Fix more mistaken references to top-level variables for primitives.

diff --git a/v7/src/compiler/back/syerly.scm b/v7/src/compiler/back/syerly.scm
index f42e751cec275d5505a74a8dd83b4fdc863103f5..f925c4a2b0df624fe7ad24becbc493710183ae0d 100644 (file)
--- a/v7/src/compiler/back/syerly.scm
+++ b/v7/src/compiler/back/syerly.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: syerly.scm,v 1.18 2008/02/14 02:12:52 cph Exp $
+$Id: syerly.scm,v 1.19 2009/02/02 20:09:20 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -98,7 +98,7 @@ USA.
                                   (list (list 'UNQUOTE-SPLICING component))))
                             operands))
                (else (list 'UNQUOTE exp))))
-           (cond ((eq? operator cons)
+           (cond ((eq? operator (ucode-primitive cons))
                   ;; integrations
                   (kernel 'CONS))
                  ((scode/absolute-reference? operator)
@@ -176,7 +176,9 @@ USA.
           (scode/combination-components (cadr operands)
             (lambda (operator inner-operands)
               (if (and (or (is-operator? operator 'CONS-SYNTAX false)
-                           (is-operator? operator 'CONS cons))
+                           (is-operator? operator
+                                         'CONS
+                                         (ucode-primitive cons)))
                        (scode/constant? (car inner-operands))
                        (bit-string?
                         (scode/constant-value (car inner-operands))))
@@ -201,7 +203,9 @@ USA.
          (receiver false false false)
          (scode/combination-components expression
            (lambda (operator operands)
-             (cond ((and (not (is-operator? operator 'CONS cons))
+             (cond ((and (not (is-operator? operator
+                                            'CONS
+                                            (ucode-primitive cons)))
                          (not (is-operator? operator 'CONS-SYNTAX false)))
                     (receiver false false false))
                    ((scode/constant? (cadr operands))

diff --git a/v7/src/compiler/base/scode.scm b/v7/src/compiler/base/scode.scm
index 22178c8977ad356f659f4282f2f93a5c3457a1cf..1ebb8c291ef6cd8cda18833e8e96f792198bd5a0 100644 (file)
--- a/v7/src/compiler/base/scode.scm
+++ b/v7/src/compiler/base/scode.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: scode.scm,v 4.21 2009/02/02 19:42:46 riastradh Exp $
+$Id: scode.scm,v 4.22 2009/02/02 20:09:20 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -96,7 +96,8 @@ USA.
 
 (define (scode/error-combination? object)
   (or (and (scode/combination? object)
-          (eq? (scode/combination-operator object) error-procedure))
+          (eq? (scode/combination-operator object)
+               (ucode-primitive error-procedure)))
       (and (scode/absolute-combination? object)
           (eq? (scode/absolute-combination-name object) 'ERROR-PROCEDURE))))
 

diff --git a/v7/src/runtime/unsyn.scm b/v7/src/runtime/unsyn.scm
index 2821e8f2f54702388957592375d4980b0f4f9031..1cbf86e88898fb3c2869f06d1f550ded1cd6ff36 100644 (file)
--- a/v7/src/runtime/unsyn.scm
+++ b/v7/src/runtime/unsyn.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: unsyn.scm,v 14.37 2008/02/29 16:06:34 riastradh Exp $
+$Id: unsyn.scm,v 14.38 2009/02/02 20:09:20 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -509,7 +509,7 @@ USA.
            ((combination? value)
             (combination-components value
               (lambda (operator operands)
-                (cond ((eq? operator lexical-assignment)
+                (cond ((eq? operator (ucode-primitive lexical-assignment))
                        `(ACCESS ,(cadr operands)
                                 ,@(unexpand-access (car operands))))
                       (else

diff --git a/v7/src/runtime/urtrap.scm b/v7/src/runtime/urtrap.scm
index 5b6c5009f9640ad356dfa09dfa5af0b84f32bbbd..c5365c06c72bd5626e7c2130534a8c80c4876ad0 100644 (file)
--- a/v7/src/runtime/urtrap.scm
+++ b/v7/src/runtime/urtrap.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: urtrap.scm,v 14.22 2008/02/14 02:11:39 cph Exp $
+$Id: urtrap.scm,v 14.23 2009/02/02 20:09:20 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -167,7 +167,8 @@ USA.
 
 (define (macro-reference-trap-expression? expression)
   (and (combination? expression)
-       (eq? (combination-operator expression) primitive-object-set-type)
+       (eq? (combination-operator expression)
+           (ucode-primitive primitive-object-set-type))
        (let ((operands (combination-operands expression)))
         (and (pair? operands)
              (eqv? (car operands) (ucode-type reference-trap))