diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/g-error.boot | 4 | ||||
| -rw-r--r-- | src/interp/i-util.boot | 7 | ||||
| -rw-r--r-- | src/interp/macros.lisp | 6 | ||||
| -rw-r--r-- | src/interp/sys-constants.boot | 5 |
5 files changed, 16 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b1144d3e..43f5ab94 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2012-01-14 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/i-util.boot ($intTopLevel): Move to sys-constants.boot. + * interp/g-error.boot (returnToTopLevel): Tidy. + * interp/macros.lisp (applyWithOutputToString): Likewise. + +2012-01-14 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/spaderror.lisp: Move convent to spad.lisp. Remove. 2012-01-14 Gabriel Dos Reis <gdr@cs.tamu.edu> diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot index 844e18ac..60eab314 100644 --- a/src/interp/g-error.boot +++ b/src/interp/g-error.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2011, Gabriel Dos Reis. +-- Copyright (C) 2007-2012, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -143,7 +143,7 @@ TOP() == returnToTopLevel() returnToTopLevel() == SETQ(CHR, "ENDOFLINECHR") SETQ(TOK, 'END__UNIT) - THROW('TOP__LEVEL,'restart) + THROW($intTopLevel,'restart) returnToReader() == not $ReadingFile => returnToTopLevel() diff --git a/src/interp/i-util.boot b/src/interp/i-util.boot index 4ff153c7..4f29b071 100644 --- a/src/interp/i-util.boot +++ b/src/interp/i-util.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2011, Gabriel Dos Reis. +-- Copyright (C) 2007-2012, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -37,11 +37,6 @@ namespace BOOT module i_-util ---% - -$intTopLevel == - "top__level" - --% The function for making prompts inputPrompt str == diff --git a/src/interp/macros.lisp b/src/interp/macros.lisp index 15dd7678..33d031aa 100644 --- a/src/interp/macros.lisp +++ b/src/interp/macros.lisp @@ -1,6 +1,6 @@ ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. ;; All rights reserved. -;; Copyright (C) 2007-2011, Gabriel Dos Reis. +;; Copyright (C) 2007-2012, Gabriel Dos Reis. ;; All rights reserved. ;; ;; Redistribution and use in source and binary forms, with or without @@ -524,8 +524,8 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size (|$OutputStream| out-stream) val) (declare (special curoutstream |$algebraOutputStream|)) - (setq val (catch 'spad_reader - (catch 'TOP_LEVEL + (setq val (catch |$SpadReaderTag| + (catch |$intTopLevel| (apply (symbol-function func) args)))) (cons val (get-output-stream-string |$OutputStream|)))) diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot index e92391e5..3239d54d 100644 --- a/src/interp/sys-constants.boot +++ b/src/interp/sys-constants.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2011, Gabriel Dos Reis. +-- Copyright (C) 2007-2012, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -694,6 +694,9 @@ $KillLispSystem == 14 $SpadReaderTag == "SPAD__READER" +$intTopLevel == + "top__level" + --% ++ Default optimization level |