[Golok-commit] SF.net SVN: golok:[22] trunk

[<sr...@us...>]

Revision: 22
          http://golok.svn.sourceforge.net/golok/?rev=22&view=rev
Author:   sralmai
Date:     2010-03-25 15:03:43 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
[PARSER CHANGE]: Depreciated "->" for describing links, now "--" is used for referencing "lpeer" "rpeer" and "peer" directional links. (dme-mult works again...)

Modified Paths:
--------------
    trunk/examples/dme-mult.amf
    trunk/examples/dme.amf
    trunk/examples/dpp.amf
    trunk/examples/lr-dpp.amf
    trunk/examples/milners.amf
    trunk/parser.scm
    trunk/run-all.sh
    trunk/search.scm
    trunk/topo-datatypes.scm

Modified: trunk/examples/dme-mult.amf
===================================================================
--- trunk/examples/dme-mult.amf	2010-03-24 15:42:06 UTC (rev 21)
+++ trunk/examples/dme-mult.amf	2010-03-25 15:03:43 UTC (rev 22)
@@ -5,39 +5,39 @@
 # "normal" nodes and pass nodes (as in "Automating Cut-off..")
 #
 #
-process forward {
-IDLE: [ Idle, token] -> [ Idle, token2]
-SND: [Start, epsilon] -> [Idle, token2]
-}
-
 process critical {
 ENTER:	[ Idle,  token2 ] -> [ Cs , in ]
 LEAVE:	[ Cs , in ] -> [ Idle , token ]
 
 }
 
-# insert two new elements (a pass and a node) into the ring
+process forward {
+IDLE: [ Idle, token ] -> [ Idle, token2 ]
+SND: [ Start, epsilon ] -> [ Idle, token2 ]
+}
 
 topology {
   connectivity {
-    critical 0 -> forward 0
-    forward 0 -> critical 0
+    critical 0 -- forward 0
+    forward 0 -- critical 0
   }
   
+  # insert two new elements (a forward and a critical) into the ring
   additionrule plain-add {
     create: critical x
     create: forward y
   
-    require: forward a -> critical 0
+    require: forward a -- critical 0
 
-    remove: var a -> critical 0
+    remove: var a -- critical 0
   
-    add: var a -> var x
-    add: var x -> var y
-    add: var y -> critical 0
+    add: var a -- var x
+    add: var x -- var y
+    add: var y -- critical 0
   }
   
   msgs {
+    ( critical, token2, peer)
   	( critical, token2, lpeer)
   	( critical, in, self)
     ( forward, token, lpeer)

Modified: trunk/examples/dme.amf
===================================================================
--- trunk/examples/dme.amf	2010-03-24 15:42:06 UTC (rev 21)
+++ trunk/examples/dme.amf	2010-03-25 15:03:43 UTC (rev 22)
@@ -1,5 +1,5 @@
 #
-# gen-DME.amf 
+# dme.amf 
 #
 #
 process node {
@@ -15,15 +15,15 @@
 topology {
 
   connectivity {
-    node 0 -> node 0
+    node 0 -- node 0
   }
   
   additionrule plain-add {
-    require: node y -> node 0
+    require: node y -- node 0
     create: node x
-    remove: var y -> node 0
-    add: var y -> var x
-    add: var x -> node 0
+    remove: var y -- node 0
+    add: var y -- var x
+    add: var x -- node 0
   }
   
   msgs {

Modified: trunk/examples/dpp.amf
===================================================================
--- trunk/examples/dpp.amf	2010-03-24 15:42:06 UTC (rev 21)
+++ trunk/examples/dpp.amf	2010-03-25 15:03:43 UTC (rev 22)
@@ -25,15 +25,15 @@
 
 topology {
   connectivity {
-    diner 0 -> diner 0
+    diner 0 -- diner 0
   }
   
   additionrule add-one {
     create: diner x
-    require: diner y -> diner 0
-    remove: var y -> diner 0
-    add: var y -> var x
-    add: var x -> diner 0
+    require: diner y -- diner 0
+    remove: var y -- diner 0
+    add: var y -- var x
+    add: var x -- diner 0
   }
   
   msgs {

Modified: trunk/examples/lr-dpp.amf
===================================================================
--- trunk/examples/lr-dpp.amf	2010-03-24 15:42:06 UTC (rev 21)
+++ trunk/examples/lr-dpp.amf	2010-03-25 15:03:43 UTC (rev 22)
@@ -52,19 +52,19 @@
 
 topology {
   connectivity {
-    left-diner 0 -> right-diner 0
-    right-diner 0 -> left-diner 0
+    left-diner 0 -- right-diner 0
+    right-diner 0 -- left-diner 0
   }
   
   # add another left and right diner into the ring
   additionrule add-two {
         create: left-diner x
         create: right-diner y
-        require: right-diner z -> left-diner 0
-        remove: var z -> left-diner 0
-        add: var z -> var x
-        add: var x -> var y
-        add: var y -> left-diner 0
+        require: right-diner z -- left-diner 0
+        remove: var z -- left-diner 0
+        add: var z -- var x
+        add: var x -- var y
+        add: var y -- left-diner 0
   }
   
   # the general format is:

Modified: trunk/examples/milners.amf
===================================================================
--- trunk/examples/milners.amf	2010-03-24 15:42:06 UTC (rev 21)
+++ trunk/examples/milners.amf	2010-03-25 15:03:43 UTC (rev 22)
@@ -25,16 +25,16 @@
 
 topology {
   connectivity {
-    scheduler 0 -> scheduler 1
-    scheduler 1 -> scheduler 0
+    scheduler 0 -- scheduler 1
+    scheduler 1 -- scheduler 0
   }
   
   additionrule plain-add {
-    require: scheduler y -> scheduler 0
+    require: scheduler y -- scheduler 0
     create: scheduler x
-    remove: var y -> scheduler 0
-    add: var y -> var x
-    add: var x -> scheduler 0
+    remove: var y -- scheduler 0
+    add: var y -- var x
+    add: var x -- scheduler 0
   }
   
   msgs {

Modified: trunk/parser.scm
===================================================================
--- trunk/parser.scm	2010-03-24 15:42:06 UTC (rev 21)
+++ trunk/parser.scm	2010-03-25 15:03:43 UTC (rev 22)
@@ -193,8 +193,9 @@
   (define-datatype
     p_transition
     p_transition?
-    (a-p_transition (msg symbol?)
+    (a-p_transition 
                (process-type symbol?)
+               (msg symbol?)
                (from-what-link-type symbol?)))
   
     (define-datatype

Modified: trunk/run-all.sh
===================================================================
--- trunk/run-all.sh	2010-03-24 15:42:06 UTC (rev 21)
+++ trunk/run-all.sh	2010-03-25 15:03:43 UTC (rev 22)
@@ -2,7 +2,7 @@
 
 # this *should* be something nice to ensure stuff works
 
-TESTS="dme SpinLock SpinLock-mult dpp lr-dpp" 
+TESTS="dme dme-mult SpinLock SpinLock-mult dpp lr-dpp" 
 
 make clean
 make

Modified: trunk/search.scm
===================================================================
--- trunk/search.scm	2010-03-24 15:42:06 UTC (rev 21)
+++ trunk/search.scm	2010-03-25 15:03:43 UTC (rev 22)
@@ -337,7 +337,7 @@
     (let ([fr (hash-map fringe (lambda (x y) x))])
       (cond
         ; if fringe empty, return fail
-        ((= 0 (length fr)) (begin (display-ln "AM I ever here?\n")#f))
+        ((= 0 (length fr)) #f)
 
         ; return fringe
         ((= 0 depth) fringe)  ;(begin (display-ln "The state space is " (hash-count state-space)"\n")fringe))

Modified: trunk/topo-datatypes.scm
===================================================================
--- trunk/topo-datatypes.scm	2010-03-24 15:42:06 UTC (rev 21)
+++ trunk/topo-datatypes.scm	2010-03-25 15:03:43 UTC (rev 22)
@@ -168,6 +168,12 @@
           (env x)))))
 
 ; return a topo-vector for model-builder
+;
+; output is a vector of size # processes in topology
+;
+; each entry is a list of duples
+; (msg index-of-process-this-message-can-be-sent-to)
+;
 (define topology-instantiate
   (lambda (topo prot-msgs)
     (let* ([ot (make-offset-table (topology-counts topo))]
@@ -179,7 +185,7 @@
                                               (vector-ref model x)
                                               prot-msgs vect (ot_ri2pt x ot)))
                             (build-list size values))])
-      vect)))
+          vect)))
 
 (define make-msg-list!
   (lambda (x type-list prot-msgs vect pt)
@@ -224,8 +230,11 @@
                            (cons-to-vec vect r2 (list 'child  p1 r1))))
           ((eqv? lt '--) (begin
                            (cons-to-vec vect r1 (list 'peer  p2 r2))
-                           (cons-to-vec vect r2 (list 'peer p1 r1))))
+                           (cons-to-vec vect r2 (list 'peer p1 r1)))
+                           (cons-to-vec vect r1 (list 'lpeer p2 r2))
+                           (cons-to-vec vect r2 (list 'rpeer p1 r1)))
           ((eqv? lt '->) (begin
+                           (display-ln "WARNING: '->' is depreciated! Use '--' instead")
                            (cons-to-vec vect r1 (list 'lpeer p2 r2))
                            (cons-to-vec vect r2 (list 'rpeer p1 r1))))
           (#t (raise-user-error (string-append "Parse error: " 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.