Convert test inputs from the version 1 file format to version 2

Makefile

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

java/daikon/test/SampleTester.decls

@@ -1,87 +1,106 @@
-VarComparability
-none
+decl-version 2.0
+
+var-comparability none
 
 ListImplementors
 java.util.List
 
-DECLARE
-foo.f():::ENTER
-x
-int
-int
-22
-y
-int
-int
-22
-z
-int
-int
-22
+ppt foo.f():::ENTER
+  ppt-type enter
+  variable x
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
+  variable y
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
+  variable z
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
 
-DECLARE
-foo.f():::EXIT35
-x
-int
-int
-22
-y
-int
-int
-22
-z
-int
-int
-22
+ppt foo.f():::EXIT35
+  ppt-type subexit
+  variable x
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
+  variable y
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
+  variable z
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
 
-DECLARE
-foo.g():::ENTER
-p
-int
-int
-22
-q
-int
-int
-22
-r
-int
-int
-22
+ppt foo.g():::ENTER
+  ppt-type enter
+  variable p
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
+  variable q
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
+  variable r
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
 
-DECLARE
-foo.g():::EXIT40
-p
-int
-int
-22
-q
-int
-int
-22
-r
-int
-int
-22
+ppt foo.g():::EXIT40
+  ppt-type subexit
+  variable p
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
+  variable q
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
+  variable r
+    var-kind variable
+    dec-type int
+    rep-type int
+    comparability 22
 
-DECLARE
-foo.strings():::ENTER
-s
-java.lang.String
-java.lang.String
-22
-a[]
-java.lang.String[]
-java.lang.String[]
-22[22]
+ppt foo.strings():::ENTER
+  ppt-type enter
+  variable s
+    var-kind variable
+    dec-type java.lang.String
+    rep-type java.lang.String
+    comparability 22
+  variable a[..]
+    var-kind variable
+    array 1
+    dec-type java.lang.String[]
+    rep-type java.lang.String[]
+    comparability 22[22]
 
-DECLARE
-foo.strings():::EXIT1
-s
-java.lang.String
-java.lang.String
-22
-a[]
-java.lang.String[]
-java.lang.String[]
-22[22]
+ppt foo.strings():::EXIT1
+  ppt-type subexit
+  variable s
+    var-kind variable
+    dec-type java.lang.String
+    rep-type java.lang.String
+    comparability 22
+  variable a[..]
+    var-kind variable
+    array 1
+    dec-type java.lang.String[]
+    rep-type java.lang.String[]
+    comparability 22[22]

java/daikon/test/split/SplitterFactoryTestUpdater.java

@@ -102,19 +102,15 @@ private static void generateSplitters(List<String> spinfos, List<String> decls)
     }
     spinfoFileLists.add(new ArrayList<File>(spinfoFiles));
     for (String declsFile : decls) {
-      declsFile = targetDir + declsFile;
-      declsFileSet.add(new File(declsFile));
+      declsFileSet.add(new File(targetDir + declsFile));
     }
     declsFileLists.add(new ArrayList<File>(declsFileSet));
     try {
       PptSplitter.dkconfig_suppressSplitterErrors = true;
       Daikon.create_splitters(spinfoFiles);
-      // calling read_data_trace_file in a loop instead of calling
-      // read_data_trace_files allows us to mix version 1 and
-      // version 2 decls file formats.
+      // An earlier read in this JVM may have set the decl format.
+      FileIO.resetNewDeclFormat();
       for (String declsFile : decls) {
-        // This reset allows current format to differ from previous.
-        FileIO.resetNewDeclFormat();
         FileIO.read_data_trace_file(targetDir + declsFile, allPpts);
       }
     } catch (IOException e) {
@@ -351,8 +347,9 @@ private static String getTestClassText() {
     ps.println("      }");
     ps.println("      PptSplitter.dkconfig_suppressSplitterErrors = true;");
     ps.println("      Daikon.create_splitters(spFiles);");
+    ps.println("      // An earlier read in this JVM may have set the decl format.");
+    ps.println("      FileIO.resetNewDeclFormat();");
     ps.println("      for (String declsFile : decls) {");
-    ps.println("        FileIO.resetNewDeclFormat();");
     ps.println(
         "        FileIO.read_data_trace_file(declsFile, allPpts);"); // invoked for side effects
     ps.println("      }");