Avoid using new-style SEQUENCE stuff in LIAR.

diff --git a/src/compiler/fggen/canon.scm b/src/compiler/fggen/canon.scm
index 62db01a4d4a461e8f59583e53fb161ae06acf384..5cf836e91a3241f8c7f74ca42d3492fb8e0b556a 100644 (file)
--- a/src/compiler/fggen/canon.scm
+++ b/src/compiler/fggen/canon.scm
@@ -819,7 +819,7 @@ ARBITRARY:  The expression may be executed more than once.  It
        ((dispatch-entry
          (sc-macro-transformer
           (lambda (form environment)
-            `(VECTOR-SET! DISPATCH-VECTOR ,(microcode-type (cadr form))
+            `(VECTOR-SET! DISPATCH-VECTOR (MICROCODE-TYPE ',(cadr form))
                           ,(close-syntax (caddr form) environment)))))
 
         (dispatch-entries

diff --git a/src/compiler/fggen/fggen.scm b/src/compiler/fggen/fggen.scm
index a9f6cad7a8da83334fa33a9ce6c96f2a59f09b2a..629729c5d5760b6e215f7518df43f83ef8a5f9cd 100644 (file)
--- a/src/compiler/fggen/fggen.scm
+++ b/src/compiler/fggen/fggen.scm
@@ -507,12 +507,14 @@ USA.
       (let ((first-action
             (generate/subproblem/effect
              block continuation context
-             (scode/sequence-immediate-first expression) 'SEQUENCE-CONTINUE
+             (car (scode/sequence-actions expression))
+              'SEQUENCE-CONTINUE
              expression)))
        ((scfg*ctype->ctype! continuation)
         first-action
-        (generate/expression block continuation context
-                             (scode/sequence-immediate-second expression))))
+        (generate/expression
+         block continuation context
+         (make-sequence (cdr (scode/sequence-actions expression))))))
       (error "Not a sequence" expression)))
 
 (define (generate/conditional block continuation context expression)
@@ -962,7 +964,7 @@ USA.
          (sc-macro-transformer
           (lambda (form environment)
             `(VECTOR-SET! DISPATCH-VECTOR
-                          ,(microcode-type (cadr form))
+                          (MICROCODE-TYPE ',(cadr form))
                           ,(close-syntax (caddr form) environment)))))
         (dispatch-entries
          (sc-macro-transformer