Changeset 2654
- Timestamp:
- Nov 18, 2012, 8:33:13 PM (6 years ago)
- Location:
- proto/pablo
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
proto/pablo/.classpath
r2415 r2654 3 3 <classpathentry kind="src" path="src"/> 4 4 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> 5 <classpathentry kind="lib" path="/home/ken/workspace/pablo/ext/lib/commons-cli-1.2.jar"/> 5 6 <classpathentry kind="output" path="bin"/> 6 7 </classpath> -
proto/pablo/runConfigurations/pabloCompiler.launch
r2632 r2654 9 9 </listAttribute> 10 10 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="compiler.PabloCompiler"/> 11 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=" ${workspace_loc}/pablo/input/test/pablo/py2pablo/parabix2_pablo.pablo.exclude"/>11 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--input ${workspace_loc}/pablo/input/test/pablo/py2pablo/parabix2_pablo.pablo.exclude -a"/> 12 12 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="pablo"/> 13 13 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/> -
proto/pablo/src/compiler/Config.java
r2652 r2654 20 20 OptionBuilder.withDescription("Pablo help."); 21 21 option = OptionBuilder.create("h"); 22 23 22 options.addOption(option); 24 23 … … 26 25 OptionBuilder.hasArg(true); 27 26 OptionBuilder.isRequired(true); 28 OptionBuilder.withDescription("Pablo source file."); 27 OptionBuilder.withLongOpt("input"); 28 OptionBuilder.withDescription("Pablo input file."); 29 29 option = OptionBuilder.create("i"); 30 31 30 options.addOption(option); 32 31 32 // template file 33 OptionBuilder.hasArg(true); 34 OptionBuilder.isRequired(false); 35 OptionBuilder.withLongOpt("template"); 36 OptionBuilder.withDescription("Pablo template file."); 37 option = OptionBuilder.create("t"); 38 options.addOption(option); 39 33 40 // output directory 34 41 OptionBuilder.hasArg(true); 35 OptionBuilder.isRequired(true); 36 OptionBuilder.withDescription("Pablo outpur directory."); 42 OptionBuilder.isRequired(false); 43 OptionBuilder.withLongOpt("output"); 44 OptionBuilder.withDescription("Pablo output name."); 37 45 option = OptionBuilder.create("o"); 38 39 46 options.addOption(option); 47 48 // error routine 49 OptionBuilder.hasArg(true); 50 OptionBuilder.isRequired(false); 51 OptionBuilder.withLongOpt("error"); 52 OptionBuilder.withDescription("Name/qualified name for error routine."); 53 option = OptionBuilder.create("e"); 54 options.addOption(option); 55 56 // SIMD register dump statements 57 OptionBuilder.hasArg(false); 58 OptionBuilder.isRequired(false); 59 //OptionBuilder.withLongOpt("add"); 60 OptionBuilder.withDescription("Add SIMD register dump statements."); 61 option = OptionBuilder.create("a"); 62 options.addOption(option); 63 64 // TODO - Add options as needed. 40 65 41 66 return options; -
proto/pablo/src/compiler/PabloCompiler.java
r2652 r2654 19 19 import org.apache.commons.cli.CommandLineParser; 20 20 import org.apache.commons.cli.HelpFormatter; 21 import org.apache.commons.cli.Option; 21 22 import org.apache.commons.cli.Options; 22 23 import org.apache.commons.cli.PosixParser; … … 27 28 public static final String applicationName = "PabloCompiler"; 28 29 public static final int EXIT_CODE_FOR_ERROR = 1; 29 protected static String outputDirectory = "output/";30 protected static String inputFilename = null;31 30 31 // Options 32 private static String inputFilename; 33 private static String templateFilename; 34 private static String outputFilename; 35 private static String errorRoutine; 36 37 private static boolean addDumpStatements = false; 38 32 39 public static void main(String[] args) throws FileNotFoundException { 33 40 … … 38 45 CommandLine cmd = parser.parse(options, args); 39 46 inputFilename = cmd.getOptionValue("i"); 40 41 if(cmd.hasOption("o")) { 42 outputDirectory = cmd.getOptionValue("o"); 43 } 47 templateFilename = cmd.getOptionValue("t", "code.c"); 48 outputFilename = cmd.getOptionValue("o", "template.c"); 49 errorRoutine = cmd.getOptionValue("e", "assert_0_error"); 50 51 if(cmd.hasOption("a")) { 52 addDumpStatements = true; 53 } 44 54 45 55 } catch (Exception e) { … … 82 92 augmentedAssignment.transform(); 83 93 84 DumpAssignmentStatementsTransformer dumpAssignmentStatementsTransformer = new DumpAssignmentStatementsTransformer(entry.getValue()); 85 dumpAssignmentStatementsTransformer.transform(); 86 94 if(PabloCompiler.addDumpStatements) { 95 DumpAssignmentStatementsTransformer dumpAssignmentStatementsTransformer = new DumpAssignmentStatementsTransformer(entry.getValue()); 96 dumpAssignmentStatementsTransformer.transform(); 97 } 98 87 99 CarryQIntroTransformer carryQIntro = new CarryQIntroTransformer(entry.getValue()); 88 100 carryQIntro.transform(true, false);
Note: See TracChangeset
for help on using the changeset viewer.