diff --git a/build.gradle b/build.gradle index 53cabf6a14877076728ccab0ede2b64f5ed7a52c..852f93a533b793547468674c37f5085dea492341 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ task preprocess(type: JavaExec) { "./src/main/jastadd/ecore.relast", "./src/main/jastadd/grammar/Grammar.relast", "./src/main/jastadd/grammar/EcoreToGrammar.relast", - "--listClass=ArrayList", + "--listClass=java.util.ArrayList", "--jastAddList=JastAddList", "--useJastAddNames", "--file", diff --git a/libs/relast.jar b/libs/relast.jar index 8072303b7c830d3040d9c69afa4e971f5814b268..a3430dfc1754b92676e2beb6b9f8ce4f1bb4429f 100644 Binary files a/libs/relast.jar and b/libs/relast.jar differ diff --git a/src/main/jastadd/JastAddAPIExtension.jadd b/src/main/jastadd/JastAddAPIExtension.jadd index 476bd816cf52d389811adf4d979081368572aeaf..736ee811d814c5686db0a108e87d508aa0f1eeb8 100644 --- a/src/main/jastadd/JastAddAPIExtension.jadd +++ b/src/main/jastadd/JastAddAPIExtension.jadd @@ -45,7 +45,7 @@ aspect JastAddAPIExtension { result.add(child); } } - return Collections.unmodifiableList(result); + return java.util.Collections.unmodifiableList(result); } public ASTNode ASTNode.root() {