Carson Smith - GSoC Submission PR

eclipse/run-JPF-symbc.launch

@@ -6,6 +6,7 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
 <mapAttribute key="org.eclipse.debug.core.environmentVariables">
 <mapEntry key="LD_LIBRARY_PATH" value="/Users/corinapasareanu/workspace-isstac/jpf-symbc"/>
 </mapAttribute>
@@ -25,4 +26,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="&quot;${resource_loc}&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jpf-symbc"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024m -ea"/>
-</launchConfiguration>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jpf-symbc/lib}"/>
+</launchConfiguration>

src/main/gov/nasa/jpf/symbc/arrays/ArrayConstraint.java

@@ -21,6 +21,7 @@
 package gov.nasa.jpf.symbc.arrays;
 
 import gov.nasa.jpf.symbc.numeric.Constraint;
+import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor2;
 import gov.nasa.jpf.symbc.numeric.Comparator;
 import gov.nasa.jpf.symbc.numeric.IntegerExpression;
 
@@ -58,5 +59,13 @@ public ArrayConstraint not() {
             }
         }
     }
+
+    //Carson Smith
+	public boolean accept(ConstraintExpressionVisitor2 visitor) {
+		visitor.preVisit(this);
+		boolean result = visitor.visit(this);
+		visitor.postVisit(this);
+		return result;
+	}
 }
 

src/main/gov/nasa/jpf/symbc/arrays/ArrayExpression.java

@@ -19,6 +19,7 @@
 package gov.nasa.jpf.symbc.arrays;
 
 import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor;
+import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor2;
 import gov.nasa.jpf.symbc.numeric.Expression;
 import gov.nasa.jpf.symbc.numeric.IntegerConstant;
 import gov.nasa.jpf.symbc.numeric.IntegerExpression;

src/main/gov/nasa/jpf/symbc/arrays/RealArrayConstraint.java

@@ -20,6 +20,7 @@
 package gov.nasa.jpf.symbc.arrays;
 
 import gov.nasa.jpf.symbc.numeric.Constraint;
+import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor2;
 import gov.nasa.jpf.symbc.numeric.Comparator;
 import gov.nasa.jpf.symbc.numeric.RealExpression;
 
@@ -51,5 +52,13 @@ public RealArrayConstraint not() {
             }
         }
     }
+
+    //Carson Smith
+    public boolean accept(ConstraintExpressionVisitor2 visitor) {
+		visitor.preVisit(this);
+		boolean result = visitor.visit(this);
+		visitor.postVisit(this);
+		return result;
+	}
 }
 

src/main/gov/nasa/jpf/symbc/concolic/FunctionExpression.java

@@ -38,7 +38,8 @@
 package gov.nasa.jpf.symbc.concolic;
 // support for arbitrary external functions
 
-import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor;
+import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor;
+import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor2;
 import gov.nasa.jpf.symbc.numeric.Expression;
 import gov.nasa.jpf.symbc.numeric.IntegerExpression;
 import gov.nasa.jpf.symbc.numeric.PathCondition;
@@ -203,6 +204,9 @@ public int compareTo(Expression expr) {
 		}
 	}
 
-
+	@Override
+	public Object accept(ConstraintExpressionVisitor2 visitor) {
+		throw new RuntimeException("FunctionExpression - This isn't a supported expression type for the visitor system.");
+	}
 
 }

src/main/gov/nasa/jpf/symbc/mixednumstrg/SpecialIntegerExpression.java

@@ -54,6 +54,7 @@
 
 
 import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor;
+import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor2;
 import gov.nasa.jpf.symbc.numeric.Expression;
 import gov.nasa.jpf.symbc.numeric.IntegerExpression;
 import gov.nasa.jpf.symbc.string.StringExpression;
@@ -111,4 +112,9 @@ public int compareTo(Expression expr) {
 				return getClass().getCanonicalName().compareTo(expr.getClass().getCanonicalName());
 			}
 		}
+
+		@Override
+		public Object accept(ConstraintExpressionVisitor2 visitor) {
+			throw new RuntimeException("This isn't a supported expression type for the visitor system.");
+		}
 }

src/main/gov/nasa/jpf/symbc/mixednumstrg/SpecialRealExpression.java

@@ -54,6 +54,7 @@
 
 
 import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor;
+import gov.nasa.jpf.symbc.numeric.ConstraintExpressionVisitor2;
 import gov.nasa.jpf.symbc.numeric.RealExpression;
 import gov.nasa.jpf.symbc.numeric.IntegerExpression;
 import gov.nasa.jpf.symbc.numeric.Expression;
@@ -115,4 +116,9 @@ public int compareTo(Expression expr) {
 				return getClass().getCanonicalName().compareTo(expr.getClass().getCanonicalName());
 			}
 		}
+
+		@Override
+		public Object accept(ConstraintExpressionVisitor2 visitor) {
+			throw new RuntimeException("This isn't a supported expression type for the visitor system.");
+		}
 }

src/main/gov/nasa/jpf/symbc/numeric/BinaryLinearIntegerExpression.java

@@ -37,7 +37,7 @@
 
 package gov.nasa.jpf.symbc.numeric;
 
-import java.util.Map;
+import java.util.Map;
 
 public class BinaryLinearIntegerExpression extends LinearIntegerExpression
 {
@@ -58,6 +58,15 @@ public void accept(ConstraintExpressionVisitor visitor) {
 		left.accept(visitor);
 		right.accept(visitor);
 		visitor.postVisit(this);
+	}
+
+	//Carson Smith
+	@Override
+	public Object accept(ConstraintExpressionVisitor2 visitor) {
+		visitor.preVisit(this);
+		Object result = visitor.visit(this);
+		visitor.postVisit(this);
+		return result;
 	}
 
 	@Override

src/main/gov/nasa/jpf/symbc/numeric/BinaryNonLinearIntegerExpression.java

@@ -116,6 +116,13 @@ public int compareTo(Expression expr) {
 		} else {
 			return getClass().getCanonicalName().compareTo(expr.getClass().getCanonicalName());
 		}
+	}
+
+	@Override
+	public Object accept(ConstraintExpressionVisitor2 visitor) {
+		visitor.preVisit(this);
+		Object result = visitor.visit(this);
+		visitor.postVisit(this);
+		return result;
 	}
-
 }

src/main/gov/nasa/jpf/symbc/numeric/BinaryRealExpression.java

@@ -121,5 +121,13 @@ public int compareTo(Expression expr) {
 		} else {
 			return getClass().getCanonicalName().compareTo(expr.getClass().getCanonicalName());
 		}
+	}
+
+	@Override
+	public Object accept(ConstraintExpressionVisitor2 visitor) {
+		visitor.preVisit(this);
+		Object result = visitor.visit(this);
+		visitor.postVisit(this);
+		return result;
 	}
 }

src/main/gov/nasa/jpf/symbc/numeric/Constraint.java

@@ -39,6 +39,9 @@
 
 import java.util.Map;
 
+import gov.nasa.jpf.symbc.numeric.visitors.CollectVariableVisitor;
+import gov.nasa.jpf.symbc.numeric.visitors.ProblemGeneralVisitor;
+
 public abstract class Constraint implements Comparable<Constraint> {
   private final Expression left;
 
@@ -168,13 +171,21 @@ public Constraint last() {
       return c;
   }
 
-//JacoGeldenhuys
+  	//JacoGeldenhuys - For use with GREEN
 	public void accept(ConstraintExpressionVisitor visitor) {
 		visitor.preVisit(this);
 		left.accept(visitor);
 		right.accept(visitor);
 		visitor.postVisit(this);
 	}
+
+	//	Carson Smith - For use with GSoC changes.
+	public boolean accept(ConstraintExpressionVisitor2 visitor) {
+		visitor.preVisit(this);
+		boolean result = visitor.visit(this);
+		visitor.postVisit(this);
+		return result;
+	}
 
 	public String prefix_notation() {
 		//return left.toString() + comp.toString() + right.toString()

src/main/gov/nasa/jpf/symbc/numeric/ConstraintExpressionVisitor.java

@@ -237,6 +237,4 @@ public void postVisit(StringSymbolic expr) {
 	public void postVisit(SymbolicStringBuilder expr) {
 	}
 
-
-
 }

src/main/gov/nasa/jpf/symbc/numeric/ConstraintExpressionVisitor2.java

@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2014, United States Government, as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All rights reserved.
+ *
+ * Symbolic Pathfinder (jpf-symbc) is licensed under the Apache License, 
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * 
+ *        http://www.apache.org/licenses/LICENSE-2.0. 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package gov.nasa.jpf.symbc.numeric;
+
+import gov.nasa.jpf.symbc.arrays.ArrayConstraint;
+import gov.nasa.jpf.symbc.arrays.RealArrayConstraint;
+
+/**
+ * An extension of the previous visitor system created for GREEN solver integration
+ * set up for a more robust purpose of handling the functionality previously done by
+ * PCParser. All it changes about the previous system is the creation of literal 
+ * visit() methods that return values explicitly upon being called. The calling of 
+ * accept() has been moved to these visit methods for simplicity purposes.
+ * 
+ * Not all methods have been moved over. As of now, only the methods needed to be moved
+ * have been moved since many of the preVisit() and postVisit() methods visit constraints
+ * or expressions that don't need visit() functionality to accomplish my initial goal.
+ * 
+ * @author Carson Smith
+ */
+public abstract class ConstraintExpressionVisitor2 extends ConstraintExpressionVisitor {
+
+	/*--- CONSTRAINT VISITOR ROUTINES ---*/
+
+	public boolean visit(Constraint constraint) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public boolean visit(LinearIntegerConstraint constraint) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public boolean visit(NonLinearIntegerConstraint constraint) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public boolean visit(RealConstraint constraint) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public boolean visit(MixedConstraint constraint) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public boolean visit(LogicalORLinearIntegerConstraints constraint) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public boolean visit(ArrayConstraint constraint) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public boolean visit(RealArrayConstraint constraint) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	/*--- EXPRESSION VISITOR ROUTINES ---*/
+
+	public Object visit(SymbolicInteger expr) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public Double visit(RealConstant expr) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public Object visit(SymbolicReal expr) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public Object visit(MathRealExpression expr) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public Object visit(BinaryLinearIntegerExpression expression) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public Object visit(BinaryNonLinearIntegerExpression expression) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public Object visit(BinaryRealExpression expression) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+	public Long visit(IntegerConstant integerConstant) {
+		throw new RuntimeException("Method needs to be Overloaded.");
+	}
+
+}

src/main/gov/nasa/jpf/symbc/numeric/Expression.java

@@ -39,6 +39,9 @@
 
 
 import java.util.Map;
+
+import gov.nasa.jpf.symbc.numeric.visitors.ProblemGeneralVisitor;
+
 import java.util.LinkedList;
 
 
@@ -47,6 +50,7 @@ public abstract class Expression implements Comparable<Expression> {
     public abstract String stringPC();
     public abstract void getVarsVals(Map<String,Object> varsVals);
 	public abstract void accept(ConstraintExpressionVisitor visitor);
+//	public abstract Object accept(ConstraintExpressionVisitor2 visitor);
 	public String prefix_notation() {throw new RuntimeException("error printing");}
 
 }

src/main/gov/nasa/jpf/symbc/numeric/IntegerConstant.java

@@ -37,7 +37,9 @@
 
 package gov.nasa.jpf.symbc.numeric;
 
-import java.util.Map;
+import java.util.Map;
+
+import gov.nasa.jpf.symbc.numeric.visitors.ProblemGeneralVisitor;
 
 import static gov.nasa.jpf.symbc.numeric.Operator.*;
 
@@ -307,6 +309,14 @@ public void getVarsVals(Map<String,Object> varsVals) {}
 	public void accept(ConstraintExpressionVisitor visitor) {
 		visitor.preVisit(this);
 		visitor.postVisit(this);
+	}
+
+	//Carson Smith
+	public Object accept(ConstraintExpressionVisitor2 visitor) {
+		visitor.preVisit(this);
+		Object result = visitor.visit(this);
+		visitor.postVisit(this);
+		return result;
 	}
 
 	@Override

src/main/gov/nasa/jpf/symbc/numeric/IntegerExpression.java

@@ -296,7 +296,8 @@ public char solutionChar() {
 		throw new RuntimeException( "## Error: Expression Solution request Error: " + this);
 	}
 
-
+	public abstract Object accept(ConstraintExpressionVisitor2 visitor);
+
 	//protected void finalize() throws Throwable {
     //	System.out.println("Finalized LIExp -> " + this);
     //}

src/main/gov/nasa/jpf/symbc/numeric/LinearIntegerConstraint.java

@@ -61,5 +61,14 @@ public IntegerExpression getRight() {
     @Override
     public LinearIntegerConstraint not() {
         return new LinearIntegerConstraint(getLeft(), getComparator().not(), getRight());
-    }    
+    }
+
+    //Carson Smith
+    @Override
+    public boolean accept(ConstraintExpressionVisitor2 visitor) {
+    	visitor.preVisit(this);
+		boolean result = visitor.visit(this);
+		visitor.postVisit(this);
+		return result;
+	}
 }