adding syntax support for externally defined distributions and functions

example/hurricane-new.blog

@@ -30,5 +30,5 @@ distinct DamageLevel Severe, Mild;
 obs Damage(First) = Severe;
 
 query First;
-query Damage(A);
-query Damage(B);
+//query Damage(A);
+//query Damage(B);

src/main/java/blog/absyn/DistributionDec.java

@@ -3,35 +3,24 @@
 import blog.symbol.Symbol;
 
 /**
+ * Distribution declaration
+ * 
  * @author leili
  * @date Apr 22, 2012
  * 
  */
-public class DistributionDec extends Dec {
-  public Symbol name;
-  public Symbol classname;
-  public ExprList params;
+public class DistributionDec extends FunctionDec {
 
-  public DistributionDec(int p, Symbol n, Symbol cn, ExprList a) {
-    this(0, p, n, cn, a);
+  public DistributionDec(int p, Symbol n, FieldList a, Ty r) {
+    this(0, p, n, a, r);
   }
 
-  public DistributionDec(int line, int col, Symbol n, Symbol cn, ExprList a) {
-    super(line, col);
-    name = n;
-    classname = cn;
-    params = a;
+  public DistributionDec(int line, int pos, Symbol n, FieldList a, Ty r) {
+    super(line, pos, n, a, r, null);
   }
 
   @Override
   public void printTree(Printer pr, int d) {
-    pr.indent(d);
-    pr.sayln("DistributionDec(");
-    pr.indent(d + 1);
-    pr.say(name.toString());
-    pr.sayln(",");
-    pr.say(classname.toString());
-    pr.sayln(",");
-    params.printTree(pr, d + 1);
+    // to be removed
   }
 }

src/main/java/blog/model/BuiltInFunctions.java

@@ -174,6 +174,11 @@ public class BuiltInFunctions {
    */
   public static FixedFunction MINUS;
 
+  /**
+   * The unary function on integers <code>x<code> that returns - x.
+   */
+  public static FixedFunction UMINUS;
+
   /**
    * The function on integers <code>x<code>, <code>y</code> that returns x * y.
    */
@@ -229,6 +234,11 @@ public class BuiltInFunctions {
    */
   public static FixedFunction RMINUS;
 
+  /**
+   * The unary function on a real <code>x<code> that returns - x.
+   */
+  public static FixedFunction RUMINUS;
+
   /**
    * The function on reals <code>x<code>, <code>y</code> that returns x * y.
    */
@@ -736,6 +746,34 @@ public Object getValue(List args) {
     MOD = new FixedFunction(MOD_NAME, argTypes, retType, modInterp);
     addFunction(MOD);
 
+    // Add non-random functions from integer to integer
+    argTypes.clear();
+    argTypes.add(BuiltInTypes.INTEGER);
+    retType = BuiltInTypes.INTEGER;
+
+    FunctionInterp uminusInterp = new AbstractFunctionInterp() {
+      public Object getValue(List args) {
+        Number arg1 = (Number) args.get(0);
+        return new Integer(-arg1.intValue());
+      }
+    };
+    UMINUS = new FixedFunction(MINUS_NAME, argTypes, retType, uminusInterp);
+    addFunction(UMINUS);
+
+    // Add non-random functions from integer to integer
+    argTypes.clear();
+    argTypes.add(BuiltInTypes.REAL);
+    retType = BuiltInTypes.REAL;
+
+    FunctionInterp ruminusInterp = new AbstractFunctionInterp() {
+      public Object getValue(List args) {
+        Number arg1 = (Number) args.get(0);
+        return new Double(-arg1.intValue());
+      }
+    };
+    RUMINUS = new FixedFunction(MINUS_NAME, argTypes, retType, ruminusInterp);
+    addFunction(RUMINUS);
+
     // Add non-random functions from (real x real) to real
     argTypes.clear();
     argTypes.add(BuiltInTypes.REAL);