From 7dcbe0bc5a9cac09de030b5f328f2e4d575f4ab5 Mon Sep 17 00:00:00 2001 From: Aren Babikian Date: Wed, 6 Jan 2021 00:01:51 +0100 Subject: rebase dreal-integ on models20-measurements --- .../org/eclipse/viatra/solver/language/.gitignore | 6 ----- .../viatra/solver/language/generator/.gitignore | 3 --- ....SolverLanguageTokenDefInjectingParser.xtendbin | Bin 2741 -> 0 bytes .../viatra/solver/language/parser/antlr/.gitignore | 9 ------- .../SolverLanguageTokenDefInjectingParser.java | 26 --------------------- .../viatra/solver/language/scoping/.gitignore | 3 --- ...nguageSyntheticTokenSyntacticSequencer.xtendbin | Bin 2757 -> 0 bytes .../viatra/solver/language/serializer/.gitignore | 3 --- ...erLanguageSyntheticTokenSyntacticSequencer.java | 24 ------------------- .../viatra/solver/language/validation/.gitignore | 3 --- 10 files changed, 77 deletions(-) delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/.gitignore delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/generator/.gitignore delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/SolverLanguageTokenDefInjectingParser.java delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/scoping/.gitignore delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntheticTokenSyntacticSequencer.java delete mode 100644 Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore (limited to 'Application/org.eclipse.viatra.solver.language/xtend-gen') 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 deleted file mode 100644 index 82298938..00000000 --- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/.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 deleted file mode 100644 index a9345b80..00000000 --- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/generator/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.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 deleted file mode 100644 index d2fd056e..00000000 Binary files a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin and /dev/null differ 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 deleted file mode 100644 index 5fbb81c3..00000000 --- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/.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 deleted file mode 100644 index 12c92733..00000000 --- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/SolverLanguageTokenDefInjectingParser.java +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 16497231..00000000 --- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/scoping/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.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 deleted file mode 100644 index 30cf1dbd..00000000 Binary files a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin and /dev/null differ 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 deleted file mode 100644 index 1f04090d..00000000 --- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.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 deleted file mode 100644 index af761a86..00000000 --- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntheticTokenSyntacticSequencer.java +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 565d4b27..00000000 --- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/.SolverLanguageValidator.java._trace -/.SolverLanguageValidator.xtendbin -/SolverLanguageValidator.java -- cgit v1.2.3-70-g09d2