Changeset 14591

Timestamp:

12/27/13 15:58:16 (10 years ago)

Author:

Mark Evenson

Message:

Correctly initialize/restore *BACKQUOTE-COUNT* special when loading FASLs.

Throw intelligible errors from problems encountered by SHARPSIGN-DOT
macros passed through '--eval' arguments.

Fixes #334.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Interpreter.java (modified) (1 diff)
• Load.java (modified) (1 diff)
• backquote.lisp (modified) (1 diff)

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

@@ -596 +596 @@
         StringInputStream stream = new StringInputStream(s);
         final LispThread thread = LispThread.currentThread();
-        LispObject obj = stream.read(false, EOF, false, thread,
-                                     Stream.currentReadtable);
+        LispObject obj = null;
+
+        final SpecialBindingsMark mark0 = thread.markSpecialBindings();
+        thread.bindSpecial(Symbol.DEBUGGER_HOOK, _DEBUGGER_HOOK_FUNCTION);
+        try {  // catch possible errors from use of SHARPSIGN_DOT macros in --eval stanzas
+          obj = stream.read(false, EOF, false, thread,
+                            Stream.currentReadtable);
+        } finally {
+          thread.resetSpecialBindings(mark0);
+        }
         if (obj == EOF)
             return error(new EndOfFile(stream));
+
         final SpecialBindingsMark mark = thread.markSpecialBindings();
         thread.bindSpecial(Symbol.DEBUGGER_HOOK, _DEBUGGER_HOOK_FUNCTION);

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

@@ -485 +485 @@
             thread.bindSpecialToCurrentValue(special);
 
+        thread.bindSpecial(_BACKQUOTE_COUNT_, Fixnum.getInstance(0));
         int loadDepth = Fixnum.getValue(_LOAD_DEPTH_.symbolValue(thread));
         thread.bindSpecial(_LOAD_DEPTH_, Fixnum.getInstance(++loadDepth));

trunk/abcl/src/org/armedbear/lisp/backquote.lisp

@@ -73 +73 @@
 ;;; of ",@a)"
 
-;; (%defvar '*backquote-count* 0)
+;; (%defvar '*backquote-count* 0) ; defined in Java, q.v. Lisp.java:2754
 (%defvar '*bq-comma-flag* '(|,|))
 (%defvar '*bq-at-flag* '(|,@|))
 (%defvar '*bq-dot-flag* '(|,.|))
-;; (%defvar '*bq-vector-flag* '(|bqv|))
+;; (%defvar '*bq-vector-flag* '(|bqv|)) ; defined in Java, q.v. Lisp.java:2757
 
 ;;; the actual character macro