new reference: numbers of nodes larger because of new types

[r1762]

diff --git a/firmjni/testprograms/run-results.txt b/firmjni/testprograms/run-results.txt
index 7e74bd0..63a7bc5 100644 (file)
--- a/firmjni/testprograms/run-results.txt
+++ b/firmjni/testprograms/run-results.txt
@@ -7,23 +7,23 @@ use xvcg to view this graph:
 
 Creating an IR graph: IfElseExample...
 Optimization: 2
-new Nodes: 35,
-old Nodes: 36, 34, 35,
+new Nodes: 37,
+old Nodes: 38, 36, 37,
 Optimization: 2
-new Nodes: 19,
-old Nodes: 37, 34, 19,
+new Nodes: 21,
+old Nodes: 39, 36, 21,
 Optimization: 4
-new Nodes: 27,
-old Nodes: 42, 35,
+new Nodes: 29,
+old Nodes: 44, 37,
 Optimization: 1
-new Nodes: 30,
-old Nodes: 57, 30,
+new Nodes: 32,
+old Nodes: 59, 32,
 Optimization: 1
-new Nodes: 28,
-old Nodes: 60, 28,
+new Nodes: 30,
+old Nodes: 62, 30,
 Done building the graph.  Optimizing it.
 Optimization: 4
-new Nodes: 27,
-old Nodes: 42, 35,
+new Nodes: 29,
+old Nodes: 44, 37,
 use xvcg to view this graph:
 /ben/goetz/bin/xvcg GRAPHNAME

diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
index 1d6592c..3e52188 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
@@ -17,9 +17,9 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-node: {title: "e15" label: "ent a_elem_ent" color: yellow
+node: {title: "e17" label: "ent a_elem_ent" color: yellow
  info1: "
-id: e15
+id: e17
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -29,25 +29,25 @@ name:    a_elem_ent
 ld_name: a_a_elem_ent
 offset:  -1"
 }
-edge: { sourcename: "e15" targetname: "t10"class: 3 label: "type" color: red}
-node: {title: "t14" label: "array a" info1: "state: layout_undefined
+edge: { sourcename: "e17" targetname: "t12"class: 3 label: "type" color: red}
+node: {title: "t16" label: "array a" info1: "state: layout_undefined
 size: -1B,
 "}
-edge: { sourcename: "t14" targetname: "t10"class: 10 label: "arr elt tp" color:green}
-edge: { sourcename: "t14" targetname: "e15"class: 10 label: "arr ent" color: green}
-edge: { sourcename: "n16" targetname: "t14"label: "upper 0"}
-edge: { sourcename: "n17" targetname: "t14"label: "lower 0"}
-node: {title: "n16" label: "0x9Iu  16" color: yellow info1: "visited: 1
+edge: { sourcename: "t16" targetname: "t12"class: 10 label: "arr elt tp" color:green}
+edge: { sourcename: "t16" targetname: "e17"class: 10 label: "arr ent" color: green}
+edge: { sourcename: "n18" targetname: "t16"label: "upper 0"}
+edge: { sourcename: "n19" targetname: "t16"label: "lower 0"}
+node: {title: "n18" label: "0x9Iu  18" color: yellow info1: "visited: 1
 "}
-node: {title: "n17" label: "0x0Iu  17" color: yellow info1: "visited: 1
+node: {title: "n19" label: "0x0Iu  19" color: yellow info1: "visited: 1
 "}
-node: {title: "t10" label: "primitive int" info1: "state: layout_fixed,
+node: {title: "t12" label: "primitive int" info1: "state: layout_fixed,
 mode: Is,
 size: 4B,
 "}
-node: {title: "e13" label: "ent ARRAY-HEAP_EXAMPLE_main" color: yellow
+node: {title: "e15" label: "ent ARRAY-HEAP_EXAMPLE_main" color: yellow
  info1: "
-id: e13
+id: e15
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -56,22 +56,22 @@ peculiarity: peculiarity_existent
 name:    ARRAY-HEAP_EXAMPLE_main
 ld_name: GlobalType_ARRAY-HEAP_EXAMPLE_main
 offset:  -1
-irg = g30"
+irg = g32"
 }
-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 info1: "visited: 1
+edge: { sourcename: "e15" targetname: "t13"class: 3 label: "type" color: red}
+edge: { sourcename: "e15" targetname: "n14"label: "value 0"}
+node: {title: "n14" label: "&(GlobalType_ARRAY-HEAP_EXAMPLE_main)P  14" color: yellow info1: "visited: 1
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "t0" targetname: "e13"class: 12 label: "member" color:blue}
-node: {title: "t11" label: "method ARRAY-HEAP_EXAMPLE_main" info1: "state: layout_fixed,
+edge: { sourcename: "t0" targetname: "e15"class: 12 label: "member" color:blue}
+node: {title: "t13" label: "method ARRAY-HEAP_EXAMPLE_main" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t11" targetname: "t10"class: 6 label: "res 0" color: green}
-node: {title: "t18" label: "class ARRAY-HEAP_EXAMPLE_mainframe_tp" info1: "state: layout_undefined
+edge: { sourcename: "t13" targetname: "t12"class: 6 label: "res 0" color: green}
+node: {title: "t20" label: "class ARRAY-HEAP_EXAMPLE_mainframe_tp" 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 2e8d8cf..c111282 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
@@ -17,65 +17,65 @@ 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 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: "End  48" 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"  info1: "visited: 9
+graph: { title: "n51" label: "51" status:clustered color:yellow
+edge: {sourcename: "n51" targetname: "n52" label: "0" color: red}
+node: {title: "n50" label: "Return  50"  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: "n50" targetname: "n64" label: "0" color: blue}
+edge: {sourcename: "n50" targetname: "n55" label: "1" }
+node: {title: "n55" label: "ProjIs 2 55" color: yellow info1: "visited: 9
 "}
-edge: {sourcename: "n53" targetname: "n54" label: "0" }
-node: {title: "n54" label: "Load  54"  info1: "visited: 9
+edge: {sourcename: "n55" targetname: "n56" label: "0" }
+node: {title: "n56" label: "Load  56"  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: "n56" targetname: "n63" label: "0" color: blue}
+edge: {sourcename: "n56" targetname: "n57" label: "1" }
+node: {title: "n57" label: "Sel a_elem_ent 57"  info1: "visited: 9
 Selecting entity of type int
   from entity of type a
 "}
-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: "n63" label: "0" color: blue}
+edge: {sourcename: "n57" targetname: "n59" label: "1" }
+edge: {sourcename: "n57" targetname: "n58" label: "2" }
+node: {title: "n59" label: "ProjP 2 59" color: yellow info1: "visited: 9
 "}
-edge: {sourcename: "n57" targetname: "n58" label: "0" }
-node: {title: "n58" label: "Alloc  58"  info1: "visited: 9
+edge: {sourcename: "n59" targetname: "n60" label: "0" }
+node: {title: "n60" label: "Alloc  60"  info1: "visited: 9
 allocating entity of type a
 "}
-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: "n60" targetname: "n62" label: "0" color: blue}
+edge: {sourcename: "n60" targetname: "n61" label: "1" }
+node: {title: "n63" label: "ProjM 0 63" 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: "n63" targetname: "n60" label: "0" color: blue}
+node: {title: "n64" label: "ProjM 0 64" color: yellow info1: "visited: 9
 "}
-edge: {sourcename: "n62" targetname: "n54" label: "0" color: blue}
+edge: {sourcename: "n64" targetname: "n56" 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
+graph: { title: "n53" label: "53" status:clustered color:yellow
+edge: {sourcename: "n53" targetname: "n52" label: "0" color: red}
+node: {title: "n52" label: "ProjX 0 52" 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
+edge: {sourcename: "n52" targetname: "n54" label: "0" color: red}
+node: {title: "n54" label: "Start  54" color: blue info1: "visited: 10
 start of method of type ARRAY-HEAP_EXAMPLE_main
 "}
-node: {title: "n56" label: "0x3Iu  56" color: yellow info1: "visited: 10
+node: {title: "n58" label: "0x3Iu  58" color: yellow info1: "visited: 10
 "}
-node: {title: "n59" label: "0x28Iu  59" color: yellow info1: "visited: 10
+node: {title: "n61" label: "0x28Iu  61" color: yellow info1: "visited: 10
 "}
-node: {title: "n60" label: "ProjM 1 60" color: yellow info1: "visited: 10
+node: {title: "n62" label: "ProjM 1 62" color: yellow info1: "visited: 10
 "}
-edge: {sourcename: "n60" targetname: "n52" label: "0" color: blue}
+edge: {sourcename: "n62" targetname: "n54" label: "0" color: blue}
 }
 
-node: {title: "n66" label: "Bad  66"  info1: "visited: 0
+node: {title: "n68" label: "Bad  68"  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 fcbd1d0..7def239 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg
@@ -17,66 +17,66 @@ 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 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: "End  46" 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"  info1: "visited: 14
+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: 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: "n48" targetname: "n60" label: "0" color: blue}
+edge: {sourcename: "n48" targetname: "n53" label: "1" }
+node: {title: "n53" label: "ProjIs 2 53" color: yellow info1: "visited: 14
 "}
-edge: {sourcename: "n51" targetname: "n52" label: "0" }
-node: {title: "n52" label: "Load  52"  info1: "visited: 14
+edge: {sourcename: "n53" targetname: "n54" label: "0" }
+node: {title: "n54" label: "Load  54"  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: "n54" targetname: "n59" label: "0" color: blue}
+edge: {sourcename: "n54" targetname: "n55" label: "1" }
+node: {title: "n55" label: "Sel a_tp_elem_ent 55"  info1: "visited: 14
 Selecting entity of type int
   from entity of type a_tp
 "}
-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: "n59" label: "0" color: blue}
+edge: {sourcename: "n55" targetname: "n57" label: "1" }
+edge: {sourcename: "n55" targetname: "n56" label: "2" }
+node: {title: "n57" label: "Sel a 57"  info1: "visited: 14
 Selecting entity of type a_tp
   from entity of type mainframe_tp
 "}
-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: "n57" targetname: "n59" label: "0" color: blue}
+edge: {sourcename: "n57" targetname: "n58" label: "1" }
+node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 14
 "}
-edge: {sourcename: "n58" targetname: "n52" label: "0" color: blue}
+edge: {sourcename: "n60" targetname: "n54" 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
+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: 15
 "}
-edge: {sourcename: "n48" targetname: "n50" label: "0" color: red}
-node: {title: "n50" label: "Start  50" color: blue info1: "visited: 15
+edge: {sourcename: "n50" targetname: "n52" label: "0" color: red}
+node: {title: "n52" label: "Start  52" color: blue info1: "visited: 15
 start of method of type main
 "}
-node: {title: "n54" label: "0x3Iu  54" color: yellow info1: "visited: 15
+node: {title: "n56" label: "0x3Iu  56" color: yellow info1: "visited: 15
 "}
-node: {title: "n56" label: "ProjP 2 56" color: yellow info1: "visited: 15
+node: {title: "n58" label: "ProjP 2 58" 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: "n58" targetname: "n52" label: "0" }
+node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 15
 "}
-edge: {sourcename: "n57" targetname: "n50" label: "0" color: blue}
+edge: {sourcename: "n59" targetname: "n52" label: "0" color: blue}
 }
 
-node: {title: "n61" label: "Bad  61"  info1: "visited: 0
+node: {title: "n63" label: "Bad  63"  info1: "visited: 0
 "}
-node: {title: "e16" label: "ent a_tp_elem_ent" color: yellow
+node: {title: "e18" label: "ent a_tp_elem_ent" color: yellow
  info1: "
-id: e16
+id: e18
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -86,25 +86,25 @@ name:    a_tp_elem_ent
 ld_name: a_tp_a_tp_elem_ent
 offset:  -1"
 }
-edge: { sourcename: "e16" targetname: "t10"class: 3 label: "type" color: red}
-node: {title: "t15" label: "array a_tp" info1: "state: layout_undefined
+edge: { sourcename: "e18" targetname: "t12"class: 3 label: "type" color: red}
+node: {title: "t17" label: "array a_tp" info1: "state: layout_undefined
 size: -1B,
 "}
-edge: { sourcename: "t15" targetname: "t10"class: 10 label: "arr elt tp" color:green}
-edge: { sourcename: "t15" targetname: "e16"class: 10 label: "arr ent" color: green}
-edge: { sourcename: "n17" targetname: "t15"label: "upper 0"}
-edge: { sourcename: "n18" targetname: "t15"label: "lower 0"}
-node: {title: "n17" label: "0x9Iu  17" color: yellow info1: "visited: 2
+edge: { sourcename: "t17" targetname: "t12"class: 10 label: "arr elt tp" color:green}
+edge: { sourcename: "t17" targetname: "e18"class: 10 label: "arr ent" color: green}
+edge: { sourcename: "n19" targetname: "t17"label: "upper 0"}
+edge: { sourcename: "n20" targetname: "t17"label: "lower 0"}
+node: {title: "n19" label: "0x9Iu  19" color: yellow info1: "visited: 2
 "}
-node: {title: "n18" label: "0x0Iu  18" color: yellow info1: "visited: 2
+node: {title: "n20" label: "0x0Iu  20" color: yellow info1: "visited: 2
 "}
-node: {title: "t10" label: "primitive int" info1: "state: layout_fixed,
+node: {title: "t12" label: "primitive int" info1: "state: layout_fixed,
 mode: Is,
 size: 4B,
 "}
-node: {title: "e33" label: "ent a" color: yellow
+node: {title: "e35" label: "ent a" color: yellow
  info1: "
-id: e33
+id: e35
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -114,14 +114,14 @@ name:    a
 ld_name: mainframe_tp_a
 offset:  -1"
 }
-edge: { sourcename: "e33" targetname: "t15"class: 3 label: "type" color: red}
-node: {title: "t19" label: "class mainframe_tp" info1: "state: layout_undefined
+edge: { sourcename: "e35" targetname: "t17"class: 3 label: "type" color: red}
+node: {title: "t21" label: "class mainframe_tp" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "t19" targetname: "e33"class: 12 label: "member" color:blue}
-node: {title: "e14" label: "ent main" color: yellow
+edge: { sourcename: "t21" targetname: "e35"class: 12 label: "member" color:blue}
+node: {title: "e16" label: "ent main" color: yellow
  info1: "
-id: e14
+id: e16
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -130,21 +130,21 @@ peculiarity: peculiarity_existent
 name:    main
 ld_name: ARRAY-STACK_EXAMPLE_main
 offset:  -1
-irg = g31"
+irg = g33"
 }
-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 info1: "visited: 2
+edge: { sourcename: "e16" targetname: "t14"class: 3 label: "type" color: red}
+edge: { sourcename: "e16" targetname: "n15"label: "value 0"}
+node: {title: "n15" label: "&(ARRAY-STACK_EXAMPLE_main)P  15" color: yellow info1: "visited: 2
 "}
-node: {title: "t11" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined
+node: {title: "t13" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "t11" targetname: "e14"class: 12 label: "member" color:blue}
-node: {title: "t12" label: "method main" info1: "state: layout_fixed,
+edge: { sourcename: "t13" targetname: "e16"class: 12 label: "member" color:blue}
+node: {title: "t14" label: "method main" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t12" targetname: "t10"class: 6 label: "res 0" color: green}
-edge: { sourcename: "n53" targetname: "e16"class: 2 priority: 2 linestyle: dotted}
-edge: { sourcename: "n55" targetname: "e33"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "t14" targetname: "t12"class: 6 label: "res 0" color: green}
+edge: { sourcename: "n55" targetname: "e18"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n57" targetname: "e35"class: 2 priority: 2 linestyle: dotted}
 }

diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg
index 603637c..f90b2e5 100644 (file)
--- a/testprograms/ref-results/All_types.vcg
+++ b/testprograms/ref-results/All_types.vcg
@@ -17,19 +17,19 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-node: {title: "t10" label: "primitive int" info1: "state: layout_fixed,
+node: {title: "t12" label: "primitive int" info1: "state: layout_fixed,
 mode: Is,
 size: 4B,
 "}
-node: {title: "t11" label: "class PRIMA" info1: "state: layout_undefined
+node: {title: "t13" label: "class PRIMA" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-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
+edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue}
+node: {title: "e15" label: "ent a" color: yellow
  info1: "
-id: e13
+id: e15
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -39,10 +39,10 @@ name:    a
 ld_name: PRIMA_a
 offset:  -1"
 }
-edge: { sourcename: "e13" targetname: "t10"class: 3 label: "type" color: red}
-node: {title: "e16" label: "ent set_a" color: yellow
+edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red}
+node: {title: "e18" label: "ent set_a" color: yellow
  info1: "
-id: e16
+id: e18
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -51,26 +51,26 @@ peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
-irg = g69"
+irg = g71"
 }
-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 info1: "visited: 4
+edge: { sourcename: "e18" targetname: "t16"class: 3 label: "type" color: red}
+edge: { sourcename: "e18" targetname: "n17"label: "value 0"}
+node: {title: "n17" label: "&(PRIMA_set_a)P  17" color: yellow info1: "visited: 4
 "}
-node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
+node: {title: "t16" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 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: "t12" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
+edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green}
+node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t12" targetname: "t11"class: 9 label: "points to" color:green}
-node: {title: "e19" label: "ent c" color: yellow
+edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green}
+node: {title: "e21" label: "ent c" color: yellow
  info1: "
-id: e19
+id: e21
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -79,31 +79,31 @@ peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1
-irg = g92"
+irg = g94"
 }
-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 info1: "visited: 4
+edge: { sourcename: "e21" targetname: "t19"class: 3 label: "type" color: red}
+edge: { sourcename: "e21" targetname: "n20"label: "value 0"}
+node: {title: "n20" label: "&(PRIMA_c)P  20" color: yellow info1: "visited: 4
 "}
-node: {title: "t17" label: "method c" info1: "state: layout_fixed,
+node: {title: "t19" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t17" targetname: "t12"class: 5 label: "param 0" color: green}
-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: "t20" label: "method OO_INLINE_EXAMPLE_main" info1: "state: layout_fixed,
+edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green}
+node: {title: "t22" label: "method OO_INLINE_EXAMPLE_main" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t20" targetname: "t10"class: 6 label: "res 0" color: green}
+edge: { sourcename: "t22" targetname: "t12"class: 6 label: "res 0" color: green}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 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
+edge: { sourcename: "t0" targetname: "e24"class: 12 label: "member" color:blue}
+node: {title: "e24" label: "ent OO_INLINE_EXAMPLE_main" color: yellow
  info1: "
-id: e22
+id: e24
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -112,10 +112,10 @@ peculiarity: peculiarity_existent
 name:    OO_INLINE_EXAMPLE_main
 ld_name: GlobalType_OO_INLINE_EXAMPLE_main
 offset:  -1
-irg = g35"
+irg = g37"
 }
-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 info1: "visited: 4
+edge: { sourcename: "e24" targetname: "t22"class: 3 label: "type" color: red}
+edge: { sourcename: "e24" targetname: "n23"label: "value 0"}
+node: {title: "n23" label: "&(GlobalType_OO_INLINE_EXAMPLE_main)P  23" 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 cc030db..4514807 100644 (file)
--- a/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CALL_STR_EXAMPLE_main.vcg
@@ -17,46 +17,46 @@ 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 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: "End  55" 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"  info1: "visited: 7
+graph: { title: "n58" label: "58" status:clustered color:yellow
+edge: {sourcename: "n58" targetname: "n59" label: "0" color: red}
+node: {title: "n57" label: "Return  57"  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: "n57" targetname: "n62" label: "0" color: blue}
+node: {title: "n62" label: "ProjM 0 62" 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: "n62" targetname: "n63" label: "0" color: blue}
+node: {title: "n63" label: "Call  63"  info1: "visited: 7
 calling method of type f
   param 0 type: ptr_to_string
 "}
-edge: {sourcename: "n61" targetname: "n64" label: "0" color: blue}
-edge: {sourcename: "n61" targetname: "n63" label: "1" }
-edge: {sourcename: "n61" targetname: "n62" label: "2" }
+edge: {sourcename: "n63" targetname: "n66" label: "0" color: blue}
+edge: {sourcename: "n63" targetname: "n65" label: "1" }
+edge: {sourcename: "n63" targetname: "n64" 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 info1: "visited: 8
+graph: { title: "n60" label: "60" status:clustered color:yellow
+edge: {sourcename: "n60" targetname: "n59" label: "0" color: red}
+node: {title: "n59" label: "ProjX 0 59" 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
+edge: {sourcename: "n59" targetname: "n61" label: "0" color: red}
+node: {title: "n61" label: "Start  61" color: blue info1: "visited: 8
 start of method of type CALL_STR_EXAMPLE_main
 "}
-node: {title: "n62" label: "&(GlobalType_constStr)P  62" color: yellow info1: "visited: 8
+node: {title: "n64" label: "&(GlobalType_constStr)P  64" color: yellow info1: "visited: 8
 "}
-node: {title: "n63" label: "SymC f  63"  info1: "visited: 8
+node: {title: "n65" label: "SymC f  65"  info1: "visited: 8
 "}
-node: {title: "n64" label: "ProjM 1 64" color: yellow info1: "visited: 8
+node: {title: "n66" label: "ProjM 1 66" color: yellow info1: "visited: 8
 "}
-edge: {sourcename: "n64" targetname: "n59" label: "0" color: blue}
+edge: {sourcename: "n66" targetname: "n61" label: "0" color: blue}
 }
 
-node: {title: "n68" label: "Bad  68"  info1: "visited: 0
+node: {title: "n70" label: "Bad  70"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/COND_EXAMPLE_main.vcg b/testprograms/ref-results/COND_EXAMPLE_main.vcg
index fcda472..3f77fcc 100644 (file)
--- a/testprograms/ref-results/COND_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/COND_EXAMPLE_main.vcg
@@ -17,103 +17,103 @@ 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 info1: "visited: 9
+graph: { title: "n61" label: "61" status:clustered color:yellow
+edge: {sourcename: "n61" targetname: "n62" label: "0" color: red}
+node: {title: "n60" label: "End  60" 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"  info1: "visited: 10
+graph: { title: "n63" label: "63" status:clustered color:yellow
+edge: {sourcename: "n63" targetname: "n84" label: "0" color: red}
+edge: {sourcename: "n63" targetname: "n64" label: "1" color: red}
+node: {title: "n62" label: "Return  62"  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: "n62" targetname: "n89" label: "0" color: blue}
+edge: {sourcename: "n62" targetname: "n87" label: "1" }
+node: {title: "n87" label: "PhiIs  87" color: green info1: "visited: 10
 "}
-edge: {sourcename: "n85" targetname: "n86" label: "0" }
-edge: {sourcename: "n85" targetname: "n76" label: "1" }
+edge: {sourcename: "n87" targetname: "n88" label: "0" }
+edge: {sourcename: "n87" targetname: "n78" 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 info1: "visited: 11
-"}
-edge: {sourcename: "n62" targetname: "n67" label: "0" color: red}
-node: {title: "n67" label: "Cond  67"  info1: "visited: 11
+graph: { title: "n65" label: "65" status:clustered color:yellow
+edge: {sourcename: "n65" targetname: "n66" label: "0" color: red}
+node: {title: "n64" label: "ProjX 0 64" color: yellow info1: "visited: 11
 "}
-edge: {sourcename: "n67" targetname: "n68" label: "0" }
-node: {title: "n68" label: "Projb Ne 68" color: yellow info1: "visited: 11
+edge: {sourcename: "n64" targetname: "n69" label: "0" color: red}
+node: {title: "n69" label: "Cond  69"  info1: "visited: 11
 "}
-edge: {sourcename: "n68" targetname: "n69" label: "0" }
-node: {title: "n69" label: "CmpT  69"  info1: "visited: 11
+edge: {sourcename: "n69" targetname: "n70" label: "0" }
+node: {title: "n70" label: "Projb Ne 70" color: yellow 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: "n70" targetname: "n71" label: "0" }
+node: {title: "n71" label: "CmpT  71"  info1: "visited: 11
 "}
-edge: {sourcename: "n71" targetname: "n78" label: "0" }
+edge: {sourcename: "n71" targetname: "n73" label: "0" }
 edge: {sourcename: "n71" targetname: "n72" label: "1" }
-node: {title: "n72" label: "ConvIs  72"  info1: "visited: 11
+node: {title: "n73" label: "AndIs  73"  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: "n80" label: "0" }
+edge: {sourcename: "n73" targetname: "n74" label: "1" }
+node: {title: "n74" label: "ConvIs  74"  info1: "visited: 11
 "}
-edge: {sourcename: "n73" targetname: "n74" label: "0" }
-node: {title: "n74" label: "CmpT  74"  info1: "visited: 11
+edge: {sourcename: "n74" targetname: "n75" label: "0" }
+node: {title: "n75" label: "Projb Lt 75" color: yellow 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: "n75" targetname: "n76" label: "0" }
+node: {title: "n76" label: "CmpT  76"  info1: "visited: 11
 "}
-edge: {sourcename: "n76" targetname: "n77" label: "0" }
-node: {title: "n78" label: "ConvIs  78"  info1: "visited: 11
+edge: {sourcename: "n76" targetname: "n78" label: "0" }
+edge: {sourcename: "n76" targetname: "n77" label: "1" }
+node: {title: "n78" label: "ProjIs 0 78" color: yellow info1: "visited: 11
 "}
 edge: {sourcename: "n78" targetname: "n79" label: "0" }
-node: {title: "n79" label: "Projb Gt 79" color: yellow info1: "visited: 11
+node: {title: "n80" label: "ConvIs  80"  info1: "visited: 11
 "}
-edge: {sourcename: "n79" targetname: "n80" label: "0" }
-node: {title: "n80" label: "CmpT  80"  info1: "visited: 11
+edge: {sourcename: "n80" targetname: "n81" label: "0" }
+node: {title: "n81" label: "Projb Gt 81" color: yellow 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: "n81" targetname: "n82" label: "0" }
+node: {title: "n82" label: "CmpT  82"  info1: "visited: 11
 "}
-edge: {sourcename: "n84" targetname: "n67" label: "0" color: red}
+edge: {sourcename: "n82" targetname: "n78" label: "0" }
+edge: {sourcename: "n82" targetname: "n83" label: "1" }
+node: {title: "n86" label: "ProjX 1 86" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n86" targetname: "n69" 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 info1: "visited: 12
+graph: { title: "n67" label: "67" status:clustered color:yellow
+edge: {sourcename: "n67" targetname: "n66" label: "0" color: red}
+node: {title: "n66" label: "ProjX 0 66" 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
+edge: {sourcename: "n66" targetname: "n68" label: "0" color: red}
+node: {title: "n68" label: "Start  68" color: blue info1: "visited: 12
 start of method of type main
   param 0 type: int
 "}
-node: {title: "n70" label: "0x0Is  70" color: yellow info1: "visited: 12
+node: {title: "n72" label: "0x0Is  72" color: yellow info1: "visited: 12
 "}
-node: {title: "n75" label: "0xAIs  75" color: yellow info1: "visited: 12
+node: {title: "n77" label: "0xAIs  77" color: yellow info1: "visited: 12
 "}
-node: {title: "n77" label: "ProjT 4 77" color: yellow info1: "visited: 12
+node: {title: "n79" label: "ProjT 4 79" color: yellow info1: "visited: 12
 "}
-edge: {sourcename: "n77" targetname: "n66" label: "0" }
-node: {title: "n81" label: "0x2Is  81" color: yellow info1: "visited: 12
+edge: {sourcename: "n79" targetname: "n68" label: "0" }
+node: {title: "n83" label: "0x2Is  83" color: yellow info1: "visited: 12
 "}
-node: {title: "n86" label: "0x1Is  86" color: yellow info1: "visited: 12
+node: {title: "n88" label: "0x1Is  88" color: yellow info1: "visited: 12
 "}
-node: {title: "n87" label: "ProjM 1 87" color: yellow info1: "visited: 12
+node: {title: "n89" label: "ProjM 1 89" color: yellow info1: "visited: 12
 "}
-edge: {sourcename: "n87" targetname: "n66" label: "0" color: blue}
+edge: {sourcename: "n89" targetname: "n68" 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"  info1: "visited: 13
+graph: { title: "n85" label: "85" status:clustered color:yellow
+edge: {sourcename: "n85" targetname: "n86" label: "0" color: red}
+node: {title: "n84" label: "Jmp  84"  info1: "visited: 13
 "}
 }
 
-node: {title: "n90" label: "Bad  90"  info1: "visited: 0
+node: {title: "n92" label: "Bad  92"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
index 8c932c2..00488f2 100644 (file)
--- a/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/CONST_EVAL_EXAMPLE_main.vcg
@@ -17,36 +17,36 @@ 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 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"  info1: "visited: 5
+node: {title: "n45" label: "End  45" color: blue info1: "visited: 4
 "}
-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 info1: "visited: 6
+edge: {sourcename: "n48" targetname: "n49" label: "0" color: red}
+node: {title: "n47" label: "Return  47"  info1: "visited: 5
+"}
+edge: {sourcename: "n47" targetname: "n53" label: "0" color: blue}
+edge: {sourcename: "n47" targetname: "n52" label: "1" }
+edge: {sourcename: "n47" targetname: "n52" label: "2" }
+}
+
+graph: { title: "n50" label: "50" status:clustered color:yellow
+edge: {sourcename: "n50" targetname: "n49" label: "0" color: red}
+node: {title: "n49" label: "ProjX 0 49" 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
+edge: {sourcename: "n49" targetname: "n51" label: "0" color: red}
+node: {title: "n51" label: "Start  51" color: blue info1: "visited: 6
 start of method of type main
 "}
-node: {title: "n50" label: "0xCIs  50" color: yellow info1: "visited: 6
+node: {title: "n52" label: "0xCIs  52" color: yellow info1: "visited: 6
 "}
-node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 6
+node: {title: "n53" label: "ProjM 1 53" color: yellow info1: "visited: 6
 "}
-edge: {sourcename: "n51" targetname: "n49" label: "0" color: blue}
+edge: {sourcename: "n53" targetname: "n51" label: "0" color: blue}
 }
 
-node: {title: "n55" label: "Bad  55"  info1: "visited: 0
+node: {title: "n57" label: "Bad  57"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg
index a5011e3..4ba2b0f 100644 (file)
--- a/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg
+++ b/testprograms/ref-results/DEAD_BLOCK_main-cfg.vcg
@@ -17,12 +17,12 @@ 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"  info1: "visited: 0
+node: {title: "n67" label: "Block 67" }
+edge: { sourcename: "n67" targetname: "n75"}
+node: {title: "n75" label: "Block 75" }
+edge: { sourcename: "n75" targetname: "n71"}
+node: {title: "n71" label: "Block 71" }
+edge: { sourcename: "n71" targetname: "n71"}
+node: {title: "n70" label: "Bad  70"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/DEAD_BLOCK_main.vcg b/testprograms/ref-results/DEAD_BLOCK_main.vcg
index c52eb36..926cee1 100644 (file)
--- a/testprograms/ref-results/DEAD_BLOCK_main.vcg
+++ b/testprograms/ref-results/DEAD_BLOCK_main.vcg
@@ -17,35 +17,35 @@ 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 info1: "visited: 9
+graph: { title: "n67" label: "67" status:clustered color:yellow
+edge: {sourcename: "n67" targetname: "n68" label: "0" color: red}
+node: {title: "n66" label: "End  66" 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"  info1: "visited: 10
+graph: { title: "n75" label: "75" status:clustered color:yellow
+edge: {sourcename: "n75" targetname: "n72" label: "0" color: red}
+node: {title: "n68" label: "Return  68"  info1: "visited: 10
 "}
-edge: {sourcename: "n66" targetname: "n75" label: "0" color: blue}
-edge: {sourcename: "n66" targetname: "n74" label: "1" }
+edge: {sourcename: "n68" targetname: "n77" label: "0" color: blue}
+edge: {sourcename: "n68" targetname: "n76" 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 info1: "visited: 11
+graph: { title: "n71" label: "71" status:clustered color:yellow
+edge: {sourcename: "n71" targetname: "n72" label: "0" color: red}
+node: {title: "n72" label: "ProjX 0 72" 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
+edge: {sourcename: "n72" targetname: "n73" label: "0" color: red}
+node: {title: "n73" label: "Start  73" color: blue info1: "visited: 11
 start of method of type main
 "}
-node: {title: "n74" label: "0x2Is  74" color: yellow info1: "visited: 11
+node: {title: "n76" label: "0x2Is  76" color: yellow info1: "visited: 11
 "}
-node: {title: "n75" label: "ProjM 1 75" color: yellow info1: "visited: 11
+node: {title: "n77" label: "ProjM 1 77" color: yellow info1: "visited: 11
 "}
-edge: {sourcename: "n75" targetname: "n71" label: "0" color: blue}
+edge: {sourcename: "n77" targetname: "n73" label: "0" color: blue}
 }
 
-node: {title: "n68" label: "Bad  68"  info1: "visited: 0
+node: {title: "n70" label: "Bad  70"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/EMPTY_main.vcg b/testprograms/ref-results/EMPTY_main.vcg
index 34eb053..9e1fc98 100644 (file)
--- a/testprograms/ref-results/EMPTY_main.vcg
+++ b/testprograms/ref-results/EMPTY_main.vcg
@@ -17,32 +17,32 @@ 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 info1: "visited: 4
+graph: { title: "n16" label: "16" status:clustered color:yellow
+edge: {sourcename: "n16" targetname: "n30" label: "0" color: red}
+node: {title: "n17" label: "End  17" 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"  info1: "visited: 5
+graph: { title: "n28" label: "28" status:clustered color:yellow
+edge: {sourcename: "n28" targetname: "n22" label: "0" color: red}
+node: {title: "n30" label: "Return  30"  info1: "visited: 5
 "}
-edge: {sourcename: "n28" targetname: "n21" label: "0" color: blue}
+edge: {sourcename: "n30" targetname: "n23" 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
+graph: { title: "n18" label: "18" status:clustered color:yellow
+edge: {sourcename: "n18" targetname: "n22" label: "0" color: red}
+node: {title: "n22" label: "ProjX 0 22" 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
+edge: {sourcename: "n22" targetname: "n19" label: "0" color: red}
+node: {title: "n19" label: "Start  19" color: blue info1: "visited: 6
 start of method of type EMPTY_main
 "}
-node: {title: "n21" label: "ProjM 1 21" color: yellow info1: "visited: 6
+node: {title: "n23" label: "ProjM 1 23" color: yellow info1: "visited: 6
 "}
-edge: {sourcename: "n21" targetname: "n17" label: "0" color: blue}
+edge: {sourcename: "n23" targetname: "n19" label: "0" color: blue}
 }
 
-node: {title: "n18" label: "Bad  18"  info1: "visited: 0
+node: {title: "n20" label: "Bad  20"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
index e02024e..b702490 100644 (file)
--- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
@@ -17,77 +17,77 @@ 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 info1: "visited: 19
+graph: { title: "n75" label: "75" status:clustered color:yellow
+node: {title: "n74" label: "End  74" color: blue info1: "visited: 19
 "}
-edge: {sourcename: "n72" targetname: "n78" label: "0" color: red}
-edge: {sourcename: "n72" targetname: "n84" label: "1" }
+edge: {sourcename: "n74" targetname: "n80" label: "0" color: red}
+edge: {sourcename: "n74" targetname: "n86" 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
+graph: { title: "n80" label: "80" status:clustered color:yellow
+edge: {sourcename: "n80" targetname: "n84" label: "0" color: red}
+edge: {sourcename: "n80" targetname: "n81" label: "1" color: red}
+node: {title: "n86" label: "PhiM  86" 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
+edge: {sourcename: "n86" targetname: "n96" label: "0" color: blue}
+edge: {sourcename: "n86" targetname: "n87" label: "1" color: blue}
+node: {title: "n81" label: "Jmp  81"  info1: "visited: 20
 "}
-node: {title: "n85" label: "ProjM 0 85" color: yellow info1: "visited: 20
+node: {title: "n87" label: "ProjM 0 87" 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: "n87" targetname: "n88" label: "0" color: blue}
+node: {title: "n88" label: "Store  88"  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: "n88" targetname: "n86" label: "0" color: blue}
+edge: {sourcename: "n88" targetname: "n94" label: "1" }
+edge: {sourcename: "n88" targetname: "n89" label: "2" }
+node: {title: "n89" label: "PhiIs  89" 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: "n89" targetname: "n92" label: "0" }
+edge: {sourcename: "n89" targetname: "n90" label: "1" }
+node: {title: "n90" label: "PhiIs  90" 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: "n90" targetname: "n91" label: "0" }
+edge: {sourcename: "n90" targetname: "n89" label: "1" }
+node: {title: "n94" label: "Sel VAR_A 94"  info1: "visited: 20
 Selecting entity of type int
   from entity of type GlobalType
 "}
-edge: {sourcename: "n92" targetname: "n84" label: "0" color: blue}
-edge: {sourcename: "n92" targetname: "n93" label: "1" }
+edge: {sourcename: "n94" targetname: "n86" label: "0" color: blue}
+edge: {sourcename: "n94" targetname: "n95" 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"  info1: "visited: 21
+graph: { title: "n85" label: "85" status:clustered color:yellow
+edge: {sourcename: "n85" targetname: "n78" label: "0" color: red}
+node: {title: "n84" label: "Jmp  84"  info1: "visited: 21
 "}
-node: {title: "n90" label: "ProjIs 0 90" color: yellow info1: "visited: 21
+node: {title: "n92" label: "ProjIs 0 92" color: yellow info1: "visited: 21
 "}
-edge: {sourcename: "n90" targetname: "n91" label: "0" }
+edge: {sourcename: "n92" targetname: "n93" 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 info1: "visited: 22
+graph: { title: "n77" label: "77" status:clustered color:yellow
+edge: {sourcename: "n77" targetname: "n78" label: "0" color: red}
+node: {title: "n78" label: "ProjX 0 78" 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
+edge: {sourcename: "n78" targetname: "n79" label: "0" color: red}
+node: {title: "n79" label: "Start  79" color: blue info1: "visited: 22
 start of method of type main_tp
   param 0 type: int
 "}
-node: {title: "n89" label: "0x1Is  89" color: yellow info1: "visited: 22
+node: {title: "n91" label: "0x1Is  91" color: yellow info1: "visited: 22
 "}
-node: {title: "n91" label: "ProjT 4 91" color: yellow info1: "visited: 22
+node: {title: "n93" label: "ProjT 4 93" 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: "n79" label: "0" }
+node: {title: "n95" label: "ProjP 3 95" 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: "n95" targetname: "n79" label: "0" }
+node: {title: "n96" label: "ProjM 1 96" color: yellow info1: "visited: 22
 "}
-edge: {sourcename: "n94" targetname: "n77" label: "0" color: blue}
+edge: {sourcename: "n96" targetname: "n79" label: "0" color: blue}
 }
 
-node: {title: "n74" label: "Bad  74"  info1: "visited: 0
+node: {title: "n76" label: "Bad  76"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg
index d11072e..c501232 100644 (file)
--- a/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/GLOBAL_CSE_EXAMPLE_main.vcg
@@ -17,91 +17,91 @@ 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 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"  info1: "visited: 13
+edge: {sourcename: "n64" targetname: "n65" label: "0" color: red}
+node: {title: "n63" label: "End  63" color: blue info1: "visited: 12
 "}
-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"  info1: "visited: 14
+edge: {sourcename: "n66" targetname: "n80" label: "0" color: red}
+edge: {sourcename: "n66" targetname: "n67" label: "1" color: red}
+node: {title: "n65" label: "Return  65"  info1: "visited: 13
+"}
+edge: {sourcename: "n65" targetname: "n88" label: "0" color: blue}
+edge: {sourcename: "n65" targetname: "n83" label: "1" }
+node: {title: "n83" label: "PhiIs  83" color: green info1: "visited: 13
 "}
+edge: {sourcename: "n83" targetname: "n86" label: "0" }
+edge: {sourcename: "n83" targetname: "n84" label: "1" }
 }
 
 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
+node: {title: "n67" label: "Jmp  67"  info1: "visited: 14
 "}
-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 info1: "visited: 16
+edge: {sourcename: "n70" targetname: "n71" label: "0" color: red}
+node: {title: "n74" label: "Cond  74"  info1: "visited: 15
+"}
+edge: {sourcename: "n74" targetname: "n75" label: "0" }
+}
+
+graph: { title: "n72" label: "72" status:clustered color:yellow
+edge: {sourcename: "n72" targetname: "n71" label: "0" color: red}
+node: {title: "n73" label: "Start  73" color: blue info1: "visited: 16
 start of method of type GLOBAL_CSE_EXAMPLE_main
   param 0 type: int
 "}
 }
 
-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
+graph: { title: "n81" label: "81" status:clustered color:yellow
+edge: {sourcename: "n81" targetname: "n82" label: "0" color: red}
+node: {title: "n80" label: "Jmp  80"  info1: "visited: 17
 "}
 }
 
-node: {title: "n67" label: "ProjX 1 67" color: yellow info1: "visited: 18
+node: {title: "n69" label: "ProjX 1 69" 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: "n74" label: "0" color: red}
+node: {title: "n71" label: "ProjX 0 71" 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: "n71" targetname: "n73" label: "0" color: red}
+node: {title: "n75" label: "Projb Eq 75" color: yellow info1: "visited: 18
 "}
-edge: {sourcename: "n73" targetname: "n74" label: "0" }
-node: {title: "n74" label: "CmpT  74"  info1: "visited: 18
+edge: {sourcename: "n75" targetname: "n76" label: "0" }
+node: {title: "n76" label: "CmpT  76"  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
+edge: {sourcename: "n76" targetname: "n78" label: "0" }
+edge: {sourcename: "n76" targetname: "n77" label: "1" }
+node: {title: "n77" label: "0x2Is  77" color: yellow info1: "visited: 18
 "}
-node: {title: "n76" label: "ProjIs 0 76" color: yellow info1: "visited: 18
+node: {title: "n78" label: "ProjIs 0 78" 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: "n78" targetname: "n79" label: "0" }
+node: {title: "n79" label: "ProjT 4 79" 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: "n79" targetname: "n73" label: "0" }
+node: {title: "n82" label: "ProjX 0 82" 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: "n74" label: "0" color: red}
+node: {title: "n84" label: "SubIs  84"  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
+edge: {sourcename: "n84" targetname: "n78" label: "0" }
+edge: {sourcename: "n84" targetname: "n85" label: "1" }
+node: {title: "n85" label: "0x3Is  85" color: yellow info1: "visited: 18
 "}
-node: {title: "n84" label: "AddIs  84"  info1: "visited: 18
+node: {title: "n86" label: "AddIs  86"  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
+edge: {sourcename: "n86" targetname: "n84" label: "0" }
+edge: {sourcename: "n86" targetname: "n87" label: "1" }
+node: {title: "n87" label: "0x5Is  87" color: yellow info1: "visited: 18
 "}
-node: {title: "n86" label: "ProjM 1 86" color: yellow info1: "visited: 18
+node: {title: "n88" label: "ProjM 1 88" color: yellow info1: "visited: 18
 "}
-edge: {sourcename: "n86" targetname: "n71" label: "0" color: blue}
-node: {title: "n89" label: "Bad  89"  info1: "visited: 0
+edge: {sourcename: "n88" targetname: "n73" label: "0" color: blue}
+node: {title: "n91" label: "Bad  91"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/GLOBAL_VAR_main-all.vcg b/testprograms/ref-results/GLOBAL_VAR_main-all.vcg
index a420e6a..b1aaf20 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main-all.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main-all.vcg
@@ -17,61 +17,61 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-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 info1: "visited: 11
-"}
-edge: {sourcename: "n38" targetname: "n39" label: "0" color: red}
-node: {title: "n39" label: "Return  39"  info1: "visited: 11
+node: {title: "n39" label: "End  39" color: blue 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 info1: "visited: 11
 "}
 edge: {sourcename: "n40" targetname: "n41" label: "0" color: red}
-node: {title: "n41" label: "ProjX 0 41" color: yellow info1: "visited: 11
+node: {title: "n41" label: "Return  41"  info1: "visited: 11
 "}
 edge: { sourcename: "n41" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
-edge: {sourcename: "n41" targetname: "n43" label: "0" color: red}
+edge: {sourcename: "n41" targetname: "n46" label: "0" color: blue}
 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
-start of method of type GLOBAL_VAR_main
+edge: {sourcename: "n42" targetname: "n43" label: "0" color: red}
+node: {title: "n43" label: "ProjX 0 43" color: yellow info1: "visited: 11
 "}
-edge: { sourcename: "n43" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n44" label: "ProjM 0 44" color: yellow info1: "visited: 11
+edge: { sourcename: "n43" targetname: "n44" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n43" targetname: "n45" label: "0" color: red}
+node: {title: "n44" label: "Block  44" color: lightyellow 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"  info1: "visited: 11
+edge: {sourcename: "n44" targetname: "n43" label: "0" color: red}
+node: {title: "n45" label: "Start  45" color: blue info1: "visited: 11
+start of method of type GLOBAL_VAR_main
 "}
-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 info1: "visited: 11
+edge: { sourcename: "n45" targetname: "n44" class: 2 priority: 2 linestyle: dotted}
+node: {title: "n46" label: "ProjM 0 46" color: yellow info1: "visited: 11
 "}
 edge: { sourcename: "n46" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n47" label: "Sel i 47"  info1: "visited: 11
+edge: {sourcename: "n46" targetname: "n47" label: "0" color: blue}
+node: {title: "n47" label: "Store  47"  info1: "visited: 11
+"}
+edge: { sourcename: "n47" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n47" targetname: "n51" label: "0" color: blue}
+edge: {sourcename: "n47" targetname: "n49" label: "1" }
+edge: {sourcename: "n47" targetname: "n48" label: "2" }
+node: {title: "n48" label: "0x2Is  48" color: yellow info1: "visited: 11
+"}
+edge: { sourcename: "n48" targetname: "n44" class: 2 priority: 2 linestyle: dotted}
+node: {title: "n49" label: "Sel i 49"  info1: "visited: 11
 Selecting entity of type int
   from entity of type GlobalType
 "}
-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 info1: "visited: 11
+edge: { sourcename: "n49" targetname: "n42" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n49" targetname: "n51" label: "0" color: blue}
+edge: {sourcename: "n49" targetname: "n50" label: "1" }
+node: {title: "n50" label: "ProjP 3 50" 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 info1: "visited: 11
+edge: { sourcename: "n50" targetname: "n44" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n50" targetname: "n45" label: "0" }
+node: {title: "n51" label: "ProjM 1 51" 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}
-node: {title: "e14" label: "ent i" color: yellow
+edge: { sourcename: "n51" targetname: "n44" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n51" targetname: "n45" label: "0" color: blue}
+node: {title: "e16" label: "ent i" color: yellow
  info1: "
-id: e14
+id: e16
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -81,15 +81,15 @@ name:    i
 ld_name: GlobalType_i
 offset:  -1"
 }
-edge: { sourcename: "e14" targetname: "t10"class: 3 label: "type" color: red}
+edge: { sourcename: "e16" targetname: "t12"class: 3 label: "type" color: red}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-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
+edge: { sourcename: "t0" targetname: "e15"class: 12 label: "member" color:blue}
+edge: { sourcename: "t0" targetname: "e16"class: 12 label: "member" color:blue}
+node: {title: "e15" label: "ent GLOBAL_VAR_main" color: yellow
  info1: "
-id: e13
+id: e15
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -98,22 +98,22 @@ peculiarity: peculiarity_existent
 name:    GLOBAL_VAR_main
 ld_name: GlobalType_GLOBAL_VAR_main
 offset:  -1
-irg = g27"
+irg = g29"
 }
-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 info1: "visited: 1
+edge: { sourcename: "e15" targetname: "t13"class: 3 label: "type" color: red}
+edge: { sourcename: "e15" targetname: "n14"label: "value 0"}
+node: {title: "n14" label: "&(GlobalType_GLOBAL_VAR_main)P  14" color: yellow info1: "visited: 1
 "}
-node: {title: "t11" label: "method GLOBAL_VAR_main" info1: "state: layout_fixed,
+node: {title: "t13" label: "method GLOBAL_VAR_main" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-node: {title: "t10" label: "primitive int" info1: "state: layout_fixed,
+node: {title: "t12" label: "primitive int" info1: "state: layout_fixed,
 mode: Is,
 size: 4B,
 "}
-node: {title: "t15" label: "class GLOBAL_VAR_mainframe_tp" info1: "state: layout_undefined
+node: {title: "t17" label: "class GLOBAL_VAR_mainframe_tp" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "n47" targetname: "e14"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n49" targetname: "e16"class: 2 priority: 2 linestyle: dotted}
 }

diff --git a/testprograms/ref-results/GLOBAL_VAR_main.vcg b/testprograms/ref-results/GLOBAL_VAR_main.vcg
index a715627..3566ee4 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main.vcg
@@ -17,51 +17,51 @@ 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 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: "End  39" 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"  info1: "visited: 8
+graph: { title: "n42" label: "42" status:clustered color:yellow
+edge: {sourcename: "n42" targetname: "n43" label: "0" color: red}
+node: {title: "n41" label: "Return  41"  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: "n41" targetname: "n46" label: "0" color: blue}
+node: {title: "n46" label: "ProjM 0 46" 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: "n46" targetname: "n47" label: "0" color: blue}
+node: {title: "n47" label: "Store  47"  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: "n51" label: "0" color: blue}
+edge: {sourcename: "n47" targetname: "n49" label: "1" }
+edge: {sourcename: "n47" targetname: "n48" label: "2" }
+node: {title: "n49" label: "Sel i 49"  info1: "visited: 8
 Selecting entity of type int
   from entity of type GlobalType
 "}
-edge: {sourcename: "n47" targetname: "n49" label: "0" color: blue}
-edge: {sourcename: "n47" targetname: "n48" label: "1" }
+edge: {sourcename: "n49" targetname: "n51" label: "0" color: blue}
+edge: {sourcename: "n49" targetname: "n50" 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 info1: "visited: 9
+graph: { title: "n44" label: "44" status:clustered color:yellow
+edge: {sourcename: "n44" targetname: "n43" label: "0" color: red}
+node: {title: "n43" label: "ProjX 0 43" 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
+edge: {sourcename: "n43" targetname: "n45" label: "0" color: red}
+node: {title: "n45" label: "Start  45" color: blue info1: "visited: 9
 start of method of type GLOBAL_VAR_main
 "}
-node: {title: "n46" label: "0x2Is  46" color: yellow info1: "visited: 9
+node: {title: "n48" label: "0x2Is  48" color: yellow info1: "visited: 9
 "}
-node: {title: "n48" label: "ProjP 3 48" color: yellow info1: "visited: 9
+node: {title: "n50" label: "ProjP 3 50" 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: "n50" targetname: "n45" label: "0" }
+node: {title: "n51" label: "ProjM 1 51" color: yellow info1: "visited: 9
 "}
-edge: {sourcename: "n49" targetname: "n43" label: "0" color: blue}
+edge: {sourcename: "n51" targetname: "n45" label: "0" color: blue}
 }
 
-node: {title: "n52" label: "Bad  52"  info1: "visited: 0
+node: {title: "n54" label: "Bad  54"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg
index 5726768..3706b83 100644 (file)
--- a/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/IF_ELSE_EXAMPLE_main.vcg
@@ -17,38 +17,38 @@ 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 info1: "visited: 13
+graph: { title: "n64" label: "64" status:clustered color:yellow
+edge: {sourcename: "n64" targetname: "n65" label: "0" color: red}
+node: {title: "n63" label: "End  63" 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"  info1: "visited: 14
+graph: { title: "n68" label: "68" status:clustered color:yellow
+edge: {sourcename: "n68" targetname: "n69" label: "0" color: red}
+node: {title: "n65" label: "Return  65"  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" }
+edge: {sourcename: "n65" targetname: "n75" label: "0" color: blue}
+edge: {sourcename: "n65" targetname: "n74" label: "1" }
+edge: {sourcename: "n65" targetname: "n73" 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 info1: "visited: 15
+graph: { title: "n70" label: "70" status:clustered color:yellow
+edge: {sourcename: "n70" targetname: "n69" label: "0" color: red}
+node: {title: "n69" label: "ProjX 0 69" 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
+edge: {sourcename: "n69" targetname: "n71" label: "0" color: red}
+node: {title: "n71" label: "Start  71" color: blue info1: "visited: 15
 start of method of type IF_ELSE_EXAMPLE_main
 "}
-node: {title: "n71" label: "0x2Is  71" color: yellow info1: "visited: 15
+node: {title: "n73" label: "0x2Is  73" color: yellow info1: "visited: 15
 "}
-node: {title: "n72" label: "0x0Is  72" color: yellow info1: "visited: 15
+node: {title: "n74" label: "0x0Is  74" color: yellow info1: "visited: 15
 "}
-node: {title: "n73" label: "ProjM 1 73" color: yellow info1: "visited: 15
+node: {title: "n75" label: "ProjM 1 75" color: yellow info1: "visited: 15
 "}
-edge: {sourcename: "n73" targetname: "n69" label: "0" color: blue}
+edge: {sourcename: "n75" targetname: "n71" label: "0" color: blue}
 }
 
-node: {title: "n70" label: "Bad  70"  info1: "visited: 0
+node: {title: "n72" label: "Bad  72"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/IF_EXAMPLE_main.vcg b/testprograms/ref-results/IF_EXAMPLE_main.vcg
index 7c17457..7034445 100644 (file)
--- a/testprograms/ref-results/IF_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/IF_EXAMPLE_main.vcg
@@ -17,79 +17,79 @@ 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 info1: "visited: 8
+graph: { title: "n17" label: "17" status:clustered color:yellow
+edge: {sourcename: "n17" targetname: "n52" label: "0" color: red}
+node: {title: "n18" label: "End  18" 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"  info1: "visited: 9
+graph: { title: "n43" label: "43" status:clustered color:yellow
+edge: {sourcename: "n43" targetname: "n35" label: "0" color: red}
+edge: {sourcename: "n43" targetname: "n42" label: "1" color: red}
+node: {title: "n52" label: "Return  52"  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: "n52" targetname: "n24" label: "0" color: blue}
+edge: {sourcename: "n52" targetname: "n45" label: "1" }
+node: {title: "n45" label: "PhiIs  45" color: green info1: "visited: 9
 "}
-edge: {sourcename: "n43" targetname: "n28" label: "0" }
-edge: {sourcename: "n43" targetname: "n38" label: "1" }
+edge: {sourcename: "n45" targetname: "n30" label: "0" }
+edge: {sourcename: "n45" targetname: "n40" 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
+graph: { title: "n37" label: "37" status:clustered color:yellow
+edge: {sourcename: "n37" targetname: "n36" label: "0" color: red}
+node: {title: "n42" label: "Jmp  42"  info1: "visited: 10
 "}
-node: {title: "n38" label: "SubIs  38"  info1: "visited: 10
+node: {title: "n40" label: "SubIs  40"  info1: "visited: 10
 "}
-edge: {sourcename: "n38" targetname: "n28" label: "0" }
-edge: {sourcename: "n38" targetname: "n36" label: "1" }
+edge: {sourcename: "n40" targetname: "n30" label: "0" }
+edge: {sourcename: "n40" targetname: "n38" 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 info1: "visited: 11
+graph: { title: "n29" label: "29" status:clustered color:yellow
+edge: {sourcename: "n29" targetname: "n23" label: "0" color: red}
+node: {title: "n36" label: "ProjX 1 36" 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: "n36" targetname: "n34" label: "0" color: red}
+node: {title: "n34" label: "Cond  34"  info1: "visited: 11
 "}
-edge: {sourcename: "n32" targetname: "n31" label: "0" }
-node: {title: "n31" label: "Projb Eq 31" color: yellow info1: "visited: 11
+edge: {sourcename: "n34" targetname: "n33" label: "0" }
+node: {title: "n33" label: "Projb Eq 33" color: yellow info1: "visited: 11
 "}
-edge: {sourcename: "n31" targetname: "n30" label: "0" }
-node: {title: "n30" label: "CmpT  30"  info1: "visited: 11
+edge: {sourcename: "n33" targetname: "n32" label: "0" }
+node: {title: "n32" label: "CmpT  32"  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: "n32" targetname: "n30" label: "0" }
+edge: {sourcename: "n32" targetname: "n31" label: "1" }
+node: {title: "n30" label: "ProjIs 0 30" 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: "n30" targetname: "n27" label: "0" }
+node: {title: "n35" label: "ProjX 0 35" color: yellow info1: "visited: 11
 "}
-edge: {sourcename: "n33" targetname: "n32" label: "0" color: red}
+edge: {sourcename: "n35" targetname: "n34" 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 info1: "visited: 12
+graph: { title: "n19" label: "19" status:clustered color:yellow
+edge: {sourcename: "n19" targetname: "n23" label: "0" color: red}
+node: {title: "n23" label: "ProjX 0 23" 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
+edge: {sourcename: "n23" targetname: "n20" label: "0" color: red}
+node: {title: "n20" label: "Start  20" color: blue info1: "visited: 12
 start of method of type IF_EXAMPLE_main
   param 0 type: int
 "}
-node: {title: "n29" label: "0x2Is  29" color: yellow info1: "visited: 12
+node: {title: "n31" label: "0x2Is  31" color: yellow info1: "visited: 12
 "}
-node: {title: "n25" label: "ProjT 4 25" color: yellow info1: "visited: 12
+node: {title: "n27" label: "ProjT 4 27" color: yellow info1: "visited: 12
 "}
-edge: {sourcename: "n25" targetname: "n18" label: "0" }
-node: {title: "n36" label: "0x3Is  36" color: yellow info1: "visited: 12
+edge: {sourcename: "n27" targetname: "n20" label: "0" }
+node: {title: "n38" label: "0x3Is  38" color: yellow info1: "visited: 12
 "}
-node: {title: "n22" label: "ProjM 1 22" color: yellow info1: "visited: 12
+node: {title: "n24" label: "ProjM 1 24" color: yellow info1: "visited: 12
 "}
-edge: {sourcename: "n22" targetname: "n18" label: "0" color: blue}
+edge: {sourcename: "n24" targetname: "n20" label: "0" color: blue}
 }
 
-node: {title: "n19" label: "Bad  19"  info1: "visited: 0
+node: {title: "n21" label: "Bad  21"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/IF_WHILE_EXAMPLE_main.vcg b/testprograms/ref-results/IF_WHILE_EXAMPLE_main.vcg
index 0ae2f65..2a5d9d5 100644 (file)
--- a/testprograms/ref-results/IF_WHILE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/IF_WHILE_EXAMPLE_main.vcg
@@ -17,135 +17,135 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-node: {title: "n88" label: "Start  88" color: blue info1: "visited: 14
+node: {title: "n90" label: "Start  90" color: blue info1: "visited: 14
 start of method of type main
 "}
-edge: { sourcename: "n88" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n87" label: "ProjX 0 87" color: yellow info1: "visited: 14
+edge: { sourcename: "n90" targetname: "n88" class: 2 priority: 2 linestyle: dotted}
+node: {title: "n89" label: "ProjX 0 89" 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 info1: "visited: 14
+edge: { sourcename: "n89" targetname: "n88" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n89" targetname: "n90" label: "0" color: red}
+node: {title: "n88" label: "Block  88" 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: "n88" targetname: "n89" label: "0" color: red}
+node: {title: "n87" label: "0x0Iu  87" color: yellow info1: "visited: 14
 "}
-edge: { sourcename: "n85" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n84" label: "CmpT  84"  info1: "visited: 14
+edge: { sourcename: "n87" targetname: "n88" class: 2 priority: 2 linestyle: dotted}
+node: {title: "n86" label: "CmpT  86"  info1: "visited: 14
 "}
-edge: { sourcename: "n84" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n86" targetname: "n80" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n86" targetname: "n87" label: "0" }
+edge: {sourcename: "n86" targetname: "n87" label: "1" }
+node: {title: "n85" label: "Projb Eq 85" color: yellow info1: "visited: 14
+"}
+edge: { sourcename: "n85" targetname: "n80" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n85" targetname: "n86" label: "0" }
+node: {title: "n84" label: "Cond  84"  info1: "visited: 14
+"}
+edge: { sourcename: "n84" targetname: "n80" 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 info1: "visited: 14
+node: {title: "n83" label: "ProjX 1 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"  info1: "visited: 14
+edge: { sourcename: "n83" targetname: "n80" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n83" targetname: "n84" label: "0" color: red}
+node: {title: "n82" label: "Block  82" color: lightyellow 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 info1: "visited: 14
+edge: {sourcename: "n82" targetname: "n83" label: "0" color: red}
+node: {title: "n81" label: "Jmp  81"  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 info1: "visited: 14
+edge: { sourcename: "n81" targetname: "n82" class: 2 priority: 2 linestyle: dotted}
+node: {title: "n92" label: "Block  92" 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: "n92" targetname: "n89" label: "0" color: red}
+node: {title: "n91" label: "Jmp  91"  info1: "visited: 14
 "}
-edge: { sourcename: "n79" targetname: "n80" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n90" label: "Block  90" color: lightyellow info1: "visited: 14
+edge: { sourcename: "n91" targetname: "n92" class: 2 priority: 2 linestyle: dotted}
+node: {title: "n80" label: "Block  80" 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: "n80" targetname: "n91" label: "0" color: red}
+edge: {sourcename: "n80" targetname: "n81" label: "1" color: red}
+node: {title: "n79" label: "ProjX 0 79" color: yellow info1: "visited: 14
 "}
-edge: { sourcename: "n89" targetname: "n90" class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n79" targetname: "n80" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n79" targetname: "n84" label: "0" color: red}
 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: "n78" targetname: "n79" label: "0" color: red}
+node: {title: "n96" label: "0x0Iu  96" 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 info1: "visited: 14
+edge: { sourcename: "n96" targetname: "n88" class: 2 priority: 2 linestyle: dotted}
+node: {title: "n95" label: "PhiIu  95" color: green 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: "n95" targetname: "n80" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n95" targetname: "n96" label: "0" }
+edge: {sourcename: "n95" targetname: "n94" label: "1" }
+node: {title: "n97" label: "0x1Iu  97" color: yellow info1: "visited: 14
 "}
-edge: { sourcename: "n94" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n93" label: "PhiIu  93" color: green info1: "visited: 14
+edge: { sourcename: "n97" targetname: "n88" class: 2 priority: 2 linestyle: dotted}
+node: {title: "n94" label: "PhiIu  94" 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 info1: "visited: 14
+edge: { sourcename: "n94" targetname: "n80" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n94" targetname: "n97" label: "0" }
+edge: {sourcename: "n94" targetname: "n95" label: "1" }
+node: {title: "n93" label: "SubIu  93"  info1: "visited: 14
 "}
-edge: { sourcename: "n95" targetname: "n86" class: 2 priority: 2 linestyle: dotted}
-node: {title: "n92" label: "PhiIu  92" color: green info1: "visited: 14
+edge: { sourcename: "n93" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n93" targetname: "n95" label: "0" }
+edge: {sourcename: "n93" targetname: "n94" label: "1" }
+node: {title: "n98" label: "ProjM 1 98" color: yellow 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"  info1: "visited: 14
+edge: { sourcename: "n98" targetname: "n88" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n98" targetname: "n90" label: "0" color: blue}
+node: {title: "n77" label: "Return  77"  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 info1: "visited: 14
+edge: { sourcename: "n77" targetname: "n78" class: 2 priority: 2 linestyle: dotted}
+edge: {sourcename: "n77" targetname: "n98" label: "0" color: blue}
+edge: {sourcename: "n77" targetname: "n93" label: "1" }
+node: {title: "n76" label: "Block  76" color: lightyellow 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"  info1: "visited: 14
+edge: {sourcename: "n76" targetname: "n77" label: "0" color: red}
+node: {title: "n75" label: "End  75" color: blue 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 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}
-edge: {sourcename: "n87" targetname: "n90" color: red linestyle: dashed}
-edge: {sourcename: "n87" targetname: "n86" color: red linestyle: dashed}
 edge: {sourcename: "n90" targetname: "n89" color: red linestyle: dashed}
-edge: {sourcename: "n89" targetname: "n78" color: red linestyle: dashed}
-edge: {sourcename: "n78" targetname: "n81" color: red linestyle: dashed}
-edge: {sourcename: "n78" targetname: "n82" color: red linestyle: dashed}
-edge: {sourcename: "n78" targetname: "n83" color: red linestyle: dashed}
-edge: {sourcename: "n78" targetname: "n84" color: red linestyle: dashed}
-edge: {sourcename: "n78" targetname: "n77" color: red linestyle: dashed}
-edge: {sourcename: "n78" targetname: "n93" color: red linestyle: dashed}
-edge: {sourcename: "n78" targetname: "n92" color: red linestyle: dashed}
-edge: {sourcename: "n81" targetname: "n80" color: red linestyle: dashed}
+edge: {sourcename: "n90" targetname: "n98" color: red linestyle: dashed}
+edge: {sourcename: "n89" targetname: "n92" color: red linestyle: dashed}
+edge: {sourcename: "n89" targetname: "n88" color: red linestyle: dashed}
+edge: {sourcename: "n92" targetname: "n91" color: red linestyle: dashed}
+edge: {sourcename: "n91" targetname: "n80" color: red linestyle: dashed}
+edge: {sourcename: "n80" targetname: "n83" color: red linestyle: dashed}
+edge: {sourcename: "n80" targetname: "n84" color: red linestyle: dashed}
+edge: {sourcename: "n80" targetname: "n85" color: red linestyle: dashed}
+edge: {sourcename: "n80" targetname: "n86" color: red linestyle: dashed}
 edge: {sourcename: "n80" targetname: "n79" color: red linestyle: dashed}
-edge: {sourcename: "n79" targetname: "n78" color: red linestyle: dashed}
+edge: {sourcename: "n80" targetname: "n95" color: red linestyle: dashed}
+edge: {sourcename: "n80" targetname: "n94" color: red linestyle: dashed}
+edge: {sourcename: "n83" targetname: "n82" color: red linestyle: dashed}
 edge: {sourcename: "n82" targetname: "n81" color: red linestyle: dashed}
-edge: {sourcename: "n82" targetname: "n77" color: red linestyle: dashed}
+edge: {sourcename: "n81" targetname: "n80" color: red linestyle: dashed}
+edge: {sourcename: "n84" targetname: "n83" color: red linestyle: dashed}
+edge: {sourcename: "n84" targetname: "n79" color: red linestyle: dashed}
+edge: {sourcename: "n79" targetname: "n78" color: red linestyle: dashed}
+edge: {sourcename: "n78" targetname: "n77" color: red linestyle: dashed}
+edge: {sourcename: "n78" targetname: "n93" color: red linestyle: dashed}
 edge: {sourcename: "n77" targetname: "n76" color: red linestyle: dashed}
 edge: {sourcename: "n76" targetname: "n75" color: red linestyle: dashed}
-edge: {sourcename: "n76" targetname: "n91" color: red linestyle: dashed}
-edge: {sourcename: "n75" targetname: "n74" color: red linestyle: dashed}
-edge: {sourcename: "n74" targetname: "n73" color: red linestyle: dashed}
-edge: {sourcename: "n91" targetname: "n75" color: red linestyle: dashed}
-edge: {sourcename: "n83" targetname: "n82" color: red linestyle: dashed}
-edge: {sourcename: "n84" targetname: "n83" color: red linestyle: dashed}
-edge: {sourcename: "n93" targetname: "n92" color: red linestyle: dashed}
-edge: {sourcename: "n93" targetname: "n91" color: red linestyle: dashed}
-edge: {sourcename: "n92" targetname: "n93" color: red linestyle: dashed}
-edge: {sourcename: "n92" targetname: "n91" color: red linestyle: dashed}
-edge: {sourcename: "n86" targetname: "n87" color: red linestyle: dashed}
-edge: {sourcename: "n86" targetname: "n88" color: red linestyle: dashed}
-edge: {sourcename: "n86" targetname: "n85" color: red linestyle: dashed}
-edge: {sourcename: "n86" targetname: "n96" color: red linestyle: dashed}
-edge: {sourcename: "n86" targetname: "n94" color: red linestyle: dashed}
-edge: {sourcename: "n86" targetname: "n95" color: red linestyle: dashed}
-edge: {sourcename: "n85" targetname: "n84" color: red linestyle: dashed}
+edge: {sourcename: "n93" targetname: "n77" color: red linestyle: dashed}
 edge: {sourcename: "n85" targetname: "n84" color: red linestyle: dashed}
-edge: {sourcename: "n96" targetname: "n75" color: red linestyle: dashed}
+edge: {sourcename: "n86" targetname: "n85" color: red linestyle: dashed}
+edge: {sourcename: "n95" targetname: "n94" color: red linestyle: dashed}
+edge: {sourcename: "n95" targetname: "n93" color: red linestyle: dashed}
+edge: {sourcename: "n94" targetname: "n95" color: red linestyle: dashed}
 edge: {sourcename: "n94" targetname: "n93" color: red linestyle: dashed}
-edge: {sourcename: "n95" targetname: "n92" color: red linestyle: dashed}
+edge: {sourcename: "n88" targetname: "n89" color: red linestyle: dashed}
+edge: {sourcename: "n88" targetname: "n90" color: red linestyle: dashed}
+edge: {sourcename: "n88" targetname: "n87" color: red linestyle: dashed}
+edge: {sourcename: "n88" targetname: "n98" color: red linestyle: dashed}
+edge: {sourcename: "n88" targetname: "n96" color: red linestyle: dashed}
+edge: {sourcename: "n88" targetname: "n97" color: red linestyle: dashed}
+edge: {sourcename: "n87" targetname: "n86" color: red linestyle: dashed}
+edge: {sourcename: "n87" targetname: "n86" color: red linestyle: dashed}
+edge: {sourcename: "n98" targetname: "n77" color: red linestyle: dashed}
+edge: {sourcename: "n96" targetname: "n95" color: red linestyle: dashed}
+edge: {sourcename: "n97" targetname: "n94" 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 df163fe..7d681c2 100644 (file)
--- a/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg
+++ b/testprograms/ref-results/IRREGULAR_CF_main-cfg.vcg
@@ -17,24 +17,24 @@ 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: "n90"}
 edge: { sourcename: "n67" targetname: "n69"}
 node: {title: "n69" label: "Block 69" }
+edge: { sourcename: "n69" targetname: "n83"}
 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
+edge: { sourcename: "n73" targetname: "n75"}
+node: {title: "n75" label: "Block 75" }
+edge: { sourcename: "n75" targetname: "n75"}
+node: {title: "n83" label: "Block 83" }
+edge: { sourcename: "n83" targetname: "n73"}
+node: {title: "n90" label: "Block 90" }
+edge: { sourcename: "n90" targetname: "n83"}
+node: {title: "n96" label: "Bad  96"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/IRREGULAR_CF_main.vcg b/testprograms/ref-results/IRREGULAR_CF_main.vcg
index 991ef1e..f9075df 100644 (file)
--- a/testprograms/ref-results/IRREGULAR_CF_main.vcg
+++ b/testprograms/ref-results/IRREGULAR_CF_main.vcg
@@ -17,98 +17,98 @@ 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 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"  info1: "visited: 6
+edge: {sourcename: "n65" targetname: "n66" label: "0" color: red}
+node: {title: "n64" label: "End  64" color: blue info1: "visited: 5
 "}
-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: "n89" label: "0" color: red}
 edge: {sourcename: "n67" targetname: "n68" label: "1" color: red}
-node: {title: "n66" label: "Jmp  66"  info1: "visited: 7
+node: {title: "n66" label: "Return  66"  info1: "visited: 6
 "}
+edge: {sourcename: "n66" targetname: "n92" label: "0" color: blue}
 }
 
 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
+edge: {sourcename: "n69" targetname: "n82" label: "0" color: red}
+edge: {sourcename: "n69" targetname: "n70" label: "1" color: red}
+node: {title: "n68" label: "Jmp  68"  info1: "visited: 7
 "}
 }
 
 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
+node: {title: "n70" label: "Jmp  70"  info1: "visited: 8
+"}
+}
+
+graph: { title: "n73" label: "73" status:clustered color:yellow
+edge: {sourcename: "n73" targetname: "n74" label: "0" color: red}
+node: {title: "n72" label: "ProjX 1 72" 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: "n72" targetname: "n77" label: "0" color: red}
+node: {title: "n77" label: "Cond  77"  info1: "visited: 9
 "}
-edge: {sourcename: "n75" targetname: "n76" label: "0" }
-node: {title: "n76" label: "Projb Eq 76" color: yellow info1: "visited: 9
+edge: {sourcename: "n77" targetname: "n78" label: "0" }
+node: {title: "n78" label: "Projb Eq 78" color: yellow info1: "visited: 9
 "}
-edge: {sourcename: "n76" targetname: "n77" label: "0" }
-node: {title: "n77" label: "CmpT  77"  info1: "visited: 9
+edge: {sourcename: "n78" targetname: "n79" label: "0" }
+node: {title: "n79" label: "CmpT  79"  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: "n79" targetname: "n81" label: "0" }
+edge: {sourcename: "n79" targetname: "n80" label: "1" }
+node: {title: "n84" label: "ProjX 0 84" color: yellow info1: "visited: 9
 "}
-edge: {sourcename: "n82" targetname: "n75" label: "0" color: red}
+edge: {sourcename: "n84" targetname: "n77" 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 info1: "visited: 10
+graph: { title: "n75" label: "75" status:clustered color:yellow
+edge: {sourcename: "n75" targetname: "n74" label: "0" color: red}
+node: {title: "n74" label: "ProjX 0 74" 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
+edge: {sourcename: "n74" targetname: "n76" label: "0" color: red}
+node: {title: "n76" label: "Start  76" color: blue info1: "visited: 10
 start of method of type main
 "}
-node: {title: "n78" label: "0x1Is  78" color: yellow info1: "visited: 10
+node: {title: "n80" label: "0x1Is  80" color: yellow info1: "visited: 10
 "}
-node: {title: "n79" label: "0x0Is  79" color: yellow info1: "visited: 10
+node: {title: "n81" label: "0x0Is  81" color: yellow info1: "visited: 10
 "}
-node: {title: "n86" label: "0x2Is  86" color: yellow info1: "visited: 10
+node: {title: "n88" label: "0x2Is  88" color: yellow info1: "visited: 10
 "}
-node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 10
+node: {title: "n92" label: "ProjM 1 92" color: yellow info1: "visited: 10
 "}
-edge: {sourcename: "n90" targetname: "n74" label: "0" color: blue}
+edge: {sourcename: "n92" targetname: "n76" 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 info1: "visited: 11
+graph: { title: "n83" label: "83" status:clustered color:yellow
+edge: {sourcename: "n83" targetname: "n84" label: "0" color: red}
+node: {title: "n82" label: "ProjX 1 82" 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: "n82" targetname: "n85" label: "0" color: red}
+node: {title: "n85" label: "Cond  85"  info1: "visited: 11
 "}
-edge: {sourcename: "n83" targetname: "n84" label: "0" }
-node: {title: "n84" label: "Projb Eq 84" color: yellow info1: "visited: 11
+edge: {sourcename: "n85" targetname: "n86" label: "0" }
+node: {title: "n86" label: "Projb Eq 86" color: yellow info1: "visited: 11
 "}
-edge: {sourcename: "n84" targetname: "n85" label: "0" }
-node: {title: "n85" label: "CmpT  85"  info1: "visited: 11
+edge: {sourcename: "n86" targetname: "n87" label: "0" }
+node: {title: "n87" label: "CmpT  87"  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: "n87" targetname: "n81" label: "0" }
+edge: {sourcename: "n87" targetname: "n88" label: "1" }
+node: {title: "n91" label: "ProjX 0 91" color: yellow info1: "visited: 11
 "}
-edge: {sourcename: "n89" targetname: "n83" label: "0" color: red}
+edge: {sourcename: "n91" targetname: "n85" 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"  info1: "visited: 12
+graph: { title: "n90" label: "90" status:clustered color:yellow
+edge: {sourcename: "n90" targetname: "n91" label: "0" color: red}
+node: {title: "n89" label: "Jmp  89"  info1: "visited: 12
 "}
 }
 
-node: {title: "n94" label: "Bad  94"  info1: "visited: 0
+node: {title: "n96" label: "Bad  96"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg
index dfd0e72..58f82c2 100644 (file)
--- a/testprograms/ref-results/IRR_LOOP_main-cfg.vcg
+++ b/testprograms/ref-results/IRR_LOOP_main-cfg.vcg
@@ -17,21 +17,21 @@ 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: "n68"}
 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
+edge: { sourcename: "n66" targetname: "n79"}
+edge: { sourcename: "n66" targetname: "n68"}
+node: {title: "n68" label: "Block 68" }
+edge: { sourcename: "n68" targetname: "n79"}
+edge: { sourcename: "n68" targetname: "n66"}
+node: {title: "n79" label: "Block 79" }
+edge: { sourcename: "n79" targetname: "n74"}
+node: {title: "n74" label: "Block 74" }
+edge: { sourcename: "n74" targetname: "n74"}
+node: {title: "n96" label: "Bad  96"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/IRR_LOOP_main.vcg b/testprograms/ref-results/IRR_LOOP_main.vcg
index 5698dde..ec52e61 100644 (file)
--- a/testprograms/ref-results/IRR_LOOP_main.vcg
+++ b/testprograms/ref-results/IRR_LOOP_main.vcg
@@ -17,113 +17,113 @@ 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 info1: "visited: 5
+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: 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"  info1: "visited: 6
+graph: { title: "n64" label: "64" status:clustered color:yellow
+edge: {sourcename: "n64" targetname: "n88" label: "0" color: red}
+edge: {sourcename: "n64" targetname: "n65" label: "1" color: red}
+node: {title: "n63" label: "Return  63"  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: "n63" targetname: "n89" label: "0" color: blue}
+node: {title: "n89" label: "PhiM  89" color: green info1: "visited: 6
 "}
-edge: {sourcename: "n87" targetname: "n89" label: "0" color: blue}
-edge: {sourcename: "n87" targetname: "n88" label: "1" color: blue}
+edge: {sourcename: "n89" targetname: "n91" label: "0" color: blue}
+edge: {sourcename: "n89" targetname: "n90" 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
+graph: { title: "n66" label: "66" status:clustered color:yellow
+edge: {sourcename: "n66" targetname: "n87" label: "0" color: red}
+edge: {sourcename: "n66" targetname: "n67" label: "1" color: red}
+node: {title: "n65" label: "ProjX 0 65" 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: "n65" targetname: "n70" label: "0" color: red}
+node: {title: "n69" label: "ProjX 1 69" 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: "n69" targetname: "n70" label: "0" color: red}
+node: {title: "n70" label: "Cond  70"  info1: "visited: 7
 "}
-edge: {sourcename: "n68" targetname: "n69" label: "0" }
-node: {title: "n69" label: "Projb Eq 69" color: yellow info1: "visited: 7
+edge: {sourcename: "n70" targetname: "n71" label: "0" }
+node: {title: "n71" label: "Projb Eq 71" color: yellow info1: "visited: 7
 "}
-edge: {sourcename: "n69" targetname: "n70" label: "0" }
-node: {title: "n70" label: "CmpT  70"  info1: "visited: 7
+edge: {sourcename: "n71" targetname: "n72" label: "0" }
+node: {title: "n72" label: "CmpT  72"  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: "n72" targetname: "n77" label: "0" }
+edge: {sourcename: "n72" targetname: "n73" label: "1" }
+node: {title: "n90" label: "PhiM  90" color: green info1: "visited: 7
 "}
-edge: {sourcename: "n88" targetname: "n90" label: "0" color: blue}
-edge: {sourcename: "n88" targetname: "n89" label: "1" color: blue}
+edge: {sourcename: "n90" targetname: "n92" label: "0" color: blue}
+edge: {sourcename: "n90" targetname: "n91" 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
+graph: { title: "n68" label: "68" status:clustered color:yellow
+edge: {sourcename: "n68" targetname: "n78" label: "0" color: red}
+edge: {sourcename: "n68" targetname: "n69" label: "1" color: red}
+node: {title: "n67" label: "ProjX 1 67" 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: "n67" targetname: "n84" label: "0" color: red}
+node: {title: "n84" label: "Cond  84"  info1: "visited: 8
 "}
-edge: {sourcename: "n82" targetname: "n83" label: "0" }
-node: {title: "n83" label: "Projb Eq 83" color: yellow info1: "visited: 8
+edge: {sourcename: "n84" targetname: "n85" label: "0" }
+node: {title: "n85" label: "Projb Eq 85" color: yellow info1: "visited: 8
 "}
-edge: {sourcename: "n83" targetname: "n84" label: "0" }
-node: {title: "n84" label: "CmpT  84"  info1: "visited: 8
+edge: {sourcename: "n85" targetname: "n86" label: "0" }
+node: {title: "n86" label: "CmpT  86"  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: "n77" label: "0" }
+edge: {sourcename: "n86" targetname: "n73" label: "1" }
+node: {title: "n88" label: "ProjX 0 88" 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: "n88" targetname: "n84" label: "0" color: red}
+node: {title: "n91" label: "PhiM  91" color: green info1: "visited: 8
 "}
-edge: {sourcename: "n89" targetname: "n90" label: "0" color: blue}
-edge: {sourcename: "n89" targetname: "n88" label: "1" color: blue}
+edge: {sourcename: "n91" targetname: "n92" label: "0" color: blue}
+edge: {sourcename: "n91" targetname: "n90" 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 info1: "visited: 9
+graph: { title: "n79" label: "79" status:clustered color:yellow
+edge: {sourcename: "n79" targetname: "n75" label: "0" color: red}
+node: {title: "n78" label: "ProjX 0 78" 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: "n80" label: "0" color: red}
+node: {title: "n80" label: "Cond  80"  info1: "visited: 9
 "}
-edge: {sourcename: "n78" targetname: "n79" label: "0" }
-node: {title: "n79" label: "Projb Eq 79" color: yellow info1: "visited: 9
+edge: {sourcename: "n80" targetname: "n81" label: "0" }
+node: {title: "n81" label: "Projb Eq 81" color: yellow info1: "visited: 9
 "}
-edge: {sourcename: "n79" targetname: "n80" label: "0" }
-node: {title: "n80" label: "CmpT  80"  info1: "visited: 9
+edge: {sourcename: "n81" targetname: "n82" label: "0" }
+node: {title: "n82" label: "CmpT  82"  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: "n82" targetname: "n77" label: "0" }
+edge: {sourcename: "n82" targetname: "n83" label: "1" }
+node: {title: "n87" label: "ProjX 1 87" color: yellow info1: "visited: 9
 "}
-edge: {sourcename: "n85" targetname: "n78" label: "0" color: red}
+edge: {sourcename: "n87" targetname: "n80" 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 info1: "visited: 10
+graph: { title: "n74" label: "74" status:clustered color:yellow
+edge: {sourcename: "n74" targetname: "n75" label: "0" color: red}
+node: {title: "n73" label: "0x2Is  73" color: yellow info1: "visited: 10
 "}
-node: {title: "n73" label: "ProjX 0 73" color: yellow info1: "visited: 10
+node: {title: "n75" label: "ProjX 0 75" 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
+edge: {sourcename: "n75" targetname: "n76" label: "0" color: red}
+node: {title: "n76" label: "Start  76" color: blue info1: "visited: 10
 start of method of type main
 "}
-node: {title: "n75" label: "0x0Is  75" color: yellow info1: "visited: 10
+node: {title: "n77" label: "0x0Is  77" color: yellow info1: "visited: 10
 "}
-node: {title: "n81" label: "0x1Is  81" color: yellow info1: "visited: 10
+node: {title: "n83" label: "0x1Is  83" color: yellow info1: "visited: 10
 "}
-node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 10
+node: {title: "n92" label: "ProjM 1 92" color: yellow info1: "visited: 10
 "}
-edge: {sourcename: "n90" targetname: "n74" label: "0" color: blue}
+edge: {sourcename: "n92" targetname: "n76" label: "0" color: blue}
 }
 
-node: {title: "n94" label: "Bad  94"  info1: "visited: 0
+node: {title: "n96" label: "Bad  96"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
index b95b0c1..83d5c22 100644 (file)
--- a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
@@ -17,145 +17,145 @@ 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 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: "End  77" 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"  info1: "visited: 16
+graph: { title: "n80" label: "80" status:clustered color:yellow
+edge: {sourcename: "n80" targetname: "n81" label: "0" color: red}
+node: {title: "n79" label: "Return  79"  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: "n79" targetname: "n115" label: "0" color: blue}
+edge: {sourcename: "n79" targetname: "n113" label: "1" }
+node: {title: "n113" label: "ProjIu 2 113" color: yellow info1: "visited: 16
 "}
-edge: {sourcename: "n111" targetname: "n112" label: "0" }
-node: {title: "n112" label: "Load  112"  info1: "visited: 16
+edge: {sourcename: "n113" targetname: "n114" label: "0" }
+node: {title: "n114" label: "Load  114"  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: "n114" targetname: "n97" label: "0" color: blue}
+edge: {sourcename: "n114" targetname: "n89" label: "1" }
+node: {title: "n115" label: "ProjM 0 115" color: yellow info1: "visited: 16
 "}
-edge: {sourcename: "n113" targetname: "n112" label: "0" color: blue}
+edge: {sourcename: "n115" targetname: "n114" 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
+graph: { title: "n82" label: "82" status:clustered color:yellow
+edge: {sourcename: "n82" targetname: "n112" label: "0" color: red}
+edge: {sourcename: "n82" targetname: "n83" label: "1" color: red}
+node: {title: "n81" label: "ProjX 1 81" 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: "n84" label: "0" color: red}
+node: {title: "n83" label: "ProjX 0 83" 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: "n83" targetname: "n84" label: "0" color: red}
+node: {title: "n84" label: "Cond  84"  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: "n84" targetname: "n85" label: "0" }
+node: {title: "n85" label: "Projb Gt 85" color: yellow info1: "visited: 17
 "}
 edge: {sourcename: "n85" targetname: "n86" label: "0" }
-node: {title: "n86" label: "Load  86"  info1: "visited: 17
+node: {title: "n86" label: "CmpT  86"  info1: "visited: 17
 "}
-edge: {sourcename: "n86" targetname: "n94" label: "0" color: blue}
+edge: {sourcename: "n86" targetname: "n111" label: "0" }
 edge: {sourcename: "n86" targetname: "n87" label: "1" }
-node: {title: "n94" label: "PhiM  94" color: green info1: "visited: 17
+node: {title: "n87" label: "ProjIu 2 87" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n87" targetname: "n88" label: "0" }
+node: {title: "n88" label: "Load  88"  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: "n88" targetname: "n96" label: "0" color: blue}
+edge: {sourcename: "n88" targetname: "n89" label: "1" }
+node: {title: "n96" label: "PhiM  96" color: green 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: "n106" label: "0" color: blue}
+edge: {sourcename: "n96" targetname: "n97" label: "1" color: blue}
+node: {title: "n97" label: "ProjM 0 97" color: yellow 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: "n97" targetname: "n98" label: "0" color: blue}
+node: {title: "n98" label: "Store  98"  info1: "visited: 17
 "}
-edge: {sourcename: "n98" targetname: "n99" label: "0" color: blue}
-node: {title: "n99" label: "Store  99"  info1: "visited: 17
+edge: {sourcename: "n98" targetname: "n100" label: "0" color: blue}
+edge: {sourcename: "n98" targetname: "n99" label: "1" }
+edge: {sourcename: "n98" targetname: "n87" label: "2" }
+node: {title: "n100" label: "ProjM 0 100" color: yellow 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" color: blue}
+node: {title: "n101" label: "Store  101"  info1: "visited: 17
 "}
-edge: {sourcename: "n100" targetname: "n101" label: "0" }
-node: {title: "n101" label: "Load  101"  info1: "visited: 17
+edge: {sourcename: "n101" targetname: "n105" label: "0" color: blue}
+edge: {sourcename: "n101" targetname: "n89" label: "1" }
+edge: {sourcename: "n101" targetname: "n102" label: "2" }
+node: {title: "n102" label: "ProjIu 2 102" color: yellow 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: "n103" label: "0" }
+node: {title: "n103" label: "Load  103"  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: "n104" label: "0" color: blue}
+edge: {sourcename: "n103" targetname: "n99" label: "1" }
+node: {title: "n104" label: "ProjM 0 104" color: yellow info1: "visited: 17
 "}
-edge: {sourcename: "n103" targetname: "n101" label: "0" color: blue}
+edge: {sourcename: "n104" targetname: "n88" label: "0" color: blue}
+node: {title: "n105" label: "ProjM 0 105" color: yellow info1: "visited: 17
+"}
+edge: {sourcename: "n105" targetname: "n103" 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"  info1: "visited: 18
+graph: { title: "n90" label: "90" status:clustered color:yellow
+edge: {sourcename: "n90" targetname: "n91" label: "0" color: red}
+node: {title: "n89" label: "Sel VAR_A 89"  info1: "visited: 18
 Selecting entity of type int
   from entity of type GlobalType
 "}
-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: "n89" targetname: "n95" label: "0" color: blue}
+edge: {sourcename: "n89" targetname: "n94" label: "1" }
+node: {title: "n99" label: "Sel VAR_B 99"  info1: "visited: 18
 Selecting entity of type int
   from entity of type GlobalType
 "}
-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: "n99" targetname: "n95" label: "0" color: blue}
+edge: {sourcename: "n99" targetname: "n94" label: "1" }
+node: {title: "n106" label: "ProjM 0 106" 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: "n106" targetname: "n107" label: "0" color: blue}
+node: {title: "n107" label: "Store  107"  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: "n109" label: "0" color: blue}
+edge: {sourcename: "n107" targetname: "n99" label: "1" }
+edge: {sourcename: "n107" targetname: "n108" label: "2" }
+node: {title: "n109" label: "ProjM 0 109" 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: "n109" targetname: "n110" label: "0" color: blue}
+node: {title: "n110" label: "Store  110"  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
+edge: {sourcename: "n110" targetname: "n95" label: "0" color: blue}
+edge: {sourcename: "n110" targetname: "n89" label: "1" }
+edge: {sourcename: "n110" targetname: "n111" label: "2" }
+node: {title: "n112" label: "Jmp  112"  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 info1: "visited: 19
+graph: { title: "n92" label: "92" status:clustered color:yellow
+edge: {sourcename: "n92" targetname: "n91" label: "0" color: red}
+node: {title: "n91" label: "ProjX 0 91" 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
+edge: {sourcename: "n91" targetname: "n93" label: "0" color: red}
+node: {title: "n93" label: "Start  93" color: blue info1: "visited: 19
 start of method of type main
 "}
-node: {title: "n92" label: "ProjP 3 92" color: yellow info1: "visited: 19
+node: {title: "n94" label: "ProjP 3 94" 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: "n94" targetname: "n93" label: "0" }
+node: {title: "n95" label: "ProjM 1 95" 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
+edge: {sourcename: "n95" targetname: "n93" label: "0" color: blue}
+node: {title: "n108" label: "0x1Iu  108" color: yellow info1: "visited: 19
 "}
-node: {title: "n109" label: "0x0Iu  109" color: yellow info1: "visited: 19
+node: {title: "n111" label: "0x0Iu  111" color: yellow info1: "visited: 19
 "}
 }
 
-node: {title: "n116" label: "Bad  116"  info1: "visited: 0
+node: {title: "n118" label: "Bad  118"  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 ecd83a0..a94f602 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg
@@ -17,98 +17,98 @@ 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 info1: "visited: 26
+graph: { title: "n195" label: "195" status:clustered color:yellow
+node: {title: "n194" label: "End  194" 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 info1: "visited: 27
+graph: { title: "n200" label: "200" status:clustered color:yellow
+edge: {sourcename: "n200" targetname: "n202" label: "0" color: red}
+edge: {sourcename: "n200" targetname: "n201" label: "1" color: red}
+node: {title: "n204" label: "PhiM  204" 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
+edge: {sourcename: "n204" targetname: "n215" label: "0" color: blue}
+edge: {sourcename: "n204" targetname: "n205" label: "1" color: blue}
+node: {title: "n201" label: "Jmp  201"  info1: "visited: 27
 "}
-node: {title: "n203" label: "Store  203"  info1: "visited: 27
+node: {title: "n205" label: "Store  205"  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: "n205" targetname: "n204" label: "0" color: blue}
+edge: {sourcename: "n205" targetname: "n210" label: "1" }
+edge: {sourcename: "n205" targetname: "n206" label: "2" }
+node: {title: "n206" label: "PhiIs  206" 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: "n206" targetname: "n209" label: "0" }
+edge: {sourcename: "n206" targetname: "n207" label: "1" }
+node: {title: "n207" label: "PhiIs  207" 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: "n207" targetname: "n208" label: "0" }
+edge: {sourcename: "n207" targetname: "n206" label: "1" }
+node: {title: "n210" label: "Sel a 210"  info1: "visited: 27
 Selecting entity of type int
   from entity of type PRIMA
 "}
-edge: {sourcename: "n208" targetname: "n202" label: "0" color: blue}
-edge: {sourcename: "n208" targetname: "n209" label: "1" }
+edge: {sourcename: "n210" targetname: "n204" label: "0" color: blue}
+edge: {sourcename: "n210" targetname: "n211" 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"  info1: "visited: 28
+graph: { title: "n203" label: "203" status:clustered color:yellow
+edge: {sourcename: "n203" targetname: "n198" label: "0" color: red}
+node: {title: "n202" label: "Jmp  202"  info1: "visited: 28
 "}
-node: {title: "n206" label: "0x0Is  206" color: yellow info1: "visited: 28
+node: {title: "n208" label: "0x0Is  208" color: yellow info1: "visited: 28
 "}
-node: {title: "n209" label: "ProjP 2 209" color: yellow info1: "visited: 28
+node: {title: "n211" label: "ProjP 2 211" color: yellow info1: "visited: 28
 "}
-edge: {sourcename: "n209" targetname: "n210" label: "0" }
-node: {title: "n210" label: "Alloc  210"  info1: "visited: 28
+edge: {sourcename: "n211" targetname: "n212" label: "0" }
+node: {title: "n212" label: "Alloc  212"  info1: "visited: 28
 allocating entity of type PRIMA
 "}
-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: "n212" targetname: "n214" label: "0" color: blue}
+edge: {sourcename: "n212" targetname: "n213" label: "1" }
+node: {title: "n215" label: "ProjM 0 215" 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: "n215" targetname: "n216" label: "0" color: blue}
+node: {title: "n216" label: "Store  216"  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: "n219" label: "0" color: blue}
+edge: {sourcename: "n216" targetname: "n218" label: "1" }
+edge: {sourcename: "n216" targetname: "n217" label: "2" }
+node: {title: "n218" label: "Sel a 218"  info1: "visited: 28
 Selecting entity of type int
   from entity of type PRIMA
 "}
-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: "n218" targetname: "n219" label: "0" color: blue}
+edge: {sourcename: "n218" targetname: "n211" label: "1" }
+node: {title: "n219" label: "ProjM 0 219" color: yellow info1: "visited: 28
 "}
-edge: {sourcename: "n217" targetname: "n210" label: "0" color: blue}
+edge: {sourcename: "n219" targetname: "n212" 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 info1: "visited: 29
+graph: { title: "n197" label: "197" status:clustered color:yellow
+edge: {sourcename: "n197" targetname: "n198" label: "0" color: red}
+node: {title: "n198" label: "ProjX 0 198" 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
+edge: {sourcename: "n198" targetname: "n199" label: "0" color: red}
+node: {title: "n199" label: "Start  199" color: blue info1: "visited: 29
 start of method of type OO_INLINE_EXAMPLE_main
 "}
-node: {title: "n207" label: "0x5Is  207" color: yellow info1: "visited: 29
+node: {title: "n209" label: "0x5Is  209" color: yellow info1: "visited: 29
 "}
-node: {title: "n211" label: "SymC PRIMA size  211"  info1: "visited: 29
+node: {title: "n213" label: "SymC PRIMA size  213"  info1: "visited: 29
 "}
-node: {title: "n212" label: "ProjM 1 212" color: yellow info1: "visited: 29
+node: {title: "n214" label: "ProjM 1 214" 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
+edge: {sourcename: "n214" targetname: "n199" label: "0" color: blue}
+node: {title: "n217" label: "0x2Is  217" color: yellow info1: "visited: 29
 "}
 }
 
-node: {title: "n194" label: "Bad  194"  info1: "visited: 0
+node: {title: "n196" label: "Bad  196"  info1: "visited: 0
 "}
-node: {title: "e13" label: "ent a" color: yellow
+node: {title: "e15" label: "ent a" color: yellow
  info1: "
-id: e13
+id: e15
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -118,16 +118,16 @@ name:    a
 ld_name: PRIMA_a
 offset:  -1"
 }
-edge: { sourcename: "e13" targetname: "t10"class: 3 label: "type" color: red}
-node: {title: "t11" label: "class PRIMA" info1: "state: layout_undefined
+edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red}
+node: {title: "t13" label: "class PRIMA" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-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
+edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue}
+node: {title: "e18" label: "ent set_a" color: yellow
  info1: "
-id: e16
+id: e18
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -136,30 +136,30 @@ peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
-irg = g69"
+irg = g71"
 }
-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 info1: "visited: 1
+edge: { sourcename: "e18" targetname: "t16"class: 3 label: "type" color: red}
+edge: { sourcename: "e18" targetname: "n17"label: "value 0"}
+node: {title: "n17" label: "&(PRIMA_set_a)P  17" color: yellow info1: "visited: 1
 "}
-node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
+node: {title: "t16" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 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: "t12" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
+edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green}
+node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t12" targetname: "t11"class: 9 label: "points to" color:green}
-node: {title: "t10" label: "primitive int" info1: "state: layout_fixed,
+edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green}
+node: {title: "t12" label: "primitive int" info1: "state: layout_fixed,
 mode: Is,
 size: 4B,
 "}
-node: {title: "e19" label: "ent c" color: yellow
+node: {title: "e21" label: "ent c" color: yellow
  info1: "
-id: e19
+id: e21
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -168,22 +168,22 @@ peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1
-irg = g92"
+irg = g94"
 }
-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 info1: "visited: 1
+edge: { sourcename: "e21" targetname: "t19"class: 3 label: "type" color: red}
+edge: { sourcename: "e21" targetname: "n20"label: "value 0"}
+node: {title: "n20" label: "&(PRIMA_c)P  20" color: yellow info1: "visited: 1
 "}
-node: {title: "t17" label: "method c" info1: "state: layout_fixed,
+node: {title: "t19" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t17" targetname: "t12"class: 5 label: "param 0" color: green}
-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
+edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green}
+node: {title: "e24" label: "ent OO_INLINE_EXAMPLE_main" color: yellow
  info1: "
-id: e22
+id: e24
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -192,26 +192,26 @@ peculiarity: peculiarity_existent
 name:    OO_INLINE_EXAMPLE_main
 ld_name: GlobalType_OO_INLINE_EXAMPLE_main
 offset:  -1
-irg = g35"
+irg = g37"
 }
-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 info1: "visited: 1
+edge: { sourcename: "e24" targetname: "t22"class: 3 label: "type" color: red}
+edge: { sourcename: "e24" targetname: "n23"label: "value 0"}
+node: {title: "n23" label: "&(GlobalType_OO_INLINE_EXAMPLE_main)P  23" color: yellow info1: "visited: 1
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "t0" targetname: "e22"class: 12 label: "member" color:blue}
-node: {title: "t20" label: "method OO_INLINE_EXAMPLE_main" info1: "state: layout_fixed,
+edge: { sourcename: "t0" targetname: "e24"class: 12 label: "member" color:blue}
+node: {title: "t22" label: "method OO_INLINE_EXAMPLE_main" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t20" targetname: "t10"class: 6 label: "res 0" color: green}
-node: {title: "t23" label: "class OO_INLINE_EXAMPLE_mainframe_tp" info1: "state: layout_undefined
+edge: { sourcename: "t22" targetname: "t12"class: 6 label: "res 0" color: green}
+node: {title: "t25" label: "class OO_INLINE_EXAMPLE_mainframe_tp" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "n208" targetname: "e13"class: 2 priority: 2 linestyle: dotted}
-edge: { sourcename: "n210" targetname: "t11"class: 2 priority: 2 linestyle: dotted}
-edge: { sourcename: "n211" targetname: "t11"class: 2 priority: 2 linestyle: dotted}
-edge: { sourcename: "n216" targetname: "e13"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n210" targetname: "e15"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n212" targetname: "t13"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n213" targetname: "t13"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n218" targetname: "e15"class: 2 priority: 2 linestyle: dotted}
 }

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
index 67b6854..10e7e8b 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
@@ -17,93 +17,93 @@ 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 info1: "visited: 21
+graph: { title: "n195" label: "195" status:clustered color:yellow
+node: {title: "n194" label: "End  194" 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 info1: "visited: 22
+graph: { title: "n200" label: "200" status:clustered color:yellow
+edge: {sourcename: "n200" targetname: "n202" label: "0" color: red}
+edge: {sourcename: "n200" targetname: "n201" label: "1" color: red}
+node: {title: "n204" label: "PhiM  204" 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
+edge: {sourcename: "n204" targetname: "n215" label: "0" color: blue}
+edge: {sourcename: "n204" targetname: "n205" label: "1" color: blue}
+node: {title: "n201" label: "Jmp  201"  info1: "visited: 22
 "}
-node: {title: "n203" label: "Store  203"  info1: "visited: 22
+node: {title: "n205" label: "Store  205"  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: "n205" targetname: "n204" label: "0" color: blue}
+edge: {sourcename: "n205" targetname: "n210" label: "1" }
+edge: {sourcename: "n205" targetname: "n206" label: "2" }
+node: {title: "n206" label: "PhiIs  206" 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: "n206" targetname: "n209" label: "0" }
+edge: {sourcename: "n206" targetname: "n207" label: "1" }
+node: {title: "n207" label: "PhiIs  207" 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: "n207" targetname: "n208" label: "0" }
+edge: {sourcename: "n207" targetname: "n206" label: "1" }
+node: {title: "n210" label: "Sel a 210"  info1: "visited: 22
 Selecting entity of type int
   from entity of type PRIMA
 "}
-edge: {sourcename: "n208" targetname: "n202" label: "0" color: blue}
-edge: {sourcename: "n208" targetname: "n209" label: "1" }
+edge: {sourcename: "n210" targetname: "n204" label: "0" color: blue}
+edge: {sourcename: "n210" targetname: "n211" 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"  info1: "visited: 23
+graph: { title: "n203" label: "203" status:clustered color:yellow
+edge: {sourcename: "n203" targetname: "n198" label: "0" color: red}
+node: {title: "n202" label: "Jmp  202"  info1: "visited: 23
 "}
-node: {title: "n206" label: "0x0Is  206" color: yellow info1: "visited: 23
+node: {title: "n208" label: "0x0Is  208" color: yellow info1: "visited: 23
 "}
-node: {title: "n209" label: "ProjP 2 209" color: yellow info1: "visited: 23
+node: {title: "n211" label: "ProjP 2 211" color: yellow info1: "visited: 23
 "}
-edge: {sourcename: "n209" targetname: "n210" label: "0" }
-node: {title: "n210" label: "Alloc  210"  info1: "visited: 23
+edge: {sourcename: "n211" targetname: "n212" label: "0" }
+node: {title: "n212" label: "Alloc  212"  info1: "visited: 23
 allocating entity of type PRIMA
 "}
-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: "n212" targetname: "n214" label: "0" color: blue}
+edge: {sourcename: "n212" targetname: "n213" label: "1" }
+node: {title: "n215" label: "ProjM 0 215" 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: "n215" targetname: "n216" label: "0" color: blue}
+node: {title: "n216" label: "Store  216"  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: "n219" label: "0" color: blue}
+edge: {sourcename: "n216" targetname: "n218" label: "1" }
+edge: {sourcename: "n216" targetname: "n217" label: "2" }
+node: {title: "n218" label: "Sel a 218"  info1: "visited: 23
 Selecting entity of type int
   from entity of type PRIMA
 "}
-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: "n218" targetname: "n219" label: "0" color: blue}
+edge: {sourcename: "n218" targetname: "n211" label: "1" }
+node: {title: "n219" label: "ProjM 0 219" color: yellow info1: "visited: 23
 "}
-edge: {sourcename: "n217" targetname: "n210" label: "0" color: blue}
+edge: {sourcename: "n219" targetname: "n212" 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 info1: "visited: 24
+graph: { title: "n197" label: "197" status:clustered color:yellow
+edge: {sourcename: "n197" targetname: "n198" label: "0" color: red}
+node: {title: "n198" label: "ProjX 0 198" 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
+edge: {sourcename: "n198" targetname: "n199" label: "0" color: red}
+node: {title: "n199" label: "Start  199" color: blue info1: "visited: 24
 start of method of type OO_INLINE_EXAMPLE_main
 "}
-node: {title: "n207" label: "0x5Is  207" color: yellow info1: "visited: 24
+node: {title: "n209" label: "0x5Is  209" color: yellow info1: "visited: 24
 "}
-node: {title: "n211" label: "SymC PRIMA size  211"  info1: "visited: 24
+node: {title: "n213" label: "SymC PRIMA size  213"  info1: "visited: 24
 "}
-node: {title: "n212" label: "ProjM 1 212" color: yellow info1: "visited: 24
+node: {title: "n214" label: "ProjM 1 214" 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
+edge: {sourcename: "n214" targetname: "n199" label: "0" color: blue}
+node: {title: "n217" label: "0x2Is  217" color: yellow info1: "visited: 24
 "}
 }
 
-node: {title: "n194" label: "Bad  194"  info1: "visited: 0
+node: {title: "n196" label: "Bad  196"  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 c2f2400..0a84ac1 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg
@@ -17,116 +17,116 @@ 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 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: "End  107" 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"  info1: "visited: 20
+graph: { title: "n110" label: "110" status:clustered color:yellow
+edge: {sourcename: "n110" targetname: "n111" label: "0" color: red}
+node: {title: "n109" label: "Return  109"  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: "n109" targetname: "n128" label: "0" color: blue}
+edge: {sourcename: "n109" targetname: "n114" label: "1" }
+node: {title: "n114" label: "ProjIs 0 114" 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: "n114" targetname: "n115" label: "0" }
+node: {title: "n115" label: "ProjT 2 115" color: yellow info1: "visited: 20
 "}
-edge: {sourcename: "n113" targetname: "n114" label: "0" }
-node: {title: "n114" label: "Call  114"  info1: "visited: 20
+edge: {sourcename: "n115" targetname: "n116" label: "0" }
+node: {title: "n116" label: "Call  116"  info1: "visited: 20
 calling method of type c
   param 0 type: class_prima_ptr
   param 1 type: int
   resul 0 type: int
 "}
-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: "n123" label: "0" color: blue}
+edge: {sourcename: "n116" targetname: "n122" label: "1" }
+edge: {sourcename: "n116" targetname: "n118" label: "2" }
+edge: {sourcename: "n116" targetname: "n117" label: "3" }
+node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 20
 "}
-edge: {sourcename: "n116" targetname: "n117" label: "0" }
-node: {title: "n117" label: "Alloc  117"  info1: "visited: 20
+edge: {sourcename: "n118" targetname: "n119" label: "0" }
+node: {title: "n119" label: "Alloc  119"  info1: "visited: 20
 allocating entity of type PRIMA
 "}
-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: "n119" targetname: "n121" label: "0" color: blue}
+edge: {sourcename: "n119" targetname: "n120" label: "1" }
+node: {title: "n122" label: "Sel c 122"  info1: "visited: 20
 Selecting entity of type c
   from entity of type PRIMA
 "}
-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: "n122" targetname: "n123" label: "0" color: blue}
+edge: {sourcename: "n122" targetname: "n118" label: "1" }
+node: {title: "n123" label: "ProjM 0 123" 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: "n123" targetname: "n124" label: "0" color: blue}
+node: {title: "n124" label: "Call  124"  info1: "visited: 20
 calling method of type set_a
   param 0 type: class_prima_ptr
   param 1 type: int
 "}
-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: "n127" label: "0" color: blue}
+edge: {sourcename: "n124" targetname: "n126" label: "1" }
+edge: {sourcename: "n124" targetname: "n118" label: "2" }
+edge: {sourcename: "n124" targetname: "n125" label: "3" }
+node: {title: "n126" label: "Sel set_a 126"  info1: "visited: 20
 Selecting entity of type set_a
   from entity of type PRIMA
 "}
-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: "n126" targetname: "n127" label: "0" color: blue}
+edge: {sourcename: "n126" targetname: "n118" label: "1" }
+node: {title: "n127" label: "ProjM 0 127" 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: "n127" targetname: "n119" label: "0" color: blue}
+node: {title: "n128" label: "ProjM 0 128" color: yellow info1: "visited: 20
 "}
-edge: {sourcename: "n126" targetname: "n114" label: "0" color: blue}
+edge: {sourcename: "n128" targetname: "n116" 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 info1: "visited: 21
+graph: { title: "n112" label: "112" status:clustered color:yellow
+edge: {sourcename: "n112" targetname: "n111" label: "0" color: red}
+node: {title: "n111" label: "ProjX 0 111" 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
+edge: {sourcename: "n111" targetname: "n113" label: "0" color: red}
+node: {title: "n113" label: "Start  113" color: blue info1: "visited: 21
 start of method of type OO_PROGRAM_EXAMPLE_main
 "}
-node: {title: "n115" label: "0x5Is  115" color: yellow info1: "visited: 21
+node: {title: "n117" label: "0x5Is  117" color: yellow info1: "visited: 21
 "}
-node: {title: "n118" label: "SymC PRIMA size  118"  info1: "visited: 21
+node: {title: "n120" label: "SymC PRIMA size  120"  info1: "visited: 21
 "}
-node: {title: "n119" label: "ProjM 1 119" color: yellow info1: "visited: 21
+node: {title: "n121" label: "ProjM 1 121" 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
+edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue}
+node: {title: "n125" label: "0x2Is  125" color: yellow info1: "visited: 21
 "}
 }
 
-node: {title: "n130" label: "Bad  130"  info1: "visited: 0
+node: {title: "n132" label: "Bad  132"  info1: "visited: 0
 "}
-node: {title: "t17" label: "method c" info1: "state: layout_fixed,
+node: {title: "t19" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t17" targetname: "t12"class: 5 label: "param 0" color: green}
-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: "t12" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
+edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green}
+node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t12" targetname: "t11"class: 9 label: "points to" color:green}
-node: {title: "t11" label: "class PRIMA" info1: "state: layout_undefined
+edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green}
+node: {title: "t13" label: "class PRIMA" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-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
+edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue}
+node: {title: "e15" label: "ent a" color: yellow
  info1: "
-id: e13
+id: e15
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -136,14 +136,14 @@ name:    a
 ld_name: PRIMA_a
 offset:  -1"
 }
-edge: { sourcename: "e13" targetname: "t10"class: 3 label: "type" color: red}
-node: {title: "t10" label: "primitive int" info1: "state: layout_fixed,
+edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red}
+node: {title: "t12" label: "primitive int" info1: "state: layout_fixed,
 mode: Is,
 size: 4B,
 "}
-node: {title: "e16" label: "ent set_a" color: yellow
+node: {title: "e18" label: "ent set_a" color: yellow
  info1: "
-id: e16
+id: e18
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -152,21 +152,21 @@ peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
-irg = g69"
+irg = g71"
 }
-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 info1: "visited: 1
+edge: { sourcename: "e18" targetname: "t16"class: 3 label: "type" color: red}
+edge: { sourcename: "e18" targetname: "n17"label: "value 0"}
+node: {title: "n17" label: "&(PRIMA_set_a)P  17" color: yellow info1: "visited: 1
 "}
-node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
+node: {title: "t16" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 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
+edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green}
+node: {title: "e21" label: "ent c" color: yellow
  info1: "
-id: e19
+id: e21
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -175,15 +175,15 @@ peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1
-irg = g92"
+irg = g94"
 }
-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 info1: "visited: 1
+edge: { sourcename: "e21" targetname: "t19"class: 3 label: "type" color: red}
+edge: { sourcename: "e21" targetname: "n20"label: "value 0"}
+node: {title: "n20" label: "&(PRIMA_c)P  20" color: yellow info1: "visited: 1
 "}
-node: {title: "e22" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
+node: {title: "e24" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
  info1: "
-id: e22
+id: e24
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -192,28 +192,28 @@ peculiarity: peculiarity_existent
 name:    OO_PROGRAM_EXAMPLE_main
 ld_name: GlobalType_OO_PROGRAM_EXAMPLE_main
 offset:  -1
-irg = g35"
+irg = g37"
 }
-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 info1: "visited: 1
+edge: { sourcename: "e24" targetname: "t22"class: 3 label: "type" color: red}
+edge: { sourcename: "e24" targetname: "n23"label: "value 0"}
+node: {title: "n23" label: "&(GlobalType_OO_PROGRAM_EXAMPLE_main)P  23" color: yellow info1: "visited: 1
 "}
 node: {title: "t0" label: "class GlobalType" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "t0" targetname: "e22"class: 12 label: "member" color:blue}
-node: {title: "t20" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed,
+edge: { sourcename: "t0" targetname: "e24"class: 12 label: "member" color:blue}
+node: {title: "t22" label: "method OO_PROGRAM_EXAMPLE_main" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t20" targetname: "t10"class: 6 label: "res 0" color: green}
-node: {title: "t23" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined
+edge: { sourcename: "t22" targetname: "t12"class: 6 label: "res 0" color: green}
+node: {title: "t25" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "n114" targetname: "t17"class: 2 priority: 2 linestyle: dotted}
-edge: { sourcename: "n117" targetname: "t11"class: 2 priority: 2 linestyle: dotted}
-edge: { sourcename: "n118" targetname: "t11"class: 2 priority: 2 linestyle: dotted}
-edge: { sourcename: "n120" targetname: "e19"class: 2 priority: 2 linestyle: dotted}
-edge: { sourcename: "n122" targetname: "t14"class: 2 priority: 2 linestyle: dotted}
-edge: { sourcename: "n124" targetname: "e16"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n116" targetname: "t19"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n119" targetname: "t13"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n120" targetname: "t13"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n122" targetname: "e21"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n124" targetname: "t16"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n126" targetname: "e18"class: 2 priority: 2 linestyle: dotted}
 }

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
index 99616d3..351f873 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
@@ -17,93 +17,93 @@ 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 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: "End  107" 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"  info1: "visited: 16
+graph: { title: "n110" label: "110" status:clustered color:yellow
+edge: {sourcename: "n110" targetname: "n111" label: "0" color: red}
+node: {title: "n109" label: "Return  109"  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: "n109" targetname: "n128" label: "0" color: blue}
+edge: {sourcename: "n109" targetname: "n114" label: "1" }
+node: {title: "n114" label: "ProjIs 0 114" 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: "n114" targetname: "n115" label: "0" }
+node: {title: "n115" label: "ProjT 2 115" color: yellow info1: "visited: 16
 "}
-edge: {sourcename: "n113" targetname: "n114" label: "0" }
-node: {title: "n114" label: "Call  114"  info1: "visited: 16
+edge: {sourcename: "n115" targetname: "n116" label: "0" }
+node: {title: "n116" label: "Call  116"  info1: "visited: 16
 calling method of type c
   param 0 type: class_prima_ptr
   param 1 type: int
   resul 0 type: int
 "}
-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: "n123" label: "0" color: blue}
+edge: {sourcename: "n116" targetname: "n122" label: "1" }
+edge: {sourcename: "n116" targetname: "n118" label: "2" }
+edge: {sourcename: "n116" targetname: "n117" label: "3" }
+node: {title: "n118" label: "ProjP 2 118" color: yellow info1: "visited: 16
 "}
-edge: {sourcename: "n116" targetname: "n117" label: "0" }
-node: {title: "n117" label: "Alloc  117"  info1: "visited: 16
+edge: {sourcename: "n118" targetname: "n119" label: "0" }
+node: {title: "n119" label: "Alloc  119"  info1: "visited: 16
 allocating entity of type PRIMA
 "}
-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: "n119" targetname: "n121" label: "0" color: blue}
+edge: {sourcename: "n119" targetname: "n120" label: "1" }
+node: {title: "n122" label: "Sel c 122"  info1: "visited: 16
 Selecting entity of type c
   from entity of type PRIMA
 "}
-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: "n122" targetname: "n123" label: "0" color: blue}
+edge: {sourcename: "n122" targetname: "n118" label: "1" }
+node: {title: "n123" label: "ProjM 0 123" 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: "n123" targetname: "n124" label: "0" color: blue}
+node: {title: "n124" label: "Call  124"  info1: "visited: 16
 calling method of type set_a
   param 0 type: class_prima_ptr
   param 1 type: int
 "}
-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: "n127" label: "0" color: blue}
+edge: {sourcename: "n124" targetname: "n126" label: "1" }
+edge: {sourcename: "n124" targetname: "n118" label: "2" }
+edge: {sourcename: "n124" targetname: "n125" label: "3" }
+node: {title: "n126" label: "Sel set_a 126"  info1: "visited: 16
 Selecting entity of type set_a
   from entity of type PRIMA
 "}
-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: "n126" targetname: "n127" label: "0" color: blue}
+edge: {sourcename: "n126" targetname: "n118" label: "1" }
+node: {title: "n127" label: "ProjM 0 127" 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: "n127" targetname: "n119" label: "0" color: blue}
+node: {title: "n128" label: "ProjM 0 128" color: yellow info1: "visited: 16
 "}
-edge: {sourcename: "n126" targetname: "n114" label: "0" color: blue}
+edge: {sourcename: "n128" targetname: "n116" 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 info1: "visited: 17
+graph: { title: "n112" label: "112" status:clustered color:yellow
+edge: {sourcename: "n112" targetname: "n111" label: "0" color: red}
+node: {title: "n111" label: "ProjX 0 111" 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
+edge: {sourcename: "n111" targetname: "n113" label: "0" color: red}
+node: {title: "n113" label: "Start  113" color: blue info1: "visited: 17
 start of method of type OO_PROGRAM_EXAMPLE_main
 "}
-node: {title: "n115" label: "0x5Is  115" color: yellow info1: "visited: 17
+node: {title: "n117" label: "0x5Is  117" color: yellow info1: "visited: 17
 "}
-node: {title: "n118" label: "SymC PRIMA size  118"  info1: "visited: 17
+node: {title: "n120" label: "SymC PRIMA size  120"  info1: "visited: 17
 "}
-node: {title: "n119" label: "ProjM 1 119" color: yellow info1: "visited: 17
+node: {title: "n121" label: "ProjM 1 121" 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
+edge: {sourcename: "n121" targetname: "n113" label: "0" color: blue}
+node: {title: "n125" label: "0x2Is  125" color: yellow info1: "visited: 17
 "}
 }
 
-node: {title: "n130" label: "Bad  130"  info1: "visited: 0
+node: {title: "n132" label: "Bad  132"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/PRIMA_c-all.vcg b/testprograms/ref-results/PRIMA_c-all.vcg
index 9f00b88..c2e5404 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-all.vcg
+++ b/testprograms/ref-results/PRIMA_c-all.vcg
@@ -17,78 +17,78 @@ 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 info1: "visited: 26
+graph: { title: "n243" label: "243" status:clustered color:yellow
+node: {title: "n242" label: "End  242" 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 info1: "visited: 27
+graph: { title: "n248" label: "248" status:clustered color:yellow
+edge: {sourcename: "n248" targetname: "n250" label: "0" color: red}
+edge: {sourcename: "n248" targetname: "n249" label: "1" color: red}
+node: {title: "n252" label: "PhiM  252" 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
+edge: {sourcename: "n252" targetname: "n261" label: "0" color: blue}
+edge: {sourcename: "n252" targetname: "n253" label: "1" color: blue}
+node: {title: "n249" label: "Jmp  249"  info1: "visited: 27
 "}
-node: {title: "n251" label: "Store  251"  info1: "visited: 27
+node: {title: "n253" label: "Store  253"  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: "n253" targetname: "n252" label: "0" color: blue}
+edge: {sourcename: "n253" targetname: "n259" label: "1" }
+edge: {sourcename: "n253" targetname: "n254" label: "2" }
+node: {title: "n254" label: "PhiIs  254" 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: "n254" targetname: "n257" label: "0" }
+edge: {sourcename: "n254" targetname: "n255" label: "1" }
+node: {title: "n255" label: "PhiIs  255" 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: "n255" targetname: "n256" label: "0" }
+edge: {sourcename: "n255" targetname: "n254" label: "1" }
+node: {title: "n259" label: "Sel a 259"  info1: "visited: 27
 Selecting entity of type int
   from entity of type PRIMA
 "}
-edge: {sourcename: "n257" targetname: "n250" label: "0" color: blue}
-edge: {sourcename: "n257" targetname: "n258" label: "1" }
+edge: {sourcename: "n259" targetname: "n252" label: "0" color: blue}
+edge: {sourcename: "n259" targetname: "n260" 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"  info1: "visited: 28
+graph: { title: "n251" label: "251" status:clustered color:yellow
+edge: {sourcename: "n251" targetname: "n246" label: "0" color: red}
+node: {title: "n250" label: "Jmp  250"  info1: "visited: 28
 "}
-node: {title: "n255" label: "ProjIs 1 255" color: yellow info1: "visited: 28
+node: {title: "n257" label: "ProjIs 1 257" 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: "n257" targetname: "n258" label: "0" }
+node: {title: "n260" label: "ProjP 0 260" color: yellow info1: "visited: 28
 "}
-edge: {sourcename: "n258" targetname: "n256" label: "0" }
+edge: {sourcename: "n260" targetname: "n258" 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 info1: "visited: 29
+graph: { title: "n245" label: "245" status:clustered color:yellow
+edge: {sourcename: "n245" targetname: "n246" label: "0" color: red}
+node: {title: "n246" label: "ProjX 0 246" 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
+edge: {sourcename: "n246" targetname: "n247" label: "0" color: red}
+node: {title: "n247" label: "Start  247" color: blue info1: "visited: 29
 start of method of type c
   param 0 type: class_prima_ptr
   param 1 type: int
 "}
-node: {title: "n254" label: "0x0Is  254" color: yellow info1: "visited: 29
+node: {title: "n256" label: "0x0Is  256" color: yellow info1: "visited: 29
 "}
-node: {title: "n256" label: "ProjT 4 256" color: yellow info1: "visited: 29
+node: {title: "n258" label: "ProjT 4 258" 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: "n258" targetname: "n247" label: "0" }
+node: {title: "n261" label: "ProjM 1 261" color: yellow info1: "visited: 29
 "}
-edge: {sourcename: "n259" targetname: "n245" label: "0" color: blue}
+edge: {sourcename: "n261" targetname: "n247" label: "0" color: blue}
 }
 
-node: {title: "n242" label: "Bad  242"  info1: "visited: 0
+node: {title: "n244" label: "Bad  244"  info1: "visited: 0
 "}
-node: {title: "e13" label: "ent a" color: yellow
+node: {title: "e15" label: "ent a" color: yellow
  info1: "
-id: e13
+id: e15
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -98,16 +98,16 @@ name:    a
 ld_name: PRIMA_a
 offset:  -1"
 }
-edge: { sourcename: "e13" targetname: "t10"class: 3 label: "type" color: red}
-node: {title: "t11" label: "class PRIMA" info1: "state: layout_undefined
+edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red}
+node: {title: "t13" label: "class PRIMA" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-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
+edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue}
+node: {title: "e18" label: "ent set_a" color: yellow
  info1: "
-id: e16
+id: e18
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -116,30 +116,30 @@ peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
-irg = g69"
+irg = g71"
 }
-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 info1: "visited: 3
+edge: { sourcename: "e18" targetname: "t16"class: 3 label: "type" color: red}
+edge: { sourcename: "e18" targetname: "n17"label: "value 0"}
+node: {title: "n17" label: "&(PRIMA_set_a)P  17" color: yellow info1: "visited: 3
 "}
-node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
+node: {title: "t16" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 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: "t12" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
+edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green}
+node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t12" targetname: "t11"class: 9 label: "points to" color:green}
-node: {title: "t10" label: "primitive int" info1: "state: layout_fixed,
+edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green}
+node: {title: "t12" label: "primitive int" info1: "state: layout_fixed,
 mode: Is,
 size: 4B,
 "}
-node: {title: "e19" label: "ent c" color: yellow
+node: {title: "e21" label: "ent c" color: yellow
  info1: "
-id: e19
+id: e21
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -148,21 +148,21 @@ peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1
-irg = g92"
+irg = g94"
 }
-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 info1: "visited: 3
+edge: { sourcename: "e21" targetname: "t19"class: 3 label: "type" color: red}
+edge: { sourcename: "e21" targetname: "n20"label: "value 0"}
+node: {title: "n20" label: "&(PRIMA_c)P  20" color: yellow info1: "visited: 3
 "}
-node: {title: "t17" label: "method c" info1: "state: layout_fixed,
+node: {title: "t19" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t17" targetname: "t12"class: 5 label: "param 0" color: green}
-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: "t80" label: "class cframe_tp" info1: "state: layout_undefined
+edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green}
+node: {title: "t82" label: "class cframe_tp" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "n257" targetname: "e13"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n259" targetname: "e15"class: 2 priority: 2 linestyle: dotted}
 }

diff --git a/testprograms/ref-results/PRIMA_set_a-all.vcg b/testprograms/ref-results/PRIMA_set_a-all.vcg
index 031490b..a8612ef 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-all.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-all.vcg
@@ -17,62 +17,62 @@ 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 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: "End  224" 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"  info1: "visited: 21
+graph: { title: "n227" label: "227" status:clustered color:yellow
+edge: {sourcename: "n227" targetname: "n228" label: "0" color: red}
+node: {title: "n226" label: "Return  226"  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: "n226" targetname: "n231" label: "0" color: blue}
+node: {title: "n231" label: "ProjM 0 231" 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: "n231" targetname: "n232" label: "0" color: blue}
+node: {title: "n232" label: "Store  232"  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: "n232" targetname: "n237" label: "0" color: blue}
+edge: {sourcename: "n232" targetname: "n235" label: "1" }
+edge: {sourcename: "n232" targetname: "n233" label: "2" }
+node: {title: "n233" label: "ProjIs 1 233" 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: "n234" label: "0" }
+node: {title: "n235" label: "Sel a 235"  info1: "visited: 21
 Selecting entity of type int
   from entity of type PRIMA
 "}
-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: "n235" targetname: "n237" label: "0" color: blue}
+edge: {sourcename: "n235" targetname: "n236" label: "1" }
+node: {title: "n236" label: "ProjP 0 236" color: yellow info1: "visited: 21
 "}
-edge: {sourcename: "n234" targetname: "n232" label: "0" }
+edge: {sourcename: "n236" targetname: "n234" 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 info1: "visited: 22
+graph: { title: "n229" label: "229" status:clustered color:yellow
+edge: {sourcename: "n229" targetname: "n228" label: "0" color: red}
+node: {title: "n228" label: "ProjX 0 228" 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
+edge: {sourcename: "n228" targetname: "n230" label: "0" color: red}
+node: {title: "n230" label: "Start  230" color: blue info1: "visited: 22
 start of method of type set_a
   param 0 type: class_prima_ptr
   param 1 type: int
 "}
-node: {title: "n232" label: "ProjT 4 232" color: yellow info1: "visited: 22
+node: {title: "n234" label: "ProjT 4 234" 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: "n234" targetname: "n230" label: "0" }
+node: {title: "n237" label: "ProjM 1 237" color: yellow info1: "visited: 22
 "}
-edge: {sourcename: "n235" targetname: "n228" label: "0" color: blue}
+edge: {sourcename: "n237" targetname: "n230" label: "0" color: blue}
 }
 
-node: {title: "n238" label: "Bad  238"  info1: "visited: 0
+node: {title: "n240" label: "Bad  240"  info1: "visited: 0
 "}
-node: {title: "e13" label: "ent a" color: yellow
+node: {title: "e15" label: "ent a" color: yellow
  info1: "
-id: e13
+id: e15
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -82,16 +82,16 @@ name:    a
 ld_name: PRIMA_a
 offset:  -1"
 }
-edge: { sourcename: "e13" targetname: "t10"class: 3 label: "type" color: red}
-node: {title: "t11" label: "class PRIMA" info1: "state: layout_undefined
+edge: { sourcename: "e15" targetname: "t12"class: 3 label: "type" color: red}
+node: {title: "t13" label: "class PRIMA" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-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
+edge: { sourcename: "t13" targetname: "e15"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e18"class: 12 label: "member" color:blue}
+edge: { sourcename: "t13" targetname: "e21"class: 12 label: "member" color:blue}
+node: {title: "e18" label: "ent set_a" color: yellow
  info1: "
-id: e16
+id: e18
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -100,30 +100,30 @@ peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
-irg = g69"
+irg = g71"
 }
-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 info1: "visited: 2
+edge: { sourcename: "e18" targetname: "t16"class: 3 label: "type" color: red}
+edge: { sourcename: "e18" targetname: "n17"label: "value 0"}
+node: {title: "n17" label: "&(PRIMA_set_a)P  17" color: yellow info1: "visited: 2
 "}
-node: {title: "t14" label: "method set_a" info1: "state: layout_fixed,
+node: {title: "t16" label: "method set_a" info1: "state: layout_fixed,
 mode: P,
 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: "t12" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
+edge: { sourcename: "t16" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t16" targetname: "t12"class: 5 label: "param 1" color: green}
+node: {title: "t14" label: "pointer class_prima_ptr" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t12" targetname: "t11"class: 9 label: "points to" color:green}
-node: {title: "t10" label: "primitive int" info1: "state: layout_fixed,
+edge: { sourcename: "t14" targetname: "t13"class: 9 label: "points to" color:green}
+node: {title: "t12" label: "primitive int" info1: "state: layout_fixed,
 mode: Is,
 size: 4B,
 "}
-node: {title: "e19" label: "ent c" color: yellow
+node: {title: "e21" label: "ent c" color: yellow
  info1: "
-id: e19
+id: e21
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -132,21 +132,21 @@ peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1
-irg = g92"
+irg = g94"
 }
-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 info1: "visited: 2
+edge: { sourcename: "e21" targetname: "t19"class: 3 label: "type" color: red}
+edge: { sourcename: "e21" targetname: "n20"label: "value 0"}
+node: {title: "n20" label: "&(PRIMA_c)P  20" color: yellow info1: "visited: 2
 "}
-node: {title: "t17" label: "method c" info1: "state: layout_fixed,
+node: {title: "t19" label: "method c" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t17" targetname: "t12"class: 5 label: "param 0" color: green}
-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: "t57" label: "class set_aframe_tp" info1: "state: layout_undefined
+edge: { sourcename: "t19" targetname: "t14"class: 5 label: "param 0" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 5 label: "param 1" color: green}
+edge: { sourcename: "t19" targetname: "t12"class: 6 label: "res 0" color: green}
+node: {title: "t59" label: "class set_aframe_tp" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "n233" targetname: "e13"class: 2 priority: 2 linestyle: dotted}
+edge: { sourcename: "n235" targetname: "e15"class: 2 priority: 2 linestyle: dotted}
 }

diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg
index 17ee5bf..df0c2ca 100644 (file)
--- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg
+++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main-cfg.vcg
@@ -17,24 +17,24 @@ 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: "n103"}
+edge: { sourcename: "n79" targetname: "n100"}
 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
+edge: { sourcename: "n85" targetname: "n87"}
+node: {title: "n87" label: "Block 87" }
+edge: { sourcename: "n87" targetname: "n87"}
+node: {title: "n100" label: "Block 100" }
+edge: { sourcename: "n100" targetname: "n83"}
+node: {title: "n103" label: "Block 103" }
+edge: { sourcename: "n103" targetname: "n85"}
+node: {title: "n111" label: "Bad  111"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg
index c1109c8..b0a08af 100644 (file)
--- a/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/THREE_CFPRED_EXAMPLE_main.vcg
@@ -17,113 +17,113 @@ 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 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"  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" }
+edge: {sourcename: "n77" targetname: "n78" label: "0" color: red}
+node: {title: "n76" label: "End  76" color: blue info1: "visited: 8
+"}
 }
 
 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
-"}
+edge: {sourcename: "n79" targetname: "n102" label: "0" color: red}
+edge: {sourcename: "n79" targetname: "n99" label: "1" color: red}
+edge: {sourcename: "n79" targetname: "n80" label: "2" color: red}
+node: {title: "n78" label: "Return  78"  info1: "visited: 9
+"}
+edge: {sourcename: "n78" targetname: "n108" label: "0" color: blue}
+edge: {sourcename: "n78" targetname: "n105" label: "1" }
+node: {title: "n105" label: "PhiIs  105" color: green info1: "visited: 9
+"}
+edge: {sourcename: "n105" targetname: "n107" label: "0" }
+edge: {sourcename: "n105" targetname: "n106" label: "1" }
+edge: {sourcename: "n105" targetname: "n106" label: "2" }
 }
 
 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
+node: {title: "n80" label: "Jmp  80"  info1: "visited: 10
 "}
-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
+}
+
+graph: { title: "n83" label: "83" status:clustered color:yellow
+edge: {sourcename: "n83" targetname: "n84" label: "0" color: red}
+node: {title: "n82" label: "ProjX 1 82" color: yellow info1: "visited: 11
 "}
-edge: {sourcename: "n94" targetname: "n95" label: "0" }
-node: {title: "n95" label: "CmpT  95"  info1: "visited: 11
+edge: {sourcename: "n82" targetname: "n95" label: "0" color: red}
+node: {title: "n95" label: "Cond  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
+node: {title: "n96" label: "Projb Eq 96" color: yellow info1: "visited: 11
+"}
+edge: {sourcename: "n96" targetname: "n97" label: "0" }
+node: {title: "n97" label: "CmpT  97"  info1: "visited: 11
+"}
+edge: {sourcename: "n97" targetname: "n98" label: "0" }
+edge: {sourcename: "n97" targetname: "n92" label: "1" }
+node: {title: "n101" label: "ProjX 0 101" color: yellow info1: "visited: 11
 "}
-edge: {sourcename: "n99" targetname: "n93" label: "0" color: red}
+edge: {sourcename: "n101" targetname: "n95" 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
+graph: { title: "n85" label: "85" status:clustered color:yellow
+edge: {sourcename: "n85" targetname: "n86" label: "0" color: red}
+node: {title: "n84" label: "ProjX 0 84" 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: "n84" targetname: "n89" label: "0" color: red}
+node: {title: "n89" label: "Cond  89"  info1: "visited: 12
 "}
-edge: {sourcename: "n87" targetname: "n88" label: "0" }
-node: {title: "n88" label: "Projb Eq 88" color: yellow info1: "visited: 12
+edge: {sourcename: "n89" targetname: "n90" label: "0" }
+node: {title: "n90" label: "Projb Eq 90" color: yellow info1: "visited: 12
 "}
-edge: {sourcename: "n88" targetname: "n89" label: "0" }
-node: {title: "n89" label: "CmpT  89"  info1: "visited: 12
+edge: {sourcename: "n90" targetname: "n91" label: "0" }
+node: {title: "n91" label: "CmpT  91"  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: "n91" targetname: "n94" label: "0" }
+edge: {sourcename: "n91" targetname: "n92" label: "1" }
+node: {title: "n92" label: "ProjIs 0 92" 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: "n92" targetname: "n93" label: "0" }
+node: {title: "n104" label: "ProjX 1 104" color: yellow info1: "visited: 12
 "}
-edge: {sourcename: "n102" targetname: "n87" label: "0" color: red}
+edge: {sourcename: "n104" targetname: "n89" 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 info1: "visited: 13
+graph: { title: "n87" label: "87" status:clustered color:yellow
+edge: {sourcename: "n87" targetname: "n86" label: "0" color: red}
+node: {title: "n86" label: "ProjX 0 86" 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
+edge: {sourcename: "n86" targetname: "n88" label: "0" color: red}
+node: {title: "n88" label: "Start  88" color: blue info1: "visited: 13
 start of method of type THREE_CFPRED_EXAMPLE_main
   param 0 type: int
 "}
-node: {title: "n91" label: "ProjT 4 91" color: yellow info1: "visited: 13
+node: {title: "n93" label: "ProjT 4 93" color: yellow info1: "visited: 13
 "}
-edge: {sourcename: "n91" targetname: "n86" label: "0" }
-node: {title: "n92" label: "0x1Is  92" color: yellow info1: "visited: 13
+edge: {sourcename: "n93" targetname: "n88" label: "0" }
+node: {title: "n94" label: "0x1Is  94" color: yellow info1: "visited: 13
 "}
-node: {title: "n96" label: "0x3Is  96" color: yellow info1: "visited: 13
+node: {title: "n98" label: "0x3Is  98" color: yellow info1: "visited: 13
 "}
-node: {title: "n104" label: "0x6Is  104" color: yellow info1: "visited: 13
+node: {title: "n106" label: "0x6Is  106" color: yellow info1: "visited: 13
 "}
-node: {title: "n105" label: "0x5Is  105" color: yellow info1: "visited: 13
+node: {title: "n107" label: "0x5Is  107" color: yellow info1: "visited: 13
 "}
-node: {title: "n106" label: "ProjM 1 106" color: yellow info1: "visited: 13
+node: {title: "n108" label: "ProjM 1 108" color: yellow info1: "visited: 13
 "}
-edge: {sourcename: "n106" targetname: "n86" label: "0" color: blue}
+edge: {sourcename: "n108" targetname: "n88" 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"  info1: "visited: 14
+graph: { title: "n100" label: "100" status:clustered color:yellow
+edge: {sourcename: "n100" targetname: "n101" label: "0" color: red}
+node: {title: "n99" label: "Jmp  99"  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"  info1: "visited: 15
+graph: { title: "n103" label: "103" status:clustered color:yellow
+edge: {sourcename: "n103" targetname: "n104" label: "0" color: red}
+node: {title: "n102" label: "Jmp  102"  info1: "visited: 15
 "}
 }
 
-node: {title: "n109" label: "Bad  109"  info1: "visited: 0
+node: {title: "n111" label: "Bad  111"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg
index 0fb1023..b45cf8b 100644 (file)
--- a/testprograms/ref-results/WHILE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/WHILE_EXAMPLE_main.vcg
@@ -17,89 +17,89 @@ 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 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: "End  66" 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"  info1: "visited: 16
+graph: { title: "n69" label: "69" status:clustered color:yellow
+edge: {sourcename: "n69" targetname: "n70" label: "0" color: red}
+node: {title: "n68" label: "Return  68"  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: "n68" targetname: "n90" label: "0" color: blue}
+edge: {sourcename: "n68" targetname: "n89" label: "1" }
+node: {title: "n89" label: "SubIs  89"  info1: "visited: 16
 "}
-edge: {sourcename: "n87" targetname: "n77" label: "0" }
-edge: {sourcename: "n87" targetname: "n76" label: "1" }
+edge: {sourcename: "n89" targetname: "n79" label: "0" }
+edge: {sourcename: "n89" targetname: "n78" 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
+graph: { title: "n71" label: "71" status:clustered color:yellow
+edge: {sourcename: "n71" targetname: "n88" label: "0" color: red}
+edge: {sourcename: "n71" targetname: "n72" label: "1" color: red}
+node: {title: "n70" label: "ProjX 0 70" 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: "n70" targetname: "n75" label: "0" color: red}
+node: {title: "n74" label: "ProjX 1 74" 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: "n74" targetname: "n75" label: "0" color: red}
+node: {title: "n75" label: "Cond  75"  info1: "visited: 17
 "}
-edge: {sourcename: "n73" targetname: "n74" label: "0" }
-node: {title: "n74" label: "Projb Eq 74" color: yellow info1: "visited: 17
+edge: {sourcename: "n75" targetname: "n76" label: "0" }
+node: {title: "n76" label: "Projb Eq 76" color: yellow info1: "visited: 17
 "}
-edge: {sourcename: "n74" targetname: "n75" label: "0" }
-node: {title: "n75" label: "CmpT  75"  info1: "visited: 17
+edge: {sourcename: "n76" targetname: "n77" label: "0" }
+node: {title: "n77" label: "CmpT  77"  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: "n77" targetname: "n87" label: "0" }
+edge: {sourcename: "n77" targetname: "n78" label: "1" }
+node: {title: "n78" label: "PhiIs  78" 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: "n78" targetname: "n86" label: "0" }
+edge: {sourcename: "n78" targetname: "n79" label: "1" }
+node: {title: "n79" label: "PhiIs  79" color: green info1: "visited: 17
 "}
-edge: {sourcename: "n77" targetname: "n78" label: "0" }
-edge: {sourcename: "n77" targetname: "n76" label: "1" }
+edge: {sourcename: "n79" targetname: "n80" label: "0" }
+edge: {sourcename: "n79" targetname: "n78" 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"  info1: "visited: 18
+graph: { title: "n73" label: "73" status:clustered color:yellow
+edge: {sourcename: "n73" targetname: "n74" label: "0" color: red}
+node: {title: "n72" label: "Jmp  72"  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 info1: "visited: 19
+graph: { title: "n81" label: "81" status:clustered color:yellow
+edge: {sourcename: "n81" targetname: "n82" label: "0" color: red}
+node: {title: "n80" label: "ProjIs 0 80" color: yellow info1: "visited: 19
 "}
-edge: {sourcename: "n78" targetname: "n83" label: "0" }
-node: {title: "n86" label: "Jmp  86"  info1: "visited: 19
+edge: {sourcename: "n80" targetname: "n85" label: "0" }
+node: {title: "n88" label: "Jmp  88"  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 info1: "visited: 20
+graph: { title: "n83" label: "83" status:clustered color:yellow
+edge: {sourcename: "n83" targetname: "n82" label: "0" color: red}
+node: {title: "n82" label: "ProjX 0 82" 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
+edge: {sourcename: "n82" targetname: "n84" label: "0" color: red}
+node: {title: "n84" label: "Start  84" color: blue info1: "visited: 20
 start of method of type main_tp
   param 0 type: int
 "}
-node: {title: "n83" label: "ProjT 4 83" color: yellow info1: "visited: 20
+node: {title: "n85" label: "ProjT 4 85" color: yellow info1: "visited: 20
 "}
-edge: {sourcename: "n83" targetname: "n82" label: "0" }
-node: {title: "n84" label: "0x1Is  84" color: yellow info1: "visited: 20
+edge: {sourcename: "n85" targetname: "n84" label: "0" }
+node: {title: "n86" label: "0x1Is  86" color: yellow info1: "visited: 20
 "}
-node: {title: "n85" label: "0x0Is  85" color: yellow info1: "visited: 20
+node: {title: "n87" label: "0x0Is  87" color: yellow info1: "visited: 20
 "}
-node: {title: "n88" label: "ProjM 1 88" color: yellow info1: "visited: 20
+node: {title: "n90" label: "ProjM 1 90" color: yellow info1: "visited: 20
 "}
-edge: {sourcename: "n88" targetname: "n82" label: "0" color: blue}
+edge: {sourcename: "n90" targetname: "n84" label: "0" color: blue}
 }
 
-node: {title: "n91" label: "Bad  91"  info1: "visited: 0
+node: {title: "n93" label: "Bad  93"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/c.vcg b/testprograms/ref-results/c.vcg
index e8c45af..4eab067 100644 (file)
--- a/testprograms/ref-results/c.vcg
+++ b/testprograms/ref-results/c.vcg
@@ -17,73 +17,73 @@ 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 info1: "visited: 21
+graph: { title: "n243" label: "243" status:clustered color:yellow
+node: {title: "n242" label: "End  242" 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 info1: "visited: 22
+graph: { title: "n248" label: "248" status:clustered color:yellow
+edge: {sourcename: "n248" targetname: "n250" label: "0" color: red}
+edge: {sourcename: "n248" targetname: "n249" label: "1" color: red}
+node: {title: "n252" label: "PhiM  252" 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
+edge: {sourcename: "n252" targetname: "n261" label: "0" color: blue}
+edge: {sourcename: "n252" targetname: "n253" label: "1" color: blue}
+node: {title: "n249" label: "Jmp  249"  info1: "visited: 22
 "}
-node: {title: "n251" label: "Store  251"  info1: "visited: 22
+node: {title: "n253" label: "Store  253"  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: "n253" targetname: "n252" label: "0" color: blue}
+edge: {sourcename: "n253" targetname: "n259" label: "1" }
+edge: {sourcename: "n253" targetname: "n254" label: "2" }
+node: {title: "n254" label: "PhiIs  254" 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: "n254" targetname: "n257" label: "0" }
+edge: {sourcename: "n254" targetname: "n255" label: "1" }
+node: {title: "n255" label: "PhiIs  255" 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: "n255" targetname: "n256" label: "0" }
+edge: {sourcename: "n255" targetname: "n254" label: "1" }
+node: {title: "n259" label: "Sel a 259"  info1: "visited: 22
 Selecting entity of type int
   from entity of type PRIMA
 "}
-edge: {sourcename: "n257" targetname: "n250" label: "0" color: blue}
-edge: {sourcename: "n257" targetname: "n258" label: "1" }
+edge: {sourcename: "n259" targetname: "n252" label: "0" color: blue}
+edge: {sourcename: "n259" targetname: "n260" 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"  info1: "visited: 23
+graph: { title: "n251" label: "251" status:clustered color:yellow
+edge: {sourcename: "n251" targetname: "n246" label: "0" color: red}
+node: {title: "n250" label: "Jmp  250"  info1: "visited: 23
 "}
-node: {title: "n255" label: "ProjIs 1 255" color: yellow info1: "visited: 23
+node: {title: "n257" label: "ProjIs 1 257" 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: "n257" targetname: "n258" label: "0" }
+node: {title: "n260" label: "ProjP 0 260" color: yellow info1: "visited: 23
 "}
-edge: {sourcename: "n258" targetname: "n256" label: "0" }
+edge: {sourcename: "n260" targetname: "n258" 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 info1: "visited: 24
+graph: { title: "n245" label: "245" status:clustered color:yellow
+edge: {sourcename: "n245" targetname: "n246" label: "0" color: red}
+node: {title: "n246" label: "ProjX 0 246" 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
+edge: {sourcename: "n246" targetname: "n247" label: "0" color: red}
+node: {title: "n247" label: "Start  247" color: blue info1: "visited: 24
 start of method of type c
   param 0 type: class_prima_ptr
   param 1 type: int
 "}
-node: {title: "n254" label: "0x0Is  254" color: yellow info1: "visited: 24
+node: {title: "n256" label: "0x0Is  256" color: yellow info1: "visited: 24
 "}
-node: {title: "n256" label: "ProjT 4 256" color: yellow info1: "visited: 24
+node: {title: "n258" label: "ProjT 4 258" 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: "n258" targetname: "n247" label: "0" }
+node: {title: "n261" label: "ProjM 1 261" color: yellow info1: "visited: 24
 "}
-edge: {sourcename: "n259" targetname: "n245" label: "0" color: blue}
+edge: {sourcename: "n261" targetname: "n247" label: "0" color: blue}
 }
 
-node: {title: "n242" label: "Bad  242"  info1: "visited: 0
+node: {title: "n244" label: "Bad  244"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/main-type.vcg b/testprograms/ref-results/main-type.vcg
index f0ee5e5..394ad5a 100644 (file)
--- a/testprograms/ref-results/main-type.vcg
+++ b/testprograms/ref-results/main-type.vcg
@@ -17,9 +17,9 @@ classname 10: "Array Element Type"
 classname 11: "Overwrites"
 classname 12: "Member"
 
-node: {title: "e16" label: "ent a_tp_elem_ent" color: yellow
+node: {title: "e18" label: "ent a_tp_elem_ent" color: yellow
  info1: "
-id: e16
+id: e18
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -29,25 +29,25 @@ name:    a_tp_elem_ent
 ld_name: a_tp_a_tp_elem_ent
 offset:  -1"
 }
-edge: { sourcename: "e16" targetname: "t10"class: 3 label: "type" color: red}
-node: {title: "t15" label: "array a_tp" info1: "state: layout_undefined
+edge: { sourcename: "e18" targetname: "t12"class: 3 label: "type" color: red}
+node: {title: "t17" label: "array a_tp" info1: "state: layout_undefined
 size: -1B,
 "}
-edge: { sourcename: "t15" targetname: "t10"class: 10 label: "arr elt tp" color:green}
-edge: { sourcename: "t15" targetname: "e16"class: 10 label: "arr ent" color: green}
-edge: { sourcename: "n17" targetname: "t15"label: "upper 0"}
-edge: { sourcename: "n18" targetname: "t15"label: "lower 0"}
-node: {title: "n17" label: "0x9Iu  17" color: yellow info1: "visited: 1
+edge: { sourcename: "t17" targetname: "t12"class: 10 label: "arr elt tp" color:green}
+edge: { sourcename: "t17" targetname: "e18"class: 10 label: "arr ent" color: green}
+edge: { sourcename: "n19" targetname: "t17"label: "upper 0"}
+edge: { sourcename: "n20" targetname: "t17"label: "lower 0"}
+node: {title: "n19" label: "0x9Iu  19" color: yellow info1: "visited: 1
 "}
-node: {title: "n18" label: "0x0Iu  18" color: yellow info1: "visited: 1
+node: {title: "n20" label: "0x0Iu  20" color: yellow info1: "visited: 1
 "}
-node: {title: "t10" label: "primitive int" info1: "state: layout_fixed,
+node: {title: "t12" label: "primitive int" info1: "state: layout_fixed,
 mode: Is,
 size: 4B,
 "}
-node: {title: "e33" label: "ent a" color: yellow
+node: {title: "e35" label: "ent a" color: yellow
  info1: "
-id: e33
+id: e35
 allocation:  allocation_automatic
 visibility:  visibility_local
 variability: variability_uninitialized
@@ -57,14 +57,14 @@ name:    a
 ld_name: mainframe_tp_a
 offset:  -1"
 }
-edge: { sourcename: "e33" targetname: "t15"class: 3 label: "type" color: red}
-node: {title: "t19" label: "class mainframe_tp" info1: "state: layout_undefined
+edge: { sourcename: "e35" targetname: "t17"class: 3 label: "type" color: red}
+node: {title: "t21" label: "class mainframe_tp" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "t19" targetname: "e33"class: 12 label: "member" color:blue}
-node: {title: "e14" label: "ent main" color: yellow
+edge: { sourcename: "t21" targetname: "e35"class: 12 label: "member" color:blue}
+node: {title: "e16" label: "ent main" color: yellow
  info1: "
-id: e14
+id: e16
 allocation:  allocation_static
 visibility:  visibility_local
 variability: variability_constant
@@ -73,19 +73,19 @@ peculiarity: peculiarity_existent
 name:    main
 ld_name: ARRAY-STACK_EXAMPLE_main
 offset:  -1
-irg = g31"
+irg = g33"
 }
-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 info1: "visited: 1
+edge: { sourcename: "e16" targetname: "t14"class: 3 label: "type" color: red}
+edge: { sourcename: "e16" targetname: "n15"label: "value 0"}
+node: {title: "n15" label: "&(ARRAY-STACK_EXAMPLE_main)P  15" color: yellow info1: "visited: 1
 "}
-node: {title: "t11" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined
+node: {title: "t13" label: "class ARRAY-STACK_EXAMPLE" info1: "state: layout_undefined
 size: -1B,
 " color: green}
-edge: { sourcename: "t11" targetname: "e14"class: 12 label: "member" color:blue}
-node: {title: "t12" label: "method main" info1: "state: layout_fixed,
+edge: { sourcename: "t13" targetname: "e16"class: 12 label: "member" color:blue}
+node: {title: "t14" label: "method main" info1: "state: layout_fixed,
 mode: P,
 size: 4B,
 "}
-edge: { sourcename: "t12" targetname: "t10"class: 6 label: "res 0" color: green}
+edge: { sourcename: "t14" targetname: "t12"class: 6 label: "res 0" color: green}
 }

diff --git a/testprograms/ref-results/main.vcg b/testprograms/ref-results/main.vcg
index a119a50..1687c3d 100644 (file)
--- a/testprograms/ref-results/main.vcg
+++ b/testprograms/ref-results/main.vcg
@@ -17,61 +17,61 @@ 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 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: "End  46" 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"  info1: "visited: 9
+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: "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: "n48" targetname: "n60" 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: "n51" targetname: "n52" label: "0" }
-node: {title: "n52" label: "Load  52"  info1: "visited: 9
+edge: {sourcename: "n53" targetname: "n54" label: "0" }
+node: {title: "n54" label: "Load  54"  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: "n54" targetname: "n59" label: "0" color: blue}
+edge: {sourcename: "n54" targetname: "n55" label: "1" }
+node: {title: "n55" label: "Sel a_tp_elem_ent 55"  info1: "visited: 9
 Selecting entity of type int
   from entity of type a_tp
 "}
-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: "n59" label: "0" color: blue}
+edge: {sourcename: "n55" targetname: "n57" label: "1" }
+edge: {sourcename: "n55" targetname: "n56" label: "2" }
+node: {title: "n57" label: "Sel a 57"  info1: "visited: 9
 Selecting entity of type a_tp
   from entity of type mainframe_tp
 "}
-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: "n57" targetname: "n59" label: "0" color: blue}
+edge: {sourcename: "n57" targetname: "n58" label: "1" }
+node: {title: "n60" label: "ProjM 0 60" color: yellow info1: "visited: 9
 "}
-edge: {sourcename: "n58" targetname: "n52" label: "0" color: blue}
+edge: {sourcename: "n60" targetname: "n54" 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
+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: "n48" targetname: "n50" label: "0" color: red}
-node: {title: "n50" label: "Start  50" color: blue info1: "visited: 10
+edge: {sourcename: "n50" targetname: "n52" label: "0" color: red}
+node: {title: "n52" label: "Start  52" color: blue info1: "visited: 10
 start of method of type main
 "}
-node: {title: "n54" label: "0x3Iu  54" color: yellow info1: "visited: 10
+node: {title: "n56" label: "0x3Iu  56" color: yellow info1: "visited: 10
 "}
-node: {title: "n56" label: "ProjP 2 56" color: yellow info1: "visited: 10
+node: {title: "n58" label: "ProjP 2 58" 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: "n58" targetname: "n52" label: "0" }
+node: {title: "n59" label: "ProjM 1 59" color: yellow info1: "visited: 10
 "}
-edge: {sourcename: "n57" targetname: "n50" label: "0" color: blue}
+edge: {sourcename: "n59" targetname: "n52" label: "0" color: blue}
 }
 
-node: {title: "n61" label: "Bad  61"  info1: "visited: 0
+node: {title: "n63" label: "Bad  63"  info1: "visited: 0
 "}
 }

diff --git a/testprograms/ref-results/set_a.vcg b/testprograms/ref-results/set_a.vcg
index 16a7e80..ce0ce6f 100644 (file)
--- a/testprograms/ref-results/set_a.vcg
+++ b/testprograms/ref-results/set_a.vcg
@@ -17,57 +17,57 @@ 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 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: "End  224" 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"  info1: "visited: 17
+graph: { title: "n227" label: "227" status:clustered color:yellow
+edge: {sourcename: "n227" targetname: "n228" label: "0" color: red}
+node: {title: "n226" label: "Return  226"  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: "n226" targetname: "n231" label: "0" color: blue}
+node: {title: "n231" label: "ProjM 0 231" 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: "n231" targetname: "n232" label: "0" color: blue}
+node: {title: "n232" label: "Store  232"  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: "n232" targetname: "n237" label: "0" color: blue}
+edge: {sourcename: "n232" targetname: "n235" label: "1" }
+edge: {sourcename: "n232" targetname: "n233" label: "2" }
+node: {title: "n233" label: "ProjIs 1 233" 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: "n234" label: "0" }
+node: {title: "n235" label: "Sel a 235"  info1: "visited: 17
 Selecting entity of type int
   from entity of type PRIMA
 "}
-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: "n235" targetname: "n237" label: "0" color: blue}
+edge: {sourcename: "n235" targetname: "n236" label: "1" }
+node: {title: "n236" label: "ProjP 0 236" color: yellow info1: "visited: 17
 "}
-edge: {sourcename: "n234" targetname: "n232" label: "0" }
+edge: {sourcename: "n236" targetname: "n234" 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 info1: "visited: 18
+graph: { title: "n229" label: "229" status:clustered color:yellow
+edge: {sourcename: "n229" targetname: "n228" label: "0" color: red}
+node: {title: "n228" label: "ProjX 0 228" 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
+edge: {sourcename: "n228" targetname: "n230" label: "0" color: red}
+node: {title: "n230" label: "Start  230" color: blue info1: "visited: 18
 start of method of type set_a
   param 0 type: class_prima_ptr
   param 1 type: int
 "}
-node: {title: "n232" label: "ProjT 4 232" color: yellow info1: "visited: 18
+node: {title: "n234" label: "ProjT 4 234" 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: "n234" targetname: "n230" label: "0" }
+node: {title: "n237" label: "ProjM 1 237" color: yellow info1: "visited: 18
 "}
-edge: {sourcename: "n235" targetname: "n228" label: "0" color: blue}
+edge: {sourcename: "n237" targetname: "n230" label: "0" color: blue}
 }
 
-node: {title: "n238" label: "Bad  238"  info1: "visited: 0
+node: {title: "n240" label: "Bad  240"  info1: "visited: 0
 "}
 }