fix: terminal prevents expect and with from being keywords

Author: tpluscode

app.hypermedia.testing.dsl/src/main/java/app/hypermedia/testing/dsl/Core.xtext

@@ -16,29 +16,26 @@ ResponseStep:
 RepresentationStep:
     PropertyBlock |
     PropertyStatement;
-    
-terminal WITH_MODIFIER: 'With';
-terminal EXPECT_MODIFIER: 'Expect';
 
 ClassBlock:
-	WITH_MODIFIER 'Class' name=STRING '{'
+	'With' 'Class' name=STRING '{'
 		(children+=RepresentationStep)*
 		hatch=HATCH?
 	'}';
 
 PropertyBlock:
-    modifier=(WITH_MODIFIER | EXPECT_MODIFIER) 'Property' name=STRING '{'
+    modifier=('With' | 'Expect') 'Property' name=STRING '{'
         (children+=RepresentationStep)*
         hatch=HATCH?
     '}'
 ;
 
 PropertyStatement:
-    EXPECT_MODIFIER 'Property' name=STRING (value=STRING)?
+    'Expect' 'Property' name=STRING (value=STRING)?
 ;
 
 StatusStatement:
-    EXPECT_MODIFIER 'Status' status=INT
+    'Expect' 'Status' status=INT
 ;
 
 terminal HATCH: '++' -> '++';

app.hypermedia.testing.dsl/src/main/java/app/hypermedia/testing/dsl/Hydra.xtext

@@ -19,14 +19,14 @@ RepresentationStep:
 ;
 
 RelaxedOperationBlock:
-    WITH_MODIFIER 'Operation' name=STRING '{'
+    'With' 'Operation' name=STRING '{'
         (invocations+=InvocationBlock)*
     '}'
 ;
 
 // TODO: Can we use only one step for this and restrict Expect Operation from being used on top level?? 
 OperationBlock:
-    modifier=(WITH_MODIFIER | EXPECT_MODIFIER) 'Operation' name=STRING '{'
+    modifier=('With' | 'Expect') 'Operation' name=STRING '{'
         (invocations+=InvocationBlock)*
     '}'
 ;