Changeset 11639 in project

Timestamp:

08/14/08 07:52:09 (12 years ago)

Author:

Ivan Raikov

Message:

Bug fixes in let-enum.

File:

• release/3/oru/nmodl.scm (modified) (5 diffs)

release/3/oru/nmodl.scm

@@ -44 +44 @@
             (match kv ((k v) v) (else (cdr kv)))))))
 
-(define nl "\n")
-
 (define (nmodl-name s)
   (let ((cs (string->list (->string s))))
@@ -73 +71 @@
 (define (enumbnds expr ax)
   (match expr 
-         (('if . es)  (fold enumbnds ax es))
-         (('let bnds body)  (fold enumbnds (append (map car bnds) ax) body))
-         ((s . es)    (if (symbol? s)  (fold enumbnds ax es) ax))
+         (('if . es)        (fold enumbnds ax es))
+         (('let bnds body)  (enumbnds body (append  (map car bnds) ax)))
+         ((s . es)          (if (symbol? s)  (fold enumbnds ax es) ax))
          (else ax)))
 
@@ -164 +162 @@
           `(if ,(k c subst) ,(k t subst) ,(k e subst)))
          (('let bs e)
-          (k `(let ,(map (lambda (b) `(,(car b) ,(k (cadr b) subst))) bs) ,e) subst))
+          (k `(let ,(map (lambda (b) `(,(car b) ,(k (cadr b) subst))) bs) ,(k e subst)) subst))
          ((f . es)
           (cons (k f subst) (map (lambda (e) (k e subst)) es)))
+         ((? symbol? )  (lookup-def t subst t))
          ((? atom? ) t)))
 
@@ -177 +176 @@
   (match expr 
          (('if c t e) 
-          (let ((x (gensym "if")))
-            `(let ((,x (if ,(if-convert c) ,(if-convert t) ,(if-convert e))))  ,x)))
+          (let ((r (gensym "if")))
+            `(let ((,r (if ,(if-convert c) ,(if-convert t) ,(if-convert e))))  
+               ,r)))
          (('let bs e)
           `(let ,(map (lambda (b) `(,(car b) ,(if-convert (cadr b)))) bs) ,(if-convert e)))
@@ -190 +190 @@
          (('let ((x ('if c t e))) y)
           (let ((ax (fold let-enum ax (list c t e))))
-            (if (eq? x y)  (cons (list x `(if ,c ,t ,e)) ax) ax)))
-
-         (('let bnds body)  (let-enum body (append bnds ax)))
+            (if (eq? x y)  (append ax (list (list x `(if ,c ,t ,e)))) ax)))
+
+         (('let bnds body)  (let-enum body (append ax bnds)))
 
          (('if c t e)  (fold let-enum ax (list c t e)))