Updates preparing for version 2.3

Author: kevinlano

ASTBasicTerm.java

@@ -2894,6 +2894,13 @@ public Type cobolDataType()
     return null; 
   } 
 
+  public boolean cobolIsSigned()
+  { if ("S".equals(value))
+    { return true; }
+ 
+    return false; 
+  } 
+
   public Vector cobolDataDefinitions(java.util.Map context, Vector invs)
   { // Each immediately higher level item becomes an attribute
     // of container. If composite, it also becomes a class

ASTCompositeTerm.java

@@ -355,9 +355,9 @@ public ASTTerm replaceAmbiguousCobolNames(Vector rnames)
 
       String rname = (String) rnames.get(0); 
 
-      JOptionPane.showMessageDialog(null, this + 
+     /* JOptionPane.showMessageDialog(null, this + 
               " Basic data item: " + fld + " in " + rname, 
-              " ", JOptionPane.INFORMATION_MESSAGE);
+              " ", JOptionPane.INFORMATION_MESSAGE); */ 
 
       if (ASTTerm.cobolAmbiguousDataNames.contains(fld))
       { ASTTerm newname = 
@@ -381,9 +381,9 @@ else if ("dataDescriptionEntryFormat1".equals(tag) &&
       ASTTerm rec = (ASTTerm) terms.get(1); 
       String ename = rec.literalForm(); 
 
-      JOptionPane.showMessageDialog(null, this + 
+      /* JOptionPane.showMessageDialog(null, this + 
               " Record data: " + ename, 
-              " ", JOptionPane.INFORMATION_MESSAGE);
+              " ", JOptionPane.INFORMATION_MESSAGE); */ 
 
       Vector newterms = new Vector();
       newterms.add(terms.get(0)); 
@@ -41338,6 +41338,36 @@ else if (res == intType && typ == longType)
     return stringType; 
   } 
 
+  public boolean cobolIsSigned()
+  { if ("dataPictureClause".equals(tag))
+    { // (PIC | PICTURE) IS? pictureString
+
+      int sze = terms.size(); 
+      ASTTerm ptrm = (ASTTerm) terms.get(sze-1); 
+      System.out.println(">> " + ptrm + " is signed: " + ptrm.cobolIsSigned()); 
+      return ptrm.cobolIsSigned(); 
+    } 
+
+    if ("pictureString".equals(tag))
+    { boolean res = false; 
+      for (int i = 0; i < terms.size(); i++) 
+      { ASTTerm tt = (ASTTerm) terms.get(i); 
+        boolean bb = tt.cobolIsSigned();
+        if (bb == true) 
+        { return true; }
+      } 
+
+      return res; 
+    } 
+
+    if ("pictureChars".equals(tag))
+    { ASTTerm val = (ASTTerm) terms.get(0); 
+      return "S".equals(val.literalForm()); 
+    }   
+
+    return false; 
+  } 
+
   public int cobolOccursTimes()
   { if ("dataOccursClause".equals(tag))
     { // OCCURS integerLiteral dataOccursTo? TIMES? 
@@ -41582,6 +41612,7 @@ public Vector cobolDataDefinitions(java.util.Map context, Vector invs)
           int fractwidth = pictureClause.cobolFractionWidth();
           Type typ = pictureClause.cobolDataType();
           int wdth = pictureClause.cobolDataWidth();  
+          boolean isSigned = pictureClause.cobolIsSigned();  
 
           ASTTerm t2 = (ASTTerm) terms.get(1); 
           if (t2.getTag().equals("dataName"))
@@ -41662,12 +41693,14 @@ public Vector cobolDataDefinitions(java.util.Map context, Vector invs)
             typ.setElementType(elemT); 
           }  
 
+          boolean isSigned = pictureClause.cobolIsSigned();  
           integerWidth = pictureClause.cobolIntegerWidth(); 
           fractionalWidth = 
               pictureClause.cobolFractionWidth(); 
 
           JOptionPane.showMessageDialog(null, 
              "Type of " + fieldName + " is " + typ + 
+             " Signed: " + isSigned + 
              " Width: " + wdth + " " + integerWidth + " " + 
              fractionalWidth, 
              "", 
@@ -41985,13 +42018,14 @@ else if (levelNumber >= prevLevel)
             }  
           } 
 
-          JOptionPane.showMessageDialog(null, 
+        /*  JOptionPane.showMessageDialog(null, 
                  fieldName + 
                  " is subrecord of " + ownername + 
                  " from " + startPos, 
                           "", 
                           JOptionPane.INFORMATION_MESSAGE);
-         
+        */
+ 
           context.put("container", newent); 
           context.put("previousLevel", new Integer(levelNumber));
           context.put("startPosition", new Integer(1));  
@@ -42187,6 +42221,7 @@ public static boolean is88Entry(ASTTerm trm)
             int fractwidth = 
                        pictureClause.cobolFractionWidth();
             Type typ = pictureClause.cobolDataType();  
+            boolean isSigned = pictureClause.cobolIsSigned();  
 
             ASTTerm t2 = (ASTTerm) ctrm.terms.get(1); 
             if (t2.getTag().equals("dataName"))
@@ -42202,16 +42237,25 @@ public static boolean is88Entry(ASTTerm trm)
 
               JOptionPane.showMessageDialog(null, 
                 "Type of " + fname + " is " + typ + 
-                " Width " + wdth + 
-                " Integer width " + intwidth + 
-                " Fract width " + fractwidth, 
+                " Signed: " + isSigned + 
+                " Width: " + wdth + 
+                " Integer width: " + intwidth + 
+                " Fract width: " + fractwidth, 
                 "", 
                 JOptionPane.INFORMATION_MESSAGE);
 
               if (typ != null) 
               { String dval = typ.defaultValue(); 
                 ASTTerm.setTaggedValue(fname, "defaultValue", 
-                                       dval);  
+                                       dval); 
+                Constraint consV = 
+                   Constraint.getDataConstraint(fname,
+                                 typ,intwidth,fractwidth,
+                                 isSigned); 
+                if (consV != null)
+                { consV.ownerName = progname;  
+                  invs.add(consV);  
+                } 
               } 
             }
             else 
@@ -42290,7 +42334,8 @@ public static boolean is88Entry(ASTTerm trm)
           if (pictureClause != null) 
           { wdth = pictureClause.cobolDataWidth() * multiplicity; 
             typ = pictureClause.cobolDataType();  
-
+            boolean isSigned = pictureClause.cobolIsSigned();  
+          
             if (multiplicity > 1) 
             { Type elemT = typ; 
               typ = new Type("Sequence", null);
@@ -42309,6 +42354,7 @@ public static boolean is88Entry(ASTTerm trm)
 
             JOptionPane.showMessageDialog(null, 
                "Type of " + fieldName + " is " + typ + 
+               " Signed: " + isSigned + 
                " Width: " + wdth + 
                " Integer width: " + integerWidth + 
                " Fraction width: " + fractionalWidth + 
@@ -42334,7 +42380,15 @@ public static boolean is88Entry(ASTTerm trm)
               ASTTerm.setTaggedValue(
                                    fieldName, "defaultValue", 
                                    dval);  
-               
+              Constraint consV = 
+                Constraint.getDataConstraint(fieldName,
+                      typ,integerWidth,fractionalWidth, 
+                      isSigned); 
+
+              if (multiplicity == 1 && consV != null)
+              { consV.ownerName = progname;  
+                invs.add(consV);  
+              }
             }   
 
             int dIndex = fieldName.lastIndexOf("$"); 
@@ -42778,15 +42832,15 @@ else if (multiplicity > 1 & contMult > 1)
             cent.addAttribute(att); 
             ownername = 
                  cname.substring(0,cname.length()-6);
-             
+            /*
             JOptionPane.showMessageDialog(null, 
                  fieldName + 
                  " is subrecord of " + ownername + 
                  " from " + startPos + 
                  " multiplicity " + multiplicity, 
                           "", 
                           JOptionPane.INFORMATION_MESSAGE);
-         
+            */ 
        // context.put("container", newent); 
        // context.put("previousLevel", new Integer(levelNumber));
        // context.put("startPosition", new Integer(1));

ASTSymbolTerm.java

@@ -1046,6 +1046,13 @@ public Type cobolDataType()
     return null; 
   } 
 
+  public boolean cobolIsSigned()
+  { if ("S".equals(symbol))
+    { return true; }
+ 
+    return false; 
+  } 
+
   public Vector cobolDataDefinitions(java.util.Map context, Vector invs)
   { Vector res = new Vector(); 
     return res; 

ASTTerm.java

@@ -4158,6 +4158,8 @@ public static Vector randomCompositeASTTermsForTag(
 
   public abstract Type cobolDataType(); 
 
+  public abstract boolean cobolIsSigned(); 
+
   public static String coefficientOfPower(ASTTerm var, int n, 
                                           ASTTerm expr)
   { // coefficient of n-th power of v in expr, n > 0

BasicExpression.java

@@ -1377,7 +1377,8 @@ public boolean isExecutable()
   } // d.isDeleted not valid syntax.
 
   public boolean isPrimitive()  // A number, boolean or enumeration value
-  { if (umlkind == ROLE || umlkind == CLASSID) { return false; } 
+  { if (umlkind == ROLE || umlkind == CLASSID) 
+    { return false; } 
     // if (arrayIndex != null) 
     // { return (elementType != null && elementType.isPrimitive()); } 
 
@@ -1437,10 +1438,12 @@ else if (data.equals("max") || data.equals("min") || data.equals("last") ||
     }  // not prim if objectRef multiple and data : {sqr, sqrt, floor, exp, sqrt,
        // abs, toLower, toUpper
 
-    if (umlkind == VALUE || umlkind == VARIABLE || umlkind == CONSTANT)
+    if (umlkind == VALUE || umlkind == VARIABLE || 
+        umlkind == CONSTANT)
     { return Type.primitiveType(type); } 
 
-    if (umlkind == ATTRIBUTE || umlkind == QUERY || umlkind == UPDATEOP)
+    if (umlkind == ATTRIBUTE || umlkind == QUERY || 
+        umlkind == UPDATEOP)
     { // Look it up
 
       if (objectRef == null)
@@ -1463,6 +1466,7 @@ else if (entity != null)
 
        // if objectRef not multiple
     }
+
     return false;
   }
 
@@ -7876,11 +7880,11 @@ public String queryFormJava7(java.util.Map env, boolean local)
         "OclDate".equals(objectRef + ""))
     { return "Ocl.getTime()"; } 
 
-    if (data.startsWith("new"))
+    /* if (data.startsWith("new"))
     { String createdClass = data.substring(3); 
       if ("OclDate".equals(createdClass))
       { return "new Date()"; }
-    } 
+    } */ 
 
     if (data.equals("formattedString") && 
         "StringLib".equals(objectRef + ""))

BehaviouralFeature.java

@@ -1269,6 +1269,7 @@ public Vector formMutantCallsPython(
 
         String testcode = 
           "  def " + nme + "_mutation_tests_" + j + "(_self, _counts, _totals) :\n" + 
+          "    pass\n" + 
           code + "\n" + 
           "    try :\n" + 
           call +    

BinaryExpression.java

@@ -12531,7 +12531,7 @@ else if (rprim)
     { String ll = left.unwrap(lqf); 
       res = ll + " " + operator + " " + rqf; 
     } 
-    else  // includes case of Strings 
+    else  // includes case of Strings and dates 
     { res = "(" + lqf + ".compareTo(" + rqf + ") " + operator + " 0)"; } 
     // System.out.println("Comparitor query form: " + this + " is " + res); 
     return res;     

Constraint.java

@@ -138,6 +138,75 @@ public static Constraint getConstraint(Expression inv)
     { return new Constraint(new BasicExpression(true), inv); } 
   } 
 
+  public static Constraint getDataConstraint(String dname, 
+           Type typ, int intwidth, int fracwidth, 
+           boolean isSigned) 
+  { if (typ == null) 
+    { return null; } 
+
+    if ("int".equals(typ.getName()))
+    { // 0 <= dname & dname <= 9999..999 for intwidth 9's
+      BasicExpression dvar = 
+        BasicExpression.newAttributeBasicExpression(
+                                           dname,typ);
+      Expression conj1 = 
+        new BinaryExpression("<=", new BasicExpression(0), 
+                             dvar); 
+      int n_nines = 9; 
+      for (int i = 2; i <= intwidth; i++) 
+      { n_nines = n_nines*10 + 9; }
+ 
+      if (isSigned)
+      { conj1 = 
+          new BinaryExpression("<=", 
+                new BasicExpression(-n_nines), 
+                dvar);
+      } 
+
+      Expression conj2 = 
+        new BinaryExpression("<=", dvar, 
+                             new BasicExpression(n_nines));  
+      Expression conj = new BinaryExpression("&", conj1, conj2); 
+      return new Constraint(new BasicExpression(true), conj); 
+    } 
+
+    if ("double".equals(typ.getName()))
+    { // 0 <= dname & dname <= 9*9.9* for intwidth and
+      // fracwidth 9's
+
+      BasicExpression dvar = 
+        BasicExpression.newAttributeBasicExpression(
+                                           dname,typ);
+      Expression conj1 = 
+        new BinaryExpression("<=", new BasicExpression(0.0), 
+                             dvar); 
+
+      int n_nines = 0; 
+      for (int i = 1; i <= intwidth; i++) 
+      { n_nines = n_nines*10 + 9; }
+
+      double m_nines = 0.0; 
+      for (int i = 1; i <= fracwidth; i++) 
+      { m_nines = m_nines + 9/Math.pow(10,i); }
+
+ 
+      if (isSigned)
+      { conj1 = 
+          new BinaryExpression("<=", 
+                new BasicExpression(-(n_nines + m_nines)), 
+                dvar);
+      } 
+
+      Expression conj2 = 
+        new BinaryExpression("<=", dvar, 
+              new BasicExpression(n_nines + m_nines));  
+      Expression conj = new BinaryExpression("&", conj1, conj2); 
+      return new Constraint(new BasicExpression(true), conj); 
+    } 
+
+    return null; 
+  } 
+
   public Constraint(Expression scond, Expression succdt)
   { Expression ante = scond; 
     succ = succdt;