From 38f370818b96017a55287392eeae725bed18f73d Mon Sep 17 00:00:00 2001 From: Johannes Mey Date: Sun, 8 Jul 2018 18:46:29 +0200 Subject: [PATCH 01/62] add option to rename list class. this made it much easier to use the generator in the train benchmark. --- spec/jastadd/Backend.jadd | 43 ++++++++++--------- .../org/jastadd/relast/compiler/Compiler.java | 8 ++++ 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/spec/jastadd/Backend.jadd b/spec/jastadd/Backend.jadd index f206987..8778063 100644 --- a/spec/jastadd/Backend.jadd +++ b/spec/jastadd/Backend.jadd @@ -1,4 +1,7 @@ aspect BackendAbstractGrammar { + + public static String ASTNode.listClass = "ArrayList"; + public String Program.generateAbstractGrammar() { StringBuilder sb = new StringBuilder(); generateAbstractGrammar(sb); @@ -19,7 +22,7 @@ aspect BackendAbstractGrammar { if (hasSuper()) { sb.append(" : " + getSuper()); } - + if (getNumComponent() > 0 || relationComponents().size() > 0) { sb.append(" ::="); } @@ -56,7 +59,7 @@ aspect BackendAbstractGrammar { return "<" + getImplAttributeName() + ":" + ofTypeDecl() + ">"; } public String ManyRelationComponent.generateAbstractGrammar() { - return "<" + getImplAttributeName() + ":ArrayList<" + ofTypeDecl() + ">>"; + return "<" + getImplAttributeName() + ":" + ASTNode.listClass + "<" + ofTypeDecl() + ">>"; } public String RelationComponent.getImplAttributeName() { @@ -159,7 +162,7 @@ aspect BackendDirectedAPI { } public void OptionalRelationComponent.generateDirectedAPI(StringBuilder sb) { generateDirectedZeroOneAPI(sb, true); - + generateExtraOptAPI(sb); } public void RelationComponent.generateDirectedZeroOneAPI(StringBuilder sb, boolean optional) { @@ -184,9 +187,9 @@ aspect BackendDirectedAPI { sb.append(ind(1) + "public void " + toTypeDecl() + ".addTo"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); - sb.append(ind(2) + "ArrayList<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); + sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); sb.append(ind(2) + "if (list == null) {\n"); - sb.append(ind(3) + "list = new ArrayList<>();\n"); + sb.append(ind(3) + "list = new " + ASTNode.listClass + "<>();\n"); sb.append(ind(2) + "}\n"); sb.append(ind(2) + "list.add(o);\n"); sb.append(ind(2) + "set" + getImplAttributeName() + "(list);\n"); @@ -196,7 +199,7 @@ aspect BackendDirectedAPI { sb.append(ind(1) + "public void " + toTypeDecl() + ".removeFrom"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); - sb.append(ind(2) + "ArrayList<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); + sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); sb.append(ind(2) + "if (list != null && list.remove(o)) {\n"); sb.append(ind(3) + "set" + getImplAttributeName() + "(list);\n"); sb.append(ind(2) + "}\n"); @@ -227,7 +230,7 @@ aspect BackendDirectedAPI { public void RelationComponent.generateGetMany(StringBuilder sb) { sb.append(ind(1) + "public java.util.List<" + ofTypeDecl() + "> " + toTypeDecl()); sb.append("." + name() + "() {\n"); - sb.append(ind(2) + "ArrayList<" + ofTypeDecl() + "> l = get" + sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> l = get" + getImplAttributeName() + "();\n"); sb.append(ind(2) + "return l != null ? Collections.unmodifiableList(l) : Collections.emptyList();\n"); sb.append(ind(1) + "}\n"); @@ -314,14 +317,14 @@ aspect BackendBidirectionalAPI { sb.append(ind(1) + "public void " + toTypeDecl() + ".addTo"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); - sb.append(ind(2) + "ArrayList<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); + sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); sb.append(ind(2) + "if (list == null) {\n"); - sb.append(ind(3) + "list = new ArrayList<>();\n"); + sb.append(ind(3) + "list = new " + ASTNode.listClass + "<>();\n"); sb.append(ind(2) + "}\n"); - sb.append(ind(2) + "ArrayList<" + otherSide().ofTypeDecl() + "> list2 = o.get" + sb.append(ind(2) + ASTNode.listClass + "<" + otherSide().ofTypeDecl() + "> list2 = o.get" + otherSide().getImplAttributeName() + "();\n"); sb.append(ind(2) + "if (list2 == null) {\n"); - sb.append(ind(3) + "list2 = new ArrayList<>();\n"); + sb.append(ind(3) + "list2 = new "+ ASTNode.listClass + "<>();\n"); sb.append(ind(2) + "}\n"); sb.append(ind(2) + "list.add(o);\n"); sb.append(ind(2) + "list2.add(this);\n"); @@ -333,9 +336,9 @@ aspect BackendBidirectionalAPI { sb.append(ind(1) + "public void " + toTypeDecl() + ".removeFrom"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); - sb.append(ind(2) + "ArrayList<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); + sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); sb.append(ind(2) + "if (list != null && list.remove(o)) {\n"); - sb.append(ind(3) + "ArrayList<" + otherSide().ofTypeDecl() + "> list2 = o.get" + sb.append(ind(3) + ASTNode.listClass + "<" + otherSide().ofTypeDecl() + "> list2 = o.get" + otherSide().getImplAttributeName() + "();\n"); sb.append(ind(3) + "if (list2 != null) list2.remove(this);\n"); sb.append(ind(3) + "set" + getImplAttributeName() + "(list);\n"); @@ -354,15 +357,15 @@ aspect BackendBidirectionalAPI { sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); sb.append(ind(2) + "if (o != null && o.get" + otherSide().getImplAttributeName() + "() != null) {\n"); - sb.append(ind(3) + "ArrayList<" + ofTypeDecl() + "> list2 = o.get" + sb.append(ind(3) + ASTNode.listClass + "<" + ofTypeDecl() + "> list2 = o.get" + otherSide().getImplAttributeName() + "().get" + getImplAttributeName() + "();\n"); sb.append(ind(3) + "if (list2.remove(o))\n"); sb.append(ind(4) + "o.get" + otherSide().getImplAttributeName() + "().set" + getImplAttributeName() + "(list2);\n"); sb.append(ind(2) + "}\n"); - sb.append(ind(2) + "ArrayList<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); + sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); sb.append(ind(2) + "if (list == null) {\n"); - sb.append(ind(3) + "list = new ArrayList<>();\n"); + sb.append(ind(3) + "list = new " + ASTNode.listClass + "<>();\n"); sb.append(ind(2) + "}\n"); sb.append(ind(2) + "list.add(o);\n"); sb.append(ind(2) + "set" + getImplAttributeName() + "(list);\n"); @@ -373,7 +376,7 @@ aspect BackendBidirectionalAPI { sb.append(ind(1) + "public void " + toTypeDecl() + ".removeFrom"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); - sb.append(ind(2) + "ArrayList<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); + sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); sb.append(ind(2) + "if (list != null && list.remove(o)) {\n"); sb.append(ind(3) + "set" + getImplAttributeName() + "(list);\n"); sb.append(ind(3) + "if (o.get" + otherSide().getImplAttributeName() + "() == this) {\n"); @@ -394,7 +397,7 @@ aspect BackendBidirectionalAPI { sb.append(ind(2) + "assertNotNull(o);\n"); } sb.append(ind(2) + "if (get" + getImplAttributeName() + "() != null) {\n"); - sb.append(ind(3) + "ArrayList<" + toTypeDecl() + "> list2 = get" + getImplAttributeName() + sb.append(ind(3) + ASTNode.listClass + "<" + toTypeDecl() + "> list2 = get" + getImplAttributeName() + "()." + "get" + otherSide().getImplAttributeName() + "();\n"); sb.append(ind(3) + "list2.remove(this);\n"); sb.append(ind(3) + "get" + getImplAttributeName() + "()." + "set" @@ -406,10 +409,10 @@ aspect BackendBidirectionalAPI { if (isOpt) { sb.append(ind(2) + "if (o != null) {\n"); } - sb.append(ind(ind) + "ArrayList<" + toTypeDecl() + "> list = o.get" + sb.append(ind(ind) + ASTNode.listClass + "<" + toTypeDecl() + "> list = o.get" + otherSide().getImplAttributeName() + "();\n"); sb.append(ind(ind) + "if (list == null) {\n"); - sb.append(ind(ind+1) + "list = new ArrayList<>();\n"); + sb.append(ind(ind+1) + "list = new " + ASTNode.listClass + "<>();\n"); sb.append(ind(ind) + "}\n"); sb.append(ind(ind) + "list.add(this);\n"); sb.append(ind(ind) + "o.set" + otherSide().getImplAttributeName() + "(list);\n"); diff --git a/src/java/org/jastadd/relast/compiler/Compiler.java b/src/java/org/jastadd/relast/compiler/Compiler.java index a6f8a1d..f5ff3c3 100644 --- a/src/java/org/jastadd/relast/compiler/Compiler.java +++ b/src/java/org/jastadd/relast/compiler/Compiler.java @@ -21,6 +21,7 @@ public class Compiler { protected ArrayList> options; protected FlagOption optionWriteToFile; protected FlagOption optionPrintAST; + protected StringOption optionListClass; protected CommandLine commandLine; public Compiler(String args[]) throws CommandLineException { @@ -47,6 +48,12 @@ public class Compiler { } System.exit(1); } else { + + if (optionListClass.isSet()) { + System.out.println("ListClass is set to " + optionListClass.getValue()); + p.listClass = optionListClass.getValue(); + } + if (optionWriteToFile.isSet()) { File file = new File(filename); String absPath = file.getAbsolutePath(); @@ -76,6 +83,7 @@ public class Compiler { protected void addOptions() { optionWriteToFile = addOption(new FlagOption("file", "write output to files Gen.ast and Gen.jadd")); optionPrintAST = addOption(new FlagOption("ast", "print AST")); + optionListClass = addOption(new StringOption("listClass", "determine the class name of the nonterminal reference list")); } protected > OptionType addOption(OptionType option) { -- GitLab From 9377baeadf54acc5bc2382a071a1b878069f863a Mon Sep 17 00:00:00 2001 From: Johannes Mey Date: Mon, 6 Aug 2018 14:47:36 +0200 Subject: [PATCH 02/62] add support for NTAs --- spec/jastadd/Backend.jadd | 3 +++ spec/jastadd/RelAst.ast | 3 ++- spec/parser/RelAstBase.parser | 9 ++++++--- spec/scanner/RelAst.flex | 11 ++++++----- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/spec/jastadd/Backend.jadd b/spec/jastadd/Backend.jadd index 8778063..4e09448 100644 --- a/spec/jastadd/Backend.jadd +++ b/spec/jastadd/Backend.jadd @@ -51,6 +51,9 @@ aspect BackendAbstractGrammar { public String OptComponent.generateAbstractGrammar() { return "[" + super.generateAbstractGrammar() + "]"; } + public String NTAComponent.generateAbstractGrammar() { + return "/" + super.generateAbstractGrammar() + "/"; + } public String TokenComponent.generateAbstractGrammar() { return "<" + getID() + ":" + getTypeUse() + ">"; } diff --git a/spec/jastadd/RelAst.ast b/spec/jastadd/RelAst.ast index 3a7116e..3a17c0c 100644 --- a/spec/jastadd/RelAst.ast +++ b/spec/jastadd/RelAst.ast @@ -6,6 +6,7 @@ abstract SimpleTypeComponent : Component ::= TypeUse:SimpleTypeUse; NormalComponent : SimpleTypeComponent; ListComponent : SimpleTypeComponent; OptComponent : SimpleTypeComponent; +NTAComponent : SimpleTypeComponent; TokenComponent : Component ::= TypeUse; abstract TypeUse ::= ; @@ -19,4 +20,4 @@ OptionalRelationComponent : RelationComponent; ManyRelationComponent : RelationComponent; abstract Direction; RightDirection : Direction; -Bidirectional : Direction; \ No newline at end of file +Bidirectional : Direction; diff --git a/spec/parser/RelAstBase.parser b/spec/parser/RelAstBase.parser index 15fca6a..284d795 100644 --- a/spec/parser/RelAstBase.parser +++ b/spec/parser/RelAstBase.parser @@ -1,4 +1,4 @@ -Program goal = +Program goal = type_decls.t relations.r {: return new Program(t, r); :} | STRING_LITERAL STAR {: return new Program(); :} ; @@ -9,9 +9,9 @@ List type_decls = ; TypeDecl type_decl = - ID type_decl_super.s components_opt.c SCOL + ID type_decl_super.s components_opt.c SCOL {: return new TypeDecl(ID, false, s, c); :} - | ABSTRACT ID type_decl_super.s components_opt.c SCOL + | ABSTRACT ID type_decl_super.s components_opt.c SCOL {: return new TypeDecl(ID, true, s, c); :} ; @@ -55,6 +55,9 @@ Component component = // Opt | LBRACKET ID COL s_type_use.u RBRACKET {: return new OptComponent(ID, u); :} | LBRACKET s_type_use.u RBRACKET {: return new OptComponent(u.getID(), u); :} + // NTA + | SLASH ID COL s_type_use.u SLASH {: return new NTAComponent(ID, u); :} + | SLASH s_type_use.u SLASH {: return new NTAComponent(u.getID(), u); :} // Token | LT ID COL type_use.u GT {: return new TokenComponent(ID, u); :} | LT ID GT {: return new TokenComponent(ID, new SimpleTypeUse("String")); :} diff --git a/spec/scanner/RelAst.flex b/spec/scanner/RelAst.flex index 27d068b..6aaeaeb 100644 --- a/spec/scanner/RelAst.flex +++ b/spec/scanner/RelAst.flex @@ -9,8 +9,8 @@ import org.jastadd.relast.ast.RelAstParser.Terminals; %class RelAstScanner %extends beaver.Scanner -%type beaver.Symbol -%function nextToken +%type beaver.Symbol +%function nextToken %yylexthrow beaver.Scanner.Exception %scanerror RelAstScanner.ScannerError @@ -18,7 +18,7 @@ import org.jastadd.relast.ast.RelAstParser.Terminals; %column %{ private StringBuilder stringLitSb = new StringBuilder(); - + private beaver.Symbol sym(short id) { return new beaver.Symbol(id, yyline + 1, yycolumn + 1, yylength(), yytext()); } @@ -27,12 +27,12 @@ import org.jastadd.relast.ast.RelAstParser.Terminals; return new beaver.Symbol(id, yyline + 1, yycolumn + 1, yylength(), text); } - + public static class ScannerError extends Error { public ScannerError(String message) { super(message); } - } + } %} WhiteSpace = [ ] | \t | \f | \n | \r | \r\n @@ -62,6 +62,7 @@ ID = [a-zA-Z$_][a-zA-Z0-9$_]* ">" { return sym(Terminals.GT); } "[" { return sym(Terminals.LBRACKET); } "]" { return sym(Terminals.RBRACKET); } + "/" { return sym(Terminals.SLASH); } "?" { return sym(Terminals.QUESTION_MARK); } "->" { return sym(Terminals.RIGHT); } "<->" { return sym(Terminals.BIDIRECTIONAL); } -- GitLab From c95eef3209264f3bd7819c9331fa36e9355fb088 Mon Sep 17 00:00:00 2001 From: rschoene Date: Wed, 8 Aug 2018 14:01:54 +0200 Subject: [PATCH 03/62] Added support for NTA terminals. --- spec/parser/RelAstBase.parser | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spec/parser/RelAstBase.parser b/spec/parser/RelAstBase.parser index 284d795..9099259 100644 --- a/spec/parser/RelAstBase.parser +++ b/spec/parser/RelAstBase.parser @@ -58,6 +58,9 @@ Component component = // NTA | SLASH ID COL s_type_use.u SLASH {: return new NTAComponent(ID, u); :} | SLASH s_type_use.u SLASH {: return new NTAComponent(u.getID(), u); :} + // NTA Token (same as NTA) + | SLASH LT ID COL s_type_use.u GT SLASH {: return new NTAComponent(ID, u); :} + | SLASH LT s_type_use.u GT SLASH {: return new NTAComponent(u.getID(), u); :} // Token | LT ID COL type_use.u GT {: return new TokenComponent(ID, u); :} | LT ID GT {: return new TokenComponent(ID, new SimpleTypeUse("String")); :} @@ -88,4 +91,4 @@ RelationComponent relation_comp = Direction direction = RIGHT {: return new RightDirection(); :} | BIDIRECTIONAL {: return new Bidirectional(); :} - ; \ No newline at end of file + ; -- GitLab From 6cbd64865367a0fda29b6ec75ae9b1c206b72a41 Mon Sep 17 00:00:00 2001 From: rschoene Date: Wed, 8 Aug 2018 14:03:05 +0200 Subject: [PATCH 04/62] Ignoring IntelliJ files and test warnings. --- .gitignore | 3 +++ tests/valid/All.java | 1 + 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 12a5107..50d1074 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ /relast-compiler.jar /src/generated/ /.gradle + +/.idea/ +*.iml diff --git a/tests/valid/All.java b/tests/valid/All.java index 3771423..80bddea 100644 --- a/tests/valid/All.java +++ b/tests/valid/All.java @@ -1,6 +1,7 @@ import AST.*; import java.util.*; +@SuppressWarnings("ArraysAsListWithZeroOrOneArgument") public class All extends AbstractTests { private Root r; private A a1; -- GitLab From dcfe383c4ceaf75dd32a4939c432f0f8a480655f Mon Sep 17 00:00:00 2001 From: rschoene Date: Wed, 8 Aug 2018 14:04:34 +0200 Subject: [PATCH 05/62] Changes generated accessors. - "addToX" -> "addX" - "removeFromX" -> "removeX" - "x()" -> "getXs" and "getXList" --- spec/jastadd/Backend.jadd | 29 +- tests/valid/All.java | 564 +++++++++++++++++++-------------- tests/valid/All.relast | 24 +- tests/valid/LowerBounds.java | 20 +- tests/valid/LowerBounds.relast | 6 +- 5 files changed, 362 insertions(+), 281 deletions(-) diff --git a/spec/jastadd/Backend.jadd b/spec/jastadd/Backend.jadd index 4e09448..835e9ec 100644 --- a/spec/jastadd/Backend.jadd +++ b/spec/jastadd/Backend.jadd @@ -187,7 +187,7 @@ aspect BackendDirectedAPI { generateGetMany(sb); // Add - sb.append(ind(1) + "public void " + toTypeDecl() + ".addTo"); + sb.append(ind(1) + "public void " + toTypeDecl() + ".add"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); @@ -199,7 +199,7 @@ aspect BackendDirectedAPI { sb.append(ind(1) + "}\n"); // Remove - sb.append(ind(1) + "public void " + toTypeDecl() + ".removeFrom"); + sb.append(ind(1) + "public void " + toTypeDecl() + ".remove"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); @@ -211,7 +211,7 @@ aspect BackendDirectedAPI { public void RelationComponent.generateGetOne(StringBuilder sb) { sb.append(ind(1) + "public " + ofTypeDecl() + " " + toTypeDecl()); - sb.append("." + name() + "() {\n"); + sb.append(".get" + nameCapitalized() + "() {\n"); sb.append(ind(2) + "return get" + getImplAttributeName() + "();\n"); sb.append(ind(1) + "}\n"); } @@ -220,7 +220,7 @@ aspect BackendDirectedAPI { // has sb.append(ind(1) + "public boolean " + toTypeDecl()); sb.append(".has" + nameCapitalized() + "() {\n"); - sb.append(ind(2) + "return " + name() + "() != null;\n"); + sb.append(ind(2) + "return get" + nameCapitalized() + "() != null;\n"); sb.append(ind(1) + "}\n"); // clear @@ -231,8 +231,15 @@ aspect BackendDirectedAPI { } public void RelationComponent.generateGetMany(StringBuilder sb) { + // getXs sb.append(ind(1) + "public java.util.List<" + ofTypeDecl() + "> " + toTypeDecl()); - sb.append("." + name() + "() {\n"); + sb.append(".get" + nameCapitalized() + "s() {\n"); + sb.append(ind(2) + "return get" + nameCapitalized() + "List();\n"); + sb.append(ind(1) + "}\n"); + + // getXList + sb.append(ind(1) + "public java.util.List<" + ofTypeDecl() + "> " + toTypeDecl()); + sb.append(".get" + nameCapitalized() + "List() {\n"); sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> l = get" + getImplAttributeName() + "();\n"); sb.append(ind(2) + "return l != null ? Collections.unmodifiableList(l) : Collections.emptyList();\n"); @@ -317,7 +324,7 @@ aspect BackendBidirectionalAPI { generateGetMany(sb); // Add - sb.append(ind(1) + "public void " + toTypeDecl() + ".addTo"); + sb.append(ind(1) + "public void " + toTypeDecl() + ".add"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); @@ -336,7 +343,7 @@ aspect BackendBidirectionalAPI { sb.append(ind(1) + "}\n"); // Remove - sb.append(ind(1) + "public void " + toTypeDecl() + ".removeFrom"); + sb.append(ind(1) + "public void " + toTypeDecl() + ".remove"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); @@ -356,7 +363,7 @@ aspect BackendBidirectionalAPI { generateGetMany(sb); // Add - sb.append(ind(1) + "public void " + toTypeDecl() + ".addTo"); + sb.append(ind(1) + "public void " + toTypeDecl() + ".add"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); sb.append(ind(2) + "if (o != null && o.get" + otherSide().getImplAttributeName() + "() != null) {\n"); @@ -376,7 +383,7 @@ aspect BackendBidirectionalAPI { sb.append(ind(1) + "}\n"); // Remove - sb.append(ind(1) + "public void " + toTypeDecl() + ".removeFrom"); + sb.append(ind(1) + "public void " + toTypeDecl() + ".remove"); sb.append(nameCapitalized() + "(" + ofTypeDecl() + " o) {\n"); sb.append(ind(2) + "assertNotNull(o);\n"); sb.append(ind(2) + ASTNode.listClass + "<" + ofTypeDecl() + "> list = get" + getImplAttributeName() + "();\n"); @@ -470,7 +477,7 @@ aspect LowerBoundCheck { } public void OneRelationComponent.generateLowerBoundCheck(StringBuilder sb) { - sb.append(ind(2) + "if (" + name() + "() == null) {\n"); + sb.append(ind(2) + "if (get" + nameCapitalized() + "() == null) {\n"); sb.append(ind(3) + "list.add(new Pair<>(this, \"" + name() + "\"));\n"); sb.append(ind(2) + "}\n"); } @@ -542,4 +549,4 @@ aspect Utils { } return s; } -} \ No newline at end of file +} diff --git a/tests/valid/All.java b/tests/valid/All.java index 80bddea..404f3fc 100644 --- a/tests/valid/All.java +++ b/tests/valid/All.java @@ -34,20 +34,20 @@ public class All extends AbstractTests { } /** - * rel A.di1 -> B; + * rel A.Di1 -> B; */ private void testDi1() { setup(); a1.setDi1(b2); a2.setDi1(b1); - assertSame(a1.di1(), b2); - assertSame(a2.di1(), b1); + assertSame(a1.getDi1(), b2); + assertSame(a2.getDi1(), b1); a2.setDi1(b2); - assertSame(a1.di1(), b2); - assertSame(a2.di1(), b2); + assertSame(a1.getDi1(), b2); + assertSame(a2.getDi1(), b2); try { a3.setDi1(null); @@ -59,25 +59,25 @@ public class All extends AbstractTests { /** - * rel A.di2? -> B; + * rel A.Di2? -> B; */ private void testDi2() { setup(); a1.setDi2(b2); a2.setDi2(b1); - assertSame(a1.di2(), b2); - assertSame(a2.di2(), b1); + assertSame(a1.getDi2(), b2); + assertSame(a2.getDi2(), b1); a2.setDi2(b2); - assertSame(a1.di2(), b2); - assertSame(a2.di2(), b2); + assertSame(a1.getDi2(), b2); + assertSame(a2.getDi2(), b2); a2.clearDi2(); - assertSame(a1.di2(), b2); - assertNull(a2.di2()); + assertSame(a1.getDi2(), b2); + assertNull(a2.getDi2()); assertTrue(a1.hasDi2()); assertFalse(a2.hasDi2()); @@ -86,38 +86,47 @@ public class All extends AbstractTests { /** - * rel A.di3* -> B; + * rel A.Di3* -> B; */ private void testDi3() { setup(); - a1.addToDi3(b1); - a1.addToDi3(b2); - a1.addToDi3(b3); - a2.addToDi3(b2); + a1.addDi3(b1); + a1.addDi3(b2); + a1.addDi3(b3); + a2.addDi3(b2); - assertEquals(a1.di3(), Arrays.asList(b1, b2, b3)); - assertEquals(a2.di3(), Arrays.asList(b2)); - assertEquals(a3.di3(), Arrays.asList()); - - a1.addToDi3(b1); - a2.addToDi3(b1); - a2.addToDi3(b2); - - assertEquals(a1.di3(), Arrays.asList(b1, b2, b3, b1)); - assertEquals(a2.di3(), Arrays.asList(b2, b1, b2)); - assertEquals(a3.di3(), Arrays.asList()); - - a1.removeFromDi3(b1); - a2.removeFromDi3(b2); - - assertEquals(a1.di3(), Arrays.asList(b2, b3, b1)); - assertEquals(a2.di3(), Arrays.asList(b1, b2)); - assertEquals(a3.di3(), Arrays.asList()); + assertEquals(a1.getDi3s(), Arrays.asList(b1, b2, b3)); + assertEquals(a1.getDi3List(), Arrays.asList(b1, b2, b3)); + assertEquals(a2.getDi3s(), Arrays.asList(b2)); + assertEquals(a2.getDi3List(), Arrays.asList(b2)); + assertEquals(a3.getDi3s(), Arrays.asList()); + assertEquals(a3.getDi3List(), Arrays.asList()); + + a1.addDi3(b1); + a2.addDi3(b1); + a2.addDi3(b2); + + assertEquals(a1.getDi3s(), Arrays.asList(b1, b2, b3, b1)); + assertEquals(a1.getDi3List(), Arrays.asList(b1, b2, b3, b1)); + assertEquals(a2.getDi3s(), Arrays.asList(b2, b1, b2)); + assertEquals(a2.getDi3List(), Arrays.asList(b2, b1, b2)); + assertEquals(a3.getDi3s(), Arrays.asList()); + assertEquals(a3.getDi3List(), Arrays.asList()); + + a1.removeDi3(b1); + a2.removeDi3(b2); + + assertEquals(a1.getDi3s(), Arrays.asList(b2, b3, b1)); + assertEquals(a1.getDi3List(), Arrays.asList(b2, b3, b1)); + assertEquals(a2.getDi3s(), Arrays.asList(b1, b2)); + assertEquals(a2.getDi3List(), Arrays.asList(b1, b2)); + assertEquals(a3.getDi3s(), Arrays.asList()); + assertEquals(a3.getDi3List(), Arrays.asList()); } /** - * rel A.bi1 <-> B.bi1; + * rel A.Bi1 <-> B.Bi1; */ private void testBi1() { testBi11(); @@ -132,10 +141,10 @@ public class All extends AbstractTests { // Change a2.setBi1(b1); - assertNull(a1.bi1()); - assertSame(a2.bi1(), b1); - assertSame(b1.bi1(), a2); - assertNull(b2.bi1()); + assertNull(a1.getBi1()); + assertSame(a2.getBi1(), b1); + assertSame(b1.getBi1(), a2); + assertNull(b2.getBi1()); } private void testBi12() { // Init @@ -145,16 +154,16 @@ public class All extends AbstractTests { // Change a2.setBi1(b2); - assertNull(a1.bi1()); - assertSame(a2.bi1(), b2); - assertNull(b1.bi1()); - assertSame(b2.bi1(), a2); + assertNull(a1.getBi1()); + assertSame(a2.getBi1(), b2); + assertNull(b1.getBi1()); + assertSame(b2.getBi1(), a2); } /** - * rel A.bi2 <-> B.bi2?; + * rel A.Bi2 <-> B.Bi2?; */ private void testBi2() { testBi21(); @@ -169,10 +178,10 @@ public class All extends AbstractTests { // Change a2.setBi2(b1); - assertNull(a1.bi2()); - assertSame(a2.bi2(), b1); - assertSame(b1.bi2(), a2); - assertNull(b2.bi2()); + assertNull(a1.getBi2()); + assertSame(a2.getBi2(), b1); + assertSame(b1.getBi2(), a2); + assertNull(b2.getBi2()); } private void testBi22() { // Init @@ -182,53 +191,65 @@ public class All extends AbstractTests { // Change a2.setBi2(b2); - assertNull(a1.bi2()); - assertSame(a2.bi2(), b2); - assertNull(b1.bi2()); - assertSame(b2.bi2(), a2); + assertNull(a1.getBi2()); + assertSame(a2.getBi2(), b2); + assertNull(b1.getBi2()); + assertSame(b2.getBi2(), a2); } /** - * rel A.bi3 <-> B.bi3*; + * rel A.Bi3 <-> B.Bi3*; */ private void testBi3() { setup(); a2.setBi3(b2); - assertNull(a1.bi3()); - assertSame(a2.bi3(), b2); - assertEquals(b1.bi3(), Arrays.asList()); - assertEquals(b2.bi3(), Arrays.asList(a2)); - assertEquals(b3.bi3(), Arrays.asList()); + assertNull(a1.getBi3()); + assertSame(a2.getBi3(), b2); + assertEquals(b1.getBi3s(), Arrays.asList()); + assertEquals(b1.getBi3List(), Arrays.asList()); + assertEquals(b2.getBi3s(), Arrays.asList(a2)); + assertEquals(b2.getBi3List(), Arrays.asList(a2)); + assertEquals(b3.getBi3s(), Arrays.asList()); + assertEquals(b3.getBi3List(), Arrays.asList()); a2.setBi3(b3); - assertNull(a1.bi3()); - assertSame(a2.bi3(), b3); - assertEquals(b1.bi3(), Arrays.asList()); - assertEquals(b2.bi3(), Arrays.asList()); - assertEquals(b3.bi3(), Arrays.asList(a2)); + assertNull(a1.getBi3()); + assertSame(a2.getBi3(), b3); + assertEquals(b1.getBi3s(), Arrays.asList()); + assertEquals(b1.getBi3List(), Arrays.asList()); + assertEquals(b2.getBi3s(), Arrays.asList()); + assertEquals(b2.getBi3List(), Arrays.asList()); + assertEquals(b3.getBi3s(), Arrays.asList(a2)); + assertEquals(b3.getBi3List(), Arrays.asList(a2)); a1.setBi3(b3); a3.setBi3(b3); - assertSame(a1.bi3(), b3); - assertSame(a2.bi3(), b3); - assertSame(a3.bi3(), b3); - assertEquals(b1.bi3(), Arrays.asList()); - assertEquals(b2.bi3(), Arrays.asList()); - assertEquals(b3.bi3(), Arrays.asList(a2, a1, a3)); + assertSame(a1.getBi3(), b3); + assertSame(a2.getBi3(), b3); + assertSame(a3.getBi3(), b3); + assertEquals(b1.getBi3s(), Arrays.asList()); + assertEquals(b1.getBi3List(), Arrays.asList()); + assertEquals(b2.getBi3s(), Arrays.asList()); + assertEquals(b2.getBi3List(), Arrays.asList()); + assertEquals(b3.getBi3s(), Arrays.asList(a2, a1, a3)); + assertEquals(b3.getBi3List(), Arrays.asList(a2, a1, a3)); a2.setBi3(b1); - assertSame(a1.bi3(), b3); - assertSame(a2.bi3(), b1); - assertSame(a3.bi3(), b3); - assertEquals(b1.bi3(), Arrays.asList(a2)); - assertEquals(b2.bi3(), Arrays.asList()); - assertEquals(b3.bi3(), Arrays.asList(a1, a3)); + assertSame(a1.getBi3(), b3); + assertSame(a2.getBi3(), b1); + assertSame(a3.getBi3(), b3); + assertEquals(b1.getBi3s(), Arrays.asList(a2)); + assertEquals(b1.getBi3List(), Arrays.asList(a2)); + assertEquals(b2.getBi3s(), Arrays.asList()); + assertEquals(b2.getBi3List(), Arrays.asList()); + assertEquals(b3.getBi3s(), Arrays.asList(a1, a3)); + assertEquals(b3.getBi3List(), Arrays.asList(a1, a3)); try { a2.setBi3(null); @@ -241,7 +262,7 @@ public class All extends AbstractTests { /** - * rel A.bi4? <-> B.bi4; + * rel A.Bi4? <-> B.Bi4; */ private void testBi4() { testBi41(); @@ -256,10 +277,10 @@ public class All extends AbstractTests { // Change a2.setBi4(b1); - assertNull(a1.bi4()); - assertSame(a2.bi4(), b1); - assertSame(b1.bi4(), a2); - assertNull(b2.bi4()); + assertNull(a1.getBi4()); + assertSame(a2.getBi4(), b1); + assertSame(b1.getBi4(), a2); + assertNull(b2.getBi4()); } private void testBi42() { // Init @@ -269,16 +290,16 @@ public class All extends AbstractTests { // Change a2.setBi4(b2); - assertNull(a1.bi4()); - assertSame(a2.bi4(), b2); - assertNull(b1.bi4()); - assertSame(b2.bi4(), a2); + assertNull(a1.getBi4()); + assertSame(a2.getBi4(), b2); + assertNull(b1.getBi4()); + assertSame(b2.getBi4(), a2); } /** - * rel A.bi5? <-> B.bi5?; + * rel A.Bi5? <-> B.Bi5?; */ private void testBi5() { testBi51(); @@ -293,10 +314,10 @@ public class All extends AbstractTests { // Change a2.setBi5(b1); - assertNull(a1.bi5()); - assertSame(a2.bi5(), b1); - assertSame(b1.bi5(), a2); - assertNull(b2.bi5()); + assertNull(a1.getBi5()); + assertSame(a2.getBi5(), b1); + assertSame(b1.getBi5(), a2); + assertNull(b2.getBi5()); } private void testBi52() { // Init @@ -306,62 +327,77 @@ public class All extends AbstractTests { // Change a2.setBi5(b2); - assertNull(a1.bi5()); - assertSame(a2.bi5(), b2); - assertNull(b1.bi5()); - assertSame(b2.bi5(), a2); + assertNull(a1.getBi5()); + assertSame(a2.getBi5(), b2); + assertNull(b1.getBi5()); + assertSame(b2.getBi5(), a2); } /** - * rel A.bi6? <-> B.bi6*; + * rel A.Bi6? <-> B.Bi6*; */ private void testBi6() { setup(); a2.setBi6(b2); - assertNull(a1.bi6()); - assertSame(a2.bi6(), b2); - assertEquals(b1.bi6(), Arrays.asList()); - assertEquals(b2.bi6(), Arrays.asList(a2)); - assertEquals(b3.bi6(), Arrays.asList()); + assertNull(a1.getBi6()); + assertSame(a2.getBi6(), b2); + assertEquals(b1.getBi6s(), Arrays.asList()); + assertEquals(b1.getBi6List(), Arrays.asList()); + assertEquals(b2.getBi6s(), Arrays.asList(a2)); + assertEquals(b2.getBi6List(), Arrays.asList(a2)); + assertEquals(b3.getBi6s(), Arrays.asList()); + assertEquals(b3.getBi6List(), Arrays.asList()); a2.setBi6(b3); - assertNull(a1.bi6()); - assertSame(a2.bi6(), b3); - assertEquals(b1.bi6(), Arrays.asList()); - assertEquals(b2.bi6(), Arrays.asList()); - assertEquals(b3.bi6(), Arrays.asList(a2)); + assertNull(a1.getBi6()); + assertSame(a2.getBi6(), b3); + assertEquals(b1.getBi6s(), Arrays.asList()); + assertEquals(b1.getBi6List(), Arrays.asList()); + assertEquals(b2.getBi6s(), Arrays.asList()); + assertEquals(b2.getBi6List(), Arrays.asList()); + assertEquals(b3.getBi6s(), Arrays.asList(a2)); + assertEquals(b3.getBi6List(), Arrays.asList(a2)); a1.setBi6(b3); a3.setBi6(b3); - assertSame(a1.bi6(), b3); - assertSame(a2.bi6(), b3); - assertSame(a3.bi6(), b3); - assertEquals(b1.bi6(), Arrays.asList()); - assertEquals(b2.bi6(), Arrays.asList()); - assertEquals(b3.bi6(), Arrays.asList(a2, a1, a3)); + assertSame(a1.getBi6(), b3); + assertSame(a2.getBi6(), b3); + assertSame(a3.getBi6(), b3); + assertEquals(b1.getBi6s(), Arrays.asList()); + assertEquals(b1.getBi6List(), Arrays.asList()); + assertEquals(b2.getBi6s(), Arrays.asList()); + assertEquals(b2.getBi6List(), Arrays.asList()); + assertEquals(b3.getBi6s(), Arrays.asList(a2, a1, a3)); + assertEquals(b3.getBi6List(), Arrays.asList(a2, a1, a3)); a2.setBi6(b1); - assertSame(a1.bi6(), b3); - assertSame(a2.bi6(), b1); - assertSame(a3.bi6(), b3); - assertEquals(b1.bi6(), Arrays.asList(a2)); - assertEquals(b2.bi6(), Arrays.asList()); - assertEquals(b3.bi6(), Arrays.asList(a1, a3)); + assertSame(a1.getBi6(), b3); + assertSame(a2.getBi6(), b1); + assertSame(a3.getBi6(), b3); + assertEquals(b1.getBi6s(), Arrays.asList(a2)); + assertEquals(b1.getBi6List(), Arrays.asList(a2)); + assertEquals(b2.getBi6s(), Arrays.asList()); + assertEquals(b2.getBi6List(), Arrays.asList()); + assertEquals(b3.getBi6s(), Arrays.asList(a1, a3)); + assertEquals(b3.getBi6List(), Arrays.asList(a1, a3)); a2.clearBi6(); - assertSame(a1.bi6(), b3); - assertNull(a2.bi6()); - assertSame(a3.bi6(), b3); - assertEquals(b1.bi6(), Arrays.asList()); - assertEquals(b2.bi6(), Arrays.asList()); - assertEquals(b3.bi6(), Arrays.asList(a1, a3)); + assertSame(a1.getBi6(), b3); + assertNull(a2.getBi6()); + assertSame(a3.getBi6(), b3); + assertEquals(b1.getBi6s(), Arrays.asList()); + assertEquals(b1.getBi6List(), Arrays.asList()); + assertEquals(b2.getBi6s(), Arrays.asList()); + assertEquals(b2.getBi6List(), Arrays.asList()); + assertEquals(b3.getBi6s(), Arrays.asList(a1, a3)); + assertEquals(b3.getBi6List(), Arrays.asList(a1, a3)); assertTrue(a1.hasBi6()); assertFalse(a2.hasBi6()); @@ -371,165 +407,203 @@ public class All extends AbstractTests { /** - * rel A.bi7* <-> B.bi7; + * rel A.Bi7* <-> B.Bi7; */ private void testBi7() { setup(); - a2.addToBi7(b2); - - assertEquals(a1.bi7(), Arrays.asList()); - assertEquals(a2.bi7(), Arrays.asList(b2)); - assertNull(b1.bi7()); - assertSame(b2.bi7(), a2); - assertNull(b3.bi7()); - - a2.addToBi7(b3); - a1.addToBi7(b2); - - assertEquals(a1.bi7(), Arrays.asList(b2)); - assertEquals(a2.bi7(), Arrays.asList(b3)); - assertNull(b1.bi7()); - assertSame(b2.bi7(), a1); - assertSame(b3.bi7(), a2); - - a1.addToBi7(b1); - - assertEquals(a1.bi7(), Arrays.asList(b2, b1)); - assertEquals(a2.bi7(), Arrays.asList(b3)); - assertSame(b1.bi7(), a1); - assertSame(b2.bi7(), a1); - assertSame(b3.bi7(), a2); - - a1.addToBi7(b1); - - assertEquals(a1.bi7(), Arrays.asList(b2, b1)); - assertEquals(a2.bi7(), Arrays.asList(b3)); - assertSame(b1.bi7(), a1); - assertSame(b2.bi7(), a1); - assertSame(b3.bi7(), a2); - - a1.removeFromBi7(b1); - - assertEquals(a1.bi7(), Arrays.asList(b2)); - assertEquals(a2.bi7(), Arrays.asList(b3)); - assertNull(b1.bi7()); - assertSame(b2.bi7(), a1); - assertSame(b3.bi7(), a2); + a2.addBi7(b2); + + assertEquals(a1.getBi7s(), Arrays.asList()); + assertEquals(a1.getBi7List(), Arrays.asList()); + assertEquals(a2.getBi7s(), Arrays.asList(b2)); + assertEquals(a2.getBi7List(), Arrays.asList(b2)); + assertNull(b1.getBi7()); + assertSame(b2.getBi7(), a2); + assertNull(b3.getBi7()); + + a2.addBi7(b3); + a1.addBi7(b2); + + assertEquals(a1.getBi7s(), Arrays.asList(b2)); + assertEquals(a1.getBi7List(), Arrays.asList(b2)); + assertEquals(a2.getBi7s(), Arrays.asList(b3)); + assertEquals(a2.getBi7List(), Arrays.asList(b3)); + assertNull(b1.getBi7()); + assertSame(b2.getBi7(), a1); + assertSame(b3.getBi7(), a2); + + a1.addBi7(b1); + + assertEquals(a1.getBi7s(), Arrays.asList(b2, b1)); + assertEquals(a1.getBi7List(), Arrays.asList(b2, b1)); + assertEquals(a2.getBi7s(), Arrays.asList(b3)); + assertEquals(a2.getBi7List(), Arrays.asList(b3)); + assertSame(b1.getBi7(), a1); + assertSame(b2.getBi7(), a1); + assertSame(b3.getBi7(), a2); + + a1.addBi7(b1); + + assertEquals(a1.getBi7s(), Arrays.asList(b2, b1)); + assertEquals(a1.getBi7List(), Arrays.asList(b2, b1)); + assertEquals(a2.getBi7s(), Arrays.asList(b3)); + assertEquals(a2.getBi7List(), Arrays.asList(b3)); + assertSame(b1.getBi7(), a1); + assertSame(b2.getBi7(), a1); + assertSame(b3.getBi7(), a2); + + a1.removeBi7(b1); + + assertEquals(a1.getBi7s(), Arrays.asList(b2)); + assertEquals(a1.getBi7List(), Arrays.asList(b2)); + assertEquals(a2.getBi7s(), Arrays.asList(b3)); + assertEquals(a2.getBi7List(), Arrays.asList(b3)); + assertNull(b1.getBi7()); + assertSame(b2.getBi7(), a1); + assertSame(b3.getBi7(), a2); } /** - * rel A.bi8* <-> B.bi8?; + * rel A.Bi8* <-> B.Bi8?; */ private void testBi8() { setup(); - a2.addToBi8(b2); - - assertEquals(a1.bi8(), Arrays.asList()); - assertEquals(a2.bi8(), Arrays.asList(b2)); - assertNull(b1.bi8()); - assertSame(b2.bi8(), a2); - assertNull(b3.bi8()); - - a2.addToBi8(b3); - a1.addToBi8(b2); - - assertEquals(a1.bi8(), Arrays.asList(b2)); - assertEquals(a2.bi8(), Arrays.asList(b3)); - assertNull(b1.bi8()); - assertSame(b2.bi8(), a1); - assertSame(b3.bi8(), a2); - - a1.addToBi8(b1); - - assertEquals(a1.bi8(), Arrays.asList(b2, b1)); - assertEquals(a2.bi8(), Arrays.asList(b3)); - assertSame(b1.bi8(), a1); - assertSame(b2.bi8(), a1); - assertSame(b3.bi8(), a2); - - a1.addToBi8(b1); - - assertEquals(a1.bi8(), Arrays.asList(b2, b1)); - assertEquals(a2.bi8(), Arrays.asList(b3)); - assertSame(b1.bi8(), a1); - assertSame(b2.bi8(), a1); - assertSame(b3.bi8(), a2); - - a1.removeFromBi8(b1); - - assertEquals(a1.bi8(), Arrays.asList(b2)); - assertEquals(a2.bi8(), Arrays.asList(b3)); - assertNull(b1.bi8()); - assertSame(b2.bi8(), a1); - assertSame(b3.bi8(), a2); + a2.addBi8(b2); + + assertEquals(a1.getBi8s(), Arrays.asList()); + assertEquals(a1.getBi8List(), Arrays.asList()); + assertEquals(a2.getBi8s(), Arrays.asList(b2)); + assertEquals(a2.getBi8List(), Arrays.asList(b2)); + assertNull(b1.getBi8()); + assertSame(b2.getBi8(), a2); + assertNull(b3.getBi8()); + + a2.addBi8(b3); + a1.addBi8(b2); + + assertEquals(a1.getBi8s(), Arrays.asList(b2)); + assertEquals(a1.getBi8List(), Arrays.asList(b2)); + assertEquals(a2.getBi8s(), Arrays.asList(b3)); + assertEquals(a2.getBi8List(), Arrays.asList(b3)); + assertNull(b1.getBi8()); + assertSame(b2.getBi8(), a1); + assertSame(b3.getBi8(), a2); + + a1.addBi8(b1); + + assertEquals(a1.getBi8s(), Arrays.asList(b2, b1)); + assertEquals(a1.getBi8List(), Arrays.asList(b2, b1)); + assertEquals(a2.getBi8s(), Arrays.asList(b3)); + assertEquals(a2.getBi8List(), Arrays.asList(b3)); + assertSame(b1.getBi8(), a1); + assertSame(b2.getBi8(), a1); + assertSame(b3.getBi8(), a2); + + a1.addBi8(b1); + + assertEquals(a1.getBi8s(), Arrays.asList(b2, b1)); + assertEquals(a1.getBi8List(), Arrays.asList(b2, b1)); + assertEquals(a2.getBi8s(), Arrays.asList(b3)); + assertEquals(a2.getBi8List(), Arrays.asList(b3)); + assertSame(b1.getBi8(), a1); + assertSame(b2.getBi8(), a1); + assertSame(b3.getBi8(), a2); + + a1.removeBi8(b1); + + assertEquals(a1.getBi8s(), Arrays.asList(b2)); + assertEquals(a1.getBi8List(), Arrays.asList(b2)); + assertEquals(a2.getBi8s(), Arrays.asList(b3)); + assertEquals(a2.getBi8List(), Arrays.asList(b3)); + assertNull(b1.getBi8()); + assertSame(b2.getBi8(), a1); + assertSame(b3.getBi8(), a2); } /** - * rel A.bi9* <-> B.bi9*; + * rel A.Bi9* <-> B.Bi9*; */ private void testBi9() { setup(); - a1.addToBi9(b1); - a1.addToBi9(b2); - - assertEquals(a1.bi9(), Arrays.asList(b1, b2)); - assertEquals(a2.bi9(), Arrays.asList()); - assertEquals(a3.bi9(), Arrays.asList()); - assertEquals(b1.bi9(), Arrays.asList(a1)); - assertEquals(b2.bi9(), Arrays.asList(a1)); - assertEquals(b3.bi9(), Arrays.asList()); - - b3.addToBi9(a1); - b3.addToBi9(a3); - b3.addToBi9(a1); - - assertEquals(a1.bi9(), Arrays.asList(b1, b2, b3, b3)); - assertEquals(a2.bi9(), Arrays.asList()); - assertEquals(a3.bi9(), Arrays.asList(b3)); - assertEquals(b1.bi9(), Arrays.asList(a1)); - assertEquals(b2.bi9(), Arrays.asList(a1)); - assertEquals(b3.bi9(), Arrays.asList(a1, a3, a1)); - - b3.removeFromBi9(a1); - - assertEquals(a1.bi9(), Arrays.asList(b1, b2, b3)); - assertEquals(a2.bi9(), Arrays.asList()); - assertEquals(a3.bi9(), Arrays.asList(b3)); - assertEquals(b1.bi9(), Arrays.asList(a1)); - assertEquals(b2.bi9(), Arrays.asList(a1)); - assertEquals(b3.bi9(), Arrays.asList(a3, a1)); + a1.addBi9(b1); + a1.addBi9(b2); + + assertEquals(a1.getBi9s(), Arrays.asList(b1, b2)); + assertEquals(a1.getBi9List(), Arrays.asList(b1, b2)); + assertEquals(a2.getBi9s(), Arrays.asList()); + assertEquals(a2.getBi9List(), Arrays.asList()); + assertEquals(a3.getBi9s(), Arrays.asList()); + assertEquals(a3.getBi9List(), Arrays.asList()); + assertEquals(b1.getBi9s(), Arrays.asList(a1)); + assertEquals(b1.getBi9List(), Arrays.asList(a1)); + assertEquals(b2.getBi9s(), Arrays.asList(a1)); + assertEquals(b2.getBi9List(), Arrays.asList(a1)); + assertEquals(b3.getBi9s(), Arrays.asList()); + assertEquals(b3.getBi9List(), Arrays.asList()); + + b3.addBi9(a1); + b3.addBi9(a3); + b3.addBi9(a1); + + assertEquals(a1.getBi9s(), Arrays.asList(b1, b2, b3, b3)); + assertEquals(a1.getBi9List(), Arrays.asList(b1, b2, b3, b3)); + assertEquals(a2.getBi9s(), Arrays.asList()); + assertEquals(a2.getBi9List(), Arrays.asList()); + assertEquals(a3.getBi9s(), Arrays.asList(b3)); + assertEquals(a3.getBi9List(), Arrays.asList(b3)); + assertEquals(b1.getBi9s(), Arrays.asList(a1)); + assertEquals(b1.getBi9List(), Arrays.asList(a1)); + assertEquals(b2.getBi9s(), Arrays.asList(a1)); + assertEquals(b2.getBi9List(), Arrays.asList(a1)); + assertEquals(b3.getBi9s(), Arrays.asList(a1, a3, a1)); + assertEquals(b3.getBi9List(), Arrays.asList(a1, a3, a1)); + + b3.removeBi9(a1); + + assertEquals(a1.getBi9s(), Arrays.asList(b1, b2, b3)); + assertEquals(a1.getBi9List(), Arrays.asList(b1, b2, b3)); + assertEquals(a2.getBi9s(), Arrays.asList()); + assertEquals(a2.getBi9List(), Arrays.asList()); + assertEquals(a3.getBi9s(), Arrays.asList(b3)); + assertEquals(a3.getBi9List(), Arrays.asList(b3)); + assertEquals(b1.getBi9s(), Arrays.asList(a1)); + assertEquals(b1.getBi9List(), Arrays.asList(a1)); + assertEquals(b2.getBi9s(), Arrays.asList(a1)); + assertEquals(b2.getBi9List(), Arrays.asList(a1)); + assertEquals(b3.getBi9s(), Arrays.asList(a3, a1)); + assertEquals(b3.getBi9List(), Arrays.asList(a3, a1)); } public void testImmutableList() { setup(); - a1.addToDi3(b1); - a1.addToDi3(b2); + a1.addDi3(b1); + a1.addDi3(b2); try { - a1.di3().add(b3); + a1.getDi3s().add(b3); assertException(); } catch (Exception e) { // OK } - a1.addToBi7(b1); - a1.addToBi7(b2); + a1.addBi7(b1); + a1.addBi7(b2); try { - a1.bi7().add(b3); + a1.getBi7s().add(b3); assertException(); } catch (Exception e) { // OK } - a1.addToBi9(b1); - a1.addToBi9(b2); + a1.addBi9(b1); + a1.addBi9(b2); try { - a1.bi9().add(b3); + a1.getBi9s().add(b3); assertException(); } catch (Exception e) { // OK @@ -552,4 +626,4 @@ public class All extends AbstractTests { r.addB(b2); r.addB(b3); } -} \ No newline at end of file +} diff --git a/tests/valid/All.relast b/tests/valid/All.relast index 56fe6de..51f3c62 100644 --- a/tests/valid/All.relast +++ b/tests/valid/All.relast @@ -2,18 +2,18 @@ Root ::= A* B*; A ::= ; B ::= ; -rel A.di1 -> B; -rel A.di2? -> B; -rel A.di3* -> B; +rel A.Di1 -> B; +rel A.Di2? -> B; +rel A.Di3* -> B; -rel A.bi1 <-> B.bi1; -rel A.bi2 <-> B.bi2?; -rel A.bi3 <-> B.bi3*; +rel A.Bi1 <-> B.Bi1; +rel A.Bi2 <-> B.Bi2?; +rel A.Bi3 <-> B.Bi3*; -rel A.bi4? <-> B.bi4; -rel A.bi5? <-> B.bi5?; -rel A.bi6? <-> B.bi6*; +rel A.Bi4? <-> B.Bi4; +rel A.Bi5? <-> B.Bi5?; +rel A.Bi6? <-> B.Bi6*; -rel A.bi7* <-> B.bi7; -rel A.bi8* <-> B.bi8?; -rel A.bi9* <-> B.bi9*; +rel A.Bi7* <-> B.Bi7; +rel A.Bi8* <-> B.Bi8?; +rel A.Bi9* <-> B.Bi9*; diff --git a/tests/valid/LowerBounds.java b/tests/valid/LowerBounds.java index 4fe5ea6..2c8d0b2 100644 --- a/tests/valid/LowerBounds.java +++ b/tests/valid/LowerBounds.java @@ -10,9 +10,9 @@ public class LowerBounds extends AbstractTests { * A ::= [C]; * B ::= ; * C ::= ; - * rel A.b -> B; - * rel B.c <-> C.b; - * rel Root.aa? -> A; + * rel A.Br -> B; + * rel B.Cr <-> C.Br; + * rel Root.Aa? -> A; */ public void test() { Root r = new Root(); @@ -29,19 +29,19 @@ public class LowerBounds extends AbstractTests { assertTrue(r.violatesLowerBounds()); - a1.setB(b1); - a2.setB(b2); - b1.setC(c1); - b2.setC(c2); + a1.setBr(b1); + a2.setBr(b2); + b1.setCr(c1); + b2.setCr(c2); assertFalse(r.violatesLowerBounds()); - b2.setC(c1); + b2.setCr(c1); assertTrue(r.violatesLowerBounds()); - b1.setC(c2); + b1.setCr(c2); assertFalse(r.violatesLowerBounds()); } -} \ No newline at end of file +} diff --git a/tests/valid/LowerBounds.relast b/tests/valid/LowerBounds.relast index 43b2340..27932b7 100644 --- a/tests/valid/LowerBounds.relast +++ b/tests/valid/LowerBounds.relast @@ -3,6 +3,6 @@ A ::= [C]; B ::= ; C ::= ; -rel A.b -> B; -rel B.c <-> C.b; -rel Root.aa? -> A; +rel A.Br -> B; +rel B.Cr <-> C.Br; +rel Root.Aa? -> A; -- GitLab From d03c09882c7163c303b21a93e7adea6f68aa2d4e Mon Sep 17 00:00:00 2001 From: Johannes Mey Date: Fri, 22 Feb 2019 10:30:34 +0100 Subject: [PATCH 06/62] switch to gradle build --- .gitignore | 20 +- README.md | 5 +- build.gradle | 104 + build.xml | 161 -- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 172 ++ gradlew.bat | 84 + spec/parser/Preamble.parser | 5 - .../jastadd/relast/tests/AnalysisTests.java | 14 - {spec => src/main}/jastadd/Analysis.jrag | 0 {spec => src/main}/jastadd/Backend.jadd | 0 {spec => src/main}/jastadd/DumpTree.jrag | 0 {spec => src/main}/jastadd/Errors.jrag | 0 src/main/jastadd/Preamble.parser | 6 + {spec => src/main}/jastadd/RelAst.ast | 0 .../scanner => src/main/jastadd}/RelAst.flex | 4 +- .../main/jastadd/RelAst.parser | 0 .../org/jastadd/relast/compiler/Compiler.java | 3 + .../org/jastadd/relast/compiler/Utils.java | 0 .../relast/compiler/options/CommandLine.java | 0 .../relast/compiler/options/EnumOption.java | 0 .../relast/compiler/options/FlagOption.java | 0 .../relast/compiler/options/Option.java | 0 .../relast/compiler/options/StringOption.java | 0 .../jastadd/relast/tests/AnalysisTests.java | 7 + .../relast/tests/testsuite/TestSuite.java | 72 +- tests/Makefile | 4 +- tests/errors/Makefile | 8 +- tests/valid/Makefile | 8 +- tools/JFlex.jar | Bin 942317 -> 0 bytes tools/JastAddParser.jar | Bin 213686 -> 0 bytes tools/RagDoll.jar | Bin 495833 -> 0 bytes tools/beaver-rt.jar | Bin 11348 -> 0 bytes tools/beaver.jar | Bin 92668 -> 0 bytes tools/jastadd2.jar | Bin 759660 -> 0 bytes .../junit4.11-SNAPSHOT/allclasses-frame.html | 285 -- .../allclasses-noframe.html | 285 -- .../junit4.11-SNAPSHOT/constant-values.html | 144 - .../junit4.11-SNAPSHOT/deprecated-list.html | 319 --- .../javadoc/junit4.11-SNAPSHOT/help-doc.html | 217 -- .../javadoc/junit4.11-SNAPSHOT/index-all.html | 2529 ----------------- tools/javadoc/junit4.11-SNAPSHOT/index.html | 39 - .../org/hamcrest/BaseDescription.html | 512 ---- .../org/hamcrest/BaseMatcher.html | 344 --- .../org/hamcrest/Condition.Step.html | 209 -- .../org/hamcrest/Condition.html | 406 --- .../org/hamcrest/CoreMatchers.html | 1627 ----------- .../org/hamcrest/CustomMatcher.html | 298 -- .../org/hamcrest/CustomTypeSafeMatcher.html | 299 -- .../hamcrest/Description.NullDescription.html | 480 ---- .../org/hamcrest/Description.html | 410 --- .../org/hamcrest/DiagnosingMatcher.html | 342 --- .../org/hamcrest/Factory.html | 172 -- .../org/hamcrest/FeatureMatcher.html | 343 --- .../org/hamcrest/Matcher.html | 308 -- .../org/hamcrest/MatcherAssert.html | 310 -- .../org/hamcrest/SelfDescribing.html | 218 -- .../org/hamcrest/StringDescription.html | 418 --- .../hamcrest/TypeSafeDiagnosingMatcher.html | 396 --- .../org/hamcrest/TypeSafeMatcher.html | 410 --- .../org/hamcrest/core/AllOf.html | 554 ---- .../org/hamcrest/core/AnyOf.html | 596 ---- ...mbinableMatcher.CombinableBothMatcher.html | 253 -- ...inableMatcher.CombinableEitherMatcher.html | 253 -- .../org/hamcrest/core/CombinableMatcher.html | 431 --- .../org/hamcrest/core/DescribedAs.html | 371 --- .../org/hamcrest/core/Every.html | 341 --- .../org/hamcrest/core/Is.html | 472 --- .../org/hamcrest/core/IsAnything.html | 358 --- .../hamcrest/core/IsCollectionContaining.html | 450 --- .../org/hamcrest/core/IsEqual.html | 350 --- .../org/hamcrest/core/IsInstanceOf.html | 388 --- .../org/hamcrest/core/IsNot.html | 366 --- .../org/hamcrest/core/IsNull.html | 416 --- .../org/hamcrest/core/IsSame.html | 360 --- .../org/hamcrest/core/StringContains.html | 356 --- .../org/hamcrest/core/StringEndsWith.html | 356 --- .../org/hamcrest/core/StringStartsWith.html | 356 --- .../org/hamcrest/core/SubstringMatcher.html | 411 --- .../org/hamcrest/core/package-frame.html | 68 - .../org/hamcrest/core/package-summary.html | 244 -- .../org/hamcrest/core/package-tree.html | 162 -- .../org/hamcrest/internal/ArrayIterator.html | 300 -- .../internal/ReflectiveTypeFinder.html | 294 -- .../internal/SelfDescribingValue.html | 261 -- .../internal/SelfDescribingValueIterator.html | 300 -- .../org/hamcrest/internal/package-frame.html | 38 - .../hamcrest/internal/package-summary.html | 167 -- .../org/hamcrest/internal/package-tree.html | 154 - .../org/hamcrest/package-frame.html | 84 - .../org/hamcrest/package-summary.html | 261 -- .../org/hamcrest/package-tree.html | 175 -- .../junit4.11-SNAPSHOT/org/junit/After.html | 197 -- .../org/junit/AfterClass.html | 200 -- .../junit4.11-SNAPSHOT/org/junit/Assert.html | 1663 ----------- .../junit4.11-SNAPSHOT/org/junit/Assume.html | 374 --- .../junit4.11-SNAPSHOT/org/junit/Before.html | 197 -- .../org/junit/BeforeClass.html | 195 -- .../org/junit/ClassRule.html | 247 -- .../org/junit/ComparisonFailure.html | 336 --- .../org/junit/FixMethodOrder.html | 228 -- .../junit4.11-SNAPSHOT/org/junit/Ignore.html | 229 -- .../junit4.11-SNAPSHOT/org/junit/Rule.html | 230 -- .../org/junit/Test.None.html | 211 -- .../junit4.11-SNAPSHOT/org/junit/Test.html | 273 -- .../junit/experimental/ParallelComputer.html | 342 --- .../categories/Categories.CategoryFilter.html | 332 --- .../Categories.ExcludeCategory.html | 206 -- .../Categories.IncludeCategory.html | 206 -- .../experimental/categories/Categories.html | 351 --- .../experimental/categories/Category.html | 241 -- .../categories/package-frame.html | 49 - .../categories/package-summary.html | 183 -- .../experimental/categories/package-tree.html | 169 -- .../max/CouldNotReadCoreException.html | 244 -- .../org/junit/experimental/max/MaxCore.html | 368 --- .../junit/experimental/max/MaxHistory.html | 285 -- .../junit/experimental/max/package-frame.html | 45 - .../experimental/max/package-summary.html | 178 -- .../junit/experimental/max/package-tree.html | 157 - .../org/junit/experimental/package-frame.html | 32 - .../junit/experimental/package-summary.html | 155 - .../org/junit/experimental/package-tree.html | 153 - .../experimental/results/PrintableResult.html | 328 --- .../experimental/results/ResultMatchers.html | 326 --- .../experimental/results/package-frame.html | 34 - .../experimental/results/package-summary.html | 159 -- .../experimental/results/package-tree.html | 151 - .../junit/experimental/runners/Enclosed.html | 301 -- .../experimental/runners/package-frame.html | 32 - .../experimental/runners/package-summary.html | 155 - .../experimental/runners/package-tree.html | 159 -- .../experimental/theories/DataPoint.html | 166 -- .../experimental/theories/DataPoints.html | 166 -- .../theories/ParameterSignature.html | 387 --- .../theories/ParameterSupplier.html | 253 -- .../theories/ParametersSuppliedBy.html | 206 -- ...gnment.CouldNotGenerateValueException.html | 241 -- .../theories/PotentialAssignment.html | 313 -- .../theories/Theories.TheoryAnchor.html | 405 --- .../junit/experimental/theories/Theories.html | 449 --- .../junit/experimental/theories/Theory.html | 198 -- .../experimental/theories/package-frame.html | 68 - .../theories/package-summary.html | 211 -- .../experimental/theories/package-tree.html | 175 -- .../theories/suppliers/TestedOn.html | 206 -- .../theories/suppliers/TestedOnSupplier.html | 254 -- .../theories/suppliers/package-frame.html | 43 - .../theories/suppliers/package-summary.html | 169 -- .../theories/suppliers/package-tree.html | 159 -- .../org/junit/matchers/JUnitMatchers.html | 543 ---- .../org/junit/matchers/package-frame.html | 32 - .../org/junit/matchers/package-summary.html | 177 -- .../org/junit/matchers/package-tree.html | 151 - .../org/junit/package-frame.html | 74 - .../org/junit/package-summary.html | 247 -- .../org/junit/package-tree.html | 172 -- .../org/junit/rules/ErrorCollector.html | 408 --- .../org/junit/rules/ExpectedException.html | 503 ---- .../org/junit/rules/ExternalResource.html | 354 --- .../org/junit/rules/MethodRule.html | 247 -- .../org/junit/rules/RuleChain.html | 346 --- .../org/junit/rules/RunRules.html | 272 -- .../org/junit/rules/TemporaryFolder.html | 525 ---- .../org/junit/rules/TestName.html | 314 -- .../org/junit/rules/TestRule.html | 257 -- .../org/junit/rules/TestWatcher.html | 404 --- .../org/junit/rules/TestWatchman.html | 408 --- .../org/junit/rules/Timeout.html | 298 -- .../org/junit/rules/Verifier.html | 323 --- .../org/junit/rules/package-frame.html | 65 - .../org/junit/rules/package-summary.html | 333 --- .../org/junit/rules/package-tree.html | 171 -- .../org/junit/runner/Computer.html | 318 --- .../org/junit/runner/Describable.html | 216 -- .../org/junit/runner/Description.html | 869 ------ .../org/junit/runner/JUnitCore.html | 493 ---- .../org/junit/runner/Request.html | 544 ---- .../org/junit/runner/Result.html | 405 --- .../org/junit/runner/RunWith.html | 231 -- .../org/junit/runner/Runner.html | 327 --- .../org/junit/runner/manipulation/Filter.html | 400 --- .../junit/runner/manipulation/Filterable.html | 221 -- .../manipulation/NoTestsRemainException.html | 244 -- .../junit/runner/manipulation/Sortable.html | 220 -- .../org/junit/runner/manipulation/Sorter.html | 344 --- .../runner/manipulation/package-frame.html | 58 - .../runner/manipulation/package-summary.html | 208 -- .../runner/manipulation/package-tree.html | 162 -- .../junit/runner/notification/Failure.html | 393 --- .../runner/notification/RunListener.html | 433 --- .../runner/notification/RunNotifier.html | 485 ---- .../notification/StoppedByUserException.html | 247 -- .../runner/notification/package-frame.html | 47 - .../runner/notification/package-summary.html | 196 -- .../runner/notification/package-tree.html | 159 -- .../org/junit/runner/package-frame.html | 64 - .../org/junit/runner/package-summary.html | 223 -- .../org/junit/runner/package-tree.html | 165 -- .../org/junit/runners/AllTests.html | 280 -- .../junit/runners/BlockJUnit4ClassRunner.html | 869 ------ .../org/junit/runners/JUnit4.html | 277 -- .../org/junit/runners/MethodSorters.html | 373 --- .../runners/Parameterized.Parameter.html | 214 -- .../runners/Parameterized.Parameters.html | 224 -- .../org/junit/runners/Parameterized.html | 426 --- .../org/junit/runners/ParentRunner.html | 798 ------ .../org/junit/runners/Suite.SuiteClasses.html | 214 -- .../org/junit/runners/Suite.html | 506 ---- .../junit/runners/model/FrameworkField.html | 390 --- .../junit/runners/model/FrameworkMember.html | 318 --- .../junit/runners/model/FrameworkMethod.html | 652 ----- .../runners/model/InitializationError.html | 310 -- .../model/MultipleFailureException.html | 321 --- .../junit/runners/model/RunnerBuilder.html | 362 --- .../junit/runners/model/RunnerScheduler.html | 242 -- .../org/junit/runners/model/Statement.html | 267 -- .../org/junit/runners/model/TestClass.html | 453 --- .../junit/runners/model/package-frame.html | 66 - .../junit/runners/model/package-summary.html | 213 -- .../org/junit/runners/model/package-tree.html | 163 -- .../org/junit/runners/package-frame.html | 68 - .../org/junit/runners/package-summary.html | 240 -- .../org/junit/runners/package-tree.html | 184 -- .../junit4.11-SNAPSHOT/overview-frame.html | 76 - .../junit4.11-SNAPSHOT/overview-summary.html | 219 -- .../junit4.11-SNAPSHOT/overview-tree.html | 266 -- tools/javadoc/junit4.11-SNAPSHOT/package-list | 18 - .../junit4.11-SNAPSHOT/resources/inherit.gif | Bin 57 -> 0 bytes .../junit4.11-SNAPSHOT/serialized-form.html | 577 ---- .../javadoc/junit4.11-SNAPSHOT/stylesheet.css | 1 - tools/junit-4.11-SNAPSHOT-src.jar | Bin 148579 -> 0 bytes tools/junit-4.11-SNAPSHOT.jar | Bin 287437 -> 0 bytes tools/junit-4.8.2.jar | Bin 237344 -> 0 bytes 235 files changed, 438 insertions(+), 59383 deletions(-) create mode 100644 build.gradle delete mode 100755 build.xml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 spec/parser/Preamble.parser delete mode 100644 src/java/org/jastadd/relast/tests/AnalysisTests.java rename {spec => src/main}/jastadd/Analysis.jrag (100%) rename {spec => src/main}/jastadd/Backend.jadd (100%) rename {spec => src/main}/jastadd/DumpTree.jrag (100%) rename {spec => src/main}/jastadd/Errors.jrag (100%) create mode 100644 src/main/jastadd/Preamble.parser rename {spec => src/main}/jastadd/RelAst.ast (100%) rename {spec/scanner => src/main/jastadd}/RelAst.flex (96%) rename spec/parser/RelAstBase.parser => src/main/jastadd/RelAst.parser (100%) rename src/{ => main}/java/org/jastadd/relast/compiler/Compiler.java (97%) rename src/{ => main}/java/org/jastadd/relast/compiler/Utils.java (100%) rename src/{ => main}/java/org/jastadd/relast/compiler/options/CommandLine.java (100%) rename src/{ => main}/java/org/jastadd/relast/compiler/options/EnumOption.java (100%) rename src/{ => main}/java/org/jastadd/relast/compiler/options/FlagOption.java (100%) rename src/{ => main}/java/org/jastadd/relast/compiler/options/Option.java (100%) rename src/{ => main}/java/org/jastadd/relast/compiler/options/StringOption.java (100%) create mode 100644 src/test/java/org/jastadd/relast/tests/AnalysisTests.java rename src/{ => test}/java/org/jastadd/relast/tests/testsuite/TestSuite.java (89%) delete mode 100644 tools/JFlex.jar delete mode 100644 tools/JastAddParser.jar delete mode 100644 tools/RagDoll.jar delete mode 100644 tools/beaver-rt.jar delete mode 100644 tools/beaver.jar delete mode 100644 tools/jastadd2.jar delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/allclasses-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/allclasses-noframe.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/constant-values.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/deprecated-list.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/help-doc.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/index-all.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/index.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/BaseDescription.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/BaseMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/Condition.Step.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/Condition.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/CoreMatchers.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/CustomMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/CustomTypeSafeMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/Description.NullDescription.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/Description.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/DiagnosingMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/Factory.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/FeatureMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/Matcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/MatcherAssert.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/SelfDescribing.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/StringDescription.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/TypeSafeDiagnosingMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/TypeSafeMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/AllOf.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/AnyOf.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/CombinableMatcher.CombinableBothMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/CombinableMatcher.CombinableEitherMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/CombinableMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/DescribedAs.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/Every.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/Is.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/IsAnything.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/IsCollectionContaining.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/IsEqual.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/IsInstanceOf.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/IsNot.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/IsNull.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/IsSame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/StringContains.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/StringEndsWith.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/StringStartsWith.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/SubstringMatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/core/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/internal/ArrayIterator.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/internal/ReflectiveTypeFinder.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/internal/SelfDescribingValue.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/internal/SelfDescribingValueIterator.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/internal/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/internal/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/internal/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/hamcrest/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/After.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/AfterClass.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/Assert.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/Assume.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/Before.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/BeforeClass.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/ClassRule.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/ComparisonFailure.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/FixMethodOrder.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/Ignore.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/Rule.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/Test.None.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/Test.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/ParallelComputer.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/categories/Categories.CategoryFilter.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/categories/Categories.ExcludeCategory.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/categories/Categories.IncludeCategory.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/categories/Categories.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/categories/Category.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/categories/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/categories/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/categories/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/max/CouldNotReadCoreException.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/max/MaxCore.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/max/MaxHistory.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/max/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/max/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/max/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/results/PrintableResult.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/results/ResultMatchers.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/results/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/results/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/results/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/runners/Enclosed.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/runners/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/runners/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/runners/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/DataPoint.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/DataPoints.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/ParameterSignature.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/ParameterSupplier.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/ParametersSuppliedBy.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/PotentialAssignment.CouldNotGenerateValueException.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/PotentialAssignment.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/Theories.TheoryAnchor.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/Theories.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/Theory.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/suppliers/TestedOn.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/suppliers/TestedOnSupplier.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/suppliers/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/suppliers/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/experimental/theories/suppliers/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/matchers/JUnitMatchers.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/matchers/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/matchers/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/matchers/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/ErrorCollector.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/ExpectedException.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/ExternalResource.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/MethodRule.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/RuleChain.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/RunRules.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/TemporaryFolder.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/TestName.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/TestRule.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/TestWatcher.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/TestWatchman.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/Timeout.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/Verifier.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/rules/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/Computer.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/Describable.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/Description.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/JUnitCore.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/Request.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/Result.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/RunWith.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/Runner.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/manipulation/Filter.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/manipulation/Filterable.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/manipulation/NoTestsRemainException.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/manipulation/Sortable.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/manipulation/Sorter.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/manipulation/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/manipulation/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/manipulation/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/notification/Failure.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/notification/RunListener.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/notification/RunNotifier.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/notification/StoppedByUserException.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/notification/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/notification/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/notification/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runner/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/AllTests.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/BlockJUnit4ClassRunner.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/JUnit4.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/MethodSorters.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/Parameterized.Parameter.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/Parameterized.Parameters.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/Parameterized.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/ParentRunner.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/Suite.SuiteClasses.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/Suite.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/FrameworkField.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/FrameworkMember.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/FrameworkMethod.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/InitializationError.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/MultipleFailureException.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/RunnerBuilder.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/RunnerScheduler.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/Statement.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/TestClass.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/model/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/package-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/package-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/org/junit/runners/package-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/overview-frame.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/overview-summary.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/overview-tree.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/package-list delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/resources/inherit.gif delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/serialized-form.html delete mode 100644 tools/javadoc/junit4.11-SNAPSHOT/stylesheet.css delete mode 100644 tools/junit-4.11-SNAPSHOT-src.jar delete mode 100644 tools/junit-4.11-SNAPSHOT.jar delete mode 100644 tools/junit-4.8.2.jar diff --git a/.gitignore b/.gitignore index 50d1074..ed82bf2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,7 @@ -.DS_Store +*.jar +.idea/ +.gradle/ +build +src/gen-res/ +src/gen/ *.class -.vimrc -.*.swp -/*.relast - -/.settings -/bin/ -/ant-bin/ -/relast-compiler.jar -/src/generated/ -/.gradle - -/.idea/ -*.iml diff --git a/README.md b/README.md index e7ca89e..68b7a36 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,14 @@ Run preprocessor on train benchmark (output written to standard output): - $ ant jar + $ ./gradlew jar $ cat examples/TrainBenchmark.relast $ java -jar relast-compiler.jar examples/TrainBenchmark.relast + $ java -jar build/libs/relast.jar examples/TrainBenchmark.relast Run preprocessor and write output to files: - $ java -jar relast-compiler.jar examples/TrainBenchmark.relast --file + $ java -jar build/libs/relast.jar examples/TrainBenchmark.relast --file $ cat examples/TrainBenchmarkGen.ast $ cat examples/TrainBenchmarkGen.jadd diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..992c466 --- /dev/null +++ b/build.gradle @@ -0,0 +1,104 @@ +apply plugin: 'java' +apply plugin: 'jastadd' +apply plugin: 'application' +apply plugin: "idea" + +sourceCompatibility = 1.8 + +mainClassName = 'org.jastadd.relast.compiler.Compiler' + +repositories { + jcenter() +} + +buildscript { + repositories.jcenter() + dependencies { + classpath 'org.jastadd:jastaddgradle:1.13.3' + } +} + +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.0' + compile group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' +// compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.10.0' +// compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.10.0' +} + +sourceSets { + main { + java.srcDir "src/gen/java" + } +} + +jar { + manifest { + attributes "Main-Class": 'org.jastadd.relast.compiler.Compiler' + } + + from { + configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + } +} + +jastadd { + configureModuleBuild() + modules { + module("RelAst") { + + java { + basedir "." + include "src/main/**/*.java" + include "src/gen/**/*.java" + } + + jastadd { + basedir "src/main/jastadd/" + include "**/*.ast" + include "**/*.jadd" + include "**/*.jrag" + } + + scanner { + include "src/main/jastadd/RelAst.flex" + } + + parser { + include "src/main/jastadd/Preamble.parser" + include "src/main/jastadd/RelAst.parser" + } + } + } + + cleanGen.doFirst { + delete "src/gen/java/de" + delete "src/gen-res/BuildInfo.properties" + } + + preprocessParser.doFirst { + + args += ["--no-beaver-symbol"] + + } + + module = "RelAst" + + astPackage = 'org.jastadd.relast.ast' + + parser.name = 'RelAstParser' + + genDir = 'src/gen/java' + + buildInfoDir = 'src/gen-res' + + scanner.genDir = "src/gen/java/org/jastadd/relast/scanner" + parser.genDir = "src/gen/java/org/jastadd/relast/parser" + + jastaddOptions = ["--lineColumnNumbers", "--safeLazy", "--visitCheck=true", "--rewrite=cnta", "--cache=all"] +} + + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/build.xml b/build.xml deleted file mode 100755 index 50520f7..0000000 --- a/build.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..01b8bf6b1f99cad9213fc495b33ad5bbab8efd20 GIT binary patch literal 54329 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

<5G2M1WZP5 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