Commit 524fe4bd authored by Jonathan Shahen's avatar Jonathan Shahen

important bug fixes for Mohawk T parser and converting to TRole and TRule

parent 2a599ab7
......@@ -80,5 +80,10 @@ public class ConverterCUI {
System.out.println(OptionString.TO_ASAPTIME_NSA.c() + OptionString.SPECFILE.c("data/reduction/")
+ OptionString.LOGLEVEL.c("debug") + OptionString.BULK.c() + OptionString.SPECEXT.c(fileExt.Mohawk_T)
+ "!exit");
System.out.println("");
System.out.println(OptionString.TO_ALL.c() + OptionString.SPECFILE.c("data/tests/randomTest.mohawk.T")
+ OptionString.LOGLEVEL.c("debug") + OptionString.SPECEXT.c(fileExt.Mohawk_T) + "!exit");
}
}
......@@ -271,7 +271,7 @@ timeslotArray returns [ArrayList<TimeSlot> t] @init {
mohawkT.timeIntervalHelper.add(new TimeSlot($b.val));
}
)? RightBracket
)* RightBracket
| c = timeslot
{
$t.add(new TimeSlot($c.val));
......
......@@ -67,6 +67,7 @@ public class ConvertToTRole extends ConvertTo {
File convertedFile = new File(file.getAbsolutePath() + getFileExtenstion());
FileOutputStream out = new FileOutputStream(convertedFile);
out.write(header.getBytes());
// Convert Rules into Reduced ASAPTime NSA Rules
for (Rule r : workableRules) {
//newRules.add(new TRole_Rule(r, roleHelper, timeIntervalHelper));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment