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

Merge branch 'release/3.2.13'

parents a2e433d2 dec8b4e6
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.12' project.version = '3.2.13'
project.group = 'de.hhu.stups' project.group = 'de.hhu.stups'
project.archivesBaseName = "sablecc" project.archivesBaseName = "sablecc"
......
...@@ -184,6 +184,10 @@ public class Parser implements IParser ...@@ -184,6 +184,10 @@ public class Parser implements IParser
+ token.getText().length()); + token.getText().length());
} }
protected boolean addElementsFromListToNewList(String productionRuleAsString) {
return true;
}
$ $
Macro:ParserInliningPushHeader Macro:ParserInliningPushHeader
...@@ -399,6 +403,7 @@ Macro:ParserNewHeader ...@@ -399,6 +403,7 @@ Macro:ParserNewHeader
{ {
this.firstPopped = null; this.firstPopped = null;
this.lastPopped = null; this.lastPopped = null;
final boolean addElementsToNewList = addElementsFromListToNewList("$1$");
ArrayList nodeList = new ArrayList(); ArrayList nodeList = new ArrayList();
...@@ -474,8 +479,11 @@ $ ...@@ -474,8 +479,11 @@ $
Macro:ParserTypedLinkedListAddAll Macro:ParserTypedLinkedListAddAll
if($2$Node$3$ != null) //Macro:ParserTypedLinkedListAddAll if($2$Node$3$ != null) //Macro:ParserTypedLinkedListAddAll
{ {
if(addElementsToNewList){
$0$Node$1$.addAll($2$Node$3$); $0$Node$1$.addAll($2$Node$3$);
//$0$Node$1$ = $2$Node$3$; }else{
$0$Node$1$ = $2$Node$3$;
}
} }
$ $
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment