Changeset 30996 in project


Ignore:
Timestamp:
06/10/14 02:10:44 (6 years ago)
Author:
Ivan Raikov
Message:

signal-diagram: refactoring transitions

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/4/signal-diagram/trunk/signal-diagram.scm

    r30993 r30996  
    200200  (REDUCE       (f function?) (name symbol?) (init symbol?))
    201201  (RTRANSITION  (f diagram?) (g diagram?)
    202                 (ef symbol?) (eg symbol?)
     202                (ef symbol?) (efd diagram?) (eg symbol?) (egd diagram?)
    203203                (s  symbol?)
    204204                )
     
    877877;; Recurring state transitions
    878878
    879 (define (sf-rtransition0 f fk e ek state)
     879(define (sf-rtransition f fk e ef ek ekf state)
    880880
    881881  (let* ((fe      (sfarrow-dfe f))
     
    10931093
    10941094     ;; signature
    1095      `(RTRANSITION ,(sfarrow-sig f) ,(sfarrow-sig fk) ,e ,ek ,state)
     1095     `(RTRANSITION ,(sfarrow-sig f) ,(sfarrow-sig fk) ,e ,(sfarrow-sig ef) ,ek ,(sfarrow-sig ekf) ,state)
    10961096
    10971097     ;; children
    1098      `(RTRANSITION ,f ,fk)
     1098     `(RTRANSITION ,f ,fk ,ef ,ekf)
    10991099
    11001100     ;; relations
     
    11031103     ))
    11041104)
    1105 
    1106 (define (sf-rtransition f fk e ek s)
    1107   (sf-rtransition0 f fk e ek s))
    11081105
    11091106
     
    14711468           (ACTUATE (s f)              (sf-actuate s (recur f ev)))
    14721469           (REDUCE (f n i)             (sf-reduce f n i))
    1473            (RTRANSITION (f g ef eg s)  (sf-rtransition (recur f ev) (recur g ev) ef eg s))
     1470           (RTRANSITION (f g ef efd eg egd s) 
     1471                                       (sf-rtransition (recur f ev) (recur g ev) ef (recur efd) eg (recur egd) s))
    14741472           (TRANSIENT (f g e ef)       (let ((ee (recur ef #f)))
    14751473                                         (sf-transient (recur f (list e ee)) (recur g ev) e ee)))
Note: See TracChangeset for help on using the changeset viewer.