fix merging issue

10 files changed, 77 insertions, 0 deletions

diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/.gitignore
new file mode 100644
index 00000000..82298938
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/.gitignore
@@ -0,0 +1,6 @@
+/.SolverLanguageRuntimeModule.java._trace
+/.SolverLanguageRuntimeModule.xtendbin
+/.SolverLanguageStandaloneSetup.java._trace
+/.SolverLanguageStandaloneSetup.xtendbin
+/SolverLanguageRuntimeModule.java
+/SolverLanguageStandaloneSetup.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/generator/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/generator/.gitignore
new file mode 100644
index 00000000..a9345b80
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/generator/.gitignore
@@ -0,0 +1,3 @@
+/.SolverLanguageGenerator.java._trace
+/.SolverLanguageGenerator.xtendbin
+/SolverLanguageGenerator.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
new file mode 100644
index 00000000..5fa0b267
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore
new file mode 100644
index 00000000..5fbb81c3
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore
@@ -0,0 +1,9 @@
+/.SolverLangaugeSyntheticTokenParser.java._trace
+/.SolverLanguageSyntheticTokenTokenSource.java._trace
+/.LastTokenState.java._trace
+/.SolverLangusgeSyntheticTokenParser.java._trace
+/.SolverLanguageSyntheticTokenParser.java._trace
+/.SolverLanguageTokenSource.java._trace
+/.SolverLanguageTokenDefInjectingParser.java._trace
+/.SolverLanguageTokenDefInjectingParser.xtendbin
+/SolverLanguageTokenDefInjectingParser.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/SolverLanguageTokenDefInjectingParser.java b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/SolverLanguageTokenDefInjectingParser.java
new file mode 100644
index 00000000..12c92733
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/SolverLanguageTokenDefInjectingParser.java
@@ -0,0 +1,26 @@
+package org.eclipse.viatra.solver.language.parser.antlr;
+
+import com.google.inject.Inject;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.TokenSource;
+import org.eclipse.viatra.solver.language.parser.antlr.SolverLanguageParser;
+import org.eclipse.viatra.solver.language.parser.antlr.SolverLanguageTokenSource;
+import org.eclipse.xtext.parser.antlr.ITokenDefProvider;
+
+@SuppressWarnings("all")
+public class SolverLanguageTokenDefInjectingParser extends SolverLanguageParser {
+  @Inject
+  private ITokenDefProvider tokenDefProvider;
+  
+  @Override
+  protected TokenSource createLexer(final CharStream stream) {
+    SolverLanguageTokenSource _xblockexpression = null;
+    {
+      TokenSource _createLexer = super.createLexer(stream);
+      final SolverLanguageTokenSource tokenSource = ((SolverLanguageTokenSource) _createLexer);
+      tokenSource.initializeTokenDefsFrom(this.tokenDefProvider);
+      _xblockexpression = tokenSource;
+    }
+    return _xblockexpression;
+  }
+}
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/scoping/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/scoping/.gitignore
new file mode 100644
index 00000000..16497231
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/scoping/.gitignore
@@ -0,0 +1,3 @@
+/.SolverLanguageScopeProvider.java._trace
+/.SolverLanguageScopeProvider.xtendbin
+/SolverLanguageScopeProvider.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
new file mode 100644
index 00000000..77d0c330
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore
new file mode 100644
index 00000000..1f04090d
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore
@@ -0,0 +1,3 @@
+/.SolverLanguageSyntheticTokenSyntacticSequencer.java._trace
+/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
+/SolverLanguageSyntheticTokenSyntacticSequencer.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntheticTokenSyntacticSequencer.java b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntheticTokenSyntacticSequencer.java
new file mode 100644
index 00000000..af761a86
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntheticTokenSyntacticSequencer.java
@@ -0,0 +1,24 @@
+package org.eclipse.viatra.solver.language.serializer;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.viatra.solver.language.serializer.SolverLanguageSyntacticSequencer;
+import org.eclipse.xtext.RuleCall;
+import org.eclipse.xtext.nodemodel.INode;
+
+@SuppressWarnings("all")
+public class SolverLanguageSyntheticTokenSyntacticSequencer extends SolverLanguageSyntacticSequencer {
+  @Override
+  protected String getTRANSITIVE_CLOSUREToken(final EObject semanticObject, final RuleCall ruleCall, final INode node) {
+    return "+";
+  }
+  
+  @Override
+  protected String getREFLEXIVE_TRANSITIVE_CLOSUREToken(final EObject semanticObject, final RuleCall ruleCall, final INode node) {
+    return "*";
+  }
+  
+  @Override
+  protected String getFULL_STOPToken(final EObject semanticObject, final RuleCall ruleCall, final INode node) {
+    return ".";
+  }
+}
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
new file mode 100644
index 00000000..565d4b27
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
@@ -0,0 +1,3 @@
+/.SolverLanguageValidator.java._trace
+/.SolverLanguageValidator.xtendbin
+/SolverLanguageValidator.java