@@ -44,7 +44,7 @@ (is val t) (list " PUSH(TOBJ);") (list " PUSH(FIX2OBJ(" val "));"))) (aquote ast) - (let val (car ast!subx) + (let val ast!val (list " PUSH(QUOTE_CONSTANTS[" (add-constant val) "]" "/* '" (tostring:write val) " */);")) (aref ast) @@ -370,7 +370,7 @@ int main (int argc, char * argv[]) { (aseq ast) (cons 'do (map source ast!subx)) (aquote ast) - (cons 'quote ast!subx) + (list 'quote ast!val) ; if unknown AST, then probably still in list form ; (cref driver) ast)) codegen.arc @@ -39,8 +39,8 @@ ; a quoted form ; (currently only literals) -(def make-quote (subx) - (listtab `((type quote) (subx ,subx)))) +(def make-quote (subx val) + (listtab `((type quote) (subx ,subx) (val ,val)))) (def aquote (x) (and (isa x 'table) (is x!type 'quote))) structs.arc @@ -85,7 +85,7 @@ (= macquote* (make-macro 'quote (fn (e cte) (if (is (len (cdr e)) 1) - (make-quote (cdr e)) + (make-quote '() (cadr e)) (err "quote expects 1 arg"))))) (= macset* (make-macro 'set xe.arc 80d4509e8566894e78dd098880436b5c4064126f Alan Manuel K. Gloria almkglor@gmail.com http://github.com/sacado/arc2c/commit/1053cf8820056376f796b6ddda3dff31216c6f25 1053cf8820056376f796b6ddda3dff31216c6f25 2008-04-09T15:33:25-07:00 2008-04-09T15:33:25-07:00 Changed quote AST: quoted field is now in separate 'val field The new rule is: any AST's subx field is always a list of AST's. Non-AST values are *banned* from the subx field. Special-casing quote AST's is beginning to irritate me. a56948c8392f41cde10dfae752d751f970a0171b Alan Manuel K. Gloria almkglor@gmail.com