Changeset 15137

Timestamp:

11/01/19 15:52:54 (4 years ago)

Author:

Mark Evenson

Message:

Fix ANSI-TESTS GENSYM.ERROR.10 and GENSYM.ERROR.11
(Douglas Miles)

From <​https://github.com/armedbear/abcl/commit/d19d9a2d87a4cf456fc0b949561343520c559e3d> and <​https://github.com/armedbear/abcl/commit/74e2956a3f79f7ddf8fa1d9993c94ef917075d68>.

File:

• trunk/abcl/src/org/armedbear/lisp/Lisp.java (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -1167 +1167 @@
   {
     StringBuilder sb = new StringBuilder(prefix);
-    SpecialBinding binding = thread.getSpecialBinding(Symbol.GENSYM_COUNTER);
+    final Symbol gensymCounter = Symbol.GENSYM_COUNTER;
+    SpecialBinding binding = thread.getSpecialBinding(gensymCounter);
     final LispObject oldValue;
     if (binding != null) {
         oldValue = binding.value;
-        if (oldValue instanceof Fixnum
-                || oldValue instanceof Bignum)
-          binding.value = oldValue.incr();
+        if ((oldValue instanceof Fixnum
+                || oldValue instanceof Bignum) && Fixnum.ZERO.isLessThanOrEqualTo(oldValue)) {
+            binding.value = oldValue.incr();
+        }
         else {
-           Symbol.GENSYM_COUNTER.setSymbolValue(Fixnum.ZERO);
+           binding.value = Fixnum.ZERO;
            error(new TypeError("The value of *GENSYM-COUNTER* was not a nonnegative integer. Old value: " +
                                 oldValue.princToString() + " New value: 0"));
@@ -1182 +1184 @@
         // we're manipulating a global resource
         // make sure we operate thread-safely
-        synchronized (Symbol.GENSYM_COUNTER) {
-            oldValue = Symbol.GENSYM_COUNTER.getSymbolValue();
-            if (oldValue instanceof Fixnum
-                    || oldValue instanceof Bignum)
-                Symbol.GENSYM_COUNTER.setSymbolValue(oldValue.incr());
+        synchronized (gensymCounter) {
+            oldValue = gensymCounter.getSymbolValue();
+            if ((oldValue instanceof Fixnum
+                    || oldValue instanceof Bignum) && Fixnum.ZERO.isLessThanOrEqualTo(oldValue))  {
+                gensymCounter.setSymbolValue(oldValue.incr());
+            }
             else {
-               Symbol.GENSYM_COUNTER.setSymbolValue(Fixnum.ZERO);
+               gensymCounter.setSymbolValue(Fixnum.ZERO);
                error(new TypeError("The value of *GENSYM-COUNTER* was not a nonnegative integer. Old value: " +
                                     oldValue.princToString() + " New value: 0"));