[Pntool-developers] SF.net SVN: pntool:[114]

[<com...@us...>]

Revision: 114
          http://pntool.svn.sourceforge.net/pntool/?rev=114&view=rev
Author:   compaqdrew
Date:     2009-06-28 06:07:34 +0000 (Sun, 28 Jun 2009)

Log Message:
-----------
Better codegen main_function.c integration

Modified Paths:
--------------
    Makefile
    codegen/src/codegen.c
    codegen/src/codegen.h
    pnheaders/main_function.c

Modified: Makefile
===================================================================
--- Makefile	2009-06-28 06:07:26 UTC (rev 113)
+++ Makefile	2009-06-28 06:07:34 UTC (rev 114)
@@ -36,8 +36,8 @@
 #	cd $(SPNBOX); make
 #	cd $(TRANSLATOR); make
 
-main_function.o: $(PNHEADERS)/main_function.c $(PNHEADERS)/pns.h $(SPNBOX)/spnbox.h
-	$(COMPILER) -c $(PNHEADERS)/main_function.c -Ispnbox
+main_function.o: $(PNHEADERS)/main_function.c $(PNHEADERS)/pns.h $(SPNBOX)/spnbox.h $(CODEGEN)/src/codegen.h
+	$(COMPILER) -c $(PNHEADERS)/main_function.c -Ispnbox -Icodegen/src
 
 clean:
 	rm -f main_function.o

Modified: codegen/src/codegen.c
===================================================================
--- codegen/src/codegen.c	2009-06-28 06:07:26 UTC (rev 113)
+++ codegen/src/codegen.c	2009-06-28 06:07:34 UTC (rev 114)
@@ -16,7 +16,7 @@
 #include "petriNetSerializer.h"
 
 
-int GenerateProgam(pns *supervisor, char* sname, process** prarray, int num)
+int GenerateProgram(pns *supervisor, char* sname, process** prarray, int num)
 {
     //Temporary solution to make current code work with new version
     pns pnarray[num];

Modified: codegen/src/codegen.h
===================================================================
--- codegen/src/codegen.h	2009-06-28 06:07:26 UTC (rev 113)
+++ codegen/src/codegen.h	2009-06-28 06:07:34 UTC (rev 114)
@@ -9,7 +9,7 @@
  */
 #include "../../pnheaders/pns.h"
 
-int GenerateProgam(pns *supervisor, char* sname, process** prarray, int num); 
+int GenerateProgram(pns *supervisor, char* sname, process** prarray, int num); 
 /* Generates the supervisor and the process source files. It also generates
    the makefile that should be used to build them. Note that sname is the 
    name of the supervisor program. Further, num is the number of processes. */

Modified: pnheaders/main_function.c
===================================================================
--- pnheaders/main_function.c	2009-06-28 06:07:26 UTC (rev 113)
+++ pnheaders/main_function.c	2009-06-28 06:07:34 UTC (rev 114)
@@ -1,5 +1,6 @@
 #include "pns.h"
 #include "spnbox.h"
+#include "codegen.h" //this is the real GenerateProgram call (as opposed to GenerateProgam)
 
 int verb;
 
@@ -134,7 +135,7 @@
 
   // Generate code
 
-  GenerateProgam(&pnsv, sp->name, sp->process_array, sp->process_num); 
+  GenerateProgram(&pnsv, sp->name, sp->process_array, sp->process_num); 
 
   dealloc(&pnsv);
 


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