fix optional arguments...lots of changes

[IRC.git] / Robust / src / Main / Main.java

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 126d21a56e5f75e5f35b7f7f1e99f488650afbee..c924259d8de37279487d6aad0c2daedd7ab20ef0 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -131,6 +131,7 @@ public class Main {
 
       BuildFlat bf=new BuildFlat(state,tu);
       bf.buildFlat();
+      SafetyAnalysis sa=null;
 
       if (state.TASKSTATE) {
          CallGraph callgraph=new CallGraph(state);
@@ -143,7 +144,7 @@ public class Main {
          if (state.OPTIONAL) {
              ExecutionGraph et=new ExecutionGraph(state, ta);
              et.createExecutionGraph();
-             SafetyAnalysis sa = new SafetyAnalysis(et.getExecutionGraph(), state, ta);
+             sa = new SafetyAnalysis(et.getExecutionGraph(), state, ta);
              sa.doAnalysis();
              state.storeAnalysisResult(sa.getResult());
              state.storeOptionalTaskDescriptors(sa.getOptionalTaskDescriptors());
@@ -169,7 +170,7 @@ public class Main {
          BuildCode bc=new BuildCode(state, bf.getMap(), tu, la);
          bc.buildCode();
       } else {
-         BuildCode bc=new BuildCode(state, bf.getMap(), tu);
+         BuildCode bc=new BuildCode(state, bf.getMap(), tu, sa);
          bc.buildCode();
       }
       System.exit(0);