* interp/postpar.boot (postBootNotEqual): New. Disallow `^=' in

	Spad codes.

5 files changed, 33 insertions, 19 deletions

diff --git a/configure b/configure
index 62ee1e75..f1bbca35 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-04-01.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-04-03.
 #
 # Report bugs to <open-axiom-bugs@lists.sf.net>.
 #
@@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='OpenAxiom'
 PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.2.0-2008-04-01'
-PACKAGE_STRING='OpenAxiom 1.2.0-2008-04-01'
+PACKAGE_VERSION='1.2.0-2008-04-03'
+PACKAGE_STRING='OpenAxiom 1.2.0-2008-04-03'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1399,7 +1399,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenAxiom 1.2.0-2008-04-01 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.2.0-2008-04-03 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1469,7 +1469,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-04-01:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-04-03:";;
    esac
   cat <<\_ACEOF
 
@@ -1573,7 +1573,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.2.0-2008-04-01
+OpenAxiom configure 1.2.0-2008-04-03
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1587,7 +1587,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenAxiom $as_me 1.2.0-2008-04-01, which was
+It was created by OpenAxiom $as_me 1.2.0-2008-04-03, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -25767,7 +25767,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenAxiom $as_me 1.2.0-2008-04-01, which was
+This file was extended by OpenAxiom $as_me 1.2.0-2008-04-03, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25816,7 +25816,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.2.0-2008-04-01
+OpenAxiom config.status 1.2.0-2008-04-03
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 81b6afe6..6f1873b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.2.0-2008-04-01], 
+AC_INIT([OpenAxiom], [1.2.0-2008-04-03], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index e809472f..4b1000a3 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1086,7 +1086,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.2.0-2008-04-01], 
+AC_INIT([OpenAxiom], [1.2.0-2008-04-03], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b54a770..dd6ee975 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-03  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/postpar.boot (postBootNotEqual): New.  Disallow `^=' in
+	Spad codes.
+
 2008-04-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* algebra/acplot.spad.pamphlet: Replace `^=' with `~='.
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index 149bbd75..fc59b59f 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -1,6 +1,6 @@
--- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
+-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007, Gabriel Dos Reis.
+-- Copyright (C) 2007-2008, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
 --       the documentation and/or other materials provided with the
 --       distribution.
 --
---     - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+--     - Neither the name of The Numerical Algorithms Group Ltd. nor the
 --       names of its contributors may be used to endorse or promote products
 --       derived from this software without specific prior written permission.
 --
@@ -529,6 +529,14 @@ deepestExpression x ==
   x is ["_!",y] => deepestExpression y
   x
 
+--% `^='
+++ check that `^=' is not used in Spad code to mean `not equal'.
+postBootNotEqual u ==
+  $BOOT => [first u, :postTran rest u]
+  checkWarning ['"Operator ", :bright '"^=", 
+   '"is not valid Spad.  Please use",:bright '"~=",'"instead."]
+  ["~=",:postTran rest u]
+
 --% Register special parse tree tranformers.
 
 for x in [["with", :function postWith],_
@@ -538,18 +546,18 @@ for x in [["with", :function postWith],_
 	  ["Block", :function postBlock],_
 	  ["QUOTE", :function postQUOTE],_
 	  ["COLLECT", :function postCollect],_
-	  ["_:BF_:", :function postBigFloat],_
+	  [":BF:", :function postBigFloat],_
 	  ["in", :function postin],_
 	  ["IN", :function postIn],_
 	  ["REPEAT", :function postRepeat],_
 	  ["TupleCollect", :function postTupleCollect],_
 	  ["add", :function postAdd],_
 	  ["Reduce", :function postReduce],_
-	  ["_,", :function postComma],_
-	  ["_;", :function postSemiColon],_
+	  [",", :function postComma],_
+	  [";", :function postSemiColon],_
 	  ["where", :function postWhere],_
-	  ["_:_:", :function postColonColon],_
-	  ["_:", :function postColon],_
+	  ["::", :function postColonColon],_
+	  [":", :function postColon],_
 	  ["@", :function postAtSign],_
 	  ["pretend", :function postPretend],_
 	  ["if", :function postIf],_
@@ -560,6 +568,7 @@ for x in [["with", :function postWith],_
 	  ["==>", :function postMDef],_
 	  ["->", :function postMapping],_
 	  ["=>", :function postExit],_
+          ["^=", :function postBootNotEqual],_
 	  ["Tuple", :function postTuple]] repeat
   MAKEPROP(car x, "postTran", cdr x)