adapted ROOT.ML files and .cm files

git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@4214 3260e6d1-4efc-4170-b0a7-36055960796d

src/ROOT.ML

@@ -100,3 +100,8 @@ use "secure_uml.sml";
 use "rep_secure.sig";
 use "rep_secure.sml";
 
+(* ******************************************************** *)
+(* codegen-module, developed by Raphael Eidenbenz           *)
+OS.FileSys.chDir "codegen"; 
+use "ROOT.ML"; 
+OS.FileSys.chDir "..";

src/codegen/ROOT.ML

@@ -21,14 +21,6 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                  
  ******************************************************************************)
 
-(*
-OS.FileSys.chDir "../../../src";
-*)
-
-OS.FileSys.chDir "../lib/su4sml/src"; 
-use "ROOT.ML";
-OS.FileSys.chDir "../../../src";
-
 OS.FileSys.chDir "compiler";
 
 use "compiler_ext.sig";

src/codegen/codegen.cm

@@ -5,9 +5,8 @@ Group is
   $/smlnj-lib.cm
 #else
 #endif
-     ../lib/su4sml/src/su4sml.cm
      compiler/compiler_ext.sig
-     compiler/mlton.sml	
+     compiler/smlnj.sml	
      gcg_library.sml
      gcg_helper.sml
      tpl_parser.sig

src/codegen/gcg_library.sml

@@ -21,6 +21,8 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                  
  ******************************************************************************)
 
+structure GCG_Library = struct
+(* is this used anywhere? *)
 exception GCG_Error
 
 fun gcg_error s = (print ("Error:"^s^"\n"); raise GCG_Error);
@@ -42,4 +44,5 @@ end
 
 val curry = fn f => fn x => fn y => f (x, y)
 val uncurry = fn f => fn (x, y) => f x y
-			     
+			     
+end

src/su4sml.cm

@@ -1,7 +1,7 @@
 Group is
 #if(defined(SMLNJ_VERSION))
   $/basis.cm 
-  $smlnj/compiler/compiler.cm
+  $smlnj/compiler/current.cm
   $/smlnj-lib.cm
 #else
 #endif
@@ -34,3 +34,19 @@ Group is
     ocl2string.sml
     xml2xmi.sml 
     xmi2rep.sml  
+    codegen/compiler/compiler_ext.sig
+    codegen/compiler/smlnj.sml	
+    codegen/gcg_library.sml
+    codegen/gcg_helper.sml
+    codegen/tpl_parser.sig
+    codegen/tpl_parser.sml
+    codegen/cartridge.sig
+    codegen/base_cartridge.sig
+    codegen/base_cartridge.sml
+    codegen/c#_cartridge.sml
+    codegen/c#_net1_cartridge.sml
+    codegen/secureuml_cartridge.sig
+    codegen/secureuml_cartridge.sml
+    codegen/gcg_core.sig
+    codegen/gcg_core.sml
+    codegen/codegen.sml