Undoing a change the hard way.

diff --git a/src/runtime/scode.scm b/src/runtime/scode.scm
index 92efdd04f8bb4bc3e8ca762dd9e48940de47cb02..0e941ca3f3dd2b3526b1deeea649c3dbdf1f65f9 100644 (file)
--- a/src/runtime/scode.scm
+++ b/src/runtime/scode.scm
@@ -93,24 +93,6 @@ USA.
   (guarantee-quotation quotation 'QUOTATION-EXPRESSION)
   (&singleton-element quotation))
 
-;;;; Syntax error
-
-(define (make-syntax-error message datum)
-  (&typed-pair-cons (ucode-type syntax-error) message datum))
-
-(define (syntax-error? object)
-  (object-type? (ucode-type syntax-error) object))
-
-(define-guarantee syntax-error "SCode syntax error")
-
-(define (syntax-error-message syntax-error)
-  (guarantee-syntax-error syntax-error 'syntax-error-message)
-  (system-pair-car syntax-error))
-
-(define (syntax-error-datum syntax-error)
-  (guarantee-syntax-error syntax-error 'syntax-error-datum)
-  (system-pair-cdr syntax-error))
-
 ;;;; Variable
 
 (define (make-variable name)

diff --git a/src/runtime/uerror.scm b/src/runtime/uerror.scm
index c07b159a361b3cc36f2b0ff94397886d6b6e7648..3222a6e78993d637e4214c753511f3097f8cc20c 100644 (file)
--- a/src/runtime/uerror.scm
+++ b/src/runtime/uerror.scm
@@ -43,7 +43,6 @@ USA.
 (define condition-type:primitive-io-error)
 (define condition-type:primitive-procedure-error)
 (define condition-type:process-terminated-error)
-(define condition-type:syntax-error)
 (define condition-type:system-call-error)
 (define condition-type:unimplemented-primitive)
 (define condition-type:unimplemented-primitive-for-os)
@@ -903,25 +902,6 @@ USA.
       (write (access-condition condition 'DATUM) port)
       (write-string " is not applicable." port))))
 
-(set! condition-type:syntax-error
-  (make-condition-type 'SYNTAX-ERROR condition-type:error
-      '(MESSAGE DATUM)
-      (lambda (condition port)
-       (write-string "Syntax error: " port)
-       (write-string (access-condition condition 'MESSAGE) port)
-       (write (access-condition condition 'DATUM) port))))
-
-(define-error-handler 'SYNTAX-ERROR
-  (let ((signal
-        (condition-signaller condition-type:syntax-error
-                             '(MESSAGE DATUM))))
-    (lambda (continuation)
-      (let ((frame (continuation/first-subproblem continuation)))
-       (let ((expression (eval-frame/expression frame)))
-         (signal continuation
-                 (syntax-error-message expression)
-                 (syntax-error-datum expression)))))))
-
 (define-error-handler 'UNDEFINED-PROCEDURE
   (let ((signal
         (condition-signaller condition-type:inapplicable-object