From 419e76265ecbdf65e960e0624be006d31ed1e191 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Fri, 8 May 2020 18:28:19 +0200 Subject: Update solver language grammar First version, still needs TokenSource and Linker to work. --- .../SolverLanguageSyntacticSequencer.java | 121 ++++++++++++++------- 1 file changed, 82 insertions(+), 39 deletions(-) (limited to 'Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntacticSequencer.java') diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntacticSequencer.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntacticSequencer.java index 8a2d6f62..861f2125 100644 --- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntacticSequencer.java +++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/serializer/SolverLanguageSyntacticSequencer.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.18.0.M3 + * generated by Xtext 2.21.0 */ package org.eclipse.viatra.solver.language.serializer; @@ -11,7 +11,6 @@ import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias; -import org.eclipse.xtext.serializer.analysis.GrammarAlias.GroupAlias; import org.eclipse.xtext.serializer.analysis.GrammarAlias.TokenAlias; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable; import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynTransition; @@ -21,25 +20,58 @@ import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer; public class SolverLanguageSyntacticSequencer extends AbstractSyntacticSequencer { protected SolverLanguageGrammarAccess grammarAccess; - protected AbstractElementAlias match_BasicInterpretation___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q; - protected AbstractElementAlias match_Constraint___LeftParenthesisKeyword_0_2_0_RightParenthesisKeyword_0_2_3__q; - protected AbstractElementAlias match_PatternBody_TrueKeyword_1_0_q; - protected AbstractElementAlias match_Predicate___LeftParenthesisKeyword_2_0_RightParenthesisKeyword_2_2__q; + protected AbstractElementAlias match_AtomicExpression_LeftParenthesisKeyword_3_0_a; + protected AbstractElementAlias match_AtomicExpression_LeftParenthesisKeyword_3_0_p; + protected AbstractElementAlias match_MemberDefinition_SemicolonKeyword_5_q; @Inject protected void init(IGrammarAccess access) { grammarAccess = (SolverLanguageGrammarAccess) access; - match_BasicInterpretation___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getBasicInterpretationAccess().getLeftParenthesisKeyword_1_0()), new TokenAlias(false, false, grammarAccess.getBasicInterpretationAccess().getRightParenthesisKeyword_1_2())); - match_Constraint___LeftParenthesisKeyword_0_2_0_RightParenthesisKeyword_0_2_3__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getConstraintAccess().getLeftParenthesisKeyword_0_2_0()), new TokenAlias(false, false, grammarAccess.getConstraintAccess().getRightParenthesisKeyword_0_2_3())); - match_PatternBody_TrueKeyword_1_0_q = new TokenAlias(false, true, grammarAccess.getPatternBodyAccess().getTrueKeyword_1_0()); - match_Predicate___LeftParenthesisKeyword_2_0_RightParenthesisKeyword_2_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getPredicateAccess().getLeftParenthesisKeyword_2_0()), new TokenAlias(false, false, grammarAccess.getPredicateAccess().getRightParenthesisKeyword_2_2())); + match_AtomicExpression_LeftParenthesisKeyword_3_0_a = new TokenAlias(true, true, grammarAccess.getAtomicExpressionAccess().getLeftParenthesisKeyword_3_0()); + match_AtomicExpression_LeftParenthesisKeyword_3_0_p = new TokenAlias(true, false, grammarAccess.getAtomicExpressionAccess().getLeftParenthesisKeyword_3_0()); + match_MemberDefinition_SemicolonKeyword_5_q = new TokenAlias(false, true, grammarAccess.getMemberDefinitionAccess().getSemicolonKeyword_5()); } @Override protected String getUnassignedRuleCallToken(EObject semanticObject, RuleCall ruleCall, INode node) { + if (ruleCall.getRule() == grammarAccess.getDOTRule()) + return getDOTToken(semanticObject, ruleCall, node); + else if (ruleCall.getRule() == grammarAccess.getPLUSRule()) + return getPLUSToken(semanticObject, ruleCall, node); + else if (ruleCall.getRule() == grammarAccess.getSTARRule()) + return getSTARToken(semanticObject, ruleCall, node); return ""; } + /** + * terminal DOT: + * "synthetic::dot"; + */ + protected String getDOTToken(EObject semanticObject, RuleCall ruleCall, INode node) { + if (node != null) + return getTokenText(node); + return "synthetic::dot"; + } + + /** + * terminal PLUS: + * "synthetic::plus"; + */ + protected String getPLUSToken(EObject semanticObject, RuleCall ruleCall, INode node) { + if (node != null) + return getTokenText(node); + return "synthetic::plus"; + } + + /** + * terminal STAR: + * "synthetic::star"; + */ + protected String getSTARToken(EObject semanticObject, RuleCall ruleCall, INode node) { + if (node != null) + return getTokenText(node); + return "synthetic::star"; + } @Override protected void emitUnassignedTokens(EObject semanticObject, ISynTransition transition, INode fromNode, INode toNode) { @@ -47,60 +79,71 @@ public class SolverLanguageSyntacticSequencer extends AbstractSyntacticSequencer List transitionNodes = collectNodes(fromNode, toNode); for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) { List syntaxNodes = getNodesFor(transitionNodes, syntax); - if (match_BasicInterpretation___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q.equals(syntax)) - emit_BasicInterpretation___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q(semanticObject, getLastNavigableState(), syntaxNodes); - else if (match_Constraint___LeftParenthesisKeyword_0_2_0_RightParenthesisKeyword_0_2_3__q.equals(syntax)) - emit_Constraint___LeftParenthesisKeyword_0_2_0_RightParenthesisKeyword_0_2_3__q(semanticObject, getLastNavigableState(), syntaxNodes); - else if (match_PatternBody_TrueKeyword_1_0_q.equals(syntax)) - emit_PatternBody_TrueKeyword_1_0_q(semanticObject, getLastNavigableState(), syntaxNodes); - else if (match_Predicate___LeftParenthesisKeyword_2_0_RightParenthesisKeyword_2_2__q.equals(syntax)) - emit_Predicate___LeftParenthesisKeyword_2_0_RightParenthesisKeyword_2_2__q(semanticObject, getLastNavigableState(), syntaxNodes); + if (match_AtomicExpression_LeftParenthesisKeyword_3_0_a.equals(syntax)) + emit_AtomicExpression_LeftParenthesisKeyword_3_0_a(semanticObject, getLastNavigableState(), syntaxNodes); + else if (match_AtomicExpression_LeftParenthesisKeyword_3_0_p.equals(syntax)) + emit_AtomicExpression_LeftParenthesisKeyword_3_0_p(semanticObject, getLastNavigableState(), syntaxNodes); + else if (match_MemberDefinition_SemicolonKeyword_5_q.equals(syntax)) + emit_MemberDefinition_SemicolonKeyword_5_q(semanticObject, getLastNavigableState(), syntaxNodes); else acceptNodes(getLastNavigableState(), syntaxNodes); } } /** * Ambiguous syntax: - * ('(' ')')? - * - * This ambiguous syntax occurs at: - * symbol=Symbol (ambiguity) ':' value=TruthValue - */ - protected void emit_BasicInterpretation___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q(EObject semanticObject, ISynNavigable transition, List nodes) { - acceptNodes(transition, nodes); - } - - /** - * Ambiguous syntax: - * ('(' ')')? + * '('* * * This ambiguous syntax occurs at: - * symbol=ModelSymbol (ambiguity) (rule end) + * (rule start) (ambiguity) '[' lowerBound=Expression + * (rule start) (ambiguity) 'count' '{' body=Expression + * (rule start) (ambiguity) 'empty' (rule start) + * (rule start) (ambiguity) 'if' condition=Expression + * (rule start) (ambiguity) 'inf' (rule start) + * (rule start) (ambiguity) op=AggregationOp + * (rule start) (ambiguity) op=UnaryOp + * (rule start) (ambiguity) referred=[NamedElement|QualifiedName] + * (rule start) (ambiguity) value=LogicValue + * (rule start) (ambiguity) value=Real + * (rule start) (ambiguity) value=STRING + * (rule start) (ambiguity) {BinaryExpression.left=} + * (rule start) (ambiguity) {Call.functor=} + * (rule start) (ambiguity) {Comparison.left=} + * (rule start) (ambiguity) {Conjunction.children+=} + * (rule start) (ambiguity) {Disjunction.children+=} + * (rule start) (ambiguity) {Switch.cases+=} */ - protected void emit_Constraint___LeftParenthesisKeyword_0_2_0_RightParenthesisKeyword_0_2_3__q(EObject semanticObject, ISynNavigable transition, List nodes) { + protected void emit_AtomicExpression_LeftParenthesisKeyword_3_0_a(EObject semanticObject, ISynNavigable transition, List nodes) { acceptNodes(transition, nodes); } /** * Ambiguous syntax: - * 'true'? + * '('+ * * This ambiguous syntax occurs at: - * (rule start) (ambiguity) (rule start) + * (rule start) (ambiguity) 'count' '{' body=Expression + * (rule start) (ambiguity) 'if' condition=Expression + * (rule start) (ambiguity) op=AggregationOp + * (rule start) (ambiguity) op=UnaryOp + * (rule start) (ambiguity) {BinaryExpression.left=} + * (rule start) (ambiguity) {Comparison.left=} + * (rule start) (ambiguity) {Conjunction.children+=} + * (rule start) (ambiguity) {Disjunction.children+=} + * (rule start) (ambiguity) {Switch.cases+=} */ - protected void emit_PatternBody_TrueKeyword_1_0_q(EObject semanticObject, ISynNavigable transition, List nodes) { + protected void emit_AtomicExpression_LeftParenthesisKeyword_3_0_p(EObject semanticObject, ISynNavigable transition, List nodes) { acceptNodes(transition, nodes); } /** * Ambiguous syntax: - * ('(' ')')? + * ';'? * * This ambiguous syntax occurs at: - * symbol=ModelSymbol (ambiguity) ':-' 'false' '.' (rule end) - * symbol=ModelSymbol (ambiguity) ':-' bodies+=PatternBody + * name=ID (ambiguity) (rule end) + * opposite=[NamedElement|QualifiedName] (ambiguity) (rule end) */ - protected void emit_Predicate___LeftParenthesisKeyword_2_0_RightParenthesisKeyword_2_2__q(EObject semanticObject, ISynNavigable transition, List nodes) { + protected void emit_MemberDefinition_SemicolonKeyword_5_q(EObject semanticObject, ISynNavigable transition, List nodes) { acceptNodes(transition, nodes); } -- cgit v1.2.3-70-g09d2