diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/preparse.lisp | 8 | ||||
| -rw-r--r-- | src/interp/spad-parser.boot | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 88f507c1..8d1aa179 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-06-04 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/spad-parser.boot (findCommentBlock): Lose last + parameter. Adjust callers. + 2012-06-03 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/spad.lisp (SPAD): Adjust. diff --git a/src/interp/preparse.lisp b/src/interp/preparse.lisp index 16eace23..8af7c8b3 100644 --- a/src/interp/preparse.lisp +++ b/src/interp/preparse.lisp @@ -87,7 +87,7 @@ (|preparseEcho| (|readerLines| rd)) (COND ((NULL LINES) (RETURN NIL)) (NCOMBLOCK - (|findCommentBlock| NIL NUMS LOCS NCOMBLOCK NIL))) + (|findCommentBlock| NIL NUMS LOCS NCOMBLOCK))) (RETURN (|pairList| (|reverse!| NUMS) (|parsePiles| (|reverse!| LOCS) (|reverse!| LINES)))))) (cond ((and (NULL LINES) (> (LENGTH A) 0) (EQ (CHAR A 0) #\) )) @@ -123,7 +123,7 @@ (COND ((= SLOC N) (COND ((AND NCOMBLOCK (NOT (= N (CAR NCOMBLOCK)))) - (|findCommentBlock| NUM NUMS LOCS NCOMBLOCK (|readerLines| rd)) + (|findCommentBlock| NUM NUMS LOCS NCOMBLOCK) (SETQ NCOMBLOCK NIL))) (SETQ NCOMBLOCK (CONS N (CONS A (IFCDR NCOMBLOCK)))) (SETQ A "")) @@ -158,7 +158,7 @@ (setq $skipme nil)))) (when (and LINES (EQL SLOC 0)) (IF (AND NCOMBLOCK (NOT (ZEROP (CAR NCOMBLOCK)))) - (|findCommentBlock| NUM NUMS LOCS NCOMBLOCK (|readerLines| rd))) + (|findCommentBlock| NUM NUMS LOCS NCOMBLOCK)) (RETURN (|pairList| (|reverse!| NUMS) (|parsePiles| (|reverse!| LOCS) (|reverse!| LINES))))) (cond ((> PARENLEV 0) @@ -166,7 +166,7 @@ (setq SLOC PSLOC) (GO REREAD))) (COND (NCOMBLOCK - (|findCommentBlock| NUM NUMS LOCS NCOMBLOCK (|readerLines| rd)) + (|findCommentBlock| NUM NUMS LOCS NCOMBLOCK) (setq NCOMBLOCK ()))) (PUSH SLOC LOCS) REREAD (|preparseEcho| (|readerLines| rd)) diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot index bab426f3..b33e5ef5 100644 --- a/src/interp/spad-parser.boot +++ b/src/interp/spad-parser.boot @@ -106,7 +106,7 @@ skipToEndif rs == ++ `oldnums' is the list of line numbers of previous lines ++ `oldlocs' is the list of previous indentation locations ++ `ncblock' is the current comment block -findCommentBlock(n,oldnums,oldlocs,ncblock,lines) == +findCommentBlock(n,oldnums,oldlocs,ncblock) == x := [nc,:block] := ncblock nc = 0 => [n - 1,:reverse block] |