Extended MathApp

Author: kevinlano

BasicExpression.java

@@ -3680,7 +3680,7 @@ else if (objectRef.type != null &&
         bf = e.getDefinedOperation(data,parameters);
 
         if (bf != null) 
-        { System.out.println("**Type of " + data + " is operation, of class: " + e);
+        { System.out.println("*>>* Type of " + data + " is operation, of class: " + e);
           entity = e;
           if (bf.parametersMatch(parameters)) { } 
           else 
@@ -5464,12 +5464,13 @@ else if (objectRef.type != null && objectRef.type.isEntity(entities))
         bf = e.getDefinedOperation(data,parameters);
 
         if (bf != null) 
-        { System.out.println("**Type of " + data + " is operation, of: " + e);
+        { System.out.println("** Type of " + data + " is operation, of: " + e);
           entity = e;
           if (bf.parametersMatch(parameters)) { } 
           else 
-          { JOptionPane.showMessageDialog(null, "Parameters do not match operation pars: " + this + " " + bf, 
-                                    "Type warning", JOptionPane.WARNING_MESSAGE);
+          { JOptionPane.showMessageDialog(null, 
+              "Parameters do not match operation pars: " + this + " " + bf, 
+              "Type warning", JOptionPane.WARNING_MESSAGE);
             continue; 
           }  
 
@@ -5517,7 +5518,8 @@ else if (e.getEventNames().contains(data))
           return true; 
         } // else, downcast if in a subclass
         else 
-        { Entity subent = e.searchForSubclassWithOperation(data); 
+        { Entity subent = 
+            e.searchForSubclassWithOperation(data); 
           if (subent != null) 
           { downcast = true; 
             entity = subent; 
@@ -5532,7 +5534,8 @@ else if (e.getEventNames().contains(data))
               { umlkind = QUERY; }
               else 
               { umlkind = UPDATEOP; 
-                if (type == null || type.equals("") || type.equals("void"))
+                if (type == null || type.equals("") || 
+                    type.equals("void"))
                 { type = new Type("boolean",null); }  
               } 
               setObjectRefType(); 
@@ -5594,8 +5597,16 @@ else if (objectRef != null)
         } 
         umlkind = UPDATEOP;   
       }          
+
+      // System.err.println("Operation " + data + " at call " + this + ".\n");  
+      //  System.out.println(">> " + objectRef + " of type: " + objectRef.type); 
+      // type = new Type("boolean",null);         
+      // elementType = new Type("boolean",null);
+      // umlkind = UPDATEOP;   
+      // }
     }
 
+
     if (isFunction(data))
     { umlkind = FUNCTION;
       if (objectRef == null) // error

BehaviouralFeature.java

@@ -3043,20 +3043,39 @@ public Expression determinate(Vector arguments)
   } 
 
   public boolean parametersMatch(Vector pars)
-  { if (pars == null || parameters == null) { return false; } 
+  { if (pars == null || parameters == null) 
+    { return false; } 
+
+    System.out.println(">>> For operation " + name + " actual parameters are " + pars + " formal parameters are " + parameters); 
+
     if (pars.size() == parameters.size()) 
     { return true; } 
+
+    return false; 
+  } // and check the types
+
+  public boolean parametersSupset(Vector pars)
+  { if (pars == null || parameters == null) 
+    { return false; } 
+
+    if (pars.size() < parameters.size()) 
+    { return true; } 
+
     return false; 
   } // and check the types
 
   public boolean parameterMatch(Vector pars)
-  { if (pars == null || parameters == null) { return false; } 
+  { if (pars == null || parameters == null) 
+    { return false; } 
     if (pars.size() != parameters.size()) 
     { return false; } 
     for (int i = 0; i < parameters.size(); i++) 
     { Attribute par = (Attribute) parameters.get(i); 
       Expression arg = (Expression) pars.get(i); 
-      if (Type.isSubType(arg.getType(), par.getType())) { }  // = or a subtype
+      if (par.getType() == null ||
+          Type.isVacuousType(par.getType())) { } 
+      else if (par.getType().equals(arg.getType())) { } 
+      else if (Type.isSubType(arg.getType(), par.getType())) { }  // = or a subtype
       else 
       { return false; } 
     } 
@@ -3065,12 +3084,28 @@ public boolean parameterMatch(Vector pars)
   } // and check the types
 
   public void setFormalParameters(Vector pars)
-  { if (pars == null || parameters == null) { return; } 
-    for (int i = 0; i < parameters.size() && i < pars.size(); i++) 
+  { if (pars == null || parameters == null) 
+    { return; }
+ 
+    Vector extrapars = new Vector(); 
+
+    for (int i = 0; i < parameters.size(); i++) 
     { Attribute par = (Attribute) parameters.get(i); 
-      Expression arg = (Expression) pars.get(i); 
-      arg.formalParameter = par; 
+      Type pt = par.getType(); 
+
+      if (i < pars.size())
+      { Expression arg = (Expression) pars.get(i); 
+        arg.formalParameter = par;
+      } 
+      else 
+      { Expression nullInit = 
+          Type.nullInitialValueExpression(pt); 
+        nullInit.formalParameter = par; 
+        extrapars.add(nullInit); 
+      } 
     } 
+
+    pars.addAll(extrapars); 
   } // Used in code generation, eg., for Swift. 
 
   public Expression substituteParameters(Expression e, Vector arguments) 

Entity.java

@@ -7148,8 +7148,9 @@ public BehaviouralFeature getOperation(String nme, Vector parameters)
   { BehaviouralFeature res = null; 
     for (int i = 0; i < operations.size(); i++) 
     { res = (BehaviouralFeature) operations.get(i); 
-      if (nme.equals(res.getName()) && res.parametersMatch(parameters))
-      { return res; } 
+      if (nme.equals(res.getName()) && 
+          res.parametersMatch(parameters))
+      { return res; }
     }  
 
     return getOperation(nme); 
@@ -7185,17 +7186,28 @@ public BehaviouralFeature getDefinedOperation(String nme)
     return null; 
   } 
 
-  public BehaviouralFeature getDefinedOperation(String nme, Vector parameters)
+  public BehaviouralFeature getDefinedOperation(String nme, 
+                                         Vector parameters)
   { BehaviouralFeature res = null; 
     for (int i = 0; i < operations.size(); i++) 
     { res = (BehaviouralFeature) operations.get(i); 
-      if (nme.equals(res.getName()) && res.parametersMatch(parameters))
+      if (nme.equals(res.getName()) && 
+          res.parametersMatch(parameters))
       { return res; } 
     }  
 
+    for (int i = 0; i < operations.size(); i++) 
+    { res = (BehaviouralFeature) operations.get(i); 
+      if (nme.equals(res.getName()) && 
+          res.parametersSupset(parameters))
+      { System.out.println("!! There is no operation " + nme + " in class " + name + " with " + parameters.size() + " parameters,\n   but there is an operation with " + res.getParameters().size() + " parameters -- the call needs to be extended."); 
+      }   
+    } 
+
     if (superclass != null) 
     { return superclass.getDefinedOperation(nme,parameters); } 
 
+
     return null; 
   } 
 

MathApp.java

@@ -562,7 +562,7 @@ else if (chr.length() > 0 &&
           { inserting = true; 
             insertedText = insertedText + chr.charAt(0); 
             if ("Define".equals(insertedText))
-            { thisLabel.setText("Define variable: Define v, Define v = expr, Define v = instruction, Define v ~ distribution"); }
+            { thisLabel.setText("Define variable: Define v, Define v = expr, Define v : type, Define v : type = expr, Define v = instruction, Define v ~ distribution"); }
             else if ("Solve".equals(insertedText))
             { thisLabel.setText("Solve single quadratic or differential equations, and multiple linear equations: Solve eqns for vars"); }
             else if ("Prove".equals(insertedText))
@@ -1182,13 +1182,13 @@ public void actionPerformed(ActionEvent e)
       {  
         umlPane = new JEditorPane();  
         umlPane.setEditable(false); 
-        umlPane.setSize(300,400);
+        umlPane.setSize(400,400);
         int w = getWidth(); 
         int h = getHeight(); 
 
         getContentPane().add(new JScrollPane(umlPane),  
                              java.awt.BorderLayout.EAST); 
-        setSize(w + 300, h); 
+        setSize(w + 400, h); 
         umlPane.setVisible(true); 
 
         java.awt.LayoutManager ll = getLayout(); 
@@ -1423,7 +1423,9 @@ public void actionPerformed(ActionEvent e)
 
       helpPane.setText("Specifications contain these elements: \n\n" + 
         "1. Define clauses, with syntax one of\n" + 
-        "    Define var = expr\n" + 
+        "    Define var = expr\n" +
+        "    Define var : type\n" + 
+        "    Define var : type = expr\n" + 
         "    Define funcn(pars) = expr\n" + 
         "    Define var = instruction\n" + 
         "    Define var ~ distribution\n\n" +

Statement.java

@@ -269,6 +269,56 @@ public static Statement replaceReturnBySkip(Statement st)
     return st;
   } // Other cases, for all other forms of statement. 
 
+  public static Vector getLocalDeclarations(Statement st)
+  { Vector res = new Vector(); 
+    if (st == null) 
+    { return res; }
+ 
+    if (st instanceof SequenceStatement) 
+    { SequenceStatement sq = (SequenceStatement) st; 
+      Vector stats = sq.getStatements(); 
+      for (int i = 0; i < stats.size(); i++) 
+      { if (stats.get(i) instanceof Statement)
+        { Statement stat = (Statement) stats.get(i); 
+          res.addAll(Statement.getLocalDeclarations(stat));
+        }  
+      } 
+      return res;
+    } 
+    
+    if (st instanceof CreationStatement)
+    { res.add(st); 
+      return res; 
+    } 
+
+    if (st instanceof ConditionalStatement) 
+    { ConditionalStatement cs = (ConditionalStatement) st; 
+      res.addAll(getLocalDeclarations(cs.ifPart())); 
+      res.addAll(getLocalDeclarations(cs.elsePart())); 
+      return res; 
+    } 
+
+    if (st instanceof WhileStatement) 
+    { WhileStatement ws = (WhileStatement) st; 
+      res.addAll(getLocalDeclarations(ws.getLoopBody())); 
+      return res; 
+    } 
+
+    if (st instanceof TryStatement) 
+    { TryStatement ts = (TryStatement) st; 
+      res.addAll(getLocalDeclarations(ts.getBody())); 
+      Vector stats = ts.getClauses(); 
+      for (int i = 0; i < stats.size(); i++) 
+      { if (stats.get(i) instanceof Statement)
+        { Statement stat = (Statement) stats.get(i); 
+          res.addAll(getLocalDeclarations(stat));
+        }  
+      } 
+      res.addAll(getLocalDeclarations(ts.getEndStatement())); 
+    } 
+
+    return res;
+  } // Other cases, for all other forms of statement. 
 
   public static Vector getBreaksContinues(Statement st)
   { Vector res = new Vector(); 

Type.java

@@ -2868,6 +2868,15 @@ else if (nme.equals("int") || nme.equals("long"))
     return res; 
   } 
 
+  public static Expression nullInitialValueExpression(Type t)
+  { if (t == null) 
+    { return new BasicExpression("null"); } 
+    String tname = t.getName(); 
+    if (tname.equals("double"))
+    { return new BasicExpression("Math_NaN"); } 
+    return new BasicExpression("null"); 
+  } 
+
   public static Expression defaultInitialValueExpression(Type t)
   { if (t == null) 
     { return new BasicExpression("null"); } 

UmlTool.java

@@ -949,6 +949,13 @@ public UmlTool()
       "Splits operation code into segments where possible");
     qualityMenu.add(splitSegmentsop);
 
+    JMenuItem hoistDecsop = 
+      new JMenuItem("Hoist local declarations"); 
+    hoistDecsop.addActionListener(this);
+    hoistDecsop.setToolTipText(
+      "Hoists local declarations to start of operation code");
+    qualityMenu.add(hoistDecsop);
+
     JMenuItem refineMenu = new JMenu("Refinement"); 
     transMenu.add(refineMenu); 
 

UnaryExpression.java

@@ -3784,7 +3784,10 @@ else if (Type.isMapType(argument.type))
     { return qf + ".trim()"; } 
 
     if (operator.equals("->oclIsUndefined")) 
-    { return "(" + qf + " == null)"; } 
+    { if (argument.isNumeric())
+      { return "Double.isNaN((double) " + qf + ")"; } 
+      return "(" + qf + " == null)"; 
+    } 
 
     if (operator.equals("->oclIsInvalid")) 
     { return "Double.isNaN(" + qf + ")"; } 
@@ -4081,7 +4084,10 @@ else if (argument instanceof UnaryExpression)
     { return qf + ".trim()"; } 
 
     if (operator.equals("->oclIsUndefined")) 
-    { return "(" + qf + " == null)"; } 
+    { if (argument.isNumeric())
+      { return "Double.isNaN((double) " + qf + ")"; } 
+      return "(" + qf + " == null)"; 
+    } 
 
     if (operator.equals("->oclIsInvalid")) 
     { return "Double.isNaN(" + qf + ")"; } 
@@ -4448,7 +4454,10 @@ else if (argument instanceof UnaryExpression)
     { return qf + ".trim()"; } 
 
     if (operator.equals("->oclIsUndefined")) 
-    { return "(" + qf + " == null)"; } 
+    { if (argument.isNumeric())
+      { return "Double.isNaN((double) " + qf + ")"; } 
+      return "(" + qf + " == null)"; 
+    } 
 
     if (operator.equals("->oclIsInvalid")) 
     { return "Double.isNaN(" + qf + ")"; } 
@@ -4821,7 +4830,10 @@ public String queryFormCSharp(java.util.Map env, boolean local)
     { return "((ArrayList) SystemTypes.characters(" + qf + "))"; } 
 
     if (operator.equals("->oclIsUndefined")) 
-    { return "(" + qf + " == null)"; } 
+    { if (argument.isNumeric())
+      { return "double.IsNaN((double) " + qf + ")"; }
+      return "(" + qf + " == null)"; 
+    } 
 
     if (operator.equals("->oclIsInvalid")) 
     { return "double.IsNaN(" + qf + ")"; } 
@@ -5158,10 +5170,15 @@ public String queryFormCPP(java.util.Map env, boolean local)
     { return "UmlRsdsLib<int>::byte2char(" + qf + ")"; } 
 
     if (operator.equals("->oclIsUndefined")) 
-    { return "(" + qf + " == NULL)"; } 
+    { if (argument.isNumeric())
+      { return "_isnan((double) " + qf + ")"; }
+      return "(" + qf + " == NULL)"; 
+    } 
 
     if (operator.equals("->oclIsNew")) 
-    { return "(" + qf + " != NULL)"; } 
+    { 
+      return "(" + qf + " != NULL)"; 
+    } 
 
     if (operator.equals("->oclIsInvalid")) 
     { // return "std::isnan(" + qf + ")";