aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-01-02 02:08:50 +0000
committerdos-reis <gdr@axiomatics.org>2009-01-02 02:08:50 +0000
commit8e2eb71cea7c58615b87344af16d57b703b4c5b5 (patch)
treef65fd78be4e713509ab92bbae3f20ebe947b8dd0
parent363768900a8d94fb76c2d38c7884c38e8447762f (diff)
downloadopen-axiom-8e2eb71cea7c58615b87344af16d57b703b4c5b5.tar.gz
* interp/pf2sex.boot (pfLiteral2Sex): Fix evaluation of intergers
with non-decimal radix. * interp/scan.boot (rdigti?): Allow non-capital letters.
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac2
-rw-r--r--configure.ac.pamphlet2
-rw-r--r--src/ChangeLog6
-rw-r--r--src/interp/pf2sex.boot7
-rw-r--r--src/interp/scan.boot12
6 files changed, 34 insertions, 13 deletions
diff --git a/configure b/configure
index 81802b49..2b888c9a 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.3.0-2008-12-30.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-01-01.
#
# 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.3.0-2008-12-30'
-PACKAGE_STRING='OpenAxiom 1.3.0-2008-12-30'
+PACKAGE_VERSION='1.3.0-2009-01-01'
+PACKAGE_STRING='OpenAxiom 1.3.0-2009-01-01'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
ac_unique_file="src/Makefile.pamphlet"
@@ -1405,7 +1405,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.3.0-2008-12-30 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2009-01-01 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1475,7 +1475,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-12-30:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-01-01:";;
esac
cat <<\_ACEOF
@@ -1579,7 +1579,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2008-12-30
+OpenAxiom configure 1.3.0-2009-01-01
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1593,7 +1593,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.3.0-2008-12-30, which was
+It was created by OpenAxiom $as_me 1.3.0-2009-01-01, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -26424,7 +26424,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.3.0-2008-12-30, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2009-01-01, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26473,7 +26473,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2008-12-30
+OpenAxiom config.status 1.3.0-2009-01-01
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 2b368a47..a68901f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2008-12-30],
+AC_INIT([OpenAxiom], [1.3.0-2009-01-01],
[open-axiom-bugs@lists.sf.net])
AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 61a7e939..7bea00be 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1126,7 +1126,7 @@ information:
<<Autoconf init>>=
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2008-12-30],
+AC_INIT([OpenAxiom], [1.3.0-2009-01-01],
[open-axiom-bugs@lists.sf.net])
@
diff --git a/src/ChangeLog b/src/ChangeLog
index e69de29b..4c92874a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -0,0 +1,6 @@
+2009-01-01 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/pf2sex.boot (pfLiteral2Sex): Fix evaluation of intergers
+ with non-decimal radix.
+ * interp/scan.boot (rdigti?): Allow non-capital letters.
+
diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot
index 56539978..c675054e 100644
--- a/src/interp/pf2sex.boot
+++ b/src/interp/pf2sex.boot
@@ -181,7 +181,12 @@ pf2Sex1 pf ==
pfLiteral2Sex pf ==
type := pfLiteralClass pf
type = 'integer =>
- READ_-FROM_-STRING pfLiteralString pf
+ txt := pfLiteralString pf
+ MULTIPLE_-VALUE_-BIND(part1 pos1,
+ PARSE_-INTEGER(txt,KEYWORD::JUNK_-ALLOWED,true),
+ if pos1 = #txt then part1
+ else PARSE_-INTEGER(SUBSTRING(txt,pos1+1,nil),
+ KEYWORD::RADIX, part1))
type = 'string or type = 'char =>
pfLiteralString pf
type = 'float =>
diff --git a/src/interp/scan.boot b/src/interp/scan.boot
index 557be8f8..674fe05e 100644
--- a/src/interp/scan.boot
+++ b/src/interp/scan.boot
@@ -38,6 +38,14 @@ import incl
namespace BOOT
module scan
+--%
+
+$RDigits ==
+ '"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+$smallLetters ==
+ '"abcdefghijklmnopqrstuvwxyz"
+
--% Separators
$SPACE == QENUM('" ", 0)
@@ -665,7 +673,9 @@ scanExponent(a,w)==
else lffloat(a,w,'"0")
rdigit? x==
- STRPOS(x,'"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",0,nil)
+ d := STRPOS(x,$RDigits,0,nil) => d
+ d := STRPOS(x,$smallLetters,0,nil) => 10 + d
+ nil
scanError()==
n:=$n