Skip to content
Snippets Groups Projects
Commit a2e433d2 authored by hansen's avatar hansen
Browse files

Merge branch 'release/3.2.12'

parents 93197be1 f86b4773
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ apply plugin: 'eclipse' ...@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
apply plugin: 'maven' apply plugin: 'maven'
project.version = '3.2.11' project.version = '3.2.12'
project.group = 'de.hhu.stups' project.group = 'de.hhu.stups'
project.archivesBaseName = "sablecc" project.archivesBaseName = "sablecc"
......
...@@ -41,8 +41,8 @@ public class Parser implements IParser ...@@ -41,8 +41,8 @@ public class Parser implements IParser
private final static int ACCEPT = 2; private final static int ACCEPT = 2;
private final static int ERROR = 3; private final static int ERROR = 3;
private ArrayList firstPopped = null; protected ArrayList firstPopped = null;
private ArrayList lastPopped = null; protected ArrayList lastPopped = null;
private ITokenListContainer lex; private ITokenListContainer lex;
public Parser( Lexer lexer) public Parser( Lexer lexer)
...@@ -55,12 +55,12 @@ public class Parser implements IParser ...@@ -55,12 +55,12 @@ public class Parser implements IParser
private Map<PositionedNode, SourcecodeRange> mapping = new HashMap<PositionedNode, SourcecodeRange>(); private Map<PositionedNode, SourcecodeRange> mapping = new HashMap<PositionedNode, SourcecodeRange>();
public Map<PositionedNode, SourcecodeRange> getMapping() { return this.mapping; } public Map<PositionedNode, SourcecodeRange> getMapping() { return this.mapping; }
private void checkResult(Object elementToCheck) { protected void checkResult(Object elementToCheck) {
checkResult(elementToCheck, false); checkResult(elementToCheck, false);
} }
private void checkResult(Object elementToCheck, boolean slurp) { protected void checkResult(Object elementToCheck, boolean slurp) {
// nodes with no tokens or sub nodes at all may exist // nodes with no tokens or sub nodes at all may exist
if (this.firstPopped == null) { if (this.firstPopped == null) {
return; return;
...@@ -110,7 +110,7 @@ public class Parser implements IParser ...@@ -110,7 +110,7 @@ public class Parser implements IParser
} }
private int findBeginPos(final ArrayList list, protected int findBeginPos(final ArrayList list,
PositionedNode n) { PositionedNode n) {
Object first = list.get(0); Object first = list.get(0);
if (!(first instanceof PositionedNode) && !(first instanceof IToken)) { if (!(first instanceof PositionedNode) && !(first instanceof IToken)) {
...@@ -141,7 +141,7 @@ public class Parser implements IParser ...@@ -141,7 +141,7 @@ public class Parser implements IParser
} }
private int findEndPos(final ArrayList list) { protected int findEndPos(final ArrayList list) {
Object last = list.get(list.size() - 1); Object last = list.get(list.size() - 1);
if (!(last instanceof PositionedNode) && !(last instanceof IToken)) { if (!(last instanceof PositionedNode) && !(last instanceof IToken)) {
final List list2 = (List) last; final List list2 = (List) last;
...@@ -159,7 +159,7 @@ public class Parser implements IParser ...@@ -159,7 +159,7 @@ public class Parser implements IParser
return item.getEndIndex(); return item.getEndIndex();
} }
private int findIndex(final IToken token) { protected int findIndex(final IToken token) {
final List<IToken> list = this.lex.getTokenList(); final List<IToken> list = this.lex.getTokenList();
for (int i = list.size() - 1; i >= 0; i--) { for (int i = list.size() - 1; i >= 0; i--) {
...@@ -171,13 +171,13 @@ public class Parser implements IParser ...@@ -171,13 +171,13 @@ public class Parser implements IParser
return -1; return -1;
} }
private SourcePosition createBeginPos(final int index) { protected SourcePosition createBeginPos(final int index) {
final List<IToken> list = this.lex.getTokenList(); final List<IToken> list = this.lex.getTokenList();
final IToken token = list.get(index); final IToken token = list.get(index);
return new SourcePosition(token.getLine(), token.getPos()); return new SourcePosition(token.getLine(), token.getPos());
} }
private SourcePosition createEndPos(final int index) { protected SourcePosition createEndPos(final int index) {
final List<IToken> list = this.lex.getTokenList(); final List<IToken> list = this.lex.getTokenList();
final IToken token = list.get(index); final IToken token = list.get(index);
return new SourcePosition(token.getLine(), token.getPos() return new SourcePosition(token.getLine(), token.getPos()
...@@ -261,7 +261,7 @@ Macro:ParserCommon ...@@ -261,7 +261,7 @@ Macro:ParserCommon
return s.state; return s.state;
} }
private ArrayList pop() protected ArrayList pop()
{ {
ArrayList list = ((State) this.stack.previous()).nodes; ArrayList list = ((State) this.stack.previous()).nodes;
if (this.firstPopped == null) { if (this.firstPopped == null) {
...@@ -395,7 +395,7 @@ Macro:ParserNewHeader ...@@ -395,7 +395,7 @@ Macro:ParserNewHeader
ArrayList new$0$() /* reduce $1$ */ protected ArrayList new$0$() /* reduce $1$ */
{ {
this.firstPopped = null; this.firstPopped = null;
this.lastPopped = null; this.lastPopped = null;
...@@ -529,7 +529,7 @@ Macro:ParserGotoTail ...@@ -529,7 +529,7 @@ Macro:ParserGotoTail
$ $
Macro:ParserErrorsHeader Macro:ParserErrorsHeader
private static String[] errorMessages; protected static String[] errorMessages;
/* { /* {
$ $
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment