diff mbox series

[applied] dwarf-reader: Better support concrete instance functions DIEs

Message ID 87mskwod8v.fsf@redhat.com
State New
Headers
Series [applied] dwarf-reader: Better support concrete instance functions DIEs |

Commit Message

Dodji Seketeli Aug. 28, 2024, 3:53 p.m. UTC 
  Hello,

abidiff wrongly reports this change while comparing two binaries[1]:

  [C] 'function void g_cclosure_marshal_VOID__BOOLEAN(GClosure*, GValue*, guint, const GValue*, gpointer, gpointer)' at gmarshal.c:188:1 has some indirect sub-type changes:
    parameter 2 of type 'GValue*' changed:
      entity changed from 'GValue*' to 'typedef guint' at gtypes.h:61:1
      type size changed from 64 to 32 (in bits)
    parameter 3 of type 'typedef guint' changed:
      entity changed from 'typedef guint' to 'GValue*'
      type size changed from 32 to 64 (in bits)
    parameter 4 of type 'const GValue*' changed:
      in pointed to type 'const GValue' at gclosure.h:77:1:
        entity changed from 'const GValue' to 'typedef GClosure' at gclosure.h:77:1
        type size changed from 192 to 256 (in bits)
    parameter 6 of type 'typedef gpointer' changed:
      typedef name changed from gpointer to guint at gtypes.h:61:1
      underlying type 'void*' changed:
        entity changed from 'void*' to 'unsigned int'
        type size changed from 0 to 32 (in bits)
    parameter 7 of type 'const GValue*' was added
    parameter 8 of type 'typedef gpointer' was added
    parameter 9 of type 'typedef gpointer' was added

Let's look at the DWARF of the newer binary:

The abstract DIE for the g_cclosure_marshal_VOID__BOOLEAN is:
 [ 62c87]    subprogram           abbrev: 100
             external             (flag_present) yes
             name                 (strp) "g_cclosure_marshal_VOID__BOOLEAN"
             decl_file            (implicit_const) gmarshal.c (19)
             decl_line            (data1) 188
             decl_column          (implicit_const) 1
             prototyped           (flag_present) yes
             sibling              (ref_udata) [ 62d20]
 [ 62c8f]      formal_parameter     abbrev: 28
               name                 (GNU_strp_alt) "closure"
               decl_file            (data1) gmarshal.c (19)
               decl_line            (data1) 188
               decl_column          (data1) 49
               type                 (ref_addr) [   b10]
 [ 62c9b]      formal_parameter     abbrev: 28
               name                 (GNU_strp_alt) "return_value"
               decl_file            (data1) gmarshal.c (19)
               decl_line            (data1) 189
               decl_column          (data1) 49
               type                 (ref_addr) [   9db]
 [ 62ca7]      formal_parameter     abbrev: 28
               name                 (GNU_strp_alt) "n_param_values"
               decl_file            (data1) gmarshal.c (19)
               decl_line            (data1) 190
               decl_column          (data1) 49
               type                 (ref_addr) [   4e8]
 [ 62cb3]      formal_parameter     abbrev: 28
               name                 (GNU_strp_alt) "param_values"
               decl_file            (data1) gmarshal.c (19)
               decl_line            (data1) 191
               decl_column          (data1) 49
               type                 (ref_addr) [   9dd]
 [ 62cbf]      formal_parameter     abbrev: 28
               name                 (GNU_strp_alt) "invocation_hint"
               decl_file            (data1) gmarshal.c (19)
               decl_line            (data1) 192
               decl_column          (data1) 49
               type                 (ref_addr) [   3a0]
 [ 62ccb]      formal_parameter     abbrev: 28
               name                 (GNU_strp_alt) "marshal_data"
               decl_file            (data1) gmarshal.c (19)
               decl_line            (data1) 193
               decl_column          (data1) 49
               type                 (ref_addr) [   3a0]

Let's focus on its second parameter.  Its DIE is:
 [ 62c9b]      formal_parameter     abbrev: 28
               name                 (GNU_strp_alt) "return_value"
               decl_file            (data1) gmarshal.c (19)
               decl_line            (data1) 189
               decl_column          (data1) 49
               type                 (ref_addr) [   9db]

Of type:

 [   9db]    pointer_type         abbrev: 43
             byte_size            (implicit_const) 8
             type                 (ref_udata) [   9aa]
[...]
 [   9aa]    typedef              abbrev: 36
             name                 (GNU_strp_alt) "GValue"
             decl_file            (data1) gtype.h (9)
             decl_line            (data2) 431
             decl_column          (data1) 41
             type                 (ref_udata) [   9b6]

So it's a "GValue*" type.

Now, the concrete instance of that abstract DIE, which represent the
concrete function is:

 [ 12125]    subprogram           abbrev: 87
             abstract_origin      (ref_addr) [ 62c87]
             low_pc               (addr) +0x000000000001c450 <g_cclosure_marshal_VOID__BOOLEAN.part.0>
             high_pc              (udata) 100 (+0x000000000001c4b4)
             frame_base           (exprloc)
              [ 0] call_frame_cfa
             sibling              (ref_udata) [ 121de]
 [ 12138]      formal_parameter     abbrev: 58
               abstract_origin      (ref_addr) [ 62c8f]
               location             (sec_offset) location list [  c2dc]
               GNU_locviews         (sec_offset) location list [  c2d2]
 [ 12145]      formal_parameter     abbrev: 58
               abstract_origin      (ref_addr) [ 62cb3]
               location             (sec_offset) location list [  c317]
               GNU_locviews         (sec_offset) location list [  c30d]
 [ 12152]      formal_parameter     abbrev: 58
               abstract_origin      (ref_addr) [ 62ccb]
               location             (sec_offset) location list [  c354]
               GNU_locviews         (sec_offset) location list [  c348]
 [ 1218b]      formal_parameter     abbrev: 58
               abstract_origin      (ref_addr) [ 62cbf]
               location             (sec_offset) location list [  c3f9]
               GNU_locviews         (sec_offset) location list [  c3f7]
 [ 12198]      formal_parameter     abbrev: 58
               abstract_origin      (ref_addr) [ 62ca7]
               location             (sec_offset) location list [  c40a]
               GNU_locviews         (sec_offset) location list [  c408]
 [ 121a5]      formal_parameter     abbrev: 58
               abstract_origin      (ref_addr) [ 62c9b]
               location             (sec_offset) location list [  c41b]
               GNU_locviews         (sec_offset) location list [  c419]

Note how the formal parameters of that concrete instance are all in a
different order than the ones of the concrete instance ...

In this case, when reading the concrete instance, we need to get the
IR of the function from the abstract instance DIE and then only read
the potential complementary attributes from this concrete instance.

The DWARF reader mistakenly builds the IR for the function from the
concrete instance in this case, hence the wrong change reported down
the road.

This patch fixes that.

Note that artifacts coming from that bug, reported on IRC have been
added to the libabigail-tests.git test suite.

[1]: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/merge_requests/21393#note_2077175107

	* src/abg-dwarf-reader.cc (build_ir_node_from_die):  If the DIE is
	a concrete instance of an abstract one, then get the IR from the
	abstract one as it has all the types right.
	* tests/data/test-annotate/test14-pr18893.so.abi: Adjust.
	* tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt: Likewise.
	* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt:
	Likewise.
	* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt:
	Likewise.
	* tests/data/test-read-dwarf/test-libandroid.so.abi: Likewise.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 src/abg-dwarf-reader.cc                       |   15 +-
 .../data/test-annotate/test14-pr18893.so.abi  | 3969 +++++++++--------
 .../PR24690/PR24690-report-0.txt              |    2 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt |   55 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-3.txt |    4 +-
 .../test-read-dwarf/test-libandroid.so.abi    |   15 +
 .../test-read-dwarf/test14-pr18893.so.abi     | 3767 ++++++++--------
 7 files changed, 3971 insertions(+), 3856 deletions(-)
diff mbox series

Patch

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 70a44674..a95deafd 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -16371,10 +16371,16 @@  build_ir_node_from_die(reader&	rdr,
 		  }
 	      }
 	  }
+	else if (has_abstract_origin)
+	  // Let's see if this function is the implementation of an
+	  // existing interface.  In that case, let's read the
+	  // specification of the origin interface ...
+	  existing_fn = build_function_decl(rdr, &abstract_origin_die, where_offset,
+					    /*existing_fn=*/nullptr);
 
 	rdr.scope_stack().push(interface_scope);
 
-	// Either we create a branch new IR for the current function
+	// Either we create a brand new IR for the current function
 	// DIE we are looking at, or we complete an existing IR node
 	// with the new completementary information carried by this
 	// DIE for that IR node.
@@ -16397,11 +16403,12 @@  build_ir_node_from_die(reader&	rdr,
 		result.reset();
 		break;
 	      }
-	    // OK so we came to the conclusion that we need to keep
-	    // the function.  So let's add it to its scope.
-	    result = add_decl_to_scope(is_decl(result), interface_scope);
 	  }
 
+	// OK so we came to the conclusion that we need to keep
+	// the function.  So let's add it to its scope.
+	result = add_decl_to_scope(is_decl(result), interface_scope);
+
 	function_decl_sptr fn = is_function_decl(result);
 	if (fn && is_member_function(fn))
 	  {
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index 36467e24..cb65f0da 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -126,354 +126,488 @@ 
     <!-- gluUnProject4 -->
     <elf-symbol name='gluUnProject4' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
+  <abi-instr address-size='64' path='libnurbs/interface/bezierPatchMesh.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+    <!-- struct bezierPatch -->
+    <class-decl name='bezierPatch' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='36' column='1' id='type-id-1'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- float bezierPatch::umin -->
+        <var-decl name='umin' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <!-- float bezierPatch::vmin -->
+        <var-decl name='vmin' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- float bezierPatch::umax -->
+        <var-decl name='umax' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <!-- float bezierPatch::vmax -->
+        <var-decl name='vmax' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- int bezierPatch::uorder -->
+        <var-decl name='uorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='38' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <!-- int bezierPatch::vorder -->
+        <var-decl name='vorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='39' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- int bezierPatch::dimension -->
+        <var-decl name='dimension' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='57' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- float* bezierPatch::ctlpoints -->
+        <var-decl name='ctlpoints' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <!-- bezierPatch* bezierPatch::next -->
+        <var-decl name='next' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='63' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct bezierPatchMesh -->
+    <class-decl name='bezierPatchMesh' size-in-bits='960' is-struct='yes' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='39' column='1' id='type-id-6'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- bezierPatch* bezierPatchMesh::bpatch -->
+        <var-decl name='bpatch' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='40' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- bezierPatch* bezierPatchMesh::bpatch_normal -->
+        <var-decl name='bpatch_normal' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='41' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- bezierPatch* bezierPatchMesh::bpatch_texcoord -->
+        <var-decl name='bpatch_texcoord' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='42' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- bezierPatch* bezierPatchMesh::bpatch_color -->
+        <var-decl name='bpatch_color' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='43' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- float* bezierPatchMesh::UVarray -->
+        <var-decl name='UVarray' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='45' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <!-- int* bezierPatchMesh::length_array -->
+        <var-decl name='length_array' type-id='type-id-8' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='46' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <!-- GLenum* bezierPatchMesh::type_array -->
+        <var-decl name='type_array' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='47' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <!-- int bezierPatchMesh::size_UVarray -->
+        <var-decl name='size_UVarray' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='50' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='480'>
+        <!-- int bezierPatchMesh::index_UVarray -->
+        <var-decl name='index_UVarray' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='51' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <!-- int bezierPatchMesh::size_length_array -->
+        <var-decl name='size_length_array' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='52' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='544'>
+        <!-- int bezierPatchMesh::index_length_array -->
+        <var-decl name='index_length_array' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='53' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <!-- int bezierPatchMesh::counter -->
+        <var-decl name='counter' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='55' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='608'>
+        <!-- GLenum bezierPatchMesh::type -->
+        <var-decl name='type' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='56' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <!-- float* bezierPatchMesh::vertex_array -->
+        <var-decl name='vertex_array' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <!-- float* bezierPatchMesh::normal_array -->
+        <var-decl name='normal_array' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='60' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <!-- float* bezierPatchMesh::color_array -->
+        <var-decl name='color_array' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <!-- float* bezierPatchMesh::texcoord_array -->
+        <var-decl name='texcoord_array' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='62' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <!-- bezierPatchMesh* bezierPatchMesh::next -->
+        <var-decl name='next' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='65' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- typedef bezierPatch bezierPatch -->
+    <typedef-decl name='bezierPatch' type-id='type-id-1' filepath='libnurbs/interface/bezierPatch.h' line='65' column='1' id='type-id-12'/>
+    <!-- typedef bezierPatchMesh bezierPatchMesh -->
+    <typedef-decl name='bezierPatchMesh' type-id='type-id-6' filepath='libnurbs/interface/bezierPatchMesh.h' line='66' column='1' id='type-id-13'/>
+    <!-- GLenum* -->
+    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-9'/>
+    <!-- bezierPatch* -->
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-5'/>
+    <!-- bezierPatch* -->
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-7'/>
+    <!-- bezierPatchMesh* -->
+    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-11'/>
+    <!-- bezierPatchMesh* -->
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-14'/>
+    <!-- float* -->
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-4'/>
+    <!-- int* -->
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-8'/>
+  </abi-instr>
   <abi-instr address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- REAL[160] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='5120' id='type-id-2'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='5120' id='type-id-16'>
       <!-- <anonymous range>[160] -->
-      <subrange length='160' lower-bound='0' upper-bound='159' type-id='type-id-3' id='type-id-4'/>
+      <subrange length='160' lower-bound='0' upper-bound='159' type-id='type-id-17' id='type-id-18'/>
     </array-type-def>
     <!-- REAL[40] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='1280' id='type-id-5'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='1280' id='type-id-19'>
       <!-- <anonymous range>[40] -->
-      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-3' id='type-id-6'/>
+      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-17' id='type-id-20'/>
     </array-type-def>
     <!-- class OpenGLCurveEvaluator -->
-    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-7'>
+    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-21'>
       <!-- struct BasicCurveEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-8'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-22'/>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_vertex -->
-        <var-decl name='em_vertex' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
+        <var-decl name='em_vertex' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='6656'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_normal -->
-        <var-decl name='em_normal' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
+        <var-decl name='em_normal' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='13248'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_color -->
-        <var-decl name='em_color' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
+        <var-decl name='em_color' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19840'>
         <!-- curveEvalMachine OpenGLCurveEvaluator::em_texcoord -->
-        <var-decl name='em_texcoord' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
+        <var-decl name='em_texcoord' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26432'>
         <!-- int OpenGLCurveEvaluator::vertex_flag -->
-        <var-decl name='vertex_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
+        <var-decl name='vertex_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26464'>
         <!-- int OpenGLCurveEvaluator::normal_flag -->
-        <var-decl name='normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
+        <var-decl name='normal_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26496'>
         <!-- int OpenGLCurveEvaluator::color_flag -->
-        <var-decl name='color_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
+        <var-decl name='color_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26528'>
         <!-- int OpenGLCurveEvaluator::texcoord_flag -->
-        <var-decl name='texcoord_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
+        <var-decl name='texcoord_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26560'>
         <!-- REAL OpenGLCurveEvaluator::global_grid_u0 -->
-        <var-decl name='global_grid_u0' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='111' column='1'/>
+        <var-decl name='global_grid_u0' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='111' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26592'>
         <!-- REAL OpenGLCurveEvaluator::global_grid_u1 -->
-        <var-decl name='global_grid_u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='112' column='1'/>
+        <var-decl name='global_grid_u1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26624'>
         <!-- int OpenGLCurveEvaluator::global_grid_nu -->
-        <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
+        <var-decl name='global_grid_nu' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26688'>
         <!-- void (* OpenGLCurveEvaluator::beginCallBackN)(GLenum) -->
-        <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26752'>
         <!-- void (* OpenGLCurveEvaluator::endCallBackN)(void) -->
-        <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26816'>
         <!-- void (* OpenGLCurveEvaluator::vertexCallBackN)(const GLfloat*) -->
-        <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26880'>
         <!-- void (* OpenGLCurveEvaluator::normalCallBackN)(const GLfloat*) -->
-        <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26944'>
         <!-- void (* OpenGLCurveEvaluator::colorCallBackN)(const GLfloat*) -->
-        <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27008'>
         <!-- void (* OpenGLCurveEvaluator::texcoordCallBackN)(const GLfloat*) -->
-        <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27072'>
         <!-- void (* OpenGLCurveEvaluator::beginCallBackData)(GLenum, void*) -->
-        <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-27' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27136'>
         <!-- void (* OpenGLCurveEvaluator::endCallBackData)(void*) -->
-        <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-28' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27200'>
         <!-- void (* OpenGLCurveEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
-        <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27264'>
         <!-- void (* OpenGLCurveEvaluator::normalCallBackData)(const GLfloat*, void*) -->
-        <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27328'>
         <!-- void (* OpenGLCurveEvaluator::colorCallBackData)(const GLfloat*, void*) -->
-        <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
         <!-- void (* OpenGLCurveEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
-        <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
         <!-- void* OpenGLCurveEvaluator::userData -->
-        <var-decl name='userData' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
+        <var-decl name='userData' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27520'>
         <!-- int OpenGLCurveEvaluator::output_triangles -->
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
       </data-member>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <!-- OpenGLCurveEvaluator::~OpenGLCurveEvaluator(int) -->
         <function-decl name='~OpenGLCurveEvaluator' filepath='libnurbs/interface/glcurveval.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='9'>
         <!-- void OpenGLCurveEvaluator::domain1f(REAL, REAL) -->
         <function-decl name='domain1f' mangled-name='_ZN20OpenGLCurveEvaluator8domain1fEff' filepath='libnurbs/interface/glcurveval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='10'>
         <!-- void OpenGLCurveEvaluator::range1f(long int, REAL*, REAL*) -->
         <function-decl name='range1f' mangled-name='_ZN20OpenGLCurveEvaluator7range1fElPfS0_' filepath='libnurbs/interface/glcurveval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='11'>
         <!-- void OpenGLCurveEvaluator::enable(long int) -->
         <function-decl name='enable' mangled-name='_ZN20OpenGLCurveEvaluator6enableEl' filepath='libnurbs/interface/glcurveval.cc' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='12'>
         <!-- void OpenGLCurveEvaluator::disable(long int) -->
         <function-decl name='disable' mangled-name='_ZN20OpenGLCurveEvaluator7disableEl' filepath='libnurbs/interface/glcurveval.cc' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='13'>
         <!-- void OpenGLCurveEvaluator::bgnmap1f(long int) -->
         <function-decl name='bgnmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8bgnmap1fEl' filepath='libnurbs/interface/glcurveval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='14'>
         <!-- void OpenGLCurveEvaluator::map1f(long int, REAL, REAL, long int, long int, REAL*) -->
         <function-decl name='map1f' mangled-name='_ZN20OpenGLCurveEvaluator5map1fElffllPf' filepath='libnurbs/interface/glcurveval.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='15'>
         <!-- void OpenGLCurveEvaluator::mapgrid1f(long int, REAL, REAL) -->
         <function-decl name='mapgrid1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapgrid1fElff' filepath='libnurbs/interface/glcurveval.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='16'>
         <!-- void OpenGLCurveEvaluator::mapmesh1f(long int, long int, long int) -->
         <function-decl name='mapmesh1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapmesh1fElll' filepath='libnurbs/interface/glcurveval.cc' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='17'>
         <!-- void OpenGLCurveEvaluator::evalcoord1f(long int, REAL) -->
         <function-decl name='evalcoord1f' mangled-name='_ZN20OpenGLCurveEvaluator11evalcoord1fElf' filepath='libnurbs/interface/glcurveval.cc' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='18'>
         <!-- void OpenGLCurveEvaluator::endmap1f() -->
         <function-decl name='endmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8endmap1fEv' filepath='libnurbs/interface/glcurveval.cc' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='19'>
         <!-- void OpenGLCurveEvaluator::bgnline() -->
         <function-decl name='bgnline' mangled-name='_ZN20OpenGLCurveEvaluator7bgnlineEv' filepath='libnurbs/interface/glcurveval.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='20'>
         <!-- void OpenGLCurveEvaluator::endline() -->
         <function-decl name='endline' mangled-name='_ZN20OpenGLCurveEvaluator7endlineEv' filepath='libnurbs/interface/glcurveval.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-          <parameter type-id='type-id-18' is-artificial='yes'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct curveEvalMachine -->
-    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-22'>
+    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-35'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL curveEvalMachine::uprime -->
-        <var-decl name='uprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='56' column='1'/>
+        <var-decl name='uprime' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int curveEvalMachine::k -->
-        <var-decl name='k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
+        <var-decl name='k' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL curveEvalMachine::u1 -->
-        <var-decl name='u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='58' column='1'/>
+        <var-decl name='u1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- REAL curveEvalMachine::u2 -->
-        <var-decl name='u2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='59' column='1'/>
+        <var-decl name='u2' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int curveEvalMachine::ustride -->
-        <var-decl name='ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
+        <var-decl name='ustride' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int curveEvalMachine::uorder -->
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
+        <var-decl name='uorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- REAL curveEvalMachine::ctlpoints[160] -->
-        <var-decl name='ctlpoints' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='62' column='1'/>
+        <var-decl name='ctlpoints' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
         <!-- REAL curveEvalMachine::ucoeff[40] -->
-        <var-decl name='ucoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='63' column='1'/>
+        <var-decl name='ucoeff' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='63' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef float REAL -->
-    <typedef-decl name='REAL' type-id='type-id-23' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-1'/>
+    <typedef-decl name='REAL' type-id='type-id-2' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-15'/>
     <!-- typedef curveEvalMachine curveEvalMachine -->
-    <typedef-decl name='curveEvalMachine' type-id='type-id-22' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-9'/>
+    <typedef-decl name='curveEvalMachine' type-id='type-id-35' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-23'/>
     <!-- CachingEvaluator* -->
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-25'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-37'/>
     <!-- CachingEvaluator* const -->
-    <qualified-type-def type-id='type-id-25' const='yes' id='type-id-26'/>
+    <qualified-type-def type-id='type-id-37' const='yes' id='type-id-38'/>
     <!-- OpenGLCurveEvaluator* -->
-    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-31'/>
     <!-- OpenGLCurveEvaluator* const -->
-    <qualified-type-def type-id='type-id-18' const='yes' id='type-id-27'/>
+    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-39'/>
     <!-- REAL* -->
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-21'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-34'/>
     <!-- const GLfloat -->
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-29'/>
+    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-41'/>
     <!-- const GLfloat* -->
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-42'/>
     <!-- const int -->
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-31'/>
+    <qualified-type-def type-id='type-id-3' const='yes' id='type-id-43'/>
     <!-- curveEvalMachine* -->
-    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-32'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-44'/>
     <!-- void (*)(const GLfloat*) -->
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-26'/>
     <!-- void (*)(const GLfloat*, void*) -->
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-16'/>
+    <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-29'/>
     <!-- CurveMap* -->
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-36'/>
+    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-48'/>
     <!-- class CachingEvaluator -->
-    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' id='type-id-24'>
+    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' id='type-id-36'>
       <member-type access='private'>
         <!-- enum CachingEvaluator::ServiceMode -->
-        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-37'>
-          <underlying-type type-id='type-id-38'/>
+        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-49'>
+          <underlying-type type-id='type-id-50'/>
           <enumerator name='play' value='0'/>
           <enumerator name='record' value='1'/>
           <enumerator name='playAndRecord' value='2'/>
@@ -483,2136 +617,2004 @@ 
         <!-- CachingEvaluator::~CachingEvaluator(int) -->
         <function-decl name='~CachingEvaluator' filepath='libnurbs/internals/cachingeval.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-25' is-artificial='yes'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <!-- int CachingEvaluator::canRecord() -->
         <function-decl name='canRecord' mangled-name='_ZN16CachingEvaluator9canRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-25' is-artificial='yes'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
         <!-- int CachingEvaluator::canPlayAndRecord() -->
         <function-decl name='canPlayAndRecord' mangled-name='_ZN16CachingEvaluator16canPlayAndRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-25' is-artificial='yes'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
         <!-- int CachingEvaluator::createHandle(int) -->
         <function-decl name='createHandle' mangled-name='_ZN16CachingEvaluator12createHandleEi' filepath='libnurbs/internals/cachingeval.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-25' is-artificial='yes'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='5'>
         <!-- void CachingEvaluator::beginOutput(CachingEvaluator::ServiceMode, int) -->
         <function-decl name='beginOutput' mangled-name='_ZN16CachingEvaluator11beginOutputENS_11ServiceModeEi' filepath='libnurbs/internals/cachingeval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-25' is-artificial='yes'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
           <!-- parameter of type 'enum CachingEvaluator::ServiceMode' -->
-          <parameter type-id='type-id-37'/>
+          <parameter type-id='type-id-49'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='6'>
         <!-- void CachingEvaluator::endOutput() -->
         <function-decl name='endOutput' mangled-name='_ZN16CachingEvaluator9endOutputEv' filepath='libnurbs/internals/cachingeval.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-25' is-artificial='yes'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='7'>
         <!-- void CachingEvaluator::discardRecording(int) -->
         <function-decl name='discardRecording' mangled-name='_ZN16CachingEvaluator16discardRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-25' is-artificial='yes'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='8'>
         <!-- void CachingEvaluator::playRecording(int) -->
         <function-decl name='playRecording' mangled-name='_ZN16CachingEvaluator13playRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'CachingEvaluator*' -->
-          <parameter type-id='type-id-25' is-artificial='yes'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- class BasicCurveEvaluator -->
-    <class-decl name='BasicCurveEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-8'>
+    <class-decl name='BasicCurveEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-22'>
       <!-- class CachingEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-24'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-36'/>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <!-- BasicCurveEvaluator::~BasicCurveEvaluator(int) -->
         <function-decl name='~BasicCurveEvaluator' filepath='libnurbs/internals/basiccrveval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='9'>
         <!-- void BasicCurveEvaluator::domain1f(REAL, REAL) -->
         <function-decl name='domain1f' mangled-name='_ZN19BasicCurveEvaluator8domain1fEff' filepath='libnurbs/internals/basiccrveval.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='10'>
         <!-- void BasicCurveEvaluator::range1f(long int, REAL*, REAL*) -->
         <function-decl name='range1f' mangled-name='_ZN19BasicCurveEvaluator7range1fElPfS0_' filepath='libnurbs/internals/basiccrveval.cc' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='11'>
         <!-- void BasicCurveEvaluator::enable(long int) -->
         <function-decl name='enable' mangled-name='_ZN19BasicCurveEvaluator6enableEl' filepath='libnurbs/internals/basiccrveval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='12'>
         <!-- void BasicCurveEvaluator::disable(long int) -->
         <function-decl name='disable' mangled-name='_ZN19BasicCurveEvaluator7disableEl' filepath='libnurbs/internals/basiccrveval.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='13'>
         <!-- void BasicCurveEvaluator::bgnmap1f(long int) -->
         <function-decl name='bgnmap1f' mangled-name='_ZN19BasicCurveEvaluator8bgnmap1fEl' filepath='libnurbs/internals/basiccrveval.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='14'>
         <!-- void BasicCurveEvaluator::map1f(long int, REAL, REAL, long int, long int, REAL*) -->
         <function-decl name='map1f' mangled-name='_ZN19BasicCurveEvaluator5map1fElffllPf' filepath='libnurbs/internals/basiccrveval.cc' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='15'>
         <!-- void BasicCurveEvaluator::mapgrid1f(long int, REAL, REAL) -->
         <function-decl name='mapgrid1f' mangled-name='_ZN19BasicCurveEvaluator9mapgrid1fElff' filepath='libnurbs/internals/basiccrveval.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='16'>
         <!-- void BasicCurveEvaluator::mapmesh1f(long int, long int, long int) -->
         <function-decl name='mapmesh1f' mangled-name='_ZN19BasicCurveEvaluator9mapmesh1fElll' filepath='libnurbs/internals/basiccrveval.cc' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='17'>
         <!-- void BasicCurveEvaluator::evalcoord1f(long int, REAL) -->
         <function-decl name='evalcoord1f' mangled-name='_ZN19BasicCurveEvaluator11evalcoord1fElf' filepath='libnurbs/internals/basiccrveval.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='18'>
         <!-- void BasicCurveEvaluator::endmap1f() -->
         <function-decl name='endmap1f' mangled-name='_ZN19BasicCurveEvaluator8endmap1fEv' filepath='libnurbs/internals/basiccrveval.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='19'>
         <!-- void BasicCurveEvaluator::bgnline() -->
         <function-decl name='bgnline' mangled-name='_ZN19BasicCurveEvaluator7bgnlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='20'>
         <!-- void BasicCurveEvaluator::endline() -->
         <function-decl name='endline' mangled-name='_ZN19BasicCurveEvaluator7endlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-          <parameter type-id='type-id-39' is-artificial='yes'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct CurveMap -->
-    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-35'/>
+    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-47'/>
     <!-- void (const GLfloat*) -->
-    <function-type size-in-bits='64' id='type-id-33'>
+    <function-type size-in-bits='64' id='type-id-45'>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-30'/>
+      <parameter type-id='type-id-42'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (const GLfloat*, void*) -->
-    <function-type size-in-bits='64' id='type-id-34'>
+    <function-type size-in-bits='64' id='type-id-46'>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-30'/>
+      <parameter type-id='type-id-42'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-30'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (GLenum) -->
-    <function-type size-in-bits='64' id='type-id-40'>
+    <function-type size-in-bits='64' id='type-id-52'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-10'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (GLenum, void*) -->
-    <function-type size-in-bits='64' id='type-id-42'>
+    <function-type size-in-bits='64' id='type-id-53'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-10'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-30'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (void*) -->
-    <function-type size-in-bits='64' id='type-id-43'>
+    <function-type size-in-bits='64' id='type-id-54'>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-30'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- int (CachingEvaluator::*) () -->
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-44'>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-55'>
       <!-- implicit parameter of type 'CachingEvaluator*' -->
-      <parameter type-id='type-id-25' is-artificial='yes'/>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- int (CachingEvaluator::*) (int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-45'>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-56'>
       <!-- implicit parameter of type 'CachingEvaluator*' -->
-      <parameter type-id='type-id-25' is-artificial='yes'/>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-3'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- void (BasicCurveEvaluator::*) () -->
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-46'>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-57'>
       <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-      <parameter type-id='type-id-39' is-artificial='yes'/>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicCurveEvaluator::*) (REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-47'>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-58'>
       <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-      <parameter type-id='type-id-39' is-artificial='yes'/>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicCurveEvaluator::*) (long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-48'>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-59'>
       <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-      <parameter type-id='type-id-39' is-artificial='yes'/>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicCurveEvaluator::*) (long int, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-49'>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-60'>
       <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-      <parameter type-id='type-id-39' is-artificial='yes'/>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicCurveEvaluator::*) (long int, REAL*, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-50'>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-61'>
       <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-      <parameter type-id='type-id-39' is-artificial='yes'/>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicCurveEvaluator::*) (long int, REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-51'>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-62'>
       <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-      <parameter type-id='type-id-39' is-artificial='yes'/>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicCurveEvaluator::*) (long int, REAL, REAL, long int, long int, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-52'>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-63'>
       <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-      <parameter type-id='type-id-39' is-artificial='yes'/>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicCurveEvaluator::*) (long int, long int, long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-53'>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-64'>
       <!-- implicit parameter of type 'BasicCurveEvaluator*' -->
-      <parameter type-id='type-id-39' is-artificial='yes'/>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (CachingEvaluator::*) () -->
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-54'>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-65'>
       <!-- implicit parameter of type 'CachingEvaluator*' -->
-      <parameter type-id='type-id-25' is-artificial='yes'/>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (CachingEvaluator::*) (CachingEvaluator::ServiceMode, int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-55'>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-66'>
       <!-- implicit parameter of type 'CachingEvaluator*' -->
-      <parameter type-id='type-id-25' is-artificial='yes'/>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
       <!-- parameter of type 'enum CachingEvaluator::ServiceMode' -->
-      <parameter type-id='type-id-37'/>
+      <parameter type-id='type-id-49'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-3'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (CachingEvaluator::*) (int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-56'>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-67'>
       <!-- implicit parameter of type 'CachingEvaluator*' -->
-      <parameter type-id='type-id-25' is-artificial='yes'/>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-3'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- GLUnurbs* -->
-    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-58'/>
+    <pointer-type-def type-id='type-id-68' size-in-bits='64' id='type-id-69'/>
     <!-- GLUnurbs* const -->
-    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-59'/>
+    <qualified-type-def type-id='type-id-69' const='yes' id='type-id-70'/>
     <!-- OpenGLSurfaceEvaluator* -->
-    <pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-61'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-72'/>
     <!-- OpenGLSurfaceEvaluator* const -->
-    <qualified-type-def type-id='type-id-61' const='yes' id='type-id-62'/>
-    <!-- float* -->
-    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-63'/>
+    <qualified-type-def type-id='type-id-72' const='yes' id='type-id-73'/>
     <!-- struct GLUnurbs -->
-    <class-decl name='GLUnurbs' size-in-bits='1149440' is-struct='yes' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='49' column='1' id='type-id-57'>
+    <class-decl name='GLUnurbs' size-in-bits='1149440' is-struct='yes' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='49' column='1' id='type-id-68'>
       <!-- class NurbsTessellator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-64'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-74'/>
       <data-member access='public' layout-offset-in-bits='47616'>
         <!-- errorCallbackType GLUnurbs::errorCallback -->
-        <var-decl name='errorCallback' type-id='type-id-65' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='71' column='1'/>
+        <var-decl name='errorCallback' type-id='type-id-75' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='71' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47680'>
         <!-- GLboolean GLUnurbs::autoloadmode -->
-        <var-decl name='autoloadmode' type-id='type-id-66' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='130' column='1'/>
+        <var-decl name='autoloadmode' type-id='type-id-76' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47744'>
         <!-- OpenGLSurfaceEvaluator GLUnurbs::surfaceEvaluator -->
-        <var-decl name='surfaceEvaluator' type-id='type-id-60' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='131' column='1'/>
+        <var-decl name='surfaceEvaluator' type-id='type-id-71' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1121792'>
         <!-- OpenGLCurveEvaluator GLUnurbs::curveEvaluator -->
-        <var-decl name='curveEvaluator' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
+        <var-decl name='curveEvaluator' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1149376'>
         <!-- int GLUnurbs::callbackFlag -->
-        <var-decl name='callbackFlag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
+        <var-decl name='callbackFlag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
       </data-member>
       <member-function access='public' vtable-offset='2'>
         <!-- void GLUnurbs::bgnrender() -->
         <function-decl name='bgnrender' mangled-name='_ZN8GLUnurbs9bgnrenderEv' filepath='libnurbs/interface/glrenderer.cc' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
-          <parameter type-id='type-id-58' is-artificial='yes'/>
+          <parameter type-id='type-id-69' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='3'>
         <!-- void GLUnurbs::endrender() -->
         <function-decl name='endrender' mangled-name='_ZN8GLUnurbs9endrenderEv' filepath='libnurbs/interface/glrenderer.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
-          <parameter type-id='type-id-58' is-artificial='yes'/>
+          <parameter type-id='type-id-69' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='6'>
         <!-- void GLUnurbs::errorHandler(int) -->
         <function-decl name='errorHandler' mangled-name='_ZN8GLUnurbs12errorHandlerEi' filepath='libnurbs/interface/glrenderer.cc' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'GLUnurbs*' -->
-          <parameter type-id='type-id-58' is-artificial='yes'/>
+          <parameter type-id='type-id-69' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct OpenGLSurfaceEvaluator -->
-    <class-decl name='OpenGLSurfaceEvaluator' size-in-bits='1074048' is-struct='yes' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='100' column='1' id='type-id-60'>
+    <class-decl name='OpenGLSurfaceEvaluator' size-in-bits='1074048' is-struct='yes' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='100' column='1' id='type-id-71'>
       <!-- struct BasicSurfaceEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-67'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-77'/>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- StoredVertex* OpenGLSurfaceEvaluator::vertexCache[3] -->
-        <var-decl name='vertexCache' type-id='type-id-68' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='180' column='1'/>
+        <var-decl name='vertexCache' type-id='type-id-78' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='180' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- int OpenGLSurfaceEvaluator::tmeshing -->
-        <var-decl name='tmeshing' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
+        <var-decl name='tmeshing' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='288'>
         <!-- int OpenGLSurfaceEvaluator::which -->
-        <var-decl name='which' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
+        <var-decl name='which' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
         <!-- int OpenGLSurfaceEvaluator::vcount -->
-        <var-decl name='vcount' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
+        <var-decl name='vcount' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='352'>
         <!-- GLint OpenGLSurfaceEvaluator::gl_polygon_mode[2] -->
-        <var-decl name='gl_polygon_mode' type-id='type-id-69' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='185' column='1'/>
+        <var-decl name='gl_polygon_mode' type-id='type-id-79' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='185' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <!-- bezierPatchMesh* OpenGLSurfaceEvaluator::global_bpm -->
-        <var-decl name='global_bpm' type-id='type-id-70' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='188' column='1'/>
+        <var-decl name='global_bpm' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='188' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
         <!-- int OpenGLSurfaceEvaluator::output_triangles -->
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- void (* OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
-        <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- void (* OpenGLSurfaceEvaluator::endCallBackN)(void) -->
-        <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
         <!-- void (* OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
-        <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
         <!-- void (* OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
-        <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
         <!-- void (* OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
-        <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
         <!-- void (* OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
-        <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
         <!-- void (* OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
-        <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-27' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
         <!-- void (* OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
-        <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-28' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
         <!-- void (* OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
-        <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
         <!-- void (* OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
-        <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
         <!-- void (* OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
-        <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
         <!-- void (* OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
-        <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
         <!-- void* OpenGLSurfaceEvaluator::userData -->
-        <var-decl name='userData' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
+        <var-decl name='userData' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
         <!-- int OpenGLSurfaceEvaluator::LOD_eval_level -->
-        <var-decl name='LOD_eval_level' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
+        <var-decl name='LOD_eval_level' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1440'>
         <!-- int OpenGLSurfaceEvaluator::global_uorder -->
-        <var-decl name='global_uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
+        <var-decl name='global_uorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
         <!-- int OpenGLSurfaceEvaluator::global_vorder -->
-        <var-decl name='global_vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
+        <var-decl name='global_vorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1504'>
         <!-- REAL OpenGLSurfaceEvaluator::global_uprime -->
-        <var-decl name='global_uprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='233' column='1'/>
+        <var-decl name='global_uprime' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='233' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1536'>
         <!-- REAL OpenGLSurfaceEvaluator::global_vprime -->
-        <var-decl name='global_vprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='234' column='1'/>
+        <var-decl name='global_vprime' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='234' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1568'>
         <!-- REAL OpenGLSurfaceEvaluator::global_vprime_BV -->
-        <var-decl name='global_vprime_BV' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='235' column='1'/>
+        <var-decl name='global_vprime_BV' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='235' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1600'>
         <!-- REAL OpenGLSurfaceEvaluator::global_uprime_BU -->
-        <var-decl name='global_uprime_BU' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='236' column='1'/>
+        <var-decl name='global_uprime_BU' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='236' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1632'>
         <!-- int OpenGLSurfaceEvaluator::global_uorder_BV -->
-        <var-decl name='global_uorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
+        <var-decl name='global_uorder_BV' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
         <!-- int OpenGLSurfaceEvaluator::global_vorder_BV -->
-        <var-decl name='global_vorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
+        <var-decl name='global_vorder_BV' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1696'>
         <!-- int OpenGLSurfaceEvaluator::global_uorder_BU -->
-        <var-decl name='global_uorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
+        <var-decl name='global_uorder_BU' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1728'>
         <!-- int OpenGLSurfaceEvaluator::global_vorder_BU -->
-        <var-decl name='global_vorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
+        <var-decl name='global_vorder_BU' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1760'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ucoeff[40] -->
-        <var-decl name='global_ucoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='242' column='1'/>
+        <var-decl name='global_ucoeff' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='242' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3040'>
         <!-- REAL OpenGLSurfaceEvaluator::global_vcoeff[40] -->
-        <var-decl name='global_vcoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='243' column='1'/>
+        <var-decl name='global_vcoeff' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='243' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='4320'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ucoeffDeriv[40] -->
-        <var-decl name='global_ucoeffDeriv' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='244' column='1'/>
+        <var-decl name='global_ucoeffDeriv' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='244' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5600'>
         <!-- REAL OpenGLSurfaceEvaluator::global_vcoeffDeriv[40] -->
-        <var-decl name='global_vcoeffDeriv' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='245' column='1'/>
+        <var-decl name='global_vcoeffDeriv' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='245' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='6880'>
         <!-- REAL OpenGLSurfaceEvaluator::global_BV[40][4] -->
-        <var-decl name='global_BV' type-id='type-id-71' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='247' column='1'/>
+        <var-decl name='global_BV' type-id='type-id-80' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='247' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='12000'>
         <!-- REAL OpenGLSurfaceEvaluator::global_PBV[40][4] -->
-        <var-decl name='global_PBV' type-id='type-id-71' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='248' column='1'/>
+        <var-decl name='global_PBV' type-id='type-id-80' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='248' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='17120'>
         <!-- REAL OpenGLSurfaceEvaluator::global_BU[40][4] -->
-        <var-decl name='global_BU' type-id='type-id-71' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='249' column='1'/>
+        <var-decl name='global_BU' type-id='type-id-80' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='249' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='22240'>
         <!-- REAL OpenGLSurfaceEvaluator::global_PBU[40][4] -->
-        <var-decl name='global_PBU' type-id='type-id-71' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='250' column='1'/>
+        <var-decl name='global_PBU' type-id='type-id-80' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='250' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
         <!-- REAL* OpenGLSurfaceEvaluator::global_baseData -->
-        <var-decl name='global_baseData' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='251' column='1'/>
+        <var-decl name='global_baseData' type-id='type-id-34' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='251' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_k -->
-        <var-decl name='global_ev_k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='253' column='1'/>
+        <var-decl name='global_ev_k' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='253' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27488'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_u1 -->
-        <var-decl name='global_ev_u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='254' column='1'/>
+        <var-decl name='global_ev_u1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='254' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27520'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_u2 -->
-        <var-decl name='global_ev_u2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='255' column='1'/>
+        <var-decl name='global_ev_u2' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='255' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27552'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_ustride -->
-        <var-decl name='global_ev_ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='256' column='1'/>
+        <var-decl name='global_ev_ustride' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='256' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27584'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_uorder -->
-        <var-decl name='global_ev_uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='257' column='1'/>
+        <var-decl name='global_ev_uorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='257' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27616'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_v1 -->
-        <var-decl name='global_ev_v1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='258' column='1'/>
+        <var-decl name='global_ev_v1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='258' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27648'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_v2 -->
-        <var-decl name='global_ev_v2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='259' column='1'/>
+        <var-decl name='global_ev_v2' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='259' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27680'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_vstride -->
-        <var-decl name='global_ev_vstride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='260' column='1'/>
+        <var-decl name='global_ev_vstride' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='260' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27712'>
         <!-- int OpenGLSurfaceEvaluator::global_ev_vorder -->
-        <var-decl name='global_ev_vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='261' column='1'/>
+        <var-decl name='global_ev_vorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='261' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27744'>
         <!-- REAL OpenGLSurfaceEvaluator::global_ev_ctlPoints[6400] -->
-        <var-decl name='global_ev_ctlPoints' type-id='type-id-72' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='262' column='1'/>
+        <var-decl name='global_ev_ctlPoints' type-id='type-id-81' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='262' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232544'>
         <!-- REAL OpenGLSurfaceEvaluator::global_grid_u0 -->
-        <var-decl name='global_grid_u0' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='264' column='1'/>
+        <var-decl name='global_grid_u0' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='264' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232576'>
         <!-- REAL OpenGLSurfaceEvaluator::global_grid_u1 -->
-        <var-decl name='global_grid_u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='265' column='1'/>
+        <var-decl name='global_grid_u1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='265' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232608'>
         <!-- int OpenGLSurfaceEvaluator::global_grid_nu -->
-        <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='266' column='1'/>
+        <var-decl name='global_grid_nu' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='266' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232640'>
         <!-- REAL OpenGLSurfaceEvaluator::global_grid_v0 -->
-        <var-decl name='global_grid_v0' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='267' column='1'/>
+        <var-decl name='global_grid_v0' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='267' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232672'>
         <!-- REAL OpenGLSurfaceEvaluator::global_grid_v1 -->
-        <var-decl name='global_grid_v1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='268' column='1'/>
+        <var-decl name='global_grid_v1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='268' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232704'>
         <!-- int OpenGLSurfaceEvaluator::global_grid_nv -->
-        <var-decl name='global_grid_nv' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='269' column='1'/>
+        <var-decl name='global_grid_nv' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='269' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='232736'>
         <!-- surfEvalMachine OpenGLSurfaceEvaluator::em_vertex -->
-        <var-decl name='em_vertex' type-id='type-id-73' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='349' column='1'/>
+        <var-decl name='em_vertex' type-id='type-id-82' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='349' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='443008'>
         <!-- surfEvalMachine OpenGLSurfaceEvaluator::em_normal -->
-        <var-decl name='em_normal' type-id='type-id-73' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='350' column='1'/>
+        <var-decl name='em_normal' type-id='type-id-82' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='350' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='653280'>
         <!-- surfEvalMachine OpenGLSurfaceEvaluator::em_color -->
-        <var-decl name='em_color' type-id='type-id-73' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='351' column='1'/>
+        <var-decl name='em_color' type-id='type-id-82' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='351' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='863552'>
         <!-- surfEvalMachine OpenGLSurfaceEvaluator::em_texcoord -->
-        <var-decl name='em_texcoord' type-id='type-id-73' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='352' column='1'/>
+        <var-decl name='em_texcoord' type-id='type-id-82' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='352' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073824'>
         <!-- int OpenGLSurfaceEvaluator::auto_normal_flag -->
-        <var-decl name='auto_normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='354' column='1'/>
+        <var-decl name='auto_normal_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='354' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073856'>
         <!-- int OpenGLSurfaceEvaluator::callback_auto_normal -->
-        <var-decl name='callback_auto_normal' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='356' column='1'/>
+        <var-decl name='callback_auto_normal' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='356' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073888'>
         <!-- int OpenGLSurfaceEvaluator::vertex_flag -->
-        <var-decl name='vertex_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='357' column='1'/>
+        <var-decl name='vertex_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='357' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073920'>
         <!-- int OpenGLSurfaceEvaluator::normal_flag -->
-        <var-decl name='normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='358' column='1'/>
+        <var-decl name='normal_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='358' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073952'>
         <!-- int OpenGLSurfaceEvaluator::color_flag -->
-        <var-decl name='color_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='359' column='1'/>
+        <var-decl name='color_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='359' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1073984'>
         <!-- int OpenGLSurfaceEvaluator::texcoord_flag -->
-        <var-decl name='texcoord_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='360' column='1'/>
+        <var-decl name='texcoord_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='360' column='1'/>
       </data-member>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
         <!-- OpenGLSurfaceEvaluator::~OpenGLSurfaceEvaluator(int) -->
         <function-decl name='~OpenGLSurfaceEvaluator' filepath='libnurbs/interface/glsurfeval.cc' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
         <!-- void OpenGLSurfaceEvaluator::range2f(long int, REAL*, REAL*) -->
         <function-decl name='range2f' mangled-name='_ZN22OpenGLSurfaceEvaluator7range2fElPfS0_' filepath='libnurbs/interface/glsurfeval.cc' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='10'>
         <!-- void OpenGLSurfaceEvaluator::domain2f(REAL, REAL, REAL, REAL) -->
         <function-decl name='domain2f' mangled-name='_ZN22OpenGLSurfaceEvaluator8domain2fEffff' filepath='libnurbs/interface/glsurfeval.cc' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='11'>
         <!-- void OpenGLSurfaceEvaluator::enable(long int) -->
         <function-decl name='enable' mangled-name='_ZN22OpenGLSurfaceEvaluator6enableEl' filepath='libnurbs/interface/glsurfeval.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
         <!-- void OpenGLSurfaceEvaluator::disable(long int) -->
         <function-decl name='disable' mangled-name='_ZN22OpenGLSurfaceEvaluator7disableEl' filepath='libnurbs/interface/glsurfeval.cc' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
         <!-- void OpenGLSurfaceEvaluator::bgnmap2f(long int) -->
         <function-decl name='bgnmap2f' mangled-name='_ZN22OpenGLSurfaceEvaluator8bgnmap2fEl' filepath='libnurbs/interface/glsurfeval.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
         <!-- void OpenGLSurfaceEvaluator::map2f(long int, REAL, REAL, long int, long int, REAL, REAL, long int, long int, REAL*) -->
         <function-decl name='map2f' mangled-name='_ZN22OpenGLSurfaceEvaluator5map2fElffllffllPf' filepath='libnurbs/interface/glsurfeval.cc' line='872' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='15'>
         <!-- void OpenGLSurfaceEvaluator::mapgrid2f(long int, REAL, REAL, long int, REAL, REAL) -->
         <function-decl name='mapgrid2f' mangled-name='_ZN22OpenGLSurfaceEvaluator9mapgrid2fElfflff' filepath='libnurbs/interface/glsurfeval.cc' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='16'>
         <!-- void OpenGLSurfaceEvaluator::mapmesh2f(long int, long int, long int, long int, long int) -->
         <function-decl name='mapmesh2f' mangled-name='_ZN22OpenGLSurfaceEvaluator9mapmesh2fElllll' filepath='libnurbs/interface/glsurfeval.cc' line='946' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='17'>
         <!-- void OpenGLSurfaceEvaluator::evalcoord2f(long int, REAL, REAL) -->
         <function-decl name='evalcoord2f' mangled-name='_ZN22OpenGLSurfaceEvaluator11evalcoord2fElff' filepath='libnurbs/interface/glsurfeval.cc' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='18'>
         <!-- void OpenGLSurfaceEvaluator::evalpoint2i(long int, long int) -->
         <function-decl name='evalpoint2i' mangled-name='_ZN22OpenGLSurfaceEvaluator11evalpoint2iEll' filepath='libnurbs/interface/glsurfeval.cc' line='1059' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='19'>
         <!-- void OpenGLSurfaceEvaluator::endmap2f() -->
         <function-decl name='endmap2f' mangled-name='_ZN22OpenGLSurfaceEvaluator8endmap2fEv' filepath='libnurbs/interface/glsurfeval.cc' line='801' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
         <!-- void OpenGLSurfaceEvaluator::polymode(long int) -->
         <function-decl name='polymode' mangled-name='_ZN22OpenGLSurfaceEvaluator8polymodeEl' filepath='libnurbs/interface/glsurfeval.cc' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='21'>
         <!-- void OpenGLSurfaceEvaluator::bgnline() -->
         <function-decl name='bgnline' mangled-name='_ZN22OpenGLSurfaceEvaluator7bgnlineEv' filepath='libnurbs/interface/glsurfeval.cc' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='22'>
         <!-- void OpenGLSurfaceEvaluator::endline() -->
         <function-decl name='endline' mangled-name='_ZN22OpenGLSurfaceEvaluator7endlineEv' filepath='libnurbs/interface/glsurfeval.cc' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='23'>
         <!-- void OpenGLSurfaceEvaluator::bgnclosedline() -->
         <function-decl name='bgnclosedline' mangled-name='_ZN22OpenGLSurfaceEvaluator13bgnclosedlineEv' filepath='libnurbs/interface/glsurfeval.cc' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='24'>
         <!-- void OpenGLSurfaceEvaluator::endclosedline() -->
         <function-decl name='endclosedline' mangled-name='_ZN22OpenGLSurfaceEvaluator13endclosedlineEv' filepath='libnurbs/interface/glsurfeval.cc' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='25'>
         <!-- void OpenGLSurfaceEvaluator::bgntmesh() -->
         <function-decl name='bgntmesh' mangled-name='_ZN22OpenGLSurfaceEvaluator8bgntmeshEv' filepath='libnurbs/interface/glsurfeval.cc' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='26'>
         <!-- void OpenGLSurfaceEvaluator::swaptmesh() -->
         <function-decl name='swaptmesh' mangled-name='_ZN22OpenGLSurfaceEvaluator9swaptmeshEv' filepath='libnurbs/interface/glsurfeval.cc' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='27'>
         <!-- void OpenGLSurfaceEvaluator::endtmesh() -->
         <function-decl name='endtmesh' mangled-name='_ZN22OpenGLSurfaceEvaluator8endtmeshEv' filepath='libnurbs/interface/glsurfeval.cc' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='28'>
         <!-- void OpenGLSurfaceEvaluator::bgnqstrip() -->
         <function-decl name='bgnqstrip' mangled-name='_ZN22OpenGLSurfaceEvaluator9bgnqstripEv' filepath='libnurbs/interface/glsurfeval.cc' line='712' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='29'>
         <!-- void OpenGLSurfaceEvaluator::endqstrip() -->
         <function-decl name='endqstrip' mangled-name='_ZN22OpenGLSurfaceEvaluator9endqstripEv' filepath='libnurbs/interface/glsurfeval.cc' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='30'>
         <!-- void OpenGLSurfaceEvaluator::bgntfan() -->
         <function-decl name='bgntfan' mangled-name='_ZN22OpenGLSurfaceEvaluator7bgntfanEv' filepath='libnurbs/interface/glsurfeval.cc' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='31'>
         <!-- void OpenGLSurfaceEvaluator::endtfan() -->
         <function-decl name='endtfan' mangled-name='_ZN22OpenGLSurfaceEvaluator7endtfanEv' filepath='libnurbs/interface/glsurfeval.cc' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='32'>
         <!-- void OpenGLSurfaceEvaluator::evalUStrip(int, REAL, REAL*, int, REAL, REAL*) -->
         <function-decl name='evalUStrip' mangled-name='_ZN22OpenGLSurfaceEvaluator10evalUStripEifPfifS0_' filepath='libnurbs/interface/glsurfeval.cc' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='33'>
         <!-- void OpenGLSurfaceEvaluator::evalVStrip(int, REAL, REAL*, int, REAL, REAL*) -->
         <function-decl name='evalVStrip' mangled-name='_ZN22OpenGLSurfaceEvaluator10evalVStripEifPfifS0_' filepath='libnurbs/interface/glsurfeval.cc' line='530' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='34'>
         <!-- void OpenGLSurfaceEvaluator::inDoEvalCoord2NOGE(REAL, REAL, REAL*, REAL*) -->
         <function-decl name='inDoEvalCoord2NOGE' mangled-name='_ZN22OpenGLSurfaceEvaluator18inDoEvalCoord2NOGEEffPfS0_' filepath='libnurbs/interface/glsurfeval.h' line='283' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='35'>
         <!-- void OpenGLSurfaceEvaluator::inDoEvalCoord2NOGE_BU(REAL, REAL, REAL*, REAL*) -->
         <function-decl name='inDoEvalCoord2NOGE_BU' mangled-name='_ZN22OpenGLSurfaceEvaluator21inDoEvalCoord2NOGE_BUEffPfS0_' filepath='libnurbs/interface/glsurfeval.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='36'>
         <!-- void OpenGLSurfaceEvaluator::inDoEvalCoord2NOGE_BV(REAL, REAL, REAL*, REAL*) -->
         <function-decl name='inDoEvalCoord2NOGE_BV' mangled-name='_ZN22OpenGLSurfaceEvaluator21inDoEvalCoord2NOGE_BVEffPfS0_' filepath='libnurbs/interface/glsurfeval.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='37'>
         <!-- void OpenGLSurfaceEvaluator::inPreEvaluateBV_intfac(REAL) -->
         <function-decl name='inPreEvaluateBV_intfac' mangled-name='_ZN22OpenGLSurfaceEvaluator22inPreEvaluateBV_intfacEf' filepath='libnurbs/interface/glsurfeval.h' line='316' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='38'>
         <!-- void OpenGLSurfaceEvaluator::inPreEvaluateBU_intfac(REAL) -->
         <function-decl name='inPreEvaluateBU_intfac' mangled-name='_ZN22OpenGLSurfaceEvaluator22inPreEvaluateBU_intfacEf' filepath='libnurbs/interface/glsurfeval.h' line='321' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-          <parameter type-id='type-id-61' is-artificial='yes'/>
+          <parameter type-id='type-id-72' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- GLUnurbs* gluNewNurbsRenderer() -->
     <function-decl name='gluNewNurbsRenderer' mangled-name='gluNewNurbsRenderer' filepath='libnurbs/interface/glinterface.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewNurbsRenderer'>
       <!-- GLUnurbs* -->
-      <return type-id='type-id-58'/>
+      <return type-id='type-id-69'/>
     </function-decl>
     <!-- void gluDeleteNurbsRenderer(GLUnurbs*) -->
     <function-decl name='gluDeleteNurbsRenderer' mangled-name='gluDeleteNurbsRenderer' filepath='libnurbs/interface/glinterface.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteNurbsRenderer'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='75' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluBeginSurface(GLUnurbs*) -->
     <function-decl name='gluBeginSurface' mangled-name='gluBeginSurface' filepath='libnurbs/interface/glinterface.cc' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginSurface'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='89' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='89' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluBeginCurve(GLUnurbs*) -->
     <function-decl name='gluBeginCurve' mangled-name='gluBeginCurve' filepath='libnurbs/interface/glinterface.cc' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginCurve'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='99' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='99' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluEndCurve(GLUnurbs*) -->
     <function-decl name='gluEndCurve' mangled-name='gluEndCurve' filepath='libnurbs/interface/glinterface.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndCurve'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='105' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='105' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluEndSurface(GLUnurbs*) -->
     <function-decl name='gluEndSurface' mangled-name='gluEndSurface' filepath='libnurbs/interface/glinterface.cc' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndSurface'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='111' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='111' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluBeginTrim(GLUnurbs*) -->
     <function-decl name='gluBeginTrim' mangled-name='gluBeginTrim' filepath='libnurbs/interface/glinterface.cc' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginTrim'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='131' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='131' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluEndTrim(GLUnurbs*) -->
     <function-decl name='gluEndTrim' mangled-name='gluEndTrim' filepath='libnurbs/interface/glinterface.cc' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndTrim'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='141' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='141' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluPwlCurve(GLUnurbs*, GLint, float*, GLint, GLenum) -->
     <function-decl name='gluPwlCurve' mangled-name='gluPwlCurve' filepath='libnurbs/interface/glinterface.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPwlCurve'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='150' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='150' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='150' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='150' column='1'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-63' filepath='libnurbs/interface/glinterface.cc' line='150' column='1'/>
+      <parameter type-id='type-id-4' filepath='libnurbs/interface/glinterface.cc' line='150' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
+      <parameter type-id='type-id-10' filepath='libnurbs/interface/glinterface.cc' line='151' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluNurbsCurve(GLUnurbs*, GLint, float*, GLint, float*, GLint, GLenum) -->
     <function-decl name='gluNurbsCurve' mangled-name='gluNurbsCurve' filepath='libnurbs/interface/glinterface.cc' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCurve'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-63' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
+      <parameter type-id='type-id-4' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='173' column='1'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-63' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
+      <parameter type-id='type-id-4' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
+      <parameter type-id='type-id-10' filepath='libnurbs/interface/glinterface.cc' line='174' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluNurbsSurface(GLUnurbs*, GLint, GLfloat*, GLint, GLfloat*, GLint, GLint, GLfloat*, GLint, GLint, GLenum) -->
     <function-decl name='gluNurbsSurface' mangled-name='gluNurbsSurface' filepath='libnurbs/interface/glinterface.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsSurface'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='199' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='199' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='199' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='199' column='1'/>
       <!-- parameter of type 'GLfloat*' -->
-      <parameter type-id='type-id-75' filepath='libnurbs/interface/glinterface.cc' line='199' column='1'/>
+      <parameter type-id='type-id-84' filepath='libnurbs/interface/glinterface.cc' line='199' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='200' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='200' column='1'/>
       <!-- parameter of type 'GLfloat*' -->
-      <parameter type-id='type-id-75' filepath='libnurbs/interface/glinterface.cc' line='200' column='1'/>
+      <parameter type-id='type-id-84' filepath='libnurbs/interface/glinterface.cc' line='200' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='201' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='201' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='201' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='201' column='1'/>
       <!-- parameter of type 'GLfloat*' -->
-      <parameter type-id='type-id-75' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
+      <parameter type-id='type-id-84' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
+      <parameter type-id='type-id-83' filepath='libnurbs/interface/glinterface.cc' line='202' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libnurbs/interface/glinterface.cc' line='203' column='1'/>
+      <parameter type-id='type-id-10' filepath='libnurbs/interface/glinterface.cc' line='203' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluLoadSamplingMatrices(GLUnurbs*, const GLfloat*, const GLfloat*, const GLint*) -->
     <function-decl name='gluLoadSamplingMatrices' mangled-name='gluLoadSamplingMatrices' filepath='libnurbs/interface/glinterface.cc' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluLoadSamplingMatrices'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-30' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
+      <parameter type-id='type-id-42' filepath='libnurbs/interface/glinterface.cc' line='235' column='1'/>
       <!-- parameter of type 'const GLfloat*' -->
-      <parameter type-id='type-id-30' filepath='libnurbs/interface/glinterface.cc' line='236' column='1'/>
+      <parameter type-id='type-id-42' filepath='libnurbs/interface/glinterface.cc' line='236' column='1'/>
       <!-- parameter of type 'const GLint*' -->
-      <parameter type-id='type-id-76' filepath='libnurbs/interface/glinterface.cc' line='237' column='1'/>
+      <parameter type-id='type-id-85' filepath='libnurbs/interface/glinterface.cc' line='237' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluNurbsProperty(GLUnurbs*, GLenum, GLfloat) -->
     <function-decl name='gluNurbsProperty' mangled-name='gluNurbsProperty' filepath='libnurbs/interface/glinterface.cc' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsProperty'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
+      <parameter type-id='type-id-10' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
       <!-- parameter of type 'typedef GLfloat' -->
-      <parameter type-id='type-id-28' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
+      <parameter type-id='type-id-40' filepath='libnurbs/interface/glinterface.cc' line='243' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluGetNurbsProperty(GLUnurbs*, GLenum, GLfloat*) -->
     <function-decl name='gluGetNurbsProperty' mangled-name='gluGetNurbsProperty' filepath='libnurbs/interface/glinterface.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetNurbsProperty'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
+      <parameter type-id='type-id-10' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <!-- parameter of type 'GLfloat*' -->
-      <parameter type-id='type-id-75' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
+      <parameter type-id='type-id-84' filepath='libnurbs/interface/glinterface.cc' line='359' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluNurbsCallback(GLUnurbs*, GLenum, _GLUfuncptr) -->
     <function-decl name='gluNurbsCallback' mangled-name='gluNurbsCallback' filepath='libnurbs/interface/glinterface.cc' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallback'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
+      <parameter type-id='type-id-10' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
       <!-- parameter of type 'typedef _GLUfuncptr' -->
-      <parameter type-id='type-id-77' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
+      <parameter type-id='type-id-86' filepath='libnurbs/interface/glinterface.cc' line='430' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluNurbsCallbackDataEXT(GLUnurbs*, void*) -->
     <function-decl name='gluNurbsCallbackDataEXT' mangled-name='gluNurbsCallbackDataEXT' filepath='libnurbs/interface/glinterface.cc' line='459' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallbackDataEXT'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
+      <parameter type-id='type-id-30' filepath='libnurbs/interface/glinterface.cc' line='459' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluNurbsCallbackData(GLUnurbs*, void*) -->
     <function-decl name='gluNurbsCallbackData' mangled-name='gluNurbsCallbackData' filepath='libnurbs/interface/glinterface.cc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNurbsCallbackData'>
       <!-- parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' filepath='libnurbs/interface/glinterface.cc' line='466' column='1'/>
+      <parameter type-id='type-id-69' filepath='libnurbs/interface/glinterface.cc' line='466' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libnurbs/interface/glinterface.cc' line='466' column='1'/>
+      <parameter type-id='type-id-30' filepath='libnurbs/interface/glinterface.cc' line='466' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void (GLUnurbs::*) () -->
-    <function-type size-in-bits='64' method-class-id='type-id-57' id='type-id-78'>
+    <function-type size-in-bits='64' method-class-id='type-id-68' id='type-id-87'>
       <!-- implicit parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' is-artificial='yes'/>
+      <parameter type-id='type-id-69' is-artificial='yes'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (GLUnurbs::*) (int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-57' id='type-id-79'>
+    <function-type size-in-bits='64' method-class-id='type-id-68' id='type-id-88'>
       <!-- implicit parameter of type 'GLUnurbs*' -->
-      <parameter type-id='type-id-58' is-artificial='yes'/>
+      <parameter type-id='type-id-69' is-artificial='yes'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-3'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLCurveEvaluator::*) () -->
-    <function-type size-in-bits='64' method-class-id='type-id-7' id='type-id-80'>
+    <function-type size-in-bits='64' method-class-id='type-id-21' id='type-id-89'>
       <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-      <parameter type-id='type-id-18' is-artificial='yes'/>
+      <parameter type-id='type-id-31' is-artificial='yes'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLCurveEvaluator::*) (REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-7' id='type-id-81'>
+    <function-type size-in-bits='64' method-class-id='type-id-21' id='type-id-90'>
       <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-      <parameter type-id='type-id-18' is-artificial='yes'/>
+      <parameter type-id='type-id-31' is-artificial='yes'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLCurveEvaluator::*) (long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-7' id='type-id-82'>
+    <function-type size-in-bits='64' method-class-id='type-id-21' id='type-id-91'>
       <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-      <parameter type-id='type-id-18' is-artificial='yes'/>
+      <parameter type-id='type-id-31' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLCurveEvaluator::*) (long int, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-7' id='type-id-83'>
+    <function-type size-in-bits='64' method-class-id='type-id-21' id='type-id-92'>
       <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-      <parameter type-id='type-id-18' is-artificial='yes'/>
+      <parameter type-id='type-id-31' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLCurveEvaluator::*) (long int, REAL*, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-7' id='type-id-84'>
+    <function-type size-in-bits='64' method-class-id='type-id-21' id='type-id-93'>
       <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-      <parameter type-id='type-id-18' is-artificial='yes'/>
+      <parameter type-id='type-id-31' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLCurveEvaluator::*) (long int, REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-7' id='type-id-85'>
+    <function-type size-in-bits='64' method-class-id='type-id-21' id='type-id-94'>
       <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-      <parameter type-id='type-id-18' is-artificial='yes'/>
+      <parameter type-id='type-id-31' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLCurveEvaluator::*) (long int, REAL, REAL, long int, long int, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-7' id='type-id-86'>
+    <function-type size-in-bits='64' method-class-id='type-id-21' id='type-id-95'>
       <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-      <parameter type-id='type-id-18' is-artificial='yes'/>
+      <parameter type-id='type-id-31' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLCurveEvaluator::*) (long int, long int, long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-7' id='type-id-87'>
+    <function-type size-in-bits='64' method-class-id='type-id-21' id='type-id-96'>
       <!-- implicit parameter of type 'OpenGLCurveEvaluator*' -->
-      <parameter type-id='type-id-18' is-artificial='yes'/>
+      <parameter type-id='type-id-31' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) () -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-88'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-97'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-89'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-98'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (REAL, REAL, REAL*, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-90'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-99'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (REAL, REAL, REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-91'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-100'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (int, REAL, REAL*, int, REAL, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-92'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-101'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-3'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-3'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-93'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-102'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (long int, REAL*, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-94'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-103'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (long int, REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-95'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-104'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (long int, REAL, REAL, long int, REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-96'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-105'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (long int, REAL, REAL, long int, long int, REAL, REAL, long int, long int, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-97'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-106'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (long int, long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-98'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-107'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (OpenGLSurfaceEvaluator::*) (long int, long int, long int, long int, long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-60' id='type-id-99'>
+    <function-type size-in-bits='64' method-class-id='type-id-71' id='type-id-108'>
       <!-- implicit parameter of type 'OpenGLSurfaceEvaluator*' -->
-      <parameter type-id='type-id-61' is-artificial='yes'/>
+      <parameter type-id='type-id-72' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- GLfloat[4] -->
-    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='128' id='type-id-100'>
+    <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='128' id='type-id-109'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-101'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-17' id='type-id-110'/>
     </array-type-def>
     <!-- typedef void (*)(GLenum) errorCallbackType -->
-    <typedef-decl name='errorCallbackType' type-id='type-id-11' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-65'/>
+    <typedef-decl name='errorCallbackType' type-id='type-id-24' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-75'/>
     <!-- GLfloat(*)[4] -->
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-102'/>
+    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-111'/>
     <!-- class NurbsTessellator -->
-    <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-64'>
+    <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-74'>
       <data-member access='protected' layout-offset-in-bits='64'>
         <!-- Renderhints NurbsTessellator::renderhints -->
-        <var-decl name='renderhints' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
+        <var-decl name='renderhints' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='320'>
         <!-- Maplist NurbsTessellator::maplist -->
-        <var-decl name='maplist' type-id='type-id-104' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
+        <var-decl name='maplist' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='3008'>
         <!-- Backend NurbsTessellator::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
+        <var-decl name='backend' type-id='type-id-114' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3648'>
         <!-- Subdivider NurbsTessellator::subdivider -->
-        <var-decl name='subdivider' type-id='type-id-106' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
+        <var-decl name='subdivider' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='24064'>
         <!-- JumpBuffer* NurbsTessellator::jumpbuffer -->
-        <var-decl name='jumpbuffer' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
+        <var-decl name='jumpbuffer' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='24128'>
         <!-- Pool NurbsTessellator::o_pwlcurvePool -->
-        <var-decl name='o_pwlcurvePool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
+        <var-decl name='o_pwlcurvePool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26624'>
         <!-- Pool NurbsTessellator::o_nurbscurvePool -->
-        <var-decl name='o_nurbscurvePool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
+        <var-decl name='o_nurbscurvePool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='29120'>
         <!-- Pool NurbsTessellator::o_curvePool -->
-        <var-decl name='o_curvePool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
+        <var-decl name='o_curvePool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='31616'>
         <!-- Pool NurbsTessellator::o_trimPool -->
-        <var-decl name='o_trimPool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
+        <var-decl name='o_trimPool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='34112'>
         <!-- Pool NurbsTessellator::o_surfacePool -->
-        <var-decl name='o_surfacePool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
+        <var-decl name='o_surfacePool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='36608'>
         <!-- Pool NurbsTessellator::o_nurbssurfacePool -->
-        <var-decl name='o_nurbssurfacePool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
+        <var-decl name='o_nurbssurfacePool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='39104'>
         <!-- Pool NurbsTessellator::propertyPool -->
-        <var-decl name='propertyPool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
+        <var-decl name='propertyPool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='41600'>
         <!-- Pool NurbsTessellator::quiltPool -->
-        <var-decl name='quiltPool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
+        <var-decl name='quiltPool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='44096'>
         <!-- TrimVertexPool NurbsTessellator::extTrimVertexPool -->
-        <var-decl name='extTrimVertexPool' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
+        <var-decl name='extTrimVertexPool' type-id='type-id-118' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46720'>
         <!-- int NurbsTessellator::inSurface -->
-        <var-decl name='inSurface' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
+        <var-decl name='inSurface' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46752'>
         <!-- int NurbsTessellator::inCurve -->
-        <var-decl name='inCurve' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
+        <var-decl name='inCurve' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46784'>
         <!-- int NurbsTessellator::inTrim -->
-        <var-decl name='inTrim' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
+        <var-decl name='inTrim' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46816'>
         <!-- int NurbsTessellator::isCurveModified -->
-        <var-decl name='isCurveModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
+        <var-decl name='isCurveModified' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46848'>
         <!-- int NurbsTessellator::isTrimModified -->
-        <var-decl name='isTrimModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
+        <var-decl name='isTrimModified' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46880'>
         <!-- int NurbsTessellator::isSurfaceModified -->
-        <var-decl name='isSurfaceModified' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
+        <var-decl name='isSurfaceModified' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46912'>
         <!-- int NurbsTessellator::isDataValid -->
-        <var-decl name='isDataValid' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
+        <var-decl name='isDataValid' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46944'>
         <!-- int NurbsTessellator::numTrims -->
-        <var-decl name='numTrims' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
+        <var-decl name='numTrims' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46976'>
         <!-- int NurbsTessellator::playBack -->
-        <var-decl name='playBack' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
+        <var-decl name='playBack' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47040'>
         <!-- O_trim** NurbsTessellator::nextTrim -->
-        <var-decl name='nextTrim' type-id='type-id-110' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
+        <var-decl name='nextTrim' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47104'>
         <!-- O_curve** NurbsTessellator::nextCurve -->
-        <var-decl name='nextCurve' type-id='type-id-111' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
+        <var-decl name='nextCurve' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47168'>
         <!-- O_nurbscurve** NurbsTessellator::nextNurbscurve -->
-        <var-decl name='nextNurbscurve' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
+        <var-decl name='nextNurbscurve' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47232'>
         <!-- O_pwlcurve** NurbsTessellator::nextPwlcurve -->
-        <var-decl name='nextPwlcurve' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
+        <var-decl name='nextPwlcurve' type-id='type-id-122' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47296'>
         <!-- O_nurbssurface** NurbsTessellator::nextNurbssurface -->
-        <var-decl name='nextNurbssurface' type-id='type-id-114' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
+        <var-decl name='nextNurbssurface' type-id='type-id-123' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47360'>
         <!-- O_surface* NurbsTessellator::currentSurface -->
-        <var-decl name='currentSurface' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
+        <var-decl name='currentSurface' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47424'>
         <!-- O_trim* NurbsTessellator::currentTrim -->
-        <var-decl name='currentTrim' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
+        <var-decl name='currentTrim' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47488'>
         <!-- O_curve* NurbsTessellator::currentCurve -->
-        <var-decl name='currentCurve' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
+        <var-decl name='currentCurve' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47552'>
         <!-- DisplayList* NurbsTessellator::dl -->
-        <var-decl name='dl' type-id='type-id-118' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
+        <var-decl name='dl' type-id='type-id-127' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
       </data-member>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <!-- NurbsTessellator::~NurbsTessellator(int) -->
         <function-decl name='~NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-119' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <!-- void NurbsTessellator::bgnrender() -->
         <function-decl name='bgnrender' mangled-name='_ZN16NurbsTessellator9bgnrenderEv' filepath='libnurbs/internals/nurbstess.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-119' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
         <!-- void NurbsTessellator::endrender() -->
         <function-decl name='endrender' mangled-name='_ZN16NurbsTessellator9endrenderEv' filepath='libnurbs/internals/nurbstess.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-119' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
         <!-- void NurbsTessellator::makeobj(int) -->
         <function-decl name='makeobj' mangled-name='_ZN16NurbsTessellator7makeobjEi' filepath='libnurbs/internals/nurbstess.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-119' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='5'>
         <!-- void NurbsTessellator::closeobj() -->
         <function-decl name='closeobj' mangled-name='_ZN16NurbsTessellator8closeobjEv' filepath='libnurbs/internals/nurbstess.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-119' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='6'>
         <!-- void NurbsTessellator::errorHandler(int) -->
         <function-decl name='errorHandler' mangled-name='_ZN16NurbsTessellator12errorHandlerEi' filepath='libnurbs/internals/nurbstess.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-119' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- void (NurbsTessellator::*) () -->
-    <function-type size-in-bits='64' method-class-id='type-id-64' id='type-id-120'>
+    <function-type size-in-bits='64' method-class-id='type-id-74' id='type-id-129'>
       <!-- implicit parameter of type 'NurbsTessellator*' -->
-      <parameter type-id='type-id-119' is-artificial='yes'/>
+      <parameter type-id='type-id-128' is-artificial='yes'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (NurbsTessellator::*) (int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-64' id='type-id-121'>
+    <function-type size-in-bits='64' method-class-id='type-id-74' id='type-id-130'>
       <!-- implicit parameter of type 'NurbsTessellator*' -->
-      <parameter type-id='type-id-119' is-artificial='yes'/>
+      <parameter type-id='type-id-128' is-artificial='yes'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-3'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- GLint[2] -->
-    <array-type-def dimensions='1' type-id='type-id-74' size-in-bits='64' id='type-id-69'>
+    <array-type-def dimensions='1' type-id='type-id-83' size-in-bits='64' id='type-id-79'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
     </array-type-def>
     <!-- REAL[2] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-123'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='64' id='type-id-132'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
     </array-type-def>
     <!-- REAL[3] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='96' id='type-id-124'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='96' id='type-id-133'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-125'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-17' id='type-id-134'/>
     </array-type-def>
     <!-- REAL[40][4] -->
-    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='5120' id='type-id-71'>
+    <array-type-def dimensions='2' type-id='type-id-15' size-in-bits='5120' id='type-id-80'>
       <!-- <anonymous range>[40] -->
-      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-3' id='type-id-6'/>
+      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-17' id='type-id-20'/>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-101'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-17' id='type-id-110'/>
     </array-type-def>
     <!-- REAL[6400] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='204800' id='type-id-72'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='204800' id='type-id-81'>
       <!-- <anonymous range>[6400] -->
-      <subrange length='6400' lower-bound='0' upper-bound='6399' type-id='type-id-3' id='type-id-126'/>
+      <subrange length='6400' lower-bound='0' upper-bound='6399' type-id='type-id-17' id='type-id-135'/>
     </array-type-def>
     <!-- StoredVertex*[3] -->
-    <array-type-def dimensions='1' type-id='type-id-127' size-in-bits='192' id='type-id-68'>
+    <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='192' id='type-id-78'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-125'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-17' id='type-id-134'/>
     </array-type-def>
     <!-- class StoredVertex -->
-    <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-128'>
+    <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-137'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- int StoredVertex::type -->
-        <var-decl name='type' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
+        <var-decl name='type' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='32'>
         <!-- REAL StoredVertex::coord[2] -->
-        <var-decl name='coord' type-id='type-id-123' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
+        <var-decl name='coord' type-id='type-id-132' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- long int StoredVertex::point[2] -->
-        <var-decl name='point' type-id='type-id-129' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
+        <var-decl name='point' type-id='type-id-138' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
       </data-member>
     </class-decl>
     <!-- long int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='128' id='type-id-129'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-138'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
     </array-type-def>
-    <!-- struct bezierPatch -->
-    <class-decl name='bezierPatch' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='36' column='1' id='type-id-130'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- float bezierPatch::umin -->
-        <var-decl name='umin' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <!-- float bezierPatch::vmin -->
-        <var-decl name='vmin' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- float bezierPatch::umax -->
-        <var-decl name='umax' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <!-- float bezierPatch::vmax -->
-        <var-decl name='vmax' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- int bezierPatch::uorder -->
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='38' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <!-- int bezierPatch::vorder -->
-        <var-decl name='vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='39' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <!-- int bezierPatch::dimension -->
-        <var-decl name='dimension' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='57' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <!-- float* bezierPatch::ctlpoints -->
-        <var-decl name='ctlpoints' type-id='type-id-63' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='58' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <!-- bezierPatch* bezierPatch::next -->
-        <var-decl name='next' type-id='type-id-131' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='63' column='1'/>
-      </data-member>
-    </class-decl>
-    <!-- struct bezierPatchMesh -->
-    <class-decl name='bezierPatchMesh' size-in-bits='960' is-struct='yes' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='39' column='1' id='type-id-132'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- bezierPatch* bezierPatchMesh::bpatch -->
-        <var-decl name='bpatch' type-id='type-id-133' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='40' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- bezierPatch* bezierPatchMesh::bpatch_normal -->
-        <var-decl name='bpatch_normal' type-id='type-id-133' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='41' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- bezierPatch* bezierPatchMesh::bpatch_texcoord -->
-        <var-decl name='bpatch_texcoord' type-id='type-id-133' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='42' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <!-- bezierPatch* bezierPatchMesh::bpatch_color -->
-        <var-decl name='bpatch_color' type-id='type-id-133' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='43' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <!-- float* bezierPatchMesh::UVarray -->
-        <var-decl name='UVarray' type-id='type-id-63' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='45' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <!-- int* bezierPatchMesh::length_array -->
-        <var-decl name='length_array' type-id='type-id-134' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='46' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <!-- GLenum* bezierPatchMesh::type_array -->
-        <var-decl name='type_array' type-id='type-id-135' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='47' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <!-- int bezierPatchMesh::size_UVarray -->
-        <var-decl name='size_UVarray' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='50' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='480'>
-        <!-- int bezierPatchMesh::index_UVarray -->
-        <var-decl name='index_UVarray' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='51' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <!-- int bezierPatchMesh::size_length_array -->
-        <var-decl name='size_length_array' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='52' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='544'>
-        <!-- int bezierPatchMesh::index_length_array -->
-        <var-decl name='index_length_array' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='53' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <!-- int bezierPatchMesh::counter -->
-        <var-decl name='counter' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='55' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='608'>
-        <!-- GLenum bezierPatchMesh::type -->
-        <var-decl name='type' type-id='type-id-41' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='56' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <!-- float* bezierPatchMesh::vertex_array -->
-        <var-decl name='vertex_array' type-id='type-id-63' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='59' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <!-- float* bezierPatchMesh::normal_array -->
-        <var-decl name='normal_array' type-id='type-id-63' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='60' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <!-- float* bezierPatchMesh::color_array -->
-        <var-decl name='color_array' type-id='type-id-63' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='61' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <!-- float* bezierPatchMesh::texcoord_array -->
-        <var-decl name='texcoord_array' type-id='type-id-63' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='62' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='896'>
-        <!-- bezierPatchMesh* bezierPatchMesh::next -->
-        <var-decl name='next' type-id='type-id-136' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='65' column='1'/>
-      </data-member>
-    </class-decl>
     <!-- struct surfEvalMachine -->
-    <class-decl name='surfEvalMachine' size-in-bits='210272' is-struct='yes' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='63' column='1' id='type-id-137'>
+    <class-decl name='surfEvalMachine' size-in-bits='210272' is-struct='yes' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='63' column='1' id='type-id-139'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL surfEvalMachine::uprime -->
-        <var-decl name='uprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='64' column='1'/>
+        <var-decl name='uprime' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- REAL surfEvalMachine::vprime -->
-        <var-decl name='vprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='65' column='1'/>
+        <var-decl name='vprime' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int surfEvalMachine::k -->
-        <var-decl name='k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='66' column='1'/>
+        <var-decl name='k' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- REAL surfEvalMachine::u1 -->
-        <var-decl name='u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='67' column='1'/>
+        <var-decl name='u1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL surfEvalMachine::u2 -->
-        <var-decl name='u2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='68' column='1'/>
+        <var-decl name='u2' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int surfEvalMachine::ustride -->
-        <var-decl name='ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='69' column='1'/>
+        <var-decl name='ustride' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int surfEvalMachine::uorder -->
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='70' column='1'/>
+        <var-decl name='uorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- REAL surfEvalMachine::v1 -->
-        <var-decl name='v1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='71' column='1'/>
+        <var-decl name='v1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- REAL surfEvalMachine::v2 -->
-        <var-decl name='v2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='72' column='1'/>
+        <var-decl name='v2' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int surfEvalMachine::vstride -->
-        <var-decl name='vstride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='73' column='1'/>
+        <var-decl name='vstride' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int surfEvalMachine::vorder -->
-        <var-decl name='vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='74' column='1'/>
+        <var-decl name='vorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
         <!-- REAL surfEvalMachine::ctlPoints[6400] -->
-        <var-decl name='ctlPoints' type-id='type-id-72' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='75' column='1'/>
+        <var-decl name='ctlPoints' type-id='type-id-81' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='205152'>
         <!-- REAL surfEvalMachine::ucoeff[40] -->
-        <var-decl name='ucoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='76' column='1'/>
+        <var-decl name='ucoeff' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='206432'>
         <!-- REAL surfEvalMachine::vcoeff[40] -->
-        <var-decl name='vcoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='77' column='1'/>
+        <var-decl name='vcoeff' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='207712'>
         <!-- REAL surfEvalMachine::ucoeffDeriv[40] -->
-        <var-decl name='ucoeffDeriv' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='78' column='1'/>
+        <var-decl name='ucoeffDeriv' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='78' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='208992'>
         <!-- REAL surfEvalMachine::vcoeffDeriv[40] -->
-        <var-decl name='vcoeffDeriv' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='79' column='1'/>
+        <var-decl name='vcoeffDeriv' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='79' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef bezierPatch bezierPatch -->
-    <typedef-decl name='bezierPatch' type-id='type-id-130' filepath='libnurbs/interface/bezierPatch.h' line='65' column='1' id='type-id-138'/>
-    <!-- typedef bezierPatchMesh bezierPatchMesh -->
-    <typedef-decl name='bezierPatchMesh' type-id='type-id-132' filepath='libnurbs/interface/bezierPatchMesh.h' line='66' column='1' id='type-id-139'/>
     <!-- typedef surfEvalMachine surfEvalMachine -->
-    <typedef-decl name='surfEvalMachine' type-id='type-id-137' filepath='libnurbs/interface/glsurfeval.h' line='80' column='1' id='type-id-73'/>
-    <!-- GLenum* -->
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-135'/>
+    <typedef-decl name='surfEvalMachine' type-id='type-id-139' filepath='libnurbs/interface/glsurfeval.h' line='80' column='1' id='type-id-82'/>
     <!-- REAL(*)[3] -->
-    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-140'/>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-140'/>
     <!-- StoredVertex* -->
-    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-127'/>
+    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-136'/>
     <!-- StoredVertex* const -->
-    <qualified-type-def type-id='type-id-127' const='yes' id='type-id-141'/>
-    <!-- bezierPatch* -->
-    <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-131'/>
-    <!-- bezierPatch* -->
-    <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-133'/>
-    <!-- bezierPatchMesh* -->
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-136'/>
-    <!-- bezierPatchMesh* -->
-    <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-70'/>
-    <!-- int* -->
-    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-134'/>
+    <qualified-type-def type-id='type-id-136' const='yes' id='type-id-141'/>
     <!-- surfEvalMachine* -->
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-142'/>
+    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-142'/>
     <!-- SurfaceMap* -->
     <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-144'/>
     <!-- class BasicSurfaceEvaluator -->
-    <class-decl name='BasicSurfaceEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/basicsurfeval.h' line='43' column='1' id='type-id-67'>
+    <class-decl name='BasicSurfaceEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/basicsurfeval.h' line='43' column='1' id='type-id-77'>
       <!-- class CachingEvaluator -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-24'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-36'/>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <!-- BasicSurfaceEvaluator::~BasicSurfaceEvaluator(int) -->
         <function-decl name='~BasicSurfaceEvaluator' filepath='libnurbs/internals/basicsurfeval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='9'>
@@ -2621,13 +2623,13 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='10'>
@@ -2636,15 +2638,15 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='11'>
@@ -2653,9 +2655,9 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='12'>
@@ -2664,9 +2666,9 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='13'>
@@ -2675,9 +2677,9 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='14'>
@@ -2686,27 +2688,27 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='15'>
@@ -2715,19 +2717,19 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='16'>
@@ -2736,17 +2738,17 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='17'>
@@ -2755,13 +2757,13 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='18'>
@@ -2770,11 +2772,11 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='19'>
@@ -2783,7 +2785,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='20'>
@@ -2792,9 +2794,9 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-20'/>
+          <parameter type-id='type-id-33'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='21'>
@@ -2803,7 +2805,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='22'>
@@ -2812,7 +2814,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='23'>
@@ -2821,7 +2823,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='24'>
@@ -2830,7 +2832,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='25'>
@@ -2839,7 +2841,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='26'>
@@ -2848,7 +2850,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='27'>
@@ -2857,7 +2859,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='28'>
@@ -2866,7 +2868,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='29'>
@@ -2875,7 +2877,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='30'>
@@ -2884,7 +2886,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='31'>
@@ -2893,7 +2895,7 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='32'>
@@ -2902,19 +2904,19 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='33'>
@@ -2923,19 +2925,19 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-10'/>
+          <parameter type-id='type-id-3'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='34'>
@@ -2944,15 +2946,15 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='35'>
@@ -2961,15 +2963,15 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='36'>
@@ -2978,15 +2980,15 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- parameter of type 'REAL*' -->
-          <parameter type-id='type-id-21'/>
+          <parameter type-id='type-id-34'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='37'>
@@ -2995,9 +2997,9 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='38'>
@@ -3006,187 +3008,187 @@ 
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
           <parameter type-id='type-id-145' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
-          <parameter type-id='type-id-1'/>
+          <parameter type-id='type-id-15'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct SurfaceMap -->
     <class-decl name='SurfaceMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-143'/>
     <!-- void (BasicSurfaceEvaluator::*) () -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-146'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-146'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-147'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-147'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (REAL, REAL, REAL*, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-148'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-148'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (REAL, REAL, REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-149'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-149'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (int, REAL, REAL*, int, REAL, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-150'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-150'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-3'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-3'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-151'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-151'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (long int, REAL*, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-152'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-152'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (long int, REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-153'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-153'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (long int, REAL, REAL, long int, REAL, REAL) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-154'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-154'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (long int, REAL, REAL, long int, long int, REAL, REAL, long int, long int, REAL*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-155'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-155'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'typedef REAL' -->
-      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-15'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'REAL*' -->
-      <parameter type-id='type-id-21'/>
+      <parameter type-id='type-id-34'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (long int, long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-156'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-156'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (BasicSurfaceEvaluator::*) (long int, long int, long int, long int, long int) -->
-    <function-type size-in-bits='64' method-class-id='type-id-67' id='type-id-157'>
+    <function-type size-in-bits='64' method-class-id='type-id-77' id='type-id-157'>
       <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
       <parameter type-id='type-id-145' is-artificial='yes'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- parameter of type 'long int' -->
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-33'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/interface/incurveeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
@@ -3199,7 +3201,7 @@ 
     <!-- char*[32] -->
     <array-type-def dimensions='1' type-id='type-id-159' size-in-bits='2048' id='type-id-160'>
       <!-- <anonymous range>[32] -->
-      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-3' id='type-id-161'/>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-17' id='type-id-161'/>
     </array-type-def>
     <!-- class Buffer -->
     <class-decl name='Buffer' size-in-bits='64' visibility='default' filepath='libnurbs/internals/bufpool.h' line='45' column='1' id='type-id-162'>
@@ -3209,11 +3211,11 @@ 
       </data-member>
     </class-decl>
     <!-- class Pool -->
-    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-108'>
+    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-117'>
       <member-type access='protected'>
         <!-- enum Pool::Magic -->
         <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-164'>
-          <underlying-type type-id='type-id-38'/>
+          <underlying-type type-id='type-id-50'/>
           <enumerator name='is_allocated' value='62369'/>
           <enumerator name='is_free' value='61858'/>
         </enum-decl>
@@ -3228,7 +3230,7 @@ 
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2112'>
         <!-- int Pool::nextblock -->
-        <var-decl name='nextblock' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
+        <var-decl name='nextblock' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2176'>
         <!-- char* Pool::curblock -->
@@ -3236,19 +3238,19 @@ 
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2240'>
         <!-- int Pool::buffersize -->
-        <var-decl name='buffersize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
+        <var-decl name='buffersize' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2272'>
         <!-- int Pool::nextsize -->
-        <var-decl name='nextsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
+        <var-decl name='nextsize' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2304'>
         <!-- int Pool::nextfree -->
-        <var-decl name='nextfree' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
+        <var-decl name='nextfree' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2336'>
         <!-- int Pool::initsize -->
-        <var-decl name='initsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
+        <var-decl name='initsize' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2368'>
         <!-- const char* Pool::name -->
@@ -3271,16 +3273,16 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int PwlArc::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='47' column='1'/>
+        <var-decl name='npts' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='47' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- long int PwlArc::type -->
-        <var-decl name='type' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='48' column='1'/>
+        <var-decl name='type' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='48' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum arc_side -->
     <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-169'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-50'/>
       <enumerator name='arc_none' value='0'/>
       <enumerator name='arc_right' value='1'/>
       <enumerator name='arc_top' value='2'/>
@@ -3293,15 +3295,15 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-166'/>
       <data-member access='public' static='yes'>
         <!-- static const int Arc::bezier_tag -->
-        <var-decl name='bezier_tag' type-id='type-id-31' mangled-name='_ZN3Arc10bezier_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='58' column='1'/>
+        <var-decl name='bezier_tag' type-id='type-id-43' mangled-name='_ZN3Arc10bezier_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const int Arc::arc_tag -->
-        <var-decl name='arc_tag' type-id='type-id-31' mangled-name='_ZN3Arc7arc_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='59' column='1'/>
+        <var-decl name='arc_tag' type-id='type-id-43' mangled-name='_ZN3Arc7arc_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const int Arc::tail_tag -->
-        <var-decl name='tail_tag' type-id='type-id-31' mangled-name='_ZN3Arc8tail_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='60' column='1'/>
+        <var-decl name='tail_tag' type-id='type-id-43' mangled-name='_ZN3Arc8tail_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- Arc_ptr Arc::prev -->
@@ -3325,28 +3327,28 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- long int Arc::type -->
-        <var-decl name='type' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
+        <var-decl name='type' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- long int Arc::nuid -->
-        <var-decl name='nuid' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
+        <var-decl name='nuid' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct TrimVertex -->
     <class-decl name='TrimVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='43' column='1' id='type-id-174'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL TrimVertex::param[2] -->
-        <var-decl name='param' type-id='type-id-123' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
+        <var-decl name='param' type-id='type-id-132' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int TrimVertex::nuid -->
-        <var-decl name='nuid' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
+        <var-decl name='nuid' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef Arc* Arc_ptr -->
     <typedef-decl name='Arc_ptr' type-id='type-id-175' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-171'/>
     <!-- typedef unsigned long int size_t -->
-    <typedef-decl name='size_t' type-id='type-id-3' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-176'/>
+    <typedef-decl name='size_t' type-id='type-id-17' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-176'/>
     <!-- Arc* -->
     <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-175'/>
     <!-- Arc* const -->
@@ -3358,9 +3360,9 @@ 
     <!-- Buffer* -->
     <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-163'/>
     <!-- Pool& -->
-    <reference-type-def kind='lvalue' type-id='type-id-108' size-in-bits='64' id='type-id-180'/>
+    <reference-type-def kind='lvalue' type-id='type-id-117' size-in-bits='64' id='type-id-180'/>
     <!-- Pool* -->
-    <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-181'/>
+    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-181'/>
     <!-- PooledObj* -->
     <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-182'/>
     <!-- PwlArc* -->
@@ -3379,19 +3381,19 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-166'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL* BezierArc::cpts -->
-        <var-decl name='cpts' type-id='type-id-21' visibility='default' filepath='libnurbs/internals/bezierarc.h' line='44' column='1'/>
+        <var-decl name='cpts' type-id='type-id-34' visibility='default' filepath='libnurbs/internals/bezierarc.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int BezierArc::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bezierarc.h' line='45' column='1'/>
+        <var-decl name='order' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/bezierarc.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- int BezierArc::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/bezierarc.h' line='46' column='1'/>
+        <var-decl name='stride' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/bezierarc.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int BezierArc::type -->
-        <var-decl name='type' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/bezierarc.h' line='47' column='1'/>
+        <var-decl name='type' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/bezierarc.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- Mapdesc* BezierArc::mapdesc -->
@@ -3401,23 +3403,23 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- REAL[4] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-185'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-185'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-101'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-17' id='type-id-110'/>
     </array-type-def>
     <!-- REAL[][24][24] -->
-    <array-type-def dimensions='3' type-id='type-id-1' size-in-bits='unknown' id='type-id-186'>
+    <array-type-def dimensions='3' type-id='type-id-15' size-in-bits='unknown' id='type-id-186'>
       <!-- <anonymous range>[] -->
       <subrange length='unknown' lower-bound='0' upper-bound='0' id='type-id-187'/>
       <!-- <anonymous range>[24] -->
-      <subrange length='24' lower-bound='0' upper-bound='23' type-id='type-id-3' id='type-id-188'/>
+      <subrange length='24' lower-bound='0' upper-bound='23' type-id='type-id-17' id='type-id-188'/>
       <!-- <anonymous range>[24] -->
-      <subrange length='24' lower-bound='0' upper-bound='23' type-id='type-id-3' id='type-id-188'/>
+      <subrange length='24' lower-bound='0' upper-bound='23' type-id='type-id-17' id='type-id-188'/>
     </array-type-def>
     <!-- __jmp_buf_tag[1] -->
     <array-type-def dimensions='1' type-id='type-id-189' size-in-bits='1600' id='type-id-190'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-3' id='type-id-191'/>
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-17' id='type-id-191'/>
     </array-type-def>
     <!-- class ArcSdirSorter -->
     <class-decl name='ArcSdirSorter' size-in-bits='192' visibility='default' filepath='libnurbs/internals/arcsorter.h' line='57' column='1' id='type-id-192'>
@@ -3433,7 +3435,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3455,7 +3457,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
@@ -3468,7 +3470,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
@@ -3483,7 +3485,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3501,7 +3503,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3535,19 +3537,19 @@ 
     <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-203'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL* Flist::pts -->
-        <var-decl name='pts' type-id='type-id-21' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
+        <var-decl name='pts' type-id='type-id-34' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int Flist::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
+        <var-decl name='npts' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- int Flist::start -->
-        <var-decl name='start' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
+        <var-decl name='start' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Flist::end -->
-        <var-decl name='end' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
+        <var-decl name='end' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='192'>
         <!-- FlistSorter Flist::sorter -->
@@ -3555,11 +3557,11 @@ 
       </data-member>
     </class-decl>
     <!-- class Subdivider -->
-    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-106'>
+    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-115'>
       <member-type access='private'>
         <!-- enum Subdivider::dir -->
         <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-205'>
-          <underlying-type type-id='type-id-38'/>
+          <underlying-type type-id='type-id-50'/>
           <enumerator name='down' value='0'/>
           <enumerator name='same' value='1'/>
           <enumerator name='up' value='2'/>
@@ -3576,23 +3578,23 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='8192'>
         <!-- Pool Subdivider::arcpool -->
-        <var-decl name='arcpool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
+        <var-decl name='arcpool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='10688'>
         <!-- Pool Subdivider::bezierarcpool -->
-        <var-decl name='bezierarcpool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
+        <var-decl name='bezierarcpool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='13184'>
         <!-- Pool Subdivider::pwlarcpool -->
-        <var-decl name='pwlarcpool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
+        <var-decl name='pwlarcpool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='15680'>
         <!-- TrimVertexPool Subdivider::trimvertexpool -->
-        <var-decl name='trimvertexpool' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
+        <var-decl name='trimvertexpool' type-id='type-id-118' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18304'>
         <!-- JumpBuffer* Subdivider::jumpbuffer -->
-        <var-decl name='jumpbuffer' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
+        <var-decl name='jumpbuffer' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18368'>
         <!-- Renderhints& Subdivider::renderhints -->
@@ -3612,11 +3614,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='18688'>
         <!-- int Subdivider::s_index -->
-        <var-decl name='s_index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
+        <var-decl name='s_index' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18720'>
         <!-- int Subdivider::t_index -->
-        <var-decl name='t_index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
+        <var-decl name='t_index' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18752'>
         <!-- Quilt* Subdivider::qlist -->
@@ -3644,23 +3646,23 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='20224'>
         <!-- int Subdivider::showDegenerate -->
-        <var-decl name='showDegenerate' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
+        <var-decl name='showDegenerate' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20256'>
         <!-- int Subdivider::isArcTypeBezier -->
-        <var-decl name='isArcTypeBezier' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
+        <var-decl name='isArcTypeBezier' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20288'>
         <!-- REAL Subdivider::domain_distance_u_rate -->
-        <var-decl name='domain_distance_u_rate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/subdivider.h' line='188' column='1'/>
+        <var-decl name='domain_distance_u_rate' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/subdivider.h' line='188' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20320'>
         <!-- REAL Subdivider::domain_distance_v_rate -->
-        <var-decl name='domain_distance_v_rate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/subdivider.h' line='189' column='1'/>
+        <var-decl name='domain_distance_v_rate' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/subdivider.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20352'>
         <!-- int Subdivider::is_domain_distance_sampling -->
-        <var-decl name='is_domain_distance_sampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
+        <var-decl name='is_domain_distance_sampling' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct JumpBuffer -->
@@ -3671,10 +3673,10 @@ 
       </data-member>
     </class-decl>
     <!-- struct TrimVertexPool -->
-    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-109'>
+    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-118'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Pool TrimVertexPool::pool -->
-        <var-decl name='pool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
+        <var-decl name='pool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <!-- TrimVertex** TrimVertexPool::vlist -->
@@ -3682,11 +3684,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <!-- int TrimVertexPool::nextvlistslot -->
-        <var-decl name='nextvlistslot' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
+        <var-decl name='nextvlistslot' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2592'>
         <!-- int TrimVertexPool::vlistsize -->
-        <var-decl name='vlistsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
+        <var-decl name='vlistsize' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct __jmp_buf_tag -->
@@ -3697,7 +3699,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int __jmp_buf_tag::__mask_was_saved -->
-        <var-decl name='__mask_was_saved' type-id='type-id-10' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
+        <var-decl name='__mask_was_saved' type-id='type-id-3' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- __sigset_t __jmp_buf_tag::__saved_mask -->
@@ -3723,7 +3725,7 @@ 
     <!-- ArcTessellator* -->
     <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-219'/>
     <!-- Backend& -->
-    <reference-type-def kind='lvalue' type-id='type-id-105' size-in-bits='64' id='type-id-208'/>
+    <reference-type-def kind='lvalue' type-id='type-id-114' size-in-bits='64' id='type-id-208'/>
     <!-- Bin& -->
     <reference-type-def kind='lvalue' type-id='type-id-202' size-in-bits='64' id='type-id-220'/>
     <!-- Bin* -->
@@ -3733,7 +3735,7 @@ 
     <!-- Flist* -->
     <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-224'/>
     <!-- JumpBuffer* -->
-    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-116'/>
     <!-- Patchlist& -->
     <reference-type-def kind='lvalue' type-id='type-id-225' size-in-bits='64' id='type-id-226'/>
     <!-- Sorter* -->
@@ -3741,17 +3743,17 @@ 
     <!-- Sorter* const -->
     <qualified-type-def type-id='type-id-227' const='yes' id='type-id-228'/>
     <!-- Subdivider& -->
-    <reference-type-def kind='lvalue' type-id='type-id-106' size-in-bits='64' id='type-id-196'/>
+    <reference-type-def kind='lvalue' type-id='type-id-115' size-in-bits='64' id='type-id-196'/>
     <!-- Subdivider* -->
-    <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-229'/>
+    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-229'/>
     <!-- TrimVertex** -->
     <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-212'/>
     <!-- TrimVertexPool& -->
-    <reference-type-def kind='lvalue' type-id='type-id-109' size-in-bits='64' id='type-id-201'/>
+    <reference-type-def kind='lvalue' type-id='type-id-118' size-in-bits='64' id='type-id-201'/>
     <!-- TrimVertexPool* -->
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-230'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-230'/>
     <!-- const REAL -->
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-231'/>
+    <qualified-type-def type-id='type-id-15' const='yes' id='type-id-231'/>
     <!-- const REAL* -->
     <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-232'/>
     <!-- Quilt* -->
@@ -3767,9 +3769,9 @@ 
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-235' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -3782,7 +3784,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
@@ -3795,7 +3797,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
@@ -3810,7 +3812,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
@@ -3826,34 +3828,34 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='5312'>
         <!-- REAL Slicer::oneOverDu -->
-        <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='73' column='1'/>
+        <var-decl name='oneOverDu' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/slicer.h' line='73' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5344'>
         <!-- REAL Slicer::du -->
-        <var-decl name='du' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
+        <var-decl name='du' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5376'>
         <!-- REAL Slicer::dv -->
-        <var-decl name='dv' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
+        <var-decl name='dv' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5408'>
         <!-- int Slicer::isolines -->
-        <var-decl name='isolines' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
+        <var-decl name='isolines' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5440'>
         <!-- int Slicer::ulinear -->
-        <var-decl name='ulinear' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
+        <var-decl name='ulinear' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5472'>
         <!-- int Slicer::vlinear -->
-        <var-decl name='vlinear' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
+        <var-decl name='vlinear' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
       </data-member>
     </class-decl>
     <!-- class Sorter -->
     <class-decl name='Sorter' size-in-bits='128' visibility='default' filepath='libnurbs/internals/sorter.h' line='36' column='1' id='type-id-195'>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int Sorter::es -->
-        <var-decl name='es' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/sorter.h' line='49' column='1'/>
+        <var-decl name='es' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/sorter.h' line='49' column='1'/>
       </data-member>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <!-- Sorter::~Sorter(int) -->
@@ -3861,9 +3863,9 @@ 
           <!-- implicit parameter of type 'Sorter*' -->
           <parameter type-id='type-id-227' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-10' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
@@ -3876,7 +3878,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- int -->
-          <return type-id='type-id-10'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
@@ -3889,7 +3891,7 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
@@ -3904,12 +3906,12 @@ 
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-159'/>
           <!-- void -->
-          <return type-id='type-id-19'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- class Backend -->
-    <class-decl name='Backend' size-in-bits='640' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-105'>
+    <class-decl name='Backend' size-in-bits='640' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-114'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- BasicCurveEvaluator& Backend::curveEvaluator -->
         <var-decl name='curveEvaluator' type-id='type-id-238' visibility='default' filepath='libnurbs/internals/backend.h' line='48' column='1'/>
@@ -3920,15 +3922,15 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Backend::wireframetris -->
-        <var-decl name='wireframetris' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
+        <var-decl name='wireframetris' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Backend::wireframequads -->
-        <var-decl name='wireframequads' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
+        <var-decl name='wireframequads' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Backend::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
+        <var-decl name='npts' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- REAL Backend::mesh[3][4] -->
@@ -3936,7 +3938,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <!-- int Backend::meshindex -->
-        <var-decl name='meshindex' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
+        <var-decl name='meshindex' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
       </data-member>
     </class-decl>
     <!-- class Curvelist -->
@@ -3951,11 +3953,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Curvelist::needsSubdivision -->
-        <var-decl name='needsSubdivision' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curvelist.h' line='59' column='1'/>
+        <var-decl name='needsSubdivision' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/curvelist.h' line='59' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- float Curvelist::stepsize -->
-        <var-decl name='stepsize' type-id='type-id-23' visibility='default' filepath='libnurbs/internals/curvelist.h' line='60' column='1'/>
+        <var-decl name='stepsize' type-id='type-id-2' visibility='default' filepath='libnurbs/internals/curvelist.h' line='60' column='1'/>
       </data-member>
     </class-decl>
     <!-- class Patchlist -->
@@ -3966,11 +3968,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- int Patchlist::notInBbox -->
-        <var-decl name='notInBbox' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patchlist.h' line='64' column='1'/>
+        <var-decl name='notInBbox' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/patchlist.h' line='64' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- int Patchlist::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patchlist.h' line='65' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/patchlist.h' line='65' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- Pspec Patchlist::pspec[2] -->
@@ -3990,7 +3992,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- int (Sorter::*) (char*, char*) -->
     <function-type size-in-bits='64' method-class-id='type-id-195' id='type-id-246'>
@@ -4001,7 +4003,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- void (FlistSorter::*) (char*, char*) -->
     <function-type size-in-bits='64' method-class-id='type-id-204' id='type-id-247'>
@@ -4012,7 +4014,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (FlistSorter::*) (char*, char*, char*) -->
     <function-type size-in-bits='64' method-class-id='type-id-204' id='type-id-248'>
@@ -4025,7 +4027,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (Sorter::*) (char*, char*) -->
     <function-type size-in-bits='64' method-class-id='type-id-195' id='type-id-249'>
@@ -4036,7 +4038,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (Sorter::*) (char*, char*, char*) -->
     <function-type size-in-bits='64' method-class-id='type-id-195' id='type-id-250'>
@@ -4049,7 +4051,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/arctess.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
@@ -4066,11 +4068,11 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- REAL[3][4] -->
-    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-240'>
+    <array-type-def dimensions='2' type-id='type-id-15' size-in-bits='384' id='type-id-240'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-125'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-17' id='type-id-134'/>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-101'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-17' id='type-id-110'/>
     </array-type-def>
     <!-- class GridTrimVertex -->
     <class-decl name='GridTrimVertex' size-in-bits='384' visibility='default' filepath='libnurbs/internals/gridtrimvertex.h' line='45' column='1' id='type-id-255'>
@@ -4097,28 +4099,28 @@ 
     <class-decl name='TrimVertex' size-in-bits='128' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='43' column='1' id='type-id-256'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL TrimVertex::param[2] -->
-        <var-decl name='param' type-id='type-id-123' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
+        <var-decl name='param' type-id='type-id-132' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- long int TrimVertex::nuid -->
-        <var-decl name='nuid' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
+        <var-decl name='nuid' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct GridVertex -->
     <class-decl name='GridVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='39' column='1' id='type-id-257'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int GridVertex::gparam[2] -->
-        <var-decl name='gparam' type-id='type-id-129' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
+        <var-decl name='gparam' type-id='type-id-138' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
       </data-member>
     </class-decl>
     <!-- Backend* -->
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-260'/>
+    <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-260'/>
     <!-- Backend* const -->
     <qualified-type-def type-id='type-id-260' const='yes' id='type-id-261'/>
     <!-- BasicCurveEvaluator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-8' size-in-bits='64' id='type-id-238'/>
+    <reference-type-def kind='lvalue' type-id='type-id-22' size-in-bits='64' id='type-id-238'/>
     <!-- BasicSurfaceEvaluator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-67' size-in-bits='64' id='type-id-239'/>
+    <reference-type-def kind='lvalue' type-id='type-id-77' size-in-bits='64' id='type-id-239'/>
     <!-- GridTrimVertex* -->
     <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-262'/>
     <!-- GridTrimVertex* const -->
@@ -4130,13 +4132,13 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/basiccrveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- BasicCurveEvaluator* -->
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-39'/>
+    <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-51'/>
     <!-- BasicCurveEvaluator* const -->
-    <qualified-type-def type-id='type-id-39' const='yes' id='type-id-264'/>
+    <qualified-type-def type-id='type-id-51' const='yes' id='type-id-264'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/basicsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- BasicSurfaceEvaluator* -->
-    <pointer-type-def type-id='type-id-67' size-in-bits='64' id='type-id-145'/>
+    <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-145'/>
     <!-- BasicSurfaceEvaluator* const -->
     <qualified-type-def type-id='type-id-145' const='yes' id='type-id-265'/>
   </abi-instr>
@@ -4169,7 +4171,7 @@ 
       </data-member>
       <data-member access='private' static='yes'>
         <!-- static const int CoveAndTiler::MAXSTRIPSIZE -->
-        <var-decl name='MAXSTRIPSIZE' type-id='type-id-31' mangled-name='_ZN12CoveAndTiler12MAXSTRIPSIZEE' visibility='default' filepath='libnurbs/internals/coveandtiler.cc' line='50' column='1'/>
+        <var-decl name='MAXSTRIPSIZE' type-id='type-id-43' mangled-name='_ZN12CoveAndTiler12MAXSTRIPSIZEE' visibility='default' filepath='libnurbs/internals/coveandtiler.cc' line='50' column='1'/>
       </data-member>
     </class-decl>
     <!-- class Jarcloc -->
@@ -4211,7 +4213,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <!-- REAL TrimRegion::oneOverDu -->
-        <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/trimregion.h' line='65' column='1'/>
+        <var-decl name='oneOverDu' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimregion.h' line='65' column='1'/>
       </data-member>
     </class-decl>
     <!-- class Trimline -->
@@ -4222,15 +4224,15 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- long int Trimline::numverts -->
-        <var-decl name='numverts' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/trimline.h' line='49' column='1'/>
+        <var-decl name='numverts' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/trimline.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- long int Trimline::i -->
-        <var-decl name='i' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/trimline.h' line='50' column='1'/>
+        <var-decl name='i' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/trimline.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- long int Trimline::size -->
-        <var-decl name='size' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
+        <var-decl name='size' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- Jarcloc Trimline::jarcl -->
@@ -4257,38 +4259,38 @@ 
     <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-275'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- long int Uarray::size -->
-        <var-decl name='size' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
+        <var-decl name='size' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- long int Uarray::ulines -->
-        <var-decl name='ulines' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/uarray.h' line='47' column='1'/>
+        <var-decl name='ulines' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/uarray.h' line='47' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- REAL* Uarray::uarray -->
-        <var-decl name='uarray' type-id='type-id-21' visibility='default' filepath='libnurbs/internals/uarray.h' line='52' column='1'/>
+        <var-decl name='uarray' type-id='type-id-34' visibility='default' filepath='libnurbs/internals/uarray.h' line='52' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct Gridline -->
     <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-274'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Gridline::v -->
-        <var-decl name='v' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
+        <var-decl name='v' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL Gridline::vval -->
-        <var-decl name='vval' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/gridline.h' line='41' column='1'/>
+        <var-decl name='vval' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int Gridline::vindex -->
-        <var-decl name='vindex' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
+        <var-decl name='vindex' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- long int Gridline::ustart -->
-        <var-decl name='ustart' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
+        <var-decl name='ustart' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- long int Gridline::uend -->
-        <var-decl name='uend' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
+        <var-decl name='uend' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
       </data-member>
     </class-decl>
     <!-- CoveAndTiler* -->
@@ -4320,24 +4322,24 @@ 
     <!-- Quiltspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-289' size-in-bits='640' id='type-id-290'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
     </array-type-def>
     <!-- REAL[120] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-291'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='3840' id='type-id-291'>
       <!-- <anonymous range>[120] -->
-      <subrange length='120' lower-bound='0' upper-bound='119' type-id='type-id-3' id='type-id-292'/>
+      <subrange length='120' lower-bound='0' upper-bound='119' type-id='type-id-17' id='type-id-292'/>
     </array-type-def>
     <!-- REAL[5] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-293'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='160' id='type-id-293'>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-3' id='type-id-294'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-17' id='type-id-294'/>
     </array-type-def>
     <!-- REAL[5][5] -->
-    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='800' id='type-id-295'>
+    <array-type-def dimensions='2' type-id='type-id-15' size-in-bits='800' id='type-id-295'>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-3' id='type-id-294'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-17' id='type-id-294'/>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-3' id='type-id-294'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-17' id='type-id-294'/>
     </array-type-def>
     <!-- class Curve -->
     <class-decl name='Curve' size-in-bits='8128' visibility='default' filepath='libnurbs/internals/curve.h' line='46' column='1' id='type-id-296'>
@@ -4351,19 +4353,19 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Curve::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
+        <var-decl name='stride' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Curve::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Curve::cullval -->
-        <var-decl name='cullval' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
+        <var-decl name='cullval' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- int Curve::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- REAL Curve::cpts[120] -->
@@ -4375,26 +4377,26 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='7936'>
         <!-- REAL Curve::stepsize -->
-        <var-decl name='stepsize' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/curve.h' line='60' column='1'/>
+        <var-decl name='stepsize' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/curve.h' line='60' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='7968'>
         <!-- REAL Curve::minstepsize -->
-        <var-decl name='minstepsize' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/curve.h' line='61' column='1'/>
+        <var-decl name='minstepsize' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/curve.h' line='61' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8000'>
         <!-- REAL Curve::range[3] -->
-        <var-decl name='range' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/curve.h' line='62' column='1'/>
+        <var-decl name='range' type-id='type-id-133' visibility='default' filepath='libnurbs/internals/curve.h' line='62' column='1'/>
       </data-member>
     </class-decl>
     <!-- float[4] -->
-    <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='128' id='type-id-299'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='128' id='type-id-299'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-3' id='type-id-101'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-17' id='type-id-110'/>
     </array-type-def>
     <!-- int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-300'>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='64' id='type-id-300'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
     </array-type-def>
     <!-- struct Mapdesc -->
     <class-decl name='Mapdesc' size-in-bits='3392' is-struct='yes' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='49' column='1' id='type-id-301'>
@@ -4402,35 +4404,35 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-166'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL Mapdesc::pixel_tolerance -->
-        <var-decl name='pixel_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='104' column='1'/>
+        <var-decl name='pixel_tolerance' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- REAL Mapdesc::error_tolerance -->
-        <var-decl name='error_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='105' column='1'/>
+        <var-decl name='error_tolerance' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL Mapdesc::object_space_error_tolerance -->
-        <var-decl name='object_space_error_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='106' column='1'/>
+        <var-decl name='object_space_error_tolerance' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- REAL Mapdesc::clampfactor -->
-        <var-decl name='clampfactor' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='107' column='1'/>
+        <var-decl name='clampfactor' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL Mapdesc::minsavings -->
-        <var-decl name='minsavings' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='108' column='1'/>
+        <var-decl name='minsavings' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- REAL Mapdesc::maxrate -->
-        <var-decl name='maxrate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='109' column='1'/>
+        <var-decl name='maxrate' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='109' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- REAL Mapdesc::maxsrate -->
-        <var-decl name='maxsrate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='110' column='1'/>
+        <var-decl name='maxsrate' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- REAL Mapdesc::maxtrate -->
-        <var-decl name='maxtrate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='111' column='1'/>
+        <var-decl name='maxtrate' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- REAL Mapdesc::bboxsize[5] -->
@@ -4438,27 +4440,27 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <!-- long int Mapdesc::type -->
-        <var-decl name='type' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
+        <var-decl name='type' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
         <!-- int Mapdesc::isrational -->
-        <var-decl name='isrational' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
+        <var-decl name='isrational' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='544'>
         <!-- int Mapdesc::ncoords -->
-        <var-decl name='ncoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
+        <var-decl name='ncoords' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- int Mapdesc::hcoords -->
-        <var-decl name='hcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
+        <var-decl name='hcoords' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <!-- int Mapdesc::inhcoords -->
-        <var-decl name='inhcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
+        <var-decl name='inhcoords' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- int Mapdesc::mask -->
-        <var-decl name='mask' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
+        <var-decl name='mask' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='672'>
         <!-- Maxmatrix Mapdesc::bmat -->
@@ -4474,23 +4476,23 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='3072'>
         <!-- REAL Mapdesc::s_steps -->
-        <var-decl name='s_steps' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='124' column='1'/>
+        <var-decl name='s_steps' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='124' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3104'>
         <!-- REAL Mapdesc::t_steps -->
-        <var-decl name='t_steps' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='125' column='1'/>
+        <var-decl name='t_steps' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3136'>
         <!-- REAL Mapdesc::sampling_method -->
-        <var-decl name='sampling_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='126' column='1'/>
+        <var-decl name='sampling_method' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='126' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3168'>
         <!-- REAL Mapdesc::culling_method -->
-        <var-decl name='culling_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='127' column='1'/>
+        <var-decl name='culling_method' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='127' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3200'>
         <!-- REAL Mapdesc::bbox_subdividing -->
-        <var-decl name='bbox_subdividing' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='128' column='1'/>
+        <var-decl name='bbox_subdividing' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3264'>
         <!-- Mapdesc* Mapdesc::next -->
@@ -4511,7 +4513,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL* Quilt::cpts -->
-        <var-decl name='cpts' type-id='type-id-21' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
+        <var-decl name='cpts' type-id='type-id-34' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- Quiltspec Quilt::qspec[2] -->
@@ -4530,23 +4532,23 @@ 
     <class-decl name='Quiltspec' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='51' column='1' id='type-id-289'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int Quiltspec::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
+        <var-decl name='stride' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int Quiltspec::width -->
-        <var-decl name='width' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
+        <var-decl name='width' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Quiltspec::offset -->
-        <var-decl name='offset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
+        <var-decl name='offset' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- int Quiltspec::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int Quiltspec::index -->
-        <var-decl name='index' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
+        <var-decl name='index' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Quiltspec::bdry[2] -->
@@ -4554,7 +4556,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- REAL Quiltspec::step_size -->
-        <var-decl name='step_size' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/quilt.h' line='58' column='1'/>
+        <var-decl name='step_size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/quilt.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- Knot* Quiltspec::breakpoints -->
@@ -4562,7 +4564,7 @@ 
       </data-member>
     </class-decl>
     <!-- typedef REAL Knot -->
-    <typedef-decl name='Knot' type-id='type-id-1' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-307'/>
+    <typedef-decl name='Knot' type-id='type-id-15' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-307'/>
     <!-- typedef REAL[5][5] Maxmatrix -->
     <typedef-decl name='Maxmatrix' type-id='type-id-295' filepath='libnurbs/internals/mapdesc.h' line='45' column='1' id='type-id-302'/>
     <!-- typedef Quilt* Quilt_ptr -->
@@ -4598,15 +4600,15 @@ 
     <class-decl name='Knotvector' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/knotvector.h' line='41' column='1' id='type-id-312'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Knotvector::order -->
-        <var-decl name='order' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/knotvector.h' line='48' column='1'/>
+        <var-decl name='order' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/knotvector.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int Knotvector::knotcount -->
-        <var-decl name='knotcount' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/knotvector.h' line='49' column='1'/>
+        <var-decl name='knotcount' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/knotvector.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int Knotvector::stride -->
-        <var-decl name='stride' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/knotvector.h' line='50' column='1'/>
+        <var-decl name='stride' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/knotvector.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- Knot* Knotvector::knotlist -->
@@ -4625,7 +4627,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- REAL* Quilt::cpts -->
-        <var-decl name='cpts' type-id='type-id-21' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
+        <var-decl name='cpts' type-id='type-id-34' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- Quiltspec Quilt::qspec[2] -->
@@ -4641,9 +4643,9 @@ 
       </data-member>
     </class-decl>
     <!-- float[3] -->
-    <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='96' id='type-id-242'>
+    <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='96' id='type-id-242'>
       <!-- <anonymous range>[3] -->
-      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-125'/>
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-17' id='type-id-134'/>
     </array-type-def>
     <!-- struct Curve -->
     <class-decl name='Curve' size-in-bits='8128' is-struct='yes' visibility='default' filepath='libnurbs/internals/curve.h' line='46' column='1' id='type-id-322'>
@@ -4657,19 +4659,19 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Curve::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
+        <var-decl name='stride' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Curve::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/curve.h' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Curve::cullval -->
-        <var-decl name='cullval' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
+        <var-decl name='cullval' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/curve.h' line='56' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- int Curve::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/curve.h' line='57' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- REAL Curve::cpts[120] -->
@@ -4681,15 +4683,15 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='7936'>
         <!-- REAL Curve::stepsize -->
-        <var-decl name='stepsize' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/curve.h' line='60' column='1'/>
+        <var-decl name='stepsize' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/curve.h' line='60' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='7968'>
         <!-- REAL Curve::minstepsize -->
-        <var-decl name='minstepsize' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/curve.h' line='61' column='1'/>
+        <var-decl name='minstepsize' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/curve.h' line='61' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8000'>
         <!-- REAL Curve::range[3] -->
-        <var-decl name='range' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/curve.h' line='62' column='1'/>
+        <var-decl name='range' type-id='type-id-133' visibility='default' filepath='libnurbs/internals/curve.h' line='62' column='1'/>
       </data-member>
     </class-decl>
     <!-- Curve* -->
@@ -4709,42 +4711,42 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/curvesub.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- struct Renderhints -->
-    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-103'>
+    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-112'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL Renderhints::display_method -->
-        <var-decl name='display_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='49' column='1'/>
+        <var-decl name='display_method' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/renderhints.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- REAL Renderhints::errorchecking -->
-        <var-decl name='errorchecking' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='50' column='1'/>
+        <var-decl name='errorchecking' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/renderhints.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL Renderhints::subdivisions -->
-        <var-decl name='subdivisions' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='51' column='1'/>
+        <var-decl name='subdivisions' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/renderhints.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- REAL Renderhints::tmp1 -->
-        <var-decl name='tmp1' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='52' column='1'/>
+        <var-decl name='tmp1' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/renderhints.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int Renderhints::displaydomain -->
-        <var-decl name='displaydomain' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
+        <var-decl name='displaydomain' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Renderhints::maxsubdivisions -->
-        <var-decl name='maxsubdivisions' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
+        <var-decl name='maxsubdivisions' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int Renderhints::wiretris -->
-        <var-decl name='wiretris' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
+        <var-decl name='wiretris' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int Renderhints::wirequads -->
-        <var-decl name='wirequads' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
+        <var-decl name='wirequads' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
       </data-member>
     </class-decl>
     <!-- Renderhints* -->
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-327'/>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-327'/>
     <!-- Curve* -->
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-329'/>
     <!-- Mapdesc* -->
@@ -4765,7 +4767,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Pool DisplayList::dlnodePool -->
-        <var-decl name='dlnodePool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
+        <var-decl name='dlnodePool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <!-- Dlnode** DisplayList::lastNode -->
@@ -4773,7 +4775,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='2624'>
         <!-- NurbsTessellator* DisplayList::nt -->
-        <var-decl name='nt' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
+        <var-decl name='nt' type-id='type-id-128' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct Dlnode -->
@@ -4786,7 +4788,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void* Dlnode::arg -->
-        <var-decl name='arg' type-id='type-id-17' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
+        <var-decl name='arg' type-id='type-id-30' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- PFVS Dlnode::cleanup -->
@@ -4805,15 +4807,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int PFVS::__delta -->
-        <var-decl name='__delta' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
+        <var-decl name='__delta' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef PFVS PFVS -->
     <typedef-decl name='PFVS' type-id='type-id-337' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-336'/>
     <!-- DisplayList* -->
-    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-127'/>
     <!-- DisplayList* const -->
-    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-339'/>
+    <qualified-type-def type-id='type-id-127' const='yes' id='type-id-339'/>
     <!-- Dlnode* -->
     <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-333'/>
     <!-- Dlnode* const -->
@@ -4821,17 +4823,17 @@ 
     <!-- Dlnode** -->
     <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-334'/>
     <!-- NurbsTessellator* -->
-    <pointer-type-def type-id='type-id-64' size-in-bits='64' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-128'/>
     <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-338'/>
     <!-- void (NurbsTessellator::*) (void*) -->
-    <function-type size-in-bits='64' method-class-id='type-id-64' id='type-id-341'>
+    <function-type size-in-bits='64' method-class-id='type-id-74' id='type-id-341'>
       <!-- implicit parameter of type 'NurbsTessellator*' -->
-      <parameter type-id='type-id-119' is-artificial='yes'/>
+      <parameter type-id='type-id-128' is-artificial='yes'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-30'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
@@ -4866,7 +4868,7 @@ 
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- long int Hull::Side::index -->
-            <var-decl name='index' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
+            <var-decl name='index' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -4915,35 +4917,35 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-166'/>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL Mapdesc::pixel_tolerance -->
-        <var-decl name='pixel_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='104' column='1'/>
+        <var-decl name='pixel_tolerance' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='104' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='32'>
         <!-- REAL Mapdesc::error_tolerance -->
-        <var-decl name='error_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='105' column='1'/>
+        <var-decl name='error_tolerance' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- REAL Mapdesc::object_space_error_tolerance -->
-        <var-decl name='object_space_error_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='106' column='1'/>
+        <var-decl name='object_space_error_tolerance' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- REAL Mapdesc::clampfactor -->
-        <var-decl name='clampfactor' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='107' column='1'/>
+        <var-decl name='clampfactor' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- REAL Mapdesc::minsavings -->
-        <var-decl name='minsavings' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='108' column='1'/>
+        <var-decl name='minsavings' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- REAL Mapdesc::maxrate -->
-        <var-decl name='maxrate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='109' column='1'/>
+        <var-decl name='maxrate' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='109' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- REAL Mapdesc::maxsrate -->
-        <var-decl name='maxsrate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='110' column='1'/>
+        <var-decl name='maxsrate' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='110' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- REAL Mapdesc::maxtrate -->
-        <var-decl name='maxtrate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='111' column='1'/>
+        <var-decl name='maxtrate' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='111' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- REAL Mapdesc::bboxsize[5] -->
@@ -4951,27 +4953,27 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <!-- long int Mapdesc::type -->
-        <var-decl name='type' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
+        <var-decl name='type' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
         <!-- int Mapdesc::isrational -->
-        <var-decl name='isrational' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
+        <var-decl name='isrational' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='116' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='544'>
         <!-- int Mapdesc::ncoords -->
-        <var-decl name='ncoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
+        <var-decl name='ncoords' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='117' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- int Mapdesc::hcoords -->
-        <var-decl name='hcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
+        <var-decl name='hcoords' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='118' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <!-- int Mapdesc::inhcoords -->
-        <var-decl name='inhcoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
+        <var-decl name='inhcoords' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- int Mapdesc::mask -->
-        <var-decl name='mask' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
+        <var-decl name='mask' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='672'>
         <!-- Maxmatrix Mapdesc::bmat -->
@@ -4987,23 +4989,23 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='3072'>
         <!-- REAL Mapdesc::s_steps -->
-        <var-decl name='s_steps' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='124' column='1'/>
+        <var-decl name='s_steps' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='124' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3104'>
         <!-- REAL Mapdesc::t_steps -->
-        <var-decl name='t_steps' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='125' column='1'/>
+        <var-decl name='t_steps' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3136'>
         <!-- REAL Mapdesc::sampling_method -->
-        <var-decl name='sampling_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='126' column='1'/>
+        <var-decl name='sampling_method' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='126' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3168'>
         <!-- REAL Mapdesc::culling_method -->
-        <var-decl name='culling_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='127' column='1'/>
+        <var-decl name='culling_method' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='127' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3200'>
         <!-- REAL Mapdesc::bbox_subdividing -->
-        <var-decl name='bbox_subdividing' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='128' column='1'/>
+        <var-decl name='bbox_subdividing' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3264'>
         <!-- Mapdesc* Mapdesc::next -->
@@ -5023,10 +5025,10 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/maplist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class Maplist -->
-    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-104'>
+    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-113'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Pool Maplist::mapdescPool -->
-        <var-decl name='mapdescPool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
+        <var-decl name='mapdescPool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <!-- Mapdesc* Maplist::maps -->
@@ -5044,7 +5046,7 @@ 
     <!-- Mapdesc** -->
     <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-357'/>
     <!-- Maplist* -->
-    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-358'/>
     <!-- Maplist* const -->
     <qualified-type-def type-id='type-id-358' const='yes' id='type-id-359'/>
     <!-- PooledObj* const -->
@@ -5054,7 +5056,7 @@ 
     <!-- GridTrimVertex*[2] -->
     <array-type-def dimensions='1' type-id='type-id-262' size-in-bits='128' id='type-id-361'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
     </array-type-def>
     <!-- class Mesher -->
     <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-237'>
@@ -5072,7 +5074,7 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='2304'>
         <!-- Pool Mesher::p -->
-        <var-decl name='p' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
+        <var-decl name='p' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='4800'>
         <!-- unsigned int Mesher::stacksize -->
@@ -5088,11 +5090,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='5056'>
         <!-- int Mesher::itop -->
-        <var-decl name='itop' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
+        <var-decl name='itop' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5088'>
         <!-- int Mesher::lastedge -->
-        <var-decl name='lastedge' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
+        <var-decl name='lastedge' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
       </data-member>
     </class-decl>
     <!-- GridTrimVertex** -->
@@ -5102,13 +5104,13 @@ 
     <!-- Mesher* const -->
     <qualified-type-def type-id='type-id-365' const='yes' id='type-id-366'/>
     <!-- const float -->
-    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-362'/>
+    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-362'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Real[2] -->
     <array-type-def dimensions='1' type-id='type-id-367' size-in-bits='64' id='type-id-368'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
     </array-type-def>
     <!-- class primStream -->
     <class-decl name='primStream' size-in-bits='384' visibility='default' filepath='libnurbs/nurbtess/primitiveStream.h' line='44' column='1' id='type-id-369'>
@@ -5180,9 +5182,9 @@ 
       </data-member>
     </class-decl>
     <!-- typedef int Int -->
-    <typedef-decl name='Int' type-id='type-id-10' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-372'/>
+    <typedef-decl name='Int' type-id='type-id-3' filepath='libnurbs/nurbtess/definitions.h' line='37' column='1' id='type-id-372'/>
     <!-- typedef float Real -->
-    <typedef-decl name='Real' type-id='type-id-23' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-367'/>
+    <typedef-decl name='Real' type-id='type-id-2' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-367'/>
     <!-- typedef Real[2] Real2 -->
     <typedef-decl name='Real2' type-id='type-id-368' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-377'/>
     <!-- Int* -->
@@ -5217,7 +5219,7 @@ 
   <abi-instr address-size='64' path='libnurbs/internals/nurbsinterfac.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- enum Curvetype -->
     <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-387'>
-      <underlying-type type-id='type-id-38'/>
+      <underlying-type type-id='type-id-50'/>
       <enumerator name='ct_nurbscurve' value='0'/>
       <enumerator name='ct_pwlcurve' value='1'/>
       <enumerator name='ct_none' value='2'/>
@@ -5249,23 +5251,23 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_curve* O_curve::next -->
-        <var-decl name='next' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
+        <var-decl name='next' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- O_surface* O_curve::owner -->
-        <var-decl name='owner' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
+        <var-decl name='owner' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_curve::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
+        <var-decl name='used' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int O_curve::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='64' column='1'/>
+        <var-decl name='save' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- long int O_curve::nuid -->
-        <var-decl name='nuid' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/reader.h' line='65' column='1'/>
+        <var-decl name='nuid' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/reader.h' line='65' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct O_nurbscurve -->
@@ -5278,15 +5280,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbscurve::type -->
-        <var-decl name='type' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
+        <var-decl name='type' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL O_nurbscurve::tesselation -->
-        <var-decl name='tesselation' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/reader.h' line='73' column='1'/>
+        <var-decl name='tesselation' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int O_nurbscurve::method -->
-        <var-decl name='method' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='74' column='1'/>
+        <var-decl name='method' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- O_nurbscurve* O_nurbscurve::next -->
@@ -5294,15 +5296,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_nurbscurve::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='76' column='1'/>
+        <var-decl name='used' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int O_nurbscurve::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
+        <var-decl name='save' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- O_curve* O_nurbscurve::owner -->
-        <var-decl name='owner' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
+        <var-decl name='owner' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct O_nurbssurface -->
@@ -5315,11 +5317,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbssurface::type -->
-        <var-decl name='type' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
+        <var-decl name='type' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_surface* O_nurbssurface::owner -->
-        <var-decl name='owner' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
+        <var-decl name='owner' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- O_nurbssurface* O_nurbssurface::next -->
@@ -5327,11 +5329,11 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_nurbssurface::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='106' column='1'/>
+        <var-decl name='save' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int O_nurbssurface::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='107' column='1'/>
+        <var-decl name='used' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='107' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct O_pwlcurve -->
@@ -5344,7 +5346,7 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int O_pwlcurve::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='86' column='1'/>
+        <var-decl name='npts' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_pwlcurve* O_pwlcurve::next -->
@@ -5352,15 +5354,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int O_pwlcurve::used -->
-        <var-decl name='used' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='88' column='1'/>
+        <var-decl name='used' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int O_pwlcurve::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
+        <var-decl name='save' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- O_curve* O_pwlcurve::owner -->
-        <var-decl name='owner' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
+        <var-decl name='owner' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct O_surface -->
@@ -5373,15 +5375,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- O_trim* O_surface::o_trim -->
-        <var-decl name='o_trim' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
+        <var-decl name='o_trim' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_surface::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
+        <var-decl name='save' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- long int O_surface::nuid -->
-        <var-decl name='nuid' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/reader.h' line='116' column='1'/>
+        <var-decl name='nuid' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/reader.h' line='116' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct O_trim -->
@@ -5390,15 +5392,15 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-166'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- O_curve* O_trim::o_curve -->
-        <var-decl name='o_curve' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
+        <var-decl name='o_curve' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- O_trim* O_trim::next -->
-        <var-decl name='next' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
+        <var-decl name='next' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_trim::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
+        <var-decl name='save' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct Property -->
@@ -5407,55 +5409,55 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-166'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Property::type -->
-        <var-decl name='type' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
+        <var-decl name='type' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int Property::tag -->
-        <var-decl name='tag' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/reader.h' line='122' column='1'/>
+        <var-decl name='tag' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/reader.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL Property::value -->
-        <var-decl name='value' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/reader.h' line='123' column='1'/>
+        <var-decl name='value' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Property::save -->
-        <var-decl name='save' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/reader.h' line='124' column='1'/>
+        <var-decl name='save' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/reader.h' line='124' column='1'/>
       </data-member>
     </class-decl>
     <!-- NurbsTessellator* const -->
-    <qualified-type-def type-id='type-id-119' const='yes' id='type-id-399'/>
+    <qualified-type-def type-id='type-id-128' const='yes' id='type-id-399'/>
     <!-- O_curve* -->
-    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-126'/>
     <!-- O_curve* const -->
-    <qualified-type-def type-id='type-id-117' const='yes' id='type-id-400'/>
+    <qualified-type-def type-id='type-id-126' const='yes' id='type-id-400'/>
     <!-- O_curve** -->
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-120'/>
     <!-- O_nurbscurve* -->
     <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-390'/>
     <!-- O_nurbscurve* const -->
     <qualified-type-def type-id='type-id-390' const='yes' id='type-id-401'/>
     <!-- O_nurbscurve** -->
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-121'/>
     <!-- O_nurbssurface* -->
     <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-394'/>
     <!-- O_nurbssurface* const -->
     <qualified-type-def type-id='type-id-394' const='yes' id='type-id-402'/>
     <!-- O_nurbssurface** -->
-    <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-123'/>
     <!-- O_pwlcurve* -->
     <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-391'/>
     <!-- O_pwlcurve** -->
-    <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-122'/>
     <!-- O_surface* -->
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-115'/>
+    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-124'/>
     <!-- O_surface* const -->
-    <qualified-type-def type-id='type-id-115' const='yes' id='type-id-403'/>
+    <qualified-type-def type-id='type-id-124' const='yes' id='type-id-403'/>
     <!-- O_trim* -->
-    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-125'/>
     <!-- O_trim* const -->
-    <qualified-type-def type-id='type-id-116' const='yes' id='type-id-404'/>
+    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-404'/>
     <!-- O_trim** -->
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-119'/>
     <!-- Property* -->
     <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-405'/>
     <!-- Property* const -->
@@ -5467,19 +5469,19 @@ 
     <!-- Patchspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-407' size-in-bits='640' id='type-id-408'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
     </array-type-def>
     <!-- REAL[2880] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='92160' id='type-id-409'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='92160' id='type-id-409'>
       <!-- <anonymous range>[2880] -->
-      <subrange length='2880' lower-bound='0' upper-bound='2879' type-id='type-id-3' id='type-id-410'/>
+      <subrange length='2880' lower-bound='0' upper-bound='2879' type-id='type-id-17' id='type-id-410'/>
     </array-type-def>
     <!-- REAL[2][5] -->
-    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='320' id='type-id-411'>
+    <array-type-def dimensions='2' type-id='type-id-15' size-in-bits='320' id='type-id-411'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
       <!-- <anonymous range>[5] -->
-      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-3' id='type-id-294'/>
+      <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-17' id='type-id-294'/>
     </array-type-def>
     <!-- class Patch -->
     <class-decl name='Patch' size-in-bits='277696' visibility='default' filepath='libnurbs/internals/patch.h' line='62' column='1' id='type-id-412'>
@@ -5493,15 +5495,15 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Patch::cullval -->
-        <var-decl name='cullval' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='84' column='1'/>
+        <var-decl name='cullval' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/patch.h' line='84' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Patch::notInBbox -->
-        <var-decl name='notInBbox' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='85' column='1'/>
+        <var-decl name='notInBbox' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/patch.h' line='85' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Patch::needsSampling -->
-        <var-decl name='needsSampling' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='86' column='1'/>
+        <var-decl name='needsSampling' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/patch.h' line='86' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- REAL Patch::cpts[2880] -->
@@ -5530,34 +5532,34 @@ 
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-413'/>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int Patchspec::order -->
-        <var-decl name='order' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/patch.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- int Patchspec::stride -->
-        <var-decl name='stride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='56' column='1'/>
+        <var-decl name='stride' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/patch.h' line='56' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct Pspec -->
     <class-decl name='Pspec' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/patch.h' line='46' column='1' id='type-id-413'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL Pspec::range[3] -->
-        <var-decl name='range' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/patch.h' line='47' column='1'/>
+        <var-decl name='range' type-id='type-id-133' visibility='default' filepath='libnurbs/internals/patch.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- REAL Pspec::sidestep[2] -->
-        <var-decl name='sidestep' type-id='type-id-123' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
+        <var-decl name='sidestep' type-id='type-id-132' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- REAL Pspec::stepsize -->
-        <var-decl name='stepsize' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/patch.h' line='49' column='1'/>
+        <var-decl name='stepsize' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/patch.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- REAL Pspec::minstepsize -->
-        <var-decl name='minstepsize' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/patch.h' line='50' column='1'/>
+        <var-decl name='minstepsize' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/patch.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- int Pspec::needsSubdivision -->
-        <var-decl name='needsSubdivision' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/patch.h' line='51' column='1'/>
+        <var-decl name='needsSubdivision' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/patch.h' line='51' column='1'/>
       </data-member>
     </class-decl>
     <!-- Patch& -->
@@ -5577,7 +5579,7 @@ 
     <!-- Pspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-413' size-in-bits='512' id='type-id-244'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-3' id='type-id-122'/>
+      <subrange length='2' lower-bound='0' upper-bound='1' type-id='type-id-17' id='type-id-131'/>
     </array-type-def>
     <!-- Patchlist* -->
     <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-419'/>
@@ -5595,19 +5597,19 @@ 
     <class-decl name='Flist' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-424'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL* Flist::pts -->
-        <var-decl name='pts' type-id='type-id-21' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
+        <var-decl name='pts' type-id='type-id-34' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Flist::npts -->
-        <var-decl name='npts' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
+        <var-decl name='npts' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- int Flist::start -->
-        <var-decl name='start' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
+        <var-decl name='start' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int Flist::end -->
-        <var-decl name='end' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
+        <var-decl name='end' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='192'>
         <!-- FlistSorter Flist::sorter -->
@@ -5628,35 +5630,35 @@ 
     <class-decl name='Renderhints' size-in-bits='256' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-428'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL Renderhints::display_method -->
-        <var-decl name='display_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='49' column='1'/>
+        <var-decl name='display_method' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/renderhints.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='32'>
         <!-- REAL Renderhints::errorchecking -->
-        <var-decl name='errorchecking' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='50' column='1'/>
+        <var-decl name='errorchecking' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/renderhints.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- REAL Renderhints::subdivisions -->
-        <var-decl name='subdivisions' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='51' column='1'/>
+        <var-decl name='subdivisions' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/renderhints.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- REAL Renderhints::tmp1 -->
-        <var-decl name='tmp1' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='52' column='1'/>
+        <var-decl name='tmp1' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/renderhints.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Renderhints::displaydomain -->
-        <var-decl name='displaydomain' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
+        <var-decl name='displaydomain' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='160'>
         <!-- int Renderhints::maxsubdivisions -->
-        <var-decl name='maxsubdivisions' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
+        <var-decl name='maxsubdivisions' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
         <!-- int Renderhints::wiretris -->
-        <var-decl name='wiretris' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
+        <var-decl name='wiretris' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- int Renderhints::wirequads -->
-        <var-decl name='wirequads' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
+        <var-decl name='wirequads' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
       </data-member>
     </class-decl>
     <!-- Renderhints* -->
@@ -5808,7 +5810,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- int (ArcSorter::*) (char*, char*) -->
     <function-type size-in-bits='64' method-class-id='type-id-193' id='type-id-451'>
@@ -5819,7 +5821,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- int (ArcTdirSorter::*) (char*, char*) -->
     <function-type size-in-bits='64' method-class-id='type-id-198' id='type-id-452'>
@@ -5830,7 +5832,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- void (ArcSorter::*) (char*, char*) -->
     <function-type size-in-bits='64' method-class-id='type-id-193' id='type-id-453'>
@@ -5841,7 +5843,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (ArcSorter::*) (char*, char*, char*) -->
     <function-type size-in-bits='64' method-class-id='type-id-193' id='type-id-454'>
@@ -5854,7 +5856,7 @@ 
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-159'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/subdivider.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
@@ -5868,18 +5870,18 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- int Breakpt::multi -->
-        <var-decl name='multi' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='50' column='1'/>
+        <var-decl name='multi' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Breakpt::def -->
-        <var-decl name='def' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='51' column='1'/>
+        <var-decl name='def' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='51' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct Knotspec -->
     <class-decl name='Knotspec' size-in-bits='1152' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='54' column='1' id='type-id-456'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Knotspec::order -->
-        <var-decl name='order' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
+        <var-decl name='order' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- Knot_ptr Knotspec::inkbegin -->
@@ -5927,35 +5929,35 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- int Knotspec::ncoords -->
-        <var-decl name='ncoords' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='67' column='1'/>
+        <var-decl name='ncoords' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
         <!-- int Knotspec::prestride -->
-        <var-decl name='prestride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='68' column='1'/>
+        <var-decl name='prestride' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- int Knotspec::poststride -->
-        <var-decl name='poststride' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='69' column='1'/>
+        <var-decl name='poststride' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
         <!-- int Knotspec::preoffset -->
-        <var-decl name='preoffset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='70' column='1'/>
+        <var-decl name='preoffset' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- int Knotspec::postoffset -->
-        <var-decl name='postoffset' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='71' column='1'/>
+        <var-decl name='postoffset' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <!-- int Knotspec::prewidth -->
-        <var-decl name='prewidth' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='72' column='1'/>
+        <var-decl name='prewidth' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- int Knotspec::postwidth -->
-        <var-decl name='postwidth' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='73' column='1'/>
+        <var-decl name='postwidth' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
         <!-- int Knotspec::istransformed -->
-        <var-decl name='istransformed' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='74' column='1'/>
+        <var-decl name='istransformed' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- Knotspec* Knotspec::next -->
@@ -5974,15 +5976,15 @@ 
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int Splinespec::dim -->
-        <var-decl name='dim' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='99' column='1'/>
+        <var-decl name='dim' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- REAL* Splinespec::outcpts -->
-        <var-decl name='outcpts' type-id='type-id-21' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='100' column='1'/>
+        <var-decl name='outcpts' type-id='type-id-34' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='100' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef REAL* Knot_ptr -->
-    <typedef-decl name='Knot_ptr' type-id='type-id-21' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-457'/>
+    <typedef-decl name='Knot_ptr' type-id='type-id-34' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-457'/>
     <!-- typedef Quilt* Quilt_ptr -->
     <typedef-decl name='Quilt_ptr' type-id='type-id-321' filepath='libnurbs/internals/quilt.h' line='90' column='1' id='type-id-461'/>
     <!-- Breakpt* -->
@@ -6013,7 +6015,7 @@ 
     <class-decl name='TrimVertexPool' size-in-bits='2624' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-469'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Pool TrimVertexPool::pool -->
-        <var-decl name='pool' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
+        <var-decl name='pool' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <!-- TrimVertex** TrimVertexPool::vlist -->
@@ -6021,11 +6023,11 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <!-- int TrimVertexPool::nextvlistslot -->
-        <var-decl name='nextvlistslot' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
+        <var-decl name='nextvlistslot' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='54' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2592'>
         <!-- int TrimVertexPool::vlistsize -->
-        <var-decl name='vlistsize' type-id='type-id-10' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
+        <var-decl name='vlistsize' type-id='type-id-3' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='55' column='1'/>
       </data-member>
     </class-decl>
     <!-- TrimVertexPool* -->
@@ -6039,15 +6041,15 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- REAL[1000] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32000' id='type-id-473'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='32000' id='type-id-473'>
       <!-- <anonymous range>[1000] -->
-      <subrange length='1000' lower-bound='0' upper-bound='999' type-id='type-id-3' id='type-id-474'/>
+      <subrange length='1000' lower-bound='0' upper-bound='999' type-id='type-id-17' id='type-id-474'/>
     </array-type-def>
     <!-- class Varray -->
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-475'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL* Varray::varray -->
-        <var-decl name='varray' type-id='type-id-21' visibility='default' filepath='libnurbs/internals/varray.h' line='48' column='1'/>
+        <var-decl name='varray' type-id='type-id-34' visibility='default' filepath='libnurbs/internals/varray.h' line='48' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- REAL Varray::vval[1000] -->
@@ -6059,24 +6061,24 @@ 
       </data-member>
       <data-member access='private' layout-offset-in-bits='96064'>
         <!-- long int Varray::numquads -->
-        <var-decl name='numquads' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/varray.h' line='51' column='1'/>
+        <var-decl name='numquads' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/varray.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96128'>
         <!-- long int Varray::size -->
-        <var-decl name='size' type-id='type-id-20' visibility='default' filepath='libnurbs/internals/varray.h' line='54' column='1'/>
+        <var-decl name='size' type-id='type-id-33' visibility='default' filepath='libnurbs/internals/varray.h' line='54' column='1'/>
       </data-member>
     </class-decl>
     <!-- long int[1000] -->
-    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='64000' id='type-id-476'>
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='64000' id='type-id-476'>
       <!-- <anonymous range>[1000] -->
-      <subrange length='1000' lower-bound='0' upper-bound='999' type-id='type-id-3' id='type-id-474'/>
+      <subrange length='1000' lower-bound='0' upper-bound='999' type-id='type-id-17' id='type-id-474'/>
     </array-type-def>
     <!-- Varray* -->
     <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-477'/>
     <!-- Varray* const -->
     <qualified-type-def type-id='type-id-477' const='yes' id='type-id-478'/>
     <!-- long int* -->
-    <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-479'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class directedLine -->
@@ -6136,7 +6138,7 @@ 
     <!-- directedLine** -->
     <pointer-type-def type-id='type-id-483' size-in-bits='64' id='type-id-487'/>
     <!-- int& -->
-    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-488'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3' size-in-bits='64' id='type-id-488'/>
     <!-- sampledLine* -->
     <pointer-type-def type-id='type-id-484' size-in-bits='64' id='type-id-482'/>
     <!-- sampledLine* const -->
@@ -6221,6 +6223,8 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/nurbtess/polyDBG.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
+  <abi-instr address-size='64' path='libnurbs/nurbtess/polyUtil.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+  </abi-instr>
   <abi-instr address-size='64' path='libnurbs/nurbtess/primitiveStream.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/nurbtess/rectBlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
@@ -6237,1325 +6241,1354 @@ 
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/nurbtess/sampledLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
-    <!-- CachedVertex[100] -->
-    <array-type-def dimensions='1' type-id='type-id-496' size-in-bits='25600' id='type-id-497'>
-      <!-- <anonymous range>[100] -->
-      <subrange length='100' lower-bound='0' upper-bound='99' type-id='type-id-3' id='type-id-498'/>
-    </array-type-def>
-    <!-- GLdouble[3] -->
-    <array-type-def dimensions='1' type-id='type-id-499' size-in-bits='192' id='type-id-500'>
-      <!-- <anonymous range>[3] -->
-      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-3' id='type-id-125'/>
-    </array-type-def>
-    <!-- __jmp_buf_tag[1] -->
-    <array-type-def dimensions='1' type-id='type-id-501' size-in-bits='1600' id='type-id-502'>
-      <!-- <anonymous range>[1] -->
-      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-3' id='type-id-191'/>
-    </array-type-def>
-    <!-- enum TessState -->
-    <enum-decl name='TessState' filepath='libtess/tess.h' line='47' column='1' id='type-id-503'>
-      <underlying-type type-id='type-id-38'/>
-      <enumerator name='T_DORMANT' value='0'/>
-      <enumerator name='T_IN_POLYGON' value='1'/>
-      <enumerator name='T_IN_CONTOUR' value='2'/>
-    </enum-decl>
-    <!-- float -->
-    <type-decl name='float' size-in-bits='32' id='type-id-23'/>
-    <!-- long int -->
-    <type-decl name='long int' size-in-bits='64' id='type-id-20'/>
-    <!-- long int[8] -->
-    <array-type-def dimensions='1' type-id='type-id-20' size-in-bits='512' id='type-id-504'>
-      <!-- <anonymous range>[8] -->
-      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-3' id='type-id-505'/>
-    </array-type-def>
-    <!-- struct ActiveRegion -->
-    <class-decl name='ActiveRegion' size-in-bits='192' is-struct='yes' visibility='default' filepath='libtess/sweep.h' line='59' column='1' id='type-id-506'>
+  <abi-instr address-size='64' path='libnurbs/nurbtess/searchTree.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+    <!-- struct treeNode -->
+    <class-decl name='treeNode' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/nurbtess/searchTree.h' line='36' column='1' id='type-id-496'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- GLUhalfEdge* ActiveRegion::eUp -->
-        <var-decl name='eUp' type-id='type-id-507' visibility='default' filepath='libtess/sweep.h' line='60' column='1'/>
+        <!-- void* treeNode::key -->
+        <var-decl name='key' type-id='type-id-30' visibility='default' filepath='libnurbs/nurbtess/searchTree.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- DictListNode* ActiveRegion::nodeUp -->
-        <var-decl name='nodeUp' type-id='type-id-508' visibility='default' filepath='libtess/sweep.h' line='61' column='1'/>
+        <!-- treeNode* treeNode::parent -->
+        <var-decl name='parent' type-id='type-id-497' visibility='default' filepath='libnurbs/nurbtess/searchTree.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- int ActiveRegion::windingNumber -->
-        <var-decl name='windingNumber' type-id='type-id-10' visibility='default' filepath='libtess/sweep.h' line='62' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <!-- GLboolean ActiveRegion::inside -->
-        <var-decl name='inside' type-id='type-id-66' visibility='default' filepath='libtess/sweep.h' line='64' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='168'>
-        <!-- GLboolean ActiveRegion::sentinel -->
-        <var-decl name='sentinel' type-id='type-id-66' visibility='default' filepath='libtess/sweep.h' line='65' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='176'>
-        <!-- GLboolean ActiveRegion::dirty -->
-        <var-decl name='dirty' type-id='type-id-66' visibility='default' filepath='libtess/sweep.h' line='66' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='184'>
-        <!-- GLboolean ActiveRegion::fixUpperEdge -->
-        <var-decl name='fixUpperEdge' type-id='type-id-66' visibility='default' filepath='libtess/sweep.h' line='69' column='1'/>
-      </data-member>
-    </class-decl>
-    <!-- struct CachedVertex -->
-    <class-decl name='CachedVertex' size-in-bits='256' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='54' column='1' id='type-id-509'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- GLdouble CachedVertex::coords[3] -->
-        <var-decl name='coords' type-id='type-id-500' visibility='default' filepath='libtess/tess.h' line='55' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void* CachedVertex::data -->
-        <var-decl name='data' type-id='type-id-17' visibility='default' filepath='libtess/tess.h' line='56' column='1'/>
-      </data-member>
-    </class-decl>
-    <!-- struct DictList -->
-    <class-decl name='DictList' size-in-bits='320' is-struct='yes' visibility='default' filepath='libtess/dict.h' line='94' column='1' id='type-id-510'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- DictListNode DictList::head -->
-        <var-decl name='head' type-id='type-id-511' visibility='default' filepath='libtess/dict.h' line='95' column='1'/>
+        <!-- treeNode* treeNode::left -->
+        <var-decl name='left' type-id='type-id-497' visibility='default' filepath='libnurbs/nurbtess/searchTree.h' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void* DictList::frame -->
-        <var-decl name='frame' type-id='type-id-17' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <!-- int (* DictList::leq)(void*, DictListKey, DictListKey) -->
-        <var-decl name='leq' type-id='type-id-512' visibility='default' filepath='libtess/dict.h' line='97' column='1'/>
-      </data-member>
-    </class-decl>
-    <!-- struct DictListNode -->
-    <class-decl name='DictListNode' size-in-bits='192' is-struct='yes' visibility='default' filepath='libtess/dict.h' line='88' column='1' id='type-id-513'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- DictListKey DictListNode::key -->
-        <var-decl name='key' type-id='type-id-514' visibility='default' filepath='libtess/dict.h' line='89' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- DictListNode* DictListNode::next -->
-        <var-decl name='next' type-id='type-id-508' visibility='default' filepath='libtess/dict.h' line='90' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- DictListNode* DictListNode::prev -->
-        <var-decl name='prev' type-id='type-id-508' visibility='default' filepath='libtess/dict.h' line='91' column='1'/>
+        <!-- treeNode* treeNode::right -->
+        <var-decl name='right' type-id='type-id-497' visibility='default' filepath='libnurbs/nurbtess/searchTree.h' line='40' column='1'/>
       </data-member>
     </class-decl>
+    <!-- typedef treeNode treeNode -->
+    <typedef-decl name='treeNode' type-id='type-id-496' filepath='libnurbs/nurbtess/searchTree.h' line='41' column='1' id='type-id-498'/>
+    <!-- treeNode* -->
+    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-497'/>
+    <!-- treeNode* -->
+    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-499'/>
+  </abi-instr>
+  <abi-instr address-size='64' path='libtess/geom.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+    <!-- GLdouble[3] -->
+    <array-type-def dimensions='1' type-id='type-id-500' size-in-bits='192' id='type-id-501'>
+      <!-- <anonymous range>[3] -->
+      <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-17' id='type-id-134'/>
+    </array-type-def>
+    <!-- long int -->
+    <type-decl name='long int' size-in-bits='64' id='type-id-33'/>
     <!-- struct GLUface -->
-    <class-decl name='GLUface' size-in-bits='384' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='126' column='1' id='type-id-515'>
+    <class-decl name='GLUface' size-in-bits='384' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='126' column='1' id='type-id-502'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- GLUface* GLUface::next -->
-        <var-decl name='next' type-id='type-id-516' visibility='default' filepath='libtess/mesh.h' line='127' column='1'/>
+        <var-decl name='next' type-id='type-id-503' visibility='default' filepath='libtess/mesh.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- GLUface* GLUface::prev -->
-        <var-decl name='prev' type-id='type-id-516' visibility='default' filepath='libtess/mesh.h' line='128' column='1'/>
+        <var-decl name='prev' type-id='type-id-503' visibility='default' filepath='libtess/mesh.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- GLUhalfEdge* GLUface::anEdge -->
-        <var-decl name='anEdge' type-id='type-id-507' visibility='default' filepath='libtess/mesh.h' line='129' column='1'/>
+        <var-decl name='anEdge' type-id='type-id-504' visibility='default' filepath='libtess/mesh.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void* GLUface::data -->
-        <var-decl name='data' type-id='type-id-17' visibility='default' filepath='libtess/mesh.h' line='130' column='1'/>
+        <var-decl name='data' type-id='type-id-30' visibility='default' filepath='libtess/mesh.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- GLUface* GLUface::trail -->
-        <var-decl name='trail' type-id='type-id-516' visibility='default' filepath='libtess/mesh.h' line='133' column='1'/>
+        <var-decl name='trail' type-id='type-id-503' visibility='default' filepath='libtess/mesh.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- GLboolean GLUface::marked -->
-        <var-decl name='marked' type-id='type-id-66' visibility='default' filepath='libtess/mesh.h' line='134' column='1'/>
+        <var-decl name='marked' type-id='type-id-76' visibility='default' filepath='libtess/mesh.h' line='134' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='328'>
         <!-- GLboolean GLUface::inside -->
-        <var-decl name='inside' type-id='type-id-66' visibility='default' filepath='libtess/mesh.h' line='135' column='1'/>
+        <var-decl name='inside' type-id='type-id-76' visibility='default' filepath='libtess/mesh.h' line='135' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct GLUhalfEdge -->
-    <class-decl name='GLUhalfEdge' size-in-bits='512' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='138' column='1' id='type-id-517'>
+    <class-decl name='GLUhalfEdge' size-in-bits='512' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='138' column='1' id='type-id-505'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- GLUhalfEdge* GLUhalfEdge::next -->
-        <var-decl name='next' type-id='type-id-507' visibility='default' filepath='libtess/mesh.h' line='139' column='1'/>
+        <var-decl name='next' type-id='type-id-504' visibility='default' filepath='libtess/mesh.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- GLUhalfEdge* GLUhalfEdge::Sym -->
-        <var-decl name='Sym' type-id='type-id-507' visibility='default' filepath='libtess/mesh.h' line='140' column='1'/>
+        <var-decl name='Sym' type-id='type-id-504' visibility='default' filepath='libtess/mesh.h' line='140' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- GLUhalfEdge* GLUhalfEdge::Onext -->
-        <var-decl name='Onext' type-id='type-id-507' visibility='default' filepath='libtess/mesh.h' line='141' column='1'/>
+        <var-decl name='Onext' type-id='type-id-504' visibility='default' filepath='libtess/mesh.h' line='141' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- GLUhalfEdge* GLUhalfEdge::Lnext -->
-        <var-decl name='Lnext' type-id='type-id-507' visibility='default' filepath='libtess/mesh.h' line='142' column='1'/>
+        <var-decl name='Lnext' type-id='type-id-504' visibility='default' filepath='libtess/mesh.h' line='142' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- GLUvertex* GLUhalfEdge::Org -->
-        <var-decl name='Org' type-id='type-id-518' visibility='default' filepath='libtess/mesh.h' line='143' column='1'/>
+        <var-decl name='Org' type-id='type-id-506' visibility='default' filepath='libtess/mesh.h' line='143' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- GLUface* GLUhalfEdge::Lface -->
-        <var-decl name='Lface' type-id='type-id-516' visibility='default' filepath='libtess/mesh.h' line='144' column='1'/>
+        <var-decl name='Lface' type-id='type-id-503' visibility='default' filepath='libtess/mesh.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- ActiveRegion* GLUhalfEdge::activeRegion -->
-        <var-decl name='activeRegion' type-id='type-id-519' visibility='default' filepath='libtess/mesh.h' line='147' column='1'/>
+        <var-decl name='activeRegion' type-id='type-id-507' visibility='default' filepath='libtess/mesh.h' line='147' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- int GLUhalfEdge::winding -->
-        <var-decl name='winding' type-id='type-id-10' visibility='default' filepath='libtess/mesh.h' line='148' column='1'/>
+        <var-decl name='winding' type-id='type-id-3' visibility='default' filepath='libtess/mesh.h' line='148' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct GLUvertex -->
+    <class-decl name='GLUvertex' size-in-bits='640' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='114' column='1' id='type-id-508'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- GLUvertex* GLUvertex::next -->
+        <var-decl name='next' type-id='type-id-506' visibility='default' filepath='libtess/mesh.h' line='115' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- GLUvertex* GLUvertex::prev -->
+        <var-decl name='prev' type-id='type-id-506' visibility='default' filepath='libtess/mesh.h' line='116' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- GLUhalfEdge* GLUvertex::anEdge -->
+        <var-decl name='anEdge' type-id='type-id-504' visibility='default' filepath='libtess/mesh.h' line='117' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- void* GLUvertex::data -->
+        <var-decl name='data' type-id='type-id-30' visibility='default' filepath='libtess/mesh.h' line='118' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- GLdouble GLUvertex::coords[3] -->
+        <var-decl name='coords' type-id='type-id-501' visibility='default' filepath='libtess/mesh.h' line='121' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <!-- GLdouble GLUvertex::s -->
+        <var-decl name='s' type-id='type-id-500' visibility='default' filepath='libtess/mesh.h' line='122' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <!-- GLdouble GLUvertex::t -->
+        <var-decl name='t' type-id='type-id-500' visibility='default' filepath='libtess/mesh.h' line='122' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <!-- long int GLUvertex::pqHandle -->
+        <var-decl name='pqHandle' type-id='type-id-33' visibility='default' filepath='libtess/mesh.h' line='123' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- typedef ActiveRegion ActiveRegion -->
+    <typedef-decl name='ActiveRegion' type-id='type-id-509' filepath='libtess/mesh.h' line='46' column='1' id='type-id-510'/>
+    <!-- typedef GLUface GLUface -->
+    <typedef-decl name='GLUface' type-id='type-id-502' filepath='libtess/mesh.h' line='43' column='1' id='type-id-511'/>
+    <!-- typedef GLUhalfEdge GLUhalfEdge -->
+    <typedef-decl name='GLUhalfEdge' type-id='type-id-505' filepath='libtess/mesh.h' line='44' column='1' id='type-id-512'/>
+    <!-- typedef GLUvertex GLUvertex -->
+    <typedef-decl name='GLUvertex' type-id='type-id-508' filepath='libtess/mesh.h' line='42' column='1' id='type-id-513'/>
+    <!-- unsigned long int -->
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-17'/>
+    <!-- ActiveRegion* -->
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-507'/>
+    <!-- GLUface* -->
+    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-503'/>
+    <!-- GLUhalfEdge* -->
+    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-504'/>
+    <!-- GLUvertex* -->
+    <pointer-type-def type-id='type-id-513' size-in-bits='64' id='type-id-506'/>
+    <!-- struct ActiveRegion -->
+    <class-decl name='ActiveRegion' size-in-bits='192' is-struct='yes' visibility='default' filepath='libtess/sweep.h' line='59' column='1' id='type-id-509'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- GLUhalfEdge* ActiveRegion::eUp -->
+        <var-decl name='eUp' type-id='type-id-504' visibility='default' filepath='libtess/sweep.h' line='60' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- DictListNode* ActiveRegion::nodeUp -->
+        <var-decl name='nodeUp' type-id='type-id-514' visibility='default' filepath='libtess/sweep.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- int ActiveRegion::windingNumber -->
+        <var-decl name='windingNumber' type-id='type-id-3' visibility='default' filepath='libtess/sweep.h' line='62' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <!-- GLboolean ActiveRegion::inside -->
+        <var-decl name='inside' type-id='type-id-76' visibility='default' filepath='libtess/sweep.h' line='64' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='168'>
+        <!-- GLboolean ActiveRegion::sentinel -->
+        <var-decl name='sentinel' type-id='type-id-76' visibility='default' filepath='libtess/sweep.h' line='65' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='176'>
+        <!-- GLboolean ActiveRegion::dirty -->
+        <var-decl name='dirty' type-id='type-id-76' visibility='default' filepath='libtess/sweep.h' line='66' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='184'>
+        <!-- GLboolean ActiveRegion::fixUpperEdge -->
+        <var-decl name='fixUpperEdge' type-id='type-id-76' visibility='default' filepath='libtess/sweep.h' line='69' column='1'/>
+      </data-member>
+    </class-decl>
+  </abi-instr>
+  <abi-instr address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
+    <!-- CachedVertex[100] -->
+    <array-type-def dimensions='1' type-id='type-id-515' size-in-bits='25600' id='type-id-516'>
+      <!-- <anonymous range>[100] -->
+      <subrange length='100' lower-bound='0' upper-bound='99' type-id='type-id-17' id='type-id-517'/>
+    </array-type-def>
+    <!-- __jmp_buf_tag[1] -->
+    <array-type-def dimensions='1' type-id='type-id-518' size-in-bits='1600' id='type-id-519'>
+      <!-- <anonymous range>[1] -->
+      <subrange length='1' lower-bound='0' upper-bound='0' type-id='type-id-17' id='type-id-191'/>
+    </array-type-def>
+    <!-- enum TessState -->
+    <enum-decl name='TessState' filepath='libtess/tess.h' line='47' column='1' id='type-id-520'>
+      <underlying-type type-id='type-id-50'/>
+      <enumerator name='T_DORMANT' value='0'/>
+      <enumerator name='T_IN_POLYGON' value='1'/>
+      <enumerator name='T_IN_CONTOUR' value='2'/>
+    </enum-decl>
+    <!-- float -->
+    <type-decl name='float' size-in-bits='32' id='type-id-2'/>
+    <!-- long int[8] -->
+    <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='512' id='type-id-521'>
+      <!-- <anonymous range>[8] -->
+      <subrange length='8' lower-bound='0' upper-bound='7' type-id='type-id-17' id='type-id-522'/>
+    </array-type-def>
+    <!-- struct CachedVertex -->
+    <class-decl name='CachedVertex' size-in-bits='256' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='54' column='1' id='type-id-523'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- GLdouble CachedVertex::coords[3] -->
+        <var-decl name='coords' type-id='type-id-501' visibility='default' filepath='libtess/tess.h' line='55' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- void* CachedVertex::data -->
+        <var-decl name='data' type-id='type-id-30' visibility='default' filepath='libtess/tess.h' line='56' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct DictList -->
+    <class-decl name='DictList' size-in-bits='320' is-struct='yes' visibility='default' filepath='libtess/dict.h' line='94' column='1' id='type-id-524'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- DictListNode DictList::head -->
+        <var-decl name='head' type-id='type-id-525' visibility='default' filepath='libtess/dict.h' line='95' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- void* DictList::frame -->
+        <var-decl name='frame' type-id='type-id-30' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- int (* DictList::leq)(void*, DictListKey, DictListKey) -->
+        <var-decl name='leq' type-id='type-id-526' visibility='default' filepath='libtess/dict.h' line='97' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct DictListNode -->
+    <class-decl name='DictListNode' size-in-bits='192' is-struct='yes' visibility='default' filepath='libtess/dict.h' line='88' column='1' id='type-id-527'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- DictListKey DictListNode::key -->
+        <var-decl name='key' type-id='type-id-528' visibility='default' filepath='libtess/dict.h' line='89' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- DictListNode* DictListNode::next -->
+        <var-decl name='next' type-id='type-id-514' visibility='default' filepath='libtess/dict.h' line='90' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- DictListNode* DictListNode::prev -->
+        <var-decl name='prev' type-id='type-id-514' visibility='default' filepath='libtess/dict.h' line='91' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct GLUmesh -->
-    <class-decl name='GLUmesh' size-in-bits='2048' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='163' column='1' id='type-id-520'>
+    <class-decl name='GLUmesh' size-in-bits='2048' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='163' column='1' id='type-id-529'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- GLUvertex GLUmesh::vHead -->
-        <var-decl name='vHead' type-id='type-id-521' visibility='default' filepath='libtess/mesh.h' line='164' column='1'/>
+        <var-decl name='vHead' type-id='type-id-513' visibility='default' filepath='libtess/mesh.h' line='164' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- GLUface GLUmesh::fHead -->
-        <var-decl name='fHead' type-id='type-id-522' visibility='default' filepath='libtess/mesh.h' line='165' column='1'/>
+        <var-decl name='fHead' type-id='type-id-511' visibility='default' filepath='libtess/mesh.h' line='165' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- GLUhalfEdge GLUmesh::eHead -->
-        <var-decl name='eHead' type-id='type-id-523' visibility='default' filepath='libtess/mesh.h' line='166' column='1'/>
+        <var-decl name='eHead' type-id='type-id-512' visibility='default' filepath='libtess/mesh.h' line='166' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- GLUhalfEdge GLUmesh::eHeadSym -->
-        <var-decl name='eHeadSym' type-id='type-id-523' visibility='default' filepath='libtess/mesh.h' line='167' column='1'/>
+        <var-decl name='eHeadSym' type-id='type-id-512' visibility='default' filepath='libtess/mesh.h' line='167' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct GLUtesselator -->
-    <class-decl name='GLUtesselator' size-in-bits='29376' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='59' column='1' id='type-id-524'>
+    <class-decl name='GLUtesselator' size-in-bits='29376' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='59' column='1' id='type-id-530'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- TessState GLUtesselator::state -->
-        <var-decl name='state' type-id='type-id-503' visibility='default' filepath='libtess/tess.h' line='63' column='1'/>
+        <var-decl name='state' type-id='type-id-520' visibility='default' filepath='libtess/tess.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- GLUhalfEdge* GLUtesselator::lastEdge -->
-        <var-decl name='lastEdge' type-id='type-id-507' visibility='default' filepath='libtess/tess.h' line='65' column='1'/>
+        <var-decl name='lastEdge' type-id='type-id-504' visibility='default' filepath='libtess/tess.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- GLUmesh* GLUtesselator::mesh -->
-        <var-decl name='mesh' type-id='type-id-525' visibility='default' filepath='libtess/tess.h' line='66' column='1'/>
+        <var-decl name='mesh' type-id='type-id-531' visibility='default' filepath='libtess/tess.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (* GLUtesselator::callError)(GLenum) -->
-        <var-decl name='callError' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
+        <var-decl name='callError' type-id='type-id-24' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- GLdouble GLUtesselator::normal[3] -->
-        <var-decl name='normal' type-id='type-id-500' visibility='default' filepath='libtess/tess.h' line='73' column='1'/>
+        <var-decl name='normal' type-id='type-id-501' visibility='default' filepath='libtess/tess.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- GLdouble GLUtesselator::sUnit[3] -->
-        <var-decl name='sUnit' type-id='type-id-500' visibility='default' filepath='libtess/tess.h' line='74' column='1'/>
+        <var-decl name='sUnit' type-id='type-id-501' visibility='default' filepath='libtess/tess.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- GLdouble GLUtesselator::tUnit[3] -->
-        <var-decl name='tUnit' type-id='type-id-500' visibility='default' filepath='libtess/tess.h' line='75' column='1'/>
+        <var-decl name='tUnit' type-id='type-id-501' visibility='default' filepath='libtess/tess.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- GLdouble GLUtesselator::relTolerance -->
-        <var-decl name='relTolerance' type-id='type-id-499' visibility='default' filepath='libtess/tess.h' line='79' column='1'/>
+        <var-decl name='relTolerance' type-id='type-id-500' visibility='default' filepath='libtess/tess.h' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- GLenum GLUtesselator::windingRule -->
-        <var-decl name='windingRule' type-id='type-id-41' visibility='default' filepath='libtess/tess.h' line='80' column='1'/>
+        <var-decl name='windingRule' type-id='type-id-10' visibility='default' filepath='libtess/tess.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <!-- GLboolean GLUtesselator::fatalError -->
-        <var-decl name='fatalError' type-id='type-id-66' visibility='default' filepath='libtess/tess.h' line='81' column='1'/>
+        <var-decl name='fatalError' type-id='type-id-76' visibility='default' filepath='libtess/tess.h' line='81' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- DictList* GLUtesselator::dict -->
-        <var-decl name='dict' type-id='type-id-526' visibility='default' filepath='libtess/tess.h' line='83' column='1'/>
+        <var-decl name='dict' type-id='type-id-532' visibility='default' filepath='libtess/tess.h' line='83' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- PriorityQSort* GLUtesselator::pq -->
-        <var-decl name='pq' type-id='type-id-527' visibility='default' filepath='libtess/tess.h' line='84' column='1'/>
+        <var-decl name='pq' type-id='type-id-533' visibility='default' filepath='libtess/tess.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- GLUvertex* GLUtesselator::event -->
-        <var-decl name='event' type-id='type-id-518' visibility='default' filepath='libtess/tess.h' line='85' column='1'/>
+        <var-decl name='event' type-id='type-id-506' visibility='default' filepath='libtess/tess.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- void (* GLUtesselator::callCombine)(GLdouble*, void**, GLfloat*, void**) -->
-        <var-decl name='callCombine' type-id='type-id-528' visibility='default' filepath='libtess/tess.h' line='87' column='1'/>
+        <var-decl name='callCombine' type-id='type-id-534' visibility='default' filepath='libtess/tess.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- GLboolean GLUtesselator::flagBoundary -->
-        <var-decl name='flagBoundary' type-id='type-id-66' visibility='default' filepath='libtess/tess.h' line='92' column='1'/>
+        <var-decl name='flagBoundary' type-id='type-id-76' visibility='default' filepath='libtess/tess.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1224'>
         <!-- GLboolean GLUtesselator::boundaryOnly -->
-        <var-decl name='boundaryOnly' type-id='type-id-66' visibility='default' filepath='libtess/tess.h' line='93' column='1'/>
+        <var-decl name='boundaryOnly' type-id='type-id-76' visibility='default' filepath='libtess/tess.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <!-- GLUface* GLUtesselator::lonelyTriList -->
-        <var-decl name='lonelyTriList' type-id='type-id-516' visibility='default' filepath='libtess/tess.h' line='94' column='1'/>
+        <var-decl name='lonelyTriList' type-id='type-id-503' visibility='default' filepath='libtess/tess.h' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- void (* GLUtesselator::callBegin)(GLenum) -->
-        <var-decl name='callBegin' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
+        <var-decl name='callBegin' type-id='type-id-24' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- void (* GLUtesselator::callEdgeFlag)(GLboolean) -->
-        <var-decl name='callEdgeFlag' type-id='type-id-529' visibility='default' filepath='libtess/tess.h' line='98' column='1'/>
+        <var-decl name='callEdgeFlag' type-id='type-id-535' visibility='default' filepath='libtess/tess.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- void (* GLUtesselator::callVertex)(void*) -->
-        <var-decl name='callVertex' type-id='type-id-15' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
+        <var-decl name='callVertex' type-id='type-id-28' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- void (* GLUtesselator::callEnd)(void) -->
-        <var-decl name='callEnd' type-id='type-id-12' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
+        <var-decl name='callEnd' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- void (* GLUtesselator::callMesh)(GLUmesh*) -->
-        <var-decl name='callMesh' type-id='type-id-530' visibility='default' filepath='libtess/tess.h' line='101' column='1'/>
+        <var-decl name='callMesh' type-id='type-id-536' visibility='default' filepath='libtess/tess.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
         <!-- GLboolean GLUtesselator::emptyCache -->
-        <var-decl name='emptyCache' type-id='type-id-66' visibility='default' filepath='libtess/tess.h' line='106' column='1'/>
+        <var-decl name='emptyCache' type-id='type-id-76' visibility='default' filepath='libtess/tess.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1696'>
         <!-- int GLUtesselator::cacheCount -->
-        <var-decl name='cacheCount' type-id='type-id-10' visibility='default' filepath='libtess/tess.h' line='107' column='1'/>
+        <var-decl name='cacheCount' type-id='type-id-3' visibility='default' filepath='libtess/tess.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
         <!-- CachedVertex GLUtesselator::cache[100] -->
-        <var-decl name='cache' type-id='type-id-497' visibility='default' filepath='libtess/tess.h' line='108' column='1'/>
+        <var-decl name='cache' type-id='type-id-516' visibility='default' filepath='libtess/tess.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27328'>
         <!-- void (* GLUtesselator::callBeginData)(GLenum, void*) -->
-        <var-decl name='callBeginData' type-id='type-id-14' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
+        <var-decl name='callBeginData' type-id='type-id-27' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27392'>
         <!-- void (* GLUtesselator::callEdgeFlagData)(GLboolean, void*) -->
-        <var-decl name='callEdgeFlagData' type-id='type-id-531' visibility='default' filepath='libtess/tess.h' line='112' column='1'/>
+        <var-decl name='callEdgeFlagData' type-id='type-id-537' visibility='default' filepath='libtess/tess.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27456'>
         <!-- void (* GLUtesselator::callVertexData)(void*, void*) -->
-        <var-decl name='callVertexData' type-id='type-id-532' visibility='default' filepath='libtess/tess.h' line='114' column='1'/>
+        <var-decl name='callVertexData' type-id='type-id-538' visibility='default' filepath='libtess/tess.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27520'>
         <!-- void (* GLUtesselator::callEndData)(void*) -->
-        <var-decl name='callEndData' type-id='type-id-15' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
+        <var-decl name='callEndData' type-id='type-id-28' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27584'>
         <!-- void (* GLUtesselator::callErrorData)(GLenum, void*) -->
-        <var-decl name='callErrorData' type-id='type-id-14' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
+        <var-decl name='callErrorData' type-id='type-id-27' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
         <!-- void (* GLUtesselator::callCombineData)(GLdouble*, void**, GLfloat*, void**, void*) -->
-        <var-decl name='callCombineData' type-id='type-id-533' visibility='default' filepath='libtess/tess.h' line='117' column='1'/>
+        <var-decl name='callCombineData' type-id='type-id-539' visibility='default' filepath='libtess/tess.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
         <!-- jmp_buf GLUtesselator::env -->
-        <var-decl name='env' type-id='type-id-534' visibility='default' filepath='libtess/tess.h' line='121' column='1'/>
+        <var-decl name='env' type-id='type-id-540' visibility='default' filepath='libtess/tess.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='29312'>
         <!-- void* GLUtesselator::polygonData -->
-        <var-decl name='polygonData' type-id='type-id-17' visibility='default' filepath='libtess/tess.h' line='123' column='1'/>
-      </data-member>
-    </class-decl>
-    <!-- struct GLUvertex -->
-    <class-decl name='GLUvertex' size-in-bits='640' is-struct='yes' visibility='default' filepath='libtess/mesh.h' line='114' column='1' id='type-id-535'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- GLUvertex* GLUvertex::next -->
-        <var-decl name='next' type-id='type-id-518' visibility='default' filepath='libtess/mesh.h' line='115' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- GLUvertex* GLUvertex::prev -->
-        <var-decl name='prev' type-id='type-id-518' visibility='default' filepath='libtess/mesh.h' line='116' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- GLUhalfEdge* GLUvertex::anEdge -->
-        <var-decl name='anEdge' type-id='type-id-507' visibility='default' filepath='libtess/mesh.h' line='117' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void* GLUvertex::data -->
-        <var-decl name='data' type-id='type-id-17' visibility='default' filepath='libtess/mesh.h' line='118' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <!-- GLdouble GLUvertex::coords[3] -->
-        <var-decl name='coords' type-id='type-id-500' visibility='default' filepath='libtess/mesh.h' line='121' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <!-- GLdouble GLUvertex::s -->
-        <var-decl name='s' type-id='type-id-499' visibility='default' filepath='libtess/mesh.h' line='122' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <!-- GLdouble GLUvertex::t -->
-        <var-decl name='t' type-id='type-id-499' visibility='default' filepath='libtess/mesh.h' line='122' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <!-- long int GLUvertex::pqHandle -->
-        <var-decl name='pqHandle' type-id='type-id-20' visibility='default' filepath='libtess/mesh.h' line='123' column='1'/>
+        <var-decl name='polygonData' type-id='type-id-30' visibility='default' filepath='libtess/tess.h' line='123' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct PQhandleElem -->
-    <class-decl name='PQhandleElem' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-536' visibility='default' filepath='libtess/priorityq-heap.h' line='84' column='1' id='type-id-537'>
+    <class-decl name='PQhandleElem' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-541' visibility='default' filepath='libtess/priorityq-heap.h' line='84' column='1' id='type-id-542'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- PQHeapKey PQhandleElem::key -->
-        <var-decl name='key' type-id='type-id-538' visibility='default' filepath='libtess/priorityq-heap.h' line='84' column='1'/>
+        <var-decl name='key' type-id='type-id-543' visibility='default' filepath='libtess/priorityq-heap.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- PQHeapHandle PQhandleElem::node -->
-        <var-decl name='node' type-id='type-id-539' visibility='default' filepath='libtess/priorityq-heap.h' line='84' column='1'/>
+        <var-decl name='node' type-id='type-id-544' visibility='default' filepath='libtess/priorityq-heap.h' line='84' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct PQnode -->
-    <class-decl name='PQnode' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-540' visibility='default' filepath='libtess/priorityq-heap.h' line='83' column='1' id='type-id-541'>
+    <class-decl name='PQnode' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-545' visibility='default' filepath='libtess/priorityq-heap.h' line='83' column='1' id='type-id-546'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- PQHeapHandle PQnode::handle -->
-        <var-decl name='handle' type-id='type-id-539' visibility='default' filepath='libtess/priorityq-heap.h' line='83' column='1'/>
+        <var-decl name='handle' type-id='type-id-544' visibility='default' filepath='libtess/priorityq-heap.h' line='83' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct PriorityQHeap -->
-    <class-decl name='PriorityQHeap' size-in-bits='448' is-struct='yes' visibility='default' filepath='libtess/priorityq-heap.h' line='86' column='1' id='type-id-542'>
+    <class-decl name='PriorityQHeap' size-in-bits='448' is-struct='yes' visibility='default' filepath='libtess/priorityq-heap.h' line='86' column='1' id='type-id-547'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- PQnode* PriorityQHeap::nodes -->
-        <var-decl name='nodes' type-id='type-id-543' visibility='default' filepath='libtess/priorityq-heap.h' line='87' column='1'/>
+        <var-decl name='nodes' type-id='type-id-548' visibility='default' filepath='libtess/priorityq-heap.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- PQhandleElem* PriorityQHeap::handles -->
-        <var-decl name='handles' type-id='type-id-544' visibility='default' filepath='libtess/priorityq-heap.h' line='88' column='1'/>
+        <var-decl name='handles' type-id='type-id-549' visibility='default' filepath='libtess/priorityq-heap.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- long int PriorityQHeap::size -->
-        <var-decl name='size' type-id='type-id-20' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
+        <var-decl name='size' type-id='type-id-33' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- long int PriorityQHeap::max -->
-        <var-decl name='max' type-id='type-id-20' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
+        <var-decl name='max' type-id='type-id-33' visibility='default' filepath='libtess/priorityq-heap.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- PQHeapHandle PriorityQHeap::freeList -->
-        <var-decl name='freeList' type-id='type-id-539' visibility='default' filepath='libtess/priorityq-heap.h' line='90' column='1'/>
+        <var-decl name='freeList' type-id='type-id-544' visibility='default' filepath='libtess/priorityq-heap.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int PriorityQHeap::initialized -->
-        <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
+        <var-decl name='initialized' type-id='type-id-3' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- int (* PriorityQHeap::leq)(PQHeapKey, PQHeapKey) -->
-        <var-decl name='leq' type-id='type-id-545' visibility='default' filepath='libtess/priorityq-heap.h' line='92' column='1'/>
+        <var-decl name='leq' type-id='type-id-550' visibility='default' filepath='libtess/priorityq-heap.h' line='92' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct PriorityQSort -->
-    <class-decl name='PriorityQSort' size-in-bits='448' is-struct='yes' visibility='default' filepath='libtess/priorityq.h' line='97' column='1' id='type-id-546'>
+    <class-decl name='PriorityQSort' size-in-bits='448' is-struct='yes' visibility='default' filepath='libtess/priorityq.h' line='97' column='1' id='type-id-551'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- PriorityQHeap* PriorityQSort::heap -->
-        <var-decl name='heap' type-id='type-id-547' visibility='default' filepath='libtess/priorityq.h' line='98' column='1'/>
+        <var-decl name='heap' type-id='type-id-552' visibility='default' filepath='libtess/priorityq.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- PQSortKey* PriorityQSort::keys -->
-        <var-decl name='keys' type-id='type-id-548' visibility='default' filepath='libtess/priorityq.h' line='99' column='1'/>
+        <var-decl name='keys' type-id='type-id-553' visibility='default' filepath='libtess/priorityq.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- PQSortKey** PriorityQSort::order -->
-        <var-decl name='order' type-id='type-id-549' visibility='default' filepath='libtess/priorityq.h' line='100' column='1'/>
+        <var-decl name='order' type-id='type-id-554' visibility='default' filepath='libtess/priorityq.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- PQSortHandle PriorityQSort::size -->
-        <var-decl name='size' type-id='type-id-550' visibility='default' filepath='libtess/priorityq.h' line='101' column='1'/>
+        <var-decl name='size' type-id='type-id-555' visibility='default' filepath='libtess/priorityq.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- PQSortHandle PriorityQSort::max -->
-        <var-decl name='max' type-id='type-id-550' visibility='default' filepath='libtess/priorityq.h' line='101' column='1'/>
+        <var-decl name='max' type-id='type-id-555' visibility='default' filepath='libtess/priorityq.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int PriorityQSort::initialized -->
-        <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
+        <var-decl name='initialized' type-id='type-id-3' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- int (* PriorityQSort::leq)(PQSortKey, PQSortKey) -->
-        <var-decl name='leq' type-id='type-id-551' visibility='default' filepath='libtess/priorityq.h' line='103' column='1'/>
+        <var-decl name='leq' type-id='type-id-556' visibility='default' filepath='libtess/priorityq.h' line='103' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct __jmp_buf_tag -->
-    <class-decl name='__jmp_buf_tag' size-in-bits='1600' is-struct='yes' visibility='default' filepath='/usr/include/setjmp.h' line='36' column='1' id='type-id-501'>
+    <class-decl name='__jmp_buf_tag' size-in-bits='1600' is-struct='yes' visibility='default' filepath='/usr/include/setjmp.h' line='36' column='1' id='type-id-518'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- __jmp_buf __jmp_buf_tag::__jmpbuf -->
         <var-decl name='__jmpbuf' type-id='type-id-213' visibility='default' filepath='/usr/include/setjmp.h' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int __jmp_buf_tag::__mask_was_saved -->
-        <var-decl name='__mask_was_saved' type-id='type-id-10' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
+        <var-decl name='__mask_was_saved' type-id='type-id-3' visibility='default' filepath='/usr/include/setjmp.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- __sigset_t __jmp_buf_tag::__saved_mask -->
-        <var-decl name='__saved_mask' type-id='type-id-552' visibility='default' filepath='/usr/include/setjmp.h' line='43' column='1'/>
+        <var-decl name='__saved_mask' type-id='type-id-557' visibility='default' filepath='/usr/include/setjmp.h' line='43' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct __sigset_t -->
-    <class-decl name='__sigset_t' size-in-bits='1024' is-struct='yes' naming-typedef-id='type-id-552' visibility='default' filepath='/usr/include/bits/sigset.h' line='30' column='1' id='type-id-214'>
+    <class-decl name='__sigset_t' size-in-bits='1024' is-struct='yes' naming-typedef-id='type-id-557' visibility='default' filepath='/usr/include/bits/sigset.h' line='30' column='1' id='type-id-214'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned long int __sigset_t::__val[16] -->
-        <var-decl name='__val' type-id='type-id-553' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
+        <var-decl name='__val' type-id='type-id-558' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef ActiveRegion ActiveRegion -->
-    <typedef-decl name='ActiveRegion' type-id='type-id-506' filepath='libtess/mesh.h' line='46' column='1' id='type-id-554'/>
     <!-- typedef CachedVertex CachedVertex -->
-    <typedef-decl name='CachedVertex' type-id='type-id-509' filepath='libtess/tess.h' line='57' column='1' id='type-id-496'/>
+    <typedef-decl name='CachedVertex' type-id='type-id-523' filepath='libtess/tess.h' line='57' column='1' id='type-id-515'/>
     <!-- typedef DictList DictList -->
-    <typedef-decl name='DictList' type-id='type-id-510' filepath='libtess/dict.h' line='61' column='1' id='type-id-555'/>
+    <typedef-decl name='DictList' type-id='type-id-524' filepath='libtess/dict.h' line='61' column='1' id='type-id-559'/>
     <!-- typedef DictListNode DictListNode -->
-    <typedef-decl name='DictListNode' type-id='type-id-513' filepath='libtess/dict.h' line='62' column='1' id='type-id-511'/>
-    <!-- typedef GLUface GLUface -->
-    <typedef-decl name='GLUface' type-id='type-id-515' filepath='libtess/mesh.h' line='43' column='1' id='type-id-522'/>
-    <!-- typedef GLUhalfEdge GLUhalfEdge -->
-    <typedef-decl name='GLUhalfEdge' type-id='type-id-517' filepath='libtess/mesh.h' line='44' column='1' id='type-id-523'/>
+    <typedef-decl name='DictListNode' type-id='type-id-527' filepath='libtess/dict.h' line='62' column='1' id='type-id-525'/>
     <!-- typedef GLUmesh GLUmesh -->
-    <typedef-decl name='GLUmesh' type-id='type-id-520' filepath='libtess/mesh.h' line='40' column='1' id='type-id-556'/>
+    <typedef-decl name='GLUmesh' type-id='type-id-529' filepath='libtess/mesh.h' line='40' column='1' id='type-id-560'/>
     <!-- typedef GLUtesselator GLUtesselator -->
-    <typedef-decl name='GLUtesselator' type-id='type-id-524' filepath='../../../include/GL/glu.h' line='276' column='1' id='type-id-557'/>
-    <!-- typedef GLUvertex GLUvertex -->
-    <typedef-decl name='GLUvertex' type-id='type-id-535' filepath='libtess/mesh.h' line='42' column='1' id='type-id-521'/>
+    <typedef-decl name='GLUtesselator' type-id='type-id-530' filepath='../../../include/GL/glu.h' line='276' column='1' id='type-id-561'/>
     <!-- typedef float GLfloat -->
-    <typedef-decl name='GLfloat' type-id='type-id-23' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-28'/>
+    <typedef-decl name='GLfloat' type-id='type-id-2' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-40'/>
     <!-- typedef long int PQHeapHandle -->
-    <typedef-decl name='PQHeapHandle' type-id='type-id-20' filepath='libtess/priorityq-heap.h' line='80' column='1' id='type-id-539'/>
+    <typedef-decl name='PQHeapHandle' type-id='type-id-33' filepath='libtess/priorityq-heap.h' line='80' column='1' id='type-id-544'/>
     <!-- typedef PQHeapHandle PQSortHandle -->
-    <typedef-decl name='PQSortHandle' type-id='type-id-539' filepath='libtess/priorityq.h' line='94' column='1' id='type-id-550'/>
+    <typedef-decl name='PQSortHandle' type-id='type-id-544' filepath='libtess/priorityq.h' line='94' column='1' id='type-id-555'/>
     <!-- typedef PQhandleElem PQhandleElem -->
-    <typedef-decl name='PQhandleElem' type-id='type-id-537' filepath='libtess/priorityq-heap.h' line='84' column='1' id='type-id-536'/>
+    <typedef-decl name='PQhandleElem' type-id='type-id-542' filepath='libtess/priorityq-heap.h' line='84' column='1' id='type-id-541'/>
     <!-- typedef PQnode PQnode -->
-    <typedef-decl name='PQnode' type-id='type-id-541' filepath='libtess/priorityq-heap.h' line='83' column='1' id='type-id-540'/>
+    <typedef-decl name='PQnode' type-id='type-id-546' filepath='libtess/priorityq-heap.h' line='83' column='1' id='type-id-545'/>
     <!-- typedef PriorityQHeap PriorityQHeap -->
-    <typedef-decl name='PriorityQHeap' type-id='type-id-542' filepath='libtess/priorityq-heap.h' line='81' column='1' id='type-id-558'/>
+    <typedef-decl name='PriorityQHeap' type-id='type-id-547' filepath='libtess/priorityq-heap.h' line='81' column='1' id='type-id-562'/>
     <!-- typedef PriorityQSort PriorityQSort -->
-    <typedef-decl name='PriorityQSort' type-id='type-id-546' filepath='libtess/priorityq.h' line='95' column='1' id='type-id-559'/>
+    <typedef-decl name='PriorityQSort' type-id='type-id-551' filepath='libtess/priorityq.h' line='95' column='1' id='type-id-563'/>
     <!-- typedef long int[8] __jmp_buf -->
-    <typedef-decl name='__jmp_buf' type-id='type-id-504' filepath='/usr/include/bits/setjmp.h' line='32' column='1' id='type-id-213'/>
+    <typedef-decl name='__jmp_buf' type-id='type-id-521' filepath='/usr/include/bits/setjmp.h' line='32' column='1' id='type-id-213'/>
     <!-- typedef __sigset_t __sigset_t -->
-    <typedef-decl name='__sigset_t' type-id='type-id-214' filepath='/usr/include/bits/sigset.h' line='32' column='1' id='type-id-552'/>
+    <typedef-decl name='__sigset_t' type-id='type-id-214' filepath='/usr/include/bits/sigset.h' line='32' column='1' id='type-id-557'/>
     <!-- typedef __jmp_buf_tag[1] jmp_buf -->
-    <typedef-decl name='jmp_buf' type-id='type-id-502' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-534'/>
+    <typedef-decl name='jmp_buf' type-id='type-id-519' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-540'/>
     <!-- unnamed&#45;enum&#45;underlying&#45;type&#45;32 -->
-    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-38'/>
-    <!-- unsigned long int -->
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
+    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-50'/>
     <!-- unsigned long int[16] -->
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-553'>
+    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='1024' id='type-id-558'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-3' id='type-id-560'/>
+      <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-17' id='type-id-564'/>
     </array-type-def>
-    <!-- ActiveRegion* -->
-    <pointer-type-def type-id='type-id-554' size-in-bits='64' id='type-id-519'/>
     <!-- DictList* -->
-    <pointer-type-def type-id='type-id-555' size-in-bits='64' id='type-id-526'/>
+    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-532'/>
     <!-- DictListNode* -->
-    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-508'/>
-    <!-- GLUface* -->
-    <pointer-type-def type-id='type-id-522' size-in-bits='64' id='type-id-516'/>
-    <!-- GLUhalfEdge* -->
-    <pointer-type-def type-id='type-id-523' size-in-bits='64' id='type-id-507'/>
+    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-514'/>
     <!-- GLUmesh* -->
-    <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-560' size-in-bits='64' id='type-id-531'/>
     <!-- GLUtesselator* -->
-    <pointer-type-def type-id='type-id-557' size-in-bits='64' id='type-id-561'/>
-    <!-- GLUvertex* -->
-    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-518'/>
+    <pointer-type-def type-id='type-id-561' size-in-bits='64' id='type-id-565'/>
     <!-- GLfloat* -->
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-75'/>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-84'/>
     <!-- PQSortKey* -->
-    <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-548'/>
+    <pointer-type-def type-id='type-id-566' size-in-bits='64' id='type-id-553'/>
     <!-- PQSortKey** -->
-    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-549'/>
+    <pointer-type-def type-id='type-id-553' size-in-bits='64' id='type-id-554'/>
     <!-- PQhandleElem* -->
-    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-544'/>
+    <pointer-type-def type-id='type-id-541' size-in-bits='64' id='type-id-549'/>
     <!-- PQnode* -->
-    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-543'/>
+    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-548'/>
     <!-- PriorityQHeap* -->
-    <pointer-type-def type-id='type-id-558' size-in-bits='64' id='type-id-547'/>
+    <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-552'/>
     <!-- PriorityQSort* -->
-    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-527'/>
+    <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-533'/>
     <!-- int (*)(PQHeapKey, PQHeapKey) -->
-    <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-545'/>
+    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-550'/>
     <!-- int (*)(PQSortKey, PQSortKey) -->
-    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-551'/>
+    <pointer-type-def type-id='type-id-568' size-in-bits='64' id='type-id-556'/>
     <!-- int (*)(void*, DictListKey, DictListKey) -->
-    <pointer-type-def type-id='type-id-565' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-569' size-in-bits='64' id='type-id-526'/>
     <!-- void (*)(GLUmesh*) -->
-    <pointer-type-def type-id='type-id-566' size-in-bits='64' id='type-id-530'/>
+    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-536'/>
     <!-- void (*)(GLboolean) -->
-    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-535'/>
     <!-- void (*)(GLboolean, void*) -->
-    <pointer-type-def type-id='type-id-568' size-in-bits='64' id='type-id-531'/>
+    <pointer-type-def type-id='type-id-572' size-in-bits='64' id='type-id-537'/>
     <!-- void (*)(GLdouble*, void**, GLfloat*, void**) -->
-    <pointer-type-def type-id='type-id-569' size-in-bits='64' id='type-id-528'/>
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-534'/>
     <!-- void (*)(GLdouble*, void**, GLfloat*, void**, void*) -->
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-533'/>
+    <pointer-type-def type-id='type-id-574' size-in-bits='64' id='type-id-539'/>
     <!-- void (*)(GLenum) -->
-    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-11'/>
+    <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-24'/>
     <!-- void (*)(GLenum, void*) -->
-    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-14'/>
+    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-27'/>
     <!-- void (*)(void*) -->
-    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-15'/>
+    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-28'/>
     <!-- void (*)(void*, void*) -->
-    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-532'/>
+    <pointer-type-def type-id='type-id-575' size-in-bits='64' id='type-id-538'/>
     <!-- void** -->
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-287'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-287'/>
     <!-- typedef void* DictListKey -->
-    <typedef-decl name='DictListKey' type-id='type-id-17' filepath='libtess/dict.h' line='60' column='1' id='type-id-514'/>
+    <typedef-decl name='DictListKey' type-id='type-id-30' filepath='libtess/dict.h' line='60' column='1' id='type-id-528'/>
     <!-- typedef void* PQHeapKey -->
-    <typedef-decl name='PQHeapKey' type-id='type-id-17' filepath='libtess/priorityq-heap.h' line='79' column='1' id='type-id-538'/>
+    <typedef-decl name='PQHeapKey' type-id='type-id-30' filepath='libtess/priorityq-heap.h' line='79' column='1' id='type-id-543'/>
     <!-- typedef PQHeapKey PQSortKey -->
-    <typedef-decl name='PQSortKey' type-id='type-id-538' filepath='libtess/priorityq.h' line='93' column='1' id='type-id-562'/>
+    <typedef-decl name='PQSortKey' type-id='type-id-543' filepath='libtess/priorityq.h' line='93' column='1' id='type-id-566'/>
     <!-- GLUtesselator* gluNewTess() -->
     <function-decl name='gluNewTess' mangled-name='gluNewTess' filepath='libtess/tess.c' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewTess'>
       <!-- GLUtesselator* -->
-      <return type-id='type-id-561'/>
+      <return type-id='type-id-565'/>
     </function-decl>
     <!-- void gluDeleteTess(GLUtesselator*) -->
     <function-decl name='gluDeleteTess' mangled-name='gluDeleteTess' filepath='libtess/tess.c' line='193' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteTess'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='193' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='193' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluTessProperty(GLUtesselator*, GLenum, GLdouble) -->
     <function-decl name='gluTessProperty' mangled-name='gluTessProperty' filepath='libtess/tess.c' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessProperty'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='201' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='201' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libtess/tess.c' line='201' column='1'/>
+      <parameter type-id='type-id-10' filepath='libtess/tess.c' line='201' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libtess/tess.c' line='201' column='1'/>
+      <parameter type-id='type-id-500' filepath='libtess/tess.c' line='201' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluGetTessProperty(GLUtesselator*, GLenum, GLdouble*) -->
     <function-decl name='gluGetTessProperty' mangled-name='gluGetTessProperty' filepath='libtess/tess.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetTessProperty'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='240' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='240' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libtess/tess.c' line='240' column='1'/>
+      <parameter type-id='type-id-10' filepath='libtess/tess.c' line='240' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libtess/tess.c' line='240' column='1'/>
+      <parameter type-id='type-id-576' filepath='libtess/tess.c' line='240' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluTessNormal(GLUtesselator*, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluTessNormal' mangled-name='gluTessNormal' filepath='libtess/tess.c' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessNormal'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='268' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='268' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libtess/tess.c' line='268' column='1'/>
+      <parameter type-id='type-id-500' filepath='libtess/tess.c' line='268' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libtess/tess.c' line='268' column='1'/>
+      <parameter type-id='type-id-500' filepath='libtess/tess.c' line='268' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libtess/tess.c' line='268' column='1'/>
+      <parameter type-id='type-id-500' filepath='libtess/tess.c' line='268' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluTessCallback(GLUtesselator*, GLenum, _GLUfuncptr) -->
     <function-decl name='gluTessCallback' mangled-name='gluTessCallback' filepath='libtess/tess.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessCallback'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='276' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='276' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libtess/tess.c' line='276' column='1'/>
+      <parameter type-id='type-id-10' filepath='libtess/tess.c' line='276' column='1'/>
       <!-- parameter of type 'typedef _GLUfuncptr' -->
-      <parameter type-id='type-id-77' filepath='libtess/tess.c' line='276' column='1'/>
+      <parameter type-id='type-id-86' filepath='libtess/tess.c' line='276' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluTessVertex(GLUtesselator*, GLdouble*, void*) -->
     <function-decl name='gluTessVertex' mangled-name='gluTessVertex' filepath='libtess/tess.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessVertex'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='415' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='415' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libtess/tess.c' line='415' column='1'/>
+      <parameter type-id='type-id-576' filepath='libtess/tess.c' line='415' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libtess/tess.c' line='415' column='1'/>
+      <parameter type-id='type-id-30' filepath='libtess/tess.c' line='415' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluTessBeginPolygon(GLUtesselator*, void*) -->
     <function-decl name='gluTessBeginPolygon' mangled-name='gluTessBeginPolygon' filepath='libtess/tess.c' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessBeginPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='462' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='462' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libtess/tess.c' line='462' column='1'/>
+      <parameter type-id='type-id-30' filepath='libtess/tess.c' line='462' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluTessBeginContour(GLUtesselator*) -->
     <function-decl name='gluTessBeginContour' mangled-name='gluTessBeginContour' filepath='libtess/tess.c' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessBeginContour'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='476' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='476' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluTessEndContour(GLUtesselator*) -->
     <function-decl name='gluTessEndContour' mangled-name='gluTessEndContour' filepath='libtess/tess.c' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessEndContour'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='493' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='493' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluTessEndPolygon(GLUtesselator*) -->
     <function-decl name='gluTessEndPolygon' mangled-name='gluTessEndPolygon' filepath='libtess/tess.c' line='500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessEndPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='500' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='500' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluBeginPolygon(GLUtesselator*) -->
     <function-decl name='gluBeginPolygon' mangled-name='gluBeginPolygon' filepath='libtess/tess.c' line='611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBeginPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='611' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='611' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluNextContour(GLUtesselator*, GLenum) -->
     <function-decl name='gluNextContour' mangled-name='gluNextContour' filepath='libtess/tess.c' line='620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNextContour'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='620' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='620' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libtess/tess.c' line='620' column='1'/>
+      <parameter type-id='type-id-10' filepath='libtess/tess.c' line='620' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluEndPolygon(GLUtesselator*) -->
     <function-decl name='gluEndPolygon' mangled-name='gluEndPolygon' filepath='libtess/tess.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluEndPolygon'>
       <!-- parameter of type 'GLUtesselator*' -->
-      <parameter type-id='type-id-561' filepath='libtess/tess.c' line='628' column='1'/>
+      <parameter type-id='type-id-565' filepath='libtess/tess.c' line='628' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- int (PQHeapKey, PQHeapKey) -->
-    <function-type size-in-bits='64' id='type-id-563'>
+    <function-type size-in-bits='64' id='type-id-567'>
       <!-- parameter of type 'typedef PQHeapKey' -->
-      <parameter type-id='type-id-538'/>
+      <parameter type-id='type-id-543'/>
       <!-- parameter of type 'typedef PQHeapKey' -->
-      <parameter type-id='type-id-538'/>
+      <parameter type-id='type-id-543'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- int (PQSortKey, PQSortKey) -->
-    <function-type size-in-bits='64' id='type-id-564'>
+    <function-type size-in-bits='64' id='type-id-568'>
       <!-- parameter of type 'typedef PQSortKey' -->
-      <parameter type-id='type-id-562'/>
+      <parameter type-id='type-id-566'/>
       <!-- parameter of type 'typedef PQSortKey' -->
-      <parameter type-id='type-id-562'/>
+      <parameter type-id='type-id-566'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- int (void*, DictListKey, DictListKey) -->
-    <function-type size-in-bits='64' id='type-id-565'>
+    <function-type size-in-bits='64' id='type-id-569'>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-30'/>
       <!-- parameter of type 'typedef DictListKey' -->
-      <parameter type-id='type-id-514'/>
+      <parameter type-id='type-id-528'/>
       <!-- parameter of type 'typedef DictListKey' -->
-      <parameter type-id='type-id-514'/>
+      <parameter type-id='type-id-528'/>
       <!-- int -->
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-3'/>
     </function-type>
     <!-- void (GLUmesh*) -->
-    <function-type size-in-bits='64' id='type-id-566'>
+    <function-type size-in-bits='64' id='type-id-570'>
       <!-- parameter of type 'GLUmesh*' -->
-      <parameter type-id='type-id-525'/>
+      <parameter type-id='type-id-531'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (GLboolean) -->
-    <function-type size-in-bits='64' id='type-id-567'>
+    <function-type size-in-bits='64' id='type-id-571'>
       <!-- parameter of type 'typedef GLboolean' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-76'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (GLboolean, void*) -->
-    <function-type size-in-bits='64' id='type-id-568'>
+    <function-type size-in-bits='64' id='type-id-572'>
       <!-- parameter of type 'typedef GLboolean' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-76'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-30'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**) -->
-    <function-type size-in-bits='64' id='type-id-569'>
+    <function-type size-in-bits='64' id='type-id-573'>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572'/>
+      <parameter type-id='type-id-576'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-287'/>
       <!-- parameter of type 'GLfloat*' -->
-      <parameter type-id='type-id-75'/>
+      <parameter type-id='type-id-84'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-287'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (GLdouble*, void**, GLfloat*, void**, void*) -->
-    <function-type size-in-bits='64' id='type-id-570'>
+    <function-type size-in-bits='64' id='type-id-574'>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572'/>
+      <parameter type-id='type-id-576'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-287'/>
       <!-- parameter of type 'GLfloat*' -->
-      <parameter type-id='type-id-75'/>
+      <parameter type-id='type-id-84'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-287'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-30'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-571'>
+    <function-type size-in-bits='64' id='type-id-575'>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-30'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-30'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
     <!-- void (void) -->
-    <function-type size-in-bits='64' id='type-id-573'>
+    <function-type size-in-bits='64' id='type-id-577'>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- typedef unsigned int GLenum -->
-    <typedef-decl name='GLenum' type-id='type-id-363' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-41'/>
+    <typedef-decl name='GLenum' type-id='type-id-363' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-10'/>
     <!-- typedef unsigned char GLubyte -->
-    <typedef-decl name='GLubyte' type-id='type-id-574' filepath='../../../include/GL/gl.h' line='156' column='1' id='type-id-575'/>
+    <typedef-decl name='GLubyte' type-id='type-id-578' filepath='../../../include/GL/gl.h' line='156' column='1' id='type-id-579'/>
     <!-- unsigned char -->
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-574'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-578'/>
     <!-- unsigned int -->
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-363'/>
     <!-- const GLubyte -->
-    <qualified-type-def type-id='type-id-575' const='yes' id='type-id-576'/>
+    <qualified-type-def type-id='type-id-579' const='yes' id='type-id-580'/>
     <!-- const GLubyte* -->
-    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-577'/>
+    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-581'/>
     <!-- const GLubyte* gluErrorString(GLenum) -->
     <function-decl name='gluErrorString' mangled-name='gluErrorString' filepath='libutil/error.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluErrorString'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/error.c' line='66' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/error.c' line='66' column='1'/>
       <!-- const GLubyte* -->
-      <return type-id='type-id-577'/>
+      <return type-id='type-id-581'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- int -->
-    <type-decl name='int' size-in-bits='32' id='type-id-10'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-3'/>
     <!-- typedef int GLint -->
-    <typedef-decl name='GLint' type-id='type-id-10' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-74'/>
+    <typedef-decl name='GLint' type-id='type-id-3' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-83'/>
     <!-- typedef int GLsizei -->
-    <typedef-decl name='GLsizei' type-id='type-id-10' filepath='../../../include/GL/gl.h' line='159' column='1' id='type-id-578'/>
+    <typedef-decl name='GLsizei' type-id='type-id-3' filepath='../../../include/GL/gl.h' line='159' column='1' id='type-id-582'/>
     <!-- GLint gluScaleImage(GLenum, GLsizei, GLsizei, GLenum, void*, GLsizei, GLsizei, GLenum, void*) -->
     <function-decl name='gluScaleImage' mangled-name='gluScaleImage' filepath='libutil/mipmap.c' line='3498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluScaleImage'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='3498' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='3498' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='3498' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='3498' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='3499' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='3499' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libutil/mipmap.c' line='3499' column='1'/>
+      <parameter type-id='type-id-30' filepath='libutil/mipmap.c' line='3499' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='3500' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='3500' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='3500' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='3500' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libutil/mipmap.c' line='3501' column='1'/>
+      <parameter type-id='type-id-30' filepath='libutil/mipmap.c' line='3501' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- GLint gluBuild1DMipmapLevels(GLenum, GLint, GLsizei, GLenum, GLenum, GLint, GLint, GLint, void*) -->
     <function-decl name='gluBuild1DMipmapLevels' mangled-name='gluBuild1DMipmapLevels' filepath='libutil/mipmap.c' line='3643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild1DMipmapLevels'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='3643' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='3643' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='3643' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='3643' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='3644' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='3644' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='3645' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='3645' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='3645' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='3645' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='3646' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='3646' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='3646' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='3646' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='3646' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='3646' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libutil/mipmap.c' line='3647' column='1'/>
+      <parameter type-id='type-id-30' filepath='libutil/mipmap.c' line='3647' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- GLint gluBuild1DMipmaps(GLenum, GLint, GLsizei, GLenum, GLenum, void*) -->
     <function-decl name='gluBuild1DMipmaps' mangled-name='gluBuild1DMipmaps' filepath='libutil/mipmap.c' line='3672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild1DMipmaps'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='3672' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='3672' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='3672' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='3672' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='3673' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='3673' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='3673' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='3673' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libutil/mipmap.c' line='3674' column='1'/>
+      <parameter type-id='type-id-30' filepath='libutil/mipmap.c' line='3674' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- GLint gluBuild2DMipmapLevels(GLenum, GLint, GLsizei, GLsizei, GLenum, GLenum, GLint, GLint, GLint, void*) -->
     <function-decl name='gluBuild2DMipmapLevels' mangled-name='gluBuild2DMipmapLevels' filepath='libutil/mipmap.c' line='4552' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild2DMipmapLevels'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='4552' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='4552' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='4552' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='4552' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='4553' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='4553' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='4553' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='4553' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='4554' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='4554' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='4554' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='4554' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='4555' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='4555' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='4555' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='4555' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='4555' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='4555' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libutil/mipmap.c' line='4556' column='1'/>
+      <parameter type-id='type-id-30' filepath='libutil/mipmap.c' line='4556' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- GLint gluBuild2DMipmaps(GLenum, GLint, GLsizei, GLsizei, GLenum, GLenum, void*) -->
     <function-decl name='gluBuild2DMipmaps' mangled-name='gluBuild2DMipmaps' filepath='libutil/mipmap.c' line='4584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild2DMipmaps'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='4584' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='4584' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='4584' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='4584' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='4585' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='4585' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='4585' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='4585' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='4586' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='4586' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='4586' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='4586' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libutil/mipmap.c' line='4587' column='1'/>
+      <parameter type-id='type-id-30' filepath='libutil/mipmap.c' line='4587' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- GLint gluBuild3DMipmapLevels(GLenum, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, GLint, GLint, GLint, void*) -->
     <function-decl name='gluBuild3DMipmapLevels' mangled-name='gluBuild3DMipmapLevels' filepath='libutil/mipmap.c' line='8444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild3DMipmapLevels'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='8444' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='8444' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='8444' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='8444' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='8445' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='8445' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='8445' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='8445' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='8445' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='8445' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='8446' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='8446' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='8446' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='8446' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='8447' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='8447' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='8447' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='8447' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='8447' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='8447' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libutil/mipmap.c' line='8448' column='1'/>
+      <parameter type-id='type-id-30' filepath='libutil/mipmap.c' line='8448' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- GLint gluBuild3DMipmaps(GLenum, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, void*) -->
     <function-decl name='gluBuild3DMipmaps' mangled-name='gluBuild3DMipmaps' filepath='libutil/mipmap.c' line='8482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluBuild3DMipmaps'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='8482' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='8482' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/mipmap.c' line='8482' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/mipmap.c' line='8482' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='8483' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='8483' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='8483' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='8483' column='1'/>
       <!-- parameter of type 'typedef GLsizei' -->
-      <parameter type-id='type-id-578' filepath='libutil/mipmap.c' line='8483' column='1'/>
+      <parameter type-id='type-id-582' filepath='libutil/mipmap.c' line='8483' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-17' filepath='libutil/mipmap.c' line='8484' column='1'/>
+      <parameter type-id='type-id-30' filepath='libutil/mipmap.c' line='8484' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- void -->
-    <type-decl name='void' id='type-id-19'/>
+    <type-decl name='void' id='type-id-32'/>
     <!-- void* -->
-    <pointer-type-def type-id='type-id-19' id='type-id-17'/>
+    <pointer-type-def type-id='type-id-32' id='type-id-30'/>
   </abi-instr>
   <abi-instr address-size='64' path='libutil/project.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- double -->
-    <type-decl name='double' size-in-bits='64' id='type-id-579'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-583'/>
     <!-- typedef double GLclampd -->
-    <typedef-decl name='GLclampd' type-id='type-id-579' filepath='../../../include/GL/gl.h' line='163' column='1' id='type-id-580'/>
+    <typedef-decl name='GLclampd' type-id='type-id-583' filepath='../../../include/GL/gl.h' line='163' column='1' id='type-id-584'/>
     <!-- typedef double GLdouble -->
-    <typedef-decl name='GLdouble' type-id='type-id-579' filepath='../../../include/GL/gl.h' line='162' column='1' id='type-id-499'/>
+    <typedef-decl name='GLdouble' type-id='type-id-583' filepath='../../../include/GL/gl.h' line='162' column='1' id='type-id-500'/>
     <!-- GLdouble* -->
-    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-572'/>
+    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-576'/>
     <!-- GLint* -->
-    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-581'/>
+    <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-585'/>
     <!-- const GLdouble -->
-    <qualified-type-def type-id='type-id-499' const='yes' id='type-id-582'/>
+    <qualified-type-def type-id='type-id-500' const='yes' id='type-id-586'/>
     <!-- const GLdouble* -->
-    <pointer-type-def type-id='type-id-582' size-in-bits='64' id='type-id-583'/>
+    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-587'/>
     <!-- const GLint -->
-    <qualified-type-def type-id='type-id-74' const='yes' id='type-id-584'/>
+    <qualified-type-def type-id='type-id-83' const='yes' id='type-id-588'/>
     <!-- const GLint* -->
-    <pointer-type-def type-id='type-id-584' size-in-bits='64' id='type-id-76'/>
+    <pointer-type-def type-id='type-id-588' size-in-bits='64' id='type-id-85'/>
     <!-- void gluOrtho2D(GLdouble, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluOrtho2D' mangled-name='gluOrtho2D' filepath='libutil/project.c' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluOrtho2D'>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='57' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='57' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='57' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='57' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='57' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='57' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='57' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='57' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluPerspective(GLdouble, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluPerspective' mangled-name='gluPerspective' filepath='libutil/project.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPerspective'>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='65' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='65' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='65' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='65' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='65' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='65' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='65' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='65' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluLookAt(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble) -->
     <function-decl name='gluLookAt' mangled-name='gluLookAt' filepath='libutil/project.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluLookAt'>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='108' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='108' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='108' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='108' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='108' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='108' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='108' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='108' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='109' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='109' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='109' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='109' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='109' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='109' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='109' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='109' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='110' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='110' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- GLint gluProject(GLdouble, GLdouble, GLdouble, const GLdouble*, const GLdouble*, const GLint*, GLdouble*, GLdouble*, GLdouble*) -->
     <function-decl name='gluProject' mangled-name='gluProject' filepath='libutil/project.c' line='234' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluProject'>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='234' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='234' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='234' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='234' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='234' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='234' column='1'/>
       <!-- parameter of type 'const GLdouble*' -->
-      <parameter type-id='type-id-583' filepath='libutil/project.c' line='235' column='1'/>
+      <parameter type-id='type-id-587' filepath='libutil/project.c' line='235' column='1'/>
       <!-- parameter of type 'const GLdouble*' -->
-      <parameter type-id='type-id-583' filepath='libutil/project.c' line='236' column='1'/>
+      <parameter type-id='type-id-587' filepath='libutil/project.c' line='236' column='1'/>
       <!-- parameter of type 'const GLint*' -->
-      <parameter type-id='type-id-76' filepath='libutil/project.c' line='237' column='1'/>
+      <parameter type-id='type-id-85' filepath='libutil/project.c' line='237' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='238' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='238' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='238' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='238' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='238' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='238' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- GLint gluUnProject(GLdouble, GLdouble, GLdouble, const GLdouble*, const GLdouble*, const GLint*, GLdouble*, GLdouble*, GLdouble*) -->
     <function-decl name='gluUnProject' mangled-name='gluUnProject' filepath='libutil/project.c' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluUnProject'>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='269' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='269' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='269' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='269' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='269' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='269' column='1'/>
       <!-- parameter of type 'const GLdouble*' -->
-      <parameter type-id='type-id-583' filepath='libutil/project.c' line='270' column='1'/>
+      <parameter type-id='type-id-587' filepath='libutil/project.c' line='270' column='1'/>
       <!-- parameter of type 'const GLdouble*' -->
-      <parameter type-id='type-id-583' filepath='libutil/project.c' line='271' column='1'/>
+      <parameter type-id='type-id-587' filepath='libutil/project.c' line='271' column='1'/>
       <!-- parameter of type 'const GLint*' -->
-      <parameter type-id='type-id-76' filepath='libutil/project.c' line='272' column='1'/>
+      <parameter type-id='type-id-85' filepath='libutil/project.c' line='272' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='273' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='273' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='273' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='273' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='273' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='273' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- GLint gluUnProject4(GLdouble, GLdouble, GLdouble, GLdouble, const GLdouble*, const GLdouble*, const GLint*, GLclampd, GLclampd, GLdouble*, GLdouble*, GLdouble*, GLdouble*) -->
     <function-decl name='gluUnProject4' mangled-name='gluUnProject4' filepath='libutil/project.c' line='308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluUnProject4'>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='308' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='308' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='308' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='308' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='308' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='308' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='308' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='308' column='1'/>
       <!-- parameter of type 'const GLdouble*' -->
-      <parameter type-id='type-id-583' filepath='libutil/project.c' line='309' column='1'/>
+      <parameter type-id='type-id-587' filepath='libutil/project.c' line='309' column='1'/>
       <!-- parameter of type 'const GLdouble*' -->
-      <parameter type-id='type-id-583' filepath='libutil/project.c' line='310' column='1'/>
+      <parameter type-id='type-id-587' filepath='libutil/project.c' line='310' column='1'/>
       <!-- parameter of type 'const GLint*' -->
-      <parameter type-id='type-id-76' filepath='libutil/project.c' line='311' column='1'/>
+      <parameter type-id='type-id-85' filepath='libutil/project.c' line='311' column='1'/>
       <!-- parameter of type 'typedef GLclampd' -->
-      <parameter type-id='type-id-580' filepath='libutil/project.c' line='312' column='1'/>
+      <parameter type-id='type-id-584' filepath='libutil/project.c' line='312' column='1'/>
       <!-- parameter of type 'typedef GLclampd' -->
-      <parameter type-id='type-id-580' filepath='libutil/project.c' line='312' column='1'/>
+      <parameter type-id='type-id-584' filepath='libutil/project.c' line='312' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='313' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='313' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='313' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='313' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='313' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='313' column='1'/>
       <!-- parameter of type 'GLdouble*' -->
-      <parameter type-id='type-id-572' filepath='libutil/project.c' line='314' column='1'/>
+      <parameter type-id='type-id-576' filepath='libutil/project.c' line='314' column='1'/>
       <!-- typedef GLint -->
-      <return type-id='type-id-74'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <!-- void gluPickMatrix(GLdouble, GLdouble, GLdouble, GLdouble, GLint*) -->
     <function-decl name='gluPickMatrix' mangled-name='gluPickMatrix' filepath='libutil/project.c' line='348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPickMatrix'>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='348' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='348' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='348' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='348' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='348' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='348' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/project.c' line='348' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/project.c' line='348' column='1'/>
       <!-- parameter of type 'GLint*' -->
-      <parameter type-id='type-id-581' filepath='libutil/project.c' line='349' column='1'/>
+      <parameter type-id='type-id-585' filepath='libutil/project.c' line='349' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- struct GLUquadric -->
-    <class-decl name='GLUquadric' size-in-bits='192' is-struct='yes' visibility='default' filepath='libutil/quad.c' line='45' column='1' id='type-id-585'>
+    <class-decl name='GLUquadric' size-in-bits='192' is-struct='yes' visibility='default' filepath='libutil/quad.c' line='45' column='1' id='type-id-589'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- GLint GLUquadric::normals -->
-        <var-decl name='normals' type-id='type-id-74' visibility='default' filepath='libutil/quad.c' line='46' column='1'/>
+        <var-decl name='normals' type-id='type-id-83' visibility='default' filepath='libutil/quad.c' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- GLboolean GLUquadric::textureCoords -->
-        <var-decl name='textureCoords' type-id='type-id-66' visibility='default' filepath='libutil/quad.c' line='47' column='1'/>
+        <var-decl name='textureCoords' type-id='type-id-76' visibility='default' filepath='libutil/quad.c' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- GLint GLUquadric::orientation -->
-        <var-decl name='orientation' type-id='type-id-74' visibility='default' filepath='libutil/quad.c' line='48' column='1'/>
+        <var-decl name='orientation' type-id='type-id-83' visibility='default' filepath='libutil/quad.c' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- GLint GLUquadric::drawStyle -->
-        <var-decl name='drawStyle' type-id='type-id-74' visibility='default' filepath='libutil/quad.c' line='49' column='1'/>
+        <var-decl name='drawStyle' type-id='type-id-83' visibility='default' filepath='libutil/quad.c' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void (* GLUquadric::errorCallback)(GLint) -->
-        <var-decl name='errorCallback' type-id='type-id-586' visibility='default' filepath='libutil/quad.c' line='50' column='1'/>
+        <var-decl name='errorCallback' type-id='type-id-590' visibility='default' filepath='libutil/quad.c' line='50' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef GLUquadric GLUquadric -->
-    <typedef-decl name='GLUquadric' type-id='type-id-585' filepath='../../../include/GL/glu.h' line='275' column='1' id='type-id-587'/>
+    <typedef-decl name='GLUquadric' type-id='type-id-589' filepath='../../../include/GL/glu.h' line='275' column='1' id='type-id-591'/>
     <!-- typedef unsigned char GLboolean -->
-    <typedef-decl name='GLboolean' type-id='type-id-574' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-66'/>
+    <typedef-decl name='GLboolean' type-id='type-id-578' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-76'/>
     <!-- typedef void (*)(void) _GLUfuncptr -->
-    <typedef-decl name='_GLUfuncptr' type-id='type-id-12' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-77'/>
+    <typedef-decl name='_GLUfuncptr' type-id='type-id-25' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-86'/>
     <!-- GLUquadric* -->
-    <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-588'/>
+    <pointer-type-def type-id='type-id-591' size-in-bits='64' id='type-id-592'/>
     <!-- void (*)(GLint) -->
-    <pointer-type-def type-id='type-id-589' size-in-bits='64' id='type-id-586'/>
+    <pointer-type-def type-id='type-id-593' size-in-bits='64' id='type-id-590'/>
     <!-- void (*)(void) -->
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-12'/>
+    <pointer-type-def type-id='type-id-577' size-in-bits='64' id='type-id-25'/>
     <!-- GLUquadric* gluNewQuadric() -->
     <function-decl name='gluNewQuadric' mangled-name='gluNewQuadric' filepath='libutil/quad.c' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewQuadric'>
       <!-- GLUquadric* -->
-      <return type-id='type-id-588'/>
+      <return type-id='type-id-592'/>
     </function-decl>
     <!-- void gluDeleteQuadric(GLUquadric*) -->
     <function-decl name='gluDeleteQuadric' mangled-name='gluDeleteQuadric' filepath='libutil/quad.c' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDeleteQuadric'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='73' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='73' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluQuadricCallback(GLUquadric*, GLenum, _GLUfuncptr) -->
     <function-decl name='gluQuadricCallback' mangled-name='gluQuadricCallback' filepath='libutil/quad.c' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricCallback'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='86' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='86' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/quad.c' line='86' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/quad.c' line='86' column='1'/>
       <!-- parameter of type 'typedef _GLUfuncptr' -->
-      <parameter type-id='type-id-77' filepath='libutil/quad.c' line='86' column='1'/>
+      <parameter type-id='type-id-86' filepath='libutil/quad.c' line='86' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluQuadricNormals(GLUquadric*, GLenum) -->
     <function-decl name='gluQuadricNormals' mangled-name='gluQuadricNormals' filepath='libutil/quad.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricNormals'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='99' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='99' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/quad.c' line='99' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/quad.c' line='99' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluQuadricTexture(GLUquadric*, GLboolean) -->
     <function-decl name='gluQuadricTexture' mangled-name='gluQuadricTexture' filepath='libutil/quad.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricTexture'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='114' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='114' column='1'/>
       <!-- parameter of type 'typedef GLboolean' -->
-      <parameter type-id='type-id-66' filepath='libutil/quad.c' line='114' column='1'/>
+      <parameter type-id='type-id-76' filepath='libutil/quad.c' line='114' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluQuadricOrientation(GLUquadric*, GLenum) -->
     <function-decl name='gluQuadricOrientation' mangled-name='gluQuadricOrientation' filepath='libutil/quad.c' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricOrientation'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='120' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='120' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/quad.c' line='120' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/quad.c' line='120' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluQuadricDrawStyle(GLUquadric*, GLenum) -->
     <function-decl name='gluQuadricDrawStyle' mangled-name='gluQuadricDrawStyle' filepath='libutil/quad.c' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluQuadricDrawStyle'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='134' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='134' column='1'/>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/quad.c' line='134' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/quad.c' line='134' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluCylinder(GLUquadric*, GLdouble, GLdouble, GLdouble, GLint, GLint) -->
     <function-decl name='gluCylinder' mangled-name='gluCylinder' filepath='libutil/quad.c' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluCylinder'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='150' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='150' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='150' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='150' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='150' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='150' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='151' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='151' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/quad.c' line='151' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/quad.c' line='151' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/quad.c' line='151' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/quad.c' line='151' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluDisk(GLUquadric*, GLdouble, GLdouble, GLint, GLint) -->
     <function-decl name='gluDisk' mangled-name='gluDisk' filepath='libutil/quad.c' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluDisk'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='424' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='424' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='424' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='424' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='424' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='424' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/quad.c' line='425' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/quad.c' line='425' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/quad.c' line='425' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/quad.c' line='425' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluPartialDisk(GLUquadric*, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble) -->
     <function-decl name='gluPartialDisk' mangled-name='gluPartialDisk' filepath='libutil/quad.c' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluPartialDisk'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='431' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='431' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='431' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='431' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='432' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='432' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/quad.c' line='432' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/quad.c' line='432' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/quad.c' line='432' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/quad.c' line='432' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='433' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='433' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='433' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='433' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void gluSphere(GLUquadric*, GLdouble, GLint, GLint) -->
     <function-decl name='gluSphere' mangled-name='gluSphere' filepath='libutil/quad.c' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluSphere'>
       <!-- parameter of type 'GLUquadric*' -->
-      <parameter type-id='type-id-588' filepath='libutil/quad.c' line='694' column='1'/>
+      <parameter type-id='type-id-592' filepath='libutil/quad.c' line='694' column='1'/>
       <!-- parameter of type 'typedef GLdouble' -->
-      <parameter type-id='type-id-499' filepath='libutil/quad.c' line='694' column='1'/>
+      <parameter type-id='type-id-500' filepath='libutil/quad.c' line='694' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/quad.c' line='694' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/quad.c' line='694' column='1'/>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74' filepath='libutil/quad.c' line='694' column='1'/>
+      <parameter type-id='type-id-83' filepath='libutil/quad.c' line='694' column='1'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-decl>
     <!-- void (GLint) -->
-    <function-type size-in-bits='64' id='type-id-589'>
+    <function-type size-in-bits='64' id='type-id-593'>
       <!-- parameter of type 'typedef GLint' -->
-      <parameter type-id='type-id-74'/>
+      <parameter type-id='type-id-83'/>
       <!-- void -->
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- const GLubyte* gluGetString(GLenum) -->
     <function-decl name='gluGetString' mangled-name='gluGetString' filepath='libutil/registry.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetString'>
       <!-- parameter of type 'typedef GLenum' -->
-      <parameter type-id='type-id-41' filepath='libutil/registry.c' line='44' column='1'/>
+      <parameter type-id='type-id-10' filepath='libutil/registry.c' line='44' column='1'/>
       <!-- const GLubyte* -->
-      <return type-id='type-id-577'/>
+      <return type-id='type-id-581'/>
     </function-decl>
     <!-- GLboolean gluCheckExtension(const GLubyte*, const GLubyte*) -->
     <function-decl name='gluCheckExtension' mangled-name='gluCheckExtension' filepath='libutil/registry.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluCheckExtension'>
       <!-- parameter of type 'const GLubyte*' -->
-      <parameter type-id='type-id-577' filepath='libutil/registry.c' line='63' column='1'/>
+      <parameter type-id='type-id-581' filepath='libutil/registry.c' line='63' column='1'/>
       <!-- parameter of type 'const GLubyte*' -->
-      <parameter type-id='type-id-577' filepath='libutil/registry.c' line='63' column='1'/>
+      <parameter type-id='type-id-581' filepath='libutil/registry.c' line='63' column='1'/>
       <!-- typedef GLboolean -->
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-76'/>
     </function-decl>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index 6f71157b..5e76815b 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -1,7 +1,7 @@ 
 ================ changes of 'libflatpak.so.0.10204.0'===============
   Functions changes summary: 0 Removed, 0 Changed (10 filtered out), 16 Added functions
   Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
-  Unreachable types summary: 3 removed (2 filtered out), 1 changed (15 filtered out), 6 added (4 filtered out) types
+  Unreachable types summary: 3 removed (2 filtered out), 1 changed (14 filtered out), 6 added (4 filtered out) types
 
   16 Added functions:
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index 1537aa9a..18f8a6b7 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -203,11 +203,9 @@ 
                                                                                                                 typedef name changed from SSL to RedsStreamPrivate at reds_stream.h:32:1
                                                                                                                 underlying type 'struct ssl_st' at ssl.h:1065:1 changed:
                                                                                                                   type name changed from 'ssl_st' to 'RedsStreamPrivate'
-                                                                                                                  type size changed from 5504 to 0 (in bits)
-                                                                                                                  94 data member deletions:
-                                                                                                                    'int version', at offset 0 (in bits) at ssl.h:1070:1
+                                                                                                                  type size changed from 5504 to 1472 (in bits)
+                                                                                                                  87 data member deletions:
                                                                                                                     'int type', at offset 32 (in bits) at ssl.h:1071:1
-                                                                                                                    'const SSL_METHOD* method', at offset 64 (in bits) at ssl.h:1073:1
                                                                                                                     'BIO* rbio', at offset 128 (in bits) at ssl.h:1080:1
                                                                                                                     'BIO* wbio', at offset 192 (in bits) at ssl.h:1081:1
                                                                                                                     'BIO* bbio', at offset 256 (in bits) at ssl.h:1082:1
@@ -224,16 +222,11 @@ 
                                                                                                                     'void* init_msg', at offset 704 (in bits) at ssl.h:1120:1
                                                                                                                     'int init_num', at offset 768 (in bits) at ssl.h:1121:1
                                                                                                                     'int init_off', at offset 800 (in bits) at ssl.h:1122:1
-                                                                                                                    'unsigned char* packet', at offset 832 (in bits) at ssl.h:1125:1
                                                                                                                     'unsigned int packet_length', at offset 896 (in bits) at ssl.h:1126:1
                                                                                                                     'ssl2_state_st* s2', at offset 960 (in bits) at ssl.h:1128:1
                                                                                                                     'ssl3_state_st* s3', at offset 1024 (in bits) at ssl.h:1129:1
                                                                                                                     'dtls1_state_st* d1', at offset 1088 (in bits) at ssl.h:1130:1
                                                                                                                     'int read_ahead', at offset 1152 (in bits) at ssl.h:1132:1
-                                                                                                                    'void (* msg_callback)(int, int, int, void*, size_t, SSL*, void*)', at offset 1216 (in bits) at ssl.h:1136:1
-                                                                                                                    'void* msg_callback_arg', at offset 1280 (in bits) at ssl.h:1137:1
-                                                                                                                    'int hit', at offset 1344 (in bits) at ssl.h:1139:1
-                                                                                                                    'X509_VERIFY_PARAM* param', at offset 1408 (in bits) at ssl.h:1141:1
                                                                                                                     'stack_st_SSL_CIPHER* cipher_list', at offset 1472 (in bits) at ssl.h:1149:1
                                                                                                                     'stack_st_SSL_CIPHER* cipher_list_by_id', at offset 1536 (in bits) at ssl.h:1150:1
                                                                                                                     'int mac_flags', at offset 1600 (in bits) at ssl.h:1154:1
@@ -299,6 +292,33 @@ 
                                                                                                                     'unsigned int tlsext_hb_pending', at offset 5408 (in bits) at ssl.h:1302:1
                                                                                                                     'unsigned int tlsext_hb_seq', at offset 5440 (in bits) at ssl.h:1303:1
                                                                                                                     'int renegotiate', at offset 5472 (in bits) at ssl.h:1308:1
+                                                                                                                  6 data member changes (1 filtered):
+                                                                                                                    type of 'int version' changed:
+                                                                                                                      entity changed from 'int' to 'SSL*'
+                                                                                                                      type size changed from 32 to 64 (in bits)
+                                                                                                                    and name of 'ssl_st::version' changed to 'RedsStreamPrivate::ssl' at reds_stream.c:80:1
+                                                                                                                    type of 'const SSL_METHOD* method' changed:
+                                                                                                                      entity changed from 'const SSL_METHOD*' to 'typedef RedsSASL' at reds_stream.c:76:1
+                                                                                                                      type size changed from 64 to 768 (in bits)
+                                                                                                                    and name of 'ssl_st::method' changed to 'RedsStreamPrivate::sasl' at reds_stream.c:83:1
+                                                                                                                    type of 'unsigned char* packet' changed:
+                                                                                                                      entity changed from 'unsigned char*' to 'typedef AsyncRead' at reds_stream.c:44:1
+                                                                                                                      type size changed from 64 to 384 (in bits)
+                                                                                                                    and name of 'ssl_st::packet' changed to 'RedsStreamPrivate::async_read' at reds_stream.c:86:1
+                                                                                                                    type of 'void (* msg_callback)(int, int, int, void*, size_t, SSL*, void*)' changed:
+                                                                                                                      in pointed to type 'function type void (int, int, int, void*, size_t, SSL*, void*)' at spice-core.h:88:1:
+                                                                                                                        entity changed from 'function type void (int, int, int, void*, size_t, SSL*, void*)' to 'typedef SpiceChannelEventInfo' at spice-core.h:88:1
+                                                                                                                        type size changed from 64 to 2560 (in bits)
+                                                                                                                    and name of 'ssl_st::msg_callback' changed to 'RedsStreamPrivate::info' at reds_stream.c:92:1
+                                                                                                                    type of 'int hit' changed:
+                                                                                                                      entity changed from 'int' to 'ssize_t (*)(RedsStream*, void*, size_t)'
+                                                                                                                      type size changed from 32 to 64 (in bits)
+                                                                                                                    and name of 'ssl_st::hit' changed to 'RedsStreamPrivate::write' at reds_stream.c:95:1
+                                                                                                                    type of 'X509_VERIFY_PARAM* param' changed:
+                                                                                                                      in pointed to type 'typedef X509_VERIFY_PARAM':
+                                                                                                                        entity changed from 'typedef X509_VERIFY_PARAM' to 'function type ssize_t (RedsStream*, const iovec*, int)'
+                                                                                                                        type size changed from 448 to 64 (in bits)
+                                                                                                                    and name of 'ssl_st::param' changed to 'RedsStreamPrivate::writev' at reds_stream.c:96:1
                                                                                                             and name of 'RedsStream::ssl' changed to 'RedsStream::priv' at reds_stream.h:42:1
                                                                                                             type of 'SpiceWatch* watch' changed:
                                                                                                               in pointed to type 'typedef SpiceWatch' at spice-core.h:68:1:
@@ -539,9 +559,24 @@ 
                                                                                   array element type 'typedef StreamAgent' changed:
                                                                                     underlying type 'struct StreamAgent' at red_worker.c:464:1 changed:
                                                                                       type size hasn't changed
-                                                                                      2 data member changes:
+                                                                                      3 data member changes:
                                                                                         type of 'Stream* stream' changed:
                                                                                           pointed to type 'typedef Stream' changed at red_worker.c:432:1, as reported earlier
+                                                                                        type of 'MJpegEncoder* mjpeg_encoder' changed:
+                                                                                          in pointed to type 'typedef MJpegEncoder' at mjpeg_encoder.h:30:1:
+                                                                                            underlying type 'struct MJpegEncoder' at mjpeg_encoder.c:155:1 changed:
+                                                                                              type size changed from 8128 to 8064 (in bits)
+                                                                                              1 data member deletion:
+                                                                                                'int rate_control_is_active', at offset 5760 (in bits) at mjpeg_encoder.c:166:1
+                                                                                              7 data member changes:
+                                                                                                type of 'void (* pixel_converter)(uint8_t*, uint8_t*)' changed:
+                                                                                                  in pointed to type 'function type void (uint8_t*, uint8_t*)':
+                                                                                                'MJpegEncoderRateControl rate_control' offset changed from 5824 to 5760 (in bits) (by -64 bits)
+                                                                                                'MJpegEncoderRateControlCbs cbs' offset changed from 7680 to 7616 (in bits) (by -64 bits)
+                                                                                                'void* cbs_opaque' offset changed from 7872 to 7808 (in bits) (by -64 bits)
+                                                                                                'uint64_t starting_bit_rate' offset changed from 7936 to 7872 (in bits) (by -64 bits)
+                                                                                                'uint64_t avg_quality' offset changed from 8000 to 7936 (in bits) (by -64 bits)
+                                                                                                'uint32_t num_frames' offset changed from 8064 to 8000 (in bits) (by -64 bits)
                                                                                         type of 'DisplayChannelClient* dcc' changed:
                                                                                           in pointed to type 'typedef DisplayChannelClient' at red_worker.c:435:1:
                                                                                             underlying type 'struct DisplayChannelClient' changed, as being reported
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt
index 2d2cbb93..d56a17aa 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt
@@ -1,6 +1,6 @@ 
 ================ changes of 'libspice-server.so.1.8.0'===============
-Leaf changes summary: 10 artifacts changed (13 filtered out)
-  Changed leaf types summary: 1 (13 filtered out) leaf types changed
+Leaf changes summary: 10 artifacts changed (14 filtered out)
+  Changed leaf types summary: 1 (14 filtered out) leaf types changed
   Removed/Changed/Added functions summary: 1 Removed, 0 Changed, 8 Added functions
   Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 867cc658..59d6ee11 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -25217,7 +25217,22 @@ 
     <typedef-decl name='AHardwareBuffer' type-id='4d45f321' filepath='frameworks/native/libs/nativewindow/include/android/hardware_buffer.h' line='333' column='1' id='7a58eec0'/>
   </abi-instr>
   <abi-instr address-size='32' path='frameworks/native/libs/nativewindow/ANativeWindow.cpp' language='LANG_C_plus_plus_14'>
+    <enum-decl name='ANativeWindowQuery' filepath='frameworks/native/libs/nativewindow/include/vndk/window.h' line='68' column='1' id='5fb38be8'>
+      <underlying-type type-id='9cac1fee'/>
+      <enumerator name='ANATIVEWINDOW_QUERY_MIN_UNDEQUEUED_BUFFERS' value='3'/>
+      <enumerator name='ANATIVEWINDOW_QUERY_DEFAULT_WIDTH' value='6'/>
+      <enumerator name='ANATIVEWINDOW_QUERY_DEFAULT_HEIGHT' value='7'/>
+      <enumerator name='ANATIVEWINDOW_QUERY_TRANSFORM_HINT' value='8'/>
+      <enumerator name='ANATIVEWINDOW_QUERY_BUFFER_AGE' value='13'/>
+      <enumerator name='ANATIVEWINDOW_QUERY_MIN_SWAP_INTERVAL' value='65536'/>
+      <enumerator name='ANATIVEWINDOW_QUERY_MAX_SWAP_INTERVAL' value='65537'/>
+      <enumerator name='ANATIVEWINDOW_QUERY_XDPI' value='65538'/>
+      <enumerator name='ANATIVEWINDOW_QUERY_YDPI' value='65539'/>
+    </enum-decl>
+    <typedef-decl name='ANativeWindowQuery' type-id='5fb38be8' filepath='frameworks/native/libs/nativewindow/include/vndk/window.h' line='169' column='1' id='923f0e3c'/>
     <pointer-type-def type-id='d6dabff9' size-in-bits='32' id='b5e45470'/>
+    <qualified-type-def type-id='739fb858' const='yes' id='b0bf8c09'/>
+    <pointer-type-def type-id='b0bf8c09' size-in-bits='32' id='5f899987'/>
     <pointer-type-def type-id='4d45f322' size-in-bits='32' id='cdc60218'/>
     <pointer-type-def type-id='1b5f78db' size-in-bits='32' id='05466fe8'/>
     <pointer-type-def type-id='aa12d1cc' size-in-bits='32' id='822cd81d'/>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index 08e7c6e9..d921741e 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -67,236 +67,332 @@ 
     <elf-symbol name='gluUnProject' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gluUnProject4' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
+  <abi-instr address-size='64' path='libnurbs/interface/bezierPatchMesh.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
+    <class-decl name='bezierPatch' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='36' column='1' id='type-id-1'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='umin' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='vmin' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='umax' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='vmax' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='37' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='uorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='38' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='vorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='39' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='dimension' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='57' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='ctlpoints' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='next' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='63' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='bezierPatchMesh' size-in-bits='960' is-struct='yes' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='39' column='1' id='type-id-6'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='bpatch' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='40' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='bpatch_normal' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='41' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='bpatch_texcoord' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='42' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='bpatch_color' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='43' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='UVarray' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='45' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='length_array' type-id='type-id-8' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='46' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='type_array' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='47' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='size_UVarray' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='50' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='480'>
+        <var-decl name='index_UVarray' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='51' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='size_length_array' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='52' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='544'>
+        <var-decl name='index_length_array' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='53' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='counter' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='55' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='608'>
+        <var-decl name='type' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='56' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='vertex_array' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='normal_array' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='60' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <var-decl name='color_array' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <var-decl name='texcoord_array' type-id='type-id-4' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='62' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <var-decl name='next' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='65' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='bezierPatch' type-id='type-id-1' filepath='libnurbs/interface/bezierPatch.h' line='65' column='1' id='type-id-12'/>
+    <typedef-decl name='bezierPatchMesh' type-id='type-id-6' filepath='libnurbs/interface/bezierPatchMesh.h' line='66' column='1' id='type-id-13'/>
+    <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-9'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-5'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' id='type-id-7'/>
+    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-11'/>
+    <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-14'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-4'/>
+    <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-8'/>
+  </abi-instr>
   <abi-instr address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='5120' id='type-id-2'>
-      <subrange length='160' lower-bound='0' upper-bound='159' type-id='type-id-3' id='type-id-4'/>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='5120' id='type-id-16'>
+      <subrange length='160' lower-bound='0' upper-bound='159' type-id='type-id-17' id='type-id-18'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='1280' id='type-id-5'>
-      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-3' id='type-id-6'/>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='1280' id='type-id-19'>
+      <subrange length='40' lower-bound='0' upper-bound='39' type-id='type-id-17' id='type-id-20'/>
     </array-type-def>
-    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-7'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-8'/>
+    <class-decl name='OpenGLCurveEvaluator' size-in-bits='27584' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='66' column='1' id='type-id-21'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-22'/>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='em_vertex' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
+        <var-decl name='em_vertex' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='102' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='6656'>
-        <var-decl name='em_normal' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
+        <var-decl name='em_normal' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='103' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='13248'>
-        <var-decl name='em_color' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
+        <var-decl name='em_color' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='104' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19840'>
-        <var-decl name='em_texcoord' type-id='type-id-9' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
+        <var-decl name='em_texcoord' type-id='type-id-23' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='105' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26432'>
-        <var-decl name='vertex_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
+        <var-decl name='vertex_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26464'>
-        <var-decl name='normal_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
+        <var-decl name='normal_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26496'>
-        <var-decl name='color_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
+        <var-decl name='color_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26528'>
-        <var-decl name='texcoord_flag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
+        <var-decl name='texcoord_flag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='109' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26560'>
-        <var-decl name='global_grid_u0' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='111' column='1'/>
+        <var-decl name='global_grid_u0' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='111' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26592'>
-        <var-decl name='global_grid_u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='112' column='1'/>
+        <var-decl name='global_grid_u1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26624'>
-        <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
+        <var-decl name='global_grid_nu' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26688'>
-        <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26752'>
-        <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26816'>
-        <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26880'>
-        <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26944'>
-        <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27008'>
-        <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27072'>
-        <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-27' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27136'>
-        <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-28' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27200'>
-        <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27264'>
-        <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27328'>
-        <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
-        <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
-        <var-decl name='userData' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
+        <var-decl name='userData' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='142' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27520'>
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='154' column='1'/>
       </data-member>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~OpenGLCurveEvaluator' filepath='libnurbs/interface/glcurveval.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='9'>
         <function-decl name='domain1f' mangled-name='_ZN20OpenGLCurveEvaluator8domain1fEff' filepath='libnurbs/interface/glcurveval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='10'>
         <function-decl name='range1f' mangled-name='_ZN20OpenGLCurveEvaluator7range1fElPfS0_' filepath='libnurbs/interface/glcurveval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-21'/>
-          <parameter type-id='type-id-21'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-34'/>
+          <parameter type-id='type-id-34'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='11'>
         <function-decl name='enable' mangled-name='_ZN20OpenGLCurveEvaluator6enableEl' filepath='libnurbs/interface/glcurveval.cc' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='12'>
         <function-decl name='disable' mangled-name='_ZN20OpenGLCurveEvaluator7disableEl' filepath='libnurbs/interface/glcurveval.cc' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='13'>
         <function-decl name='bgnmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8bgnmap1fEl' filepath='libnurbs/interface/glcurveval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='14'>
         <function-decl name='map1f' mangled-name='_ZN20OpenGLCurveEvaluator5map1fElffllPf' filepath='libnurbs/interface/glcurveval.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-21'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-34'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='15'>
         <function-decl name='mapgrid1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapgrid1fElff' filepath='libnurbs/interface/glcurveval.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='16'>
         <function-decl name='mapmesh1f' mangled-name='_ZN20OpenGLCurveEvaluator9mapmesh1fElll' filepath='libnurbs/interface/glcurveval.cc' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-20'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='17'>
         <function-decl name='evalcoord1f' mangled-name='_ZN20OpenGLCurveEvaluator11evalcoord1fElf' filepath='libnurbs/interface/glcurveval.cc' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='18'>
         <function-decl name='endmap1f' mangled-name='_ZN20OpenGLCurveEvaluator8endmap1fEv' filepath='libnurbs/interface/glcurveval.cc' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='19'>
         <function-decl name='bgnline' mangled-name='_ZN20OpenGLCurveEvaluator7bgnlineEv' filepath='libnurbs/interface/glcurveval.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='20'>
         <function-decl name='endline' mangled-name='_ZN20OpenGLCurveEvaluator7endlineEv' filepath='libnurbs/interface/glcurveval.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-18' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-31' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-22'>
+    <class-decl name='curveEvalMachine' size-in-bits='6592' is-struct='yes' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='55' column='1' id='type-id-35'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='uprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='56' column='1'/>
+        <var-decl name='uprime' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='k' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
+        <var-decl name='k' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='u1' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='58' column='1'/>
+        <var-decl name='u1' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='u2' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='59' column='1'/>
+        <var-decl name='u2' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ustride' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
+        <var-decl name='ustride' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
+        <var-decl name='uorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='ctlpoints' type-id='type-id-2' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='62' column='1'/>
+        <var-decl name='ctlpoints' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='ucoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='63' column='1'/>
+        <var-decl name='ucoeff' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='63' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='REAL' type-id='type-id-23' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-1'/>
-    <typedef-decl name='curveEvalMachine' type-id='type-id-22' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-9'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-25'/>
-    <qualified-type-def type-id='type-id-25' const='yes' id='type-id-26'/>
-    <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-18'/>
-    <qualified-type-def type-id='type-id-18' const='yes' id='type-id-27'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-21'/>
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-29'/>
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-30'/>
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-31'/>
-    <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-32'/>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-13'/>
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-16'/>
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-36'/>
-    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' id='type-id-24'>
+    <typedef-decl name='REAL' type-id='type-id-2' filepath='libnurbs/internals/types.h' line='41' column='1' id='type-id-15'/>
+    <typedef-decl name='curveEvalMachine' type-id='type-id-35' filepath='libnurbs/interface/glcurveval.h' line='64' column='1' id='type-id-23'/>
+    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-37'/>
+    <qualified-type-def type-id='type-id-37' const='yes' id='type-id-38'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-31'/>
+    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-39'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-34'/>
+    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-41'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-42'/>
+    <qualified-type-def type-id='type-id-3' const='yes' id='type-id-43'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-44'/>
+    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-26'/>
+    <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-29'/>
+    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-48'/>
+    <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' id='type-id-36'>
       <member-type access='private'>
-        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-37'>
-          <underlying-type type-id='type-id-38'/>
+        <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-49'>
+          <underlying-type type-id='type-id-50'/>
           <enumerator name='play' value='0'/>
           <enumerator name='record' value='1'/>
           <enumerator name='playAndRecord' value='2'/>
@@ -304,1692 +400,1598 @@ 
       </member-type>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~CachingEvaluator' filepath='libnurbs/internals/cachingeval.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-25' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <function-decl name='canRecord' mangled-name='_ZN16CachingEvaluator9canRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-25' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
         <function-decl name='canPlayAndRecord' mangled-name='_ZN16CachingEvaluator16canPlayAndRecordEv' filepath='libnurbs/internals/cachingeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-25' is-artificial='yes'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
         <function-decl name='createHandle' mangled-name='_ZN16CachingEvaluator12createHandleEi' filepath='libnurbs/internals/cachingeval.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-25' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-10'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
+          <parameter type-id='type-id-3'/>
+          <return type-id='type-id-3'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='5'>
         <function-decl name='beginOutput' mangled-name='_ZN16CachingEvaluator11beginOutputENS_11ServiceModeEi' filepath='libnurbs/internals/cachingeval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-25' is-artificial='yes'/>
-          <parameter type-id='type-id-37'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
+          <parameter type-id='type-id-49'/>
+          <parameter type-id='type-id-3'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='6'>
         <function-decl name='endOutput' mangled-name='_ZN16CachingEvaluator9endOutputEv' filepath='libnurbs/internals/cachingeval.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-25' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='7'>
         <function-decl name='discardRecording' mangled-name='_ZN16CachingEvaluator16discardRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-25' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
+          <parameter type-id='type-id-3'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='8'>
         <function-decl name='playRecording' mangled-name='_ZN16CachingEvaluator13playRecordingEi' filepath='libnurbs/internals/cachingeval.cc' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-25' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-37' is-artificial='yes'/>
+          <parameter type-id='type-id-3'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='BasicCurveEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-8'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-24'/>
+    <class-decl name='BasicCurveEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-22'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-36'/>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~BasicCurveEvaluator' filepath='libnurbs/internals/basiccrveval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-10' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-3' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='9'>
         <function-decl name='domain1f' mangled-name='_ZN19BasicCurveEvaluator8domain1fEff' filepath='libnurbs/internals/basiccrveval.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='10'>
         <function-decl name='range1f' mangled-name='_ZN19BasicCurveEvaluator7range1fElPfS0_' filepath='libnurbs/internals/basiccrveval.cc' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-21'/>
-          <parameter type-id='type-id-21'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-34'/>
+          <parameter type-id='type-id-34'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='11'>
         <function-decl name='enable' mangled-name='_ZN19BasicCurveEvaluator6enableEl' filepath='libnurbs/internals/basiccrveval.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='12'>
         <function-decl name='disable' mangled-name='_ZN19BasicCurveEvaluator7disableEl' filepath='libnurbs/internals/basiccrveval.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='13'>
         <function-decl name='bgnmap1f' mangled-name='_ZN19BasicCurveEvaluator8bgnmap1fEl' filepath='libnurbs/internals/basiccrveval.cc' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='14'>
         <function-decl name='map1f' mangled-name='_ZN19BasicCurveEvaluator5map1fElffllPf' filepath='libnurbs/internals/basiccrveval.cc' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-21'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-34'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='15'>
         <function-decl name='mapgrid1f' mangled-name='_ZN19BasicCurveEvaluator9mapgrid1fElff' filepath='libnurbs/internals/basiccrveval.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-1'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-15'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='16'>
         <function-decl name='mapmesh1f' mangled-name='_ZN19BasicCurveEvaluator9mapmesh1fElll' filepath='libnurbs/internals/basiccrveval.cc' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-20'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-33'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='17'>
         <function-decl name='evalcoord1f' mangled-name='_ZN19BasicCurveEvaluator11evalcoord1fElf' filepath='libnurbs/internals/basiccrveval.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <parameter type-id='type-id-20'/>
-          <parameter type-id='type-id-1'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <parameter type-id='type-id-33'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='18'>
         <function-decl name='endmap1f' mangled-name='_ZN19BasicCurveEvaluator8endmap1fEv' filepath='libnurbs/internals/basiccrveval.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='19'>
         <function-decl name='bgnline' mangled-name='_ZN19BasicCurveEvaluator7bgnlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='20'>
         <function-decl name='endline' mangled-name='_ZN19BasicCurveEvaluator7endlineEv' filepath='libnurbs/internals/basiccrveval.cc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-39' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-51' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-35'/>
-    <function-type size-in-bits='64' id='type-id-33'>
-      <parameter type-id='type-id-30'/>
-      <return type-id='type-id-19'/>
+    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-47'/>
+    <function-type size-in-bits='64' id='type-id-45'>
+      <parameter type-id='type-id-42'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-34'>
+    <function-type size-in-bits='64' id='type-id-46'>
+      <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-30'/>
-      <parameter type-id='type-id-17'/>
-      <return type-id='type-id-19'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-40'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' id='type-id-52'>
+      <parameter type-id='type-id-10'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-42'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-17'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' id='type-id-53'>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-30'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-43'>
-      <parameter type-id='type-id-17'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' id='type-id-54'>
+      <parameter type-id='type-id-30'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-44'>
-      <parameter type-id='type-id-25' is-artificial='yes'/>
-      <return type-id='type-id-10'/>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-55'>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
+      <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-45'>
-      <parameter type-id='type-id-25' is-artificial='yes'/>
-      <parameter type-id='type-id-10'/>
-      <return type-id='type-id-10'/>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-56'>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-46'>
-      <parameter type-id='type-id-39' is-artificial='yes'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-57'>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-47'>
-      <parameter type-id='type-id-39' is-artificial='yes'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-58'>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-15'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-48'>
-      <parameter type-id='type-id-39' is-artificial='yes'/>
-      <parameter type-id='type-id-20'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-59'>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
+      <parameter type-id='type-id-33'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-49'>
-      <parameter type-id='type-id-39' is-artificial='yes'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-1'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-60'>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-15'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-50'>
-      <parameter type-id='type-id-39' is-artificial='yes'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-21'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-61'>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-34'/>
+      <parameter type-id='type-id-34'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-51'>
-      <parameter type-id='type-id-39' is-artificial='yes'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-62'>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-15'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-52'>
-      <parameter type-id='type-id-39' is-artificial='yes'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-63'>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-34'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-8' id='type-id-53'>
-      <parameter type-id='type-id-39' is-artificial='yes'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-20'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-22' id='type-id-64'>
+      <parameter type-id='type-id-51' is-artificial='yes'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-33'/>
+      <parameter type-id='type-id-33'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-54'>
-      <parameter type-id='type-id-25' is-artificial='yes'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-65'>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-55'>
-      <parameter type-id='type-id-25' is-artificial='yes'/>
-      <parameter type-id='type-id-37'/>
-      <parameter type-id='type-id-10'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-66'>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
+      <parameter type-id='type-id-49'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-32'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-24' id='type-id-56'>
-      <parameter type-id='type-id-25' is-artificial='yes'/>
-      <parameter type-id='type-id-10'/>
-      <return type-id='type-id-19'/>
+    <function-type size-in-bits='64' method-class-id='type-id-36' id='type-id-67'>
+      <parameter type-id='type-id-37' is-artificial='yes'/>
+      <parameter type-id='type-id-3'/>
+      <return type-id='type-id-32'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-58'/>
-    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-59'/>
-    <pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-61'/>
-    <qualified-type-def type-id='type-id-61' const='yes' id='type-id-62'/>
-    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-63'/>
-    <class-decl name='GLUnurbs' size-in-bits='1149440' is-struct='yes' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='49' column='1' id='type-id-57'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-64'/>
+    <pointer-type-def type-id='type-id-68' size-in-bits='64' id='type-id-69'/>
+    <qualified-type-def type-id='type-id-69' const='yes' id='type-id-70'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-72'/>
+    <qualified-type-def type-id='type-id-72' const='yes' id='type-id-73'/>
+    <class-decl name='GLUnurbs' size-in-bits='1149440' is-struct='yes' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='49' column='1' id='type-id-68'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-74'/>
       <data-member access='public' layout-offset-in-bits='47616'>
-        <var-decl name='errorCallback' type-id='type-id-65' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='71' column='1'/>
+        <var-decl name='errorCallback' type-id='type-id-75' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='71' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47680'>
-        <var-decl name='autoloadmode' type-id='type-id-66' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='130' column='1'/>
+        <var-decl name='autoloadmode' type-id='type-id-76' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47744'>
-        <var-decl name='surfaceEvaluator' type-id='type-id-60' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='131' column='1'/>
+        <var-decl name='surfaceEvaluator' type-id='type-id-71' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1121792'>
-        <var-decl name='curveEvaluator' type-id='type-id-7' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
+        <var-decl name='curveEvaluator' type-id='type-id-21' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1149376'>
-        <var-decl name='callbackFlag' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
+        <var-decl name='callbackFlag' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glrenderer.h' line='143' column='1'/>
       </data-member>
       <member-function access='public' vtable-offset='2'>
         <function-decl name='bgnrender' mangled-name='_ZN8GLUnurbs9bgnrenderEv' filepath='libnurbs/interface/glrenderer.cc' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-58' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-69' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='3'>
         <function-decl name='endrender' mangled-name='_ZN8GLUnurbs9endrenderEv' filepath='libnurbs/interface/glrenderer.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-58' is-artificial='yes'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-69' is-artificial='yes'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='6'>
         <function-decl name='errorHandler' mangled-name='_ZN8GLUnurbs12errorHandlerEi' filepath='libnurbs/interface/glrenderer.cc' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-58' is-artificial='yes'/>
-          <parameter type-id='type-id-10'/>
-          <return type-id='type-id-19'/>
+          <parameter type-id='type-id-69' is-artificial='yes'/>
+          <parameter type-id='type-id-3'/>
+          <return type-id='type-id-32'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='OpenGLSurfaceEvaluator' size-in-bits='1074048' is-struct='yes' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='100' column='1' id='type-id-60'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-67'/>
+    <class-decl name='OpenGLSurfaceEvaluator' size-in-bits='1074048' is-struct='yes' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='100' column='1' id='type-id-71'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-77'/>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='vertexCache' type-id='type-id-68' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='180' column='1'/>
+        <var-decl name='vertexCache' type-id='type-id-78' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='180' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
-        <var-decl name='tmeshing' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
+        <var-decl name='tmeshing' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='181' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='288'>
-        <var-decl name='which' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
+        <var-decl name='which' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='182' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
-        <var-decl name='vcount' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
+        <var-decl name='vcount' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='183' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='352'>
-        <var-decl name='gl_polygon_mode' type-id='type-id-69' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='185' column='1'/>
+        <var-decl name='gl_polygon_mode' type-id='type-id-79' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='185' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
-        <var-decl name='global_bpm' type-id='type-id-70' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='188' column='1'/>
+        <var-decl name='global_bpm' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='188' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
-        <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
+        <var-decl name='output_triangles' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
+        <var-decl name='beginCallBackN' type-id='type-id-24' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
+        <var-decl name='endCallBackN' type-id='type-id-25' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
-        <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
+        <var-decl name='vertexCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
+        <var-decl name='normalCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
+        <var-decl name='colorCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
-        <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
+        <var-decl name='texcoordCallBackN' type-id='type-id-26' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
-        <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
+        <var-decl name='beginCallBackData' type-id='type-id-27' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
-        <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
+        <var-decl name='endCallBackData' type-id='type-id-28' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
-        <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
+        <var-decl name='vertexCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
-        <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
+        <var-decl name='normalCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
-        <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
+        <var-decl name='colorCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
-        <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
+        <var-decl name='texcoordCallBackData' type-id='type-id-29' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
-        <var-decl name='userData' type-id='type-id-17' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
+        <var-decl name='userData' type-id='type-id-30' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='215' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
-        <var-decl name='LOD_eval_level' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
+        <var-decl name='LOD_eval_level' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='222' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1440'>
-        <var-decl name='global_uorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
+        <var-decl name='global_uorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='231' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
-        <var-decl name='global_vorder' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
+        <var-decl name='global_vorder' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='232' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1504'>
-        <var-decl name='global_uprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='233' column='1'/>
+        <var-decl name='global_uprime' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='233' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1536'>
-        <var-decl name='global_vprime' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='234' column='1'/>
+        <var-decl name='global_vprime' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='234' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1568'>
-        <var-decl name='global_vprime_BV' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='235' column='1'/>
+        <var-decl name='global_vprime_BV' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='235' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1600'>
-        <var-decl name='global_uprime_BU' type-id='type-id-1' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='236' column='1'/>
+        <var-decl name='global_uprime_BU' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='236' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1632'>
-        <var-decl name='global_uorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
+        <var-decl name='global_uorder_BV' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='237' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
-        <var-decl name='global_vorder_BV' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
+        <var-decl name='global_vorder_BV' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='238' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1696'>
-        <var-decl name='global_uorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
+        <var-decl name='global_uorder_BU' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='239' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1728'>
-        <var-decl name='global_vorder_BU' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
+        <var-decl name='global_vorder_BU' type-id='type-id-3' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='240' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1760'>
-        <var-decl name='global_ucoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='242' column='1'/>
+        <var-decl name='global_ucoeff' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='242' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3040'>
-        <var-decl name='global_vcoeff' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='243' column='1'/>
+        <var-decl name='global_vcoeff' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='243' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='4320'>
-        <var-decl name='global_ucoeffDeriv' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='244' column='1'/>
+        <var-decl name='global_ucoeffDeriv' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='244' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5600'>
-        <var-decl name='global_vcoeffDeriv' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='245' column='1'/>
+        <var-decl name='global_vcoeffDeriv' type-id='type-id-19' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='245' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='6880'>
-        <var-decl name='global_BV' type-id='type-id-71' visibility='default' filepath='libnurbs/interface/gl