further program reductions

eclipse-agileuml · Feb 11, 2025 · 865651c · 865651c
1 parent 6f89473
commit 865651c
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 7 deletions.
diff --git a/AssertStatement.class b/AssertStatement.class
diff --git a/AssignStatement.class b/AssignStatement.class
diff --git a/BreakStatement.class b/BreakStatement.class
diff --git a/CaseStatement.class b/CaseStatement.class
diff --git a/CatchStatement.class b/CatchStatement.class
diff --git a/ConditionalStatement.class b/ConditionalStatement.class
diff --git a/ContinueStatement.class b/ContinueStatement.class
diff --git a/CreationStatement.class b/CreationStatement.class
diff --git a/ErrorStatement.class b/ErrorStatement.class
diff --git a/FinalStatement.class b/FinalStatement.class
diff --git a/IfCase.class b/IfCase.class
diff --git a/IfStatement.class b/IfStatement.class
diff --git a/ImplicitInvocationStatement.class b/ImplicitInvocationStatement.class
diff --git a/InvocationStatement.class b/InvocationStatement.class
diff --git a/ReturnStatement.class b/ReturnStatement.class
diff --git a/SequenceStatement.class b/SequenceStatement.class
diff --git a/Statement.class b/Statement.class
diff --git a/Statement.java b/Statement.java
@@ -227,7 +227,71 @@ else if (rhs instanceof BinaryExpression &&
               new BinaryExpression("->pow", expr, sze)); 
         return new AssignStatement(lhs, newrhs); 
       }         
+      else if ((lhs + " & " + var).equals("" + rhs))
+      { // lhs := lhs & loopRange->forAll(self)
+
+        Type elemt = rng.getElementType(); 
+        BasicExpression selfvar = 
+          BasicExpression.newVariableBasicExpression(
+                                             "self",elemt); 
+        Expression prd = 
+          new BinaryExpression("->forAll", rng, selfvar); 
+        Expression newrhs = 
+            new BinaryExpression("&", lhs, prd); 
+        return new AssignStatement(lhs, newrhs); 
+      }   
+      else if (rhs instanceof BinaryExpression && 
+        ((BinaryExpression) rhs).getOperator().equals("&") &&
+        (((BinaryExpression) rhs).getLeft() + "").equals(lhs + ""))
+      { // lhs := lhs & expr
+        Expression expr = ((BinaryExpression) rhs).getRight(); 
+        Vector vuses = expr.getVariableUses();
+
+        if (VectorUtil.containsEqualString(lhs+"", vuses))
+        { return null; } 
+
+        // lhs := lhs & rng->forAll(var|expr)
+
+        Expression coll = 
+            new BinaryExpression("!", 
+              new BinaryExpression(":", var, rng), expr); 
+        Expression newrhs = 
+            new BinaryExpression("&", lhs, coll); 
+        return new AssignStatement(lhs, newrhs);
+      }         
+      else if ((lhs + " or " + var).equals("" + rhs))
+      { // lhs := lhs or loopRange->exists(self)
+
+        Type elemt = rng.getElementType(); 
+        BasicExpression selfvar = 
+          BasicExpression.newVariableBasicExpression(
+                                             "self",elemt); 
+        Expression prd = 
+          new BinaryExpression("->exists", rng, selfvar); 
+        Expression newrhs = 
+            new BinaryExpression("or", lhs, prd); 
+        return new AssignStatement(lhs, newrhs); 
+      }   
       else if (rhs instanceof BinaryExpression && 
+        ((BinaryExpression) rhs).getOperator().equals("or") &&
+        (((BinaryExpression) rhs).getLeft() + "").equals(lhs + ""))
+      { // lhs := lhs or expr
+        Expression expr = ((BinaryExpression) rhs).getRight(); 
+        Vector vuses = expr.getVariableUses();
+
+        if (VectorUtil.containsEqualString(lhs+"", vuses))
+        { return null; } 
+
+        // lhs := lhs or rng->exists(var|expr)
+
+        Expression coll = 
+            new BinaryExpression("#", 
+              new BinaryExpression(":", var, rng), expr); 
+        Expression newrhs = 
+            new BinaryExpression("or", lhs, coll); 
+        return new AssignStatement(lhs, newrhs);
+      }         
+    /*  else if (rhs instanceof BinaryExpression && 
         (((BinaryExpression) rhs).getLeft() + "").equals(
                                                     lhs + ""))
       { BinaryExpression brhs = (BinaryExpression) rhs; 
@@ -284,7 +348,7 @@ else if ("/".equals(oper))
               new BinaryExpression("->pow", expr, smm)); 
           return new AssignStatement(lhs, newrhs); 
         } 
-      }
+      } */ 
     }
     else if (st instanceof SequenceStatement) 
     { SequenceStatement sq = (SequenceStatement) st; 
@@ -530,6 +594,14 @@ else if ((lhs + " / " + var).equals("" + rhs))
       { // lhs := lhs / loopRange->prd()
         return true; 
       } 
+      else if ((lhs + " & " + var).equals("" + rhs))
+      { // lhs := lhs & loopRange->forAll(self)
+        return true; 
+      } 
+      else if ((lhs + " or " + var).equals("" + rhs))
+      { // lhs := lhs or loopRange->exists(self)
+        return true; 
+      } 
       else if (rhs instanceof BinaryExpression && 
         (((BinaryExpression) rhs).getLeft() + "").equals(
                                                     lhs + ""))
@@ -544,8 +616,10 @@ else if (rhs instanceof BinaryExpression &&
         { return false; } 
 
         if ("+".equals(oper) || "-".equals(oper) || 
-            "*".equals(oper) || "/".equals(oper))
-        { return true; } 
+            "*".equals(oper) || "/".equals(oper) ||
+            "&".equals(oper) || "or".equals(oper))
+        { return true; }
+
         return false;
       } 
     }

diff --git a/TryStatement.class b/TryStatement.class
diff --git a/WhileStatement.class b/WhileStatement.class
diff --git a/js2py3.bat b/js2py3.bat
@@ -1,8 +1,9 @@
-@ECHO OFF
-SET TEST_CURRENT_DIR=%CLASSPATH:.;=%
-if "%TEST_CURRENT_DIR%" == "%CLASSPATH%" ( SET CLASSPATH=.;%CLASSPATH% )
-@ECHO ON
+SET oldclasspath=%CLASSPATH%
+SET CLASSPATH=.;.\antlr-4.8-complete.jar;%CLASSPATH%
+
+
 type %1 | java org.antlr.v4.gui.TestRig JavaScript program -tree >output/ast.txt
 java -jar umlrsds.jar -js2python
 
+SET CLASSPATH=%oldclasspath%