removed Java 7 style multi-catch statements

d-b · Feb 24, 2014 · 07303db · 07303db
1 parent 9929496
commit 07303db
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/A3/src/compiler488/semantics/Semantics.java b/A3/src/compiler488/semantics/Semantics.java
@@ -109,7 +109,7 @@ Boolean actionDeclareScalar(ScalarDeclPart scalarDecl) {
 
     @Action(number = 11) // Declare forward function.
     Boolean actionDeclareForwardFunction(RoutineDecl routineDecl) {
-        return workingSet(routineDecl.getName(),
+        return symbolTable.scopeSet(routineDecl.getName(),
                 new FunctionSymbol(routineDecl.getName(), routineDecl.getFunctionType(), false));
     }
 
@@ -429,11 +429,10 @@ boolean invokeProcessor(AST obj, Map<String, Method> map) {
         analysisTop = obj;
 
         // Invoke the processor on object
-        try {
-            m.invoke(this, obj); return true;
-        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-            e.printStackTrace(); return false;
-        }
+        try { m.invoke(this, obj); return true; }
+        catch (IllegalAccessException e)    { e.printStackTrace(); return false; }
+        catch (IllegalArgumentException e)  { e.printStackTrace(); return false; }
+        catch (InvocationTargetException e) { e.printStackTrace(); return false; }
     }
 
     void semanticAction(int actionNumber) {
@@ -468,9 +467,10 @@ void semanticAction(int actionNumber) {
             try {
                 Boolean result = (Boolean) m.invoke(this, analysisTop);
                 System.out.println((result ? "Semantic Action: S" : "Semantic Error: S") + actionNumber);
-            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-                e.printStackTrace();
             }
+            catch (IllegalAccessException e)    { e.printStackTrace(); }
+            catch (IllegalArgumentException e)  { e.printStackTrace(); }
+            catch (InvocationTargetException e) { e.printStackTrace(); }
         }
     }