[Pntool-developers] SF.net SVN: pntool:[212] codegen/src

[<ee...@us...>]

Revision: 212
          http://pntool.svn.sourceforge.net/pntool/?rev=212&view=rev
Author:   eegs002
Date:     2009-08-04 20:31:44 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Fixed includes in process array to be of type char* instead of text

Modified Paths:
--------------
    codegen/src/main.c
    codegen/src/plantCompiler.c
    codegen/src/plantCompiler.h
    codegen/src/text.c
    codegen/src/text.h

Modified: codegen/src/main.c
===================================================================
--- codegen/src/main.c	2009-08-03 20:00:13 UTC (rev 211)
+++ codegen/src/main.c	2009-08-04 20:31:44 UTC (rev 212)
@@ -19,13 +19,15 @@
 	int labelsp1[] = {0,1,2};
 	pns plant1 = createpn("pnum tnum D m0 label",3,3,Dp1,mp1,labelsp1);
 
-	text includesP1 = createText("includes.txt",11,28);
+	//text includesP1 = createText("includes.txt",11,28);
+	char includesP1[50];
+	sprintf(includesP1,"//Plant 1 includes\n");
 	
 	updatepn(&plant1, "segment", 0 ,"printf(\"This is PLACE 1!\");");
 	updatepn(&plant1, "segment", 1 ,"printf(\"This is PLACE 2!\");");
 	updatepn(&plant1, "segment", 2 ,"printf(\"This is PLACE 3!\");");
 	
-	process proc1 = createProc("plant-1.c",&plant1,0,1, "BUILD COMMAND", &includesP1);
+	process proc1 = createProc("plant-1.c",&plant1,0,1, "BUILD COMMAND", includesP1);
 	
 	//PLANT 2
 	int Dp2[] = {-1,1,
@@ -34,12 +36,15 @@
 	int labelsp2[] = {0,1};
 	pns plant2 = createpn("pnum tnum D m0 label",2,2,Dp2,mp2,labelsp2);
 	
-	text includesP2 = createText("includes.txt",46,63);
+	//text includesP2 = createText("includes.txt",46,63);
+	char includesP2[50];
+	sprintf(includesP2,"//Plant 2 includes\n");
 	
+	
 	updatepn(&plant2, "segment", 0 ,"printf(\"PLANT 2: This is PLACE 1!\");");
 	updatepn(&plant2, "segment", 1 ,"printf(\"PLANT 2: This is PLACE 2!\");");
 	
-	process proc2 = createProc("plant-2.c",&plant2,0,1, "BUILD COMMAND", &includesP2);
+	process proc2 = createProc("plant-2.c",&plant2,0,1, "BUILD COMMAND", includesP2);
 	
 	//SUPERVISOR
 	int Ds[] = {-1,1};
@@ -61,8 +66,8 @@
     printf("\nCode generation complete\n");
     
     
-    fclose(includesP1.input);
-    fclose(includesP2.input);
+    //fclose(includesP1.input);
+    //fclose(includesP2.input);
 	
     return 0;
   

Modified: codegen/src/plantCompiler.c
===================================================================
--- codegen/src/plantCompiler.c	2009-08-03 20:00:13 UTC (rev 211)
+++ codegen/src/plantCompiler.c	2009-08-04 20:31:44 UTC (rev 212)
@@ -60,7 +60,7 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-void compileSinglePlant(pns *pnsPlant, FILE* plantFile, text *includes)
+void compileSinglePlant(pns *pnsPlant, FILE* plantFile, char *includes)
 {
      createIncludes(plantFile, includes);
      
@@ -140,9 +140,11 @@
 
 
 
-void createIncludes(FILE* plantFile, text *includes)
+void createIncludes(FILE* plantFile, char *includes)
 {
-     retrieveIncludes(plantFile, includes);
+     //retrieveIncludes(plantFile, includes);
+     fprintf(plantFile,"\n//Includes from specs\n");
+     fprintf(plantFile,includes);
      fprintf(plantFile,"#include \"pns.h\"\n");
      fprintf(plantFile,"#include \"matrix.h\"\n");
      fprintf(plantFile,"#include <signal.h>\n");

Modified: codegen/src/plantCompiler.h
===================================================================
--- codegen/src/plantCompiler.h	2009-08-03 20:00:13 UTC (rev 211)
+++ codegen/src/plantCompiler.h	2009-08-04 20:31:44 UTC (rev 212)
@@ -34,7 +34,7 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
-void compileSinglePlant(pns *pnsPlant, FILE* plantFile, text *includes);
+void compileSinglePlant(pns *pnsPlant, FILE* plantFile, char *includes);
 
 
 
@@ -72,7 +72,7 @@
 
 
 //Generate the include statements
-void createIncludes(FILE* plantFile, text *includes);
+void createIncludes(FILE* plantFile, char *includes);
 
 //Retrieve the includes statements from the file
 void retrieveIncludes(FILE* plantFile, text *includes);

Modified: codegen/src/text.c
===================================================================
--- codegen/src/text.c	2009-08-03 20:00:13 UTC (rev 211)
+++ codegen/src/text.c	2009-08-04 20:31:44 UTC (rev 212)
@@ -33,7 +33,7 @@
 
 
 process createProc(char *pName, pns *pnPtr,int pType,\
-                   int pStart, char *pBuild, text *pInclude)
+                   int pStart, char *pBuild, char *pInclude)
 {
    process proc;
    

Modified: codegen/src/text.h
===================================================================
--- codegen/src/text.h	2009-08-03 20:00:13 UTC (rev 211)
+++ codegen/src/text.h	2009-08-04 20:31:44 UTC (rev 212)
@@ -20,4 +20,4 @@
 
 //This can be used to create process structure defined in pns.h
 process createProc(char *pName, pns *pnPtr,int pType,\
-                   int pStart, char *pBuild, text *pInclude);
+                   int pStart, char *pBuild, char *pInclude);


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