* interp/scan.boot (scanCheckRadix): Take the radix in string form.

	Croak on missing digit after radix.
	(scanNumber): Don't ask for implicit 0 completion for explicit
	radix integers.
	* interp/int-top.boot (phInterpret): Don't bother evaluating
	expressions if earlier phases saw errors.
	* interp/msg.boot (getStFromMsg): Fix typo.

8 files changed, 44 insertions, 27 deletions

diff --git a/configure b/configure
index 4637ea9d..73405394 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-2009-04-01.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2009-04-08.
 #
 # 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-2009-04-01'
-PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-01'
+PACKAGE_VERSION='1.3.0-2009-04-08'
+PACKAGE_STRING='OpenAxiom 1.3.0-2009-04-08'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1406,7 +1406,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-2009-04-01 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2009-04-08 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-04-01:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2009-04-08:";;
    esac
   cat <<\_ACEOF
 
@@ -1580,7 +1580,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2009-04-01
+OpenAxiom configure 1.3.0-2009-04-08
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1594,7 +1594,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-2009-04-01, which was
+It was created by OpenAxiom $as_me 1.3.0-2009-04-08, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -26808,7 +26808,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-2009-04-01, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2009-04-08, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26857,7 +26857,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2009-04-01
+OpenAxiom config.status 1.3.0-2009-04-08
 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 ec1a66c1..e0e7eb95 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-2009-04-01], 
+AC_INIT([OpenAxiom], [1.3.0-2009-04-08], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index a9ff684c..5e11d421 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1131,7 +1131,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2009-04-01], 
+AC_INIT([OpenAxiom], [1.3.0-2009-04-08], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index 10764537..4ef10c4c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2009-04-08  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/scan.boot (scanCheckRadix): Take the radix in string form.
+	Croak on missing digit after radix.
+	(scanNumber): Don't ask for implicit 0 completion for explicit
+	radix integers.
+	* interp/int-top.boot (phInterpret): Don't bother evaluating
+	expressions if earlier phases saw errors.
+	* interp/msg.boot (getStFromMsg): Fix typo.
+
 2009-04-06  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* boot/ast.boot: Support more ISO C sized integer type in FFI.
diff --git a/src/doc/msgs/s2-us.msgs b/src/doc/msgs/s2-us.msgs
index 5774dbd8..6ded51c7 100644
--- a/src/doc/msgs/s2-us.msgs
+++ b/src/doc/msgs/s2-us.msgs
@@ -1272,6 +1272,9 @@ S2CN0002
 S2CN0003
  The character %b %1 %d is not an OpenAxiom character.
  
+S2CN0004
+ Missing digit after the radix %1b specifier.
+ 
 S2CY0002
  Improper syntax.
  
diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index 8c7df1e8..06366706 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -247,6 +247,8 @@ intloopSpadProcess(stepNo,lines,ptree,interactive?)==
     stepNo+1
  
 phInterpret carrier ==
+  -- Don't try evaluation if the data structure may have been corrupted.
+  not ncEltQ(carrier, "ok?") => "KO"
   ptree := ncEltQ(carrier, 'ptree)
   val := intInterpretPform(ptree)
   ncPutQ(carrier, 'value, val)
diff --git a/src/interp/msg.boot b/src/interp/msg.boot
index 4f658fd2..af1532f9 100644
--- a/src/interp/msg.boot
+++ b/src/interp/msg.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -349,8 +349,7 @@ getStFromMsg msg ==
     setOptKeyBlanks()
     preStL := getPreStL getMsgPrefix? msg
     getMsgTag  msg = 'line =>
-          [$optKeyBlanks, '"%1" , :preStL,_
-           getMsgText msg]
+          [$optKeyBlanks, :preStL, getMsgText msg]
     posStL := getPosStL msg
     optKey :=
         $showKeyNum =>
diff --git a/src/interp/scan.boot b/src/interp/scan.boot
index eff296bf..77f5bdc4 100644
--- a/src/interp/scan.boot
+++ b/src/interp/scan.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -585,14 +585,17 @@ spleI1(dig,zro) ==
              bb:=spleI1(dig,zro)-- escape, anyno spaces are ignored
              CONCAT(str,bb)
 
-scanCheckRadix(r,w)==
-       ns:=#w
-       done:=false
-       for i in 0..ns-1  repeat
-         a:=rdigit? w.i
-         if null a or a>=r
-         then  ncSoftError(cons($linepos,lnExtraBlanks $linepos+$n-ns+i),
-                    "S2CN0002", [w.i])
+scanCheckRadix(a,w)==
+  r := PARSE_-INTEGER a
+  ns:=#w
+  ns = 0 => 
+    ncSoftError([$linepos,:lnExtraBlanks $linepos+$n],"S2CN0004",[a])
+  done:=false
+  for i in 0..ns-1  repeat
+    a:=rdigit? w.i
+    if null a or a>=r
+    then  ncSoftError(cons($linepos,lnExtraBlanks $linepos+$n-ns+i),
+	       "S2CN0002", [w.i])
 
 scanNumber() ==
        a := spleI(function digit?)
@@ -615,8 +618,8 @@ scanNumber() ==
            else lfinteger a
          else
              $n:=$n+1
-             w:=spleI1(function rdigit?,true)
-             scanCheckRadix(PARSE_-INTEGER a,w)
+             w:=spleI1(function rdigit?,false)
+             scanCheckRadix(a,w)
              if $n>=$sz
              then
                 lfrinteger(a,w)
@@ -631,7 +634,7 @@ scanNumber() ==
                     else
                     --$n:=$n+1
                       v:=spleI1(function rdigit?,true)
-                      scanCheckRadix(PARSE_-INTEGER a,v)
+                      scanCheckRadix(a,v)
                       scanExponent(CONCAT(a,'"r",w),v)
                   else lfrinteger(a,w)