extended simulator

Author: kevinlano

BasicExpression.java

@@ -17046,10 +17046,9 @@ public Expression evaluate(
 
       if (bf == null) 
       { return this; } 
-
-      ModelState opstackframe = (ModelState) beta.clone(); 
-      opstackframe.addNewEnvironment(); 
-      opstackframe.addVariable("self", selfobject); 
+ 
+      beta.addNewEnvironment(); 
+      beta.addVariable("self", selfobject); 
 
       Vector parValues = new Vector(); 
       for (int i = 0; i < actualPars.size(); i++) 
@@ -17059,7 +17058,9 @@ public Expression evaluate(
       } 
 
       Expression res = 
-         bf.execute(sigma, opstackframe, parValues);
+         bf.execute(sigma, beta, parValues);
+
+      beta.removeLastEnvironment(); 
 
       return res; 
     } 

BehaviouralFeature.java

@@ -147,8 +147,6 @@ public Expression execute(ModelSpecification sigma,
 
     // return value is that computed by this operation,
     // if it returns a value. 
-
-    ModelState local = (ModelState) beta.clone();
 
     System.out.println(">> Executing operation " + this + 
                        " on parameters " + parValues + 
@@ -162,24 +160,27 @@ public Expression execute(ModelSpecification sigma,
       String pname = par.getName(); 
       if (i < parValues.size())
       { Expression pval = (Expression) parValues.get(i); 
-        local.addVariable(pname, pval); 
+        beta.addVariable(pname, pval); 
       } 
       else if (typ != null) 
       { Expression def = Type.defaultInitialValueExpression(typ); 
-        local.addVariable(pname, def); 
+        beta.addVariable(pname, def); 
       }    
     } 
 
     if (resultType != null) 
     { Expression res = 
          Type.defaultInitialValueExpression(resultType);
-      local.addVariable("result", res); 
+      beta.addVariable("result", res); 
     } 
 
-    int status = activity.execute(sigma,local); 
+    int status = activity.execute(sigma, beta); 
 
+    /* JOptionPane.showInputDialog(">> Operation result is " + 
+                      beta.getVariableValue("result")); */ 
+ 
     if (resultType != null) 
-    { return local.getVariableValue("result"); } 
+    { return beta.getVariableValue("result"); } 
 
     return null; 
   } 

BinaryExpression.java

@@ -19162,6 +19162,32 @@ public Expression evaluate(ModelSpecification sigma,
 
     Expression lft = left.evaluate(sigma, beta); 
     Expression rgt = right.evaluate(sigma, beta); 
+
+    if ("->apply".equals(operator) && 
+        lft instanceof UnaryExpression &&
+        ((UnaryExpression) lft).getOperator().equals("lambda"))
+    { UnaryExpression lam = (UnaryExpression) lft; 
+      // create a new local state binding lam.accumulator to rgt
+      // Evaluate lft in that state.
+
+      Expression arg = lam.getArgument(); 
+      Attribute acc = lam.getAccumulator(); 
+
+      if (acc != null) 
+      { String nme = acc.getName(); 
+        beta.addNewEnvironment(); 
+        beta.addVariable(nme, rgt); 
+
+        // JOptionPane.showInputDialog("Evaluating " + arg + " in environment " + beta); 
+
+        Expression res = arg.evaluate(sigma, beta); 
+        beta.removeLastEnvironment();
+        return res.simplify();
+      } 
+
+      return new BasicExpression("null"); 
+    } 
+
     return simplify(operator, lft, rgt, false); 
   } 
 
@@ -21645,7 +21671,7 @@ public Expression simplifyOCL()
         synLeft > synRight)
     { BinaryExpression res = 
         new BinaryExpression(operator, rexpr, lexpr); 
-      System.out.println(">> OCL efficiency smell (OES): Inefficient logical combination: " + this);
+      System.err.println("! Possible OCL efficiency smell (OES): Inefficient logical combination: " + this);
       return res; 
     } 
 
@@ -21663,7 +21689,7 @@ public Expression simplifyOCL()
 
         if (leftargop.equals("->select"))
         { // s->select(P)->size() = 0
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           UnaryExpression notpred = 
             new UnaryExpression("not", leftargpred); 
@@ -21674,7 +21700,7 @@ public Expression simplifyOCL()
         } 
         else if (leftargop.equals("->reject"))
         { // s->reject(P)->size() = 0
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           BinaryExpression res = 
             new BinaryExpression("->forAll", leftargleft,
@@ -21683,7 +21709,7 @@ else if (leftargop.equals("->reject"))
         } 
         else if (leftargop.equals("|"))
         { // s->select(x | P)->size() = 0
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           UnaryExpression notpred = 
             new UnaryExpression("not", leftargpred); 
@@ -21694,7 +21720,7 @@ else if (leftargop.equals("|"))
         } 
         else if (leftargop.equals("|R"))
         { // s->reject(x | P)->size() = 0
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           BinaryExpression res = 
             new BinaryExpression("!", leftargleft,
@@ -21704,7 +21730,7 @@ else if (leftargop.equals("|R"))
       }
       else if ("->size".equals(leftop))
       { // col->size() = 0 is col->isEmpty()
-        System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+        System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
         Expression col = arg.getArgument(); 
         UnaryExpression res = 
@@ -21720,7 +21746,7 @@ else if ("->size".equals(leftop))
       if (leftop.equals("->count"))
       { // s->count(x) = 0
 
-        System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+        System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
         BinaryExpression res = 
            new BinaryExpression("->excludes", be.getLeft(),
@@ -21743,7 +21769,7 @@ else if ("->size".equals(leftop))
 
         if (leftargop.equals("->select"))
         { // s->select(P)->size() = 1
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           BinaryExpression res = 
             new BinaryExpression("->exists1", leftargleft,
@@ -21752,7 +21778,7 @@ else if ("->size".equals(leftop))
         } 
         else if (leftargop.equals("->reject"))
         { // s->reject(P)->size() = 1
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           UnaryExpression notpred = 
             new UnaryExpression("not", leftargpred); 
@@ -21763,7 +21789,7 @@ else if (leftargop.equals("->reject"))
         } 
         else if (leftargop.equals("|"))
         { // s->select(x | P)->size() = 1
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           BinaryExpression res = 
             new BinaryExpression("#1", leftargleft,
@@ -21772,7 +21798,7 @@ else if (leftargop.equals("|"))
         } 
         else if (leftargop.equals("|R"))
         { // s->reject(x | P)->size() = 1
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           UnaryExpression notpred = 
             new UnaryExpression("not", leftargpred); 
@@ -21799,7 +21825,7 @@ else if (leftargop.equals("|R"))
 
         if (leftargop.equals("->select"))
         { // s->select(P)->size() > 0
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           BinaryExpression res = 
             new BinaryExpression("->exists", leftargleft,
@@ -21808,7 +21834,7 @@ else if (leftargop.equals("|R"))
         } 
         else if (leftargop.equals("->reject"))
         { // s->reject(P)->size() > 0
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           UnaryExpression notpred = 
             new UnaryExpression("not", leftargpred); 
@@ -21820,7 +21846,7 @@ else if (leftargop.equals("->reject"))
         else if (leftargop.equals("|"))
         { // s->select(x | P)->size() > 0
 
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           BinaryExpression res = 
             new BinaryExpression("#", leftargleft,
@@ -21830,7 +21856,7 @@ else if (leftargop.equals("|"))
         else if (leftargop.equals("|R"))
         { // s->reject(x | P)->size() > 0
 
-          System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+          System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
           UnaryExpression notpred = 
              new UnaryExpression("not", leftargpred); 
@@ -21843,7 +21869,7 @@ else if (leftargop.equals("|R"))
       else if ("->size".equals(leftop)) 
       { // col->size() > 0
 
-        System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+        System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
         Expression col = arg.getArgument(); 
         UnaryExpression res = 
           new UnaryExpression("->notEmpty", col); 
@@ -21857,7 +21883,7 @@ else if ("->size".equals(leftop))
       String leftop = be.getOperator(); 
       if (leftop.equals("->count"))
       { // s->count(x) > 0
-        System.out.println(">> OCL efficiency smell (OES): Inefficient comparison: " + this);
+        System.err.println("!! OCL efficiency smell (OES): Inefficient comparison: " + this);
 
         BinaryExpression res = 
            new BinaryExpression("->includes", be.getLeft(),
@@ -21873,7 +21899,7 @@ else if ("->size".equals(leftop))
       { BinaryExpression lbe = (BinaryExpression) domain; 
 
         if (lbe.operator.equals("->select"))
-        { System.out.println(">> OCL efficiency smell (OES): Inefficient nested select: " + this);
+        { System.err.println("!! OCL efficiency smell (OES): Inefficient nested select: " + this);
           Expression newleft = lbe.getLeft();
           Expression newright = lbe.getRight();
           BasicExpression ref = 
@@ -21887,7 +21913,7 @@ else if ("->size".equals(leftop))
           return new BinaryExpression("|", newdomain, newpred); 
         }  
         else if (lbe.operator.equals("->reject"))
-        { System.out.println(">> OCL efficiency smell (OES): Inefficient nested select: " + this);
+        { System.err.println("!! OCL efficiency smell (OES): Inefficient nested select: " + this);
           Expression newleft = lbe.getLeft(); 
           Expression newright = lbe.getRight();
           BasicExpression ref = 
@@ -21911,7 +21937,7 @@ else if (operator.equals("|R"))
       { BinaryExpression lbe = (BinaryExpression) domain; 
 
         if (lbe.operator.equals("->select"))
-        { System.out.println(">> OCL efficiency smell (OES): Inefficient nested select/reject: " + this);
+        { System.err.println("!! OCL efficiency smell (OES): Inefficient nested select/reject: " + this);
           Expression newleft = lbe.getLeft();
           Expression newright = lbe.getRight();
           BasicExpression ref = 
@@ -21926,7 +21952,7 @@ else if (operator.equals("|R"))
           return new BinaryExpression("|", newdomain, newpred); 
         }  
         else if (lbe.operator.equals("->reject"))
-        { System.out.println(">> OCL efficiency smell (OES): Inefficient nested reject: " + this);
+        { System.err.println("!! OCL efficiency smell (OES): Inefficient nested reject: " + this);
           Expression newleft = lbe.getLeft(); 
           Expression newright = lbe.getRight();
           BasicExpression ref = 
@@ -21948,19 +21974,19 @@ else if (operator.equals("->select"))
       if (left instanceof BinaryExpression) 
       { BinaryExpression lbe = (BinaryExpression) left; 
         if (lbe.operator.equals("->select"))
-        { System.out.println(">> OCL efficiency smell (OES): Inefficient nested select: " + this);
+        { System.err.println("!! OCL efficiency smell (OES): Inefficient nested select: " + this);
           Expression predicate1 = lbe.getRight(); 
           Expression combinedPred = 
               new BinaryExpression("&", predicate1, right); 
           BinaryExpression res = (BinaryExpression) clone();
           res.left = lbe.getLeft(); 
           res.operator = "->select"; 
           res.right = combinedPred; 
-          System.out.println(">> Replacing with: " + res); 
+          System.out.println("!! Replacing with: " + res); 
           return res; 
         }
         else if (lbe.operator.equals("->reject"))
-        { System.out.println(">> OCL efficiency smell (OES): Inefficient nested select: " + this);
+        { System.err.println("!! OCL efficiency smell (OES): Inefficient nested select: " + this);
           Expression predicate1 = lbe.getRight();
           Expression pred2 = 
                Expression.negate(predicate1);  
@@ -21970,7 +21996,7 @@ else if (lbe.operator.equals("->reject"))
           res.left = lbe.getLeft(); 
           res.operator = "->select"; 
           res.right = combinedPred; 
-          System.out.println(">> Replacing with: " + res); 
+          System.out.println("!! Replacing with: " + res); 
           return res; 
         }
       }
@@ -21980,7 +22006,7 @@ else if (operator.equals("->reject"))
       if (left instanceof BinaryExpression) 
       { BinaryExpression lbe = (BinaryExpression) left; 
         if (lbe.operator.equals("->select"))
-        { System.out.println(">> OCL efficiency smell (OES): Inefficient nested select: " + this);
+        { System.err.println("!! OCL efficiency smell (OES): Inefficient nested select: " + this);
           Expression predicate1 = lbe.getRight(); 
           Expression combinedPred = 
               new BinaryExpression("&", 
@@ -21989,7 +22015,7 @@ else if (operator.equals("->reject"))
           res.left = lbe.getLeft(); 
           res.operator = "->select"; 
           res.right = combinedPred; 
-          System.out.println(">> Replacing with: " + res); 
+          System.out.println("!! Replacing with: " + res); 
           return res; 
         }
         else if (lbe.operator.equals("->reject"))

CGSpec.java

@@ -11,7 +11,9 @@
 import java.util.Vector; 
 import java.io.*;
 import java.util.regex.Matcher; 
-import java.util.regex.Pattern; 
+import java.util.regex.Pattern;
+
+import javax.swing.JOptionPane;  
 
 
 public class CGSpec
@@ -802,12 +804,18 @@ else if (op.startsWith("->") && trimmedlhs.endsWith(op + "()"))
       { selected = r; }
       else if (trimmedlhs.startsWith(op))
       { selected = r; }
+      else if (op.equals("lambda") && 
+               trimmedlhs.startsWith("(" + op))
+      { selected = r; }
+
+      // JOptionPane.showInputDialog(">>> unary expression rule " + r + " for " + e + " selected: " + selected + " " + args); 
 
       if (selected != null && 
           selected.satisfiesConditions(args,
                                        entities,this))
       { return selected; } 
    }
+
    return null;
   } // _1 binds to argument
 

Entity.java

@@ -365,7 +365,9 @@ public ObjectSpecification initialisedObject(String nme)
       new ObjectSpecification(nme, this);
 
     for (int i = 0; i < attributes.size(); i++) 
-    { Attribute attr = (Attribute) attributes.get(i); 
+    { Attribute attr = (Attribute) attributes.get(i);
+      if (attr.isStatic()) 
+      { continue; }  
       String aname = attr.getName(); 
       Expression aval = attr.getInitialisation(); 
       res.setOCLValue(aname, aval);