[Swift-commit] r7614 - trunk/src/org/griphyn/vdl/engine

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-02-22 18:47:07 -0600 (Sat, 22 Feb 2014)
New Revision: 7614

Modified:
   trunk/src/org/griphyn/vdl/engine/Karajan.java
Log:
fixed imports (bug 1183)

Modified: trunk/src/org/griphyn/vdl/engine/Karajan.java
===================================================================
--- trunk/src/org/griphyn/vdl/engine/Karajan.java	2014-02-19 21:10:45 UTC (rev 7613)
+++ trunk/src/org/griphyn/vdl/engine/Karajan.java	2014-02-23 00:47:07 UTC (rev 7614)
@@ -203,7 +203,7 @@
 					//String xmlfilename = "./"+moduleToImport+".xml";
 				    String lib_path = System.getenv("SWIFT_LIB");
 					String swiftfilename = moduleToImport+".swift";
-					String xmlfilename = moduleToImport+".xml";
+					String xmlfilename = moduleToImport+".swiftx";
 
 					File local = new File(swiftfilename);
 					if( !( lib_path == null || local.exists() ) )
@@ -227,7 +227,7 @@
 					try {
         	    		VDLt2VDLx.compile(new FileInputStream(swiftfilename),new PrintStream(new FileOutputStream(xmlfilename)));
 						logger.debug("Compiled. Now reading in compiled XML for "+moduleToImport);
-						Program importedProgram = parseProgramXML(xmlfilename).getProgram();
+						Program importedProgram = parseProgramXML(new File(xmlfilename)).getProgram();
 						logger.debug("Read in compiled XML for "+moduleToImport);
 						importList.addFirst(importedProgram);
 						importedNames.add(moduleToImport);