From 82d16d23154f3725759b0e1782977d81d60fd32b Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Wed, 15 Apr 2020 10:39:20 +0200 Subject: [PATCH] also test Opt-NTAs for !13 --- src/test/jastadd/relations/Relations.jrag | 11 +++++------ src/test/jastadd/relations/Relations.relast | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/test/jastadd/relations/Relations.jrag b/src/test/jastadd/relations/Relations.jrag index 057cdde..69766fe 100644 --- a/src/test/jastadd/relations/Relations.jrag +++ b/src/test/jastadd/relations/Relations.jrag @@ -23,12 +23,11 @@ aspect NTA { // E ::= ... /<NT7:long>/ ... ; syn long E.getNT7() = 1l; -// there are not Opt-NTAs like /[NT8:A]/ /[A]/ -// // E ::= ... /[NT8:A]/ ... ; -// syn Opt<A> E.getNT8() = new Opt<A>(); -// -// // E ::= ... /[A]/ ... ; -// syn Opt<A> E.getA() = new Opt<A>(); + // E ::= ... /[NT8:A]/ ... ; + syn Opt<A> E.getNT8Opt() = new Opt<A>(); + + // E ::= ... /[A]/ ... ; + syn Opt<A> E.getAOpt() = new Opt<A>(); // E ::= ... /NT10:A*/ ... ; syn List<A> E.getNT10List() = new List<A>(); diff --git a/src/test/jastadd/relations/Relations.relast b/src/test/jastadd/relations/Relations.relast index 791cc0a..b519a44 100644 --- a/src/test/jastadd/relations/Relations.relast +++ b/src/test/jastadd/relations/Relations.relast @@ -49,11 +49,10 @@ C ; D ::= SingleA:A ListOfA:A* [OptionalA:A] /NTAA:A/ ; // production with tokens, nonterminal-tokens, multi-line -// there are not Opt-NTAs like /[NT8:A]/ /[A]/ E ::= <T1> <T2:String> <T3:boolean> <T4:int> <T5:float> <T6:double> <T7:long> <T8:java.lang.Object> <T9:ArrayList<String>> <T10:java.util.ArrayList<java.lang.String>> /<NT1>/ /<NT2:String>/ /<NT3:boolean>/ /<NT4:int>/ /<NT5:float>/ /<NT6:double>/ /<NT7:long>/ - /NT10:A*/ /B*/; + /[NT8:A]/ /[A]/ /NT10:A*/ /B*/; rel E.R1 -> A ; // inheritance and empty -- GitLab