Permit array values in SampleTester

Makefile

@@ -73,7 +73,7 @@ DAIKON_RESOURCE_FILES := daikon/config/example-settings.txt \
 	daikon/test/SampleTester.commands \
 	daikon/test/SampleTester.decls \
 	daikon/test/SampleTesterGlobal.decls \
-	daikon/test/SampleTester.test \
+	daikon/test/SampleTester.commands_linear_ternary \
 	daikon/test/varInfoNameTest.testEscForall \
 	daikon/test/varInfoNameTest.testEscForall.goal \
 	daikon/test/varInfoNameTest.testJML \

java/daikon/test/SampleTester.test → java/daikon/test/SampleTester.commands_linear_ternary

@@ -50,11 +50,11 @@ ppt: foo.f():::EXIT35
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, x, z);
   data: 6 4 12
 # should still be a line
-  assert: show_invs(x,x,z)
+#  assert: show_invs(x,x,z)
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, x, z);
   data: 1 5 9
 # should break the line and form a plane
-  assert: show_invs(x,y,z)
+#  assert: show_invs(x,y,z)
 ###################
 # the following does not work as planned because of zero coefficients
 ###################
@@ -84,11 +84,11 @@ ppt: foo.f():::EXIT35
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, x, z);
   data: 6 6 12
 # should still be a line
-assert: show_invs(x,x,z)
+#  assert: show_invs(x,x,z)
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, x, z);
   data: 1 5 100
 # should break the line and form a plane
-assert: show_invs(x,y,z)
+#  assert: show_invs(x,y,z)
 ###################
 # the following does not work as planned because of zero coefficients
 ###################
@@ -130,11 +130,11 @@ ppt: foo.f():::EXIT35
    assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, x, z);
   data: 6 5 6
 # should break the line and form a plane
-  assert: show_invs(x,y,z)
+#  assert: show_invs(x,y,z)
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, y, z);
   data: 8 8 20
 # should still be a plane
-  assert: show_invs(x,y,z)
+#  assert: show_invs(x,y,z)
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, y, z);
 # should break the plane
 #  data: 0 0 0
@@ -162,11 +162,11 @@ ppt: foo.f():::EXIT35
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, x, z);
   data: 3 8 10
 # should break the line and form a plane
-  assert: show_invs(x,y,z)
+#  assert: show_invs(x,y,z)
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, y, z);
   data: 8 16 20
 # should still be a plane
-  assert: show_invs(x,y,z)
+#  assert: show_invs(x,y,z)
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, y, z);
 # should break the plane
   data: 0 0 0
@@ -195,11 +195,11 @@ ppt: foo.f():::EXIT35
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, x, z);
   data: 2 3 1
 # should break the line and form a plane
-  assert: show_invs(x,y,z)
+#  assert: show_invs(x,y,z)
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, y, z);
   data: 15 15 15
 # should still be a plane
- assert: show_invs(x,y,z)
+#  assert: show_invs(x,y,z)
   assert: inv(daikon.inv.ternary.threeScalar.LinearTernary, x, y, z);
 # should break the plane
   data: 2 3 2

java/daikon/test/SampleTester.decls

@@ -20,31 +20,31 @@ int
 22
 
 DECLARE
-foo.g():::ENTER
-p
+foo.f():::EXIT35
+x
 int
 int
 22
-q
+y
 int
 int
 22
-r
+z
 int
 int
 22
 
 DECLARE
-foo.f():::EXIT35
-x
+foo.g():::ENTER
+p
 int
 int
 22
-y
+q
 int
 int
 22
-z
+r
 int
 int
 22
@@ -64,3 +64,24 @@ int
 int
 22
 
+DECLARE
+foo.strings():::ENTER
+s
+java.lang.String
+java.lang.String
+22
+a[]
+java.lang.String[]
+java.lang.String[]
+22[22]
+
+DECLARE
+foo.strings():::EXIT1
+s
+java.lang.String
+java.lang.String
+22
+a[]
+java.lang.String[]
+java.lang.String[]
+22[22]