Fix real literals

1 files changed, 7 insertions, 4 deletions

diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext b/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
index 495f50e4..4aeb0acd 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
+++ b/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
@@ -92,7 +92,7 @@ NodeValueAssertion:
         node=[Node|QualifiedName] ":" value=Constant ".";
 
 Constant:
-        IntConstant | RealConstant | StringConstant;
+        RealConstant | IntConstant | StringConstant;
 
 IntConstant:
         intValue=Integer;
@@ -133,18 +133,21 @@ QualifiedName hidden():
         QUOTED_ID | Identifier ("::" Identifier)*;
 
 Identifier:
-        ID | "true" | "false" | "e" | "E";
+        ID | "true" | "false";
 
 Integer returns ecore::EInt hidden():
         "-"? INT;
 
-Real returns ecore::EDouble hidden():
-        "-"? INT ("." INT | ("." INT)? ("e" | "E") ("-" | "+")? INT);
+Real returns ecore::EDouble:
+        "-"? (EXPONENTIAL | INT "." (INT | EXPONENTIAL));
 
 @Override
 terminal ID:
         ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
+terminal EXPONENTIAL:
+        INT ("e" | "E") ("+" | "-")? INT;
+
 @Override
 terminal STRING:
         '"' ('\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\' | '"'))* '"';