Skip to content
Snippets Groups Projects
Commit efe2b4e3 authored by René Schöne's avatar René Schöne
Browse files

Resolve conflict in .gitignore

parents 86d13a63 3a5bbb8e
No related branches found
No related tags found
1 merge request!10Resolve "Fix versioning and prepare publishing"
Pipeline #6266 passed
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/generated">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
</attributes>
</classpathentry>
<classpathentry including="**" kind="src" path="src/resource"/>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="lib" path="tools/beaver.jar"/>
<classpathentry kind="lib" path="tools/junit-4.11-SNAPSHOT.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
*.jar
!gradle/wrapper/gradle-wrapper.jar
.project
.classpath
.idea/
.gradle/
build
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>rel-rag</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
......@@ -40,13 +40,11 @@ ArrayList inner_type_use
;
TypeUse type_use =
// s_type_use.u {: return u; :}
// |
parameterized_type_use.p {: return p; :}
| inner_type_use.p {: return new SimpleTypeUse((String)p.stream().map( x -> ((Symbol)x).value.toString()).collect(java.util.stream.Collectors.joining("."))); :}
;
ParameterizedTypeUse parameterized_type_use =
ID LT type_use_list.l GT {: return new ParameterizedTypeUse(ID, l); :}
inner_type_use.i LT type_use_list.l GT {: return new ParameterizedTypeUse((String)i.stream().map( x -> ((Symbol)x).value.toString()).collect(java.util.stream.Collectors.joining(".")), l); :}
;
List type_use_list =
type_use.u {: return new List().add(u); :}
......
......@@ -50,6 +50,7 @@ D ::= SingleA:A ListOfA:A* [OptionalA:A] /NTAA:A/ ;
// production with tokens, nonterminal-tokens, multi-line
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>>
/<NT2:String>/ /<NT3:boolean>/ /<NT4:int>/ /<NT5:float>/ /<NT6:double>/ /<NT7:long>/ ;
rel E.NT1 -> A ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment