commit 53af6e7e5107497018e37ff5a10948c2c10d2d62
parent 81082dfa4da2063dd086e9289ecc6ab6f5b178d7
Author: Commit-Bot <unknown>
Date: Thu, 15 Jul 2010 08:48:41 +0000
Automatic commit from picoLisp.tgz, From: Thu, 15 Jul 2010 08:48:41 GMT
Diffstat:
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/doc/tut.html b/doc/tut.html
@@ -352,8 +352,7 @@ and indented way.
: (pp 'pretty)
(de pretty (X N . @)
(setq N (abs (space (or N 0))))
- (while (args)
- (printsp (next)) )
+ (while (args) (printsp (next)))
(if (or (atom X) (>= 12 (size X)))
(print X)
(while (== 'quote (car X))
@@ -361,19 +360,22 @@ and indented way.
(pop 'X) )
(let Z X
(prin "(")
- (when (memq (print (pop 'X)) "*PP")
+ (when (memq (print (pop 'X)) *PP)
(cond
- ((memq (car Z) "*PP1")
+ ((memq (car Z) *PP1)
(if (and (pair (car X)) (pair (cdar X)))
(when (>= 12 (size (car X)))
(space)
(print (pop 'X)) )
(space)
(print (pop 'X))
- (when (or (atom (car X)) (>= 12 (size (car X))))
+ (when
+ (or
+ (atom (car X))
+ (>= 12 (size (car X))) )
(space)
(print (pop 'X)) ) ) )
- ((memq (car Z) "*PP2")
+ ((memq (car Z) *PP2)
(inc 'N 3)
(loop
(prinl)
diff --git a/lib.l b/lib.l
@@ -1,4 +1,4 @@
-# 09jul10abu
+# 15jul10abu
# (c) Software Lab. Alexander Burger
(de task (Key . Prg)
@@ -252,12 +252,12 @@
(apply meta X This) )
### Pretty Printing ###
-(de "*PP"
+(de *PP
T NIL if if2 ifn when unless while until do case state for
with catch finally ! setq default push job use let let?
prog1 later recur redef =: in out ctl tab new )
-(de "*PP1" if2 let let? for redef)
-(de "*PP2" setq default)
+(de *PP1 if2 let let? for redef)
+(de *PP2 setq default)
(de pretty (X N . @)
(setq N (abs (space (or N 0))))
@@ -270,9 +270,9 @@
(pop 'X) )
(let Z X
(prin "(")
- (when (memq (print (pop 'X)) "*PP")
+ (when (memq (print (pop 'X)) *PP)
(cond
- ((memq (car Z) "*PP1")
+ ((memq (car Z) *PP1)
(if (and (pair (car X)) (pair (cdar X)))
(when (>= 12 (size (car X)))
(space)
@@ -282,7 +282,7 @@
(when (or (atom (car X)) (>= 12 (size (car X))))
(space)
(print (pop 'X)) ) ) )
- ((memq (car Z) "*PP2")
+ ((memq (car Z) *PP2)
(inc 'N 3)
(loop
(prinl)