Change name of Adam's parser's front-end

diff --git a/Changes b/Changes
index c532176..20987c0 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,8 +1,15 @@
-$Id: Changes,v 1.21 2002-11-24 17:42:26 mike Exp $
+$Id: Changes,v 1.22 2002-11-28 11:56:55 mike Exp $
 
 Revision history for the "cql-java" package.
 See the bottom of this file for a list of things still to do.
 
+0.5  (IN PROGRESS)
+       - Change regression-test rules for Adam's compiler to use his
+         new front-end cql2xcql instead of the old cqlparse3.
+       - Fix comment in etc/pqf.properties (claimed that the Type-1
+         "string" attribute was "phrase").  Just a documentation
+         error.
+
 0.4  Thu Nov 21 10:09:26 2002
        - Add support for the new "phonetic" relation modifier,
          including its mapping in "etc/pqf.properties".

diff --git a/test/regression/Makefile b/test/regression/Makefile
index e7cc2c3..81a3b27 100644 (file)
--- a/test/regression/Makefile
+++ b/test/regression/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2002-11-26 15:51:48 mike Exp $
+# $Id: Makefile,v 1.9 2002-11-28 11:56:55 mike Exp $
 
 XMLCANONICALISER = cat
 # Change this to "./xmlpp.pl" if you want to check for equivalence
@@ -7,7 +7,7 @@ test: sections/01/01.cql sections/01/01.xcql
        ./runtests ../../bin/CQLParser $(XMLCANONICALISER)
 
 test-adam: sections/01/01.cql sections/01/01.xcql
-       ./runtests ../../../srw/cql/cqlshell $(XMLCANONICALISER)
+       ./runtests ../../../srw/cql/cql2xcql $(XMLCANONICALISER)
 
 test-rob: sections/01/01.cql sections/01/01.xcql
        ./runtests ../../../rob/CQLParser.py $(XMLCANONICALISER)
@@ -17,7 +17,7 @@ sections/01/01.cql: mktests queries.raw
 
 sections/01/01.xcql: mkanswers
        ./mkanswers ../../bin/CQLParser
-# OR   ./mkanswers ../../../srw/cql/cqlshell
+# OR   ./mkanswers ../../../srw/cql/cql2xcql
 # OR   ./mkanswers ../../../rob/CQLParser.py
 # Depending on which parser you want to use as your reference
 

diff --git a/test/regression/showtest b/test/regression/showtest
index adcedef..a55c143 100755 (executable)
--- a/test/regression/showtest
+++ b/test/regression/showtest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: showtest,v 1.5 2002-11-26 15:51:48 mike Exp $
+# $Id: showtest,v 1.6 2002-11-28 11:56:55 mike Exp $
 
 if [ $# != 1 ]; then
        echo "Usage: $0 <test-name>" >&2
@@ -10,7 +10,7 @@ fi
 
 ### Warning: nasty hard-coded choices
 ( echo "=== Adam ==="
-  ../../../srw/cql/cqlshell < sections/$1.cql ) > /tmp/adam
+  ../../../srw/cql/cql2xcql < sections/$1.cql ) > /tmp/adam
 ( echo "=== Mike ==="
   ../../bin/CQLParser < sections/$1.cql ) > /tmp/mike
 sdiff -w 80 /tmp/adam /tmp/mike