new reference -- enum names different

[r1725]

diff --git a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
index ba386e0..1d6592c 100644 (file)
--- a/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/ARRAY-HEAP_EXAMPLE_main-type.vcg
@@ -20,11 +20,11 @@ classname 12: "Member"
 node: {title: "e15" label: "ent a_elem_ent" color: yellow
  info1: "
 id: e15
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a_elem_ent
 ld_name: a_a_elem_ent
 offset:  -1"
@@ -48,11 +48,11 @@ size: 4B,
 node: {title: "e13" label: "ent ARRAY-HEAP_EXAMPLE_main" color: yellow
  info1: "
 id: e13
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    ARRAY-HEAP_EXAMPLE_main
 ld_name: GlobalType_ARRAY-HEAP_EXAMPLE_main
 offset:  -1

diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg
index ef3b116..fcbd1d0 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-all.vcg
@@ -77,11 +77,11 @@ node: {title: "n61" label: "Bad  61"  info1: "visited: 0
 node: {title: "e16" label: "ent a_tp_elem_ent" color: yellow
  info1: "
 id: e16
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a_tp_elem_ent
 ld_name: a_tp_a_tp_elem_ent
 offset:  -1"
@@ -105,11 +105,11 @@ size: 4B,
 node: {title: "e33" label: "ent a" color: yellow
  info1: "
 id: e33
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a
 ld_name: mainframe_tp_a
 offset:  -1"
@@ -122,11 +122,11 @@ edge: { sourcename: "t19" targetname: "e33"class: 12 label: "member" color:blue}
 node: {title: "e14" label: "ent main" color: yellow
  info1: "
 id: e14
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    main
 ld_name: ARRAY-STACK_EXAMPLE_main
 offset:  -1

diff --git a/testprograms/ref-results/All_types.vcg b/testprograms/ref-results/All_types.vcg
index bc92c6b..603637c 100644 (file)
--- a/testprograms/ref-results/All_types.vcg
+++ b/testprograms/ref-results/All_types.vcg
@@ -30,11 +30,11 @@ edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e13" label: "ent a" color: yellow
  info1: "
 id: e13
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a
 ld_name: PRIMA_a
 offset:  -1"
@@ -43,11 +43,11 @@ edge: { sourcename: "e13" targetname: "t10"class: 3 label: "type" color: red}
 node: {title: "e16" label: "ent set_a" color: yellow
  info1: "
 id: e16
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
@@ -71,11 +71,11 @@ edge: { sourcename: "t12" targetname: "t11"class: 9 label: "points to" color:gre
 node: {title: "e19" label: "ent c" color: yellow
  info1: "
 id: e19
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1
@@ -104,11 +104,11 @@ edge: { sourcename: "t0" targetname: "e22"class: 12 label: "member" color:blue}
 node: {title: "e22" label: "ent OO_INLINE_EXAMPLE_main" color: yellow
  info1: "
 id: e22
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    OO_INLINE_EXAMPLE_main
 ld_name: GlobalType_OO_INLINE_EXAMPLE_main
 offset:  -1

diff --git a/testprograms/ref-results/GLOBAL_VAR_main-all.vcg b/testprograms/ref-results/GLOBAL_VAR_main-all.vcg
index 4c732ee..a420e6a 100644 (file)
--- a/testprograms/ref-results/GLOBAL_VAR_main-all.vcg
+++ b/testprograms/ref-results/GLOBAL_VAR_main-all.vcg
@@ -72,11 +72,11 @@ edge: {sourcename: "n49" targetname: "n43" label: "0" color: blue}
 node: {title: "e14" label: "ent i" color: yellow
  info1: "
 id: e14
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    i
 ld_name: GlobalType_i
 offset:  -1"
@@ -90,11 +90,11 @@ edge: { sourcename: "t0" targetname: "e14"class: 12 label: "member" color:blue}
 node: {title: "e13" label: "ent GLOBAL_VAR_main" color: yellow
  info1: "
 id: e13
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    GLOBAL_VAR_main
 ld_name: GlobalType_GLOBAL_VAR_main
 offset:  -1

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg
index 78be86b..ecd83a0 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-all.vcg
@@ -109,11 +109,11 @@ node: {title: "n194" label: "Bad  194"  info1: "visited: 0
 node: {title: "e13" label: "ent a" color: yellow
  info1: "
 id: e13
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a
 ld_name: PRIMA_a
 offset:  -1"
@@ -128,11 +128,11 @@ edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e16" label: "ent set_a" color: yellow
  info1: "
 id: e16
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
@@ -160,11 +160,11 @@ size: 4B,
 node: {title: "e19" label: "ent c" color: yellow
  info1: "
 id: e19
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1
@@ -184,11 +184,11 @@ edge: { sourcename: "t17" targetname: "t10"class: 6 label: "res 0" color: green}
 node: {title: "e22" label: "ent OO_INLINE_EXAMPLE_main" color: yellow
  info1: "
 id: e22
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    OO_INLINE_EXAMPLE_main
 ld_name: GlobalType_OO_INLINE_EXAMPLE_main
 offset:  -1

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg
index f05620a..c2f2400 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-all.vcg
@@ -127,11 +127,11 @@ edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e13" label: "ent a" color: yellow
  info1: "
 id: e13
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a
 ld_name: PRIMA_a
 offset:  -1"
@@ -144,11 +144,11 @@ size: 4B,
 node: {title: "e16" label: "ent set_a" color: yellow
  info1: "
 id: e16
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
@@ -167,11 +167,11 @@ edge: { sourcename: "t14" targetname: "t10"class: 5 label: "param 1" color: gree
 node: {title: "e19" label: "ent c" color: yellow
  info1: "
 id: e19
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1
@@ -184,11 +184,11 @@ node: {title: "n18" label: "&(PRIMA_c)P  18" color: yellow info1: "visited: 1
 node: {title: "e22" label: "ent OO_PROGRAM_EXAMPLE_main" color: yellow
  info1: "
 id: e22
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    OO_PROGRAM_EXAMPLE_main
 ld_name: GlobalType_OO_PROGRAM_EXAMPLE_main
 offset:  -1

diff --git a/testprograms/ref-results/PRIMA_c-all.vcg b/testprograms/ref-results/PRIMA_c-all.vcg
index 92e9011..9f00b88 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-all.vcg
+++ b/testprograms/ref-results/PRIMA_c-all.vcg
@@ -89,11 +89,11 @@ node: {title: "n242" label: "Bad  242"  info1: "visited: 0
 node: {title: "e13" label: "ent a" color: yellow
  info1: "
 id: e13
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a
 ld_name: PRIMA_a
 offset:  -1"
@@ -108,11 +108,11 @@ edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e16" label: "ent set_a" color: yellow
  info1: "
 id: e16
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
@@ -140,11 +140,11 @@ size: 4B,
 node: {title: "e19" label: "ent c" color: yellow
  info1: "
 id: e19
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1

diff --git a/testprograms/ref-results/PRIMA_set_a-all.vcg b/testprograms/ref-results/PRIMA_set_a-all.vcg
index 5c34775..031490b 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-all.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-all.vcg
@@ -73,11 +73,11 @@ node: {title: "n238" label: "Bad  238"  info1: "visited: 0
 node: {title: "e13" label: "ent a" color: yellow
  info1: "
 id: e13
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a
 ld_name: PRIMA_a
 offset:  -1"
@@ -92,11 +92,11 @@ edge: { sourcename: "t11" targetname: "e19"class: 12 label: "member" color:blue}
 node: {title: "e16" label: "ent set_a" color: yellow
  info1: "
 id: e16
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
@@ -124,11 +124,11 @@ size: 4B,
 node: {title: "e19" label: "ent c" color: yellow
  info1: "
 id: e19
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    c
 ld_name: PRIMA_c
 offset:  -1

diff --git a/testprograms/ref-results/main-type.vcg b/testprograms/ref-results/main-type.vcg
index 5866fbc..f0ee5e5 100644 (file)
--- a/testprograms/ref-results/main-type.vcg
+++ b/testprograms/ref-results/main-type.vcg
@@ -20,11 +20,11 @@ classname 12: "Member"
 node: {title: "e16" label: "ent a_tp_elem_ent" color: yellow
  info1: "
 id: e16
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a_tp_elem_ent
 ld_name: a_tp_a_tp_elem_ent
 offset:  -1"
@@ -48,11 +48,11 @@ size: 4B,
 node: {title: "e33" label: "ent a" color: yellow
  info1: "
 id: e33
-allocation:  automatic allocated
-visibility:  local
-variability: uninitialized
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_automatic
+visibility:  visibility_local
+variability: variability_uninitialized
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    a
 ld_name: mainframe_tp_a
 offset:  -1"
@@ -65,11 +65,11 @@ edge: { sourcename: "t19" targetname: "e33"class: 12 label: "member" color:blue}
 node: {title: "e14" label: "ent main" color: yellow
  info1: "
 id: e14
-allocation:  static allocated
-visibility:  local
-variability: constant
-volatility:  non_volatile
-peculiarity: existent
+allocation:  allocation_static
+visibility:  visibility_local
+variability: variability_constant
+volatility:  volatility_non_volatile
+peculiarity: peculiarity_existent
 name:    main
 ld_name: ARRAY-STACK_EXAMPLE_main
 offset:  -1