Changeset 11638 in project for release/3/oru/nmodl.scm

Timestamp:

08/14/08 06:20:31 (13 years ago)

Author:

Ivan Raikov

Message:

Some bugs fixed in processing defun declarations.

File:

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

release/3/oru/nmodl.scm

@@ -516 +516 @@
                                     (if perm  (cons `(,perm ,i ,e ,erev) ax) ax)))
                                 (list) ionchs)
-                           (lambda (x y) (eq? (car x) (car y))))
-                          ))
+                           (lambda (x y) (eq? (car x) (car y)))))
+               (acc-ions (delete-duplicates
+                           (fold (lambda (n ax) 
+                                  (let* ((subcomps ((dis 'component-subcomps) sys n))
+                                         (acc   (lookup-def 'accumulating-substance subcomps))
+                                         (i     (and acc (nmodl-name (s+ 'i acc))))
+                                         (in    (and acc (nmodl-name (s+ acc 'i))))
+                                         (out   (and acc (nmodl-name (s+ acc 'o)))))
+                                    (if acc  (cons `(,acc ,i ,in ,out) ax) ax)))
+                                (list) ionchs)
+                           (lambda (x y) (eq? (car x) (car y)))))
+               )
                
            (with-output-to-file sfname
@@ -529 +539 @@
                                (USEION ,(first x) READ ,(third x) WRITE ,(second x))))
                          perm-ions)
+               (for-each (lambda (x)
+                           (pp indent+ (RANGE ,(second x))
+                               (USEION ,(first x) READ ,(third x) ", " ,(fourth x) WRITE ,(second x))))
+                         acc-ions)
+               
                (pp indent "}")
 
@@ -562 +577 @@
                          imports)
                (for-each (lambda (x) (pp indent+ ,(second x) ,(third x))) perm-ions)
+               (for-each (lambda (x) (pp indent+ ,(second x) ,(third x) ,(fourth x))) acc-ions)
                (pp indent "}")
 
@@ -592 +608 @@
                               (lambda (n) 
                                 (let* ((subcomps ((dis 'component-subcomps) sys n))
+                                       (acc   (lookup-def 'accumulating-substance subcomps))
                                        (perm  (lookup-def 'permeating-substance subcomps))
                                        (pore  (lookup-def 'pore subcomps))
                                        (gate  (lookup-def 'gate subcomps))
                                        (sts   (and gate ((dis 'component-exports) sys gate))))
-                                  (and perm pore gate
-                                       (let* ((i     (nmodl-name (s+ 'i perm)))
-                                              (e     (nmodl-name (s+ 'e perm)))
-                                              (gmax  (car ((dis 'component-exports) sys pore)))
-                                              (pwrs  (map (lambda (n) (state-power sys n)) sts))
-                                              (gion  `(* ,gmax . ,(map (lambda (st pwr) `(pow ,st ,pwr)) sts pwrs))))
-                                         (list i e gion)))))
+                                  (cond ((and perm pore gate)
+                                         (let* ((i     (nmodl-name (s+ 'i perm)))
+                                                (e     (nmodl-name (s+ 'e perm)))
+                                                (gmax  (car ((dis 'component-exports) sys pore)))
+                                                (pwrs  (map (lambda (n) (state-power sys n)) sts))
+                                                (gion  `(* ,gmax . ,(map (lambda (st pwr) `(pow ,st ,pwr)) sts pwrs))))
+                                           (list i e gion)))
+                                         ((and acc pore gate)
+                                          (let* ((i     (nmodl-name (s+ 'i acc)))
+                                                 (gmax  (car ((dis 'component-exports) sys pore)))
+                                                 (pwrs  (map (lambda (n) (state-power sys n)) sts))
+                                                 (gion  `(* ,gmax . ,(map (lambda (st pwr) `(pow ,st ,pwr)) sts pwrs))))
+                                           (list i #f gion)))
+                                         (else (oru:error 'oru:nmodl-translator ": invalid ion channel definition " n))
+                                        )))
                                  ionchs))
                       (i-bkts (bucket-partition (lambda (x y) (eq? (car x) (car y))) i-eqs))
@@ -608 +633 @@
                                       (match b 
                                              ((and ps ((i e gion) . rst))  
-                                              (let* ((sum   `(* ,(sum (map third ps)) (- v ,e)))
+                                              (let* ((sum   (if e `(* ,(sum (map third ps)) (- v ,e))
+                                                                (sum (map third ps))))
                                                      (sum0  (rhsexpr sum))
                                                      (sum1  (canonicalize-expr/NMODL sum0)))
@@ -614 +640 @@
 
                                              ((i e gion)
-                                              (let* ((expr0  (rhsexpr `(* ,gion (- v ,e))))
+                                              (let* ((expr0  (rhsexpr (if e `(* ,gion (- v ,e)) gion)))
                                                      (expr1  (canonicalize-expr/NMODL expr0)))
                                                 (cons (list i expr1) ax)))