2 files changed, 99 insertions, 24 deletions

diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
index 336d0867..cb44c31f 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
@@ -12,8 +12,10 @@ import org.eclipse.viatra.solver.language.model.problem.Assertion;
 import org.eclipse.viatra.solver.language.model.problem.Atom;
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Conjunction;
+import org.eclipse.viatra.solver.language.model.problem.EnumDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.ExactMultiplicity;
 import org.eclipse.viatra.solver.language.model.problem.NegativeLiteral;
+import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition;
 import org.eclipse.viatra.solver.language.model.problem.Problem;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
@@ -60,12 +62,18 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
                         case ProblemPackage.CONJUNCTION:
                                 sequence_Conjunction(context, (Conjunction) semanticObject); 
                                 return; 
+                        case ProblemPackage.ENUM_DECLARATION:
+                                sequence_EnumDeclaration(context, (EnumDeclaration) semanticObject); 
+                                return; 
                         case ProblemPackage.EXACT_MULTIPLICITY:
                                 sequence_ExactMultiplicity(context, (ExactMultiplicity) semanticObject); 
                                 return; 
                         case ProblemPackage.NEGATIVE_LITERAL:
                                 sequence_NegativeLiteral(context, (NegativeLiteral) semanticObject); 
                                 return; 
+                        case ProblemPackage.NODE:
+                                sequence_EnumLiteral(context, (Node) semanticObject); 
+                                return; 
                         case ProblemPackage.PARAMETER:
                                 sequence_Parameter(context, (org.eclipse.viatra.solver.language.model.problem.Parameter) semanticObject); 
                                 return; 
@@ -100,15 +108,15 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     Argument returns Argument
          *
          * Constraint:
-         *     variable=[Variable|ID]
+         *     variableOrNode=[VariableOrNode|QualifiedName]
          */
         protected void sequence_Argument(ISerializationContext context, Argument semanticObject) {
                 if (errorAcceptor != null) {
-                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE) == ValueTransient.YES)
-                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE));
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE));
                 }
                 SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
-                feeder.accept(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1(), semanticObject.eGet(ProblemPackage.Literals.ARGUMENT__VARIABLE, false));
+                feeder.accept(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE, false));
                 feeder.finish();
         }
         
@@ -150,8 +158,8 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          * Constraint:
          *     (
          *         abstract?='abstract'? 
-         *         name=ID 
-         *         (superTypes+=[ClassDeclaration|QualifiedName] superTypes+=[ClassDeclaration|QualifiedName]*)? 
+         *         name=Identifier 
+         *         (superTypes+=[Relation|QualifiedName] superTypes+=[Relation|QualifiedName]*)? 
          *         referenceDeclarations+=ReferenceDeclaration*
          *     )
          */
@@ -174,6 +182,37 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         
         /**
          * Contexts:
+         *     Statement returns EnumDeclaration
+         *     EnumDeclaration returns EnumDeclaration
+         *
+         * Constraint:
+         *     (name=Identifier (literals+=EnumLiteral literals+=EnumLiteral*)?)
+         */
+        protected void sequence_EnumDeclaration(ISerializationContext context, EnumDeclaration semanticObject) {
+                genericSequencer.createSequence(context, semanticObject);
+        }
+        
+        
+        /**
+         * Contexts:
+         *     EnumLiteral returns Node
+         *
+         * Constraint:
+         *     name=QuotedOrUnquotedId
+         */
+        protected void sequence_EnumLiteral(ISerializationContext context, Node semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.NAMED_ELEMENT__NAME) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.NAMED_ELEMENT__NAME));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0(), semanticObject.getName());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
          *     Multiplicity returns ExactMultiplicity
          *     DefiniteMultiplicity returns ExactMultiplicity
          *     ExactMultiplicity returns ExactMultiplicity
@@ -216,19 +255,10 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     Parameter returns Parameter
          *
          * Constraint:
-         *     (parameterType=[ClassDeclaration|ID] name=ID)
+         *     (parameterType=[Relation|QualifiedName]? name=Identifier)
          */
         protected void sequence_Parameter(ISerializationContext context, org.eclipse.viatra.solver.language.model.problem.Parameter semanticObject) {
-                if (errorAcceptor != null) {
-                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.PARAMETER__PARAMETER_TYPE) == ValueTransient.YES)
-                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.PARAMETER__PARAMETER_TYPE));
-                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.NAMED_ELEMENT__NAME) == ValueTransient.YES)
-                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.NAMED_ELEMENT__NAME));
-                }
-                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
-                feeder.accept(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1(), semanticObject.eGet(ProblemPackage.Literals.PARAMETER__PARAMETER_TYPE, false));
-                feeder.accept(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());
-                feeder.finish();
+                genericSequencer.createSequence(context, semanticObject);
         }
         
         
@@ -238,7 +268,7 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     PredicateDefinition returns PredicateDefinition
          *
          * Constraint:
-         *     (error?='error'? name=ID (parameters+=Parameter parameters+=Parameter*)? (bodies+=Conjunction bodies+=Conjunction*)?)
+         *     (error?='error'? name=Identifier (parameters+=Parameter parameters+=Parameter*)? (bodies+=Conjunction bodies+=Conjunction*)?)
          */
         protected void sequence_PredicateDefinition(ISerializationContext context, PredicateDefinition semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
@@ -250,7 +280,7 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     Problem returns Problem
          *
          * Constraint:
-         *     ((name=ID statements+=Statement+) | statements+=Statement+)?
+         *     ((name=Identifier statements+=Statement+) | statements+=Statement+)?
          */
         protected void sequence_Problem(ISerializationContext context, Problem semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
@@ -287,9 +317,9 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          * Constraint:
          *     (
          *         containment?='contains'? 
-         *         referenceType=[ClassDeclaration|QualifiedName] 
+         *         referenceType=[Relation|QualifiedName] 
          *         multiplicity=Multiplicity? 
-         *         name=ID 
+         *         name=Identifier 
          *         opposite=[ReferenceDeclaration|QualifiedName]?
          *     )
          */
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java
index 80ac73d6..3f0a3f05 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java
@@ -24,14 +24,20 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
         protected ProblemGrammarAccess grammarAccess;
         protected AbstractElementAlias match_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__;
         protected AbstractElementAlias match_ClassDeclaration_SemicolonKeyword_4_0_1_1_q;
+        protected AbstractElementAlias match_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__;
+        protected AbstractElementAlias match_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q;
         protected AbstractElementAlias match_PredicateDefinition_PredKeyword_0_0_1_q;
+        protected AbstractElementAlias match_ReferenceDeclaration_RefersKeyword_0_1_q;
         
         @Inject
         protected void init(IGrammarAccess access) {
                 grammarAccess = (ProblemGrammarAccess) access;
                 match_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__ = new AlternativeAlias(false, false, new GroupAlias(false, false, new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()), new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2())), new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1()));
                 match_ClassDeclaration_SemicolonKeyword_4_0_1_1_q = new TokenAlias(false, true, grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1());
+                match_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__ = new AlternativeAlias(false, false, new GroupAlias(false, false, new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0()), new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2())), new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1()));
+                match_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q = new AlternativeAlias(false, true, new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0()), new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1()));
                 match_PredicateDefinition_PredKeyword_0_0_1_q = new TokenAlias(false, true, grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_0_1());
+                match_ReferenceDeclaration_RefersKeyword_0_1_q = new TokenAlias(false, true, grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1());
         }
         
         @Override
@@ -50,8 +56,14 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
                                 emit_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__(semanticObject, getLastNavigableState(), syntaxNodes);
                         else if (match_ClassDeclaration_SemicolonKeyword_4_0_1_1_q.equals(syntax))
                                 emit_ClassDeclaration_SemicolonKeyword_4_0_1_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
+                        else if (match_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__.equals(syntax))
+                                emit_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__(semanticObject, getLastNavigableState(), syntaxNodes);
+                        else if (match_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q.equals(syntax))
+                                emit_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q(semanticObject, getLastNavigableState(), syntaxNodes);
                         else if (match_PredicateDefinition_PredKeyword_0_0_1_q.equals(syntax))
                                 emit_PredicateDefinition_PredKeyword_0_0_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
+                        else if (match_ReferenceDeclaration_RefersKeyword_0_1_q.equals(syntax))
+                                emit_ReferenceDeclaration_RefersKeyword_0_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
                         else acceptNodes(getLastNavigableState(), syntaxNodes);
                 }
         }
@@ -61,8 +73,8 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
          *     ('{' '}') | '.'
          *
          * This ambiguous syntax occurs at:
-         *     name=ID (ambiguity) (rule end)
-         *     superTypes+=[ClassDeclaration|QualifiedName] (ambiguity) (rule end)
+         *     name=Identifier (ambiguity) (rule end)
+         *     superTypes+=[Relation|QualifiedName] (ambiguity) (rule end)
          */
         protected void emit_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
@@ -82,13 +94,46 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
         
         /**
          * Ambiguous syntax:
+         *     ('{' '}') | '.'
+         *
+         * This ambiguous syntax occurs at:
+         *     name=Identifier (ambiguity) (rule end)
+         */
+        protected void emit_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+                acceptNodes(transition, nodes);
+        }
+        
+        /**
+         * Ambiguous syntax:
+         *     (',' | ';')?
+         *
+         * This ambiguous syntax occurs at:
+         *     literals+=EnumLiteral (ambiguity) '}' (rule end)
+         */
+        protected void emit_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+                acceptNodes(transition, nodes);
+        }
+        
+        /**
+         * Ambiguous syntax:
          *     'pred'?
          *
          * This ambiguous syntax occurs at:
-         *     error?='error' (ambiguity) name=ID
+         *     error?='error' (ambiguity) name=Identifier
          */
         protected void emit_PredicateDefinition_PredKeyword_0_0_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
         }
         
+        /**
+         * Ambiguous syntax:
+         *     'refers'?
+         *
+         * This ambiguous syntax occurs at:
+         *     (rule start) (ambiguity) referenceType=[Relation|QualifiedName]
+         */
+        protected void emit_ReferenceDeclaration_RefersKeyword_0_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+                acceptNodes(transition, nodes);
+        }
+        
 }