Update test results.

5 files changed, 41 insertions, 61 deletions

diff --git a/test/test26-03.txt b/test/test26-03.txt
index a906bba..5d1b162 100644
--- a/test/test26-03.txt
+++ b/test/test26-03.txt
@@ -28047,15 +28047,15 @@ type_decl _Alloc_hider:
 type_decl Data1: 
 integer_cst 64: 
 integer_cst 0: 
-eq_expr : 
-var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 4: 
+eq_expr : ptr1, 
+var_decl k: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+integer_cst 4: ptr1, 
 cleanup_point_expr : 
 expr_stmt : 
 convert_expr : 
@@ -28275,15 +28275,15 @@ type_decl _Alloc_hider:
 type_decl Data1: 
 integer_cst 64: 
 integer_cst 0: 
-eq_expr : 
-var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 5: 
+eq_expr : ptr1, 
+var_decl k: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+integer_cst 5: ptr1, 
 cleanup_point_expr : 
 expr_stmt : 
 convert_expr : 
@@ -29725,15 +29725,15 @@ type_decl _Alloc_hider:
 type_decl Data1: 
 integer_cst 64: 
 integer_cst 0: 
-eq_expr : 
-var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 1: 
+eq_expr : ptr1, 
+var_decl k: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+integer_cst 1: ptr1, 
 cleanup_point_expr : 
 expr_stmt : 
 convert_expr : 
@@ -29953,15 +29953,15 @@ type_decl _Alloc_hider:
 type_decl Data1: 
 integer_cst 64: 
 integer_cst 0: 
-eq_expr : 
-var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 4: 
+eq_expr : ptr1, 
+var_decl k: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+integer_cst 4: ptr1, 
 cleanup_point_expr : 
 expr_stmt : 
 convert_expr : 
diff --git a/test/test28-01.txt b/test/test28-01.txt
index a2f8c34..f6ea643 100644
--- a/test/test28-01.txt
+++ b/test/test28-01.txt
@@ -11468,8 +11468,8 @@ function_decl func9 test28.cpp 179:10 2147483647
           addr_expr 2147483637 - operand
            string_cst ptr1 2147483636 - operand
            - stringLength: 5
-      cleanup_point_expr test28.cpp 202:65 2147483641 - statement
-       expr_stmt test28.cpp 202:65 2147483640 - operand
+      cleanup_point_expr test28.cpp 202:69 2147483641 - statement
+       expr_stmt test28.cpp 202:69 2147483640 - operand
         call_expr test28.cpp 202:39 2147483639 - expresssion
          addr_expr 2147483638 - function
           function_decl paranuckerInternalTest test28.cpp 12:6 20 - operand
@@ -11562,8 +11562,8 @@ function_decl func9 test28.cpp 179:10 2147483647
            - stringLength: 14
          nop_expr 2147483638 - arg
           addr_expr 2147483637 - operand
-           string_cst 2147483636 - operand
-           - stringLength: 1
+           string_cst ptr1 2147483636 - operand
+           - stringLength: 5
       cleanup_point_expr test28.cpp 203:69 2147483641 - statement
        expr_stmt test28.cpp 203:69 2147483640 - operand
         call_expr test28.cpp 203:39 2147483639 - expresssion
diff --git a/test/test28.cpp b/test/test28.cpp
index c4cca41..8b45535 100644
--- a/test/test28.cpp
+++ b/test/test28.cpp
@@ -199,7 +199,7 @@ class Object1
             {
                 paranuckerInternalTest("=", "knownVars", "ptr1");
                 paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                paranuckerInternalTest("=", "knownNullVars", "");
+                paranuckerInternalTest("=", "knownNullVars", "ptr1");
                 paranuckerInternalTest("=", "needCheckNullVars", "");
             }
         }
diff --git a/test/test29-03.txt b/test/test29-03.txt
index fb88b33..da50357 100644
--- a/test/test29-03.txt
+++ b/test/test29-03.txt
@@ -1916,11 +1916,6 @@ expr_stmt : ptr1,
 call_expr : ptr1, 
 addr_expr : ptr1, 
 function_decl paranuckerInternalTest: ptr1, 
-test29.cpp:356:35: warning: internal collections 'knownNullVars' is different.
-want: 'ptr1',
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
 cleanup_point_expr : ptr1, 
 expr_stmt : ptr1, 
 call_expr : ptr1, 
@@ -1941,11 +1936,6 @@ expr_stmt : ptr1,
 call_expr : ptr1, 
 addr_expr : ptr1, 
 function_decl paranuckerInternalTest: ptr1, 
-test29.cpp:361:31: warning: internal collections 'knownNullVars' is different.
-want: 'ptr1',
- get: 
-         paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                               ^
 cleanup_point_expr : ptr1, 
 expr_stmt : ptr1, 
 call_expr : ptr1, 
diff --git a/test/test29-04.txt b/test/test29-04.txt
index fe4e947..d6ae4d9 100644
--- a/test/test29-04.txt
+++ b/test/test29-04.txt
@@ -2,16 +2,6 @@ test29.cpp: In member function 'void Object1::func13(int*)':
 test29.cpp:344:28: warning: Useless variable check 'ptr1'. It already was checked before
          if ((ptr1 || ptr1) && ptr1)
                             ^
-test29.cpp:356:35: warning: internal collections 'knownNullVars' is different.
-want: 'ptr1',
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test29.cpp:361:31: warning: internal collections 'knownNullVars' is different.
-want: 'ptr1',
- get: 
-         paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                               ^
 test29.cpp: In member function 'void Object1::func14(int*)':
 test29.cpp:369:19: warning: Useless variable check 'ptr1'. It already was checked before
          if ((ptr1 && ptr1) || ptr1)