From 394ed0bd3726f60534835f7cb375b7330c2c71cb Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sat, 22 Feb 2014 20:59:52 +0000 Subject: [PATCH] Avoid using new-style SEQUENCE stuff in LIAR. --- src/compiler/fggen/canon.scm | 2 +- src/compiler/fggen/fggen.scm | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/compiler/fggen/canon.scm b/src/compiler/fggen/canon.scm index 62db01a4d..5cf836e91 100644 --- 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 a9f6cad7a..629729c5d 100644 --- 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 -- 2.25.1