diff options
author | dos-reis <gdr@axiomatics.org> | 2012-01-14 21:17:54 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2012-01-14 21:17:54 +0000 |
commit | 3fdb491979d151670295b7cdac04c7b322e52830 (patch) | |
tree | 1e3546cc51591caec775eb95123148e714af20da /src/interp/macros.lisp | |
parent | 80113187efe3df1192a1ea060201e27fb6462375 (diff) | |
download | open-axiom-3fdb491979d151670295b7cdac04c7b322e52830.tar.gz |
* interp/i-util.boot ($intTopLevel): Move to sys-constants.boot.
* interp/g-error.boot (returnToTopLevel): Tidy.
* interp/macros.lisp (applyWithOutputToString): Likewise.
Diffstat (limited to 'src/interp/macros.lisp')
-rw-r--r-- | src/interp/macros.lisp | 6 |
1 files changed, 3 insertions, 3 deletions
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|)))) |