- relations working

compiler/pumcl.jison

@@ -199,32 +199,28 @@ statement
 */
 relation
   : IDENT someLine IDENT
+  | IDENT STRING someLine IDENT
+  | IDENT someLine STRING IDENT
+  | IDENT STRING someLine STRING IDENT
   ;
 
 /*
   Driver - Car : "drives"
-*/
-relationWithText
-  : relation
-  | relation COLON STRING
-  ;
-
-/*
   Driver - Car : <
   Driver - Car : >
   Driver - Car : < "drives"
   Driver - Car : "drives" >
 */
 relationWithTextDirected
-  : relationWithText
-  | relationWithText ANGEL_BRACKET_OPEN
-  | relationWithText ANGEL_BRACKET_CLOSE
-  | relationWithText ANGEL_BRACKET_OPEN STRING
-  | relationWithText STRING ANGEL_BRACKET_CLOSE
+  : relation
+  | relation COLON STRING
+  | relation COLON ANGEL_BRACKET_OPEN
+  | relation COLON ANGEL_BRACKET_CLOSE
+  | relation COLON ANGEL_BRACKET_OPEN STRING
+  | relation COLON STRING ANGEL_BRACKET_CLOSE
   ;
 
 
-
 /* all lines ... */
 someLine
   :LINE