added new info field in output.

[r1593]

diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
index 7b1f857..25f7d51 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
@@ -8,7 +8,8 @@ classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
 node: {title: "e29" label: "ent a_elem_ent" color: yellow
- info1:"
+ info1: "
+id: e29
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -29,7 +30,8 @@ mode: Is,
 size: 4B,
 "}
 node: {title: "e13" label: "ent ARRAY-HEAP_EXAMPLE_main" color: yellow
- info1:"
+ info1: "
+id: e13
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -42,7 +44,8 @@ irg = g26"
 }
 edge: { sourcename: "e13" targetname: "t11"class: 3 label: "type" color: red}
 edge: { sourcename: "e13" targetname: "n12"label: "value 0"}
-node: {title: "n12" label: "&(GlobalType_ARRAY-HEAP_EXAMPLE_main)P  12" color: yellow}
+node: {title: "n12" label: "&(GlobalType_ARRAY-HEAP_EXAMPLE_main)P  12" color: yellow info1: "visited: 1
+"}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1B,
 " color: green}

diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
index e7adbf7..01b7a19 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
@@ -7,46 +7,61 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n47"  label: "47" status:clustered color:yellow
-edge: {sourcename: "n47" targetname: "n48" label: "0" color: red}
-node: {title: "n46" label: "End  46" color: blue}
+graph: { title: "n47" label: "47" status:clustered color:yellow
+edge: {sourcename: "n47 " targetname: "n48" label: "0" color: red}
+node: {title: "n46" label: "End  46" color: blue info1: "visited: 8
+"}
 }
 
-graph: { title: "n49"  label: "49" status:clustered color:yellow
-edge: {sourcename: "n49" targetname: "n50" label: "0" color: red}
-node: {title: "n48" label: "Return  48" }
-edge: {sourcename: "n48" targetname: "n62" label: "0" color: blue}
-edge: {sourcename: "n48" targetname: "n53" label: "1" }
-node: {title: "n53" label: "ProjIs 2 53" color: yellow}
-edge: {sourcename: "n53" targetname: "n54" label: "0" }
-node: {title: "n54" label: "Load  54" }
-edge: {sourcename: "n54" targetname: "n61" label: "0" color: blue}
-edge: {sourcename: "n54" targetname: "n55" label: "1" }
-node: {title: "n55" label: "Sel a_elem_ent 55" }
-edge: {sourcename: "n55" targetname: "n61" label: "0" color: blue}
-edge: {sourcename: "n55" targetname: "n57" label: "1" }
-edge: {sourcename: "n55" targetname: "n56" label: "2" }
-node: {title: "n57" label: "ProjP 2 57" color: yellow}
-edge: {sourcename: "n57" targetname: "n58" label: "0" }
-node: {title: "n58" label: "Alloc  58" }
-edge: {sourcename: "n58" targetname: "n60" label: "0" color: blue}
-edge: {sourcename: "n58" targetname: "n59" label: "1" }
-node: {title: "n61" label: "ProjM 0 61" color: yellow}
-edge: {sourcename: "n61" targetname: "n58" label: "0" color: blue}
-node: {title: "n62" label: "ProjM 0 62" color: yellow}
-edge: {sourcename: "n62" targetname: "n54" label: "0" color: blue}
+graph: { title: "n49" label: "49" status:clustered color:yellow
+edge: {sourcename: "n49 " targetname: "n50" label: "0" color: red}
+node: {title: "n48" label: "Return  48"  info1: "visited: 9
+"}
+edge: {sourcename: "n48 " targetname: "n62" label: "0" color: blue}
+edge: {sourcename: "n48 " targetname: "n53" label: "1" }
+node: {title: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n53 " targetname: "n54" label: "0" }
+node: {title: "n54" label: "Load  54"  info1: "visited: 9
+"}
+edge: {sourcename: "n54 " targetname: "n61" label: "0" color: blue}
+edge: {sourcename: "n54 " targetname: "n55" label: "1" }
+node: {title: "n55" label: "Sel a_elem_ent 55"  info1: "visited: 9
+"}
+edge: {sourcename: "n55 " targetname: "n61" label: "0" color: blue}
+edge: {sourcename: "n55 " targetname: "n57" label: "1" }
+edge: {sourcename: "n55 " targetname: "n56" label: "2" }
+node: {title: "n57" label: "ProjP 2 57" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n57 " targetname: "n58" label: "0" }
+node: {title: "n58" label: "Alloc  58"  info1: "visited: 9
+"}
+edge: {sourcename: "n58 " targetname: "n60" label: "0" color: blue}
+edge: {sourcename: "n58 " targetname: "n59" label: "1" }
+node: {title: "n61" label: "ProjM 0 61" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n61 " targetname: "n58" label: "0" color: blue}
+node: {title: "n62" label: "ProjM 0 62" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n62 " targetname: "n54" label: "0" color: blue}
 }
 
-graph: { title: "n51"  label: "51" status:clustered color:yellow
-edge: {sourcename: "n51" targetname: "n50" label: "0" color: red}
-node: {title: "n50" label: "ProjX 0 50" color: yellow}
-edge: {sourcename: "n50" targetname: "n52" label: "0" color: red}
-node: {title: "n52" label: "Start  52" color: blue}
-node: {title: "n56" label: "0x3Iu  56" color: yellow}
-node: {title: "n59" label: "0x28Iu  59" color: yellow}
-node: {title: "n60" label: "ProjM 1 60" color: yellow}
-edge: {sourcename: "n60" targetname: "n52" label: "0" color: blue}
+graph: { title: "n51" label: "51" status:clustered color:yellow
+edge: {sourcename: "n51 " targetname: "n50" label: "0" color: red}
+node: {title: "n50" label: "ProjX 0 50" color: yellow info1: "visited: 10
+"}
+edge: {sourcename: "n50 " targetname: "n52" label: "0" color: red}
+node: {title: "n52" label: "Start  52" color: blue info1: "visited: 10
+"}
+node: {title: "n56" label: "0x3Iu  56" color: yellow info1: "visited: 10
+"}
+node: {title: "n59" label: "0x28Iu  59" color: yellow info1: "visited: 10
+"}
+node: {title: "n60" label: "ProjM 1 60" color: yellow info1: "visited: 10
+"}
+edge: {sourcename: "n60 " targetname: "n52" label: "0" color: blue}
 }
 
-node: {title: "n66" label: "Bad  66" }
+node: {title: "n66" label: "Bad  66"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg
index 57fc3e0..407606f 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg
@@ -7,47 +7,61 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n45"  label: "45" status:clustered color:yellow
-edge: {sourcename: "n45" targetname: "n46" label: "0" color: red}
-node: {title: "n44" label: "End  44" color: blue}
+graph: { title: "n45" label: "45" status:clustered color:yellow
+edge: {sourcename: "n45 " targetname: "n46" label: "0" color: red}
+node: {title: "n44" label: "End  44" color: blue info1: "visited: 13
+"}
 }
 
-graph: { title: "n47"  label: "47" status:clustered color:yellow
-edge: {sourcename: "n47" targetname: "n48" label: "0" color: red}
-node: {title: "n46" label: "Return  46" }
-edge: {sourcename: "n46" targetname: "n58" label: "0" color: blue}
-edge: {sourcename: "n46" targetname: "n51" label: "1" }
-node: {title: "n51" label: "ProjIs 2 51" color: yellow}
-edge: {sourcename: "n51" targetname: "n52" label: "0" }
-node: {title: "n52" label: "Load  52" }
-edge: {sourcename: "n52" targetname: "n57" label: "0" color: blue}
-edge: {sourcename: "n52" targetname: "n53" label: "1" }
-node: {title: "n53" label: "Sel a_tp_elem_ent 53" }
-edge: {sourcename: "n53" targetname: "n57" label: "0" color: blue}
-edge: {sourcename: "n53" targetname: "n55" label: "1" }
-edge: {sourcename: "n53" targetname: "n54" label: "2" }
-node: {title: "n55" label: "Sel a 55" }
-edge: {sourcename: "n55" targetname: "n57" label: "0" color: blue}
-edge: {sourcename: "n55" targetname: "n56" label: "1" }
-node: {title: "n58" label: "ProjM 0 58" color: yellow}
-edge: {sourcename: "n58" targetname: "n52" label: "0" color: blue}
+graph: { title: "n47" label: "47" status:clustered color:yellow
+edge: {sourcename: "n47 " targetname: "n48" label: "0" color: red}
+node: {title: "n46" label: "Return  46"  info1: "visited: 14
+"}
+edge: {sourcename: "n46 " targetname: "n58" label: "0" color: blue}
+edge: {sourcename: "n46 " targetname: "n51" label: "1" }
+node: {title: "n51" label: "ProjIs 2 51" color: yellow info1: "visited: 14
+"}
+edge: {sourcename: "n51 " targetname: "n52" label: "0" }
+node: {title: "n52" label: "Load  52"  info1: "visited: 14
+"}
+edge: {sourcename: "n52 " targetname: "n57" label: "0" color: blue}
+edge: {sourcename: "n52 " targetname: "n53" label: "1" }
+node: {title: "n53" label: "Sel a_tp_elem_ent 53"  info1: "visited: 14
+"}
+edge: {sourcename: "n53 " targetname: "n57" label: "0" color: blue}
+edge: {sourcename: "n53 " targetname: "n55" label: "1" }
+edge: {sourcename: "n53 " targetname: "n54" label: "2" }
+node: {title: "n55" label: "Sel a 55"  info1: "visited: 14
+"}
+edge: {sourcename: "n55 " targetname: "n57" label: "0" color: blue}
+edge: {sourcename: "n55 " targetname: "n56" label: "1" }
+node: {title: "n58" label: "ProjM 0 58" color: yellow info1: "visited: 14
+"}
+edge: {sourcename: "n58 " targetname: "n52" label: "0" color: blue}
 }
 
-graph: { title: "n49"  label: "49" status:clustered color:yellow
-edge: {sourcename: "n49" targetname: "n48" label: "0" color: red}
-node: {title: "n48" label: "ProjX 0 48" color: yellow}
-edge: {sourcename: "n48" targetname: "n50" label: "0" color: red}
-node: {title: "n50" label: "Start  50" color: blue}
-node: {title: "n54" label: "0x3Iu  54" color: yellow}
-node: {title: "n56" label: "ProjP 2 56" color: yellow}
-edge: {sourcename: "n56" targetname: "n50" label: "0" }
-node: {title: "n57" label: "ProjM 1 57" color: yellow}
-edge: {sourcename: "n57" targetname: "n50" label: "0" color: blue}
+graph: { title: "n49" label: "49" status:clustered color:yellow
+edge: {sourcename: "n49 " targetname: "n48" label: "0" color: red}
+node: {title: "n48" label: "ProjX 0 48" color: yellow info1: "visited: 15
+"}
+edge: {sourcename: "n48 " targetname: "n50" label: "0" color: red}
+node: {title: "n50" label: "Start  50" color: blue info1: "visited: 15
+"}
+node: {title: "n54" label: "0x3Iu  54" color: yellow info1: "visited: 15
+"}
+node: {title: "n56" label: "ProjP 2 56" color: yellow info1: "visited: 15
+"}
+edge: {sourcename: "n56 " targetname: "n50" label: "0" }
+node: {title: "n57" label: "ProjM 1 57" color: yellow info1: "visited: 15
+"}
+edge: {sourcename: "n57 " targetname: "n50" label: "0" color: blue}
 }
 
-node: {title: "n61" label: "Bad  61" }
+node: {title: "n61" label: "Bad  61"  info1: "visited: 0
+"}
 node: {title: "e30" label: "ent a_tp_elem_ent" color: yellow
- info1:"
+ info1: "
+id: e30
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -68,7 +82,8 @@ mode: Is,
 size: 4B,
 "}
 node: {title: "e33" label: "ent a" color: yellow
- info1:"
+ info1: "
+id: e33
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -84,7 +99,8 @@ size: -1B,
 " color: green}
 edge: { sourcename: "t15" targetname: "e33"class: 12 label: "member" color:blue}
 node: {title: "e14" label: "ent main" color: yellow
- info1:"
+ info1: "
+id: e14
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -97,7 +113,8 @@ irg = g27"
 }
 edge: { sourcename: "e14" targetname: "t12"class: 3 label: "type" color: red}
 edge: { sourcename: "e14" targetname: "n13"label: "value 0"}
-node: {title: "n13" label: "&(ARRAY-STACK_EXAMPLE_main)P  13" color: yellow}
+node: {title: "n13" label: "&(ARRAY-STACK_EXAMPLE_main)P  13" color: yellow info1: "visited: 2
+"}
 node: {title: "t11" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined
 size: -1B,
 " color: green}

diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg
index f32ae96..bc92c6b 100644 (file)
--- a/testprograms/ref-results/All_types.vcg
+++ b/testprograms/ref-results/All_types.vcg
@@ -28,7 +28,8 @@ edge: { sourcename: "t11" targetname: "e13"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e16"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e13" label: "ent a" color: yellow
- info1:"
+ info1: "
+id: e13
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -40,7 +41,8 @@ offset:  -1"
 }
 edge: { sourcename: "e13" targetname: "t10"class: 3 label: "type" color: red}
 node: {title: "e16" label: "ent set_a" color: yellow
- info1:"
+ info1: "
+id: e16
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -53,7 +55,8 @@ irg = g69"
 }
 edge: { sourcename: "e16" targetname: "t14"class: 3 label: "type" color: red}
 edge: { sourcename: "e16" targetname: "n15"label: "value 0"}
-node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow}
+node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow info1: "visited: 4
+"}
 node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
@@ -66,7 +69,8 @@ size: 4B,
 "}
 edge: { sourcename: "t12" targetname: "t11"class: 9 label: "points to" color:green}
 node: {title: "e19" label: "ent c" color: yellow
- info1:"
+ info1: "
+id: e19
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -79,7 +83,8 @@ irg = g92"
 }
 edge: { sourcename: "e19" targetname: "t17"class: 3 label: "type" color: red}
 edge: { sourcename: "e19" targetname: "n18"label: "value 0"}
-node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow}
+node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow info1: "visited: 4
+"}
 node: {title: "t17" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
@@ -97,7 +102,8 @@ size: -1B,
 " color: green}
 edge: { sourcename: "t0" targetname: "e22"class: 12 label: "member" color:blue}
 node: {title: "e22" label: "ent OO_INLINE_EXAMPLE_main" color: yellow
- info1:"
+ info1: "
+id: e22
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -110,5 +116,6 @@ irg = g35"
 }
 edge: { sourcename: "e22" targetname: "t20"class: 3 label: "type" color: red}
 edge: { sourcename: "e22" targetname: "n21"label: "value 0"}
-node: {title: "n21" label: "&(GlobalType_OO_INLINE_EXAMPLE_main)P  21" color: yellow}
+node: {title: "n21" label: "&(GlobalType_OO_INLINE_EXAMPLE_main)P  21" color: yellow info1: "visited: 4
+"}
 }

diff --git a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
index f6d74f7..d573b62 100644 (file)
--- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
@@ -7,33 +7,43 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n54"  label: "54" status:clustered color:yellow
-edge: {sourcename: "n54" targetname: "n55" label: "0" color: red}
-node: {title: "n53" label: "End  53" color: blue}
+graph: { title: "n54" label: "54" status:clustered color:yellow
+edge: {sourcename: "n54 " targetname: "n55" label: "0" color: red}
+node: {title: "n53" label: "End  53" color: blue info1: "visited: 6
+"}
 }
 
-graph: { title: "n56"  label: "56" status:clustered color:yellow
-edge: {sourcename: "n56" targetname: "n57" label: "0" color: red}
-node: {title: "n55" label: "Return  55" }
-edge: {sourcename: "n55" targetname: "n60" label: "0" color: blue}
-node: {title: "n60" label: "ProjM 0 60" color: yellow}
-edge: {sourcename: "n60" targetname: "n61" label: "0" color: blue}
-node: {title: "n61" label: "Call  61" }
-edge: {sourcename: "n61" targetname: "n64" label: "0" color: blue}
-edge: {sourcename: "n61" targetname: "n63" label: "1" }
-edge: {sourcename: "n61" targetname: "n62" label: "2" }
+graph: { title: "n56" label: "56" status:clustered color:yellow
+edge: {sourcename: "n56 " targetname: "n57" label: "0" color: red}
+node: {title: "n55" label: "Return  55"  info1: "visited: 7
+"}
+edge: {sourcename: "n55 " targetname: "n60" label: "0" color: blue}
+node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 7
+"}
+edge: {sourcename: "n60 " targetname: "n61" label: "0" color: blue}
+node: {title: "n61" label: "Call  61"  info1: "visited: 7
+"}
+edge: {sourcename: "n61 " targetname: "n64" label: "0" color: blue}
+edge: {sourcename: "n61 " targetname: "n63" label: "1" }
+edge: {sourcename: "n61 " targetname: "n62" label: "2" }
 }
 
-graph: { title: "n58"  label: "58" status:clustered color:yellow
-edge: {sourcename: "n58" targetname: "n57" label: "0" color: red}
-node: {title: "n57" label: "ProjX 0 57" color: yellow}
-edge: {sourcename: "n57" targetname: "n59" label: "0" color: red}
-node: {title: "n59" label: "Start  59" color: blue}
-node: {title: "n62" label: "&(GlobalType_constStr)P  62" color: yellow}
-node: {title: "n63" label: "SymC f  63" }
-node: {title: "n64" label: "ProjM 1 64" color: yellow}
-edge: {sourcename: "n64" targetname: "n59" label: "0" color: blue}
+graph: { title: "n58" label: "58" status:clustered color:yellow
+edge: {sourcename: "n58 " targetname: "n57" label: "0" color: red}
+node: {title: "n57" label: "ProjX 0 57" color: yellow info1: "visited: 8
+"}
+edge: {sourcename: "n57 " targetname: "n59" label: "0" color: red}
+node: {title: "n59" label: "Start  59" color: blue info1: "visited: 8
+"}
+node: {title: "n62" label: "&(GlobalType_constStr)P  62" color: yellow info1: "visited: 8
+"}
+node: {title: "n63" label: "SymC f  63"  info1: "visited: 8
+"}
+node: {title: "n64" label: "ProjM 1 64" color: yellow info1: "visited: 8
+"}
+edge: {sourcename: "n64 " targetname: "n59" label: "0" color: blue}
 }
 
-node: {title: "n68" label: "Bad  68" }
+node: {title: "n68" label: "Bad  68"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/COND_EXAMPLE_main.vcg b/testprograms/ref-results/COND_EXAMPLE_main.vcg
index a891a91..8e84c28 100644 (file)
--- a/testprograms/ref-results/COND_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/COND_EXAMPLE_main.vcg
@@ -7,75 +7,101 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n59"  label: "59" status:clustered color:yellow
-edge: {sourcename: "n59" targetname: "n60" label: "0" color: red}
-node: {title: "n58" label: "End  58" color: blue}
+graph: { title: "n59" label: "59" status:clustered color:yellow
+edge: {sourcename: "n59 " targetname: "n60" label: "0" color: red}
+node: {title: "n58" label: "End  58" color: blue info1: "visited: 9
+"}
 }
 
-graph: { title: "n61"  label: "61" status:clustered color:yellow
-edge: {sourcename: "n61" targetname: "n82" label: "0" color: red}
-edge: {sourcename: "n61" targetname: "n62" label: "1" color: red}
-node: {title: "n60" label: "Return  60" }
-edge: {sourcename: "n60" targetname: "n87" label: "0" color: blue}
-edge: {sourcename: "n60" targetname: "n85" label: "1" }
-node: {title: "n85" label: "PhiIs  85" color: green}
-edge: {sourcename: "n85" targetname: "n86" label: "0" }
-edge: {sourcename: "n85" targetname: "n76" label: "1" }
+graph: { title: "n61" label: "61" status:clustered color:yellow
+edge: {sourcename: "n61 " targetname: "n82" label: "0" color: red}
+edge: {sourcename: "n61 " targetname: "n62" label: "1" color: red}
+node: {title: "n60" label: "Return  60"  info1: "visited: 10
+"}
+edge: {sourcename: "n60 " targetname: "n87" label: "0" color: blue}
+edge: {sourcename: "n60 " targetname: "n85" label: "1" }
+node: {title: "n85" label: "PhiIs  85" color: green info1: "visited: 10
+"}
+edge: {sourcename: "n85 " targetname: "n86" label: "0" }
+edge: {sourcename: "n85 " targetname: "n76" label: "1" }
 }
 
-graph: { title: "n63"  label: "63" status:clustered color:yellow
-edge: {sourcename: "n63" targetname: "n64" label: "0" color: red}
-node: {title: "n62" label: "ProjX 0 62" color: yellow}
-edge: {sourcename: "n62" targetname: "n67" label: "0" color: red}
-node: {title: "n67" label: "Cond  67" }
-edge: {sourcename: "n67" targetname: "n68" label: "0" }
-node: {title: "n68" label: "Projb Ne 68" color: yellow}
-edge: {sourcename: "n68" targetname: "n69" label: "0" }
-node: {title: "n69" label: "CmpT  69" }
-edge: {sourcename: "n69" targetname: "n71" label: "0" }
-edge: {sourcename: "n69" targetname: "n70" label: "1" }
-node: {title: "n71" label: "AndIs  71" }
-edge: {sourcename: "n71" targetname: "n78" label: "0" }
-edge: {sourcename: "n71" targetname: "n72" label: "1" }
-node: {title: "n72" label: "ConvIs  72" }
-edge: {sourcename: "n72" targetname: "n73" label: "0" }
-node: {title: "n73" label: "Projb Lt 73" color: yellow}
-edge: {sourcename: "n73" targetname: "n74" label: "0" }
-node: {title: "n74" label: "CmpT  74" }
-edge: {sourcename: "n74" targetname: "n76" label: "0" }
-edge: {sourcename: "n74" targetname: "n75" label: "1" }
-node: {title: "n76" label: "ProjIs 0 76" color: yellow}
-edge: {sourcename: "n76" targetname: "n77" label: "0" }
-node: {title: "n78" label: "ConvIs  78" }
-edge: {sourcename: "n78" targetname: "n79" label: "0" }
-node: {title: "n79" label: "Projb Gt 79" color: yellow}
-edge: {sourcename: "n79" targetname: "n80" label: "0" }
-node: {title: "n80" label: "CmpT  80" }
-edge: {sourcename: "n80" targetname: "n76" label: "0" }
-edge: {sourcename: "n80" targetname: "n81" label: "1" }
-node: {title: "n84" label: "ProjX 1 84" color: yellow}
-edge: {sourcename: "n84" targetname: "n67" label: "0" color: red}
+graph: { title: "n63" label: "63" status:clustered color:yellow
+edge: {sourcename: "n63 " targetname: "n64" label: "0" color: red}
+node: {title: "n62" label: "ProjX 0 62" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n62 " targetname: "n67" label: "0" color: red}
+node: {title: "n67" label: "Cond  67"  info1: "visited: 11
+"}
+edge: {sourcename: "n67 " targetname: "n68" label: "0" }
+node: {title: "n68" label: "Projb Ne 68" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n68 " targetname: "n69" label: "0" }
+node: {title: "n69" label: "CmpT  69"  info1: "visited: 11
+"}
+edge: {sourcename: "n69 " targetname: "n71" label: "0" }
+edge: {sourcename: "n69 " targetname: "n70" label: "1" }
+node: {title: "n71" label: "AndIs  71"  info1: "visited: 11
+"}
+edge: {sourcename: "n71 " targetname: "n78" label: "0" }
+edge: {sourcename: "n71 " targetname: "n72" label: "1" }
+node: {title: "n72" label: "ConvIs  72"  info1: "visited: 11
+"}
+edge: {sourcename: "n72 " targetname: "n73" label: "0" }
+node: {title: "n73" label: "Projb Lt 73" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n73 " targetname: "n74" label: "0" }
+node: {title: "n74" label: "CmpT  74"  info1: "visited: 11
+"}
+edge: {sourcename: "n74 " targetname: "n76" label: "0" }
+edge: {sourcename: "n74 " targetname: "n75" label: "1" }
+node: {title: "n76" label: "ProjIs 0 76" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n76 " targetname: "n77" label: "0" }
+node: {title: "n78" label: "ConvIs  78"  info1: "visited: 11
+"}
+edge: {sourcename: "n78 " targetname: "n79" label: "0" }
+node: {title: "n79" label: "Projb Gt 79" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n79 " targetname: "n80" label: "0" }
+node: {title: "n80" label: "CmpT  80"  info1: "visited: 11
+"}
+edge: {sourcename: "n80 " targetname: "n76" label: "0" }
+edge: {sourcename: "n80 " targetname: "n81" label: "1" }
+node: {title: "n84" label: "ProjX 1 84" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n84 " targetname: "n67" label: "0" color: red}
 }
 
-graph: { title: "n65"  label: "65" status:clustered color:yellow
-edge: {sourcename: "n65" targetname: "n64" label: "0" color: red}
-node: {title: "n64" label: "ProjX 0 64" color: yellow}
-edge: {sourcename: "n64" targetname: "n66" label: "0" color: red}
-node: {title: "n66" label: "Start  66" color: blue}
-node: {title: "n70" label: "0x0Is  70" color: yellow}
-node: {title: "n75" label: "0xAIs  75" color: yellow}
-node: {title: "n77" label: "ProjT 4 77" color: yellow}
-edge: {sourcename: "n77" targetname: "n66" label: "0" }
-node: {title: "n81" label: "0x2Is  81" color: yellow}
-node: {title: "n86" label: "0x1Is  86" color: yellow}
-node: {title: "n87" label: "ProjM 1 87" color: yellow}
-edge: {sourcename: "n87" targetname: "n66" label: "0" color: blue}
+graph: { title: "n65" label: "65" status:clustered color:yellow
+edge: {sourcename: "n65 " targetname: "n64" label: "0" color: red}
+node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n64 " targetname: "n66" label: "0" color: red}
+node: {title: "n66" label: "Start  66" color: blue info1: "visited: 12
+"}
+node: {title: "n70" label: "0x0Is  70" color: yellow info1: "visited: 12
+"}
+node: {title: "n75" label: "0xAIs  75" color: yellow info1: "visited: 12
+"}
+node: {title: "n77" label: "ProjT 4 77" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n77 " targetname: "n66" label: "0" }
+node: {title: "n81" label: "0x2Is  81" color: yellow info1: "visited: 12
+"}
+node: {title: "n86" label: "0x1Is  86" color: yellow info1: "visited: 12
+"}
+node: {title: "n87" label: "ProjM 1 87" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n87 " targetname: "n66" label: "0" color: blue}
 }
 
-graph: { title: "n83"  label: "83" status:clustered color:yellow
-edge: {sourcename: "n83" targetname: "n84" label: "0" color: red}
-node: {title: "n82" label: "Jmp  82" }
+graph: { title: "n83" label: "83" status:clustered color:yellow
+edge: {sourcename: "n83 " targetname: "n84" label: "0" color: red}
+node: {title: "n82" label: "Jmp  82"  info1: "visited: 13
+"}
 }
 
-node: {title: "n90" label: "Bad  90" }
+node: {title: "n90" label: "Bad  90"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
index 4d9d14d..9cad0e1 100644 (file)
--- a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
@@ -7,28 +7,35 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n44"  label: "44" status:clustered color:yellow
-edge: {sourcename: "n44" targetname: "n45" label: "0" color: red}
-node: {title: "n43" label: "End  43" color: blue}
+graph: { title: "n44" label: "44" status:clustered color:yellow
+edge: {sourcename: "n44 " targetname: "n45" label: "0" color: red}
+node: {title: "n43" label: "End  43" color: blue info1: "visited: 4
+"}
 }
 
-graph: { title: "n46"  label: "46" status:clustered color:yellow
-edge: {sourcename: "n46" targetname: "n47" label: "0" color: red}
-node: {title: "n45" label: "Return  45" }
-edge: {sourcename: "n45" targetname: "n51" label: "0" color: blue}
-edge: {sourcename: "n45" targetname: "n50" label: "1" }
-edge: {sourcename: "n45" targetname: "n50" label: "2" }
+graph: { title: "n46" label: "46" status:clustered color:yellow
+edge: {sourcename: "n46 " targetname: "n47" label: "0" color: red}
+node: {title: "n45" label: "Return  45"  info1: "visited: 5
+"}
+edge: {sourcename: "n45 " targetname: "n51" label: "0" color: blue}
+edge: {sourcename: "n45 " targetname: "n50" label: "1" }
+edge: {sourcename: "n45 " targetname: "n50" label: "2" }
 }
 
-graph: { title: "n48"  label: "48" status:clustered color:yellow
-edge: {sourcename: "n48" targetname: "n47" label: "0" color: red}
-node: {title: "n47" label: "ProjX 0 47" color: yellow}
-edge: {sourcename: "n47" targetname: "n49" label: "0" color: red}
-node: {title: "n49" label: "Start  49" color: blue}
-node: {title: "n50" label: "0xCIs  50" color: yellow}
-node: {title: "n51" label: "ProjM 1 51" color: yellow}
-edge: {sourcename: "n51" targetname: "n49" label: "0" color: blue}
+graph: { title: "n48" label: "48" status:clustered color:yellow
+edge: {sourcename: "n48 " targetname: "n47" label: "0" color: red}
+node: {title: "n47" label: "ProjX 0 47" color: yellow info1: "visited: 6
+"}
+edge: {sourcename: "n47 " targetname: "n49" label: "0" color: red}
+node: {title: "n49" label: "Start  49" color: blue info1: "visited: 6
+"}
+node: {title: "n50" label: "0xCIs  50" color: yellow info1: "visited: 6
+"}
+node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 6
+"}
+edge: {sourcename: "n51 " targetname: "n49" label: "0" color: blue}
 }
 
-node: {title: "n55" label: "Bad  55" }
+node: {title: "n55" label: "Bad  55"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg
index b36db72..bdbdf81 100644 (file)
--- a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg
+++ b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg
@@ -7,11 +7,12 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-node: {title:"n65" label: "Block 65" }
-edge: { sourcename: "n65" targetname: "n73" }
-node: {title:"n73" label: "Block 73" }
-edge: { sourcename: "n73" targetname: "n69" }
-node: {title:"n69" label: "Block 69" }
-edge: { sourcename: "n69" targetname: "n69" }
-node: {title: "n68" label: "Bad  68" }
+node: {title: "n65" label: "Block 65" }
+edge: { sourcename: "n65" targetname: "n73"}
+node: {title: "n73" label: "Block 73" }
+edge: { sourcename: "n73" targetname: "n69"}
+node: {title: "n69" label: "Block 69" }
+edge: { sourcename: "n69" targetname: "n69"}
+node: {title: "n68" label: "Bad  68"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/DEAD_BLOCK_main.vcg b/testprograms/ref-results/DEAD_BLOCK_main.vcg
index 042a1a5..79205fc 100644 (file)
--- a/testprograms/ref-results/DEAD_BLOCK_main.vcg
+++ b/testprograms/ref-results/DEAD_BLOCK_main.vcg
@@ -7,27 +7,34 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n65"  label: "65" status:clustered color:yellow
-edge: {sourcename: "n65" targetname: "n66" label: "0" color: red}
-node: {title: "n64" label: "End  64" color: blue}
+graph: { title: "n65" label: "65" status:clustered color:yellow
+edge: {sourcename: "n65 " targetname: "n66" label: "0" color: red}
+node: {title: "n64" label: "End  64" color: blue info1: "visited: 9
+"}
 }
 
-graph: { title: "n73"  label: "73" status:clustered color:yellow
-edge: {sourcename: "n73" targetname: "n70" label: "0" color: red}
-node: {title: "n66" label: "Return  66" }
-edge: {sourcename: "n66" targetname: "n75" label: "0" color: blue}
-edge: {sourcename: "n66" targetname: "n74" label: "1" }
+graph: { title: "n73" label: "73" status:clustered color:yellow
+edge: {sourcename: "n73 " targetname: "n70" label: "0" color: red}
+node: {title: "n66" label: "Return  66"  info1: "visited: 10
+"}
+edge: {sourcename: "n66 " targetname: "n75" label: "0" color: blue}
+edge: {sourcename: "n66 " targetname: "n74" label: "1" }
 }
 
-graph: { title: "n69"  label: "69" status:clustered color:yellow
-edge: {sourcename: "n69" targetname: "n70" label: "0" color: red}
-node: {title: "n70" label: "ProjX 0 70" color: yellow}
-edge: {sourcename: "n70" targetname: "n71" label: "0" color: red}
-node: {title: "n71" label: "Start  71" color: blue}
-node: {title: "n74" label: "0x2Is  74" color: yellow}
-node: {title: "n75" label: "ProjM 1 75" color: yellow}
-edge: {sourcename: "n75" targetname: "n71" label: "0" color: blue}
+graph: { title: "n69" label: "69" status:clustered color:yellow
+edge: {sourcename: "n69 " targetname: "n70" label: "0" color: red}
+node: {title: "n70" label: "ProjX 0 70" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n70 " targetname: "n71" label: "0" color: red}
+node: {title: "n71" label: "Start  71" color: blue info1: "visited: 11
+"}
+node: {title: "n74" label: "0x2Is  74" color: yellow info1: "visited: 11
+"}
+node: {title: "n75" label: "ProjM 1 75" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n75 " targetname: "n71" label: "0" color: blue}
 }
 
-node: {title: "n68" label: "Bad  68" }
+node: {title: "n68" label: "Bad  68"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/EMPTY_main.vcg b/testprograms/ref-results/EMPTY_main.vcg
index ed85fec..b5a1c4b 100644 (file)
--- a/testprograms/ref-results/EMPTY_main.vcg
+++ b/testprograms/ref-results/EMPTY_main.vcg
@@ -7,25 +7,31 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n14"  label: "14" status:clustered color:yellow
-edge: {sourcename: "n14" targetname: "n28" label: "0" color: red}
-node: {title: "n15" label: "End  15" color: blue}
+graph: { title: "n14" label: "14" status:clustered color:yellow
+edge: {sourcename: "n14 " targetname: "n28" label: "0" color: red}
+node: {title: "n15" label: "End  15" color: blue info1: "visited: 4
+"}
 }
 
-graph: { title: "n26"  label: "26" status:clustered color:yellow
-edge: {sourcename: "n26" targetname: "n20" label: "0" color: red}
-node: {title: "n28" label: "Return  28" }
-edge: {sourcename: "n28" targetname: "n21" label: "0" color: blue}
+graph: { title: "n26" label: "26" status:clustered color:yellow
+edge: {sourcename: "n26 " targetname: "n20" label: "0" color: red}
+node: {title: "n28" label: "Return  28"  info1: "visited: 5
+"}
+edge: {sourcename: "n28 " targetname: "n21" label: "0" color: blue}
 }
 
-graph: { title: "n16"  label: "16" status:clustered color:yellow
-edge: {sourcename: "n16" targetname: "n20" label: "0" color: red}
-node: {title: "n20" label: "ProjX 0 20" color: yellow}
-edge: {sourcename: "n20" targetname: "n17" label: "0" color: red}
-node: {title: "n17" label: "Start  17" color: blue}
-node: {title: "n21" label: "ProjM 1 21" color: yellow}
-edge: {sourcename: "n21" targetname: "n17" label: "0" color: blue}
+graph: { title: "n16" label: "16" status:clustered color:yellow
+edge: {sourcename: "n16 " targetname: "n20" label: "0" color: red}
+node: {title: "n20" label: "ProjX 0 20" color: yellow info1: "visited: 6
+"}
+edge: {sourcename: "n20 " targetname: "n17" label: "0" color: red}
+node: {title: "n17" label: "Start  17" color: blue info1: "visited: 6
+"}
+node: {title: "n21" label: "ProjM 1 21" color: yellow info1: "visited: 6
+"}
+edge: {sourcename: "n21 " targetname: "n17" label: "0" color: blue}
 }
 
-node: {title: "n18" label: "Bad  18" }
+node: {title: "n18" label: "Bad  18"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
index 335c397..7a2e544 100644 (file)
--- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
@@ -7,56 +7,73 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n73"  label: "73" status:clustered color:yellow
-node: {title: "n72" label: "End  72" color: blue}
-edge: {sourcename: "n72" targetname: "n78" label: "0" color: red}
-edge: {sourcename: "n72" targetname: "n84" label: "1" }
+graph: { title: "n73" label: "73" status:clustered color:yellow
+node: {title: "n72" label: "End  72" color: blue info1: "visited: 19
+"}
+edge: {sourcename: "n72 " targetname: "n78" label: "0" color: red}
+edge: {sourcename: "n72 " targetname: "n84" label: "1" }
 }
 
-graph: { title: "n78"  label: "78" status:clustered color:yellow
-edge: {sourcename: "n78" targetname: "n82" label: "0" color: red}
-edge: {sourcename: "n78" targetname: "n79" label: "1" color: red}
-node: {title: "n84" label: "PhiM  84" color: green}
-edge: {sourcename: "n84" targetname: "n96" label: "0" color: blue}
-edge: {sourcename: "n84" targetname: "n85" label: "1" color: blue}
-node: {title: "n79" label: "Jmp  79" }
-node: {title: "n85" label: "ProjM 0 85" color: yellow}
-edge: {sourcename: "n85" targetname: "n86" label: "0" color: blue}
-node: {title: "n86" label: "Store  86" }
-edge: {sourcename: "n86" targetname: "n84" label: "0" color: blue}
-edge: {sourcename: "n86" targetname: "n93" label: "1" }
-edge: {sourcename: "n86" targetname: "n88" label: "2" }
-node: {title: "n88" label: "PhiIs  88" color: green}
-edge: {sourcename: "n88" targetname: "n91" label: "0" }
-edge: {sourcename: "n88" targetname: "n89" label: "1" }
-node: {title: "n89" label: "PhiIs  89" color: green}
-edge: {sourcename: "n89" targetname: "n90" label: "0" }
-edge: {sourcename: "n89" targetname: "n88" label: "1" }
-node: {title: "n93" label: "Sel VAR_A 93" }
-edge: {sourcename: "n93" targetname: "n84" label: "0" color: blue}
-edge: {sourcename: "n93" targetname: "n94" label: "1" }
+graph: { title: "n78" label: "78" status:clustered color:yellow
+edge: {sourcename: "n78 " targetname: "n82" label: "0" color: red}
+edge: {sourcename: "n78 " targetname: "n79" label: "1" color: red}
+node: {title: "n84" label: "PhiM  84" color: green info1: "visited: 20
+"}
+edge: {sourcename: "n84 " targetname: "n94" label: "0" color: blue}
+edge: {sourcename: "n84 " targetname: "n85" label: "1" color: blue}
+node: {title: "n79" label: "Jmp  79"  info1: "visited: 20
+"}
+node: {title: "n85" label: "ProjM 0 85" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n85 " targetname: "n86" label: "0" color: blue}
+node: {title: "n86" label: "Store  86"  info1: "visited: 20
+"}
+edge: {sourcename: "n86 " targetname: "n84" label: "0" color: blue}
+edge: {sourcename: "n86 " targetname: "n92" label: "1" }
+edge: {sourcename: "n86 " targetname: "n87" label: "2" }
+node: {title: "n87" label: "PhiIs  87" color: green info1: "visited: 20
+"}
+edge: {sourcename: "n87 " targetname: "n90" label: "0" }
+edge: {sourcename: "n87 " targetname: "n88" label: "1" }
+node: {title: "n88" label: "PhiIs  88" color: green info1: "visited: 20
+"}
+edge: {sourcename: "n88 " targetname: "n89" label: "0" }
+edge: {sourcename: "n88 " targetname: "n87" label: "1" }
+node: {title: "n92" label: "Sel VAR_A 92"  info1: "visited: 20
+"}
+edge: {sourcename: "n92 " targetname: "n84" label: "0" color: blue}
+edge: {sourcename: "n92 " targetname: "n93" label: "1" }
 }
 
-graph: { title: "n83"  label: "83" status:clustered color:yellow
-edge: {sourcename: "n83" targetname: "n76" label: "0" color: red}
-node: {title: "n82" label: "Jmp  82" }
-node: {title: "n91" label: "ProjIs 0 91" color: yellow}
-edge: {sourcename: "n91" targetname: "n92" label: "0" }
+graph: { title: "n83" label: "83" status:clustered color:yellow
+edge: {sourcename: "n83 " targetname: "n76" label: "0" color: red}
+node: {title: "n82" label: "Jmp  82"  info1: "visited: 21
+"}
+node: {title: "n90" label: "ProjIs 0 90" color: yellow info1: "visited: 21
+"}
+edge: {sourcename: "n90 " targetname: "n91" label: "0" }
 }
 
-graph: { title: "n75"  label: "75" status:clustered color:yellow
-edge: {sourcename: "n75" targetname: "n76" label: "0" color: red}
-node: {title: "n76" label: "ProjX 0 76" color: yellow}
-edge: {sourcename: "n76" targetname: "n77" label: "0" color: red}
-node: {title: "n77" label: "Start  77" color: blue}
-node: {title: "n90" label: "0x1Is  90" color: yellow}
-node: {title: "n92" label: "ProjT 4 92" color: yellow}
-edge: {sourcename: "n92" targetname: "n77" label: "0" }
-node: {title: "n94" label: "ProjP 3 94" color: yellow}
-edge: {sourcename: "n94" targetname: "n77" label: "0" }
-node: {title: "n96" label: "ProjM 1 96" color: yellow}
-edge: {sourcename: "n96" targetname: "n77" label: "0" color: blue}
+graph: { title: "n75" label: "75" status:clustered color:yellow
+edge: {sourcename: "n75 " targetname: "n76" label: "0" color: red}
+node: {title: "n76" label: "ProjX 0 76" color: yellow info1: "visited: 22
+"}
+edge: {sourcename: "n76 " targetname: "n77" label: "0" color: red}
+node: {title: "n77" label: "Start  77" color: blue info1: "visited: 22
+"}
+node: {title: "n89" label: "0x1Is  89" color: yellow info1: "visited: 22
+"}
+node: {title: "n91" label: "ProjT 4 91" color: yellow info1: "visited: 22
+"}
+edge: {sourcename: "n91 " targetname: "n77" label: "0" }
+node: {title: "n93" label: "ProjP 3 93" color: yellow info1: "visited: 22
+"}
+edge: {sourcename: "n93 " targetname: "n77" label: "0" }
+node: {title: "n94" label: "ProjM 1 94" color: yellow info1: "visited: 22
+"}
+edge: {sourcename: "n94 " targetname: "n77" label: "0" color: blue}
 }
 
-node: {title: "n74" label: "Bad  74" }
+node: {title: "n74" label: "Bad  74"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg
index 7e2fd79..b28b0d6 100644 (file)
--- a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg
@@ -7,68 +7,89 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n62"  label: "62" status:clustered color:yellow
-edge: {sourcename: "n62" targetname: "n63" label: "0" color: red}
-node: {title: "n61" label: "End  61" color: blue}
+graph: { title: "n62" label: "62" status:clustered color:yellow
+edge: {sourcename: "n62 " targetname: "n63" label: "0" color: red}
+node: {title: "n61" label: "End  61" color: blue info1: "visited: 12
+"}
 }
 
-graph: { title: "n64"  label: "64" status:clustered color:yellow
-edge: {sourcename: "n64" targetname: "n78" label: "0" color: red}
-edge: {sourcename: "n64" targetname: "n65" label: "1" color: red}
-node: {title: "n63" label: "Return  63" }
-edge: {sourcename: "n63" targetname: "n86" label: "0" color: blue}
-edge: {sourcename: "n63" targetname: "n81" label: "1" }
-node: {title: "n81" label: "PhiIs  81" color: green}
-edge: {sourcename: "n81" targetname: "n84" label: "0" }
-edge: {sourcename: "n81" targetname: "n82" label: "1" }
+graph: { title: "n64" label: "64" status:clustered color:yellow
+edge: {sourcename: "n64 " targetname: "n78" label: "0" color: red}
+edge: {sourcename: "n64 " targetname: "n65" label: "1" color: red}
+node: {title: "n63" label: "Return  63"  info1: "visited: 13
+"}
+edge: {sourcename: "n63 " targetname: "n86" label: "0" color: blue}
+edge: {sourcename: "n63 " targetname: "n81" label: "1" }
+node: {title: "n81" label: "PhiIs  81" color: green info1: "visited: 13
+"}
+edge: {sourcename: "n81 " targetname: "n84" label: "0" }
+edge: {sourcename: "n81 " targetname: "n82" label: "1" }
 }
 
-graph: { title: "n66"  label: "66" status:clustered color:yellow
-edge: {sourcename: "n66" targetname: "n67" label: "0" color: red}
-node: {title: "n65" label: "Jmp  65" }
+graph: { title: "n66" label: "66" status:clustered color:yellow
+edge: {sourcename: "n66 " targetname: "n67" label: "0" color: red}
+node: {title: "n65" label: "Jmp  65"  info1: "visited: 14
+"}
 }
 
-graph: { title: "n68"  label: "68" status:clustered color:yellow
-edge: {sourcename: "n68" targetname: "n69" label: "0" color: red}
-node: {title: "n72" label: "Cond  72" }
-edge: {sourcename: "n72" targetname: "n73" label: "0" }
+graph: { title: "n68" label: "68" status:clustered color:yellow
+edge: {sourcename: "n68 " targetname: "n69" label: "0" color: red}
+node: {title: "n72" label: "Cond  72"  info1: "visited: 15
+"}
+edge: {sourcename: "n72 " targetname: "n73" label: "0" }
 }
 
-graph: { title: "n70"  label: "70" status:clustered color:yellow
-edge: {sourcename: "n70" targetname: "n69" label: "0" color: red}
-node: {title: "n71" label: "Start  71" color: blue}
+graph: { title: "n70" label: "70" status:clustered color:yellow
+edge: {sourcename: "n70 " targetname: "n69" label: "0" color: red}
+node: {title: "n71" label: "Start  71" color: blue info1: "visited: 16
+"}
 }
 
-graph: { title: "n79"  label: "79" status:clustered color:yellow
-edge: {sourcename: "n79" targetname: "n80" label: "0" color: red}
-node: {title: "n78" label: "Jmp  78" }
+graph: { title: "n79" label: "79" status:clustered color:yellow
+edge: {sourcename: "n79 " targetname: "n80" label: "0" color: red}
+node: {title: "n78" label: "Jmp  78"  info1: "visited: 17
+"}
 }
 
-node: {title: "n67" label: "ProjX 1 67" color: yellow}
-edge: {sourcename: "n67" targetname: "n72" label: "0" color: red}
-node: {title: "n69" label: "ProjX 0 69" color: yellow}
-edge: {sourcename: "n69" targetname: "n71" label: "0" color: red}
-node: {title: "n73" label: "Projb Eq 73" color: yellow}
-edge: {sourcename: "n73" targetname: "n74" label: "0" }
-node: {title: "n74" label: "CmpT  74" }
-edge: {sourcename: "n74" targetname: "n76" label: "0" }
-edge: {sourcename: "n74" targetname: "n75" label: "1" }
-node: {title: "n75" label: "0x2Is  75" color: yellow}
-node: {title: "n76" label: "ProjIs 0 76" color: yellow}
-edge: {sourcename: "n76" targetname: "n77" label: "0" }
-node: {title: "n77" label: "ProjT 4 77" color: yellow}
-edge: {sourcename: "n77" targetname: "n71" label: "0" }
-node: {title: "n80" label: "ProjX 0 80" color: yellow}
-edge: {sourcename: "n80" targetname: "n72" label: "0" color: red}
-node: {title: "n82" label: "SubIs  82" }
-edge: {sourcename: "n82" targetname: "n76" label: "0" }
-edge: {sourcename: "n82" targetname: "n83" label: "1" }
-node: {title: "n83" label: "0x3Is  83" color: yellow}
-node: {title: "n84" label: "AddIs  84" }
-edge: {sourcename: "n84" targetname: "n82" label: "0" }
-edge: {sourcename: "n84" targetname: "n85" label: "1" }
-node: {title: "n85" label: "0x5Is  85" color: yellow}
-node: {title: "n86" label: "ProjM 1 86" color: yellow}
-edge: {sourcename: "n86" targetname: "n71" label: "0" color: blue}
-node: {title: "n89" label: "Bad  89" }
+node: {title: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n67 " targetname: "n72" label: "0" color: red}
+node: {title: "n69" label: "ProjX 0 69" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n69 " targetname: "n71" label: "0" color: red}
+node: {title: "n73" label: "Projb Eq 73" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n73 " targetname: "n74" label: "0" }
+node: {title: "n74" label: "CmpT  74"  info1: "visited: 18
+"}
+edge: {sourcename: "n74 " targetname: "n76" label: "0" }
+edge: {sourcename: "n74 " targetname: "n75" label: "1" }
+node: {title: "n75" label: "0x2Is  75" color: yellow info1: "visited: 18
+"}
+node: {title: "n76" label: "ProjIs 0 76" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n76 " targetname: "n77" label: "0" }
+node: {title: "n77" label: "ProjT 4 77" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n77 " targetname: "n71" label: "0" }
+node: {title: "n80" label: "ProjX 0 80" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n80 " targetname: "n72" label: "0" color: red}
+node: {title: "n82" label: "SubIs  82"  info1: "visited: 18
+"}
+edge: {sourcename: "n82 " targetname: "n76" label: "0" }
+edge: {sourcename: "n82 " targetname: "n83" label: "1" }
+node: {title: "n83" label: "0x3Is  83" color: yellow info1: "visited: 18
+"}
+node: {title: "n84" label: "AddIs  84"  info1: "visited: 18
+"}
+edge: {sourcename: "n84 " targetname: "n82" label: "0" }
+edge: {sourcename: "n84 " targetname: "n85" label: "1" }
+node: {title: "n85" label: "0x5Is  85" color: yellow info1: "visited: 18
+"}
+node: {title: "n86" label: "ProjM 1 86" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n86 " targetname: "n71" label: "0" color: blue}
+node: {title: "n89" label: "Bad  89"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/GLOBAL_VAR_main-all.vcg b/testprograms/ref-results/GLOBAL_VAR_main-all.vcg
index 4a44299..b811ddd 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main-all.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main-all.vcg
@@ -7,44 +7,58 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-node: {title: "n37" label: "End  37" color: blue}
+node: {title: "n37" label: "End  37" color: blue info1: "visited: 11
+"}
 edge: { sourcename: "n37" targetname: "n38" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n38" label: "Block  38" color: lightyellow}
-edge: {sourcename: "n38" targetname: "n39" label: "0" color: red}
-node: {title: "n39" label: "Return  39" }
+node: {title: "n38" label: "Block  38" color: lightyellow info1: "visited: 11
+"}
+edge: {sourcename: "n38 " targetname: "n39" label: "0" color: red}
+node: {title: "n39" label: "Return  39"  info1: "visited: 11
+"}
 edge: { sourcename: "n39" targetname: "n40" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n39" targetname: "n44" label: "0" color: blue}
-node: {title: "n40" label: "Block  40" color: lightyellow}
-edge: {sourcename: "n40" targetname: "n41" label: "0" color: red}
-node: {title: "n41" label: "ProjX 0 41" color: yellow}
+edge: {sourcename: "n39 " targetname: "n44" label: "0" color: blue}
+node: {title: "n40" label: "Block  40" color: lightyellow info1: "visited: 11
+"}
+edge: {sourcename: "n40 " targetname: "n41" label: "0" color: red}
+node: {title: "n41" label: "ProjX 0 41" color: yellow info1: "visited: 11
+"}
 edge: { sourcename: "n41" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n41" targetname: "n43" label: "0" color: red}
-node: {title: "n42" label: "Block  42" color: lightyellow}
-edge: {sourcename: "n42" targetname: "n41" label: "0" color: red}
-node: {title: "n43" label: "Start  43" color: blue}
+edge: {sourcename: "n41 " targetname: "n43" label: "0" color: red}
+node: {title: "n42" label: "Block  42" color: lightyellow info1: "visited: 11
+"}
+edge: {sourcename: "n42 " targetname: "n41" label: "0" color: red}
+node: {title: "n43" label: "Start  43" color: blue info1: "visited: 11
+"}
 edge: { sourcename: "n43" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n44" label: "ProjM 0 44" color: yellow}
+node: {title: "n44" label: "ProjM 0 44" color: yellow info1: "visited: 11
+"}
 edge: { sourcename: "n44" targetname: "n40" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n44" targetname: "n45" label: "0" color: blue}
-node: {title: "n45" label: "Store  45" }
+edge: {sourcename: "n44 " targetname: "n45" label: "0" color: blue}
+node: {title: "n45" label: "Store  45"  info1: "visited: 11
+"}
 edge: { sourcename: "n45" targetname: "n40" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n45" targetname: "n49" label: "0" color: blue}
-edge: {sourcename: "n45" targetname: "n47" label: "1" }
-edge: {sourcename: "n45" targetname: "n46" label: "2" }
-node: {title: "n46" label: "0x2Is  46" color: yellow}
+edge: {sourcename: "n45 " targetname: "n49" label: "0" color: blue}
+edge: {sourcename: "n45 " targetname: "n47" label: "1" }
+edge: {sourcename: "n45 " targetname: "n46" label: "2" }
+node: {title: "n46" label: "0x2Is  46" color: yellow info1: "visited: 11
+"}
 edge: { sourcename: "n46" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n47" label: "Sel i 47" }
+node: {title: "n47" label: "Sel i 47"  info1: "visited: 11
+"}
 edge: { sourcename: "n47" targetname: "n40" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n47" targetname: "n49" label: "0" color: blue}
-edge: {sourcename: "n47" targetname: "n48" label: "1" }
-node: {title: "n48" label: "ProjP 3 48" color: yellow}
+edge: {sourcename: "n47 " targetname: "n49" label: "0" color: blue}
+edge: {sourcename: "n47 " targetname: "n48" label: "1" }
+node: {title: "n48" label: "ProjP 3 48" color: yellow info1: "visited: 11
+"}
 edge: { sourcename: "n48" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n48" targetname: "n43" label: "0" }
-node: {title: "n49" label: "ProjM 1 49" color: yellow}
+edge: {sourcename: "n48 " targetname: "n43" label: "0" }
+node: {title: "n49" label: "ProjM 1 49" color: yellow info1: "visited: 11
+"}
 edge: { sourcename: "n49" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n49" targetname: "n43" label: "0" color: blue}
+edge: {sourcename: "n49 " targetname: "n43" label: "0" color: blue}
 node: {title: "e14" label: "ent i" color: yellow
- info1:"
+ info1: "
+id: e14
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -61,7 +75,8 @@ size: -1B,
 edge: { sourcename: "t0" targetname: "e13"class: 12 label: "member" color:blue}
 edge: { sourcename: "t0" targetname: "e14"class: 12 label: "member" color:blue}
 node: {title: "e13" label: "ent GLOBAL_VAR_main" color: yellow
- info1:"
+ info1: "
+id: e13
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -74,7 +89,8 @@ irg = g27"
 }
 edge: { sourcename: "e13" targetname: "t11"class: 3 label: "type" color: red}
 edge: { sourcename: "e13" targetname: "n12"label: "value 0"}
-node: {title: "n12" label: "&(GlobalType_GLOBAL_VAR_main)P  12" color: yellow}
+node: {title: "n12" label: "&(GlobalType_GLOBAL_VAR_main)P  12" color: yellow info1: "visited: 1
+"}
 node: {title: "t11" label: "method GLOBAL_VAR_main" info1: "state: layout_fixed,
 mode: P,
 size: 4B,

diff --git a/testprograms/ref-results/GLOBAL_VAR_main.vcg b/testprograms/ref-results/GLOBAL_VAR_main.vcg
index ef74277..280ac33 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main.vcg
@@ -7,37 +7,48 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n38"  label: "38" status:clustered color:yellow
-edge: {sourcename: "n38" targetname: "n39" label: "0" color: red}
-node: {title: "n37" label: "End  37" color: blue}
+graph: { title: "n38" label: "38" status:clustered color:yellow
+edge: {sourcename: "n38 " targetname: "n39" label: "0" color: red}
+node: {title: "n37" label: "End  37" color: blue info1: "visited: 7
+"}
 }
 
-graph: { title: "n40"  label: "40" status:clustered color:yellow
-edge: {sourcename: "n40" targetname: "n41" label: "0" color: red}
-node: {title: "n39" label: "Return  39" }
-edge: {sourcename: "n39" targetname: "n44" label: "0" color: blue}
-node: {title: "n44" label: "ProjM 0 44" color: yellow}
-edge: {sourcename: "n44" targetname: "n45" label: "0" color: blue}
-node: {title: "n45" label: "Store  45" }
-edge: {sourcename: "n45" targetname: "n49" label: "0" color: blue}
-edge: {sourcename: "n45" targetname: "n47" label: "1" }
-edge: {sourcename: "n45" targetname: "n46" label: "2" }
-node: {title: "n47" label: "Sel i 47" }
-edge: {sourcename: "n47" targetname: "n49" label: "0" color: blue}
-edge: {sourcename: "n47" targetname: "n48" label: "1" }
+graph: { title: "n40" label: "40" status:clustered color:yellow
+edge: {sourcename: "n40 " targetname: "n41" label: "0" color: red}
+node: {title: "n39" label: "Return  39"  info1: "visited: 8
+"}
+edge: {sourcename: "n39 " targetname: "n44" label: "0" color: blue}
+node: {title: "n44" label: "ProjM 0 44" color: yellow info1: "visited: 8
+"}
+edge: {sourcename: "n44 " targetname: "n45" label: "0" color: blue}
+node: {title: "n45" label: "Store  45"  info1: "visited: 8
+"}
+edge: {sourcename: "n45 " targetname: "n49" label: "0" color: blue}
+edge: {sourcename: "n45 " targetname: "n47" label: "1" }
+edge: {sourcename: "n45 " targetname: "n46" label: "2" }
+node: {title: "n47" label: "Sel i 47"  info1: "visited: 8
+"}
+edge: {sourcename: "n47 " targetname: "n49" label: "0" color: blue}
+edge: {sourcename: "n47 " targetname: "n48" label: "1" }
 }
 
-graph: { title: "n42"  label: "42" status:clustered color:yellow
-edge: {sourcename: "n42" targetname: "n41" label: "0" color: red}
-node: {title: "n41" label: "ProjX 0 41" color: yellow}
-edge: {sourcename: "n41" targetname: "n43" label: "0" color: red}
-node: {title: "n43" label: "Start  43" color: blue}
-node: {title: "n46" label: "0x2Is  46" color: yellow}
-node: {title: "n48" label: "ProjP 3 48" color: yellow}
-edge: {sourcename: "n48" targetname: "n43" label: "0" }
-node: {title: "n49" label: "ProjM 1 49" color: yellow}
-edge: {sourcename: "n49" targetname: "n43" label: "0" color: blue}
+graph: { title: "n42" label: "42" status:clustered color:yellow
+edge: {sourcename: "n42 " targetname: "n41" label: "0" color: red}
+node: {title: "n41" label: "ProjX 0 41" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n41 " targetname: "n43" label: "0" color: red}
+node: {title: "n43" label: "Start  43" color: blue info1: "visited: 9
+"}
+node: {title: "n46" label: "0x2Is  46" color: yellow info1: "visited: 9
+"}
+node: {title: "n48" label: "ProjP 3 48" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n48 " targetname: "n43" label: "0" }
+node: {title: "n49" label: "ProjM 1 49" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n49 " targetname: "n43" label: "0" color: blue}
 }
 
-node: {title: "n52" label: "Bad  52" }
+node: {title: "n52" label: "Bad  52"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg
index 92981c7..4310951 100644 (file)
--- a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg
@@ -7,29 +7,37 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n62"  label: "62" status:clustered color:yellow
-edge: {sourcename: "n62" targetname: "n63" label: "0" color: red}
-node: {title: "n61" label: "End  61" color: blue}
+graph: { title: "n62" label: "62" status:clustered color:yellow
+edge: {sourcename: "n62 " targetname: "n63" label: "0" color: red}
+node: {title: "n61" label: "End  61" color: blue info1: "visited: 13
+"}
 }
 
-graph: { title: "n66"  label: "66" status:clustered color:yellow
-edge: {sourcename: "n66" targetname: "n67" label: "0" color: red}
-node: {title: "n63" label: "Return  63" }
-edge: {sourcename: "n63" targetname: "n73" label: "0" color: blue}
-edge: {sourcename: "n63" targetname: "n72" label: "1" }
-edge: {sourcename: "n63" targetname: "n71" label: "2" }
+graph: { title: "n66" label: "66" status:clustered color:yellow
+edge: {sourcename: "n66 " targetname: "n67" label: "0" color: red}
+node: {title: "n63" label: "Return  63"  info1: "visited: 14
+"}
+edge: {sourcename: "n63 " targetname: "n73" label: "0" color: blue}
+edge: {sourcename: "n63 " targetname: "n72" label: "1" }
+edge: {sourcename: "n63 " targetname: "n71" label: "2" }
 }
 
-graph: { title: "n68"  label: "68" status:clustered color:yellow
-edge: {sourcename: "n68" targetname: "n67" label: "0" color: red}
-node: {title: "n67" label: "ProjX 0 67" color: yellow}
-edge: {sourcename: "n67" targetname: "n69" label: "0" color: red}
-node: {title: "n69" label: "Start  69" color: blue}
-node: {title: "n71" label: "0x2Is  71" color: yellow}
-node: {title: "n72" label: "0x0Is  72" color: yellow}
-node: {title: "n73" label: "ProjM 1 73" color: yellow}
-edge: {sourcename: "n73" targetname: "n69" label: "0" color: blue}
+graph: { title: "n68" label: "68" status:clustered color:yellow
+edge: {sourcename: "n68 " targetname: "n67" label: "0" color: red}
+node: {title: "n67" label: "ProjX 0 67" color: yellow info1: "visited: 15
+"}
+edge: {sourcename: "n67 " targetname: "n69" label: "0" color: red}
+node: {title: "n69" label: "Start  69" color: blue info1: "visited: 15
+"}
+node: {title: "n71" label: "0x2Is  71" color: yellow info1: "visited: 15
+"}
+node: {title: "n72" label: "0x0Is  72" color: yellow info1: "visited: 15
+"}
+node: {title: "n73" label: "ProjM 1 73" color: yellow info1: "visited: 15
+"}
+edge: {sourcename: "n73 " targetname: "n69" label: "0" color: blue}
 }
 
-node: {title: "n70" label: "Bad  70" }
+node: {title: "n70" label: "Bad  70"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/IF_EXAMPLE_main.vcg b/testprograms/ref-results/IF_EXAMPLE_main.vcg
index 12b9be6..3a65b09 100644 (file)
--- a/testprograms/ref-results/IF_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/IF_EXAMPLE_main.vcg
@@ -7,59 +7,77 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n15"  label: "15" status:clustered color:yellow
-edge: {sourcename: "n15" targetname: "n50" label: "0" color: red}
-node: {title: "n16" label: "End  16" color: blue}
+graph: { title: "n15" label: "15" status:clustered color:yellow
+edge: {sourcename: "n15 " targetname: "n50" label: "0" color: red}
+node: {title: "n16" label: "End  16" color: blue info1: "visited: 8
+"}
 }
 
-graph: { title: "n41"  label: "41" status:clustered color:yellow
-edge: {sourcename: "n41" targetname: "n33" label: "0" color: red}
-edge: {sourcename: "n41" targetname: "n40" label: "1" color: red}
-node: {title: "n50" label: "Return  50" }
-edge: {sourcename: "n50" targetname: "n22" label: "0" color: blue}
-edge: {sourcename: "n50" targetname: "n43" label: "1" }
-node: {title: "n43" label: "PhiIs  43" color: green}
-edge: {sourcename: "n43" targetname: "n28" label: "0" }
-edge: {sourcename: "n43" targetname: "n38" label: "1" }
+graph: { title: "n41" label: "41" status:clustered color:yellow
+edge: {sourcename: "n41 " targetname: "n33" label: "0" color: red}
+edge: {sourcename: "n41 " targetname: "n40" label: "1" color: red}
+node: {title: "n50" label: "Return  50"  info1: "visited: 9
+"}
+edge: {sourcename: "n50 " targetname: "n22" label: "0" color: blue}
+edge: {sourcename: "n50 " targetname: "n43" label: "1" }
+node: {title: "n43" label: "PhiIs  43" color: green info1: "visited: 9
+"}
+edge: {sourcename: "n43 " targetname: "n28" label: "0" }
+edge: {sourcename: "n43 " targetname: "n38" label: "1" }
 }
 
-graph: { title: "n35"  label: "35" status:clustered color:yellow
-edge: {sourcename: "n35" targetname: "n34" label: "0" color: red}
-node: {title: "n40" label: "Jmp  40" }
-node: {title: "n38" label: "SubIs  38" }
-edge: {sourcename: "n38" targetname: "n28" label: "0" }
-edge: {sourcename: "n38" targetname: "n36" label: "1" }
+graph: { title: "n35" label: "35" status:clustered color:yellow
+edge: {sourcename: "n35 " targetname: "n34" label: "0" color: red}
+node: {title: "n40" label: "Jmp  40"  info1: "visited: 10
+"}
+node: {title: "n38" label: "SubIs  38"  info1: "visited: 10
+"}
+edge: {sourcename: "n38 " targetname: "n28" label: "0" }
+edge: {sourcename: "n38 " targetname: "n36" label: "1" }
 }
 
-graph: { title: "n27"  label: "27" status:clustered color:yellow
-edge: {sourcename: "n27" targetname: "n21" label: "0" color: red}
-node: {title: "n34" label: "ProjX 1 34" color: yellow}
-edge: {sourcename: "n34" targetname: "n32" label: "0" color: red}
-node: {title: "n32" label: "Cond  32" }
-edge: {sourcename: "n32" targetname: "n31" label: "0" }
-node: {title: "n31" label: "Projb Eq 31" color: yellow}
-edge: {sourcename: "n31" targetname: "n30" label: "0" }
-node: {title: "n30" label: "CmpT  30" }
-edge: {sourcename: "n30" targetname: "n28" label: "0" }
-edge: {sourcename: "n30" targetname: "n29" label: "1" }
-node: {title: "n28" label: "ProjIs 0 28" color: yellow}
-edge: {sourcename: "n28" targetname: "n25" label: "0" }
-node: {title: "n33" label: "ProjX 0 33" color: yellow}
-edge: {sourcename: "n33" targetname: "n32" label: "0" color: red}
+graph: { title: "n27" label: "27" status:clustered color:yellow
+edge: {sourcename: "n27 " targetname: "n21" label: "0" color: red}
+node: {title: "n34" label: "ProjX 1 34" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n34 " targetname: "n32" label: "0" color: red}
+node: {title: "n32" label: "Cond  32"  info1: "visited: 11
+"}
+edge: {sourcename: "n32 " targetname: "n31" label: "0" }
+node: {title: "n31" label: "Projb Eq 31" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n31 " targetname: "n30" label: "0" }
+node: {title: "n30" label: "CmpT  30"  info1: "visited: 11
+"}
+edge: {sourcename: "n30 " targetname: "n28" label: "0" }
+edge: {sourcename: "n30 " targetname: "n29" label: "1" }
+node: {title: "n28" label: "ProjIs 0 28" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n28 " targetname: "n25" label: "0" }
+node: {title: "n33" label: "ProjX 0 33" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n33 " targetname: "n32" label: "0" color: red}
 }
 
-graph: { title: "n17"  label: "17" status:clustered color:yellow
-edge: {sourcename: "n17" targetname: "n21" label: "0" color: red}
-node: {title: "n21" label: "ProjX 0 21" color: yellow}
-edge: {sourcename: "n21" targetname: "n18" label: "0" color: red}
-node: {title: "n18" label: "Start  18" color: blue}
-node: {title: "n29" label: "0x2Is  29" color: yellow}
-node: {title: "n25" label: "ProjT 4 25" color: yellow}
-edge: {sourcename: "n25" targetname: "n18" label: "0" }
-node: {title: "n36" label: "0x3Is  36" color: yellow}
-node: {title: "n22" label: "ProjM 1 22" color: yellow}
-edge: {sourcename: "n22" targetname: "n18" label: "0" color: blue}
+graph: { title: "n17" label: "17" status:clustered color:yellow
+edge: {sourcename: "n17 " targetname: "n21" label: "0" color: red}
+node: {title: "n21" label: "ProjX 0 21" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n21 " targetname: "n18" label: "0" color: red}
+node: {title: "n18" label: "Start  18" color: blue info1: "visited: 12
+"}
+node: {title: "n29" label: "0x2Is  29" color: yellow info1: "visited: 12
+"}
+node: {title: "n25" label: "ProjT 4 25" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n25 " targetname: "n18" label: "0" }
+node: {title: "n36" label: "0x3Is  36" color: yellow info1: "visited: 12
+"}
+node: {title: "n22" label: "ProjM 1 22" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n22 " targetname: "n18" label: "0" color: blue}
 }
 
-node: {title: "n19" label: "Bad  19" }
+node: {title: "n19" label: "Bad  19"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/IF_WHILE_EXAMPLE_main.vcg b/testprograms/ref-results/IF_WHILE_EXAMPLE_main.vcg
index f3f47e0..8fffdf2 100644 (file)
--- a/testprograms/ref-results/IF_WHILE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/IF_WHILE_EXAMPLE_main.vcg
@@ -7,70 +7,94 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-node: {title: "n88" label: "Start  88" color: blue}
+node: {title: "n88" label: "Start  88" color: blue info1: "visited: 14
+"}
 edge: { sourcename: "n88" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n87" label: "ProjX 0 87" color: yellow}
+node: {title: "n87" label: "ProjX 0 87" color: yellow info1: "visited: 14
+"}
 edge: { sourcename: "n87" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n87" targetname: "n88" label: "0" color: red}
-node: {title: "n86" label: "Block  86" color: lightyellow}
-edge: {sourcename: "n86" targetname: "n87" label: "0" color: red}
-node: {title: "n85" label: "0x0Iu  85" color: yellow}
+edge: {sourcename: "n87 " targetname: "n88" label: "0" color: red}
+node: {title: "n86" label: "Block  86" color: lightyellow info1: "visited: 14
+"}
+edge: {sourcename: "n86 " targetname: "n87" label: "0" color: red}
+node: {title: "n85" label: "0x0Iu  85" color: yellow info1: "visited: 14
+"}
 edge: { sourcename: "n85" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n84" label: "CmpT  84" }
+node: {title: "n84" label: "CmpT  84"  info1: "visited: 14
+"}
 edge: { sourcename: "n84" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n84" targetname: "n85" label: "0" }
-edge: {sourcename: "n84" targetname: "n85" label: "1" }
-node: {title: "n83" label: "Projb Eq 83" color: yellow}
+edge: {sourcename: "n84 " targetname: "n85" label: "0" }
+edge: {sourcename: "n84 " targetname: "n85" label: "1" }
+node: {title: "n83" label: "Projb Eq 83" color: yellow info1: "visited: 14
+"}
 edge: { sourcename: "n83" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n83" targetname: "n84" label: "0" }
-node: {title: "n82" label: "Cond  82" }
+edge: {sourcename: "n83 " targetname: "n84" label: "0" }
+node: {title: "n82" label: "Cond  82"  info1: "visited: 14
+"}
 edge: { sourcename: "n82" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n82" targetname: "n83" label: "0" }
-node: {title: "n81" label: "ProjX 1 81" color: yellow}
+edge: {sourcename: "n82 " targetname: "n83" label: "0" }
+node: {title: "n81" label: "ProjX 1 81" color: yellow info1: "visited: 14
+"}
 edge: { sourcename: "n81" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n81" targetname: "n82" label: "0" color: red}
-node: {title: "n80" label: "Block  80" color: lightyellow}
-edge: {sourcename: "n80" targetname: "n81" label: "0" color: red}
-node: {title: "n79" label: "Jmp  79" }
+edge: {sourcename: "n81 " targetname: "n82" label: "0" color: red}
+node: {title: "n80" label: "Block  80" color: lightyellow info1: "visited: 14
+"}
+edge: {sourcename: "n80 " targetname: "n81" label: "0" color: red}
+node: {title: "n79" label: "Jmp  79"  info1: "visited: 14
+"}
 edge: { sourcename: "n79" targetname: "n80" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n90" label: "Block  90" color: lightyellow}
-edge: {sourcename: "n90" targetname: "n87" label: "0" color: red}
-node: {title: "n89" label: "Jmp  89" }
+node: {title: "n90" label: "Block  90" color: lightyellow info1: "visited: 14
+"}
+edge: {sourcename: "n90 " targetname: "n87" label: "0" color: red}
+node: {title: "n89" label: "Jmp  89"  info1: "visited: 14
+"}
 edge: { sourcename: "n89" targetname: "n90" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n78" label: "Block  78" color: lightyellow}
-edge: {sourcename: "n78" targetname: "n89" label: "0" color: red}
-edge: {sourcename: "n78" targetname: "n79" label: "1" color: red}
-node: {title: "n77" label: "ProjX 0 77" color: yellow}
+node: {title: "n78" label: "Block  78" color: lightyellow info1: "visited: 14
+"}
+edge: {sourcename: "n78 " targetname: "n89" label: "0" color: red}
+edge: {sourcename: "n78 " targetname: "n79" label: "1" color: red}
+node: {title: "n77" label: "ProjX 0 77" color: yellow info1: "visited: 14
+"}
 edge: { sourcename: "n77" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n77" targetname: "n82" label: "0" color: red}
-node: {title: "n76" label: "Block  76" color: lightyellow}
-edge: {sourcename: "n76" targetname: "n77" label: "0" color: red}
-node: {title: "n94" label: "0x0Iu  94" color: yellow}
+edge: {sourcename: "n77 " targetname: "n82" label: "0" color: red}
+node: {title: "n76" label: "Block  76" color: lightyellow info1: "visited: 14
+"}
+edge: {sourcename: "n76 " targetname: "n77" label: "0" color: red}
+node: {title: "n94" label: "0x0Iu  94" color: yellow info1: "visited: 14
+"}
 edge: { sourcename: "n94" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n93" label: "PhiIu  93" color: green}
+node: {title: "n93" label: "PhiIu  93" color: green info1: "visited: 14
+"}
 edge: { sourcename: "n93" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n93" targetname: "n94" label: "0" }
-edge: {sourcename: "n93" targetname: "n92" label: "1" }
-node: {title: "n95" label: "0x1Iu  95" color: yellow}
+edge: {sourcename: "n93 " targetname: "n94" label: "0" }
+edge: {sourcename: "n93 " targetname: "n92" label: "1" }
+node: {title: "n95" label: "0x1Iu  95" color: yellow info1: "visited: 14
+"}
 edge: { sourcename: "n95" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n92" label: "PhiIu  92" color: green}
+node: {title: "n92" label: "PhiIu  92" color: green info1: "visited: 14
+"}
 edge: { sourcename: "n92" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n92" targetname: "n95" label: "0" }
-edge: {sourcename: "n92" targetname: "n93" label: "1" }
-node: {title: "n91" label: "SubIu  91" }
+edge: {sourcename: "n92 " targetname: "n95" label: "0" }
+edge: {sourcename: "n92 " targetname: "n93" label: "1" }
+node: {title: "n91" label: "SubIu  91"  info1: "visited: 14
+"}
 edge: { sourcename: "n91" targetname: "n76" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n91" targetname: "n93" label: "0" }
-edge: {sourcename: "n91" targetname: "n92" label: "1" }
-node: {title: "n96" label: "ProjM 1 96" color: yellow}
+edge: {sourcename: "n91 " targetname: "n93" label: "0" }
+edge: {sourcename: "n91 " targetname: "n92" label: "1" }
+node: {title: "n96" label: "ProjM 1 96" color: yellow info1: "visited: 14
+"}
 edge: { sourcename: "n96" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n96" targetname: "n88" label: "0" color: blue}
-node: {title: "n75" label: "Return  75" }
+edge: {sourcename: "n96 " targetname: "n88" label: "0" color: blue}
+node: {title: "n75" label: "Return  75"  info1: "visited: 14
+"}
 edge: { sourcename: "n75" targetname: "n76" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n75" targetname: "n96" label: "0" color: blue}
-edge: {sourcename: "n75" targetname: "n91" label: "1" }
-node: {title: "n74" label: "Block  74" color: lightyellow}
-edge: {sourcename: "n74" targetname: "n75" label: "0" color: red}
-node: {title: "n73" label: "End  73" color: blue}
+edge: {sourcename: "n75 " targetname: "n96" label: "0" color: blue}
+edge: {sourcename: "n75 " targetname: "n91" label: "1" }
+node: {title: "n74" label: "Block  74" color: lightyellow info1: "visited: 14
+"}
+edge: {sourcename: "n74 " targetname: "n75" label: "0" color: red}
+node: {title: "n73" label: "End  73" color: blue info1: "visited: 14
+"}
 edge: { sourcename: "n73" targetname: "n74" class: 2 priority: 2 linestyle: dotted}
 edge: {sourcename: "n88" targetname: "n87" color: red linestyle: dashed}
 edge: {sourcename: "n88" targetname: "n96" color: red linestyle: dashed}

diff --git a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg
index 91f6019..df2f67f 100644 (file)
--- a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg
+++ b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg
@@ -7,23 +7,24 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-node: {title:"n63" label: "Block 63" }
-edge: { sourcename: "n63" targetname: "n65" }
-node: {title:"n65" label: "Block 65" }
-edge: { sourcename: "n65" targetname: "n88" }
-edge: { sourcename: "n65" targetname: "n67" }
-node: {title:"n67" label: "Block 67" }
-edge: { sourcename: "n67" targetname: "n81" }
-edge: { sourcename: "n67" targetname: "n69" }
-node: {title:"n69" label: "Block 69" }
-edge: { sourcename: "n69" targetname: "n71" }
-node: {title:"n71" label: "Block 71" }
-edge: { sourcename: "n71" targetname: "n73" }
-node: {title:"n73" label: "Block 73" }
-edge: { sourcename: "n73" targetname: "n73" }
-node: {title:"n81" label: "Block 81" }
-edge: { sourcename: "n81" targetname: "n71" }
-node: {title:"n88" label: "Block 88" }
-edge: { sourcename: "n88" targetname: "n81" }
-node: {title: "n94" label: "Bad  94" }
+node: {title: "n63" label: "Block 63" }
+edge: { sourcename: "n63" targetname: "n65"}
+node: {title: "n65" label: "Block 65" }
+edge: { sourcename: "n65" targetname: "n88"}
+edge: { sourcename: "n65" targetname: "n67"}
+node: {title: "n67" label: "Block 67" }
+edge: { sourcename: "n67" targetname: "n81"}
+edge: { sourcename: "n67" targetname: "n69"}
+node: {title: "n69" label: "Block 69" }
+edge: { sourcename: "n69" targetname: "n71"}
+node: {title: "n71" label: "Block 71" }
+edge: { sourcename: "n71" targetname: "n73"}
+node: {title: "n73" label: "Block 73" }
+edge: { sourcename: "n73" targetname: "n73"}
+node: {title: "n81" label: "Block 81" }
+edge: { sourcename: "n81" targetname: "n71"}
+node: {title: "n88" label: "Block 88" }
+edge: { sourcename: "n88" targetname: "n81"}
+node: {title: "n94" label: "Bad  94"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/IRREGULAR_CF_main.vcg b/testprograms/ref-results/IRREGULAR_CF_main.vcg
index be1d8fe..d9d52dd 100644 (file)
--- a/testprograms/ref-results/IRREGULAR_CF_main.vcg
+++ b/testprograms/ref-results/IRREGULAR_CF_main.vcg
@@ -7,75 +7,97 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n63"  label: "63" status:clustered color:yellow
-edge: {sourcename: "n63" targetname: "n64" label: "0" color: red}
-node: {title: "n62" label: "End  62" color: blue}
+graph: { title: "n63" label: "63" status:clustered color:yellow
+edge: {sourcename: "n63 " targetname: "n64" label: "0" color: red}
+node: {title: "n62" label: "End  62" color: blue info1: "visited: 5
+"}
 }
 
-graph: { title: "n65"  label: "65" status:clustered color:yellow
-edge: {sourcename: "n65" targetname: "n87" label: "0" color: red}
-edge: {sourcename: "n65" targetname: "n66" label: "1" color: red}
-node: {title: "n64" label: "Return  64" }
-edge: {sourcename: "n64" targetname: "n90" label: "0" color: blue}
+graph: { title: "n65" label: "65" status:clustered color:yellow
+edge: {sourcename: "n65 " targetname: "n87" label: "0" color: red}
+edge: {sourcename: "n65 " targetname: "n66" label: "1" color: red}
+node: {title: "n64" label: "Return  64"  info1: "visited: 6
+"}
+edge: {sourcename: "n64 " targetname: "n90" label: "0" color: blue}
 }
 
-graph: { title: "n67"  label: "67" status:clustered color:yellow
-edge: {sourcename: "n67" targetname: "n80" label: "0" color: red}
-edge: {sourcename: "n67" targetname: "n68" label: "1" color: red}
-node: {title: "n66" label: "Jmp  66" }
+graph: { title: "n67" label: "67" status:clustered color:yellow
+edge: {sourcename: "n67 " targetname: "n80" label: "0" color: red}
+edge: {sourcename: "n67 " targetname: "n68" label: "1" color: red}
+node: {title: "n66" label: "Jmp  66"  info1: "visited: 7
+"}
 }
 
-graph: { title: "n69"  label: "69" status:clustered color:yellow
-edge: {sourcename: "n69" targetname: "n70" label: "0" color: red}
-node: {title: "n68" label: "Jmp  68" }
+graph: { title: "n69" label: "69" status:clustered color:yellow
+edge: {sourcename: "n69 " targetname: "n70" label: "0" color: red}
+node: {title: "n68" label: "Jmp  68"  info1: "visited: 8
+"}
 }
 
-graph: { title: "n71"  label: "71" status:clustered color:yellow
-edge: {sourcename: "n71" targetname: "n72" label: "0" color: red}
-node: {title: "n70" label: "ProjX 1 70" color: yellow}
-edge: {sourcename: "n70" targetname: "n75" label: "0" color: red}
-node: {title: "n75" label: "Cond  75" }
-edge: {sourcename: "n75" targetname: "n76" label: "0" }
-node: {title: "n76" label: "Projb Eq 76" color: yellow}
-edge: {sourcename: "n76" targetname: "n77" label: "0" }
-node: {title: "n77" label: "CmpT  77" }
-edge: {sourcename: "n77" targetname: "n79" label: "0" }
-edge: {sourcename: "n77" targetname: "n78" label: "1" }
-node: {title: "n82" label: "ProjX 0 82" color: yellow}
-edge: {sourcename: "n82" targetname: "n75" label: "0" color: red}
+graph: { title: "n71" label: "71" status:clustered color:yellow
+edge: {sourcename: "n71 " targetname: "n72" label: "0" color: red}
+node: {title: "n70" label: "ProjX 1 70" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n70 " targetname: "n75" label: "0" color: red}
+node: {title: "n75" label: "Cond  75"  info1: "visited: 9
+"}
+edge: {sourcename: "n75 " targetname: "n76" label: "0" }
+node: {title: "n76" label: "Projb Eq 76" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n76 " targetname: "n77" label: "0" }
+node: {title: "n77" label: "CmpT  77"  info1: "visited: 9
+"}
+edge: {sourcename: "n77 " targetname: "n79" label: "0" }
+edge: {sourcename: "n77 " targetname: "n78" label: "1" }
+node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n82 " targetname: "n75" label: "0" color: red}
 }
 
-graph: { title: "n73"  label: "73" status:clustered color:yellow
-edge: {sourcename: "n73" targetname: "n72" label: "0" color: red}
-node: {title: "n72" label: "ProjX 0 72" color: yellow}
-edge: {sourcename: "n72" targetname: "n74" label: "0" color: red}
-node: {title: "n74" label: "Start  74" color: blue}
-node: {title: "n78" label: "0x1Is  78" color: yellow}
-node: {title: "n79" label: "0x0Is  79" color: yellow}
-node: {title: "n86" label: "0x2Is  86" color: yellow}
-node: {title: "n90" label: "ProjM 1 90" color: yellow}
-edge: {sourcename: "n90" targetname: "n74" label: "0" color: blue}
+graph: { title: "n73" label: "73" status:clustered color:yellow
+edge: {sourcename: "n73 " targetname: "n72" label: "0" color: red}
+node: {title: "n72" label: "ProjX 0 72" color: yellow info1: "visited: 10
+"}
+edge: {sourcename: "n72 " targetname: "n74" label: "0" color: red}
+node: {title: "n74" label: "Start  74" color: blue info1: "visited: 10
+"}
+node: {title: "n78" label: "0x1Is  78" color: yellow info1: "visited: 10
+"}
+node: {title: "n79" label: "0x0Is  79" color: yellow info1: "visited: 10
+"}
+node: {title: "n86" label: "0x2Is  86" color: yellow info1: "visited: 10
+"}
+node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 10
+"}
+edge: {sourcename: "n90 " targetname: "n74" label: "0" color: blue}
 }
 
-graph: { title: "n81"  label: "81" status:clustered color:yellow
-edge: {sourcename: "n81" targetname: "n82" label: "0" color: red}
-node: {title: "n80" label: "ProjX 1 80" color: yellow}
-edge: {sourcename: "n80" targetname: "n83" label: "0" color: red}
-node: {title: "n83" label: "Cond  83" }
-edge: {sourcename: "n83" targetname: "n84" label: "0" }
-node: {title: "n84" label: "Projb Eq 84" color: yellow}
-edge: {sourcename: "n84" targetname: "n85" label: "0" }
-node: {title: "n85" label: "CmpT  85" }
-edge: {sourcename: "n85" targetname: "n79" label: "0" }
-edge: {sourcename: "n85" targetname: "n86" label: "1" }
-node: {title: "n89" label: "ProjX 0 89" color: yellow}
-edge: {sourcename: "n89" targetname: "n83" label: "0" color: red}
+graph: { title: "n81" label: "81" status:clustered color:yellow
+edge: {sourcename: "n81 " targetname: "n82" label: "0" color: red}
+node: {title: "n80" label: "ProjX 1 80" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n80 " targetname: "n83" label: "0" color: red}
+node: {title: "n83" label: "Cond  83"  info1: "visited: 11
+"}
+edge: {sourcename: "n83 " targetname: "n84" label: "0" }
+node: {title: "n84" label: "Projb Eq 84" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n84 " targetname: "n85" label: "0" }
+node: {title: "n85" label: "CmpT  85"  info1: "visited: 11
+"}
+edge: {sourcename: "n85 " targetname: "n79" label: "0" }
+edge: {sourcename: "n85 " targetname: "n86" label: "1" }
+node: {title: "n89" label: "ProjX 0 89" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n89 " targetname: "n83" label: "0" color: red}
 }
 
-graph: { title: "n88"  label: "88" status:clustered color:yellow
-edge: {sourcename: "n88" targetname: "n89" label: "0" color: red}
-node: {title: "n87" label: "Jmp  87" }
+graph: { title: "n88" label: "88" status:clustered color:yellow
+edge: {sourcename: "n88 " targetname: "n89" label: "0" color: red}
+node: {title: "n87" label: "Jmp  87"  info1: "visited: 12
+"}
 }
 
-node: {title: "n94" label: "Bad  94" }
+node: {title: "n94" label: "Bad  94"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg
index 9d071a3..ec9bfb7 100644 (file)
--- a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg
+++ b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg
@@ -7,20 +7,21 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-node: {title:"n60" label: "Block 60" }
-edge: { sourcename: "n60" targetname: "n62" }
-node: {title:"n62" label: "Block 62" }
-edge: { sourcename: "n62" targetname: "n66" }
-edge: { sourcename: "n62" targetname: "n64" }
-node: {title:"n64" label: "Block 64" }
-edge: { sourcename: "n64" targetname: "n77" }
-edge: { sourcename: "n64" targetname: "n66" }
-node: {title:"n66" label: "Block 66" }
-edge: { sourcename: "n66" targetname: "n77" }
-edge: { sourcename: "n66" targetname: "n64" }
-node: {title:"n77" label: "Block 77" }
-edge: { sourcename: "n77" targetname: "n72" }
-node: {title:"n72" label: "Block 72" }
-edge: { sourcename: "n72" targetname: "n72" }
-node: {title: "n94" label: "Bad  94" }
+node: {title: "n60" label: "Block 60" }
+edge: { sourcename: "n60" targetname: "n62"}
+node: {title: "n62" label: "Block 62" }
+edge: { sourcename: "n62" targetname: "n66"}
+edge: { sourcename: "n62" targetname: "n64"}
+node: {title: "n64" label: "Block 64" }
+edge: { sourcename: "n64" targetname: "n77"}
+edge: { sourcename: "n64" targetname: "n66"}
+node: {title: "n66" label: "Block 66" }
+edge: { sourcename: "n66" targetname: "n77"}
+edge: { sourcename: "n66" targetname: "n64"}
+node: {title: "n77" label: "Block 77" }
+edge: { sourcename: "n77" targetname: "n72"}
+node: {title: "n72" label: "Block 72" }
+edge: { sourcename: "n72" targetname: "n72"}
+node: {title: "n94" label: "Bad  94"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/IRR_LOOP_main.vcg b/testprograms/ref-results/IRR_LOOP_main.vcg
index 0bb8c77..c3cb036 100644 (file)
--- a/testprograms/ref-results/IRR_LOOP_main.vcg
+++ b/testprograms/ref-results/IRR_LOOP_main.vcg
@@ -7,85 +7,112 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n60"  label: "60" status:clustered color:yellow
-edge: {sourcename: "n60" targetname: "n61" label: "0" color: red}
-node: {title: "n59" label: "End  59" color: blue}
+graph: { title: "n60" label: "60" status:clustered color:yellow
+edge: {sourcename: "n60 " targetname: "n61" label: "0" color: red}
+node: {title: "n59" label: "End  59" color: blue info1: "visited: 5
+"}
 }
 
-graph: { title: "n62"  label: "62" status:clustered color:yellow
-edge: {sourcename: "n62" targetname: "n86" label: "0" color: red}
-edge: {sourcename: "n62" targetname: "n63" label: "1" color: red}
-node: {title: "n61" label: "Return  61" }
-edge: {sourcename: "n61" targetname: "n87" label: "0" color: blue}
-node: {title: "n87" label: "PhiM  87" color: green}
-edge: {sourcename: "n87" targetname: "n89" label: "0" color: blue}
-edge: {sourcename: "n87" targetname: "n88" label: "1" color: blue}
+graph: { title: "n62" label: "62" status:clustered color:yellow
+edge: {sourcename: "n62 " targetname: "n86" label: "0" color: red}
+edge: {sourcename: "n62 " targetname: "n63" label: "1" color: red}
+node: {title: "n61" label: "Return  61"  info1: "visited: 6
+"}
+edge: {sourcename: "n61 " targetname: "n87" label: "0" color: blue}
+node: {title: "n87" label: "PhiM  87" color: green info1: "visited: 6
+"}
+edge: {sourcename: "n87 " targetname: "n89" label: "0" color: blue}
+edge: {sourcename: "n87 " targetname: "n88" label: "1" color: blue}
 }
 
-graph: { title: "n64"  label: "64" status:clustered color:yellow
-edge: {sourcename: "n64" targetname: "n85" label: "0" color: red}
-edge: {sourcename: "n64" targetname: "n65" label: "1" color: red}
-node: {title: "n63" label: "ProjX 0 63" color: yellow}
-edge: {sourcename: "n63" targetname: "n68" label: "0" color: red}
-node: {title: "n67" label: "ProjX 1 67" color: yellow}
-edge: {sourcename: "n67" targetname: "n68" label: "0" color: red}
-node: {title: "n68" label: "Cond  68" }
-edge: {sourcename: "n68" targetname: "n69" label: "0" }
-node: {title: "n69" label: "Projb Eq 69" color: yellow}
-edge: {sourcename: "n69" targetname: "n70" label: "0" }
-node: {title: "n70" label: "CmpT  70" }
-edge: {sourcename: "n70" targetname: "n75" label: "0" }
-edge: {sourcename: "n70" targetname: "n71" label: "1" }
-node: {title: "n88" label: "PhiM  88" color: green}
-edge: {sourcename: "n88" targetname: "n90" label: "0" color: blue}
-edge: {sourcename: "n88" targetname: "n89" label: "1" color: blue}
+graph: { title: "n64" label: "64" status:clustered color:yellow
+edge: {sourcename: "n64 " targetname: "n85" label: "0" color: red}
+edge: {sourcename: "n64 " targetname: "n65" label: "1" color: red}
+node: {title: "n63" label: "ProjX 0 63" color: yellow info1: "visited: 7
+"}
+edge: {sourcename: "n63 " targetname: "n68" label: "0" color: red}
+node: {title: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 7
+"}
+edge: {sourcename: "n67 " targetname: "n68" label: "0" color: red}
+node: {title: "n68" label: "Cond  68"  info1: "visited: 7
+"}
+edge: {sourcename: "n68 " targetname: "n69" label: "0" }
+node: {title: "n69" label: "Projb Eq 69" color: yellow info1: "visited: 7
+"}
+edge: {sourcename: "n69 " targetname: "n70" label: "0" }
+node: {title: "n70" label: "CmpT  70"  info1: "visited: 7
+"}
+edge: {sourcename: "n70 " targetname: "n75" label: "0" }
+edge: {sourcename: "n70 " targetname: "n71" label: "1" }
+node: {title: "n88" label: "PhiM  88" color: green info1: "visited: 7
+"}
+edge: {sourcename: "n88 " targetname: "n90" label: "0" color: blue}
+edge: {sourcename: "n88 " targetname: "n89" label: "1" color: blue}
 }
 
-graph: { title: "n66"  label: "66" status:clustered color:yellow
-edge: {sourcename: "n66" targetname: "n76" label: "0" color: red}
-edge: {sourcename: "n66" targetname: "n67" label: "1" color: red}
-node: {title: "n65" label: "ProjX 1 65" color: yellow}
-edge: {sourcename: "n65" targetname: "n82" label: "0" color: red}
-node: {title: "n82" label: "Cond  82" }
-edge: {sourcename: "n82" targetname: "n83" label: "0" }
-node: {title: "n83" label: "Projb Eq 83" color: yellow}
-edge: {sourcename: "n83" targetname: "n84" label: "0" }
-node: {title: "n84" label: "CmpT  84" }
-edge: {sourcename: "n84" targetname: "n75" label: "0" }
-edge: {sourcename: "n84" targetname: "n71" label: "1" }
-node: {title: "n86" label: "ProjX 0 86" color: yellow}
-edge: {sourcename: "n86" targetname: "n82" label: "0" color: red}
-node: {title: "n89" label: "PhiM  89" color: green}
-edge: {sourcename: "n89" targetname: "n90" label: "0" color: blue}
-edge: {sourcename: "n89" targetname: "n88" label: "1" color: blue}
+graph: { title: "n66" label: "66" status:clustered color:yellow
+edge: {sourcename: "n66 " targetname: "n76" label: "0" color: red}
+edge: {sourcename: "n66 " targetname: "n67" label: "1" color: red}
+node: {title: "n65" label: "ProjX 1 65" color: yellow info1: "visited: 8
+"}
+edge: {sourcename: "n65 " targetname: "n82" label: "0" color: red}
+node: {title: "n82" label: "Cond  82"  info1: "visited: 8
+"}
+edge: {sourcename: "n82 " targetname: "n83" label: "0" }
+node: {title: "n83" label: "Projb Eq 83" color: yellow info1: "visited: 8
+"}
+edge: {sourcename: "n83 " targetname: "n84" label: "0" }
+node: {title: "n84" label: "CmpT  84"  info1: "visited: 8
+"}
+edge: {sourcename: "n84 " targetname: "n75" label: "0" }
+edge: {sourcename: "n84 " targetname: "n71" label: "1" }
+node: {title: "n86" label: "ProjX 0 86" color: yellow info1: "visited: 8
+"}
+edge: {sourcename: "n86 " targetname: "n82" label: "0" color: red}
+node: {title: "n89" label: "PhiM  89" color: green info1: "visited: 8
+"}
+edge: {sourcename: "n89 " targetname: "n90" label: "0" color: blue}
+edge: {sourcename: "n89 " targetname: "n88" label: "1" color: blue}
 }
 
-graph: { title: "n77"  label: "77" status:clustered color:yellow
-edge: {sourcename: "n77" targetname: "n73" label: "0" color: red}
-node: {title: "n76" label: "ProjX 0 76" color: yellow}
-edge: {sourcename: "n76" targetname: "n78" label: "0" color: red}
-node: {title: "n78" label: "Cond  78" }
-edge: {sourcename: "n78" targetname: "n79" label: "0" }
-node: {title: "n79" label: "Projb Eq 79" color: yellow}
-edge: {sourcename: "n79" targetname: "n80" label: "0" }
-node: {title: "n80" label: "CmpT  80" }
-edge: {sourcename: "n80" targetname: "n75" label: "0" }
-edge: {sourcename: "n80" targetname: "n81" label: "1" }
-node: {title: "n85" label: "ProjX 1 85" color: yellow}
-edge: {sourcename: "n85" targetname: "n78" label: "0" color: red}
+graph: { title: "n77" label: "77" status:clustered color:yellow
+edge: {sourcename: "n77 " targetname: "n73" label: "0" color: red}
+node: {title: "n76" label: "ProjX 0 76" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n76 " targetname: "n78" label: "0" color: red}
+node: {title: "n78" label: "Cond  78"  info1: "visited: 9
+"}
+edge: {sourcename: "n78 " targetname: "n79" label: "0" }
+node: {title: "n79" label: "Projb Eq 79" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n79 " targetname: "n80" label: "0" }
+node: {title: "n80" label: "CmpT  80"  info1: "visited: 9
+"}
+edge: {sourcename: "n80 " targetname: "n75" label: "0" }
+edge: {sourcename: "n80 " targetname: "n81" label: "1" }
+node: {title: "n85" label: "ProjX 1 85" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n85 " targetname: "n78" label: "0" color: red}
 }
 
-graph: { title: "n72"  label: "72" status:clustered color:yellow
-edge: {sourcename: "n72" targetname: "n73" label: "0" color: red}
-node: {title: "n71" label: "0x2Is  71" color: yellow}
-node: {title: "n73" label: "ProjX 0 73" color: yellow}
-edge: {sourcename: "n73" targetname: "n74" label: "0" color: red}
-node: {title: "n74" label: "Start  74" color: blue}
-node: {title: "n75" label: "0x0Is  75" color: yellow}
-node: {title: "n81" label: "0x1Is  81" color: yellow}
-node: {title: "n90" label: "ProjM 1 90" color: yellow}
-edge: {sourcename: "n90" targetname: "n74" label: "0" color: blue}
+graph: { title: "n72" label: "72" status:clustered color:yellow
+edge: {sourcename: "n72 " targetname: "n73" label: "0" color: red}
+node: {title: "n71" label: "0x2Is  71" color: yellow info1: "visited: 10
+"}
+node: {title: "n73" label: "ProjX 0 73" color: yellow info1: "visited: 10
+"}
+edge: {sourcename: "n73 " targetname: "n74" label: "0" color: red}
+node: {title: "n74" label: "Start  74" color: blue info1: "visited: 10
+"}
+node: {title: "n75" label: "0x0Is  75" color: yellow info1: "visited: 10
+"}
+node: {title: "n81" label: "0x1Is  81" color: yellow info1: "visited: 10
+"}
+node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 10
+"}
+edge: {sourcename: "n90 " targetname: "n74" label: "0" color: blue}
 }
 
-node: {title: "n94" label: "Bad  94" }
+node: {title: "n94" label: "Bad  94"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
index 6248ff7..159fc15 100644 (file)
--- a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
@@ -7,105 +7,140 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n76"  label: "76" status:clustered color:yellow
-edge: {sourcename: "n76" targetname: "n77" label: "0" color: red}
-node: {title: "n75" label: "End  75" color: blue}
+graph: { title: "n76" label: "76" status:clustered color:yellow
+edge: {sourcename: "n76 " targetname: "n77" label: "0" color: red}
+node: {title: "n75" label: "End  75" color: blue info1: "visited: 15
+"}
 }
 
-graph: { title: "n78"  label: "78" status:clustered color:yellow
-edge: {sourcename: "n78" targetname: "n79" label: "0" color: red}
-node: {title: "n77" label: "Return  77" }
-edge: {sourcename: "n77" targetname: "n113" label: "0" color: blue}
-edge: {sourcename: "n77" targetname: "n111" label: "1" }
-node: {title: "n111" label: "ProjIu 2 111" color: yellow}
-edge: {sourcename: "n111" targetname: "n112" label: "0" }
-node: {title: "n112" label: "Load  112" }
-edge: {sourcename: "n112" targetname: "n95" label: "0" color: blue}
-edge: {sourcename: "n112" targetname: "n87" label: "1" }
-node: {title: "n113" label: "ProjM 0 113" color: yellow}
-edge: {sourcename: "n113" targetname: "n112" label: "0" color: blue}
+graph: { title: "n78" label: "78" status:clustered color:yellow
+edge: {sourcename: "n78 " targetname: "n79" label: "0" color: red}
+node: {title: "n77" label: "Return  77"  info1: "visited: 16
+"}
+edge: {sourcename: "n77 " targetname: "n113" label: "0" color: blue}
+edge: {sourcename: "n77 " targetname: "n111" label: "1" }
+node: {title: "n111" label: "ProjIu 2 111" color: yellow info1: "visited: 16
+"}
+edge: {sourcename: "n111 " targetname: "n112" label: "0" }
+node: {title: "n112" label: "Load  112"  info1: "visited: 16
+"}
+edge: {sourcename: "n112 " targetname: "n95" label: "0" color: blue}
+edge: {sourcename: "n112 " targetname: "n87" label: "1" }
+node: {title: "n113" label: "ProjM 0 113" color: yellow info1: "visited: 16
+"}
+edge: {sourcename: "n113 " targetname: "n112" label: "0" color: blue}
 }
 
-graph: { title: "n80"  label: "80" status:clustered color:yellow
-edge: {sourcename: "n80" targetname: "n110" label: "0" color: red}
-edge: {sourcename: "n80" targetname: "n81" label: "1" color: red}
-node: {title: "n79" label: "ProjX 1 79" color: yellow}
-edge: {sourcename: "n79" targetname: "n82" label: "0" color: red}
-node: {title: "n81" label: "ProjX 0 81" color: yellow}
-edge: {sourcename: "n81" targetname: "n82" label: "0" color: red}
-node: {title: "n82" label: "Cond  82" }
-edge: {sourcename: "n82" targetname: "n83" label: "0" }
-node: {title: "n83" label: "Projb Gt 83" color: yellow}
-edge: {sourcename: "n83" targetname: "n84" label: "0" }
-node: {title: "n84" label: "CmpT  84" }
-edge: {sourcename: "n84" targetname: "n109" label: "0" }
-edge: {sourcename: "n84" targetname: "n85" label: "1" }
-node: {title: "n85" label: "ProjIu 2 85" color: yellow}
-edge: {sourcename: "n85" targetname: "n86" label: "0" }
-node: {title: "n86" label: "Load  86" }
-edge: {sourcename: "n86" targetname: "n94" label: "0" color: blue}
-edge: {sourcename: "n86" targetname: "n87" label: "1" }
-node: {title: "n94" label: "PhiM  94" color: green}
-edge: {sourcename: "n94" targetname: "n104" label: "0" color: blue}
-edge: {sourcename: "n94" targetname: "n95" label: "1" color: blue}
-node: {title: "n95" label: "ProjM 0 95" color: yellow}
-edge: {sourcename: "n95" targetname: "n96" label: "0" color: blue}
-node: {title: "n96" label: "Store  96" }
-edge: {sourcename: "n96" targetname: "n98" label: "0" color: blue}
-edge: {sourcename: "n96" targetname: "n97" label: "1" }
-edge: {sourcename: "n96" targetname: "n85" label: "2" }
-node: {title: "n98" label: "ProjM 0 98" color: yellow}
-edge: {sourcename: "n98" targetname: "n99" label: "0" color: blue}
-node: {title: "n99" label: "Store  99" }
-edge: {sourcename: "n99" targetname: "n103" label: "0" color: blue}
-edge: {sourcename: "n99" targetname: "n87" label: "1" }
-edge: {sourcename: "n99" targetname: "n100" label: "2" }
-node: {title: "n100" label: "ProjIu 2 100" color: yellow}
-edge: {sourcename: "n100" targetname: "n101" label: "0" }
-node: {title: "n101" label: "Load  101" }
-edge: {sourcename: "n101" targetname: "n102" label: "0" color: blue}
-edge: {sourcename: "n101" targetname: "n97" label: "1" }
-node: {title: "n102" label: "ProjM 0 102" color: yellow}
-edge: {sourcename: "n102" targetname: "n86" label: "0" color: blue}
-node: {title: "n103" label: "ProjM 0 103" color: yellow}
-edge: {sourcename: "n103" targetname: "n101" label: "0" color: blue}
+graph: { title: "n80" label: "80" status:clustered color:yellow
+edge: {sourcename: "n80 " targetname: "n110" label: "0" color: red}
+edge: {sourcename: "n80 " targetname: "n81" label: "1" color: red}
+node: {title: "n79" label: "ProjX 1 79" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n79 " targetname: "n82" label: "0" color: red}
+node: {title: "n81" label: "ProjX 0 81" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n81 " targetname: "n82" label: "0" color: red}
+node: {title: "n82" label: "Cond  82"  info1: "visited: 17
+"}
+edge: {sourcename: "n82 " targetname: "n83" label: "0" }
+node: {title: "n83" label: "Projb Gt 83" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n83 " targetname: "n84" label: "0" }
+node: {title: "n84" label: "CmpT  84"  info1: "visited: 17
+"}
+edge: {sourcename: "n84 " targetname: "n109" label: "0" }
+edge: {sourcename: "n84 " targetname: "n85" label: "1" }
+node: {title: "n85" label: "ProjIu 2 85" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n85 " targetname: "n86" label: "0" }
+node: {title: "n86" label: "Load  86"  info1: "visited: 17
+"}
+edge: {sourcename: "n86 " targetname: "n94" label: "0" color: blue}
+edge: {sourcename: "n86 " targetname: "n87" label: "1" }
+node: {title: "n94" label: "PhiM  94" color: green info1: "visited: 17
+"}
+edge: {sourcename: "n94 " targetname: "n104" label: "0" color: blue}
+edge: {sourcename: "n94 " targetname: "n95" label: "1" color: blue}
+node: {title: "n95" label: "ProjM 0 95" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n95 " targetname: "n96" label: "0" color: blue}
+node: {title: "n96" label: "Store  96"  info1: "visited: 17
+"}
+edge: {sourcename: "n96 " targetname: "n98" label: "0" color: blue}
+edge: {sourcename: "n96 " targetname: "n97" label: "1" }
+edge: {sourcename: "n96 " targetname: "n85" label: "2" }
+node: {title: "n98" label: "ProjM 0 98" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n98 " targetname: "n99" label: "0" color: blue}
+node: {title: "n99" label: "Store  99"  info1: "visited: 17
+"}
+edge: {sourcename: "n99 " targetname: "n103" label: "0" color: blue}
+edge: {sourcename: "n99 " targetname: "n87" label: "1" }
+edge: {sourcename: "n99 " targetname: "n100" label: "2" }
+node: {title: "n100" label: "ProjIu 2 100" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n100 " targetname: "n101" label: "0" }
+node: {title: "n101" label: "Load  101"  info1: "visited: 17
+"}
+edge: {sourcename: "n101 " targetname: "n102" label: "0" color: blue}
+edge: {sourcename: "n101 " targetname: "n97" label: "1" }
+node: {title: "n102" label: "ProjM 0 102" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n102 " targetname: "n86" label: "0" color: blue}
+node: {title: "n103" label: "ProjM 0 103" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n103 " targetname: "n101" label: "0" color: blue}
 }
 
-graph: { title: "n88"  label: "88" status:clustered color:yellow
-edge: {sourcename: "n88" targetname: "n89" label: "0" color: red}
-node: {title: "n87" label: "Sel VAR_A 87" }
-edge: {sourcename: "n87" targetname: "n93" label: "0" color: blue}
-edge: {sourcename: "n87" targetname: "n92" label: "1" }
-node: {title: "n97" label: "Sel VAR_B 97" }
-edge: {sourcename: "n97" targetname: "n93" label: "0" color: blue}
-edge: {sourcename: "n97" targetname: "n92" label: "1" }
-node: {title: "n104" label: "ProjM 0 104" color: yellow}
-edge: {sourcename: "n104" targetname: "n105" label: "0" color: blue}
-node: {title: "n105" label: "Store  105" }
-edge: {sourcename: "n105" targetname: "n107" label: "0" color: blue}
-edge: {sourcename: "n105" targetname: "n97" label: "1" }
-edge: {sourcename: "n105" targetname: "n106" label: "2" }
-node: {title: "n107" label: "ProjM 0 107" color: yellow}
-edge: {sourcename: "n107" targetname: "n108" label: "0" color: blue}
-node: {title: "n108" label: "Store  108" }
-edge: {sourcename: "n108" targetname: "n93" label: "0" color: blue}
-edge: {sourcename: "n108" targetname: "n87" label: "1" }
-edge: {sourcename: "n108" targetname: "n109" label: "2" }
-node: {title: "n110" label: "Jmp  110" }
+graph: { title: "n88" label: "88" status:clustered color:yellow
+edge: {sourcename: "n88 " targetname: "n89" label: "0" color: red}
+node: {title: "n87" label: "Sel VAR_A 87"  info1: "visited: 18
+"}
+edge: {sourcename: "n87 " targetname: "n93" label: "0" color: blue}
+edge: {sourcename: "n87 " targetname: "n92" label: "1" }
+node: {title: "n97" label: "Sel VAR_B 97"  info1: "visited: 18
+"}
+edge: {sourcename: "n97 " targetname: "n93" label: "0" color: blue}
+edge: {sourcename: "n97 " targetname: "n92" label: "1" }
+node: {title: "n104" label: "ProjM 0 104" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n104 " targetname: "n105" label: "0" color: blue}
+node: {title: "n105" label: "Store  105"  info1: "visited: 18
+"}
+edge: {sourcename: "n105 " targetname: "n107" label: "0" color: blue}
+edge: {sourcename: "n105 " targetname: "n97" label: "1" }
+edge: {sourcename: "n105 " targetname: "n106" label: "2" }
+node: {title: "n107" label: "ProjM 0 107" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n107 " targetname: "n108" label: "0" color: blue}
+node: {title: "n108" label: "Store  108"  info1: "visited: 18
+"}
+edge: {sourcename: "n108 " targetname: "n93" label: "0" color: blue}
+edge: {sourcename: "n108 " targetname: "n87" label: "1" }
+edge: {sourcename: "n108 " targetname: "n109" label: "2" }
+node: {title: "n110" label: "Jmp  110"  info1: "visited: 18
+"}
 }
 
-graph: { title: "n90"  label: "90" status:clustered color:yellow
-edge: {sourcename: "n90" targetname: "n89" label: "0" color: red}
-node: {title: "n89" label: "ProjX 0 89" color: yellow}
-edge: {sourcename: "n89" targetname: "n91" label: "0" color: red}
-node: {title: "n91" label: "Start  91" color: blue}
-node: {title: "n92" label: "ProjP 3 92" color: yellow}
-edge: {sourcename: "n92" targetname: "n91" label: "0" }
-node: {title: "n93" label: "ProjM 1 93" color: yellow}
-edge: {sourcename: "n93" targetname: "n91" label: "0" color: blue}
-node: {title: "n106" label: "0x1Iu  106" color: yellow}
-node: {title: "n109" label: "0x0Iu  109" color: yellow}
+graph: { title: "n90" label: "90" status:clustered color:yellow
+edge: {sourcename: "n90 " targetname: "n89" label: "0" color: red}
+node: {title: "n89" label: "ProjX 0 89" color: yellow info1: "visited: 19
+"}
+edge: {sourcename: "n89 " targetname: "n91" label: "0" color: red}
+node: {title: "n91" label: "Start  91" color: blue info1: "visited: 19
+"}
+node: {title: "n92" label: "ProjP 3 92" color: yellow info1: "visited: 19
+"}
+edge: {sourcename: "n92 " targetname: "n91" label: "0" }
+node: {title: "n93" label: "ProjM 1 93" color: yellow info1: "visited: 19
+"}
+edge: {sourcename: "n93 " targetname: "n91" label: "0" color: blue}
+node: {title: "n106" label: "0x1Iu  106" color: yellow info1: "visited: 19
+"}
+node: {title: "n109" label: "0x0Iu  109" color: yellow info1: "visited: 19
+"}
 }
 
-node: {title: "n116" label: "Bad  116" }
+node: {title: "n116" label: "Bad  116"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg
index 13130db..adc5b51 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg
@@ -7,69 +7,92 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n193"  label: "193" status:clustered color:yellow
-node: {title: "n192" label: "End  192" color: blue}
+graph: { title: "n193" label: "193" status:clustered color:yellow
+node: {title: "n192" label: "End  192" color: blue info1: "visited: 26
+"}
 }
 
-graph: { title: "n198"  label: "198" status:clustered color:yellow
-edge: {sourcename: "n198" targetname: "n200" label: "0" color: red}
-edge: {sourcename: "n198" targetname: "n199" label: "1" color: red}
-node: {title: "n202" label: "PhiM  202" color: green}
-edge: {sourcename: "n202" targetname: "n213" label: "0" color: blue}
-edge: {sourcename: "n202" targetname: "n203" label: "1" color: blue}
-node: {title: "n199" label: "Jmp  199" }
-node: {title: "n203" label: "Store  203" }
-edge: {sourcename: "n203" targetname: "n202" label: "0" color: blue}
-edge: {sourcename: "n203" targetname: "n208" label: "1" }
-edge: {sourcename: "n203" targetname: "n204" label: "2" }
-node: {title: "n204" label: "PhiIs  204" color: green}
-edge: {sourcename: "n204" targetname: "n207" label: "0" }
-edge: {sourcename: "n204" targetname: "n205" label: "1" }
-node: {title: "n205" label: "PhiIs  205" color: green}
-edge: {sourcename: "n205" targetname: "n206" label: "0" }
-edge: {sourcename: "n205" targetname: "n204" label: "1" }
-node: {title: "n208" label: "Sel a 208" }
-edge: {sourcename: "n208" targetname: "n202" label: "0" color: blue}
-edge: {sourcename: "n208" targetname: "n209" label: "1" }
+graph: { title: "n198" label: "198" status:clustered color:yellow
+edge: {sourcename: "n198 " targetname: "n200" label: "0" color: red}
+edge: {sourcename: "n198 " targetname: "n199" label: "1" color: red}
+node: {title: "n202" label: "PhiM  202" color: green info1: "visited: 27
+"}
+edge: {sourcename: "n202 " targetname: "n213" label: "0" color: blue}
+edge: {sourcename: "n202 " targetname: "n203" label: "1" color: blue}
+node: {title: "n199" label: "Jmp  199"  info1: "visited: 27
+"}
+node: {title: "n203" label: "Store  203"  info1: "visited: 27
+"}
+edge: {sourcename: "n203 " targetname: "n202" label: "0" color: blue}
+edge: {sourcename: "n203 " targetname: "n208" label: "1" }
+edge: {sourcename: "n203 " targetname: "n204" label: "2" }
+node: {title: "n204" label: "PhiIs  204" color: green info1: "visited: 27
+"}
+edge: {sourcename: "n204 " targetname: "n207" label: "0" }
+edge: {sourcename: "n204 " targetname: "n205" label: "1" }
+node: {title: "n205" label: "PhiIs  205" color: green info1: "visited: 27
+"}
+edge: {sourcename: "n205 " targetname: "n206" label: "0" }
+edge: {sourcename: "n205 " targetname: "n204" label: "1" }
+node: {title: "n208" label: "Sel a 208"  info1: "visited: 27
+"}
+edge: {sourcename: "n208 " targetname: "n202" label: "0" color: blue}
+edge: {sourcename: "n208 " targetname: "n209" label: "1" }
 }
 
-graph: { title: "n201"  label: "201" status:clustered color:yellow
-edge: {sourcename: "n201" targetname: "n196" label: "0" color: red}
-node: {title: "n200" label: "Jmp  200" }
-node: {title: "n206" label: "0x0Is  206" color: yellow}
-node: {title: "n209" label: "ProjP 2 209" color: yellow}
-edge: {sourcename: "n209" targetname: "n210" label: "0" }
-node: {title: "n210" label: "Alloc  210" }
-edge: {sourcename: "n210" targetname: "n212" label: "0" color: blue}
-edge: {sourcename: "n210" targetname: "n211" label: "1" }
-node: {title: "n213" label: "ProjM 0 213" color: yellow}
-edge: {sourcename: "n213" targetname: "n214" label: "0" color: blue}
-node: {title: "n214" label: "Store  214" }
-edge: {sourcename: "n214" targetname: "n217" label: "0" color: blue}
-edge: {sourcename: "n214" targetname: "n216" label: "1" }
-edge: {sourcename: "n214" targetname: "n215" label: "2" }
-node: {title: "n216" label: "Sel a 216" }
-edge: {sourcename: "n216" targetname: "n217" label: "0" color: blue}
-edge: {sourcename: "n216" targetname: "n209" label: "1" }
-node: {title: "n217" label: "ProjM 0 217" color: yellow}
-edge: {sourcename: "n217" targetname: "n210" label: "0" color: blue}
+graph: { title: "n201" label: "201" status:clustered color:yellow
+edge: {sourcename: "n201 " targetname: "n196" label: "0" color: red}
+node: {title: "n200" label: "Jmp  200"  info1: "visited: 28
+"}
+node: {title: "n206" label: "0x0Is  206" color: yellow info1: "visited: 28
+"}
+node: {title: "n209" label: "ProjP 2 209" color: yellow info1: "visited: 28
+"}
+edge: {sourcename: "n209 " targetname: "n210" label: "0" }
+node: {title: "n210" label: "Alloc  210"  info1: "visited: 28
+"}
+edge: {sourcename: "n210 " targetname: "n212" label: "0" color: blue}
+edge: {sourcename: "n210 " targetname: "n211" label: "1" }
+node: {title: "n213" label: "ProjM 0 213" color: yellow info1: "visited: 28
+"}
+edge: {sourcename: "n213 " targetname: "n214" label: "0" color: blue}
+node: {title: "n214" label: "Store  214"  info1: "visited: 28
+"}
+edge: {sourcename: "n214 " targetname: "n217" label: "0" color: blue}
+edge: {sourcename: "n214 " targetname: "n216" label: "1" }
+edge: {sourcename: "n214 " targetname: "n215" label: "2" }
+node: {title: "n216" label: "Sel a 216"  info1: "visited: 28
+"}
+edge: {sourcename: "n216 " targetname: "n217" label: "0" color: blue}
+edge: {sourcename: "n216 " targetname: "n209" label: "1" }
+node: {title: "n217" label: "ProjM 0 217" color: yellow info1: "visited: 28
+"}
+edge: {sourcename: "n217 " targetname: "n210" label: "0" color: blue}
 }
 
-graph: { title: "n195"  label: "195" status:clustered color:yellow
-edge: {sourcename: "n195" targetname: "n196" label: "0" color: red}
-node: {title: "n196" label: "ProjX 0 196" color: yellow}
-edge: {sourcename: "n196" targetname: "n197" label: "0" color: red}
-node: {title: "n197" label: "Start  197" color: blue}
-node: {title: "n207" label: "0x5Is  207" color: yellow}
-node: {title: "n211" label: "SymC PRIMA size  211" }
-node: {title: "n212" label: "ProjM 1 212" color: yellow}
-edge: {sourcename: "n212" targetname: "n197" label: "0" color: blue}
-node: {title: "n215" label: "0x2Is  215" color: yellow}
+graph: { title: "n195" label: "195" status:clustered color:yellow
+edge: {sourcename: "n195 " targetname: "n196" label: "0" color: red}
+node: {title: "n196" label: "ProjX 0 196" color: yellow info1: "visited: 29
+"}
+edge: {sourcename: "n196 " targetname: "n197" label: "0" color: red}
+node: {title: "n197" label: "Start  197" color: blue info1: "visited: 29
+"}
+node: {title: "n207" label: "0x5Is  207" color: yellow info1: "visited: 29
+"}
+node: {title: "n211" label: "SymC PRIMA size  211"  info1: "visited: 29
+"}
+node: {title: "n212" label: "ProjM 1 212" color: yellow info1: "visited: 29
+"}
+edge: {sourcename: "n212 " targetname: "n197" label: "0" color: blue}
+node: {title: "n215" label: "0x2Is  215" color: yellow info1: "visited: 29
+"}
 }
 
-node: {title: "n194" label: "Bad  194" }
+node: {title: "n194" label: "Bad  194"  info1: "visited: 0
+"}
 node: {title: "e13" label: "ent a" color: yellow
- info1:"
+ info1: "
+id: e13
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -87,7 +110,8 @@ edge: { sourcename: "t11" targetname: "e13"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e16"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e16" label: "ent set_a" color: yellow
- info1:"
+ info1: "
+id: e16
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -100,7 +124,8 @@ irg = g69"
 }
 edge: { sourcename: "e16" targetname: "t14"class: 3 label: "type" color: red}
 edge: { sourcename: "e16" targetname: "n15"label: "value 0"}
-node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow}
+node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow info1: "visited: 1
+"}
 node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
@@ -117,7 +142,8 @@ mode: Is,
 size: 4B,
 "}
 node: {title: "e19" label: "ent c" color: yellow
- info1:"
+ info1: "
+id: e19
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -130,7 +156,8 @@ irg = g92"
 }
 edge: { sourcename: "e19" targetname: "t17"class: 3 label: "type" color: red}
 edge: { sourcename: "e19" targetname: "n18"label: "value 0"}
-node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow}
+node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow info1: "visited: 1
+"}
 node: {title: "t17" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
@@ -139,7 +166,8 @@ edge: { sourcename: "t17" targetname: "t12"class: 5 label: "param 0" color: gree
 edge: { sourcename: "t17" targetname: "t10"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t17" targetname: "t10"class: 6 label: "res 0" color: green}
 node: {title: "e22" label: "ent OO_INLINE_EXAMPLE_main" color: yellow
- info1:"
+ info1: "
+id: e22
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -152,7 +180,8 @@ irg = g35"
 }
 edge: { sourcename: "e22" targetname: "t20"class: 3 label: "type" color: red}
 edge: { sourcename: "e22" targetname: "n21"label: "value 0"}
-node: {title: "n21" label: "&(GlobalType_OO_INLINE_EXAMPLE_main)P  21" color: yellow}
+node: {title: "n21" label: "&(GlobalType_OO_INLINE_EXAMPLE_main)P  21" color: yellow info1: "visited: 1
+"}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1B,
 " color: green}

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
index eaf4655..80bd032 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
@@ -7,65 +7,87 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n193"  label: "193" status:clustered color:yellow
-node: {title: "n192" label: "End  192" color: blue}
+graph: { title: "n193" label: "193" status:clustered color:yellow
+node: {title: "n192" label: "End  192" color: blue info1: "visited: 21
+"}
 }
 
-graph: { title: "n198"  label: "198" status:clustered color:yellow
-edge: {sourcename: "n198" targetname: "n200" label: "0" color: red}
-edge: {sourcename: "n198" targetname: "n199" label: "1" color: red}
-node: {title: "n202" label: "PhiM  202" color: green}
-edge: {sourcename: "n202" targetname: "n213" label: "0" color: blue}
-edge: {sourcename: "n202" targetname: "n203" label: "1" color: blue}
-node: {title: "n199" label: "Jmp  199" }
-node: {title: "n203" label: "Store  203" }
-edge: {sourcename: "n203" targetname: "n202" label: "0" color: blue}
-edge: {sourcename: "n203" targetname: "n208" label: "1" }
-edge: {sourcename: "n203" targetname: "n204" label: "2" }
-node: {title: "n204" label: "PhiIs  204" color: green}
-edge: {sourcename: "n204" targetname: "n207" label: "0" }
-edge: {sourcename: "n204" targetname: "n205" label: "1" }
-node: {title: "n205" label: "PhiIs  205" color: green}
-edge: {sourcename: "n205" targetname: "n206" label: "0" }
-edge: {sourcename: "n205" targetname: "n204" label: "1" }
-node: {title: "n208" label: "Sel a 208" }
-edge: {sourcename: "n208" targetname: "n202" label: "0" color: blue}
-edge: {sourcename: "n208" targetname: "n209" label: "1" }
+graph: { title: "n198" label: "198" status:clustered color:yellow
+edge: {sourcename: "n198 " targetname: "n200" label: "0" color: red}
+edge: {sourcename: "n198 " targetname: "n199" label: "1" color: red}
+node: {title: "n202" label: "PhiM  202" color: green info1: "visited: 22
+"}
+edge: {sourcename: "n202 " targetname: "n213" label: "0" color: blue}
+edge: {sourcename: "n202 " targetname: "n203" label: "1" color: blue}
+node: {title: "n199" label: "Jmp  199"  info1: "visited: 22
+"}
+node: {title: "n203" label: "Store  203"  info1: "visited: 22
+"}
+edge: {sourcename: "n203 " targetname: "n202" label: "0" color: blue}
+edge: {sourcename: "n203 " targetname: "n208" label: "1" }
+edge: {sourcename: "n203 " targetname: "n204" label: "2" }
+node: {title: "n204" label: "PhiIs  204" color: green info1: "visited: 22
+"}
+edge: {sourcename: "n204 " targetname: "n207" label: "0" }
+edge: {sourcename: "n204 " targetname: "n205" label: "1" }
+node: {title: "n205" label: "PhiIs  205" color: green info1: "visited: 22
+"}
+edge: {sourcename: "n205 " targetname: "n206" label: "0" }
+edge: {sourcename: "n205 " targetname: "n204" label: "1" }
+node: {title: "n208" label: "Sel a 208"  info1: "visited: 22
+"}
+edge: {sourcename: "n208 " targetname: "n202" label: "0" color: blue}
+edge: {sourcename: "n208 " targetname: "n209" label: "1" }
 }
 
-graph: { title: "n201"  label: "201" status:clustered color:yellow
-edge: {sourcename: "n201" targetname: "n196" label: "0" color: red}
-node: {title: "n200" label: "Jmp  200" }
-node: {title: "n206" label: "0x0Is  206" color: yellow}
-node: {title: "n209" label: "ProjP 2 209" color: yellow}
-edge: {sourcename: "n209" targetname: "n210" label: "0" }
-node: {title: "n210" label: "Alloc  210" }
-edge: {sourcename: "n210" targetname: "n212" label: "0" color: blue}
-edge: {sourcename: "n210" targetname: "n211" label: "1" }
-node: {title: "n213" label: "ProjM 0 213" color: yellow}
-edge: {sourcename: "n213" targetname: "n214" label: "0" color: blue}
-node: {title: "n214" label: "Store  214" }
-edge: {sourcename: "n214" targetname: "n217" label: "0" color: blue}
-edge: {sourcename: "n214" targetname: "n216" label: "1" }
-edge: {sourcename: "n214" targetname: "n215" label: "2" }
-node: {title: "n216" label: "Sel a 216" }
-edge: {sourcename: "n216" targetname: "n217" label: "0" color: blue}
-edge: {sourcename: "n216" targetname: "n209" label: "1" }
-node: {title: "n217" label: "ProjM 0 217" color: yellow}
-edge: {sourcename: "n217" targetname: "n210" label: "0" color: blue}
+graph: { title: "n201" label: "201" status:clustered color:yellow
+edge: {sourcename: "n201 " targetname: "n196" label: "0" color: red}
+node: {title: "n200" label: "Jmp  200"  info1: "visited: 23
+"}
+node: {title: "n206" label: "0x0Is  206" color: yellow info1: "visited: 23
+"}
+node: {title: "n209" label: "ProjP 2 209" color: yellow info1: "visited: 23
+"}
+edge: {sourcename: "n209 " targetname: "n210" label: "0" }
+node: {title: "n210" label: "Alloc  210"  info1: "visited: 23
+"}
+edge: {sourcename: "n210 " targetname: "n212" label: "0" color: blue}
+edge: {sourcename: "n210 " targetname: "n211" label: "1" }
+node: {title: "n213" label: "ProjM 0 213" color: yellow info1: "visited: 23
+"}
+edge: {sourcename: "n213 " targetname: "n214" label: "0" color: blue}
+node: {title: "n214" label: "Store  214"  info1: "visited: 23
+"}
+edge: {sourcename: "n214 " targetname: "n217" label: "0" color: blue}
+edge: {sourcename: "n214 " targetname: "n216" label: "1" }
+edge: {sourcename: "n214 " targetname: "n215" label: "2" }
+node: {title: "n216" label: "Sel a 216"  info1: "visited: 23
+"}
+edge: {sourcename: "n216 " targetname: "n217" label: "0" color: blue}
+edge: {sourcename: "n216 " targetname: "n209" label: "1" }
+node: {title: "n217" label: "ProjM 0 217" color: yellow info1: "visited: 23
+"}
+edge: {sourcename: "n217 " targetname: "n210" label: "0" color: blue}
 }
 
-graph: { title: "n195"  label: "195" status:clustered color:yellow
-edge: {sourcename: "n195" targetname: "n196" label: "0" color: red}
-node: {title: "n196" label: "ProjX 0 196" color: yellow}
-edge: {sourcename: "n196" targetname: "n197" label: "0" color: red}
-node: {title: "n197" label: "Start  197" color: blue}
-node: {title: "n207" label: "0x5Is  207" color: yellow}
-node: {title: "n211" label: "SymC PRIMA size  211" }
-node: {title: "n212" label: "ProjM 1 212" color: yellow}
-edge: {sourcename: "n212" targetname: "n197" label: "0" color: blue}
-node: {title: "n215" label: "0x2Is  215" color: yellow}
+graph: { title: "n195" label: "195" status:clustered color:yellow
+edge: {sourcename: "n195 " targetname: "n196" label: "0" color: red}
+node: {title: "n196" label: "ProjX 0 196" color: yellow info1: "visited: 24
+"}
+edge: {sourcename: "n196 " targetname: "n197" label: "0" color: red}
+node: {title: "n197" label: "Start  197" color: blue info1: "visited: 24
+"}
+node: {title: "n207" label: "0x5Is  207" color: yellow info1: "visited: 24
+"}
+node: {title: "n211" label: "SymC PRIMA size  211"  info1: "visited: 24
+"}
+node: {title: "n212" label: "ProjM 1 212" color: yellow info1: "visited: 24
+"}
+edge: {sourcename: "n212 " targetname: "n197" label: "0" color: blue}
+node: {title: "n215" label: "0x2Is  215" color: yellow info1: "visited: 24
+"}
 }
 
-node: {title: "n194" label: "Bad  194" }
+node: {title: "n194" label: "Bad  194"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg
index 9f93f4f..c4f3cee 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg
@@ -7,62 +7,82 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n106"  label: "106" status:clustered color:yellow
-edge: {sourcename: "n106" targetname: "n107" label: "0" color: red}
-node: {title: "n105" label: "End  105" color: blue}
+graph: { title: "n106" label: "106" status:clustered color:yellow
+edge: {sourcename: "n106 " targetname: "n107" label: "0" color: red}
+node: {title: "n105" label: "End  105" color: blue info1: "visited: 19
+"}
 }
 
-graph: { title: "n108"  label: "108" status:clustered color:yellow
-edge: {sourcename: "n108" targetname: "n109" label: "0" color: red}
-node: {title: "n107" label: "Return  107" }
-edge: {sourcename: "n107" targetname: "n126" label: "0" color: blue}
-edge: {sourcename: "n107" targetname: "n112" label: "1" }
-node: {title: "n112" label: "ProjIs 0 112" color: yellow}
-edge: {sourcename: "n112" targetname: "n113" label: "0" }
-node: {title: "n113" label: "ProjT 2 113" color: yellow}
-edge: {sourcename: "n113" targetname: "n114" label: "0" }
-node: {title: "n114" label: "Call  114" }
-edge: {sourcename: "n114" targetname: "n121" label: "0" color: blue}
-edge: {sourcename: "n114" targetname: "n120" label: "1" }
-edge: {sourcename: "n114" targetname: "n116" label: "2" }
-edge: {sourcename: "n114" targetname: "n115" label: "3" }
-node: {title: "n116" label: "ProjP 2 116" color: yellow}
-edge: {sourcename: "n116" targetname: "n117" label: "0" }
-node: {title: "n117" label: "Alloc  117" }
-edge: {sourcename: "n117" targetname: "n119" label: "0" color: blue}
-edge: {sourcename: "n117" targetname: "n118" label: "1" }
-node: {title: "n120" label: "Sel c 120" }
-edge: {sourcename: "n120" targetname: "n121" label: "0" color: blue}
-edge: {sourcename: "n120" targetname: "n116" label: "1" }
-node: {title: "n121" label: "ProjM 0 121" color: yellow}
-edge: {sourcename: "n121" targetname: "n122" label: "0" color: blue}
-node: {title: "n122" label: "Call  122" }
-edge: {sourcename: "n122" targetname: "n125" label: "0" color: blue}
-edge: {sourcename: "n122" targetname: "n124" label: "1" }
-edge: {sourcename: "n122" targetname: "n116" label: "2" }
-edge: {sourcename: "n122" targetname: "n123" label: "3" }
-node: {title: "n124" label: "Sel set_a 124" }
-edge: {sourcename: "n124" targetname: "n125" label: "0" color: blue}
-edge: {sourcename: "n124" targetname: "n116" label: "1" }
-node: {title: "n125" label: "ProjM 0 125" color: yellow}
-edge: {sourcename: "n125" targetname: "n117" label: "0" color: blue}
-node: {title: "n126" label: "ProjM 0 126" color: yellow}
-edge: {sourcename: "n126" targetname: "n114" label: "0" color: blue}
+graph: { title: "n108" label: "108" status:clustered color:yellow
+edge: {sourcename: "n108 " targetname: "n109" label: "0" color: red}
+node: {title: "n107" label: "Return  107"  info1: "visited: 20
+"}
+edge: {sourcename: "n107 " targetname: "n126" label: "0" color: blue}
+edge: {sourcename: "n107 " targetname: "n112" label: "1" }
+node: {title: "n112" label: "ProjIs 0 112" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n112 " targetname: "n113" label: "0" }
+node: {title: "n113" label: "ProjT 2 113" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n113 " targetname: "n114" label: "0" }
+node: {title: "n114" label: "Call  114"  info1: "visited: 20
+"}
+edge: {sourcename: "n114 " targetname: "n121" label: "0" color: blue}
+edge: {sourcename: "n114 " targetname: "n120" label: "1" }
+edge: {sourcename: "n114 " targetname: "n116" label: "2" }
+edge: {sourcename: "n114 " targetname: "n115" label: "3" }
+node: {title: "n116" label: "ProjP 2 116" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n116 " targetname: "n117" label: "0" }
+node: {title: "n117" label: "Alloc  117"  info1: "visited: 20
+"}
+edge: {sourcename: "n117 " targetname: "n119" label: "0" color: blue}
+edge: {sourcename: "n117 " targetname: "n118" label: "1" }
+node: {title: "n120" label: "Sel c 120"  info1: "visited: 20
+"}
+edge: {sourcename: "n120 " targetname: "n121" label: "0" color: blue}
+edge: {sourcename: "n120 " targetname: "n116" label: "1" }
+node: {title: "n121" label: "ProjM 0 121" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n121 " targetname: "n122" label: "0" color: blue}
+node: {title: "n122" label: "Call  122"  info1: "visited: 20
+"}
+edge: {sourcename: "n122 " targetname: "n125" label: "0" color: blue}
+edge: {sourcename: "n122 " targetname: "n124" label: "1" }
+edge: {sourcename: "n122 " targetname: "n116" label: "2" }
+edge: {sourcename: "n122 " targetname: "n123" label: "3" }
+node: {title: "n124" label: "Sel set_a 124"  info1: "visited: 20
+"}
+edge: {sourcename: "n124 " targetname: "n125" label: "0" color: blue}
+edge: {sourcename: "n124 " targetname: "n116" label: "1" }
+node: {title: "n125" label: "ProjM 0 125" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n125 " targetname: "n117" label: "0" color: blue}
+node: {title: "n126" label: "ProjM 0 126" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n126 " targetname: "n114" label: "0" color: blue}
 }
 
-graph: { title: "n110"  label: "110" status:clustered color:yellow
-edge: {sourcename: "n110" targetname: "n109" label: "0" color: red}
-node: {title: "n109" label: "ProjX 0 109" color: yellow}
-edge: {sourcename: "n109" targetname: "n111" label: "0" color: red}
-node: {title: "n111" label: "Start  111" color: blue}
-node: {title: "n115" label: "0x5Is  115" color: yellow}
-node: {title: "n118" label: "SymC PRIMA size  118" }
-node: {title: "n119" label: "ProjM 1 119" color: yellow}
-edge: {sourcename: "n119" targetname: "n111" label: "0" color: blue}
-node: {title: "n123" label: "0x2Is  123" color: yellow}
+graph: { title: "n110" label: "110" status:clustered color:yellow
+edge: {sourcename: "n110 " targetname: "n109" label: "0" color: red}
+node: {title: "n109" label: "ProjX 0 109" color: yellow info1: "visited: 21
+"}
+edge: {sourcename: "n109 " targetname: "n111" label: "0" color: red}
+node: {title: "n111" label: "Start  111" color: blue info1: "visited: 21
+"}
+node: {title: "n115" label: "0x5Is  115" color: yellow info1: "visited: 21
+"}
+node: {title: "n118" label: "SymC PRIMA size  118"  info1: "visited: 21
+"}
+node: {title: "n119" label: "ProjM 1 119" color: yellow info1: "visited: 21
+"}
+edge: {sourcename: "n119 " targetname: "n111" label: "0" color: blue}
+node: {title: "n123" label: "0x2Is  123" color: yellow info1: "visited: 21
+"}
 }
 
-node: {title: "n130" label: "Bad  130" }
+node: {title: "n130" label: "Bad  130"  info1: "visited: 0
+"}
 node: {title: "t17" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
@@ -82,7 +102,8 @@ edge: { sourcename: "t11" targetname: "e13"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e16"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e13" label: "ent a" color: yellow
- info1:"
+ info1: "
+id: e13
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -98,7 +119,8 @@ mode: Is,
 size: 4B,
 "}
 node: {title: "e16" label: "ent set_a" color: yellow
- info1:"
+ info1: "
+id: e16
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -111,7 +133,8 @@ irg = g69"
 }
 edge: { sourcename: "e16" targetname: "t14"class: 3 label: "type" color: red}
 edge: { sourcename: "e16" targetname: "n15"label: "value 0"}
-node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow}
+node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow info1: "visited: 1
+"}
 node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
@@ -119,7 +142,8 @@ size: 4B,
 edge: { sourcename: "t14" targetname: "t12"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t14" targetname: "t10"class: 5 label: "param 1" color: green}
 node: {title: "e19" label: "ent c" color: yellow
- info1:"
+ info1: "
+id: e19
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -132,9 +156,11 @@ irg = g92"
 }
 edge: { sourcename: "e19" targetname: "t17"class: 3 label: "type" color: red}
 edge: { sourcename: "e19" targetname: "n18"label: "value 0"}
-node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow}
+node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow info1: "visited: 1
+"}
 node: {title: "e22" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
- info1:"
+ info1: "
+id: e22
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -147,7 +173,8 @@ irg = g35"
 }
 edge: { sourcename: "e22" targetname: "t20"class: 3 label: "type" color: red}
 edge: { sourcename: "e22" targetname: "n21"label: "value 0"}
-node: {title: "n21" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P  21" color: yellow}
+node: {title: "n21" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P  21" color: yellow info1: "visited: 1
+"}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1B,
 " color: green}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
index 2519115..fc7dc52 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
@@ -7,60 +7,80 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n106"  label: "106" status:clustered color:yellow
-edge: {sourcename: "n106" targetname: "n107" label: "0" color: red}
-node: {title: "n105" label: "End  105" color: blue}
+graph: { title: "n106" label: "106" status:clustered color:yellow
+edge: {sourcename: "n106 " targetname: "n107" label: "0" color: red}
+node: {title: "n105" label: "End  105" color: blue info1: "visited: 15
+"}
 }
 
-graph: { title: "n108"  label: "108" status:clustered color:yellow
-edge: {sourcename: "n108" targetname: "n109" label: "0" color: red}
-node: {title: "n107" label: "Return  107" }
-edge: {sourcename: "n107" targetname: "n126" label: "0" color: blue}
-edge: {sourcename: "n107" targetname: "n112" label: "1" }
-node: {title: "n112" label: "ProjIs 0 112" color: yellow}
-edge: {sourcename: "n112" targetname: "n113" label: "0" }
-node: {title: "n113" label: "ProjT 2 113" color: yellow}
-edge: {sourcename: "n113" targetname: "n114" label: "0" }
-node: {title: "n114" label: "Call  114" }
-edge: {sourcename: "n114" targetname: "n121" label: "0" color: blue}
-edge: {sourcename: "n114" targetname: "n120" label: "1" }
-edge: {sourcename: "n114" targetname: "n116" label: "2" }
-edge: {sourcename: "n114" targetname: "n115" label: "3" }
-node: {title: "n116" label: "ProjP 2 116" color: yellow}
-edge: {sourcename: "n116" targetname: "n117" label: "0" }
-node: {title: "n117" label: "Alloc  117" }
-edge: {sourcename: "n117" targetname: "n119" label: "0" color: blue}
-edge: {sourcename: "n117" targetname: "n118" label: "1" }
-node: {title: "n120" label: "Sel c 120" }
-edge: {sourcename: "n120" targetname: "n121" label: "0" color: blue}
-edge: {sourcename: "n120" targetname: "n116" label: "1" }
-node: {title: "n121" label: "ProjM 0 121" color: yellow}
-edge: {sourcename: "n121" targetname: "n122" label: "0" color: blue}
-node: {title: "n122" label: "Call  122" }
-edge: {sourcename: "n122" targetname: "n125" label: "0" color: blue}
-edge: {sourcename: "n122" targetname: "n124" label: "1" }
-edge: {sourcename: "n122" targetname: "n116" label: "2" }
-edge: {sourcename: "n122" targetname: "n123" label: "3" }
-node: {title: "n124" label: "Sel set_a 124" }
-edge: {sourcename: "n124" targetname: "n125" label: "0" color: blue}
-edge: {sourcename: "n124" targetname: "n116" label: "1" }
-node: {title: "n125" label: "ProjM 0 125" color: yellow}
-edge: {sourcename: "n125" targetname: "n117" label: "0" color: blue}
-node: {title: "n126" label: "ProjM 0 126" color: yellow}
-edge: {sourcename: "n126" targetname: "n114" label: "0" color: blue}
+graph: { title: "n108" label: "108" status:clustered color:yellow
+edge: {sourcename: "n108 " targetname: "n109" label: "0" color: red}
+node: {title: "n107" label: "Return  107"  info1: "visited: 16
+"}
+edge: {sourcename: "n107 " targetname: "n126" label: "0" color: blue}
+edge: {sourcename: "n107 " targetname: "n112" label: "1" }
+node: {title: "n112" label: "ProjIs 0 112" color: yellow info1: "visited: 16
+"}
+edge: {sourcename: "n112 " targetname: "n113" label: "0" }
+node: {title: "n113" label: "ProjT 2 113" color: yellow info1: "visited: 16
+"}
+edge: {sourcename: "n113 " targetname: "n114" label: "0" }
+node: {title: "n114" label: "Call  114"  info1: "visited: 16
+"}
+edge: {sourcename: "n114 " targetname: "n121" label: "0" color: blue}
+edge: {sourcename: "n114 " targetname: "n120" label: "1" }
+edge: {sourcename: "n114 " targetname: "n116" label: "2" }
+edge: {sourcename: "n114 " targetname: "n115" label: "3" }
+node: {title: "n116" label: "ProjP 2 116" color: yellow info1: "visited: 16
+"}
+edge: {sourcename: "n116 " targetname: "n117" label: "0" }
+node: {title: "n117" label: "Alloc  117"  info1: "visited: 16
+"}
+edge: {sourcename: "n117 " targetname: "n119" label: "0" color: blue}
+edge: {sourcename: "n117 " targetname: "n118" label: "1" }
+node: {title: "n120" label: "Sel c 120"  info1: "visited: 16
+"}
+edge: {sourcename: "n120 " targetname: "n121" label: "0" color: blue}
+edge: {sourcename: "n120 " targetname: "n116" label: "1" }
+node: {title: "n121" label: "ProjM 0 121" color: yellow info1: "visited: 16
+"}
+edge: {sourcename: "n121 " targetname: "n122" label: "0" color: blue}
+node: {title: "n122" label: "Call  122"  info1: "visited: 16
+"}
+edge: {sourcename: "n122 " targetname: "n125" label: "0" color: blue}
+edge: {sourcename: "n122 " targetname: "n124" label: "1" }
+edge: {sourcename: "n122 " targetname: "n116" label: "2" }
+edge: {sourcename: "n122 " targetname: "n123" label: "3" }
+node: {title: "n124" label: "Sel set_a 124"  info1: "visited: 16
+"}
+edge: {sourcename: "n124 " targetname: "n125" label: "0" color: blue}
+edge: {sourcename: "n124 " targetname: "n116" label: "1" }
+node: {title: "n125" label: "ProjM 0 125" color: yellow info1: "visited: 16
+"}
+edge: {sourcename: "n125 " targetname: "n117" label: "0" color: blue}
+node: {title: "n126" label: "ProjM 0 126" color: yellow info1: "visited: 16
+"}
+edge: {sourcename: "n126 " targetname: "n114" label: "0" color: blue}
 }
 
-graph: { title: "n110"  label: "110" status:clustered color:yellow
-edge: {sourcename: "n110" targetname: "n109" label: "0" color: red}
-node: {title: "n109" label: "ProjX 0 109" color: yellow}
-edge: {sourcename: "n109" targetname: "n111" label: "0" color: red}
-node: {title: "n111" label: "Start  111" color: blue}
-node: {title: "n115" label: "0x5Is  115" color: yellow}
-node: {title: "n118" label: "SymC PRIMA size  118" }
-node: {title: "n119" label: "ProjM 1 119" color: yellow}
-edge: {sourcename: "n119" targetname: "n111" label: "0" color: blue}
-node: {title: "n123" label: "0x2Is  123" color: yellow}
+graph: { title: "n110" label: "110" status:clustered color:yellow
+edge: {sourcename: "n110 " targetname: "n109" label: "0" color: red}
+node: {title: "n109" label: "ProjX 0 109" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n109 " targetname: "n111" label: "0" color: red}
+node: {title: "n111" label: "Start  111" color: blue info1: "visited: 17
+"}
+node: {title: "n115" label: "0x5Is  115" color: yellow info1: "visited: 17
+"}
+node: {title: "n118" label: "SymC PRIMA size  118"  info1: "visited: 17
+"}
+node: {title: "n119" label: "ProjM 1 119" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n119 " targetname: "n111" label: "0" color: blue}
+node: {title: "n123" label: "0x2Is  123" color: yellow info1: "visited: 17
+"}
 }
 
-node: {title: "n130" label: "Bad  130" }
+node: {title: "n130" label: "Bad  130"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/PRIMA_c-all.vcg b/testprograms/ref-results/PRIMA_c-all.vcg
index fae28ad..a11bcc3 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-all.vcg
+++ b/testprograms/ref-results/PRIMA_c-all.vcg
@@ -7,56 +7,73 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n241"  label: "241" status:clustered color:yellow
-node: {title: "n240" label: "End  240" color: blue}
+graph: { title: "n241" label: "241" status:clustered color:yellow
+node: {title: "n240" label: "End  240" color: blue info1: "visited: 26
+"}
 }
 
-graph: { title: "n246"  label: "246" status:clustered color:yellow
-edge: {sourcename: "n246" targetname: "n248" label: "0" color: red}
-edge: {sourcename: "n246" targetname: "n247" label: "1" color: red}
-node: {title: "n250" label: "PhiM  250" color: green}
-edge: {sourcename: "n250" targetname: "n259" label: "0" color: blue}
-edge: {sourcename: "n250" targetname: "n251" label: "1" color: blue}
-node: {title: "n247" label: "Jmp  247" }
-node: {title: "n251" label: "Store  251" }
-edge: {sourcename: "n251" targetname: "n250" label: "0" color: blue}
-edge: {sourcename: "n251" targetname: "n257" label: "1" }
-edge: {sourcename: "n251" targetname: "n252" label: "2" }
-node: {title: "n252" label: "PhiIs  252" color: green}
-edge: {sourcename: "n252" targetname: "n255" label: "0" }
-edge: {sourcename: "n252" targetname: "n253" label: "1" }
-node: {title: "n253" label: "PhiIs  253" color: green}
-edge: {sourcename: "n253" targetname: "n254" label: "0" }
-edge: {sourcename: "n253" targetname: "n252" label: "1" }
-node: {title: "n257" label: "Sel a 257" }
-edge: {sourcename: "n257" targetname: "n250" label: "0" color: blue}
-edge: {sourcename: "n257" targetname: "n258" label: "1" }
+graph: { title: "n246" label: "246" status:clustered color:yellow
+edge: {sourcename: "n246 " targetname: "n248" label: "0" color: red}
+edge: {sourcename: "n246 " targetname: "n247" label: "1" color: red}
+node: {title: "n250" label: "PhiM  250" color: green info1: "visited: 27
+"}
+edge: {sourcename: "n250 " targetname: "n259" label: "0" color: blue}
+edge: {sourcename: "n250 " targetname: "n251" label: "1" color: blue}
+node: {title: "n247" label: "Jmp  247"  info1: "visited: 27
+"}
+node: {title: "n251" label: "Store  251"  info1: "visited: 27
+"}
+edge: {sourcename: "n251 " targetname: "n250" label: "0" color: blue}
+edge: {sourcename: "n251 " targetname: "n257" label: "1" }
+edge: {sourcename: "n251 " targetname: "n252" label: "2" }
+node: {title: "n252" label: "PhiIs  252" color: green info1: "visited: 27
+"}
+edge: {sourcename: "n252 " targetname: "n255" label: "0" }
+edge: {sourcename: "n252 " targetname: "n253" label: "1" }
+node: {title: "n253" label: "PhiIs  253" color: green info1: "visited: 27
+"}
+edge: {sourcename: "n253 " targetname: "n254" label: "0" }
+edge: {sourcename: "n253 " targetname: "n252" label: "1" }
+node: {title: "n257" label: "Sel a 257"  info1: "visited: 27
+"}
+edge: {sourcename: "n257 " targetname: "n250" label: "0" color: blue}
+edge: {sourcename: "n257 " targetname: "n258" label: "1" }
 }
 
-graph: { title: "n249"  label: "249" status:clustered color:yellow
-edge: {sourcename: "n249" targetname: "n244" label: "0" color: red}
-node: {title: "n248" label: "Jmp  248" }
-node: {title: "n255" label: "ProjIs 1 255" color: yellow}
-edge: {sourcename: "n255" targetname: "n256" label: "0" }
-node: {title: "n258" label: "ProjP 0 258" color: yellow}
-edge: {sourcename: "n258" targetname: "n256" label: "0" }
+graph: { title: "n249" label: "249" status:clustered color:yellow
+edge: {sourcename: "n249 " targetname: "n244" label: "0" color: red}
+node: {title: "n248" label: "Jmp  248"  info1: "visited: 28
+"}
+node: {title: "n255" label: "ProjIs 1 255" color: yellow info1: "visited: 28
+"}
+edge: {sourcename: "n255 " targetname: "n256" label: "0" }
+node: {title: "n258" label: "ProjP 0 258" color: yellow info1: "visited: 28
+"}
+edge: {sourcename: "n258 " targetname: "n256" label: "0" }
 }
 
-graph: { title: "n243"  label: "243" status:clustered color:yellow
-edge: {sourcename: "n243" targetname: "n244" label: "0" color: red}
-node: {title: "n244" label: "ProjX 0 244" color: yellow}
-edge: {sourcename: "n244" targetname: "n245" label: "0" color: red}
-node: {title: "n245" label: "Start  245" color: blue}
-node: {title: "n254" label: "0x0Is  254" color: yellow}
-node: {title: "n256" label: "ProjT 4 256" color: yellow}
-edge: {sourcename: "n256" targetname: "n245" label: "0" }
-node: {title: "n259" label: "ProjM 1 259" color: yellow}
-edge: {sourcename: "n259" targetname: "n245" label: "0" color: blue}
+graph: { title: "n243" label: "243" status:clustered color:yellow
+edge: {sourcename: "n243 " targetname: "n244" label: "0" color: red}
+node: {title: "n244" label: "ProjX 0 244" color: yellow info1: "visited: 29
+"}
+edge: {sourcename: "n244 " targetname: "n245" label: "0" color: red}
+node: {title: "n245" label: "Start  245" color: blue info1: "visited: 29
+"}
+node: {title: "n254" label: "0x0Is  254" color: yellow info1: "visited: 29
+"}
+node: {title: "n256" label: "ProjT 4 256" color: yellow info1: "visited: 29
+"}
+edge: {sourcename: "n256 " targetname: "n245" label: "0" }
+node: {title: "n259" label: "ProjM 1 259" color: yellow info1: "visited: 29
+"}
+edge: {sourcename: "n259 " targetname: "n245" label: "0" color: blue}
 }
 
-node: {title: "n242" label: "Bad  242" }
+node: {title: "n242" label: "Bad  242"  info1: "visited: 0
+"}
 node: {title: "e13" label: "ent a" color: yellow
- info1:"
+ info1: "
+id: e13
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -74,7 +91,8 @@ edge: { sourcename: "t11" targetname: "e13"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e16"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e16" label: "ent set_a" color: yellow
- info1:"
+ info1: "
+id: e16
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -87,7 +105,8 @@ irg = g69"
 }
 edge: { sourcename: "e16" targetname: "t14"class: 3 label: "type" color: red}
 edge: { sourcename: "e16" targetname: "n15"label: "value 0"}
-node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow}
+node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow info1: "visited: 3
+"}
 node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
@@ -104,7 +123,8 @@ mode: Is,
 size: 4B,
 "}
 node: {title: "e19" label: "ent c" color: yellow
- info1:"
+ info1: "
+id: e19
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -117,7 +137,8 @@ irg = g92"
 }
 edge: { sourcename: "e19" targetname: "t17"class: 3 label: "type" color: red}
 edge: { sourcename: "e19" targetname: "n18"label: "value 0"}
-node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow}
+node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow info1: "visited: 3
+"}
 node: {title: "t17" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,

diff --git a/testprograms/ref-results/PRIMA_set_a-all.vcg b/testprograms/ref-results/PRIMA_set_a-all.vcg
index 71e9724..e0c1118 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-all.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-all.vcg
@@ -7,44 +7,57 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n223"  label: "223" status:clustered color:yellow
-edge: {sourcename: "n223" targetname: "n224" label: "0" color: red}
-node: {title: "n222" label: "End  222" color: blue}
+graph: { title: "n223" label: "223" status:clustered color:yellow
+edge: {sourcename: "n223 " targetname: "n224" label: "0" color: red}
+node: {title: "n222" label: "End  222" color: blue info1: "visited: 20
+"}
 }
 
-graph: { title: "n225"  label: "225" status:clustered color:yellow
-edge: {sourcename: "n225" targetname: "n226" label: "0" color: red}
-node: {title: "n224" label: "Return  224" }
-edge: {sourcename: "n224" targetname: "n229" label: "0" color: blue}
-node: {title: "n229" label: "ProjM 0 229" color: yellow}
-edge: {sourcename: "n229" targetname: "n230" label: "0" color: blue}
-node: {title: "n230" label: "Store  230" }
-edge: {sourcename: "n230" targetname: "n235" label: "0" color: blue}
-edge: {sourcename: "n230" targetname: "n233" label: "1" }
-edge: {sourcename: "n230" targetname: "n231" label: "2" }
-node: {title: "n231" label: "ProjIs 1 231" color: yellow}
-edge: {sourcename: "n231" targetname: "n232" label: "0" }
-node: {title: "n233" label: "Sel a 233" }
-edge: {sourcename: "n233" targetname: "n235" label: "0" color: blue}
-edge: {sourcename: "n233" targetname: "n234" label: "1" }
-node: {title: "n234" label: "ProjP 0 234" color: yellow}
-edge: {sourcename: "n234" targetname: "n232" label: "0" }
+graph: { title: "n225" label: "225" status:clustered color:yellow
+edge: {sourcename: "n225 " targetname: "n226" label: "0" color: red}
+node: {title: "n224" label: "Return  224"  info1: "visited: 21
+"}
+edge: {sourcename: "n224 " targetname: "n229" label: "0" color: blue}
+node: {title: "n229" label: "ProjM 0 229" color: yellow info1: "visited: 21
+"}
+edge: {sourcename: "n229 " targetname: "n230" label: "0" color: blue}
+node: {title: "n230" label: "Store  230"  info1: "visited: 21
+"}
+edge: {sourcename: "n230 " targetname: "n235" label: "0" color: blue}
+edge: {sourcename: "n230 " targetname: "n233" label: "1" }
+edge: {sourcename: "n230 " targetname: "n231" label: "2" }
+node: {title: "n231" label: "ProjIs 1 231" color: yellow info1: "visited: 21
+"}
+edge: {sourcename: "n231 " targetname: "n232" label: "0" }
+node: {title: "n233" label: "Sel a 233"  info1: "visited: 21
+"}
+edge: {sourcename: "n233 " targetname: "n235" label: "0" color: blue}
+edge: {sourcename: "n233 " targetname: "n234" label: "1" }
+node: {title: "n234" label: "ProjP 0 234" color: yellow info1: "visited: 21
+"}
+edge: {sourcename: "n234 " targetname: "n232" label: "0" }
 }
 
-graph: { title: "n227"  label: "227" status:clustered color:yellow
-edge: {sourcename: "n227" targetname: "n226" label: "0" color: red}
-node: {title: "n226" label: "ProjX 0 226" color: yellow}
-edge: {sourcename: "n226" targetname: "n228" label: "0" color: red}
-node: {title: "n228" label: "Start  228" color: blue}
-node: {title: "n232" label: "ProjT 4 232" color: yellow}
-edge: {sourcename: "n232" targetname: "n228" label: "0" }
-node: {title: "n235" label: "ProjM 1 235" color: yellow}
-edge: {sourcename: "n235" targetname: "n228" label: "0" color: blue}
+graph: { title: "n227" label: "227" status:clustered color:yellow
+edge: {sourcename: "n227 " targetname: "n226" label: "0" color: red}
+node: {title: "n226" label: "ProjX 0 226" color: yellow info1: "visited: 22
+"}
+edge: {sourcename: "n226 " targetname: "n228" label: "0" color: red}
+node: {title: "n228" label: "Start  228" color: blue info1: "visited: 22
+"}
+node: {title: "n232" label: "ProjT 4 232" color: yellow info1: "visited: 22
+"}
+edge: {sourcename: "n232 " targetname: "n228" label: "0" }
+node: {title: "n235" label: "ProjM 1 235" color: yellow info1: "visited: 22
+"}
+edge: {sourcename: "n235 " targetname: "n228" label: "0" color: blue}
 }
 
-node: {title: "n238" label: "Bad  238" }
+node: {title: "n238" label: "Bad  238"  info1: "visited: 0
+"}
 node: {title: "e13" label: "ent a" color: yellow
- info1:"
+ info1: "
+id: e13
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -62,7 +75,8 @@ edge: { sourcename: "t11" targetname: "e13"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e16"class: 12 label: "member" color:blue}
 edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e16" label: "ent set_a" color: yellow
- info1:"
+ info1: "
+id: e16
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -75,7 +89,8 @@ irg = g69"
 }
 edge: { sourcename: "e16" targetname: "t14"class: 3 label: "type" color: red}
 edge: { sourcename: "e16" targetname: "n15"label: "value 0"}
-node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow}
+node: {title: "n15" label: "&(PRIMA_set_a)P  15" color: yellow info1: "visited: 2
+"}
 node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
@@ -92,7 +107,8 @@ mode: Is,
 size: 4B,
 "}
 node: {title: "e19" label: "ent c" color: yellow
- info1:"
+ info1: "
+id: e19
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -105,7 +121,8 @@ irg = g92"
 }
 edge: { sourcename: "e19" targetname: "t17"class: 3 label: "type" color: red}
 edge: { sourcename: "e19" targetname: "n18"label: "value 0"}
-node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow}
+node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow info1: "visited: 2
+"}
 node: {title: "t17" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,

diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg
index 6a1dc78..0347810 100644 (file)
--- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg
+++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg
@@ -7,23 +7,24 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-node: {title:"n75" label: "Block 75" }
-edge: { sourcename: "n75" targetname: "n77" }
-node: {title:"n77" label: "Block 77" }
-edge: { sourcename: "n77" targetname: "n101" }
-edge: { sourcename: "n77" targetname: "n98" }
-edge: { sourcename: "n77" targetname: "n79" }
-node: {title:"n79" label: "Block 79" }
-edge: { sourcename: "n79" targetname: "n81" }
-node: {title:"n81" label: "Block 81" }
-edge: { sourcename: "n81" targetname: "n83" }
-node: {title:"n83" label: "Block 83" }
-edge: { sourcename: "n83" targetname: "n85" }
-node: {title:"n85" label: "Block 85" }
-edge: { sourcename: "n85" targetname: "n85" }
-node: {title:"n98" label: "Block 98" }
-edge: { sourcename: "n98" targetname: "n81" }
-node: {title:"n101" label: "Block 101" }
-edge: { sourcename: "n101" targetname: "n83" }
-node: {title: "n109" label: "Bad  109" }
+node: {title: "n75" label: "Block 75" }
+edge: { sourcename: "n75" targetname: "n77"}
+node: {title: "n77" label: "Block 77" }
+edge: { sourcename: "n77" targetname: "n101"}
+edge: { sourcename: "n77" targetname: "n98"}
+edge: { sourcename: "n77" targetname: "n79"}
+node: {title: "n79" label: "Block 79" }
+edge: { sourcename: "n79" targetname: "n81"}
+node: {title: "n81" label: "Block 81" }
+edge: { sourcename: "n81" targetname: "n83"}
+node: {title: "n83" label: "Block 83" }
+edge: { sourcename: "n83" targetname: "n85"}
+node: {title: "n85" label: "Block 85" }
+edge: { sourcename: "n85" targetname: "n85"}
+node: {title: "n98" label: "Block 98" }
+edge: { sourcename: "n98" targetname: "n81"}
+node: {title: "n101" label: "Block 101" }
+edge: { sourcename: "n101" targetname: "n83"}
+node: {title: "n109" label: "Bad  109"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg
index 5bdc182..3701141 100644 (file)
--- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg
@@ -7,85 +7,111 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n75"  label: "75" status:clustered color:yellow
-edge: {sourcename: "n75" targetname: "n76" label: "0" color: red}
-node: {title: "n74" label: "End  74" color: blue}
+graph: { title: "n75" label: "75" status:clustered color:yellow
+edge: {sourcename: "n75 " targetname: "n76" label: "0" color: red}
+node: {title: "n74" label: "End  74" color: blue info1: "visited: 8
+"}
 }
 
-graph: { title: "n77"  label: "77" status:clustered color:yellow
-edge: {sourcename: "n77" targetname: "n100" label: "0" color: red}
-edge: {sourcename: "n77" targetname: "n97" label: "1" color: red}
-edge: {sourcename: "n77" targetname: "n78" label: "2" color: red}
-node: {title: "n76" label: "Return  76" }
-edge: {sourcename: "n76" targetname: "n106" label: "0" color: blue}
-edge: {sourcename: "n76" targetname: "n103" label: "1" }
-node: {title: "n103" label: "PhiIs  103" color: green}
-edge: {sourcename: "n103" targetname: "n105" label: "0" }
-edge: {sourcename: "n103" targetname: "n104" label: "1" }
-edge: {sourcename: "n103" targetname: "n104" label: "2" }
+graph: { title: "n77" label: "77" status:clustered color:yellow
+edge: {sourcename: "n77 " targetname: "n100" label: "0" color: red}
+edge: {sourcename: "n77 " targetname: "n97" label: "1" color: red}
+edge: {sourcename: "n77 " targetname: "n78" label: "2" color: red}
+node: {title: "n76" label: "Return  76"  info1: "visited: 9
+"}
+edge: {sourcename: "n76 " targetname: "n106" label: "0" color: blue}
+edge: {sourcename: "n76 " targetname: "n103" label: "1" }
+node: {title: "n103" label: "PhiIs  103" color: green info1: "visited: 9
+"}
+edge: {sourcename: "n103 " targetname: "n105" label: "0" }
+edge: {sourcename: "n103 " targetname: "n104" label: "1" }
+edge: {sourcename: "n103 " targetname: "n104" label: "2" }
 }
 
-graph: { title: "n79"  label: "79" status:clustered color:yellow
-edge: {sourcename: "n79" targetname: "n80" label: "0" color: red}
-node: {title: "n78" label: "Jmp  78" }
+graph: { title: "n79" label: "79" status:clustered color:yellow
+edge: {sourcename: "n79 " targetname: "n80" label: "0" color: red}
+node: {title: "n78" label: "Jmp  78"  info1: "visited: 10
+"}
 }
 
-graph: { title: "n81"  label: "81" status:clustered color:yellow
-edge: {sourcename: "n81" targetname: "n82" label: "0" color: red}
-node: {title: "n80" label: "ProjX 1 80" color: yellow}
-edge: {sourcename: "n80" targetname: "n93" label: "0" color: red}
-node: {title: "n93" label: "Cond  93" }
-edge: {sourcename: "n93" targetname: "n94" label: "0" }
-node: {title: "n94" label: "Projb Eq 94" color: yellow}
-edge: {sourcename: "n94" targetname: "n95" label: "0" }
-node: {title: "n95" label: "CmpT  95" }
-edge: {sourcename: "n95" targetname: "n96" label: "0" }
-edge: {sourcename: "n95" targetname: "n90" label: "1" }
-node: {title: "n99" label: "ProjX 0 99" color: yellow}
-edge: {sourcename: "n99" targetname: "n93" label: "0" color: red}
+graph: { title: "n81" label: "81" status:clustered color:yellow
+edge: {sourcename: "n81 " targetname: "n82" label: "0" color: red}
+node: {title: "n80" label: "ProjX 1 80" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n80 " targetname: "n93" label: "0" color: red}
+node: {title: "n93" label: "Cond  93"  info1: "visited: 11
+"}
+edge: {sourcename: "n93 " targetname: "n94" label: "0" }
+node: {title: "n94" label: "Projb Eq 94" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n94 " targetname: "n95" label: "0" }
+node: {title: "n95" label: "CmpT  95"  info1: "visited: 11
+"}
+edge: {sourcename: "n95 " targetname: "n96" label: "0" }
+edge: {sourcename: "n95 " targetname: "n90" label: "1" }
+node: {title: "n99" label: "ProjX 0 99" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n99 " targetname: "n93" label: "0" color: red}
 }
 
-graph: { title: "n83"  label: "83" status:clustered color:yellow
-edge: {sourcename: "n83" targetname: "n84" label: "0" color: red}
-node: {title: "n82" label: "ProjX 0 82" color: yellow}
-edge: {sourcename: "n82" targetname: "n87" label: "0" color: red}
-node: {title: "n87" label: "Cond  87" }
-edge: {sourcename: "n87" targetname: "n88" label: "0" }
-node: {title: "n88" label: "Projb Eq 88" color: yellow}
-edge: {sourcename: "n88" targetname: "n89" label: "0" }
-node: {title: "n89" label: "CmpT  89" }
-edge: {sourcename: "n89" targetname: "n92" label: "0" }
-edge: {sourcename: "n89" targetname: "n90" label: "1" }
-node: {title: "n90" label: "ProjIs 0 90" color: yellow}
-edge: {sourcename: "n90" targetname: "n91" label: "0" }
-node: {title: "n102" label: "ProjX 1 102" color: yellow}
-edge: {sourcename: "n102" targetname: "n87" label: "0" color: red}
+graph: { title: "n83" label: "83" status:clustered color:yellow
+edge: {sourcename: "n83 " targetname: "n84" label: "0" color: red}
+node: {title: "n82" label: "ProjX 0 82" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n82 " targetname: "n87" label: "0" color: red}
+node: {title: "n87" label: "Cond  87"  info1: "visited: 12
+"}
+edge: {sourcename: "n87 " targetname: "n88" label: "0" }
+node: {title: "n88" label: "Projb Eq 88" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n88 " targetname: "n89" label: "0" }
+node: {title: "n89" label: "CmpT  89"  info1: "visited: 12
+"}
+edge: {sourcename: "n89 " targetname: "n92" label: "0" }
+edge: {sourcename: "n89 " targetname: "n90" label: "1" }
+node: {title: "n90" label: "ProjIs 0 90" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n90 " targetname: "n91" label: "0" }
+node: {title: "n102" label: "ProjX 1 102" color: yellow info1: "visited: 12
+"}
+edge: {sourcename: "n102 " targetname: "n87" label: "0" color: red}
 }
 
-graph: { title: "n85"  label: "85" status:clustered color:yellow
-edge: {sourcename: "n85" targetname: "n84" label: "0" color: red}
-node: {title: "n84" label: "ProjX 0 84" color: yellow}
-edge: {sourcename: "n84" targetname: "n86" label: "0" color: red}
-node: {title: "n86" label: "Start  86" color: blue}
-node: {title: "n91" label: "ProjT 4 91" color: yellow}
-edge: {sourcename: "n91" targetname: "n86" label: "0" }
-node: {title: "n92" label: "0x1Is  92" color: yellow}
-node: {title: "n96" label: "0x3Is  96" color: yellow}
-node: {title: "n104" label: "0x6Is  104" color: yellow}
-node: {title: "n105" label: "0x5Is  105" color: yellow}
-node: {title: "n106" label: "ProjM 1 106" color: yellow}
-edge: {sourcename: "n106" targetname: "n86" label: "0" color: blue}
+graph: { title: "n85" label: "85" status:clustered color:yellow
+edge: {sourcename: "n85 " targetname: "n84" label: "0" color: red}
+node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 13
+"}
+edge: {sourcename: "n84 " targetname: "n86" label: "0" color: red}
+node: {title: "n86" label: "Start  86" color: blue info1: "visited: 13
+"}
+node: {title: "n91" label: "ProjT 4 91" color: yellow info1: "visited: 13
+"}
+edge: {sourcename: "n91 " targetname: "n86" label: "0" }
+node: {title: "n92" label: "0x1Is  92" color: yellow info1: "visited: 13
+"}
+node: {title: "n96" label: "0x3Is  96" color: yellow info1: "visited: 13
+"}
+node: {title: "n104" label: "0x6Is  104" color: yellow info1: "visited: 13
+"}
+node: {title: "n105" label: "0x5Is  105" color: yellow info1: "visited: 13
+"}
+node: {title: "n106" label: "ProjM 1 106" color: yellow info1: "visited: 13
+"}
+edge: {sourcename: "n106 " targetname: "n86" label: "0" color: blue}
 }
 
-graph: { title: "n98"  label: "98" status:clustered color:yellow
-edge: {sourcename: "n98" targetname: "n99" label: "0" color: red}
-node: {title: "n97" label: "Jmp  97" }
+graph: { title: "n98" label: "98" status:clustered color:yellow
+edge: {sourcename: "n98 " targetname: "n99" label: "0" color: red}
+node: {title: "n97" label: "Jmp  97"  info1: "visited: 14
+"}
 }
 
-graph: { title: "n101"  label: "101" status:clustered color:yellow
-edge: {sourcename: "n101" targetname: "n102" label: "0" color: red}
-node: {title: "n100" label: "Jmp  100" }
+graph: { title: "n101" label: "101" status:clustered color:yellow
+edge: {sourcename: "n101 " targetname: "n102" label: "0" color: red}
+node: {title: "n100" label: "Jmp  100"  info1: "visited: 15
+"}
 }
 
-node: {title: "n109" label: "Bad  109" }
+node: {title: "n109" label: "Bad  109"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg
index b811218..bff96ea 100644 (file)
--- a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg
@@ -7,67 +7,87 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n65"  label: "65" status:clustered color:yellow
-edge: {sourcename: "n65" targetname: "n66" label: "0" color: red}
-node: {title: "n64" label: "End  64" color: blue}
+graph: { title: "n65" label: "65" status:clustered color:yellow
+edge: {sourcename: "n65 " targetname: "n66" label: "0" color: red}
+node: {title: "n64" label: "End  64" color: blue info1: "visited: 15
+"}
 }
 
-graph: { title: "n67"  label: "67" status:clustered color:yellow
-edge: {sourcename: "n67" targetname: "n68" label: "0" color: red}
-node: {title: "n66" label: "Return  66" }
-edge: {sourcename: "n66" targetname: "n88" label: "0" color: blue}
-edge: {sourcename: "n66" targetname: "n87" label: "1" }
-node: {title: "n87" label: "SubIs  87" }
-edge: {sourcename: "n87" targetname: "n77" label: "0" }
-edge: {sourcename: "n87" targetname: "n76" label: "1" }
+graph: { title: "n67" label: "67" status:clustered color:yellow
+edge: {sourcename: "n67 " targetname: "n68" label: "0" color: red}
+node: {title: "n66" label: "Return  66"  info1: "visited: 16
+"}
+edge: {sourcename: "n66 " targetname: "n88" label: "0" color: blue}
+edge: {sourcename: "n66 " targetname: "n87" label: "1" }
+node: {title: "n87" label: "SubIs  87"  info1: "visited: 16
+"}
+edge: {sourcename: "n87 " targetname: "n77" label: "0" }
+edge: {sourcename: "n87 " targetname: "n76" label: "1" }
 }
 
-graph: { title: "n69"  label: "69" status:clustered color:yellow
-edge: {sourcename: "n69" targetname: "n86" label: "0" color: red}
-edge: {sourcename: "n69" targetname: "n70" label: "1" color: red}
-node: {title: "n68" label: "ProjX 0 68" color: yellow}
-edge: {sourcename: "n68" targetname: "n73" label: "0" color: red}
-node: {title: "n72" label: "ProjX 1 72" color: yellow}
-edge: {sourcename: "n72" targetname: "n73" label: "0" color: red}
-node: {title: "n73" label: "Cond  73" }
-edge: {sourcename: "n73" targetname: "n74" label: "0" }
-node: {title: "n74" label: "Projb Eq 74" color: yellow}
-edge: {sourcename: "n74" targetname: "n75" label: "0" }
-node: {title: "n75" label: "CmpT  75" }
-edge: {sourcename: "n75" targetname: "n85" label: "0" }
-edge: {sourcename: "n75" targetname: "n76" label: "1" }
-node: {title: "n76" label: "PhiIs  76" color: green}
-edge: {sourcename: "n76" targetname: "n84" label: "0" }
-edge: {sourcename: "n76" targetname: "n77" label: "1" }
-node: {title: "n77" label: "PhiIs  77" color: green}
-edge: {sourcename: "n77" targetname: "n78" label: "0" }
-edge: {sourcename: "n77" targetname: "n76" label: "1" }
+graph: { title: "n69" label: "69" status:clustered color:yellow
+edge: {sourcename: "n69 " targetname: "n86" label: "0" color: red}
+edge: {sourcename: "n69 " targetname: "n70" label: "1" color: red}
+node: {title: "n68" label: "ProjX 0 68" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n68 " targetname: "n73" label: "0" color: red}
+node: {title: "n72" label: "ProjX 1 72" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n72 " targetname: "n73" label: "0" color: red}
+node: {title: "n73" label: "Cond  73"  info1: "visited: 17
+"}
+edge: {sourcename: "n73 " targetname: "n74" label: "0" }
+node: {title: "n74" label: "Projb Eq 74" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n74 " targetname: "n75" label: "0" }
+node: {title: "n75" label: "CmpT  75"  info1: "visited: 17
+"}
+edge: {sourcename: "n75 " targetname: "n85" label: "0" }
+edge: {sourcename: "n75 " targetname: "n76" label: "1" }
+node: {title: "n76" label: "PhiIs  76" color: green info1: "visited: 17
+"}
+edge: {sourcename: "n76 " targetname: "n84" label: "0" }
+edge: {sourcename: "n76 " targetname: "n77" label: "1" }
+node: {title: "n77" label: "PhiIs  77" color: green info1: "visited: 17
+"}
+edge: {sourcename: "n77 " targetname: "n78" label: "0" }
+edge: {sourcename: "n77 " targetname: "n76" label: "1" }
 }
 
-graph: { title: "n71"  label: "71" status:clustered color:yellow
-edge: {sourcename: "n71" targetname: "n72" label: "0" color: red}
-node: {title: "n70" label: "Jmp  70" }
+graph: { title: "n71" label: "71" status:clustered color:yellow
+edge: {sourcename: "n71 " targetname: "n72" label: "0" color: red}
+node: {title: "n70" label: "Jmp  70"  info1: "visited: 18
+"}
 }
 
-graph: { title: "n79"  label: "79" status:clustered color:yellow
-edge: {sourcename: "n79" targetname: "n80" label: "0" color: red}
-node: {title: "n78" label: "ProjIs 0 78" color: yellow}
-edge: {sourcename: "n78" targetname: "n83" label: "0" }
-node: {title: "n86" label: "Jmp  86" }
+graph: { title: "n79" label: "79" status:clustered color:yellow
+edge: {sourcename: "n79 " targetname: "n80" label: "0" color: red}
+node: {title: "n78" label: "ProjIs 0 78" color: yellow info1: "visited: 19
+"}
+edge: {sourcename: "n78 " targetname: "n83" label: "0" }
+node: {title: "n86" label: "Jmp  86"  info1: "visited: 19
+"}
 }
 
-graph: { title: "n81"  label: "81" status:clustered color:yellow
-edge: {sourcename: "n81" targetname: "n80" label: "0" color: red}
-node: {title: "n80" label: "ProjX 0 80" color: yellow}
-edge: {sourcename: "n80" targetname: "n82" label: "0" color: red}
-node: {title: "n82" label: "Start  82" color: blue}
-node: {title: "n83" label: "ProjT 4 83" color: yellow}
-edge: {sourcename: "n83" targetname: "n82" label: "0" }
-node: {title: "n84" label: "0x1Is  84" color: yellow}
-node: {title: "n85" label: "0x0Is  85" color: yellow}
-node: {title: "n88" label: "ProjM 1 88" color: yellow}
-edge: {sourcename: "n88" targetname: "n82" label: "0" color: blue}
+graph: { title: "n81" label: "81" status:clustered color:yellow
+edge: {sourcename: "n81 " targetname: "n80" label: "0" color: red}
+node: {title: "n80" label: "ProjX 0 80" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n80 " targetname: "n82" label: "0" color: red}
+node: {title: "n82" label: "Start  82" color: blue info1: "visited: 20
+"}
+node: {title: "n83" label: "ProjT 4 83" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n83 " targetname: "n82" label: "0" }
+node: {title: "n84" label: "0x1Is  84" color: yellow info1: "visited: 20
+"}
+node: {title: "n85" label: "0x0Is  85" color: yellow info1: "visited: 20
+"}
+node: {title: "n88" label: "ProjM 1 88" color: yellow info1: "visited: 20
+"}
+edge: {sourcename: "n88 " targetname: "n82" label: "0" color: blue}
 }
 
-node: {title: "n91" label: "Bad  91" }
+node: {title: "n91" label: "Bad  91"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/c.vcg b/testprograms/ref-results/c.vcg
index 5ec530e..d67462c 100644 (file)
--- a/testprograms/ref-results/c.vcg
+++ b/testprograms/ref-results/c.vcg
@@ -7,52 +7,68 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n241"  label: "241" status:clustered color:yellow
-node: {title: "n240" label: "End  240" color: blue}
+graph: { title: "n241" label: "241" status:clustered color:yellow
+node: {title: "n240" label: "End  240" color: blue info1: "visited: 21
+"}
 }
 
-graph: { title: "n246"  label: "246" status:clustered color:yellow
-edge: {sourcename: "n246" targetname: "n248" label: "0" color: red}
-edge: {sourcename: "n246" targetname: "n247" label: "1" color: red}
-node: {title: "n250" label: "PhiM  250" color: green}
-edge: {sourcename: "n250" targetname: "n259" label: "0" color: blue}
-edge: {sourcename: "n250" targetname: "n251" label: "1" color: blue}
-node: {title: "n247" label: "Jmp  247" }
-node: {title: "n251" label: "Store  251" }
-edge: {sourcename: "n251" targetname: "n250" label: "0" color: blue}
-edge: {sourcename: "n251" targetname: "n257" label: "1" }
-edge: {sourcename: "n251" targetname: "n252" label: "2" }
-node: {title: "n252" label: "PhiIs  252" color: green}
-edge: {sourcename: "n252" targetname: "n255" label: "0" }
-edge: {sourcename: "n252" targetname: "n253" label: "1" }
-node: {title: "n253" label: "PhiIs  253" color: green}
-edge: {sourcename: "n253" targetname: "n254" label: "0" }
-edge: {sourcename: "n253" targetname: "n252" label: "1" }
-node: {title: "n257" label: "Sel a 257" }
-edge: {sourcename: "n257" targetname: "n250" label: "0" color: blue}
-edge: {sourcename: "n257" targetname: "n258" label: "1" }
+graph: { title: "n246" label: "246" status:clustered color:yellow
+edge: {sourcename: "n246 " targetname: "n248" label: "0" color: red}
+edge: {sourcename: "n246 " targetname: "n247" label: "1" color: red}
+node: {title: "n250" label: "PhiM  250" color: green info1: "visited: 22
+"}
+edge: {sourcename: "n250 " targetname: "n259" label: "0" color: blue}
+edge: {sourcename: "n250 " targetname: "n251" label: "1" color: blue}
+node: {title: "n247" label: "Jmp  247"  info1: "visited: 22
+"}
+node: {title: "n251" label: "Store  251"  info1: "visited: 22
+"}
+edge: {sourcename: "n251 " targetname: "n250" label: "0" color: blue}
+edge: {sourcename: "n251 " targetname: "n257" label: "1" }
+edge: {sourcename: "n251 " targetname: "n252" label: "2" }
+node: {title: "n252" label: "PhiIs  252" color: green info1: "visited: 22
+"}
+edge: {sourcename: "n252 " targetname: "n255" label: "0" }
+edge: {sourcename: "n252 " targetname: "n253" label: "1" }
+node: {title: "n253" label: "PhiIs  253" color: green info1: "visited: 22
+"}
+edge: {sourcename: "n253 " targetname: "n254" label: "0" }
+edge: {sourcename: "n253 " targetname: "n252" label: "1" }
+node: {title: "n257" label: "Sel a 257"  info1: "visited: 22
+"}
+edge: {sourcename: "n257 " targetname: "n250" label: "0" color: blue}
+edge: {sourcename: "n257 " targetname: "n258" label: "1" }
 }
 
-graph: { title: "n249"  label: "249" status:clustered color:yellow
-edge: {sourcename: "n249" targetname: "n244" label: "0" color: red}
-node: {title: "n248" label: "Jmp  248" }
-node: {title: "n255" label: "ProjIs 1 255" color: yellow}
-edge: {sourcename: "n255" targetname: "n256" label: "0" }
-node: {title: "n258" label: "ProjP 0 258" color: yellow}
-edge: {sourcename: "n258" targetname: "n256" label: "0" }
+graph: { title: "n249" label: "249" status:clustered color:yellow
+edge: {sourcename: "n249 " targetname: "n244" label: "0" color: red}
+node: {title: "n248" label: "Jmp  248"  info1: "visited: 23
+"}
+node: {title: "n255" label: "ProjIs 1 255" color: yellow info1: "visited: 23
+"}
+edge: {sourcename: "n255 " targetname: "n256" label: "0" }
+node: {title: "n258" label: "ProjP 0 258" color: yellow info1: "visited: 23
+"}
+edge: {sourcename: "n258 " targetname: "n256" label: "0" }
 }
 
-graph: { title: "n243"  label: "243" status:clustered color:yellow
-edge: {sourcename: "n243" targetname: "n244" label: "0" color: red}
-node: {title: "n244" label: "ProjX 0 244" color: yellow}
-edge: {sourcename: "n244" targetname: "n245" label: "0" color: red}
-node: {title: "n245" label: "Start  245" color: blue}
-node: {title: "n254" label: "0x0Is  254" color: yellow}
-node: {title: "n256" label: "ProjT 4 256" color: yellow}
-edge: {sourcename: "n256" targetname: "n245" label: "0" }
-node: {title: "n259" label: "ProjM 1 259" color: yellow}
-edge: {sourcename: "n259" targetname: "n245" label: "0" color: blue}
+graph: { title: "n243" label: "243" status:clustered color:yellow
+edge: {sourcename: "n243 " targetname: "n244" label: "0" color: red}
+node: {title: "n244" label: "ProjX 0 244" color: yellow info1: "visited: 24
+"}
+edge: {sourcename: "n244 " targetname: "n245" label: "0" color: red}
+node: {title: "n245" label: "Start  245" color: blue info1: "visited: 24
+"}
+node: {title: "n254" label: "0x0Is  254" color: yellow info1: "visited: 24
+"}
+node: {title: "n256" label: "ProjT 4 256" color: yellow info1: "visited: 24
+"}
+edge: {sourcename: "n256 " targetname: "n245" label: "0" }
+node: {title: "n259" label: "ProjM 1 259" color: yellow info1: "visited: 24
+"}
+edge: {sourcename: "n259 " targetname: "n245" label: "0" color: blue}
 }
 
-node: {title: "n242" label: "Bad  242" }
+node: {title: "n242" label: "Bad  242"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/main-type.vcg b/testprograms/ref-results/main-type.vcg
index 0d1dadc..7c6fe69 100644 (file)
--- a/testprograms/ref-results/main-type.vcg
+++ b/testprograms/ref-results/main-type.vcg
@@ -8,7 +8,8 @@ classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
 node: {title: "e30" label: "ent a_tp_elem_ent" color: yellow
- info1:"
+ info1: "
+id: e30
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -29,7 +30,8 @@ mode: Is,
 size: 4B,
 "}
 node: {title: "e33" label: "ent a" color: yellow
- info1:"
+ info1: "
+id: e33
 allocation:  automatic allocated
 visibility:  local
 variability: uninitialized
@@ -45,7 +47,8 @@ size: -1B,
 " color: green}
 edge: { sourcename: "t15" targetname: "e33"class: 12 label: "member" color:blue}
 node: {title: "e14" label: "ent main" color: yellow
- info1:"
+ info1: "
+id: e14
 allocation:  static allocated
 visibility:  local
 variability: constant
@@ -58,7 +61,8 @@ irg = g27"
 }
 edge: { sourcename: "e14" targetname: "t12"class: 3 label: "type" color: red}
 edge: { sourcename: "e14" targetname: "n13"label: "value 0"}
-node: {title: "n13" label: "&(ARRAY-STACK_EXAMPLE_main)P  13" color: yellow}
+node: {title: "n13" label: "&(ARRAY-STACK_EXAMPLE_main)P  13" color: yellow info1: "visited: 1
+"}
 node: {title: "t11" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined
 size: -1B,
 " color: green}

diff --git a/testprograms/ref-results/main.vcg b/testprograms/ref-results/main.vcg
index 441a262..25f688b 100644 (file)
--- a/testprograms/ref-results/main.vcg
+++ b/testprograms/ref-results/main.vcg
@@ -7,43 +7,56 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n45"  label: "45" status:clustered color:yellow
-edge: {sourcename: "n45" targetname: "n46" label: "0" color: red}
-node: {title: "n44" label: "End  44" color: blue}
+graph: { title: "n45" label: "45" status:clustered color:yellow
+edge: {sourcename: "n45 " targetname: "n46" label: "0" color: red}
+node: {title: "n44" label: "End  44" color: blue info1: "visited: 8
+"}
 }
 
-graph: { title: "n47"  label: "47" status:clustered color:yellow
-edge: {sourcename: "n47" targetname: "n48" label: "0" color: red}
-node: {title: "n46" label: "Return  46" }
-edge: {sourcename: "n46" targetname: "n58" label: "0" color: blue}
-edge: {sourcename: "n46" targetname: "n51" label: "1" }
-node: {title: "n51" label: "ProjIs 2 51" color: yellow}
-edge: {sourcename: "n51" targetname: "n52" label: "0" }
-node: {title: "n52" label: "Load  52" }
-edge: {sourcename: "n52" targetname: "n57" label: "0" color: blue}
-edge: {sourcename: "n52" targetname: "n53" label: "1" }
-node: {title: "n53" label: "Sel a_tp_elem_ent 53" }
-edge: {sourcename: "n53" targetname: "n57" label: "0" color: blue}
-edge: {sourcename: "n53" targetname: "n55" label: "1" }
-edge: {sourcename: "n53" targetname: "n54" label: "2" }
-node: {title: "n55" label: "Sel a 55" }
-edge: {sourcename: "n55" targetname: "n57" label: "0" color: blue}
-edge: {sourcename: "n55" targetname: "n56" label: "1" }
-node: {title: "n58" label: "ProjM 0 58" color: yellow}
-edge: {sourcename: "n58" targetname: "n52" label: "0" color: blue}
+graph: { title: "n47" label: "47" status:clustered color:yellow
+edge: {sourcename: "n47 " targetname: "n48" label: "0" color: red}
+node: {title: "n46" label: "Return  46"  info1: "visited: 9
+"}
+edge: {sourcename: "n46 " targetname: "n58" label: "0" color: blue}
+edge: {sourcename: "n46 " targetname: "n51" label: "1" }
+node: {title: "n51" label: "ProjIs 2 51" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n51 " targetname: "n52" label: "0" }
+node: {title: "n52" label: "Load  52"  info1: "visited: 9
+"}
+edge: {sourcename: "n52 " targetname: "n57" label: "0" color: blue}
+edge: {sourcename: "n52 " targetname: "n53" label: "1" }
+node: {title: "n53" label: "Sel a_tp_elem_ent 53"  info1: "visited: 9
+"}
+edge: {sourcename: "n53 " targetname: "n57" label: "0" color: blue}
+edge: {sourcename: "n53 " targetname: "n55" label: "1" }
+edge: {sourcename: "n53 " targetname: "n54" label: "2" }
+node: {title: "n55" label: "Sel a 55"  info1: "visited: 9
+"}
+edge: {sourcename: "n55 " targetname: "n57" label: "0" color: blue}
+edge: {sourcename: "n55 " targetname: "n56" label: "1" }
+node: {title: "n58" label: "ProjM 0 58" color: yellow info1: "visited: 9
+"}
+edge: {sourcename: "n58 " targetname: "n52" label: "0" color: blue}
 }
 
-graph: { title: "n49"  label: "49" status:clustered color:yellow
-edge: {sourcename: "n49" targetname: "n48" label: "0" color: red}
-node: {title: "n48" label: "ProjX 0 48" color: yellow}
-edge: {sourcename: "n48" targetname: "n50" label: "0" color: red}
-node: {title: "n50" label: "Start  50" color: blue}
-node: {title: "n54" label: "0x3Iu  54" color: yellow}
-node: {title: "n56" label: "ProjP 2 56" color: yellow}
-edge: {sourcename: "n56" targetname: "n50" label: "0" }
-node: {title: "n57" label: "ProjM 1 57" color: yellow}
-edge: {sourcename: "n57" targetname: "n50" label: "0" color: blue}
+graph: { title: "n49" label: "49" status:clustered color:yellow
+edge: {sourcename: "n49 " targetname: "n48" label: "0" color: red}
+node: {title: "n48" label: "ProjX 0 48" color: yellow info1: "visited: 10
+"}
+edge: {sourcename: "n48 " targetname: "n50" label: "0" color: red}
+node: {title: "n50" label: "Start  50" color: blue info1: "visited: 10
+"}
+node: {title: "n54" label: "0x3Iu  54" color: yellow info1: "visited: 10
+"}
+node: {title: "n56" label: "ProjP 2 56" color: yellow info1: "visited: 10
+"}
+edge: {sourcename: "n56 " targetname: "n50" label: "0" }
+node: {title: "n57" label: "ProjM 1 57" color: yellow info1: "visited: 10
+"}
+edge: {sourcename: "n57 " targetname: "n50" label: "0" color: blue}
 }
 
-node: {title: "n61" label: "Bad  61" }
+node: {title: "n61" label: "Bad  61"  info1: "visited: 0
+"}
 }

diff --git a/testprograms/ref-results/set_a.vcg b/testprograms/ref-results/set_a.vcg
index eab3567..a85aa8f 100644 (file)
--- a/testprograms/ref-results/set_a.vcg
+++ b/testprograms/ref-results/set_a.vcg
@@ -7,40 +7,52 @@ orientation: bottom_to_top
 classname 1: "Data"
 classname 2: "Block"
 classname 3: "Entity type"classname 4: "Entity owner"classname 5: "Method Param"classname 6: "Method Res"classname 7: "Super"classname 8: "Union"classname 9: "Points-to"classname 10: "Array Element Type"classname 11: "Overwrites"classname 12: "Member"
-graph: { title: "n223"  label: "223" status:clustered color:yellow
-edge: {sourcename: "n223" targetname: "n224" label: "0" color: red}
-node: {title: "n222" label: "End  222" color: blue}
+graph: { title: "n223" label: "223" status:clustered color:yellow
+edge: {sourcename: "n223 " targetname: "n224" label: "0" color: red}
+node: {title: "n222" label: "End  222" color: blue info1: "visited: 16
+"}
 }
 
-graph: { title: "n225"  label: "225" status:clustered color:yellow
-edge: {sourcename: "n225" targetname: "n226" label: "0" color: red}
-node: {title: "n224" label: "Return  224" }
-edge: {sourcename: "n224" targetname: "n229" label: "0" color: blue}
-node: {title: "n229" label: "ProjM 0 229" color: yellow}
-edge: {sourcename: "n229" targetname: "n230" label: "0" color: blue}
-node: {title: "n230" label: "Store  230" }
-edge: {sourcename: "n230" targetname: "n235" label: "0" color: blue}
-edge: {sourcename: "n230" targetname: "n233" label: "1" }
-edge: {sourcename: "n230" targetname: "n231" label: "2" }
-node: {title: "n231" label: "ProjIs 1 231" color: yellow}
-edge: {sourcename: "n231" targetname: "n232" label: "0" }
-node: {title: "n233" label: "Sel a 233" }
-edge: {sourcename: "n233" targetname: "n235" label: "0" color: blue}
-edge: {sourcename: "n233" targetname: "n234" label: "1" }
-node: {title: "n234" label: "ProjP 0 234" color: yellow}
-edge: {sourcename: "n234" targetname: "n232" label: "0" }
+graph: { title: "n225" label: "225" status:clustered color:yellow
+edge: {sourcename: "n225 " targetname: "n226" label: "0" color: red}
+node: {title: "n224" label: "Return  224"  info1: "visited: 17
+"}
+edge: {sourcename: "n224 " targetname: "n229" label: "0" color: blue}
+node: {title: "n229" label: "ProjM 0 229" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n229 " targetname: "n230" label: "0" color: blue}
+node: {title: "n230" label: "Store  230"  info1: "visited: 17
+"}
+edge: {sourcename: "n230 " targetname: "n235" label: "0" color: blue}
+edge: {sourcename: "n230 " targetname: "n233" label: "1" }
+edge: {sourcename: "n230 " targetname: "n231" label: "2" }
+node: {title: "n231" label: "ProjIs 1 231" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n231 " targetname: "n232" label: "0" }
+node: {title: "n233" label: "Sel a 233"  info1: "visited: 17
+"}
+edge: {sourcename: "n233 " targetname: "n235" label: "0" color: blue}
+edge: {sourcename: "n233 " targetname: "n234" label: "1" }
+node: {title: "n234" label: "ProjP 0 234" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n234 " targetname: "n232" label: "0" }
 }
 
-graph: { title: "n227"  label: "227" status:clustered color:yellow
-edge: {sourcename: "n227" targetname: "n226" label: "0" color: red}
-node: {title: "n226" label: "ProjX 0 226" color: yellow}
-edge: {sourcename: "n226" targetname: "n228" label: "0" color: red}
-node: {title: "n228" label: "Start  228" color: blue}
-node: {title: "n232" label: "ProjT 4 232" color: yellow}
-edge: {sourcename: "n232" targetname: "n228" label: "0" }
-node: {title: "n235" label: "ProjM 1 235" color: yellow}
-edge: {sourcename: "n235" targetname: "n228" label: "0" color: blue}
+graph: { title: "n227" label: "227" status:clustered color:yellow
+edge: {sourcename: "n227 " targetname: "n226" label: "0" color: red}
+node: {title: "n226" label: "ProjX 0 226" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n226 " targetname: "n228" label: "0" color: red}
+node: {title: "n228" label: "Start  228" color: blue info1: "visited: 18
+"}
+node: {title: "n232" label: "ProjT 4 232" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n232 " targetname: "n228" label: "0" }
+node: {title: "n235" label: "ProjM 1 235" color: yellow info1: "visited: 18
+"}
+edge: {sourcename: "n235 " targetname: "n228" label: "0" color: blue}
 }
 
-node: {title: "n238" label: "Bad  238" }
+node: {title: "n238" label: "Bad  238"  info1: "visited: 0
+"}
 }