diff --git a/src/main/java/org/sablecc/sablecc/parser/Parser.java b/src/main/java/org/sablecc/sablecc/parser/Parser.java index 57fa0e13e2fd01b8dc804004d05abb96d726abc6..ef14faa8e459f24d4aab4554bb5cea23ffd6e0fa 100644 --- a/src/main/java/org/sablecc/sablecc/parser/Parser.java +++ b/src/main/java/org/sablecc/sablecc/parser/Parser.java @@ -8793,7 +8793,7 @@ public class Parser implements IParser } - private static int[][][] actionTable; + private static final int[][][] actionTable; /* { {{-1, REDUCE, 0}, {1, SHIFT, 1}, {2, SHIFT, 2}, {3, SHIFT, 3}, {4, SHIFT, 4}, {5, SHIFT, 5}, {6, SHIFT, 6}, {7, SHIFT, 7}, }, {{-1, ERROR, 1}, {0, SHIFT, 16}, }, @@ -9153,7 +9153,7 @@ public class Parser implements IParser {{-1, REDUCE, 264}, }, {{-1, REDUCE, 205}, }, };*/ - private static int[][][] gotoTable; + private static final int[][][] gotoTable; /* { {{-1, 8}, }, {{-1, 9}, }, @@ -9221,7 +9221,7 @@ public class Parser implements IParser {{-1, 155}, }, {{-1, 322}, }, };*/ - private static String[] errorMessages; + private static final String[] errorMessages; /* { "expecting: 'Package', 'States', 'Helpers', 'Tokens', 'Ignored', 'Productions', 'Abstract', EOF", "expecting: pkg id", @@ -9292,7 +9292,7 @@ public class Parser implements IParser "expecting: ')', ','", "expecting: 'New', 'Null', 'T', 'P', '[', id", };*/ - private static int[] errors; + private static final int[] errors; /* { 0, 1, 2, 2, 3, 4, 2, 5, 6, 7, 8, 9, 10, 11, 12, 6, 13, 7, 14, 15, 16, 17, 17, 2, 16, 18, 2, 18, 19, 20, 21, 21, 22, 8, 9, 10, 11, 12, 6, 9, 10, 11, 12, 6, 10, 11, 12, 6, 11, 12, 6, 12, 6, 6, 1, 7, 13, 13, 2, 14, 14, 9, 23, 17, 24, 25, 16, 18, 11, 15, 26, 27, 16, 21, 2, 9, 10, 11, 12, 6, 10, 11, 12, 6, 11, 12, 6, 12, 6, 6, 10, 11, 12, 6, 11, 12, 6, 12, 6, 6, 11, 12, 6, 12, 6, 6, 12, 6, 6, 6, 13, 7, 13, 14, 14, 28, 29, 30, 31, 31, 31, 30, 15, 32, 33, 34, 35, 30, 33, 2, 2, 2, 36, 36, 36, 37, 25, 11, 38, 38, 2, 39, 40, 15, 41, 41, 26, 42, 43, 2, 26, 44, 26, 16, 45, 45, 10, 11, 12, 6, 11, 12, 6, 12, 6, 6, 11, 12, 6, 12, 6, 6, 12, 6, 6, 6, 11, 12, 6, 12, 6, 6, 12, 6, 6, 6, 12, 6, 6, 6, 6, 46, 47, 48, 17, 33, 32, 32, 49, 49, 49, 33, 33, 24, 36, 2, 36, 2, 36, 18, 23, 15, 37, 2, 2, 50, 51, 52, 42, 21, 26, 41, 41, 27, 41, 26, 40, 2, 40, 41, 42, 16, 44, 15, 26, 45, 11, 12, 6, 12, 6, 6, 12, 6, 6, 6, 12, 6, 6, 6, 6, 12, 6, 6, 6, 6, 6, 28, 28, 28, 53, 30, 32, 32, 36, 2, 15, 18, 18, 15, 54, 2, 55, 56, 41, 57, 51, 2, 51, 26, 41, 41, 41, 42, 40, 42, 16, 21, 2, 58, 15, 41, 58, 12, 6, 6, 6, 6, 6, 6, 50, 50, 18, 43, 59, 60, 2, 55, 61, 50, 62, 2, 2, 55, 57, 41, 51, 42, 58, 45, 26, 41, 41, 6, 30, 30, 2, 60, 63, 60, 62, 55, 64, 62, 62, 61, 65, 55, 41, 41, 60, 55, 66, 48, 63, 62, 62, 62, 67, 66, 66, 55, 62, 48, 66, 66, 62, };*/ @@ -9310,16 +9310,16 @@ public class Parser implements IParser // read actionTable int length = s.readInt(); - Parser.actionTable = new int[length][][]; - for(int i = 0; i < Parser.actionTable.length; i++) + actionTable = new int[length][][]; + for(int i = 0; i < actionTable.length; i++) { length = s.readInt(); - Parser.actionTable[i] = new int[length][3]; - for(int j = 0; j < Parser.actionTable[i].length; j++) + actionTable[i] = new int[length][3]; + for(int j = 0; j < actionTable[i].length; j++) { for(int k = 0; k < 3; k++) { - Parser.actionTable[i][j][k] = s.readInt(); + actionTable[i][j][k] = s.readInt(); } } } diff --git a/src/main/resources/org/sablecc/sablecc/parser.txt b/src/main/resources/org/sablecc/sablecc/parser.txt index f87cb07cc4cd10112f9b6cdd5ed7f2cd911ceab2..c7ea71cf9d2a1e8020c887a9e09d66110752f94f 100644 --- a/src/main/resources/org/sablecc/sablecc/parser.txt +++ b/src/main/resources/org/sablecc/sablecc/parser.txt @@ -425,7 +425,7 @@ $ Macro:ParserActionHeader - private static int[][][] actionTable; + private static final int[][][] actionTable; /* { $ @@ -436,7 +436,7 @@ Macro:ParserActionTail $ Macro:ParserGotoHeader - private static int[][][] gotoTable; + private static final int[][][] gotoTable; /* { $ @@ -447,7 +447,7 @@ Macro:ParserGotoTail $ Macro:ParserErrorsHeader - private static String[] errorMessages; + private static final String[] errorMessages; /* { $ @@ -458,7 +458,7 @@ Macro:ParserErrorsTail $ Macro:ParserErrorIndexHeader - private static int[] errors; + private static final int[] errors; /* { $ @@ -484,16 +484,16 @@ Macro:ParserTail // read actionTable int length = s.readInt(); - Parser.actionTable = new int[length][][]; - for(int i = 0; i < Parser.actionTable.length; i++) + actionTable = new int[length][][]; + for(int i = 0; i < actionTable.length; i++) { length = s.readInt(); - Parser.actionTable[i] = new int[length][3]; - for(int j = 0; j < Parser.actionTable[i].length; j++) + actionTable[i] = new int[length][3]; + for(int j = 0; j < actionTable[i].length; j++) { for(int k = 0; k < 3; k++) { - Parser.actionTable[i][j][k] = s.readInt(); + actionTable[i][j][k] = s.readInt(); } } }