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

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

Revision: 20
          http://golok.svn.sourceforge.net/golok/?rev=20&view=rev
Author:   sralmai
Date:     2010-03-23 15:20:01 +0000 (Tue, 23 Mar 2010)

Log Message:
-----------
[MINOR TWEAKS]: output files are now overwritten, and the Makefile includes topo-dataypes.scm

Modified Paths:
--------------
    trunk/Makefile
    trunk/model-builder.scm
    trunk/run-all.sh
    trunk/topo-datatypes.scm

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-03-14 02:54:53 UTC (rev 19)
+++ trunk/Makefile	2010-03-23 15:20:01 UTC (rev 20)
@@ -1,4 +1,4 @@
-golok: lookup-table.scm datatypes.scm model-builder.scm search.scm golok.scm find-k.scm parser.scm
+golok: lookup-table.scm datatypes.scm model-builder.scm search.scm golok.scm find-k.scm parser.scm topo-datatypes.scm
 	mzc --exe golok golok.scm
 
 render:

Modified: trunk/model-builder.scm
===================================================================
--- trunk/model-builder.scm	2010-03-14 02:54:53 UTC (rev 19)
+++ trunk/model-builder.scm	2010-03-23 15:20:01 UTC (rev 20)
@@ -428,8 +428,7 @@
            [mdl (model-mdl md)]
            [proc-mask-ids (map (lambda (x) (proc->proc-id x lookup-table)) process-mask)])
       (begin
-        (if (file-exists? filename) (raise-user-error "output file already exists:" filename) (void))
-        (current-output-port (open-output-file filename))
+        (current-output-port (open-output-file filename #:exists 'replace))
         (display-ln "/* model generated by model2dot */\n\ndigraph {\n\trankdir=LR\n\n")
         (for-each (lambda (x) (entry2dot x (vector-ref mdl x) lookup-table proc-mask-ids sb?))
                   (build-list (vector-length mdl) values))

Modified: trunk/run-all.sh
===================================================================
--- trunk/run-all.sh	2010-03-14 02:54:53 UTC (rev 19)
+++ trunk/run-all.sh	2010-03-23 15:20:01 UTC (rev 20)
@@ -26,11 +26,10 @@
   else
   ./golok -o output examples/$i.amf || fail
   fi
-  make clean
  
-##echo "Testing DFS"
- # ./golok -o output --dfs examples/$i.amf || fail
-#  make clean
+#echo "Testing DFS"
+# ./golok -o output --dfs examples/$i.amf || fail
+# make clean
 done
 
 make clean

Modified: trunk/topo-datatypes.scm
===================================================================
--- trunk/topo-datatypes.scm	2010-03-14 02:54:53 UTC (rev 19)
+++ trunk/topo-datatypes.scm	2010-03-23 15:20:01 UTC (rev 20)
@@ -87,7 +87,8 @@
                         (display-ln (car x) " " (cadr x))) counts)
             (display-ln "\nlinks:\n")
             (for-each (lambda (x)
-                        (display-ln (car x) " " (cadr x) " " (caddr x) " " (fourth x) " " (fifth x))) links)))))))
+                        (display-ln (car x) " " (cadr x) " " (caddr x) " " (fourth x) " " (fifth x))) links)))
+          'replace))))
 
 (define the-lexical-spec
   '((whitespace (whitespace) skip)


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