Import v2.1.8-32bit.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for OOC 2.1.7.
+# Generated by GNU Autoconf 2.59 for OOC 2.1.8.
 #
 # Report bugs to <[email protected]>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='OOC'
 PACKAGE_TARNAME='ooc'
-PACKAGE_VERSION='2.1.7'
-PACKAGE_STRING='OOC 2.1.7'
+PACKAGE_VERSION='2.1.8'
+PACKAGE_STRING='OOC 2.1.8'
 PACKAGE_BUGREPORT='[email protected]'
 
 ac_unique_file="src/OOC/Parser.Mod"
@@ -780,7 +780,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 OOC 2.1.7 to adapt to many kinds of systems.
+\`configure' configures OOC 2.1.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -837,7 +837,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OOC 2.1.7:";;
+     short | recursive ) echo "Configuration of OOC 2.1.8:";;
    esac
   cat <<\_ACEOF
 
@@ -955,7 +955,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-OOC configure 2.1.7
+OOC configure 2.1.8
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -969,7 +969,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OOC $as_me 2.1.7, which was
+It was created by OOC $as_me 2.1.8, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -6359,7 +6359,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by OOC $as_me 2.1.7, which was
+This file was extended by OOC $as_me 2.1.8, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6419,7 +6419,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OOC config.status 2.1.7
+OOC config.status 2.1.8
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -1,6 +1,6 @@
 dnl Autoconf requirements
 AC_PREREQ(2.53)
-AC_INIT(OOC,2.1.7,[email protected])
+AC_INIT(OOC,2.1.8,[email protected])
 AC_CONFIG_SRCDIR(src/OOC/Parser.Mod)
 AC_CONFIG_HEADER(lib/src/__config.h)
 

lib/src/IO/TextRider.Mod

@@ -1,4 +1,4 @@
-(*	$Id: TextRider.Mod,v 1.8 2004/11/21 20:31:44 mva Exp $	*)
+(*	$Id: TextRider.Mod,v 1.9 2005/02/26 17:30:19 mva Exp $	*)
 MODULE IO:TextRider [OOC_EXTENSIONS];
 
 (*
@@ -926,6 +926,10 @@ PROCEDURE (r: Reader) ReadLn*() RAISES IO.Error;
 (**This method reads and discards all characters up to and including the next
    end-of-line character.  *)
   BEGIN
+    IF (r.pos=r.lineLength) & ~r.consumeEOL THEN
+      r.ReadLineBuffer;
+    END;
+    r.consumeEOL:=FALSE;
     r.pos:=r.lineLength;
   END ReadLn;
 

lib/src/Logger.Mod

@@ -244,13 +244,11 @@ PROCEDURE (lh: Handle) DebugLongReal*(msg: STRING; x: LONGREAL);
 PROCEDURE (lh: Handle) Report*(msg: STRING);
 (**Report messages are also duplicated into the debug log.  *)
   BEGIN
-    IF lh.enableReport THEN
-      IF lh.enableDebug & lh.debugTarget.passOnDebug THEN
-        lh.debugTarget.Write(lh.prefixReportInDebug, msg);
-      END;
-      IF lh.reportTarget.passOnReport THEN
-        lh.reportTarget.Write(lh.prefix, msg);
-      END;
+    IF lh.enableDebug & lh.debugTarget.passOnDebug THEN
+      lh.debugTarget.Write(lh.prefixReportInDebug, msg);
+    END;
+    IF lh.enableReport & lh.reportTarget.passOnReport THEN
+      lh.reportTarget.Write(lh.prefix, msg);
     END;
   END Report;
 

lib/src/Object/BigInt.Mod

@@ -1,7 +1,7 @@
-(*	$Id: BigInt.Mod,v 1.7 2004/05/23 18:25:26 mva Exp $	*)
+(*	$Id: BigInt.Mod,v 1.8 2005/01/18 09:26:34 mva Exp $	*)
 MODULE Object:BigInt [OOC_EXTENSIONS];
 (*  Implements integer values of arbitrary magnitude.
-    Copyright (C) 2002-2004  Michael van Acken
+    Copyright (C) 2002-2005  Michael van Acken
 
     This module is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public License
@@ -794,9 +794,12 @@ PROCEDURE (a: BigInt) ToString*(): Object.String8;
     RETURN a.Format(10);
   END ToString;
 
-PROCEDURE NewLatin1Region* (str[NO_COPY]: ARRAY OF CHAR; start, end: LONGINT;
-                            inputBase: LONGINT): BigInt;
-(* @precond
+PROCEDURE NewLatin1Region*(str[NO_COPY]: ARRAY OF CHAR; start, end: LONGINT;
+                           inputBase: LONGINT): BigInt;
+(**Result is @code{NIL} if the string interval does not match the syntax for
+   integer numbers.
+   
+   @precond
    @samp{@oparam{start} <= @oparam{end}}
    @end precond *)
   VAR
@@ -832,13 +835,19 @@ PROCEDURE NewLatin1Region* (str[NO_COPY]: ARRAY OF CHAR; start, end: LONGINT;
       ELSIF (d >= ORD("A")) THEN
         DEC(d, ORD("A")-10);
       END;
-      ASSERT((d >= 0) & (d < base));
-      z := MulAdd1(z, SHORT(inputBase), SHORT(d));
+      IF ((d >= 0) & (d < base)) THEN
+        z := MulAdd1(z, SHORT(inputBase), SHORT(d));
+      ELSE                               (* error: bail out *)
+        RETURN NIL;
+      END;
       INC (start);
     END;
     z.size := sign*z.size;
-    ASSERT(start # firstDigit);
-    RETURN z;
+    IF (start # firstDigit) THEN
+      RETURN z;
+    ELSE                                 (* no digits, then no number *)
+      RETURN NIL;
+    END;
   END NewLatin1Region;
 
 PROCEDURE NewLatin1* (str[NO_COPY]: ARRAY OF CHAR; inputBase: LONGINT): BigInt;

src/H2O/Emitter.Mod

@@ -21,7 +21,7 @@
 
 MODULE H2O:Emitter;
 
-IMPORT TextRider, H2O:Value, Object;
+IMPORT IO:TextRider, H2O:Value, Object;
 
 CONST
   (* Declaration types *)