3 files changed, 18 insertions, 8 deletions

diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html
index 112adb74..3fb66d62 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html
@@ -21,14 +21,17 @@
 }
 
 class Person {
-    refers Person[] children opposite parent
-    refers Person parent opposite children
+    Person[] children opposite parent
+    Person parent opposite children
+    TaxStatus[1] taxStatus
 }
 
-error loop(Person p) :- children+(p, p).
+enum TaxStatus {
+        child, student, adult, retired
+}
 
-error multipleRoots(Person p, Person q) :-
-    !equals(p, q), !parent(p, _), !parent(q, _).
+error invalidTaxStatus(Person p) :-
+        taxStatus(p, child), children(p, _q).
 
 Family('family').
 members('family', anne).
@@ -36,6 +39,7 @@ members('family', bob).
 members('family', ciri).
 children(anne, ciri).
 ?children(bob, ciri).
+taxStatus(anne, adult).
 
 scope Family = 1, Person += 5..10.</pre></div>
         </div>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css
index b24610f4..9a89dd81 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css
@@ -70,6 +70,10 @@ a:hover {
         color: #8b8816;
 }
 
+.problem-enum {
+        color: #644632;
+}
+
 .problem-reference {
         color: #0000c0;
 }
@@ -78,11 +82,13 @@ a:hover {
         font-weight: bold;
 }
 
-.problem-node {
-        color: inherit !important;
+
+.CodeMirror .problem-node {
+        color: inherit;
 }
 
 .problem-enum-node {
+        color: #1a1a1a !important;
         font-weight: bold;
 }
 
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js
index 0abfa5ee..84515ad6 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js
@@ -1,5 +1,5 @@
 define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, SimpleMode) {
-        var keywords = "abstract|class|contains|error|extends|false|opposite|pred|problem|refers|scope|true|unknown";
+        var keywords = "abstract|class|contains|enum|error|extends|false|opposite|pred|problem|refers|scope|true|unknown";
         CodeMirror.defineSimpleMode("xtext/problem", {
                 start: [
                         {token: "comment", regex: "\\/\\/.*$"},