Updated MathOCL for dates

Author: kevinlano

MathApp.java

@@ -1228,6 +1228,12 @@ public void actionPerformed(ActionEvent e)
           String arg1 = CGRule.correctNewlines(entcode); 
           System.out.println(arg1); 
 
+          File datelib = new File("libraries/ocldate.km3"); 
+          if (datelib.exists())
+          { loadKM3FromFile(datelib); }
+          else 
+          { System.err.println("! Warning: no file libraries/ocldate.km3"); } 
+
           File mathlib = new File("libraries/mathlib.km3"); 
           if (mathlib.exists())
           { loadKM3FromFile(mathlib); }

MathOCL.g4

@@ -32,6 +32,8 @@ formula
     :	'Define' basicExpression '=' (instruction | expression) 
     | 'Define' basicExpression '~' expression
     | 'Define' basicExpression
+    | 'Define' basicExpression ':' type
+    | 'Define' basicExpression ':' type '=' expression
     ; 
 
 instruction
@@ -110,7 +112,7 @@ type
     | 'Bag' '(' type ')' 
     | 'OrderedSet' '(' type ')' 
     | 'Map' '(' type ',' type ')' 
-    | 'Function' '(' type ',' type ')' 
+    | 'Function' '(' type ',' type ')'
     | NATURAL
     | INTEGER
     | REAL