Merge pull request diffblue#255 from diffblue/owen/precise-access-paths

Added a test and fixed some minor things in C++ code

Author: smowton

regression/LVSA/TestPreciseAccessPaths/Test$A.class

@@ -5,7 +5,7 @@ public class Test {
   A left_a;
   A right_a;
 
-  public class A {
+  public static class A {
     Object left_object;
     Object right_object;
   }
@@ -44,4 +44,19 @@ public void call_function_to_allocate_new_object(A param_A) {
     allocate_new_object(param_A);
     output = param_A.left_object;
   }
+
+  public static class ListNode {
+    ListNode next;
+    Object data;
+  }
+
+  // Even with precise access paths we'll have to use an imprecise EVS for
+  // output, because there are an unbounded number of precise access paths for
+  // it: list_node, list_node.next, list_node.next.next, ...
+  public void get_list_node(ListNode list_node, int index) {
+    for (int i = 0; i < index; ++i) {
+      list_node = list_node.next;
+    }
+    output = list_node.data;
+  }
 }

regression/LVSA/TestPreciseAccessPaths/Test$ListNode.class

@@ -71,3 +71,14 @@ def test_call_function_to_allocate_new_object(tmpdir):
     output_value_expectation.check_number_of_values(2)
     output_value_expectation.check_contains_external_value_set()
     output_value_expectation.check_contains_dynamic_object()
+
+
+def test_get_list_node(tmpdir):
+    # This test should not change when precise access paths have been implemented
+    lvsa_driver = LvsaDriver(tmpdir, folder_name).with_test_function('get_list_node')
+    lvsa_expectation = lvsa_driver.run()
+
+    output_value_expectation = lvsa_expectation.check_output()
+
+    output_value_expectation.check_number_of_values(1)
+    output_value_expectation.check_contains_external_value_set()

regression/LVSA/TestPreciseAccessPaths/Test.class

@@ -12,7 +12,7 @@
 
 class local_value_sett:public value_sett
 {
- public:
+public:
   typedef value_sett baset;
 
   #ifdef USE_DSTRING
@@ -37,31 +37,32 @@ class local_value_sett:public value_sett
     const namespacet &ns,
     bool is_simplified) const override;
 
-  void get_value_set_rec(
-    const exprt &expr,
-    object_mapt &dest,
-    const std::string &suffix,
-    const typet &original_type,
-    const namespacet &ns) const override;
-
   void assign(
     const exprt &lhs,
     const exprt &rhs,
     const namespacet &ns,
     bool is_simplified,
     bool add_to_sets) override;
 
+  void apply_code(
+    const codet &,
+    const namespacet &) override;
+
+protected:
+  void get_value_set_rec(
+    const exprt &expr,
+    object_mapt &dest,
+    const std::string &suffix,
+    const typet &original_type,
+    const namespacet &ns) const override;
+
   void assign_rec(
     const exprt &lhs,
     const object_mapt &values_rhs,
     const std::string &suffix,
     const namespacet &ns,
     bool add_to_sets) override;
 
-  void apply_code(
-    const codet &,
-    const namespacet &) override;
-
   void apply_side_effects(
     const exprt &rhs,
     const namespacet &ns);