Changeset 11783
- Timestamp:
- 04/25/09 14:19:51 (15 years ago)
- Location:
- trunk/abcl/src/org/armedbear/lisp
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/FaslReader.java
r11488 r11783 285 285 Symbol symbol = (Symbol) stream.readSymbol(FaslReadtable.getInstance()); 286 286 LispObject pkg = Load._FASL_ANONYMOUS_PACKAGE_.symbolValue(thread); 287 if (pkg == NIL) { 288 thread.bindSpecial(Load._FASL_ANONYMOUS_PACKAGE_, 289 pkg = new Package()); 290 } 287 Debug.assertTrue(pkg != NIL); 291 288 symbol = ((Package)pkg).intern(symbol.getName()); 292 289 symbol.setPackage(NIL); -
trunk/abcl/src/org/armedbear/lisp/Load.java
r11714 r11783 345 345 // ### *fasl-anonymous-package* 346 346 // internal symbol 347 /** 348 * This variable gets bound to a package with no name in which the 349 * reader can intern its uninterned symbols. 350 * 351 */ 347 352 public static final Symbol _FASL_ANONYMOUS_PACKAGE_ = 348 353 internSpecial("*FASL-ANONYMOUS-PACKAGE*", PACKAGE_SYS, NIL); … … 474 479 Stream in = (Stream) _LOAD_STREAM_.symbolValue(thread); 475 480 final Environment env = new Environment(); 476 while (true) { 477 LispObject obj = in.faslRead(false, EOF, true, thread); 478 if (obj == EOF) 479 break; 480 eval(obj, env, thread); 481 final SpecialBinding lastSpecialBinding = thread.lastSpecialBinding; 482 try { 483 thread.bindSpecial(_FASL_ANONYMOUS_PACKAGE_, new Package()); 484 while (true) { 485 LispObject obj = in.faslRead(false, EOF, true, thread); 486 if (obj == EOF) 487 break; 488 eval(obj, env, thread); 489 } 490 } 491 finally { 492 thread.lastSpecialBinding = lastSpecialBinding; 481 493 } 482 494 return T; -
trunk/abcl/src/org/armedbear/lisp/Primitives.java
r11772 r11783 3018 3018 new Primitive("%make-package", PACKAGE_SYS, false) 3019 3019 { 3020 /** 3021 * This invocation is solely used to be able to create 3022 * a package to bind to *FASL-ANONYMOUS-PACKAGE* 3023 */ 3024 @Override 3025 public LispObject execute() 3026 throws ConditionThrowable 3027 { 3028 return new Package(); 3029 } 3030 3031 /** 3032 * This invocation is used by MAKE-PACKAGE to create a package 3033 */ 3020 3034 @Override 3021 3035 public LispObject execute(LispObject first, LispObject second, -
trunk/abcl/src/org/armedbear/lisp/Stream.java
r11754 r11783 519 519 else 520 520 { 521 SpecialBinding lastSpecialBinding = thread.lastSpecialBinding; 521 522 thread.bindSpecial(_SHARP_EQUAL_ALIST_, NIL); 522 return faslReadPreservingWhitespace(eofError, eofValue, true, thread); 523 try 524 { 525 return faslReadPreservingWhitespace(eofError, eofValue, true, thread); 526 } 527 finally 528 { 529 thread.lastSpecialBinding = lastSpecialBinding; 530 } 523 531 } 524 532 } -
trunk/abcl/src/org/armedbear/lisp/compile-file.lisp
r11765 r11783 428 428 (*explain* *explain*) 429 429 (jvm::*functions-defined-in-current-file* '()) 430 (*fbound-names* '())) 430 (*fbound-names* '()) 431 (*fasl-anonymous-package* (%make-package))) 431 432 (jvm::with-file-compilation 432 433 (write "; -*- Mode: Lisp -*-" :escape nil :stream out) -
trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
r11782 r11783 5020 5020 (set-compiland-and-write-class-file class-file compiland) 5021 5021 (setf (local-function-class-file local-function) class-file) 5022 (setf (local-function-function local-function) (load-compiled-function pathname)) 5022 (setf (local-function-function local-function) 5023 (load-compiled-function pathname)) 5023 5024 (when (local-function-variable local-function) 5024 5025 (let ((g (declare-object (load-compiled-function pathname)))) -
trunk/abcl/src/org/armedbear/lisp/jvm.lisp
r11719 r11783 414 414 (defun compile (name &optional definition) 415 415 (let ((*file-compilation* nil) 416 (*pathnames-generator* #'make-temp-file)) 416 (*pathnames-generator* #'make-temp-file) 417 (sys::*fasl-anonymous-package* (sys::%make-package))) 417 418 (jvm-compile name definition))) 418 419
Note: See TracChangeset
for help on using the changeset viewer.