aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2012-05-12 01:07:56 +0000
committerdos-reis <gdr@axiomatics.org>2012-05-12 01:07:56 +0000
commitd0c0f05a363c11d57c7d70baa224dccb92687ae3 (patch)
tree52f44abc0d9b8a7d340397b50127b005e1adc1eb
parentb09aa8e0a8ff6f0957f147c9bcac6f001de949b0 (diff)
downloadopen-axiom-d0c0f05a363c11d57c7d70baa224dccb92687ae3.tar.gz
whitespace only
-rw-r--r--src/interp/preparse.lisp34
1 files changed, 23 insertions, 11 deletions
diff --git a/src/interp/preparse.lisp b/src/interp/preparse.lisp
index 9c16a21e..3a553235 100644
--- a/src/interp/preparse.lisp
+++ b/src/interp/preparse.lisp
@@ -101,20 +101,26 @@
(CATCH 'SPAD_READER (|doSystemCommand| (subseq LINE 1)))
(GO READLOOP)))
(setq L (LENGTH A))
- (if (EQ L 0) (GO READLOOP))
+ (if (EQ L 0)
+ (GO READLOOP))
(setq PSLOC SLOC)
- (setq I 0 INSTRING () PCOUNT 0)
+ (setq I 0
+ INSTRING ()
+ PCOUNT 0)
STRLOOP (setq STRSYM (OR (|findChar| #\" A I) L))
(setq COMSYM (OR (|findString| "--" A I) L))
(setq NCOMSYM (OR (|findString| "++" A I) L))
(setq OPARSYM (OR (|findChar| #\( A I) L))
(setq CPARSYM (OR (|findChar| #\) A I) L))
(setq N (MIN STRSYM COMSYM NCOMSYM OPARSYM CPARSYM))
- (cond ((= N L) (GO NOCOMS))
+ (cond ((= N L)
+ (GO NOCOMS))
((|escaped?| A N))
((= N STRSYM) (setq INSTRING (NOT INSTRING)))
(INSTRING)
- ((= N COMSYM) (setq A (subseq A 0 N)) (GO NOCOMS)) ; discard trailing comment
+ ((= N COMSYM)
+ (setq A (subseq A 0 N))
+ (GO NOCOMS)) ; discard trailing comment
((= N NCOMSYM)
(setq SLOC (|indentationLocation| A))
(COND
@@ -128,14 +134,16 @@
(SUBSTRING A N ())) |$LineList|)
(SETQ $INDEX (1- $INDEX))
(SETQ A (SUBSEQ A 0 N))))
- (GO NOCOMS))
+ (GO NOCOMS))
((= N OPARSYM) (setq PCOUNT (1+ PCOUNT)))
((= N CPARSYM) (setq PCOUNT (1- PCOUNT))))
(setq I (1+ N))
(GO STRLOOP)
NOCOMS (setq SLOC (|indentationLocation| A))
(setq A (|trimTrailingBlank| A))
- (cond ((NULL SLOC) (setq SLOC PSLOC) (GO READLOOP)))
+ (cond ((NULL SLOC)
+ (setq SLOC PSLOC)
+ (GO READLOOP)))
(cond ((EQ (ELT A (|maxIndex| A)) #\_)
(setq CONTINUE T a (subseq A (|maxIndex| A))))
((setq CONTINUE NIL)))
@@ -146,7 +154,8 @@
(substring a 0 (STRPOSL ": (=" A 0 NIL))))
|$byConstructors|)))
(setq $skipme 't)
- (progn (push functor |$constructorsSeen|) (setq $skipme nil))))
+ (progn (push functor |$constructorsSeen|)
+ (setq $skipme nil))))
(when (and LINES (EQL SLOC 0))
(IF (AND NCOMBLOCK (NOT (ZEROP (CAR NCOMBLOCK))))
(|findCommentBlock| NUM NUMS LOCS NCOMBLOCK linelist))
@@ -155,7 +164,10 @@
(|reverse!| |$EchoLineStack|)))
(RETURN (|pairList| (|reverse!| NUMS)
(|parsePiles| (|reverse!| LOCS) (|reverse!| LINES)))))
- (cond ((> PARENLEV 0) (PUSH NIL LOCS) (setq SLOC PSLOC) (GO REREAD)))
+ (cond ((> PARENLEV 0)
+ (PUSH NIL LOCS)
+ (setq SLOC PSLOC)
+ (GO REREAD)))
(COND (NCOMBLOCK
(|findCommentBlock| NUM NUMS LOCS NCOMBLOCK linelist)
(setq NCOMBLOCK ())))
@@ -165,8 +177,8 @@
(PUSH NUM NUMS)
(setq PARENLEV (+ PARENLEV PCOUNT))
(when (and (|ioTerminal?| in-stream) (not continue))
- (setq |$preparseLastLine| nil)
- (RETURN (|pairList| (|reverse!| NUMS)
- (|parsePiles| (|reverse!| LOCS) (|reverse!| LINES)))))
+ (setq |$preparseLastLine| nil)
+ (RETURN (|pairList| (|reverse!| NUMS)
+ (|parsePiles| (|reverse!| LOCS) (|reverse!| LINES)))))
(GO READLOOP)))