diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-14 21:41:05 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-14 21:41:05 +0000 |
| commit | 683b15834757e0ccb39afe72bb46c4d644ce033e (patch) | |
| tree | 38124177955a731f9b1dc358067bc8e706b74446 | |
| parent | 03096666f13a4659f18824b2676aa27602999ab5 (diff) | |
| download | open-axiom-683b15834757e0ccb39afe72bb46c4d644ce033e.tar.gz | |
* boot/ast.boot (bfQ): Emit STRING= for string comparison.
* interp/i-output.boot: Fix type violation in equality comparison.
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/boot/ast.boot | 1 | ||||
| -rw-r--r-- | src/boot/strap/ast.clisp | 1 | ||||
| -rw-r--r-- | src/boot/strap/includer.clisp | 2 | ||||
| -rw-r--r-- | src/boot/strap/translator.clisp | 4 | ||||
| -rw-r--r-- | src/interp/i-output.boot | 2 |
8 files changed, 22 insertions, 15 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-11. +# Generated by GNU Autoconf 2.65 for OpenAxiom 1.4.0-2010-12-13. # # 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-11' -PACKAGE_STRING='OpenAxiom 1.4.0-2010-12-11' +PACKAGE_VERSION='1.4.0-2010-12-13' +PACKAGE_STRING='OpenAxiom 1.4.0-2010-12-13' 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-11 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2010-12-13 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-11:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-12-13:";; 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-11 +OpenAxiom configure 1.4.0-2010-12-13 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-11, which was +It was created by OpenAxiom $as_me 1.4.0-2010-12-13, 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-11' + VERSION='1.4.0-2010-12-13' 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-11, which was +This file was extended by OpenAxiom $as_me 1.4.0-2010-12-13, 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-11 +OpenAxiom config.status 1.4.0-2010-12-13 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4c8eff99..ff52b8c7 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-11], +AC_INIT([OpenAxiom], [1.4.0-2010-12-13], [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 9dba7e32..a909d9f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-12-14 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * boot/ast.boot (bfQ): Emit STRING= for string comparison. + * interp/i-output.boot: Fix type violation in equality comparison. + 2010-12-12 Gabriel Dos Reis <gdr@cs.tamu.edu> * boot/ast.boot (bfIS1): Tidy. diff --git a/src/boot/ast.boot b/src/boot/ast.boot index d703475b..04933187 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -751,6 +751,7 @@ bfQ(l,r)== l = nil => ["NULL",r] r = nil => ["NULL",l] l = true or r = true => ["EQ",l,r] + string? l or string? r => ["STRING=",l,r] ["EQUAL",l,r] bfLessp(l,r)== diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index a022f053..ba658ba5 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -1209,6 +1209,7 @@ ((NULL |l|) (LIST 'NULL |r|)) ((NULL |r|) (LIST 'NULL |l|)) ((OR (EQ |l| T) (EQ |r| T)) (LIST 'EQ |l| |r|)) + ((OR (STRINGP |l|) (STRINGP |r|)) (LIST 'STRING= |l| |r|)) (T (LIST 'EQUAL |l| |r|)))) (DEFUN |bfLessp| (|l| |r|) diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp index 4d4cd438..154e1cd4 100644 --- a/src/boot/strap/includer.clisp +++ b/src/boot/strap/includer.clisp @@ -92,7 +92,7 @@ (T (SETQ |a| (CAAR |stream|)) (COND ((AND (NOT (< (LENGTH |a|) 8)) - (EQUAL (SUBSTRING |a| 0 8) ")package")) + (STRING= (SUBSTRING |a| 0 8) ")package")) (|shoePackageStartsAt| (CONS (CAAR |stream|) |lines|) |sz| |name| (CDR |stream|))) ((< (LENGTH |a|) |sz|) diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp index 2171c415..c9b972c4 100644 --- a/src/boot/strap/translator.clisp +++ b/src/boot/strap/translator.clisp @@ -623,8 +623,8 @@ (LET ((|m| (CADR |b|))) (PROGN (COND - ((NOT (EQUAL (|getOptionValue| '|import|) - "skip")) + ((NOT (STRING= (|getOptionValue| '|import|) + "skip")) (|bootImport| (STRING |m|)))) (LIST (LIST 'IMPORT-MODULE (STRING |m|)))))) (|%ImportSignature| diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index cff0e227..bc847e3e 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -2424,7 +2424,7 @@ superSubApp(u, x, y, di) == stringer x == string? x => x - EQ('_|, FETCHCHAR(s:= STRINGIMAGE x, 0)) => + '_| = FETCHCHAR(s:= STRINGIMAGE x, 0) => RPLACSTR(s, 0, 1, "", nil, nil) s |