picolisp

commit 71c99f94091acc334a4daf5f8f8193837f54f3ac
parent 95590138b73bb45e5f7ab0c37dc73c9abea64edd
Author: Alexander Burger <abu@software-lab.de>
Date:   Mon, 30 May 2011 11:22:35 +0200

UB-Tree corrections
Diffstat:
M
lib/db.l
 | 
9
++++-----
M
lib/pilog.l
 | 
11
+++++------

2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/lib/db.l b/lib/db.l
@@ -1,4 +1,4 @@
-# 20may11abu
+# 30may11abu
 # (c) Software Lab. Alexander Burger
 
 # *Dbs *Jnl *Blob upd
@@ -697,10 +697,9 @@
       (while (find gt0 Lst)
          (map
             '((L)
-               (let N (min 1 (max 0 (car L)))
-                  (and (bit? 1 N) (setq Res (| Res P)))
-                  (setq P (>> -1 P))
-                  (set L (>> 1 N)) ) )
+               (and (bit? 1 (car L)) (setq Res (| Res P)))
+               (setq P (>> -1 P))
+               (set L (>> 1 (car L))) )
             Lst ) )
       (cons Res X) ) )
 
diff --git a/lib/pilog.l b/lib/pilog.l
@@ -1,4 +1,4 @@
-# 20may11abu
+# 30may11abu
 # (c) Software Lab. Alexander Burger
 
 # *Rule
@@ -163,14 +163,13 @@
                      ((atom (car Val))
                         (and (; Rel ub) (setq Val (ubZval Val)))
                         (init Tree Val (append Val T)) )
-                     ((atom (cdar Val))
+                     ((; Rel ub)
                         (init Tree
                            (ubZval (mapcar car Val))
                            (ubZval (mapcar cdr Val) T) ) )
-                     (T
-                        (if (>= (cdr Val) (car Val))
-                           (init Tree (car Val) (append (cdr Val) T))
-                           (init Tree (append (car Val) T) (cdr Val)) ) ) ) )
+                     ((>= (cdr Val) (car Val))
+                        (init Tree (car Val) (append (cdr Val) T)) )
+                     (T (init Tree (append (car Val) T) (cdr Val))) ) )
                ((isa '+Key Rel)
                   (init Tree (car Val) (cdr Val)) )
                ((>= (cdr Val) (car Val))