diff options
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/boot/includer.boot | 12 | ||||
| -rw-r--r-- | src/boot/initial-env.lisp | 11 | ||||
| -rw-r--r-- | src/boot/strap/includer.clisp | 2 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 14 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 11 |
8 files changed, 46 insertions, 33 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for OpenAxiom 1.4.0-2010-12-19. +# Generated by GNU Autoconf 2.65 for OpenAxiom 1.4.0-2010-12-27. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.4.0-2010-12-19' -PACKAGE_STRING='OpenAxiom 1.4.0-2010-12-19' +PACKAGE_VERSION='1.4.0-2010-12-27' +PACKAGE_STRING='OpenAxiom 1.4.0-2010-12-27' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -1491,7 +1491,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.4.0-2010-12-19 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2010-12-27 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1566,7 +1566,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-12-19:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-12-27:";; esac cat <<\_ACEOF @@ -1677,7 +1677,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.4.0-2010-12-19 +OpenAxiom configure 1.4.0-2010-12-27 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2569,7 +2569,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.4.0-2010-12-19, which was +It was created by OpenAxiom $as_me 1.4.0-2010-12-27, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -5468,7 +5468,7 @@ fi # Define the identity of the package. PACKAGE='openaxiom' - VERSION='1.4.0-2010-12-19' + VERSION='1.4.0-2010-12-27' cat >>confdefs.h <<_ACEOF @@ -20961,7 +20961,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.4.0-2010-12-19, which was +This file was extended by OpenAxiom $as_me 1.4.0-2010-12-27, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21027,7 +21027,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenAxiom config.status 1.4.0-2010-12-19 +OpenAxiom config.status 1.4.0-2010-12-27 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1ff71717..82974d84 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ dnl Makefiles for building OpenAxiom interpreter, compiler, libraries, and dnl auxiliary tools where appropriate. dnl -AC_INIT([OpenAxiom], [1.4.0-2010-12-19], +AC_INIT([OpenAxiom], [1.4.0-2010-12-27], [open-axiom-bugs@lists.sf.net]) dnl Most of the macros used in this configure.ac are defined in files diff --git a/src/ChangeLog b/src/ChangeLog index d2a64671..6c28c380 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2010-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * boot/includer.boot (char): Move to token.boot. + * boot/tokens.boot (shoeStartsId): Move from initial-env.lisp + (shoeIdChar): Likewise. + * boot/initial-env.lisp (CHARMEM): Remove. + 2010-12-19 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/files.spad.pamphlet (KeyedAccessFile): Use try/finally diff --git a/src/boot/includer.boot b/src/boot/includer.boot index f6056139..21498198 100644 --- a/src/boot/includer.boot +++ b/src/boot/includer.boot @@ -66,17 +66,13 @@ module includer -- -- ElseLines ::= )else SimpleLine* | )elseif SimpleLine* ElseLines | empty --- returns a printable representation of X, when it is a symbol --- or a character, as string. Otherwise, returns nil. +++ returns a printable representation of `x', when it is a symbol +++ or a character, as string. Otherwise, returns nil. PNAME x == - symbol? x => SYMBOL_-NAME x - CHARACTERP x => STRING x + symbol? x => symbolName x + char? x => STRING x nil --- converts X, a 1-length string, to a character. -char x == - CHAR(PNAME x, 0) - -- close STREAM. shoeCLOSE stream == CLOSE stream diff --git a/src/boot/initial-env.lisp b/src/boot/initial-env.lisp index 31024006..a4b45b76 100644 --- a/src/boot/initial-env.lisp +++ b/src/boot/initial-env.lisp @@ -146,17 +146,6 @@ (defun QENUM (cvec ind) (char-code (char cvec ind))) -(defun charmem (a b) - (member a b :test #'eql)) - -(defun |shoeIdChar| (x) - (or (ALPHANUMERICP x) - (charmem x '(#\' #\? #\%)))) - -(defun |shoeStartsId| (x) - (or (alpha-char-p x) - (charmem x '(#\$ #\? #\%)))) - (defun strpos (what in start dontcare) (setq what (string what) in (string in)) (if dontcare diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp index 154e1cd4..99c6a5fb 100644 --- a/src/boot/strap/includer.clisp +++ b/src/boot/strap/includer.clisp @@ -11,8 +11,6 @@ ((CHARACTERP |x|) (STRING |x|)) (T NIL))) -(DEFUN |char| (|x|) (CHAR (PNAME |x|) 0)) - (DEFUN |shoeCLOSE| (|stream|) (CLOSE |stream|)) (DEFUN |shoeNotFound| (|fn|) diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index a918ca35..101f143d 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -5,6 +5,16 @@ (PROVIDE "tokens") +(DEFUN |char| (|x|) (CHAR (SYMBOL-NAME |x|) 0)) + +(DEFUN |shoeStartsId| (|x|) + (OR (ALPHA-CHAR-P |x|) + (MEMBER |x| (LIST (|char| '$) (|char| '?) (|char| '%))))) + +(DEFUN |shoeIdChar| (|x|) + (OR (ALPHANUMERICP |x|) + (MEMBER |x| (LIST (|char| '|'|) (|char| '?) (|char| '%))))) + (DEFCONSTANT |shoeKeyWords| (LIST (LIST "and" 'AND) (LIST "by" 'BY) (LIST "case" 'CASE) (LIST "catch" 'CATCH) (LIST "cross" 'CROSS) @@ -203,7 +213,9 @@ (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL) (LET ((|bfVar#9| - (LIST (LIST '|alphabetic?| 'ALPHA-CHAR-P) + (LIST (LIST '|abs| 'ABS) + (LIST '|alphabetic?| 'ALPHA-CHAR-P) + (LIST '|alphanumeric?| 'ALPHANUMERICP) (LIST '|and| 'AND) (LIST '|append| 'APPEND) (LIST '|apply| 'APPLY) (LIST '|atom| 'ATOM) (LIST '|canonicalFilename| 'PROBE-FILE) diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index a9b603ba..bf7cb255 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -36,6 +36,16 @@ import initial_-env namespace BOOTTRAN module tokens +++ converts `x', a 1-length symbol, to a character. +char x == + CHAR(symbolName x, 0) + +shoeStartsId x == + alphabetic? x or x in [char "$", char "?", char "%"] + +shoeIdChar x == + alphanumeric? x or x in [char "'", char "?", char "%"] + ++ Table of Boot keywords and their token name. shoeKeyWords == [ _ ['"and","AND"] , _ @@ -245,6 +255,7 @@ for i in [ _ for i in [ _ ["abs", "ABS"], _ ["alphabetic?", "ALPHA-CHAR-P"], _ + ["alphanumeric?", "ALPHANUMERICP"], _ ["and", "AND"] , _ ["append", "APPEND"] , _ ["apply", "APPLY"] , _ |