1 files changed, 104 insertions, 42 deletions
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalSolverLanguage.tokens b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalSolverLanguage.tokens
index 5054ccc5..1cf5b64f 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalSolverLanguage.tokens
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalSolverLanguage.tokens
@@ -1,45 +1,74 @@
-'('=17
+'!'=60
-')'=19
+'!='=52
-'*'=31
+'('=33
-'+'=30
+')'=34
-','=18
+'*'=35
-'-'=11
+'+'=56
-'.'=12
+','=28
-'..'=41
+'-'=57
-':'=20
+'->'=27
-':-'=28
+'.'=22
-'\''=27
+'..'=37
-'abstract'=33
+'/'=58
-'bool'=23
+':'=15
-'class'=34
+':-'=16
-'containment'=39
+';'=26
-'default'=32
+'<'=53
-'enum'=38
+'<='=48
-'equals'=22
+'='=17
-'error'=16
+'=='=47
-'exists'=21
+'>'=54
-'extends'=35
+'>='=49
-'false'=14
+'['=36
-'int'=24
+']'=38
-'real'=25
+'^'=59
-'relation'=40
+'abstract'=41
-'string'=26
+'avg'=67
-'true'=13
+'class'=42
-'unknown'=15
+'contains'=44
-'{'=36
+'count'=29
-'|'=29
+'current'=63
-'}'=37
+'default'=20
-RULE_ANY_OTHER=10
+'else'=25
-RULE_ID=5
+'empty'=40
-RULE_INT=4
+'error'=19
-RULE_ML_COMMENT=7
+'extends'=43
-RULE_SL_COMMENT=8
+'extern'=21
-RULE_STRING=6
+'false'=71
-RULE_WS=9
+'functional'=18
-T__11=11
+'if'=23
-T__12=12
+'in'=55
-T__13=13
+'inf'=39
-T__14=14
+'int'=50
+'max'=69
+'maximize'=74
+'may'=61
+'min'=68
+'minimize'=73
+'must'=62
+'only'=64
+'opposite'=45
+'prod'=66
+'real'=51
+'scope'=46
+'sum'=65
+'then'=24
+'true'=70
+'unknown'=72
+'{'=30
+'|'=32
+'}'=31
+RULE_ANY_OTHER=14
+RULE_DOT=4
+RULE_ID=8
+RULE_INT=9
+RULE_ML_COMMENT=11
+RULE_PLUS=6
+RULE_QUOTED_ID=10
+RULE_SL_COMMENT=12
+RULE_STAR=5
+RULE_STRING=7
+RULE_WS=13
 T__15=15
 T__16=16
 T__17=17
@@ -67,3 +96,36 @@ T__38=38
 T__39=39
 T__40=40
 T__41=41
+T__42=42
+T__43=43
+T__44=44
+T__45=45
+T__46=46
+T__47=47
+T__48=48
+T__49=49
+T__50=50
+T__51=51
+T__52=52
+T__53=53
+T__54=54
+T__55=55
+T__56=56
+T__57=57
+T__58=58
+T__59=59
+T__60=60
+T__61=61
+T__62=62
+T__63=63
+T__64=64
+T__65=65
+T__66=66
+T__67=67
+T__68=68
+T__69=69
+T__70=70
+T__71=71
+T__72=72
+T__73=73
+T__74=74

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalSolverLanguage.tokens b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalSolverLanguage.tokens index 5054ccc5..1cf5b64f 100644 --- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalSolverLanguage.tokens +++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalSolverLanguage.tokens
@@ -1,45 +1,74 @@
1	'('=17	1	'!'=60
2	')'=19	2	'!='=52
3	'*'=31	3	'('=33
4	'+'=30	4	')'=34
5	','=18	5	'*'=35
6	'-'=11	6	'+'=56
7	'.'=12	7	','=28
8	'..'=41	8	'-'=57
9	':'=20	9	'->'=27
10	':-'=28	10	'.'=22
11	'\''=27	11	'..'=37
12	'abstract'=33	12	'/'=58
13	'bool'=23	13	':'=15
14	'class'=34	14	':-'=16
15	'containment'=39	15	';'=26
16	'default'=32	16	'<'=53
17	'enum'=38	17	'<='=48
18	'equals'=22	18	'='=17
19	'error'=16	19	'=='=47
20	'exists'=21	20	'>'=54
21	'extends'=35	21	'>='=49
22	'false'=14	22	'['=36
23	'int'=24	23	']'=38
24	'real'=25	24	'^'=59
25	'relation'=40	25	'abstract'=41
26	'string'=26	26	'avg'=67
27	'true'=13	27	'class'=42
28	'unknown'=15	28	'contains'=44
29	'{'=36	29	'count'=29
30	'\|'=29	30	'current'=63
31	'}'=37	31	'default'=20
32	RULE_ANY_OTHER=10	32	'else'=25
33	RULE_ID=5	33	'empty'=40
34	RULE_INT=4	34	'error'=19
35	RULE_ML_COMMENT=7	35	'extends'=43
36	RULE_SL_COMMENT=8	36	'extern'=21
37	RULE_STRING=6	37	'false'=71
38	RULE_WS=9	38	'functional'=18
39	T__11=11	39	'if'=23
40	T__12=12	40	'in'=55
41	T__13=13	41	'inf'=39
42	T__14=14	42	'int'=50
		43	'max'=69
		44	'maximize'=74
		45	'may'=61
		46	'min'=68
		47	'minimize'=73
		48	'must'=62
		49	'only'=64
		50	'opposite'=45
		51	'prod'=66
		52	'real'=51
		53	'scope'=46
		54	'sum'=65
		55	'then'=24
		56	'true'=70
		57	'unknown'=72
		58	'{'=30
		59	'\|'=32
		60	'}'=31
		61	RULE_ANY_OTHER=14
		62	RULE_DOT=4
		63	RULE_ID=8
		64	RULE_INT=9
		65	RULE_ML_COMMENT=11
		66	RULE_PLUS=6
		67	RULE_QUOTED_ID=10
		68	RULE_SL_COMMENT=12
		69	RULE_STAR=5
		70	RULE_STRING=7
		71	RULE_WS=13
43	T__15=15	72	T__15=15
44	T__16=16	73	T__16=16
45	T__17=17	74	T__17=17
@@ -67,3 +96,36 @@ T__38=38
67	T__39=39	96	T__39=39
68	T__40=40	97	T__40=40
69	T__41=41	98	T__41=41
		99	T__42=42
		100	T__43=43
		101	T__44=44
		102	T__45=45
		103	T__46=46
		104	T__47=47
		105	T__48=48
		106	T__49=49
		107	T__50=50
		108	T__51=51
		109	T__52=52
		110	T__53=53
		111	T__54=54
		112	T__55=55
		113	T__56=56
		114	T__57=57
		115	T__58=58
		116	T__59=59
		117	T__60=60
		118	T__61=61
		119	T__62=62
		120	T__63=63
		121	T__64=64
		122	T__65=65
		123	T__66=66
		124	T__67=67
		125	T__68=68
		126	T__69=69
		127	T__70=70
		128	T__71=71
		129	T__72=72
		130	T__73=73
		131	T__74=74