Changed dumper: debug info for tyoes/entities added

makes info for entities more "logical"
added flag to dump  ent names instead of ld_names

[r6218]

diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
index 0e79fb7..a7fea10 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
@@ -63,7 +63,7 @@ node: {title: "e21" label: "ent a_elem_ent" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -80,15 +80,15 @@ node: {title: "t18" label: "array a" info1: "array type a (18)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
   visibility: visibility_external_allocated,
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t14"class: 10 label: "arr elt tp" color:green}
 edge: { sourcename: "t18" targetname: "e21"class: 10 label: "arr ent" color: green}
 edge: { sourcename: "n22" targetname: "t18"label: "upper 0"}
@@ -119,10 +119,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e17" label: "ent ARRAY-HEAP_EXAMPLE_main" color: yellow
  info1: "entity ARRAY-HEAP_EXAMPLE_main (17)
   type:  ARRAY-HEAP_EXAMPLE_main (15)
@@ -136,7 +136,7 @@ node: {title: "e17" label: "ent ARRAY-HEAP_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 36
 
 "
@@ -170,7 +170,7 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 36
   supertypes:
   subtypes:
@@ -179,10 +179,10 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t0" targetname: "e17"class: 12 label: "member" color:blue}
 node: {title: "t15" label: "method ARRAY-HEAP_EXAMPLE_main" info1: "method type ARRAY-HEAP_EXAMPLE_main (15)
   variadicity: variadicity_non_variadic
@@ -194,10 +194,10 @@ node: {title: "t15" label: "method ARRAY-HEAP_EXAMPLE_main" info1: "method type
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t15" targetname: "t14"class: 6 label: "res 0" color: green}
 node: {title: "t24" label: "class ARRAY-HEAP_EXAMPLE_mainframe_tp" info1: "class type ARRAY-HEAP_EXAMPLE_mainframe_tp (24)
   members:
@@ -208,8 +208,8 @@ node: {title: "t24" label: "class ARRAY-HEAP_EXAMPLE_mainframe_tp" info1: "class
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 }

diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
index 77682a8..0a3d873 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main.vcg
@@ -140,9 +140,9 @@ node: {title: "n45" label: "Sel a_elem_ent 45"  info1: "Sel 45
      1:    Proj 43
      2:    0x3 44
   Private Attributes:
-  Selecting entity of type int
-    from entity a_elem_ent (21)
-    of type a
+  Selecting entity a_elem_ent (21)
+    of type    int
+    with owner a.
 "
 }
 edge: {sourcename: "n45" targetname: "n42" label: "0" class:14 priority:50 color:blue}

diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg
index b4be130..d6b2105 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-type.vcg
@@ -63,7 +63,7 @@ node: {title: "e22" label: "ent a_tp_elem_ent" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -80,15 +80,15 @@ node: {title: "t19" label: "array a_tp" info1: "array type a_tp (19)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
   visibility: visibility_external_allocated,
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t19" targetname: "t14"class: 10 label: "arr elt tp" color:green}
 edge: { sourcename: "t19" targetname: "e22"class: 10 label: "arr ent" color: green}
 edge: { sourcename: "n23" targetname: "t19"label: "upper 0"}
@@ -119,10 +119,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e39" label: "ent a" color: yellow
  info1: "entity a (39)
   type:  a_tp (19)
@@ -135,7 +135,7 @@ node: {title: "e39" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -153,7 +153,7 @@ node: {title: "t25" label: "class mainframe_tp" info1: "class type mainframe_tp
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
   supertypes:
   subtypes:
   peculiarity: peculiarity_existent
@@ -161,10 +161,10 @@ node: {title: "t25" label: "class mainframe_tp" info1: "class type mainframe_tp
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t25" targetname: "e39"class: 12 label: "member" color:blue}
 node: {title: "e18" label: "ent ARRAY-STACK_EXAMPLE_main" color: yellow
  info1: "entity main (18)
@@ -179,7 +179,7 @@ node: {title: "e18" label: "ent ARRAY-STACK_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: ARRAY-STACK_EXAMPLE_main
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 37
 
 "
@@ -213,7 +213,7 @@ node: {title: "t15" label: "class ARRAY-STACK_EXAMPLE" info1: "class type ARRAY-
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: ARRAY-STACK_EXAMPLE_main
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 37
   supertypes:
   subtypes:
@@ -222,10 +222,10 @@ node: {title: "t15" label: "class ARRAY-STACK_EXAMPLE" info1: "class type ARRAY-
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e18"class: 12 label: "member" color:blue}
 node: {title: "t16" label: "method main_tp" info1: "method type main_tp (16)
   variadicity: variadicity_non_variadic
@@ -237,9 +237,9 @@ node: {title: "t16" label: "method main_tp" info1: "method type main_tp (16)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t14"class: 6 label: "res 0" color: green}
 }

diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
index b88853c..d9633b4 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
@@ -140,9 +140,9 @@ node: {title: "n43" label: "Sel a_tp_elem_ent 43"  info1: "Sel 43
      1:    Sel 41
      2:    0x3 42
   Private Attributes:
-  Selecting entity of type int
-    from entity a_tp_elem_ent (22)
-    of type a_tp
+  Selecting entity a_tp_elem_ent (22)
+    of type    int
+    with owner a_tp.
 "
 }
 edge: {sourcename: "n43" targetname: "n35" label: "0" class:17 priority:10 color:blue}
@@ -158,9 +158,9 @@ node: {title: "n41" label: "Sel a 41"  info1: "Sel 41
      0:    Proj 35
      1:    Proj 33
   Private Attributes:
-  Selecting entity of type a_tp
-    from entity a (39)
-    of type mainframe_tp
+  Selecting entity a (39)
+    of type    a_tp
+    with owner mainframe_tp.
 "
 }
 edge: {sourcename: "n41" targetname: "n35" label: "0" class:17 priority:10 color:blue}
@@ -244,7 +244,7 @@ node: {title: "e22" label: "ent a_tp_elem_ent" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -261,15 +261,15 @@ node: {title: "t19" label: "array a_tp" info1: "array type a_tp (19)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
   visibility: visibility_external_allocated,
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t19" targetname: "t14"class: 10 label: "arr elt tp" color:green}
 edge: { sourcename: "t19" targetname: "e22"class: 10 label: "arr ent" color: green}
 edge: { sourcename: "n23" targetname: "t19"label: "upper 0"}
@@ -300,10 +300,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e39" label: "ent a" color: yellow
  info1: "entity a (39)
   type:  a_tp (19)
@@ -316,7 +316,7 @@ node: {title: "e39" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -334,7 +334,7 @@ node: {title: "t25" label: "class mainframe_tp" info1: "class type mainframe_tp
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
   supertypes:
   subtypes:
   peculiarity: peculiarity_existent
@@ -342,10 +342,10 @@ node: {title: "t25" label: "class mainframe_tp" info1: "class type mainframe_tp
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t25" targetname: "e39"class: 12 label: "member" color:blue}
 node: {title: "e18" label: "ent ARRAY-STACK_EXAMPLE_main" color: yellow
  info1: "entity main (18)
@@ -360,7 +360,7 @@ node: {title: "e18" label: "ent ARRAY-STACK_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: ARRAY-STACK_EXAMPLE_main
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 37
 
 "
@@ -394,7 +394,7 @@ node: {title: "t15" label: "class ARRAY-STACK_EXAMPLE" info1: "class type ARRAY-
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: ARRAY-STACK_EXAMPLE_main
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 37
   supertypes:
   subtypes:
@@ -403,10 +403,10 @@ node: {title: "t15" label: "class ARRAY-STACK_EXAMPLE" info1: "class type ARRAY-
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e18"class: 12 label: "member" color:blue}
 node: {title: "t16" label: "method main_tp" info1: "method type main_tp (16)
   variadicity: variadicity_non_variadic
@@ -418,10 +418,10 @@ node: {title: "t16" label: "method main_tp" info1: "method type main_tp (16)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t14"class: 6 label: "res 0" color: green}
 edge: { sourcename: "n43" targetname: "e22"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n41" targetname: "e39"class:2 priority:2 linestyle:dotted}

diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main.vcg
index 2820b4f..c7ee423 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main.vcg
@@ -140,9 +140,9 @@ node: {title: "n43" label: "Sel a_tp_elem_ent 43"  info1: "Sel 43
      1:    Sel 41
      2:    0x3 42
   Private Attributes:
-  Selecting entity of type int
-    from entity a_tp_elem_ent (22)
-    of type a_tp
+  Selecting entity a_tp_elem_ent (22)
+    of type    int
+    with owner a_tp.
 "
 }
 edge: {sourcename: "n43" targetname: "n35" label: "0" class:17 priority:10 color:blue}
@@ -158,9 +158,9 @@ node: {title: "n41" label: "Sel a 41"  info1: "Sel 41
      0:    Proj 35
      1:    Proj 33
   Private Attributes:
-  Selecting entity of type a_tp
-    from entity a (39)
-    of type mainframe_tp
+  Selecting entity a (39)
+    of type    a_tp
+    with owner mainframe_tp.
 "
 }
 edge: {sourcename: "n41" targetname: "n35" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/All_graphs.vcg b/testprograms/ref-results/All_graphs.vcg
index e4e5cf6..5ad8a00 100644 (file)
--- a/testprograms/ref-results/All_graphs.vcg
+++ b/testprograms/ref-results/All_graphs.vcg
@@ -398,9 +398,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Filter 184
      1:    Filter 185
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n78" targetname: "n184" label: "0" class:17 priority:10 color:blue}
@@ -605,9 +605,9 @@ node: {title: "n101" label: "Sel a 101"  info1: "Sel 101
      0:    Filter 176
      1:    Filter 177
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n101" targetname: "n176" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg
index c30ea38..b4bf34f 100644 (file)
--- a/testprograms/ref-results/All_types.vcg
+++ b/testprograms/ref-results/All_types.vcg
@@ -59,10 +59,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "t15" label: "method main_tp" info1: "method type main_tp (15)
   variadicity: variadicity_non_variadic
   return types: 1
@@ -74,10 +74,10 @@ node: {title: "t15" label: "method main_tp" info1: "method type main_tp (15)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t15" targetname: "t14"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t15" targetname: "t14"class: 6 label: "res 0" color: green}
 node: {title: "t16" label: "class WHILE_EXAMPLE" info1: "class type WHILE_EXAMPLE (16)
@@ -94,7 +94,7 @@ node: {title: "t16" label: "class WHILE_EXAMPLE" info1: "class type WHILE_EXAMPL
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: WHILE_EXAMPLE_main
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 31
   supertypes:
   subtypes:
@@ -103,10 +103,10 @@ node: {title: "t16" label: "class WHILE_EXAMPLE" info1: "class type WHILE_EXAMPL
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t16" targetname: "e18"class: 12 label: "member" color:blue}
 node: {title: "e18" label: "ent WHILE_EXAMPLE_main" color: yellow
  info1: "entity main (18)
@@ -121,7 +121,7 @@ node: {title: "e18" label: "ent WHILE_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: WHILE_EXAMPLE_main
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 31
 
 "
@@ -150,8 +150,8 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 }

diff --git a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
index 652b289..001c4bc 100644 (file)
--- a/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/ENDLESS_LOOP_EXAMPLE_main.vcg
@@ -113,9 +113,9 @@ node: {title: "n52" label: "Sel VAR_A 52"  info1: "Sel 52
      0:    Phi 66
      1:    Proj 28
   Private Attributes:
-  Selecting entity of type int
-    from entity VAR_A (50)
-    of type GlobalType
+  Selecting entity VAR_A (50)
+    of type    int
+    with owner GlobalType.
 "
 }
 edge: {sourcename: "n52" targetname: "n66" label: "0" class:14 priority:50 color:blue}

diff --git a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg
index 8463d30..4119ec6 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main-pure-wtypes.vcg
@@ -157,9 +157,9 @@ node: {title: "n34" label: "Sel i 34"  info1: "Sel 34
      0:    Proj 29
      1:    Proj 28
   Private Attributes:
-  Selecting entity of type int
-    from entity i (18)
-    of type GlobalType
+  Selecting entity i (18)
+    of type    int
+    with owner GlobalType.
 "
 }
 edge: {sourcename: "n34" targetname: "n29" label: "0" class:17 priority:10 color:blue}
@@ -249,7 +249,7 @@ node: {title: "e18" label: "ent i" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -268,7 +268,7 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 31
     entity i (18)
       type:  int (14)
@@ -281,7 +281,7 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
   supertypes:
   subtypes:
   peculiarity: peculiarity_existent
@@ -289,10 +289,10 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t0" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t0" targetname: "e18"class: 12 label: "member" color:blue}
 node: {title: "e17" label: "ent GLOBAL_VAR_main" color: yellow
@@ -308,7 +308,7 @@ node: {title: "e17" label: "ent GLOBAL_VAR_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 31
 
 "
@@ -337,20 +337,20 @@ node: {title: "t15" label: "method GLOBAL_VAR_main" info1: "method type GLOBAL_V
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
   state:      layout_fixed,
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "t19" label: "class GLOBAL_VAR_mainframe_tp" info1: "class type GLOBAL_VAR_mainframe_tp (19)
   members:
   supertypes:
@@ -360,9 +360,9 @@ node: {title: "t19" label: "class GLOBAL_VAR_mainframe_tp" info1: "class type GL
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n34" targetname: "e18"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 d1770cc..364ddd8 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main.vcg
@@ -124,9 +124,9 @@ node: {title: "n34" label: "Sel i 34"  info1: "Sel 34
      0:    Proj 29
      1:    Proj 28
   Private Attributes:
-  Selecting entity of type int
-    from entity i (18)
-    of type GlobalType
+  Selecting entity i (18)
+    of type    int
+    with owner GlobalType.
 "
 }
 edge: {sourcename: "n34" targetname: "n29" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
index 283588e..a54ddff 100644 (file)
--- a/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/MEMORY_EXAMPLE_main.vcg
@@ -451,9 +451,9 @@ node: {title: "n37" label: "Sel VAR_B 37"  info1: "Sel 37
      0:    Proj 29
      1:    Proj 28
   Private Attributes:
-  Selecting entity of type int
-    from entity VAR_B (36)
-    of type GlobalType
+  Selecting entity VAR_B (36)
+    of type    int
+    with owner GlobalType.
 "
 }
 edge: {sourcename: "n37" targetname: "n29" label: "0" class:17 priority:10 color:blue}
@@ -468,9 +468,9 @@ node: {title: "n35" label: "Sel VAR_A 35"  info1: "Sel 35
      0:    Proj 29
      1:    Proj 28
   Private Attributes:
-  Selecting entity of type int
-    from entity VAR_A (33)
-    of type GlobalType
+  Selecting entity VAR_A (33)
+    of type    int
+    with owner GlobalType.
 "
 }
 edge: {sourcename: "n35" targetname: "n29" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
index c0f6f85..7a6eac7 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
@@ -113,9 +113,9 @@ node: {title: "n191" label: "Sel a 191"  info1: "Sel 191
      0:    Phi 180
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA_INLINE
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA_INLINE.
 "
 }
 edge: {sourcename: "n191" targetname: "n180" label: "0" class:14 priority:50 color:blue}
@@ -205,9 +205,9 @@ node: {title: "n156" label: "Sel a 156"  info1: "Sel 156
      0:    Proj 47
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA_INLINE
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA_INLINE.
 "
 }
 edge: {sourcename: "n156" targetname: "n47" label: "0" class:14 priority:50 color:blue}
@@ -383,7 +383,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -401,7 +401,7 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA_INLINE (15)
@@ -414,7 +414,7 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_INLINE_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -428,7 +428,7 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_INLINE_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -437,10 +437,10 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -457,7 +457,7 @@ node: {title: "e20" label: "ent PRIMA_INLINE_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_INLINE_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -488,10 +488,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -501,10 +501,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -512,10 +512,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_INLINE_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -529,7 +529,7 @@ node: {title: "e23" label: "ent PRIMA_INLINE_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_INLINE_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -561,10 +561,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -581,7 +581,7 @@ node: {title: "e26" label: "ent OO_INLINE_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 39
 
 "
@@ -615,7 +615,7 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 39
   supertypes:
   subtypes:
@@ -624,10 +624,10 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue}
 node: {title: "t24" label: "method OO_INLINE_EXAMPLE_main" info1: "method type OO_INLINE_EXAMPLE_main (24)
   variadicity: variadicity_non_variadic
@@ -639,10 +639,10 @@ node: {title: "t24" label: "method OO_INLINE_EXAMPLE_main" info1: "method type O
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green}
 node: {title: "t27" label: "class OO_INLINE_EXAMPLE_mainframe_tp" info1: "class type OO_INLINE_EXAMPLE_mainframe_tp (27)
   members:
@@ -653,10 +653,10 @@ node: {title: "t27" label: "class OO_INLINE_EXAMPLE_mainframe_tp" info1: "class
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n191" targetname: "e17"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n43" targetname: "t15"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 8354369..61e77a9 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main.vcg
@@ -113,9 +113,9 @@ node: {title: "n191" label: "Sel a 191"  info1: "Sel 191
      0:    Phi 180
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA_INLINE
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA_INLINE.
 "
 }
 edge: {sourcename: "n191" targetname: "n180" label: "0" class:14 priority:50 color:blue}
@@ -205,9 +205,9 @@ node: {title: "n156" label: "Sel a 156"  info1: "Sel 156
      0:    Proj 47
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA_INLINE
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA_INLINE.
 "
 }
 edge: {sourcename: "n156" targetname: "n47" label: "0" class:14 priority:50 color:blue}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg
index ae2507a..baddc3a 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-ip.vcg
@@ -398,9 +398,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Filter 184
      1:    Filter 185
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n78" targetname: "n184" label: "0" class:17 priority:10 color:blue}
@@ -605,9 +605,9 @@ node: {title: "n101" label: "Sel a 101"  info1: "Sel 101
      0:    Filter 176
      1:    Filter 177
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n101" targetname: "n176" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg
index 5078c73..7d6fac4 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-ip.vcg
@@ -655,9 +655,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Filter 184
      1:    Filter 185
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n78" targetname: "n184" label: "0" class:17 priority:10 color:blue}
@@ -740,9 +740,9 @@ node: {title: "n101" label: "Sel a 101"  info1: "Sel 101
      0:    Filter 176
      1:    Filter 177
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n101" targetname: "n176" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg
index fb89ddb..27d298d 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg
@@ -655,9 +655,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Filter 184
      1:    Filter 185
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n78" targetname: "n184" label: "0" class:17 priority:10 color:blue}
@@ -740,9 +740,9 @@ node: {title: "n101" label: "Sel a 101"  info1: "Sel 101
      0:    Filter 176
      1:    Filter 177
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n101" targetname: "n176" label: "0" class:17 priority:10 color:blue}
@@ -900,7 +900,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -918,7 +918,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -931,7 +931,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -945,7 +945,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -954,10 +954,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -974,7 +974,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -1005,10 +1005,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -1018,10 +1018,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -1029,10 +1029,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -1046,7 +1046,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -1078,10 +1078,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -1098,7 +1098,7 @@ node: {title: "e26" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 39
 
 "
@@ -1132,7 +1132,7 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 39
   supertypes:
   subtypes:
@@ -1141,10 +1141,10 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue}
 node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24)
   variadicity: variadicity_non_variadic
@@ -1156,10 +1156,10 @@ node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green}
 node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27)
   members:
@@ -1170,10 +1170,10 @@ node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n101" targetname: "e17"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n43" targetname: "t15"class:2 priority:2 linestyle:dotted}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
index a1b6af8..f43fbb5 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
@@ -190,9 +190,9 @@ node: {title: "n49" label: "Sel PRIMA_set_a 49"  info1: "Sel 49
      0:    Proj 47
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type set_a
-    from entity set_a (20)
-    of type PRIMA
+  Selecting entity set_a (20)
+    of type    set_a
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n49" targetname: "n47" label: "0" class:14 priority:50 color:blue}
@@ -256,9 +256,9 @@ node: {title: "n53" label: "Sel PRIMA_c 53"  info1: "Sel 53
      0:    Proj 52
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type c
-    from entity c (23)
-    of type PRIMA
+  Selecting entity c (23)
+    of type    c
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n53" targetname: "n52" label: "0" class:14 priority:50 color:blue}
@@ -395,10 +395,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -409,10 +409,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   members:
@@ -427,7 +427,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -440,7 +440,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -454,7 +454,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -463,10 +463,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -482,7 +482,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -493,10 +493,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
  info1: "entity set_a (20)
   type:  set_a (18)
@@ -510,7 +510,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -541,10 +541,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
@@ -560,7 +560,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -593,7 +593,7 @@ node: {title: "e26" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 39
 
 "
@@ -627,7 +627,7 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 39
   supertypes:
   subtypes:
@@ -636,10 +636,10 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue}
 node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24)
   variadicity: variadicity_non_variadic
@@ -651,10 +651,10 @@ node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green}
 node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27)
   members:
@@ -665,10 +665,10 @@ node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n54" targetname: "t21"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n43" targetname: "t15"class:2 priority:2 linestyle:dotted}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg
index 1e4c338..e5c7b97 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure.vcg
@@ -190,9 +190,9 @@ node: {title: "n49" label: "Sel PRIMA_set_a 49"  info1: "Sel 49
      0:    Proj 47
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type set_a
-    from entity set_a (20)
-    of type PRIMA
+  Selecting entity set_a (20)
+    of type    set_a
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n49" targetname: "n47" label: "0" class:14 priority:50 color:blue}
@@ -256,9 +256,9 @@ node: {title: "n53" label: "Sel PRIMA_c 53"  info1: "Sel 53
      0:    Proj 52
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type c
-    from entity c (23)
-    of type PRIMA
+  Selecting entity c (23)
+    of type    c
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n53" targetname: "n52" label: "0" class:14 priority:50 color:blue}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg
index aa5d09c..825a80a 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-type.vcg
@@ -65,10 +65,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -79,10 +79,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   members:
@@ -97,7 +97,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -110,7 +110,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -124,7 +124,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -133,10 +133,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -152,7 +152,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -163,10 +163,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
  info1: "entity set_a (20)
   type:  set_a (18)
@@ -180,7 +180,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -211,10 +211,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
@@ -230,7 +230,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -263,7 +263,7 @@ node: {title: "e26" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 39
 
 "
@@ -297,7 +297,7 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 39
   supertypes:
   subtypes:
@@ -306,10 +306,10 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue}
 node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24)
   variadicity: variadicity_non_variadic
@@ -321,10 +321,10 @@ node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green}
 node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27)
   members:
@@ -335,8 +335,8 @@ node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 }

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
index 21cb992..e4545ff 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
@@ -398,9 +398,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Filter 184
      1:    Filter 185
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n78" targetname: "n184" label: "0" class:17 priority:10 color:blue}
@@ -605,9 +605,9 @@ node: {title: "n101" label: "Sel a 101"  info1: "Sel 101
      0:    Filter 176
      1:    Filter 177
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n101" targetname: "n176" label: "0" class:17 priority:10 color:blue}
@@ -727,7 +727,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -745,7 +745,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -758,7 +758,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -772,7 +772,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -781,10 +781,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -801,7 +801,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -832,10 +832,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -845,10 +845,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -856,10 +856,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -873,7 +873,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -905,10 +905,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -925,7 +925,7 @@ node: {title: "e26" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 39
 
 "
@@ -959,7 +959,7 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 39
   supertypes:
   subtypes:
@@ -968,10 +968,10 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue}
 node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24)
   variadicity: variadicity_non_variadic
@@ -983,10 +983,10 @@ node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green}
 node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27)
   members:
@@ -997,10 +997,10 @@ node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n101" targetname: "e17"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n43" targetname: "t15"class:2 priority:2 linestyle:dotted}

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg
index 40f8f17..d58fa46 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-wtypes.vcg
@@ -169,9 +169,9 @@ node: {title: "n53" label: "Sel PRIMA_c 53"  info1: "Sel 53
      0:    Proj 52
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type c
-    from entity c (23)
-    of type PRIMA
+  Selecting entity c (23)
+    of type    c
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n53" targetname: "n52" label: "0" class:14 priority:50 color:blue}
@@ -232,9 +232,9 @@ node: {title: "n49" label: "Sel PRIMA_set_a 49"  info1: "Sel 49
      0:    Proj 47
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type set_a
-    from entity set_a (20)
-    of type PRIMA
+  Selecting entity set_a (20)
+    of type    set_a
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n49" targetname: "n47" label: "0" class:14 priority:50 color:blue}
@@ -352,10 +352,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -366,10 +366,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   members:
@@ -384,7 +384,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -397,7 +397,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -411,7 +411,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -420,10 +420,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -439,7 +439,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -450,10 +450,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
  info1: "entity set_a (20)
   type:  set_a (18)
@@ -467,7 +467,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -498,10 +498,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
@@ -517,7 +517,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -550,7 +550,7 @@ node: {title: "e26" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 39
 
 "
@@ -584,7 +584,7 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 39
   supertypes:
   subtypes:
@@ -593,10 +593,10 @@ node: {title: "t0" label: "class GlobalType" info1: "class type GlobalType (0)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t0" targetname: "e26"class: 12 label: "member" color:blue}
 node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type OO_PROGRAM_EXAMPLE_main (24)
   variadicity: variadicity_non_variadic
@@ -608,10 +608,10 @@ node: {title: "t24" label: "method OO_PROGRAM_EXAMPLE_main" info1: "method type
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t24" targetname: "t14"class: 6 label: "res 0" color: green}
 node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class type OO_PROGRAM_EXAMPLE_mainframe_tp (27)
   members:
@@ -622,10 +622,10 @@ node: {title: "t27" label: "class OO_PROGRAM_EXAMPLE_mainframe_tp" info1: "class
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n54" targetname: "t21"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n45" targetname: "t15"class:2 priority:2 linestyle:dotted}
 edge: { sourcename: "n43" targetname: "t15"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 4de63ee..95084f2 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main.vcg
@@ -169,9 +169,9 @@ node: {title: "n53" label: "Sel PRIMA_c 53"  info1: "Sel 53
      0:    Proj 52
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type c
-    from entity c (23)
-    of type PRIMA
+  Selecting entity c (23)
+    of type    c
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n53" targetname: "n52" label: "0" class:14 priority:50 color:blue}
@@ -232,9 +232,9 @@ node: {title: "n49" label: "Sel PRIMA_set_a 49"  info1: "Sel 49
      0:    Proj 47
      1:    Proj 48
   Private Attributes:
-  Selecting entity of type set_a
-    from entity set_a (20)
-    of type PRIMA
+  Selecting entity set_a (20)
+    of type    set_a
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n49" targetname: "n47" label: "0" class:14 priority:50 color:blue}

diff --git a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
index f57d9f7..c30c170 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
@@ -113,9 +113,9 @@ node: {title: "n116" label: "Sel a 116"  info1: "Sel 116
      0:    Phi 131
      1:    Proj 98
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA_INLINE
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA_INLINE.
 "
 }
 edge: {sourcename: "n116" targetname: "n131" label: "0" class:14 priority:50 color:blue}
@@ -298,7 +298,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -316,7 +316,7 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA_INLINE (15)
@@ -329,7 +329,7 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_INLINE_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -343,7 +343,7 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_INLINE_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -352,10 +352,10 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -372,7 +372,7 @@ node: {title: "e20" label: "ent PRIMA_INLINE_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_INLINE_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -403,10 +403,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -416,10 +416,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -427,10 +427,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_INLINE_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -444,7 +444,7 @@ node: {title: "e23" label: "ent PRIMA_INLINE_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_INLINE_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -476,10 +476,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -492,9 +492,9 @@ node: {title: "t84" label: "class cframe_tp" info1: "class type cframe_tp (84)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n116" targetname: "e17"class:2 priority:2 linestyle:dotted}
 }

diff --git a/testprograms/ref-results/PRIMA_INLINE_c.vcg b/testprograms/ref-results/PRIMA_INLINE_c.vcg
index 6f5d0e1..db2858b 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_c.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_c.vcg
@@ -113,9 +113,9 @@ node: {title: "n116" label: "Sel a 116"  info1: "Sel 116
      0:    Phi 131
      1:    Proj 98
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA_INLINE
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA_INLINE.
 "
 }
 edge: {sourcename: "n116" targetname: "n131" label: "0" class:14 priority:50 color:blue}

diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
index fb2b1ea..18e1cb3 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
@@ -124,9 +124,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Proj 71
      1:    Proj 75
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA_INLINE
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA_INLINE.
 "
 }
 edge: {sourcename: "n78" targetname: "n71" label: "0" class:17 priority:10 color:blue}
@@ -229,7 +229,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -247,7 +247,7 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA_INLINE (15)
@@ -260,7 +260,7 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_INLINE_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -274,7 +274,7 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_INLINE_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -283,10 +283,10 @@ node: {title: "t15" label: "class PRIMA_INLINE" info1: "class type PRIMA_INLINE
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -303,7 +303,7 @@ node: {title: "e20" label: "ent PRIMA_INLINE_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_INLINE_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -334,10 +334,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -347,10 +347,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -358,10 +358,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_INLINE_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -375,7 +375,7 @@ node: {title: "e23" label: "ent PRIMA_INLINE_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_INLINE_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -407,10 +407,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -423,9 +423,9 @@ node: {title: "t61" label: "class set_aframe_tp" info1: "class type set_aframe_t
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n78" targetname: "e17"class:2 priority:2 linestyle:dotted}
 }

diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg
index 2b48158..7b1f033 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_set_a.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_set_a.vcg
@@ -124,9 +124,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Proj 71
      1:    Proj 75
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA_INLINE
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA_INLINE.
 "
 }
 edge: {sourcename: "n78" targetname: "n71" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
index 0884ed8..466abe8 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
@@ -175,9 +175,9 @@ node: {title: "n101" label: "Sel a 101"  info1: "Sel 101
      0:    Proj 94
      1:    Proj 98
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n101" targetname: "n94" label: "0" class:17 priority:10 color:blue}
@@ -298,7 +298,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -316,7 +316,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -329,7 +329,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -343,7 +343,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -352,10 +352,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -372,7 +372,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -403,10 +403,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -416,10 +416,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -427,10 +427,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -444,7 +444,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -476,10 +476,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -492,9 +492,9 @@ node: {title: "t84" label: "class cframe_tp" info1: "class type cframe_tp (84)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n101" targetname: "e17"class:2 priority:2 linestyle:dotted}
 }

diff --git a/testprograms/ref-results/PRIMA_c-pure.vcg b/testprograms/ref-results/PRIMA_c-pure.vcg
index 3034b97..7546f56 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-pure.vcg
+++ b/testprograms/ref-results/PRIMA_c-pure.vcg
@@ -175,9 +175,9 @@ node: {title: "n101" label: "Sel a 101"  info1: "Sel 101
      0:    Proj 94
      1:    Proj 98
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n101" targetname: "n94" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/PRIMA_c-type.vcg b/testprograms/ref-results/PRIMA_c-type.vcg
index 3efb835..3f44592 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-type.vcg
+++ b/testprograms/ref-results/PRIMA_c-type.vcg
@@ -65,7 +65,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -83,7 +83,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -96,7 +96,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -110,7 +110,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -119,10 +119,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -139,7 +139,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -170,10 +170,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -183,10 +183,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -194,10 +194,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -211,7 +211,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -243,10 +243,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -259,8 +259,8 @@ node: {title: "t84" label: "class cframe_tp" info1: "class type cframe_tp (84)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 }

diff --git a/testprograms/ref-results/PRIMA_c-wtypes.vcg b/testprograms/ref-results/PRIMA_c-wtypes.vcg
index 2b3991a..251c763 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg
@@ -153,9 +153,9 @@ node: {title: "n101" label: "Sel a 101"  info1: "Sel 101
      0:    Proj 94
      1:    Proj 98
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n101" targetname: "n94" label: "0" class:17 priority:10 color:blue}
@@ -258,7 +258,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -276,7 +276,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -289,7 +289,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -303,7 +303,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -312,10 +312,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -332,7 +332,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -363,10 +363,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -376,10 +376,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -387,10 +387,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -404,7 +404,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -436,10 +436,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -452,9 +452,9 @@ node: {title: "t84" label: "class cframe_tp" info1: "class type cframe_tp (84)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n101" targetname: "e17"class:2 priority:2 linestyle:dotted}
 }

diff --git a/testprograms/ref-results/PRIMA_c.vcg b/testprograms/ref-results/PRIMA_c.vcg
index 34efe9b..7888830 100644 (file)
--- a/testprograms/ref-results/PRIMA_c.vcg
+++ b/testprograms/ref-results/PRIMA_c.vcg
@@ -153,9 +153,9 @@ node: {title: "n101" label: "Sel a 101"  info1: "Sel 101
      0:    Proj 94
      1:    Proj 98
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n101" targetname: "n94" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
index fb7ed4b..4f55d1e 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
@@ -175,9 +175,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Proj 71
      1:    Proj 75
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n78" targetname: "n71" label: "0" class:17 priority:10 color:blue}
@@ -267,7 +267,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -285,7 +285,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -298,7 +298,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -312,7 +312,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -321,10 +321,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -341,7 +341,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -372,10 +372,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -385,10 +385,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -396,10 +396,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -413,7 +413,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -445,10 +445,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -461,9 +461,9 @@ node: {title: "t61" label: "class set_aframe_tp" info1: "class type set_aframe_t
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n78" targetname: "e17"class:2 priority:2 linestyle:dotted}
 }

diff --git a/testprograms/ref-results/PRIMA_set_a-pure.vcg b/testprograms/ref-results/PRIMA_set_a-pure.vcg
index fef4be7..fd3c007 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-pure.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-pure.vcg
@@ -175,9 +175,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Proj 71
      1:    Proj 75
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n78" targetname: "n71" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/PRIMA_set_a-type.vcg b/testprograms/ref-results/PRIMA_set_a-type.vcg
index 926c5a2..e6266e0 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-type.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-type.vcg
@@ -65,7 +65,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -83,7 +83,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -96,7 +96,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -110,7 +110,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -119,10 +119,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -139,7 +139,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -170,10 +170,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -183,10 +183,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -194,10 +194,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -211,7 +211,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -243,10 +243,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -259,8 +259,8 @@ node: {title: "t61" label: "class set_aframe_tp" info1: "class type set_aframe_t
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 }

diff --git a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
index 2b8b187..167c9b3 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
@@ -124,9 +124,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Proj 71
      1:    Proj 75
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n78" targetname: "n71" label: "0" class:17 priority:10 color:blue}
@@ -229,7 +229,7 @@ node: {title: "e17" label: "ent a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: no yet set
-  offset:  -1
+  offset:  -1 bits, -1 bytes
 
 "
 }
@@ -247,7 +247,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -260,7 +260,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -274,7 +274,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -283,10 +283,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "t15" targetname: "e17"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e20"class: 12 label: "member" color:blue}
 edge: { sourcename: "t15" targetname: "e23"class: 12 label: "member" color:blue}
@@ -303,7 +303,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -334,10 +334,10 @@ node: {title: "t18" label: "method set_a" info1: "method type set_a (18)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t18" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t18" targetname: "t14"class: 5 label: "param 1" color: green}
 node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_prima_ptr (16)
@@ -347,10 +347,10 @@ node: {title: "t16" label: "pointer class_prima_ptr" info1: "pointer type class_
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t16" targetname: "t15"class: 9 label: "points to" color:green}
 node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   visibility: visibility_external_allocated,
@@ -358,10 +358,10 @@ node: {title: "t14" label: "primitive int" info1: "primitive type int (14)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       Is,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 node: {title: "e23" label: "ent PRIMA_c" color: yellow
  info1: "entity c (23)
   type:  c (21)
@@ -375,7 +375,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "
@@ -407,10 +407,10 @@ node: {title: "t21" label: "method c" info1: "method type c (21)
   size:       32 Bits,
   alignment:  32 Bits,
   mode:       P,
-  dbg info:   (nil),
 
 
-"}
+"
+}
 edge: { sourcename: "t21" targetname: "t16"class: 5 label: "param 0" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 5 label: "param 1" color: green}
 edge: { sourcename: "t21" targetname: "t14"class: 6 label: "res 0" color: green}
@@ -423,9 +423,9 @@ node: {title: "t61" label: "class set_aframe_tp" info1: "class type set_aframe_t
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:   0 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 edge: { sourcename: "n78" targetname: "e17"class:2 priority:2 linestyle:dotted}
 }

diff --git a/testprograms/ref-results/PRIMA_set_a.vcg b/testprograms/ref-results/PRIMA_set_a.vcg
index a16cf25..6776774 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a.vcg
+++ b/testprograms/ref-results/PRIMA_set_a.vcg
@@ -124,9 +124,9 @@ node: {title: "n78" label: "Sel a 78"  info1: "Sel 78
      0:    Proj 71
      1:    Proj 75
   Private Attributes:
-  Selecting entity of type int
-    from entity a (17)
-    of type PRIMA
+  Selecting entity a (17)
+    of type    int
+    with owner PRIMA.
 "
 }
 edge: {sourcename: "n78" targetname: "n71" label: "0" class:17 priority:10 color:blue}

diff --git a/testprograms/ref-results/class_hierarchy.vcg b/testprograms/ref-results/class_hierarchy.vcg
index f165261..95545b7 100644 (file)
--- a/testprograms/ref-results/class_hierarchy.vcg
+++ b/testprograms/ref-results/class_hierarchy.vcg
@@ -66,7 +66,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: no yet set
-      offset:  -1
+      offset:  -1 bits, -1 bytes
     entity set_a (20)
       type:  set_a (18)
       owner: PRIMA (15)
@@ -79,7 +79,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_set_a
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 73
     entity c (23)
       type:  c (21)
@@ -93,7 +93,7 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
       volatility:  volatility_non_volatile
       peculiarity: peculiarity_existent
       ld_name: PRIMA_c
-      offset:  -1
+      offset:  -1 bits, -1 bytes
       irg = 96
   supertypes:
   subtypes:
@@ -102,10 +102,10 @@ node: {title: "t15" label: "class PRIMA" info1: "class type PRIMA (15)
   state:      layout_undefined,
   size:       -1 Bits,
   alignment:  32 Bits,
-  dbg info:   (nil),
 
 
-" color: green}
+"
+ color: green}
 node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
  info1: "entity set_a (20)
   type:  set_a (18)
@@ -119,7 +119,7 @@ node: {title: "e20" label: "ent PRIMA_set_a" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_set_a
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 73
 
 "
@@ -138,7 +138,7 @@ node: {title: "e23" label: "ent PRIMA_c" color: yellow
   volatility:  volatility_non_volatile
   peculiarity: peculiarity_existent
   ld_name: PRIMA_c
-  offset:  -1
+  offset:  -1 bits, -1 bytes
   irg = 96
 
 "