diff options
| -rw-r--r-- | src/boot/ChangeLog | 6 | ||||
| -rw-r--r-- | src/boot/ast.boot.pamphlet | 4 | ||||
| -rw-r--r-- | src/boot/includer.boot.pamphlet | 8 | ||||
| -rw-r--r-- | src/lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lisp/core.lisp.in | 8 |
5 files changed, 20 insertions, 10 deletions
diff --git a/src/boot/ChangeLog b/src/boot/ChangeLog index 317f6434..d7fa79ab 100644 --- a/src/boot/ChangeLog +++ b/src/boot/ChangeLog @@ -1,3 +1,9 @@ +2007-09-11 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * ast.boot.pamphlet (bfCompDef): Call coreError, not error. + * includer.boot.pamphlet (shoeNotFound): Likewise. + (SoftShoeError): Likewise. + 2007-09-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (stage0/%.$(FASLEXT)): Remove. diff --git a/src/boot/ast.boot.pamphlet b/src/boot/ast.boot.pamphlet index 09d68b35..25d982f5 100644 --- a/src/boot/ast.boot.pamphlet +++ b/src/boot/ast.boot.pamphlet @@ -176,7 +176,7 @@ bfCompDef x == otherwise => x is [def, op, args, body] => bfDef(def,op,args,body) - error '"invalid AST" + coreError '"invalid AST" bfBeginsDollar x== EQL('"$".0,(PNAME x).0) @@ -1257,7 +1257,7 @@ bfDs n== if n=0 then '"" else CONCAT('"D",bfDs(n-1)) (SETQ |body| (CAR |ISTMP#3|)) 'T)))))))) (|bfDef| |def| |op| |args| |body|)) - ('T (|error| "invalid AST"))))))))) + ('T (|coreError| "invalid AST"))))))))) (DEFUN |bfBeginsDollar| (|x|) (PROG () (RETURN (EQL (ELT "$" 0) (ELT (PNAME |x|) 0))))) diff --git a/src/boot/includer.boot.pamphlet b/src/boot/includer.boot.pamphlet index 803d5666..e613d5c4 100644 --- a/src/boot/includer.boot.pamphlet +++ b/src/boot/includer.boot.pamphlet @@ -362,7 +362,7 @@ shoeCLOSE stream == -- error out if file is not found. shoeNotFound fn == - error [fn, '" not found"] + coreError [fn, '" not found"] nil @@ -382,7 +382,7 @@ shoeConsole line == shoeSpaces n == MAKE_-FULL_-CVEC(n, '".") SoftShoeError(posn,key)== - error ['"in line ", STRINGIMAGE lineNo posn] + coreError ['"in line ", STRINGIMAGE lineNo posn] shoeConsole lineString posn shoeConsole CONCAT(shoeSpaces lineCharacter posn,'"|") shoeConsole key @@ -691,7 +691,7 @@ bPremStreamNull(s)== (DEFUN |shoeCLOSE| (|stream|) (PROG () (RETURN (CLOSE |stream|)))) (DEFUN |shoeNotFound| (|fn|) - (PROG () (RETURN (PROGN (|error| (LIST |fn| " not found")) NIL)))) + (PROG () (RETURN (PROGN (|coreError| (LIST |fn| " not found")) NIL)))) (DEFUN |shoeReadLispString| (|s| |n|) (PROG (|l|) @@ -716,7 +716,7 @@ bPremStreamNull(s)== (PROG () (RETURN (PROGN - (|error| (LIST "in line " (STRINGIMAGE (|lineNo| |posn|)))) + (|coreError| (LIST "in line " (STRINGIMAGE (|lineNo| |posn|)))) (|shoeConsole| (|lineString| |posn|)) (|shoeConsole| (CONCAT (|shoeSpaces| (|lineCharacter| |posn|)) "|")) diff --git a/src/lisp/ChangeLog b/src/lisp/ChangeLog index a60858fd..5a523df6 100644 --- a/src/lisp/ChangeLog +++ b/src/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-09-11 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * core.lisp.in (|coreError|): Rename from |error|. Adjust callers. + 2007-09-08 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (fasl_ext): New. Factor out the logic diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index 8722220c..4af04761 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -56,7 +56,7 @@ (:export "quit" "fatalError" "internalError" - "error" + "coreError" "errorCount" "countError" "warn" @@ -330,7 +330,7 @@ (|diagnosticMessage| "internal error" msg) (|quit| 1)) -(defun |error| (msg) +(defun |coreError| (msg) (|countError|) (|diagnosticMessage| "error" (cond ((consp msg) @@ -595,14 +595,14 @@ (compile-file-pathname out-file) :lisp-files `(,out-file))) (unless result - (|error| "compilation of Lisp code failed")) + (|coreError| "compilation of Lisp code failed")) (cond ((and failure-p) ;; Since we believe the source code must ;; be fixed, we don't want to leave ;; the generated FASL behing us, as that ;; would confuse both user and tools. (delete-file result) - (|error| "Lisp code contained errors")) + (|coreError| "Lisp code contained errors")) (warning-p (|warn| "Lisp code contained warnings"))) |