diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/fnewmeta.lisp | 38 |
2 files changed, 23 insertions, 20 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 126f7cb2..c46d300c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-12-08 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/fnewmeta.lisp (PARSE-OpenBracket): Tidy. + (PARSE-OpenBrace): Likewise. + 2010-12-07 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/acplot.spad.pamphlet: Fix decimal constant notation. diff --git a/src/interp/fnewmeta.lisp b/src/interp/fnewmeta.lisp index 7e152d36..e22af1f9 100644 --- a/src/interp/fnewmeta.lisp +++ b/src/interp/fnewmeta.lisp @@ -822,29 +822,27 @@ (DEFUN |PARSE-OpenBracket| () - (PROG (G1) - (RETURN - (AND (EQ (|getToken| (SETQ G1 (CURRENT-SYMBOL))) '[) - (MUST (OR (AND (EQCAR G1 '|elt|) - (PUSH-REDUCTION '|PARSE-OpenBracket| - (CONS '|elt| - (CONS (CADR G1) - (CONS '|construct| NIL))))) - (PUSH-REDUCTION '|PARSE-OpenBracket| '|construct|))) - (ACTION (ADVANCE-TOKEN)))))) + (LET ((G1 (CURRENT-SYMBOL))) + (AND (EQ (|getToken| G1) '[) + (MUST (OR (AND (EQCAR G1 '|elt|) + (PUSH-REDUCTION '|PARSE-OpenBracket| + (CONS '|elt| + (CONS (CADR G1) + (CONS '|construct| NIL))))) + (PUSH-REDUCTION '|PARSE-OpenBracket| '|construct|))) + (ACTION (ADVANCE-TOKEN))))) (DEFUN |PARSE-OpenBrace| () - (PROG (G1) - (RETURN - (AND (EQ (|getToken| (SETQ G1 (CURRENT-SYMBOL))) '{) - (MUST (OR (AND (EQCAR G1 '|elt|) - (PUSH-REDUCTION '|PARSE-OpenBrace| - (CONS '|elt| - (CONS (CADR G1) - (CONS '|brace| NIL))))) - (PUSH-REDUCTION '|PARSE-OpenBrace| '|construct|))) - (ACTION (ADVANCE-TOKEN)))))) + (LET ((G1 (CURRENT-SYMBOL))) + (AND (EQ (|getToken| G1) '{) + (MUST (OR (AND (EQCAR G1 '|elt|) + (PUSH-REDUCTION '|PARSE-OpenBrace| + (CONS '|elt| + (CONS (CADR G1) + (CONS '|brace| NIL))))) + (PUSH-REDUCTION '|PARSE-OpenBrace| '|construct|))) + (ACTION (ADVANCE-TOKEN))))) (DEFUN |PARSE-IteratorTail| () |