* interp/compiler.boot (compExpression): Tidy.

5 files changed, 18 insertions, 13 deletions

diff --git a/configure b/configure
index 72b37589..0ab5f095 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-06-10.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-07-02.
 #
 # 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-06-10'
-PACKAGE_STRING='OpenAxiom 1.2.0-2008-06-10'
+PACKAGE_VERSION='1.2.0-2008-07-02'
+PACKAGE_STRING='OpenAxiom 1.2.0-2008-07-02'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1403,7 +1403,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-06-10 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.2.0-2008-07-02 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1473,7 +1473,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-06-10:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-07-02:";;
    esac
   cat <<\_ACEOF
 
@@ -1577,7 +1577,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.2.0-2008-06-10
+OpenAxiom configure 1.2.0-2008-07-02
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1591,7 +1591,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-06-10, which was
+It was created by OpenAxiom $as_me 1.2.0-2008-07-02, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -26074,7 +26074,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-06-10, which was
+This file was extended by OpenAxiom $as_me 1.2.0-2008-07-02, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26123,7 +26123,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.2.0-2008-06-10
+OpenAxiom config.status 1.2.0-2008-07-02
 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 9d430115..8ed7074c 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-06-10], 
+AC_INIT([OpenAxiom], [1.2.0-2008-07-02], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index a6c41e21..0751ac4e 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1103,7 +1103,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.2.0-2008-06-10], 
+AC_INIT([OpenAxiom], [1.2.0-2008-07-02], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index e89e17ef..5d72a4c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/compiler.boot (compExpression): Tidy.
+
 2008-06-14  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* algebra/variable.spad.pamphlet (ModePatternVariable): New.
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 550776b2..4eebd0b6 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -283,7 +283,8 @@ extractCodeAndConstructTriple(u, m, oldE) ==
 compExpression: (%Form,%Mode,%Env) -> %Maybe %Triple
 compExpression(x,m,e) ==
   $insideExpressionIfTrue: local:= true
-  atom first x and (fn:= GETL(first x,"SPECIAL")) =>
+  -- special forms have dedicated compilers.
+  (op := first x) and SYMBOLP op and (fn := GET(op,"SPECIAL")) =>
     FUNCALL(fn,x,m,e)
   compForm(x,m,e)
 
@@ -1702,4 +1703,4 @@ for x in [["|", :"compSuchthat"],_
 	  ["UnionCategory", :"compConstructorCategory"],_
 	  ["where", :"compWhere"],_
           ["[||]", :"compileQuasiquote"]] repeat
-  MAKEPROP(car x, 'SPECIAL, cdr x)
+  MAKEPROP(first x, "SPECIAL", rest x)