*** empty log message ***

diff --git a/src/DATE b/src/DATE
index 7605e67763378b39dd3b76afb90c7122bb75390d..759b4edc81ebe53160daca21e6bf45151b1481f1 100644 (file)
--- a/src/DATE
+++ b/src/DATE
@@ -1 +1 @@
-19 August 2001
+20 August 2001

diff --git a/src/Headers/constraint.h b/src/Headers/constraint.h
index 2d67fb354fecd5ec0525fed0b1ba75ad63f13c85..5e1972149c4139c1176aecfd1f4ace9ac227844a 100644 (file)
--- a/src/Headers/constraint.h
+++ b/src/Headers/constraint.h
@@ -33,7 +33,7 @@ extern /*@truenull@*/ /*@unused@*/ bool constraint_isError (constraint p_e) /*@*
 
 extern void constraint_free (/*@only@*/  constraint p_c);
 
-//constraint makeConstraintParse (sRef x, lltok relOp, exprNode cconstant);
+/* constraint makeConstraintParse (sRef x, lltok relOp, exprNode cconstant); */
 
 /*@i22*/
 /*@-czechfcns*/
@@ -145,7 +145,7 @@ bool constraint_tooDeep (/*@observer@*/ /*@temp@*/ constraint p_c);
 
 
 /*@=czechfcns*/
-////drl possible problem : warning take this out
+/* drl possible problem : warning take this out */
 
 #include "constraintResolve.h"
 #include "constraintOutput.h"

diff --git a/src/Headers/constraintExpr.h b/src/Headers/constraintExpr.h
index f9b71e40568165634c27c8ac492b58cb17b8ad9b..64208e666909872d1556b2394eee07b11cc9752a 100644 (file)
--- a/src/Headers/constraintExpr.h
+++ b/src/Headers/constraintExpr.h
@@ -48,7 +48,7 @@ long constraintExpr_getValue (constraintExpr p_expr) /*@*/;
 
 int constraintExpr_compare (constraintExpr p_expr1, constraintExpr p_expr2) /*@*/;
 
-//constraintExpr constraintExpr_makeValueInt (int i);
+/* constraintExpr constraintExpr_makeValueInt (int i); */
 
 /*@only@*/ constraintExpr constraintExpr_makeIntLiteral (long p_i);
 

diff --git a/src/Headers/constraintExprData.h b/src/Headers/constraintExprData.h
index b82f2f711a727a04edafcd59adb4e729bba19cdd..f8759d02ed8c24a56acf5c9d0852ede6014bdacf 100644 (file)
--- a/src/Headers/constraintExprData.h
+++ b/src/Headers/constraintExprData.h
@@ -48,43 +48,34 @@ extern void constraintExprData_freeBinaryExpr (/*@only@*/ constraintExprData) ;
 extern void constraintExprData_freeUnaryExpr (/*@only@*/ constraintExprData) ;
 extern void constraintExprData_freeTerm (/*@only@*/ constraintExprData) ;
 
-constraintExprData constraintExprData_termSetTerm ( /*@returned@*/ /*@partial@*/ constraintExprData p_data, /*@only@*/ constraintTerm p_term);
+extern constraintExprData constraintExprData_termSetTerm ( /*@returned@*/ /*@partial@*/ constraintExprData p_data, /*@only@*/ constraintTerm p_term);
 
-/*@observer@*/ constraintTerm constraintExprData_termGetTerm (/*@observer@*/ constraintExprData p_data) /*@*/;
+extern /*@observer@*/ constraintTerm constraintExprData_termGetTerm (/*@observer@*/ constraintExprData p_data) /*@*/;
 
-constraintExprUnaryOpKind constraintExprData_unaryExprGetOp (/*@observer@*//*@reldef@*/constraintExprData p_data) /*@*/;
+extern constraintExprUnaryOpKind constraintExprData_unaryExprGetOp (/*@observer@*/ /*@reldef@*/ constraintExprData p_data) /*@*/;
 
-/*@observer@*/ constraintExpr  constraintExprData_unaryExprGetExpr (/*@observer@*/ /*@reldef@*/constraintExprData p_data) /*@*/;
+extern /*@observer@*/ constraintExpr  constraintExprData_unaryExprGetExpr (/*@observer@*/ /*@reldef@*/constraintExprData p_data) /*@*/;
 
+extern constraintExprData  constraintExprData_unaryExprSetOp (/*@partial@*/ /*@returned@*/ constraintExprData p_data, constraintExprUnaryOpKind p_op);
 
-//  special constraintExprData  constraintExprData_unaryExprSetOp ( /out special@*/ @returned@ constraintExprData p_data, constraintExprUnaryOpKind op) /sets result->unaryOp.unaryOp;
+extern constraintExprData  constraintExprData_unaryExprSetExpr (/*@partial@*/ /*@returned@*/ constraintExprData p_data,  /*@only@*/ constraintExpr p_expr);
 
+extern constraintExprBinaryOpKind  constraintExprData_binaryExprGetOp (/*@partial@*/constraintExprData p_data) /*@*/;
 
-constraintExprData  constraintExprData_unaryExprSetOp (/*@partial@*/ /*@returned@*/ constraintExprData p_data, constraintExprUnaryOpKind p_op);
+extern /*@observer@*/ constraintExpr  constraintExprData_binaryExprGetExpr1 (/*@observer@*/ /*@reldef@*/constraintExprData p_data)/*@*/;
 
-constraintExprData  constraintExprData_unaryExprSetExpr (/*@partial@*/ /*@returned@*/ constraintExprData p_data,  /*@only@*/ constraintExpr p_expr);
+extern /*@observer@*/ constraintExpr  constraintExprData_binaryExprGetExpr2 (/*@observer@*/ /*@reldef@*/constraintExprData p_data)/*@*/;
 
+extern constraintExprData  constraintExprData_binaryExprSetExpr1 (/*@partial@*/ /*@returned@*/ constraintExprData p_data, /*@only@*/ constraintExpr p_expr) ;
 
-constraintExprBinaryOpKind  constraintExprData_binaryExprGetOp (/*@partial@*/constraintExprData p_data) /*@*/;
+extern constraintExprData  constraintExprData_binaryExprSetExpr2  (/*@partial@*/ /*@returned@*/  constraintExprData p_data, /*@only@*/ constraintExpr p_expr);
 
-/*@observer@*/ constraintExpr  constraintExprData_binaryExprGetExpr1 (/*@observer@*/ /*@reldef@*/constraintExprData p_data)/*@*/;
+extern constraintExprData  constraintExprData_binaryExprSetOp (/*@partial@*/ /*@returned@*/ /*@out@*/constraintExprData p_data, constraintExprBinaryOpKind p_op);
 
-/*@observer@*/ constraintExpr  constraintExprData_binaryExprGetExpr2 (/*@observer@*/ /*@reldef@*/constraintExprData p_data)/*@*/;
-
-constraintExprData  constraintExprData_binaryExprSetExpr1 (/*@partial@*/ /*@returned@*/ constraintExprData p_data, /*@only@*/ constraintExpr p_expr) ;
-
-constraintExprData  constraintExprData_binaryExprSetExpr2  (/*@partial@*/ /*@returned@*/  constraintExprData p_data, /*@only@*/ constraintExpr p_expr);
-
-constraintExprData  constraintExprData_binaryExprSetOp (/*@partial@*/ /*@returned@*/ /*@out@*/constraintExprData p_data, constraintExprBinaryOpKind p_op);
-
-/*@only@*/ constraintExprData constraintExprData_copyBinaryExpr(/*@observer@*/ constraintExprData p_data);
-
-/*@only@*/ constraintExprData constraintExprData_copyUnaryExpr(/*@observer@*/ constraintExprData p_data);
-
-/*@only@*/ constraintExprData constraintExprData_copyTerm (/*@observer@*/ constraintExprData p_data);
+extern /*@only@*/ constraintExprData constraintExprData_copyBinaryExpr(/*@observer@*/ constraintExprData p_data);
+extern /*@only@*/ constraintExprData constraintExprData_copyUnaryExpr(/*@observer@*/ constraintExprData p_data);
+extern /*@only@*/ constraintExprData constraintExprData_copyTerm (/*@observer@*/ constraintExprData p_data);
 
 #else
-
 #error "Multiple Include"
-
 #endif

diff --git a/src/Headers/constraintList2.h b/src/Headers/constraintList2.h
index c2da3a42077be9871d1c92ecf41097bee6a52bba..7e8cbbff12aad720302d7b2e4cc3fa8c17f18deb 100644 (file)
--- a/src/Headers/constraintList2.h
+++ b/src/Headers/constraintList2.h
@@ -51,10 +51,12 @@ extern void constraintList_advance (constraintList p_s)
 
 extern /*@exposed@*/ constraint constraintList_getN (constraintList p_s, int p_n) /*@*/ ;
 
-//extern /*@only@*/ cstring constraintList_unparse (constraintList p_s) ;
-//extern /*@only@*/ cstring constraintList_unparseTail (constraintList p_s);
-//extern /*@only@*/ cstring constraintList_unparseToCurrent (constraintList p_s);
-//extern /*@only@*/ cstring constraintList_unparseSecondToCurrent (constraintList p_s);
+# if 0
+extern /*@only@*/ cstring constraintList_unparse (constraintList p_s) ;
+extern /*@only@*/ cstring constraintList_unparseTail (constraintList p_s);
+extern /*@only@*/ cstring constraintList_unparseToCurrent (constraintList p_s);
+extern /*@only@*/ cstring constraintList_unparseSecondToCurrent (constraintList p_s);
+# endif
 
 extern void constraintList_free (/*@only@*/ constraintList p_s) ;
 

diff --git a/src/Headers/constraintResolve.h b/src/Headers/constraintResolve.h
index 37e1a898f29ec3489893ea3e93f707ed77815786..5a28ef91d9a56ca548759ba2333dc4b0442b2948 100644 (file)
--- a/src/Headers/constraintResolve.h
+++ b/src/Headers/constraintResolve.h
@@ -7,7 +7,7 @@ extern /*@only@*/ constraintList constraintList_reflectChanges(/*@observer@*/ /*
 
 extern /*@only@*/ constraint constraint_substitute (/*@temp@*/ /*@observer@*/ constraint p_c, /*@temp@*/ /*@observer@*/ constraintList p_p);
 
-//extern constraint constraint_searchandreplace (constraint p_c, constraintExpr old, constraintExpr new);
+/* extern constraint constraint_searchandreplace (constraint p_c, constraintExpr old, constraintExpr new); */
 
 extern bool constraintList_resolve (/*@temp@*/ /*@observer@*/ constraint p_c,  /*@temp@*/ /*@observer@*/ constraintList p_p);
 
@@ -38,5 +38,3 @@ constraintList constraintList_reflectChangesOr (constraintList p_pre2, constrain
 
 extern void exprNode_mergeResolve (exprNode p_parent, exprNode p_child1, exprNode p_child2);
 
-//extern constraintList checkCall (exprNode p_fcn, exprNodeList p_arglist);
-

diff --git a/src/Headers/exprNode.h b/src/Headers/exprNode.h
index 354538c0c9c4bf4f318fc970f546941336d307e6..106d96e60a703ac6574e3c82aff95c79832f5260 100644 (file)
--- a/src/Headers/exprNode.h
+++ b/src/Headers/exprNode.h
@@ -161,8 +161,12 @@ struct s_exprNode
   cstring etext;
   /*@notnull@*/   constraintList requiresConstraints;
   /*@notnull@*/ constraintList ensuresConstraints;
-  //these two are used only for boolean expressions
-  //they store the ensures constraints for the true and false cases
+  
+  /*
+  ** These two are used only for boolean expressions, 
+  ** they store the ensures constraints for the true and false cases
+  */
+
   /*@notnull@*/ constraintList trueEnsuresConstraints;
   /*@notnull@*/ constraintList falseEnsuresConstraints;
 } ;
@@ -373,16 +377,10 @@ extern /*@only@*/ exprNode exprNode_combineLiterals (/*@only@*/ exprNode p_e, /*
 
 extern /*@only@*/ fileloc exprNode_getNextSequencePoint (exprNode p_e) ;
 
-/*drl 09-08-2000 */
-// Commenting out because this seems to conflict with Dave Evans version
-//exprNode exprNode_fakeCopy (@returned@ exprNode p_e);
-
 /*drl 01-20-2001*/
 exprNode exprNode_createNew(ctype p_c);
 
-
 /* drl 07-25-01 */
-
 bool exprNode_isInitBlock (exprNode p_e);
 
 # else

diff --git a/src/Headers/herald.h b/src/Headers/herald.h
index 42fae81d6beab75a22cdd4f1de2d3dc06af358fb..143c0e3420dc2b9f4083d9564ab089eddfa712a9 100644 (file)
--- a/src/Headers/herald.h
+++ b/src/Headers/herald.h
@@ -1,7 +1,7 @@
 /* herald.h - created automatically by gmake updateversion */
 /*@constant observer char *LCL_VERSION;@*/
-# define LCL_VERSION "LCLint 3.0.0.9 --- 19 August 2001"
+# define LCL_VERSION "LCLint 3.0.0.10 --- 20 August 2001"
 /*@constant observer char *LCL_PARSE_VERSION;@*/
-# define LCL_PARSE_VERSION "LCLint 3.0.0.9"
+# define LCL_PARSE_VERSION "LCLint 3.0.0.10"
 /*@constant observer char *LCL_COMPILE;@*/
 # define LCL_COMPILE "Compiled using gcc -Wall -g on Linux paisley 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by evans"

diff --git a/src/Headers/herald.last b/src/Headers/herald.last
index 36662b4a90c029c6d7646809439b392389b3418f..143c0e3420dc2b9f4083d9564ab089eddfa712a9 100644 (file)
--- a/src/Headers/herald.last
+++ b/src/Headers/herald.last
@@ -1,7 +1,7 @@
 /* herald.h - created automatically by gmake updateversion */
 /*@constant observer char *LCL_VERSION;@*/
-# define LCL_VERSION "LCLint 3.0.0.9 --- 23 July 2001"
+# define LCL_VERSION "LCLint 3.0.0.10 --- 20 August 2001"
 /*@constant observer char *LCL_PARSE_VERSION;@*/
-# define LCL_PARSE_VERSION "LCLint 3.0.0.9"
+# define LCL_PARSE_VERSION "LCLint 3.0.0.10"
 /*@constant observer char *LCL_COMPILE;@*/
 # define LCL_COMPILE "Compiled using gcc -Wall -g on Linux paisley 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by evans"

diff --git a/src/Headers/qual.h b/src/Headers/qual.h
index 30fea224d7875aa5251ce27dd5b11c44907218a7..6d36fb2fbfa7a2b41af35f97351cb55b346b7b0d 100644 (file)
--- a/src/Headers/qual.h
+++ b/src/Headers/qual.h
@@ -357,14 +357,6 @@ extern qual qual_createMessageLike (void) /*@*/ ;
 
 
 # define qual_createNullTerminated() qual_createPlain (QU_NULLTERMINATED)
-//# define qual_createSetBufferSize()  qual_createPlain (QU_SETBUFFERSIZE)
-
-
-
-/* start modifications */
-//extern bool qual_isNullTerminated (qual p_q) ;
-//extern bool qual_isBufQualifier (qual p_q)  ;
-/* end modifications */
 
 /* start modifications */
 /* This is used to check if we the qualifier matches any of the

diff --git a/src/Headers/uentry.h b/src/Headers/uentry.h
index b193d3d1a5e280d1789a637d7d3002772789b007..72836952784a13936aabb97442410e0cd2fab73a 100644 (file)
--- a/src/Headers/uentry.h
+++ b/src/Headers/uentry.h
@@ -603,15 +603,11 @@ extern bool uentry_hasAccessType (uentry p_e);
 /*@constant cstring GLOBAL_MARKER_NAME@*/
 # define GLOBAL_MARKER_NAME cstring_makeLiteralTemp ("#GM#")
 
-/* start modifications */
-//extern void uentry_setBufferSize (uentry p_e, exprNode cconstant);
-
 /* functions for making modification to null-term info */
-  void uentry_setNullTerminatedState (uentry p_e);
- void uentry_setPossiblyNullTerminatedState (uentry p_e);
-//extern void uentry_setNotNullTerminated (uentry p_e);
-void uentry_setSize(uentry p_e, int p_size);
- void uentry_setLen(uentry p_e, int p_len);
+extern void uentry_setNullTerminatedState (uentry p_e);
+extern void uentry_setPossiblyNullTerminatedState (uentry p_e);
+extern void uentry_setSize(uentry p_e, int p_size);
+extern void uentry_setLen(uentry p_e, int p_len);
 
 /*@i66*/
 /*@-nullderef@*/
@@ -656,7 +652,7 @@ extern bool uentry_hasMetaStateEnsures (uentry p_e) /*@*/ ;
 extern /*@only@*/ metaStateConstraintList uentry_getMetaStateEnsures (uentry p_e);
 
 /* start modifications */
-//extern void uentry_setBufferSize (uentry p_e, exprNode p_cconstant);
+
 /*drl7x*/
 extern constraintList uentry_getFcnPreconditions (uentry p_ue);
 extern constraintList uentry_getFcnPostconditions (uentry p_ue);
@@ -664,8 +660,7 @@ extern constraintList uentry_getFcnPostconditions (uentry p_ue);
 extern void uentry_setPostconditions (uentry p_ue, /*@only@*/ functionConstraint p_postconditions);
 
 extern void uentry_setPreconditions (uentry p_ue, /*@only@*/ functionConstraint p_preconditions);
-
-     /*end mods*/
+/*end mods*/
 
 # else
 # error "Multiple include"

diff --git a/src/Makefile b/src/Makefile
index a6f7c1eda240a7a3ee01229cc9c128732de7adbf..815681540855c23f91c74d8d71fd02ed2b11b20c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -203,8 +203,8 @@ stateClause.c: Headers/cgrammar_tokens.h
 ifeq ($(CHECK), 1)
        ${MAKE} $*.check
 endif
-       @echo '//  Compiling '$*.c' / compiled: '`$(OFILES)`'  (of 161 files)'
-       $(CC) $(CFLAGS) -c $*.c
+       @echo '//  Compiling '$*.c' / compiled: '`$(OFILES)`'  (of 181 files)'
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c
 
 ###
 ### alternatives (tests, releases, backups, etc.)
@@ -346,7 +346,7 @@ up:
 ###
 
 depend:
-       $(MAKEDEPEND) $(CINCLUDES) $(CFLAGS) -f Makefile.depend $(SRC) $(GRAMS)
+       $(MAKEDEPEND) $(CINCLUDES) $(CPPFLAGS) -f Makefile.depend $(SRC) $(GRAMS)
 
 ###
 ### analysing dependancies takes a long time and doesn't work terribly

diff --git a/src/Makefile.sys b/src/Makefile.sys
index ff06ca8913928e8986b746065db89d70e5c64b52..91d64dcdc73d4b6923cc72fa32cb9e37c8a67de5 100644 (file)
--- a/src/Makefile.sys
+++ b/src/Makefile.sys
@@ -46,9 +46,9 @@ LINKFLAGS     = -lfl
 
 
 ifeq ($(CC), gcc)
-  CFLAGS       = $(CPPFLAGS) -Wpointer-arith -Wcast-qual -Wcomment -Wswitch -Wunused -Wreturn-type -ansi -pedantic
+  CFLAGS       = -Wpointer-arith -Wcast-qual -Wcomment -Wswitch -Wunused -Wreturn-type -ansi -pedantic
 else
-  CFLAGS       = $(CPPFLAGS)
+  CFLAGS       = 
 endif
 
 DEBUGFLAGS = -DYYDEBUG=1 -DYYIMPURE=1 # don't change this

diff --git a/src/clabstract.c b/src/clabstract.c
index dc9f9e22c4a18d4616d87f2127fa9e62de52ece7..9b195943a7b5c9b77b5fcfec1962a719a5cdcfbc 100644 (file)
--- a/src/clabstract.c
+++ b/src/clabstract.c
@@ -51,11 +51,8 @@
 ** right values are available in the right place.
 */
 
-/*drl */
-static /*@only@*/   constraintList implicitFcnConstraints = NULL;
-
-
-//static  constraintList fcnPreConditions = NULL;
+/*drl*/
+static /*@only@*/ constraintList implicitFcnConstraints = NULL;
 
 static void clabstract_prepareFunction (uentry p_e) /*@modifies p_e@*/ ;
 static bool fcnNoGlobals = FALSE;
@@ -531,7 +528,7 @@ void  setImplictfcnConstraints (void)
        chagned this is MaxSet(s) == 0 to MaxSet(s) >= 0 */
       
       c = constraint_makeSRefWriteSafeInt (s, 0);
-       // constraint_makeSRefSetBufferSize (s, 0);
+      /* constraint_makeSRefSetBufferSize (s, 0); */
       implicitFcnConstraints = constraintList_add(implicitFcnConstraints , c);
     }
   end_uentryList_elements;

diff --git a/src/constraint.c b/src/constraint.c
index 82ab08baea4b42482342497856c9b325729081a8..a17c1e591ca13ea0f912f1b90bd367ebd262cdcf 100644 (file)
--- a/src/constraint.c
+++ b/src/constraint.c
@@ -2,7 +2,7 @@
 ** constraint.c
 */
 
-//#define DEBUGPRINT 1
+/* #define DEBUGPRINT 1 */
 
 # include <ctype.h> /* for isdigit */
 # include "lclintMacros.nf"
@@ -25,43 +25,6 @@ static /*@notnull@*/ /*@special@*/ constraint constraint_makeNew (void)
      /*@post:isnull result->or, result->orig,  result->generatingExpr, result->fcnPre @*/
      /*@defines result->or, result->generatingExpr, result->orig, result->fcnPre @*/;
      
-/*  constraint makeConstraintParse (sRef x, lltok relOp, exprNode cconstant) */
-     
-/*  { */
-/*    char *t; */
-/*    int c; */
-/*    constraint ret; */
-/*    ret = constraint_makeNew(); */
-/*    llassert (sRef_isValid(x) ); */
-/*    if (!sRef_isValid(x)) */
-/*      return ret; */
- 
-    
-/*    ret->lexpr = constraintExpr_makeTermsRef (x); */
-/*    #warning fix abstraction */
-
-/*    if (relOp.tok == GE_OP) */
-/*        ret->ar = GTE; */
-/*    else if (relOp.tok == LE_OP) */
-/*      ret->ar = LTE; */
-/*    else if (relOp.tok == EQ_OP) */
-/*      ret->ar = EQ; */
-/*    else */
-/*      llfatalbug(message ("Unsupported relational operator") ); */
-
-
-/*    t =  cstring_toCharsSafe (exprNode_unparse(cconstant)); */
-/*    c = atoi( t ); */
-/*    ret->expr = constraintExpr_makeIntLiteral (c); */
-
-/*    ret->post = TRUE; */
-/*    //  ret->orig = ret; */
-/*    DPRINTF(("GENERATED CONSTRAINT:")); */
-/*    DPRINTF( (message ("%s", constraint_print(ret) ) ) ); */
-/*    return ret; */
-/*  } */
-
-
 static void
 advanceField (char **s)
 {
@@ -95,7 +58,6 @@ static constraint makeConstraintParse2 (constraintExpr l, lltok relOp, exprNode
   ret->expr = constraintExpr_makeIntLiteral (c);
 
   ret->post = TRUE;
-  //  ret->orig = ret;
   DPRINTF(("GENERATED CONSTRAINT:"));
   DPRINTF( (message ("%s", constraint_print(ret) ) ) );
   return ret;
@@ -149,8 +111,8 @@ constraint makeConstraintParse3 (constraintExpr l, lltok relOp, constraintExpr r
   ret->orig = constraint_copy(ret);
 
   ret = constraint_simplify (ret);
-  
-  //  ret->orig = ret;
+  /* ret->orig = ret; */
+
   DPRINTF(("GENERATED CONSTRAINT:"));
   DPRINTF( (message ("%s", constraint_print(ret) ) ) );
   return ret;
@@ -161,8 +123,7 @@ constraint constraint_copy (/*@temp@*/ /*@observer@*/ constraint c)
   constraint ret;
 
   llassert (constraint_isDefined(c) );
-  // DPRINTF((message("Copying constraint %q", constraint_print) ));
-  
+
   ret = constraint_makeNew();
   ret->lexpr = constraintExpr_copy (c->lexpr);
   ret->ar = c->ar;
@@ -289,7 +250,7 @@ constraint constraint_setFcnPre (/*@returned@*/ constraint c )
   else
     {
       c->fcnPre = TRUE;
-      //      DPRINTF(( message("Warning Setting fcnPre directly") ));
+      DPRINTF(( message("Warning Setting fcnPre directly") ));
     }
   return c;
 }
@@ -332,7 +293,7 @@ bool constraint_hasMaxSet(constraint c)
 constraint constraint_makeReadSafeExprNode (  exprNode po, exprNode ind)
 {
   constraint ret = constraint_makeNew();
-  //  constraintTerm term;
+
   po = po;
   ind = ind;
   ret->lexpr = constraintExpr_makeMaxReadExpr(po);
@@ -430,12 +391,9 @@ constraint constraint_makeEnsureMaxReadAtLeast (exprNode t1, exprNode t2, filelo
   constraint ret;
   
   ret = constraint_makeReadSafeExprNode(t1, t2);
-
-  ret->lexpr = constraintExpr_setFileloc (ret->lexpr, sequencePoint);
-  
+  ret->lexpr = constraintExpr_setFileloc (ret->lexpr, sequencePoint);  
   ret->post = TRUE;  
 
-  //  fileloc_incColumn (ret->lexpr->term->loc);
   return ret;
 }
 
@@ -445,7 +403,6 @@ static constraint constraint_makeEnsuresOpConstraintExpr (/*@only@*/ constraintE
   constraint ret;
   
   llassert(constraintExpr_isDefined(c1) && constraintExpr_isDefined(c2) );
-  //  llassert(sequencePoint);
 
   ret = constraint_makeNew();
   
@@ -467,11 +424,9 @@ static constraint constraint_makeEnsuresOp (/*@dependent@*/ exprNode e1, /*@depe
     {
       llcontbug((message("null exprNode, Exprnodes are %s and %s",
                       exprNode_unparse(e1), exprNode_unparse(e2) )
-              ));
+                ));
     }
 
-  //  llassert (sequencePoint);
-  
   e  =  e1;
   c1 =  constraintExpr_makeValueExpr (e);
   
@@ -594,26 +549,19 @@ constraint constraint_makeSubtractAssign (exprNode e, exprNode f, fileloc sequen
 constraint constraint_makeMaxSetSideEffectPostDecrement (exprNode e, fileloc sequencePoint)
 {
   constraint ret = constraint_makeNew();
-  //constraintTerm term;
 
-  //  e = exprNode_fakeCopy(e);
   ret->lexpr = constraintExpr_makeValueExpr (e);
   ret->ar = EQ;
   ret->post = TRUE;
   ret->expr =  constraintExpr_makeValueExpr (e);
   ret->expr =  constraintExpr_makeDecConstraintExpr (ret->expr);
-
   ret->lexpr = constraintExpr_setFileloc (ret->lexpr, sequencePoint);
-//   fileloc_incColumn (  ret->lexpr->term->loc);
-//   fileloc_incColumn (  ret->lexpr->term->loc);
   return ret;
 }
 constraint constraint_makeMaxSetSideEffectPostIncrement (exprNode e, fileloc sequencePoint)
 {
   constraint ret = constraint_makeNew();
-  //constraintTerm term;
 
-  //  e = exprNode_fakeCopy(e);
   ret->lexpr = constraintExpr_makeValueExpr (e);
   ret->ar = EQ;
   ret->post = TRUE;
@@ -621,8 +569,6 @@ constraint constraint_makeMaxSetSideEffectPostIncrement (exprNode e, fileloc seq
   ret->expr =  constraintExpr_makeIncConstraintExpr (ret->expr);
 
   ret->lexpr = constraintExpr_setFileloc (ret->lexpr, sequencePoint);
-//   fileloc_incColumn (  ret->lexpr->term->loc);
-//   fileloc_incColumn (  ret->lexpr->term->loc);
   return ret;
 }
 
@@ -650,22 +596,6 @@ void constraint_free (/*@only@*/ constraint c)
   
 }
 
-
-// constraint constraint_makeMaxReadSideEffectPostIncrement (exprNode e, fileloc sequencePoint)
-// {
-//   constraint ret = constraint_makeNew();
-//   //constraintTerm term;
-
-//   e = exprNode_fakeCopy(e);
-//   ret->lexpr = constraintExpr_makeMaxReadExpr(e);
-//   ret->ar = EQ;
-//   ret->post = TRUE;
-//   ret->expr = constraintExpr_makeIncConstraintExpr (e);
-//   ret->lexpr = constraintExpr_setFileLoc (ret->lexpr, sequencePoint);
-//   return ret;
-// }
-
-
 cstring arithType_print (arithType ar) /*@*/
 {
   cstring st = cstring_undefined;
@@ -831,8 +761,9 @@ static /*@only@*/ cstring  constraint_printDetailedPostCondition (/*@observer@*/
   if (context_getFlag (FLG_CONSTRAINTLOCATION) )
     {
       cstring temp;
-      // llassert (c->generatingExpr);
-      temp = message ("\nOriginal Generating expression %q: %s\n", fileloc_unparse( exprNode_getfileloc (c->generatingExpr) ),
+
+      temp = message ("\nOriginal Generating expression %q: %s\n", 
+                     fileloc_unparse( exprNode_getfileloc (c->generatingExpr) ),
                      genExpr );
       st = cstring_concatFree (st, temp);
 
@@ -988,19 +919,6 @@ constraint constraint_doFixResult (constraint postcondition, /*@dependent@*/ exp
   return precondition;
 }
 
-// bool constraint_hasTerm (constraint c, constraintTerm term)
-// {
-//   DPRINTF((message ("Constraint %s", constraint_print (c) ) ) );
-  
-//   if (constraintExpr_includesTerm (c->lexpr, term) )
-//     return TRUE;
-
-//   if (constraintExpr_includesTerm (c->expr, term) )
-//     return TRUE;
-
-//   return FALSE;
-// }
-
 constraint constraint_preserveOrig (/*@returned@*/ constraint c) /*@modifies c @*/
 {
 

diff --git a/src/constraintExpr.c b/src/constraintExpr.c
index 22d4d55f589dd76d92dbc2b72f469d9bd9f12401..da05e6e67dbd68f73135dba54311b9faa1478e9e 100644 (file)
--- a/src/constraintExpr.c
+++ b/src/constraintExpr.c
@@ -2,7 +2,7 @@
 ** constraintExpr.c
 */
 
-//#define DEBUGPRINT 1
+/* #define DEBUGPRINT 1 */
 
 # include "lclintMacros.nf"
 # include "basic.h"
@@ -12,9 +12,6 @@
 # include "exprChecks.h"
 # include "exprNodeSList.h"
 
-//# include "constraintExpr.h"
-
-
 /*@-czechfcns@*/
 
 
@@ -31,11 +28,10 @@ doSRefFixConstraintParamTerm (/*@only@*/ constraintExpr p_e, /*@temp@*/ /*@obser
 static /*@only@*/ constraintExpr 
 doFixResultTerm (/*@only@*/ constraintExpr p_e, /*@exposed@*/ exprNode p_fcnCall)
      /*@modifies p_e@*/;
-
-
-     /*@special@*/ static constraintExpr constraintExpr_makeBinaryOp (void) ; /// @allocates result->data @ @sets result->kind @;
-
-//constraintExpr constraintExpr_makeMaxSetConstraintExpr (constraintExpr c);
+     
+     
+/*@special@*/ static constraintExpr constraintExpr_makeBinaryOp (void) 
+     /* @allocates result->data @ @sets result->kind @ */ ;
 
 void constraintExpr_free (/*@only@*/ constraintExpr expr)
 {
@@ -188,7 +184,7 @@ static bool isZeroBinaryOp (constraintExpr expr)
   
   llassert (expr != NULL);
   
-  // we simplify unaryExpr else where
+  /* we simplify unaryExpr elsewhere */
   if (expr->kind != binaryexpr)
     return expr;
 
@@ -495,9 +491,9 @@ constraintExpr constraintExpr_makeExprNode (exprNode e)
   return ret;
 }
 
-/*@only@*/  constraintExpr constraintExpr_makeTermExprNode (/*@exposed@*/ exprNode e)
+/*@only@*/ constraintExpr constraintExpr_makeTermExprNode (/*@exposed@*/ exprNode e)
 {
-  return  oldconstraintExpr_makeTermExprNode(e); //constraintExpr_makeExprNode (e);
+  return  oldconstraintExpr_makeTermExprNode(e);
 }
 
 static constraintExpr constraintExpr_makeTerm (/*@only@*/  constraintTerm t)
@@ -542,11 +538,11 @@ constraintExpr constraintExpr_makeTermsRef (/*@temp@*/ sRef s)
 
   /*@-uniondef@*/ 
   /*@-compdef@*/
-    ret->data = constraintExprData_unaryExprSetExpr (ret->data, cexpr);
-    ret->data = constraintExprData_unaryExprSetOp (ret->data, UNARYOP_UNDEFINED);
-
+  ret->data = constraintExprData_unaryExprSetExpr (ret->data, cexpr);
+  ret->data = constraintExprData_unaryExprSetOp (ret->data, UNARYOP_UNDEFINED);
+  
   return ret;
-
+  
   /*@=compdef@*/
   /*@=uniondef@*/
 }
@@ -710,7 +706,6 @@ constraintExpr constraintExpr_makeValueInt (int i)
   ret->data->binaryOp.expr1 = constraintExpr_undefined;
   ret->data->binaryOp.expr2 = constraintExpr_undefined;
   
-  //  ret->data = constraintExprData_binaryExprSetOp (ret->data, BINARYOP_UNDEFINED);
   return ret;
 }
 
@@ -1176,23 +1171,23 @@ static /*@only@*/ constraintExpr constraintExpr_simplifybinaryExpr (/*@only@*/co
   expr1 = constraintExpr_copy(expr1);
   expr2 = constraintExpr_copy(expr2);
 
-//drl possible problem : warning make sure this works
-    
-    lexpr->kind = expr1->kind;
-    free (lexpr->data);
-
-    lexpr->data = copyExprData (expr1->data, expr1->kind);
-    constraintExpr_free(expr1);
-    
-    if (op == PLUS)
-      expr = constraintExpr_makeSubtractExpr (expr, expr2);
-    else if (op == MINUS)
-      expr = constraintExpr_makeAddExpr (expr, expr2);
-    else
-      BADEXIT;
-
-    
-    return expr;
+  /* drl possible problem : warning make sure this works */
+  
+  lexpr->kind = expr1->kind;
+  sfree (lexpr->data);
+  
+  lexpr->data = copyExprData (expr1->data, expr1->kind);
+  constraintExpr_free(expr1);
+  
+  if (op == PLUS)
+    expr = constraintExpr_makeSubtractExpr (expr, expr2);
+  else if (op == MINUS)
+    expr = constraintExpr_makeAddExpr (expr, expr2);
+  else
+    BADEXIT;
+  
+  
+  return expr;
 
   /*
     #warning this needs to be checked
@@ -1216,7 +1211,6 @@ static /*@only@*/ constraintExpr constraintExpr_simplifyunaryExpr (/*@only@*/ co
     {
       return c;
     }
-  // pattern mxr ( var + const) = mxr(var) - const
   
   exp = constraintExprData_unaryExprGetExpr (c->data);
   exp = constraintExpr_copy(exp);
@@ -1257,10 +1251,11 @@ static /*@only@*/ constraintExpr constraintExpr_simplifyunaryExpr (/*@only@*/ co
          BADEXIT;
        }
 
-      // slight Kludge to hanlde var [] = { , , };
-      // type syntax  I don't think this is sounds but it should be good
-      // enough.  The C stanrad is very confusing about initialization
-      // -- DRL 7/25/01
+      /* slight Kludge to hanlde var [] = { , , };
+      ** type syntax  I don't think this is sounds but it should be good
+      ** enough.  The C stanrad is very confusing about initialization
+      ** -- DRL 7/25/01
+      */
       
       if (constraintTerm_isInitBlock(cterm) )
        {
@@ -1291,7 +1286,7 @@ static /*@only@*/ constraintExpr constraintExpr_simplifyunaryExpr (/*@only@*/ co
   if (constraintExprData_binaryExprGetOp (exp->data) == PLUS  )
     {
  
-      //      if (constraintExpr_canGetValue (constraintExprData_binaryExprGetExpr2 (exp->data) ) )
+      /* if (constraintExpr_canGetValue (constraintExprData_binaryExprGetExpr2 (exp->data) ) ) */
        {
        
          constraintExpr  temp, temp2;

diff --git a/src/constraintExprData.c b/src/constraintExprData.c
index 645b77220fe0c915e4619642bd8243f18a4221ad..e69e4d2e2ec81f754209be95ae7e60499a664c11 100644 (file)
--- a/src/constraintExprData.c
+++ b/src/constraintExprData.c
@@ -110,30 +110,7 @@ constraintExprData constraintExprData_copyTerm (/*@observer@*/ constraintExprDat
   return ret;
 }
 
-// constraintExprData constraintExprData_copy (constraintExprData data, constraintExprKind kind)
-// {
-//   constraintExprData ret;
-//   llassert(constraintExprData_isDefined(data));
-//   ret = dmalloc (sizeof (*ret) );
-//   switch (kind)
-//     {
-//     case binaryexpr:
-//       ret->binaryOp.binaryOp = data->binaryOp.binaryOp;
-//       ret->binaryOp.expr1 = constraintExpr_copy (data->binaryOp.expr1);
-//       ret->binaryOp.expr2 = constraintExpr_copy (data->binaryOp.expr2);
-//       break;
-//     case unaryExpr:
-//       ret->unaryOp.unaryOp = data->unaryOp.unaryOp;
-//       ret->unaryOp.expr = constraintExpr_copy (data->unaryOp.expr);
-//       break;
-//     case term:
-//       ret->term = constraintTerm_copy (data->term);
-//     }
-  
-//   return ret;
-// }
-
- constraintExprData constraintExprData_termSetTerm (/*@returned@*/  constraintExprData data,  /*@only@*/constraintTerm term)
+constraintExprData constraintExprData_termSetTerm (/*@returned@*/  constraintExprData data,  /*@only@*/constraintTerm term)
 {
   llassert (constraintExprData_isDefined(data));
 
@@ -187,8 +164,9 @@ constraintExprData  constraintExprData_unaryExprSetExpr (constraintExprData data
   return data;
 }
 
-// binaryExpr stuff
-
+/*
+** binaryExpr stuff
+*/
 
 constraintExprBinaryOpKind  constraintExprData_binaryExprGetOp (constraintExprData data)
 {

diff --git a/src/constraintGeneration.c b/src/constraintGeneration.c
index abe43c12a03b3fbb00304b85ed84f7402c76c62e..351b05cb6d2501f9077636a75e6f5348809759c1 100644 (file)
--- a/src/constraintGeneration.c
+++ b/src/constraintGeneration.c
@@ -3,7 +3,7 @@
 ** constraintGeneration.c
 */
 
-//#define DEBUGPRINT 1
+/* #define DEBUGPRINT 1 */
 
 # include <ctype.h> /* for isdigit */
 # include "lclintMacros.nf"
@@ -14,41 +14,21 @@
 # include "exprChecks.h"
 # include "exprNodeSList.h"
 
-//# include "exprDataQuite.i"
-
 /*@access exprNode @*/
 
 
 static bool exprNode_handleError(/*@dependent@*/ exprNode p_e);
 
-//static cstring exprNode_findConstraints ( exprNode p_e);
 static bool exprNode_isMultiStatement(/*@dependent@*/ exprNode p_e);
 static void  exprNode_multiStatement (/*@dependent@*/ exprNode p_e);
 
-//static void exprNode_constraintPropagateUp (exprNode p_e);
-
 static constraintList exprNode_traversTrueEnsuresConstraints (/*@dependent@*/ exprNode p_e);
 static constraintList exprNode_traversFalseEnsuresConstraints (/*@dependent@*/ exprNode p_e);
 
-static exprNode makeDataTypeConstraints (/*@returned@*/ exprNode p_e);
-
 static void checkArgumentList (/*@out@*/ exprNode p_temp, exprNodeList p_arglist, fileloc p_sequencePoint) /*@modifies p_temp @*/;
 
 static  constraintList checkCall (/*@dependent@*/ exprNode p_fcn, exprNodeList p_arglist);
 
-//constraintList constraintList_makeFixedArrayConstraints (sRefSet s);
-
-//bool exprNode_testd()
-//{
-  /*        if ( ( (exprNode_isError  ) ) )
-         {
-         }
-        if ( ( (e_1  ) ) )
-         {
-         }
-  */
-//}
-
 static bool exprNode_isUnhandled (/*@dependent@*/ /*@observer@*/ exprNode e)
 {
   llassert( exprNode_isDefined(e) );
@@ -74,10 +54,8 @@ static bool exprNode_isUnhandled (/*@dependent@*/ /*@observer@*/ exprNode e)
     case XPR_TOK:
     case XPR_FTDEFAULT:
     case XPR_DEFAULT:
-      //    case XPR_SWITCH:
     case XPR_FTCASE:
     case XPR_CASE:
-      //    case XPR_INIT:
     case XPR_NODE:
       DPRINTF((message ("Warning current constraint generation does not handle expression %s", exprNode_unparse(e)) ) );
       return TRUE;
@@ -118,9 +96,6 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@dependent@*/ exprNode e)
         return FALSE;
     }
 
-  
-  //  e = makeDataTypeConstraints (e);
-  
   DPRINTF((message ("exprNode_generateConstraints Analysising %s at %s", exprNode_unparse( e),
                    fileloc_unparse(exprNode_getfileloc(e) ) ) ) );
 
@@ -144,9 +119,6 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@dependent@*/ exprNode e)
 
     c = constraintList_makeFixedArrayConstraints (e->uses);
     e->requiresConstraints = constraintList_reflectChangesFreePre (e->requiresConstraints, c);
-  
-  //  e->ensuresConstraints = constraintList_mergeEnsures(c, e->ensuresConstraints);
-  
     constraintList_free(c);
   }    
 
@@ -190,12 +162,11 @@ static void exprNode_stmt ( /*@dependent@*/ /*@temp@*/ exprNode e)
   
   if (exprNode_isError(e) )
     {
-      return; // FALSE;
+      return; 
     }
+
   /*e->requiresConstraints = constraintList_makeNew();
     e->ensuresConstraints  = constraintList_makeNew(); */
-  //  e = makeDataTypeConstraints(e);
-  
  
   DPRINTF(( "expNode_stmt: STMT:") );
   s =  exprNode_unparse(e);
@@ -217,7 +188,7 @@ static void exprNode_stmt ( /*@dependent@*/ /*@temp@*/ exprNode e)
       tempList = e->ensuresConstraints;
       e->ensuresConstraints  = exprNode_traversEnsuresConstraints(e);
       constraintList_free(tempList);
-      return; // notError;
+      return; 
     }
   
   if (e->kind != XPR_STMT)
@@ -230,8 +201,7 @@ static void exprNode_stmt ( /*@dependent@*/ /*@temp@*/ exprNode e)
          return exprNode_multiStatement (e );
        }
       DPRINTF( (message ("Ignoring non-statement %s", exprNode_unparse(e) ) ) );
-      return; //TRUE;
-      //      llassert(FALSE);
+      return; 
     }
  
   DPRINTF (("Stmt") );
@@ -251,27 +221,21 @@ static void exprNode_stmt ( /*@dependent@*/ /*@temp@*/ exprNode e)
     }
   
   loc = exprNode_getNextSequencePoint(e); /* reduces to an expression */
-  //notError = 
   exprNode_exprTraverse (snode, FALSE, FALSE, loc);
 
   fileloc_free(loc);
 
   constraintList_free (e->requiresConstraints);
   e->requiresConstraints = exprNode_traversRequiresConstraints(snode);
-  //  printf ("For: %s \n", exprNode_unparse (e) );
-  // printf ("%s\n", constraintList_print(e->requiresConstraints) );
 
   constraintList_free (e->ensuresConstraints);
   e->ensuresConstraints  = exprNode_traversEnsuresConstraints(snode);
-  // printf ("Ensures that:\n %s\n", constraintList_print(e->ensuresConstraints) );
-  //  llassert(notError);
 
   DPRINTF ( (message ("smtlist constraints are: pre: %s \n and \t post %s\n",
                      constraintList_print(e->requiresConstraints),
                      constraintList_print(e->ensuresConstraints) ) ) );
 
-  return; // notError;
-  
+  return; 
 }
 
 
@@ -280,17 +244,14 @@ static void exprNode_stmtList  (/*@dependent@*/ exprNode e)
   exprNode stmt1, stmt2;
   if (exprNode_isError (e) )
     {
-      return; // FALSE;
+      return; 
     }
 
   /*
-    e->requiresConstraints = constraintList_makeNew();
-    e->ensuresConstraints  = constraintList_makeNew();
+    Handle case of stmtList with only one statement:
+    The parse tree stores this as stmt instead of stmtList
   */
-  //  e = makeDataTypeConstraints(e);
-  
-  /*Handle case of stmtList with only one statement:
-   The parse tree stores this as stmt instead of stmtList*/
+
   if (e->kind != XPR_STMTLIST)
     {
       exprNode_stmt(e);
@@ -315,7 +276,7 @@ static void exprNode_stmtList  (/*@dependent@*/ exprNode e)
   DPRINTF ( (message ("smtlist constraints are: pre: %s \n and \t post %s\n",
                      constraintList_print(e->requiresConstraints),
                      constraintList_print(e->ensuresConstraints) ) ) );
-  return; // TRUE;
+  return;
 }
 
 static exprNode doIf (/*@returned@*/  exprNode e, /*@dependent@*/ exprNode test, /*@dependent@*/ exprNode body)
@@ -380,7 +341,7 @@ static exprNode doIf (/*@returned@*/  exprNode e, /*@dependent@*/ exprNode test,
   constraintList_free(temp);
 
 
-//drl possible problem : warning bad
+  /* drl possible problem : warning bad */
   constraintList_free(e->ensuresConstraints);
   e->ensuresConstraints = constraintList_copy (test->ensuresConstraints);
   
@@ -409,51 +370,52 @@ static exprNode doIf (/*@returned@*/  exprNode e, /*@dependent@*/ exprNode test,
 
 static exprNode doIfElse (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode p, /*@dependent@*/ exprNode trueBranch, /*@dependent@*/ exprNode falseBranch)
 {
+  constraintList c1, cons, t, t2, f, f2;
   
-    constraintList c1, cons, t, t2, f, f2;
-
   DPRINTF ((message ("doIfElse: %s ", exprNode_unparse(e) ) ) );
-    
-    // do requires clauses
-    c1 = constraintList_copy (p->ensuresConstraints);
-    
-    t = constraintList_reflectChanges(trueBranch->requiresConstraints, p->trueEnsuresConstraints);
-    t = constraintList_reflectChangesFreePre (t, p->ensuresConstraints);
-
-    cons = constraintList_reflectChanges(falseBranch->requiresConstraints, p->falseEnsuresConstraints);
-    cons  = constraintList_reflectChangesFreePre (cons, c1);
-
-    constraintList_free(e->requiresConstraints);
-    e->requiresConstraints = constraintList_mergeRequiresFreeFirst (t, cons);
-    e->requiresConstraints = constraintList_mergeRequiresFreeFirst (e->requiresConstraints, p->requiresConstraints);
-    
-    // do ensures clauses
-    // find the  the ensures lists for each subbranch
-    t = constraintList_mergeEnsures (p->trueEnsuresConstraints, trueBranch->ensuresConstraints);
-    t2 = t;
-    t = constraintList_mergeEnsures (p->ensuresConstraints, t);
-    constraintList_free(t2);
-
-    f = constraintList_mergeEnsures (p->falseEnsuresConstraints, falseBranch->ensuresConstraints);
-    f2 = f;
-    f = constraintList_mergeEnsures (p->ensuresConstraints, f);
-    constraintList_free(f2);
-    
-    // find ensures for whole if/else statement
-    
-    constraintList_free(e->ensuresConstraints);
-
-    e->ensuresConstraints = constraintList_logicalOr (t, f);
-    
-    constraintList_free(t);
-    constraintList_free(f);
-    constraintList_free(cons);
-    constraintList_free(c1);
+  
+  /* do requires clauses */
+  c1 = constraintList_copy (p->ensuresConstraints);
+  
+  t = constraintList_reflectChanges(trueBranch->requiresConstraints, p->trueEnsuresConstraints);
+  t = constraintList_reflectChangesFreePre (t, p->ensuresConstraints);
+  
+  cons = constraintList_reflectChanges(falseBranch->requiresConstraints, p->falseEnsuresConstraints);
+  cons  = constraintList_reflectChangesFreePre (cons, c1);
+  
+  constraintList_free(e->requiresConstraints);
+  e->requiresConstraints = constraintList_mergeRequiresFreeFirst (t, cons);
+  e->requiresConstraints = constraintList_mergeRequiresFreeFirst (e->requiresConstraints, p->requiresConstraints);
+  
+  /* do ensures clauses
+     find the  the ensures lists for each subbranch
+  */
 
-    DPRINTF ((message ("doIfElse: if requires %q ", constraintList_print(e->requiresConstraints) ) ) );
-    DPRINTF ((message ("doIfElse: if ensures %q ", constraintList_print(e->ensuresConstraints) ) ) );
-    
-    return e;
+  t = constraintList_mergeEnsures (p->trueEnsuresConstraints, trueBranch->ensuresConstraints);
+  t2 = t;
+  t = constraintList_mergeEnsures (p->ensuresConstraints, t);
+  constraintList_free(t2);
+  
+  f = constraintList_mergeEnsures (p->falseEnsuresConstraints, falseBranch->ensuresConstraints);
+  f2 = f;
+  f = constraintList_mergeEnsures (p->ensuresConstraints, f);
+  constraintList_free(f2);
+  
+  /* find ensures for whole if/else statement */
+  
+  constraintList_free(e->ensuresConstraints);
+  
+  e->ensuresConstraints = constraintList_logicalOr (t, f);
+  
+  constraintList_free(t);
+  constraintList_free(f);
+  constraintList_free(cons);
+  constraintList_free(c1);
+  
+  DPRINTF ((message ("doIfElse: if requires %q ", constraintList_print(e->requiresConstraints) ) ) );
+  DPRINTF ((message ("doIfElse: if ensures %q ", constraintList_print(e->ensuresConstraints) ) ) );
+  
+  return e;
 }
 
 static exprNode doWhile (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode test, /*@dependent@*/ exprNode body)
@@ -470,47 +432,46 @@ static exprNode doWhile (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode tes
  
   sRefSet_elements (s, el)
     {
-      //    llassert (el);
-    if (sRef_isFixedArray(el) )
-      {
-       long int size;
-       DPRINTF( (message("%s is a fixed array",
-                         sRef_unparse(el)) ) );
-       //if (el->kind == SK_DERIVED)
-         //  break; //hack until I find the real problem
-       size = sRef_getArraySize(el);
-       DPRINTF( (message("%s is a fixed array with size %d",
-                         sRef_unparse(el), (int)size) ) );
-       con = constraint_makeSRefSetBufferSize (el, (size - 1));
-       //con = constraint_makeSRefWriteSafeInt (el, (size - 1));
-       ret = constraintList_add(ret, con);
-      }
-    else
-      {
-       DPRINTF( (message("%s is not a fixed array",
-                         sRef_unparse(el)) ) );
-     
-    
-    if (sRef_isExternallyVisible (el) )
-      {
-       /*DPRINTF( (message("%s is externally visible",
-                         sRef_unparse(el) ) ));
-       con = constraint_makeSRefWriteSafeInt(el, 0);
-       ret = constraintList_add(ret, con);
-       
-       con = constraint_makeSRefReadSafeInt(el, 0);
-       
-       ret = constraintList_add(ret, con);*/
-      }
-      }
+      if (sRef_isFixedArray(el) )
+       {
+         long int size;
+         DPRINTF( (message("%s is a fixed array",
+                           sRef_unparse(el)) ) );
+         size = sRef_getArraySize(el);
+         DPRINTF( (message("%s is a fixed array with size %d",
+                           sRef_unparse(el), (int)size) ) );
+         con = constraint_makeSRefSetBufferSize (el, (size - 1));
+         ret = constraintList_add(ret, con);
+       }
+      else
+       {
+         DPRINTF( (message("%s is not a fixed array",
+                           sRef_unparse(el)) ) );
+         
+         
+         if (sRef_isExternallyVisible (el) )
+           {
+             /*
+               DPRINTF( (message("%s is externally visible",
+               sRef_unparse(el) ) ));
+               con = constraint_makeSRefWriteSafeInt(el, 0);
+               ret = constraintList_add(ret, con);
+               
+               con = constraint_makeSRefReadSafeInt(el, 0);
+               
+               ret = constraintList_add(ret, con);
+             */
+           }
+       }
     }
-  end_sRefSet_elements
-
-    DPRINTF(( message("constraintList_makeFixedArrayConstraints returning %s",
-                     constraintList_print(ret) ) ));
-    return ret;
+  end_sRefSet_elements ;
+  
+  DPRINTF(( message("constraintList_makeFixedArrayConstraints returning %s",
+                   constraintList_print(ret) ) ));
+  return ret;
 }
 
+# if 0
 exprNode makeDataTypeConstraints (/*@returned@*/ exprNode e)
 {
   constraintList c;
@@ -522,44 +483,43 @@ exprNode makeDataTypeConstraints (/*@returned@*/ exprNode e)
  
  return e;
 }
+# endif
 
 static void doFor (/*@dependent@*/ exprNode e, /*@dependent@*/ exprNode forPred, /*@dependent@*/ exprNode forBody)
 {
   exprNode init, test, inc;
-  //merge the constraints: modle as if statement
+  /* merge the constraints: modle as if statement */
+
       /* init
        if (test)
           for body
           inc        */
-      init  =  exprData_getTripleInit (forPred->edata);
-      test =   exprData_getTripleTest (forPred->edata);
-      inc  =   exprData_getTripleInc (forPred->edata);
-
-      if ( ( (exprNode_isError (test) /*|| (exprNode_isError(init) )*/ ) || (exprNode_isError (inc) ) ) )
-       {
-         DPRINTF ((message ("strange for statement:%s, ignoring it", exprNode_unparse(e) ) ) );
-         return;
-       }
-
-      exprNode_forLoopHeuristics(e, forPred, forBody);
-      
-      constraintList_free(e->requiresConstraints);
-      e->requiresConstraints = constraintList_reflectChanges(forBody->requiresConstraints, test->ensuresConstraints);
-      e->requiresConstraints = constraintList_reflectChangesFreePre (e->requiresConstraints, test->trueEnsuresConstraints);
-      e->requiresConstraints = constraintList_reflectChangesFreePre (e->requiresConstraints, forPred->ensuresConstraints);
-
-      if (!forBody->canBreak)
-       {
-         e->ensuresConstraints = constraintList_addListFree(e->ensuresConstraints, constraintList_copy(forPred->ensuresConstraints) );
-         e->ensuresConstraints = constraintList_addListFree(e->ensuresConstraints,constraintList_copy( test->falseEnsuresConstraints));
-         //      forPred->ensuresConstraints = constraintList_undefined;
-         //      test->falseEnsuresConstraints = constraintList_undefined;
-       }
-      else
-       {
-         DPRINTF(("Can break") );
-       }
-      
+  init  =  exprData_getTripleInit (forPred->edata);
+  test =   exprData_getTripleTest (forPred->edata);
+  inc  =   exprData_getTripleInc (forPred->edata);
+  
+  if ( ( (exprNode_isError (test) /*|| (exprNode_isError(init) )*/ ) || (exprNode_isError (inc) ) ) )
+    {
+      DPRINTF ((message ("strange for statement:%s, ignoring it", exprNode_unparse(e) ) ) );
+      return;
+    }
+  
+  exprNode_forLoopHeuristics(e, forPred, forBody);
+  
+  constraintList_free(e->requiresConstraints);
+  e->requiresConstraints = constraintList_reflectChanges(forBody->requiresConstraints, test->ensuresConstraints);
+  e->requiresConstraints = constraintList_reflectChangesFreePre (e->requiresConstraints, test->trueEnsuresConstraints);
+  e->requiresConstraints = constraintList_reflectChangesFreePre (e->requiresConstraints, forPred->ensuresConstraints);
+  
+  if (!forBody->canBreak)
+    {
+      e->ensuresConstraints = constraintList_addListFree(e->ensuresConstraints, constraintList_copy(forPred->ensuresConstraints) );
+      e->ensuresConstraints = constraintList_addListFree(e->ensuresConstraints,constraintList_copy( test->falseEnsuresConstraints));
+    }
+  else
+    {
+      DPRINTF(("Can break") );
+    }
 }
 
 static /*@dependent@*/ exprNode exprNode_makeDependent(/*@returned@*/  exprNode e)
@@ -596,9 +556,7 @@ static void exprNode_doGenerateConstraintSwitch (/*@dependent@*/ exprNode switch
   if (body->kind != XPR_STMTLIST )
     {
       DPRINTF((message("exprNode_doGenerateConstraintSwitch: non stmtlist: %s",
-                      exprNode_unparse(body) )
-              ));
-      //      llassert(body->kind == XPR_STMT );
+                      exprNode_unparse(body) )));
       stmt = body;
       stmtList = exprNode_undefined;
       stmt = exprNode_makeDependent(stmt);
@@ -629,8 +587,6 @@ static void exprNode_doGenerateConstraintSwitch (/*@dependent@*/ exprNode switch
 
   switchExpr = exprNode_makeDependent (switchExpr);
     
-  //, FALSE, FALSE, exprNode_getfileloc(stmt) );
-
   if (! exprNode_isCaseMarker(stmt) )
     {
 
@@ -664,8 +620,10 @@ static void exprNode_doGenerateConstraintSwitch (/*@dependent@*/ exprNode switch
 
   if (exprNode_isCaseMarker(stmt) && exprNode_mustEscape(stmtList) )
     {
-      // merge current and saved constraint with Logical Or...
-      // make a constraint for ensures
+      /*
+      ** merge current and saved constraint with Logical Or...
+      ** make a constraint for ensures
+      */
 
       constraintList temp;
       constraint con;
@@ -709,12 +667,14 @@ static void exprNode_doGenerateConstraintSwitch (/*@dependent@*/ exprNode switch
     }
 
   else if (exprNode_isCaseMarker(stmt) )
-    //prior case has no break.
+    /* prior case has no break. */
     {
-      // We don't do anything to the sved constraints because the case hasn't ended
-      //The new ensures constraints for the case will be:
-      // the constraint for the case statement (CASE_LABEL == SWITCH_EXPR) logicalOr currentEnsures
-
+      /* 
+        We don't do anything to the sved constraints because the case hasn't ended
+        The new ensures constraints for the case will be:
+        the constraint for the case statement (CASE_LABEL == SWITCH_EXPR) logicalOr currentEnsures
+      */
+      
       constraintList temp;
       constraint con;
 
@@ -753,8 +713,10 @@ static void exprNode_doGenerateConstraintSwitch (/*@dependent@*/ exprNode switch
     }
   else
     {
-      // we handle the case of ! exprNode_isCaseMarker above
-      // the else if clause should always be true.
+      /*
+       we handle the case of ! exprNode_isCaseMarker above
+       the else if clause should always be true.
+      */
       BADEXIT;
     }
 
@@ -799,8 +761,10 @@ static void exprNode_generateConstraintSwitch ( exprNode switchStmt)
 
   exprNode_doGenerateConstraintSwitch (switchExpr, body, &lastRequires, &lastEnsures, &constraintsRequires, &constraintsEnsures);
 
-  // merge current and saved constraint with Logical Or...
-  // make a constraint for ensures
+  /*
+    merge current and saved constraint with Logical Or...
+    make a constraint for ensures
+  */
 
   constraintList_free(switchStmt->requiresConstraints);
   constraintList_free(switchStmt->ensuresConstraints);
@@ -834,20 +798,12 @@ static exprNode doSwitch (/*@returned@*/ exprNode e)
   exprData data;
 
   data = e->edata;
-  //  llassert(FALSE);
   DPRINTF (( message ("doSwitch for: switch (%s) %s",
                      exprNode_unparse (exprData_getPairA (data)),
                      exprNode_unparse (exprData_getPairB (data))) ));
 
   body = exprData_getPairB (data);
-
-  //  exprNode_generateConstraints(body);
-
   exprNode_generateConstraintSwitch (e);
-
-  //  e->requiresConstraints = constraintList_copy (body->requiresConstraints );
-  // e->ensuresConstraints = constraintList_copy (body->ensuresConstraints );
-
   return e;
 }
 
@@ -866,20 +822,12 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e)
 
   constraintList temp;
 
-  //  constraintList t, f;
-  /*e->requiresConstraints = constraintList_makeNew();
-  e->ensuresConstraints = constraintList_makeNew();
-  e->trueEnsuresConstraints = constraintList_makeNew();
-  e->falseEnsuresConstraints = constraintList_makeNew();
-  */
-  //  e = makeDataTypeConstraints(e);
-
   DPRINTF((message ("exprNode_multistatement Analysising %s %s at", exprNode_unparse( e),
                    fileloc_unparse(exprNode_getfileloc(e) ) ) ) );
   
   if (exprNode_handleError (e))
     {
-      return; // FALSE;
+      return; 
     }
 
   data = e->edata;
@@ -890,11 +838,10 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e)
     {
       
     case XPR_FOR:
-      // ret = message ("%s %s",
       forPred = exprData_getPairA (data);
       forBody = exprData_getPairB (data);
       
-      //first generate the constraints
+      /* First generate the constraints */
       exprNode_generateConstraints (forPred);
       exprNode_generateConstraints (forBody);
 
@@ -904,7 +851,6 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e)
       break;
 
     case XPR_FORPRED:
-      //            ret = message ("for (%s; %s; %s)",
       exprNode_generateConstraints (exprData_getTripleInit (data) );
       test = exprData_getTripleTest (data);
       exprNode_exprTraverse (test,FALSE, FALSE, exprNode_loc(e));
@@ -937,24 +883,17 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e)
     case XPR_IF:
       DPRINTF(( "IF:") );
       DPRINTF ((exprNode_unparse(e) ) );
-      //      ret = message ("if (%s) %s",
       e1 = exprData_getPairA (data);
       e2 = exprData_getPairB (data);
 
-      exprNode_exprTraverse (e1,
-                            FALSE, FALSE, exprNode_loc(e1));
+      exprNode_exprTraverse (e1, FALSE, FALSE, exprNode_loc(e1));
 
       exprNode_generateConstraints (e2);
       e = doIf (e, e1, e2);
-  
-      
-      //      e->constraints = constraintList_exprNodemerge (exprData_getPairA (data),exprData_getPairB(data));
       break;
-
      
     case XPR_IFELSE:
       DPRINTF(("Starting IFELSE"));
-      //      ret = message ("if (%s) %s else %s",
       p = exprData_getTriplePred (data);
       trueBranch = exprData_getTripleTrue (data);
       falseBranch = exprData_getTripleFalse (data);
@@ -998,15 +937,13 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e)
       break;
       
     case XPR_BLOCK:
-      //      ret = message ("{ %s }",
-                    exprNode_generateConstraints (exprData_getSingle (data));
-
-                    constraintList_free(e->requiresConstraints);
-                    e->requiresConstraints = constraintList_copy ( (exprData_getSingle (data))->requiresConstraints );
-
-                    constraintList_free(e->ensuresConstraints);
-                    e->ensuresConstraints = constraintList_copy ( (exprData_getSingle (data))->ensuresConstraints );
-                    //      e->constraints = (exprData_getSingle (data))->constraints;
+      exprNode_generateConstraints (exprData_getSingle (data));
+      
+      constraintList_free(e->requiresConstraints);
+      e->requiresConstraints = constraintList_copy ( (exprData_getSingle (data))->requiresConstraints );
+      
+      constraintList_free(e->ensuresConstraints);
+      e->ensuresConstraints = constraintList_copy ( (exprData_getSingle (data))->ensuresConstraints );
       break;
 
     case XPR_SWITCH:
@@ -1021,7 +958,7 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e)
     default:
       ret=FALSE;
     }
-  return; // ret;
+  return; 
 }
 
 static bool lltok_isBoolean_Op (lltok tok)
@@ -1071,100 +1008,89 @@ static bool lltok_isBoolean_Op (lltok tok)
 
 static void exprNode_booleanTraverse (/*@dependent@*/ exprNode e, /*@unused@*/ bool definatelv, /*@unused@*/ bool definaterv,  fileloc sequencePoint)
 {
- constraint cons;
-exprNode t1, t2;
-exprData data;
-lltok tok;
-constraintList tempList, temp;
-data = e->edata;
-
-tok = exprData_getOpTok (data);
-
-
-t1 = exprData_getOpA (data);
-t2 = exprData_getOpB (data);
-
-
- tempList = constraintList_undefined;
- 
-/* arithmetic tests */
-
-if (lltok_isEq_Op (tok) )
-{
-  cons =  constraint_makeEnsureEqual (t1, t2, sequencePoint);
-  e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
-}
- 
-
- if (lltok_isLt_Op (tok) )
-   {
-     cons =  constraint_makeEnsureLessThan (t1, t2, sequencePoint);
-     e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
-     cons = constraint_makeEnsureGreaterThanEqual (t1, t2, sequencePoint);
-     e->falseEnsuresConstraints = constraintList_add(e->falseEnsuresConstraints, cons);
-   }
- 
-   
-if (lltok_isGe_Op (tok) )
-{
+  constraint cons;
+  exprNode t1, t2;
+  exprData data;
+  lltok tok;
+  constraintList tempList, temp;
+  data = e->edata;
   
-  cons = constraint_makeEnsureGreaterThanEqual (t1, t2, sequencePoint);
-  e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
+  tok = exprData_getOpTok (data);
+  t1 = exprData_getOpA (data);
+  t2 = exprData_getOpB (data);
   
-  cons =  constraint_makeEnsureLessThan (t1, t2, sequencePoint);
-  e->falseEnsuresConstraints = constraintList_add(e->falseEnsuresConstraints, cons);
+  tempList = constraintList_undefined;
   
-}
-
-
-  if (lltok_isGt_Op (tok) )
-{
-  cons =  constraint_makeEnsureGreaterThan (t1, t2, sequencePoint);
-  e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
-  cons = constraint_makeEnsureLessThanEqual (t1, t2, sequencePoint);
-  e->falseEnsuresConstraints = constraintList_add(e->falseEnsuresConstraints, cons);
-}
-
-if (lltok_isLe_Op (tok) )
-{
-   cons = constraint_makeEnsureLessThanEqual (t1, t2, sequencePoint);
-  e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
+  /* arithmetic tests */
   
-  cons =  constraint_makeEnsureGreaterThan (t1, t2, sequencePoint);
-  e->falseEnsuresConstraints = constraintList_add(e->falseEnsuresConstraints, cons);
-}
+  if (lltok_isEq_Op (tok) )
+    {
+      cons =  constraint_makeEnsureEqual (t1, t2, sequencePoint);
+      e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
+    }
   
-
-
-/*Logical operations */
-
-
- if (lltok_isAnd_Op (tok) )
+  
+  if (lltok_isLt_Op (tok) )
+    {
+      cons =  constraint_makeEnsureLessThan (t1, t2, sequencePoint);
+      e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
+      cons = constraint_makeEnsureGreaterThanEqual (t1, t2, sequencePoint);
+      e->falseEnsuresConstraints = constraintList_add(e->falseEnsuresConstraints, cons);
+    }
    
-   {
-     //true ensures 
-     tempList = constraintList_copy (t1->trueEnsuresConstraints);
-     tempList = constraintList_addList (tempList, t2->trueEnsuresConstraints);
-     e->trueEnsuresConstraints = constraintList_addListFree(e->trueEnsuresConstraints, tempList);
-     
-      //false ensures: fens t1 or tens t1 and fens t2
-     tempList = constraintList_copy (t1->trueEnsuresConstraints);
-     tempList = constraintList_addList (tempList, t2->falseEnsuresConstraints);
-     temp = tempList;
-     tempList = constraintList_logicalOr (tempList, t1->falseEnsuresConstraints);
-     constraintList_free (temp);
-     
-     /* evans - was constraintList_addList - memory leak detected by lclint */
-     e->falseEnsuresConstraints =constraintList_addListFree (e->falseEnsuresConstraints, tempList);
-   }
- else if (lltok_isOr_Op (tok) )
-  {
-      //false ensures 
+  if (lltok_isGe_Op (tok) )
+    {
+      cons = constraint_makeEnsureGreaterThanEqual (t1, t2, sequencePoint);
+      e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
+      
+      cons =  constraint_makeEnsureLessThan (t1, t2, sequencePoint);
+      e->falseEnsuresConstraints = constraintList_add(e->falseEnsuresConstraints, cons);
+    }
+  
+  if (lltok_isGt_Op (tok) )
+    {
+      cons =  constraint_makeEnsureGreaterThan (t1, t2, sequencePoint);
+      e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
+      cons = constraint_makeEnsureLessThanEqual (t1, t2, sequencePoint);
+      e->falseEnsuresConstraints = constraintList_add(e->falseEnsuresConstraints, cons);
+    }
+  
+  if (lltok_isLe_Op (tok) )
+    {
+      cons = constraint_makeEnsureLessThanEqual (t1, t2, sequencePoint);
+      e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
+      
+      cons =  constraint_makeEnsureGreaterThan (t1, t2, sequencePoint);
+      e->falseEnsuresConstraints = constraintList_add(e->falseEnsuresConstraints, cons);
+    }
+  
+  /* Logical operations */
+  
+  if (lltok_isAnd_Op (tok) )
+    {
+      /* true ensures  */
+      tempList = constraintList_copy (t1->trueEnsuresConstraints);
+      tempList = constraintList_addList (tempList, t2->trueEnsuresConstraints);
+      e->trueEnsuresConstraints = constraintList_addListFree(e->trueEnsuresConstraints, tempList);
+      
+      /* false ensures: fens t1 or tens t1 and fens t2 */
+      tempList = constraintList_copy (t1->trueEnsuresConstraints);
+      tempList = constraintList_addList (tempList, t2->falseEnsuresConstraints);
+      temp = tempList;
+      tempList = constraintList_logicalOr (tempList, t1->falseEnsuresConstraints);
+      constraintList_free (temp);
+      
+      /* evans - was constraintList_addList - memory leak detected by lclint */
+      e->falseEnsuresConstraints = constraintList_addListFree (e->falseEnsuresConstraints, tempList);
+    }
+  else if (lltok_isOr_Op (tok) )
+    {
+      /* false ensures */
       tempList = constraintList_copy (t1->falseEnsuresConstraints);
       tempList = constraintList_addList (tempList, t2->falseEnsuresConstraints);
       e->falseEnsuresConstraints = constraintList_addListFree(e->falseEnsuresConstraints, tempList);
       
-      //true ensures: tens t1 or fens t1 and tens t2
+      /* true ensures: tens t1 or fens t1 and tens t2 */
       tempList = constraintList_copy (t1->falseEnsuresConstraints);
       tempList = constraintList_addList (tempList, t2->trueEnsuresConstraints);
       
@@ -1175,7 +1101,7 @@ if (lltok_isLe_Op (tok) )
       e->trueEnsuresConstraints = constraintList_addListFree(e->trueEnsuresConstraints, tempList);
       tempList = constraintList_undefined;
     }
- else
+  else
     {
       DPRINTF((message("%s is not a boolean operation", lltok_unparse(tok) ) ));
     } 
@@ -1193,7 +1119,7 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
 
   if (exprNode_isError(e) )
     {
-      return; // FALSE;
+      return; 
     }
   
   DPRINTF((message ("exprNode_exprTraverset Analysising %s %s at", exprNode_unparse( e),
@@ -1207,12 +1133,11 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
 
   if (exprNode_isUnhandled (e) )
      {
-       return; // FALSE;
+       return;
      }
-   //   e = makeDataTypeConstraints (e);
- 
-   handledExprNode = TRUE;
-   
+  
+  handledExprNode = TRUE;
+  
   data = e->edata;
   
   switch (e->kind)
@@ -1245,18 +1170,14 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
       cons = constraint_makeEnsureLteMaxRead (t2, t1);
       e->trueEnsuresConstraints = constraintList_add(e->trueEnsuresConstraints, cons);
        
-      //      cons = constraint_makeEnsureMinReadAtMost (t1, t2, sequencePoint);
-      // e->ensuresConstraints = constraintList_add(e->ensuresConstraints, cons);
-      
       exprNode_exprTraverse (exprData_getPairA (data), FALSE, TRUE, sequencePoint);
       exprNode_exprTraverse (exprData_getPairB (data), FALSE, TRUE, sequencePoint);
       
-            /*@i325 Should check which is array/index. */
+      /*@i325 Should check which is array/index. */
       break;
       
     case XPR_PARENS: 
       exprNode_exprTraverse (exprData_getUopNode (e->edata), definatelv, definaterv, sequencePoint);
-      //    e->constraints = constraintList_exprNodemerge (exprData_getUopNode (e->edata), exprNode_undefined);
       break;
     case XPR_INIT:
       {
@@ -1278,8 +1199,6 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
                           )
                   ) ));        */
        
-       //exprNode_exprTraverse (t1, TRUE, FALSE, sequencePoint ); 
-       
        exprNode_exprTraverse (t2, definatelv, TRUE, sequencePoint );
        
        /* this test is nessecary because some expressions generate a null expression node.  function pointer do that -- drl */
@@ -1295,8 +1214,6 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
       t1 = exprData_getOpA (data);
       t2 = exprData_getOpB (data);
       exprNode_exprTraverse (t1, TRUE, definaterv, sequencePoint ); 
-      //lltok_unparse (exprData_getOpTok (data));
-
       exprNode_exprTraverse (t2, definatelv, TRUE, sequencePoint );
 
       /* this test is nessecary because some expressions generate a null expression node.  function pointer do that -- drl */
@@ -1337,10 +1254,9 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
       if (lltok_isBoolean_Op (tok) )
        exprNode_booleanTraverse (e, definatelv, definaterv, sequencePoint);
 
-      //      e->constraints  = constraintList_exprNodemerge (exprData_getOpA (data), exprData_getOpB (data));
       break;
     case XPR_SIZEOFT:
-      //drl possible problem : warning make sure the case can be ignored..
+      /*@i43 drl possible problem : warning make sure the case can be ignored.. */
       
       break;
       
@@ -1350,8 +1266,6 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
         its a variable length array.  So we don't generate constraints.
       */
         
-      //      exprNode_exprTraverse (exprData_getSingle (data), definatelv, definaterv, sequencePoint );
-      //      e->constraints = constraintList_exprNodemerge (exprData_getSingle (e->edata), exprNode_undefined);
       break;
       
     case XPR_CALL:
@@ -1367,16 +1281,9 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
                                                 exprNode_getPostConditions(fcn, exprData_getArgs (data),e  ) );
 
       t1 = exprNode_createNew (exprNode_getType (e) );
-      
       checkArgumentList (t1, exprData_getArgs(data), sequencePoint);
-
-      
       exprNode_mergeResolve (e, t1, fcn);
-
       exprNode_free(t1);
-      
-      //      e->constraints = constraintList_add (e->constraints, constraint_create (e,exprNode_undefined, GT,  CALLSAFE ) );
-      
       break;
       
     case XPR_RETURN:
@@ -1407,7 +1314,6 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
     case XPR_PREOP: 
       t1 = exprData_getUopNode(data);
       tok = (exprData_getUopTok (data));
-      //lltok_unparse (exprData_getUopTok (data));
       exprNode_exprTraverse (t1, definatelv, definaterv, sequencePoint );
       /*handle * pointer access */
       if (lltok_isInc_Op (tok) )
@@ -1546,7 +1452,6 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
       trueBranch->falseEnsuresConstraints = exprNode_traversFalseEnsuresConstraints(trueBranch);
       constraintList_free(temp);
 
-      //dfdf
       exprNode_exprTraverse (falseBranch, FALSE, TRUE, sequencePoint );
       
       temp =       falseBranch->ensuresConstraints;
@@ -1612,7 +1517,7 @@ void exprNode_exprTraverse (exprNode e, bool definatelv, bool definaterv,  /*@ob
 
   DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->falseEnsuresConstraints) ) ));
 
-  return; // handledExprNode; 
+  return;
 }
 
 
@@ -1621,7 +1526,6 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
   exprNode t1;
 
   bool handledExprNode;
-  //  char * mes;
   exprData data;
   constraintList ret;
 
@@ -1691,9 +1595,6 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
                                    (exprData_getOpB (data) ) );
        break;
     case XPR_SIZEOFT:
-      
-      //      ctype_unparse (qtype_getType (exprData_getType (data) ) );
-      
       break;
       
     case XPR_SIZEOF:
@@ -1707,8 +1608,8 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
       ret = constraintList_addListFree (ret,
                                     exprNode_traversTrueEnsuresConstraints
                                    (exprData_getFcn (data) ) );
-      /*@i11*/      //   exprNodeList_unparse (exprData_getArgs (data) );
-         break;
+      /*@i11*/  /* exprNodeList_unparse (exprData_getArgs (data) ); */
+      break;
       
     case XPR_RETURN:
       ret = constraintList_addListFree (ret,
@@ -1717,29 +1618,24 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
       break;
   
     case XPR_NULLRETURN:
-      //      cstring_makeLiteral ("return");;
       break;
             
     case XPR_FACCESS:
-          ret = constraintList_addListFree (ret,
-                                   exprNode_traversTrueEnsuresConstraints
-                                   (exprData_getFieldNode (data) ) );
-       //exprData_getFieldName (data) ;
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversTrueEnsuresConstraints
+                                       (exprData_getFieldNode (data) ) );
       break;
    
     case XPR_ARROW:
-        ret = constraintList_addListFree (ret,
-                                   exprNode_traversTrueEnsuresConstraints
-                                   (exprData_getFieldNode (data) ) );
-       //      exprData_getFieldName (data);
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversTrueEnsuresConstraints
+                                       (exprData_getFieldNode (data) ) );
       break;
    
     case XPR_STRINGLITERAL:
-      //      cstring_copy (exprData_getLiteral (data));
       break;
       
     case XPR_NUMLIT:
-      //      cstring_copy (exprData_getLiteral (data));
       break;
     case XPR_POSTOP:
 
@@ -1764,10 +1660,8 @@ constraintList exprNode_traversTrueEnsuresConstraints (exprNode e)
 
 constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
 {
-   exprNode t1;
-
+  exprNode t1;
   bool handledExprNode;
-  //  char * mes;
   exprData data;
   constraintList ret;
 
@@ -1776,6 +1670,7 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
        ret = constraintList_makeNew();
        return ret;
      }
+
   ret = constraintList_copy (e->falseEnsuresConstraints );
    
    handledExprNode = TRUE;
@@ -1835,9 +1730,6 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
                                    (exprData_getOpB (data) ) );
        break;
     case XPR_SIZEOFT:
-      
-      //      ctype_unparse (qtype_getType (exprData_getType (data) ) );
-      
       break;
       
     case XPR_SIZEOF:
@@ -1851,8 +1743,8 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       ret = constraintList_addListFree (ret,
                                     exprNode_traversFalseEnsuresConstraints
                                    (exprData_getFcn (data) ) );
-      /*@i11*/      //   exprNodeList_unparse (exprData_getArgs (data) );
-         break;
+      /*@i11*/ /* exprNodeList_unparse (exprData_getArgs (data) ); */
+      break;
       
     case XPR_RETURN:
       ret = constraintList_addListFree (ret,
@@ -1861,29 +1753,24 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       break;
   
     case XPR_NULLRETURN:
-      //      cstring_makeLiteral ("return");;
       break;
             
     case XPR_FACCESS:
-          ret = constraintList_addListFree (ret,
-                                   exprNode_traversFalseEnsuresConstraints
-                                   (exprData_getFieldNode (data) ) );
-       //exprData_getFieldName (data) ;
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversFalseEnsuresConstraints
+                                       (exprData_getFieldNode (data) ) );
       break;
-   
+      
     case XPR_ARROW:
-        ret = constraintList_addListFree (ret,
-                                   exprNode_traversFalseEnsuresConstraints
-                                   (exprData_getFieldNode (data) ) );
-       //      exprData_getFieldName (data);
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversFalseEnsuresConstraints
+                                       (exprData_getFieldNode (data) ) );
       break;
    
     case XPR_STRINGLITERAL:
-      //      cstring_copy (exprData_getLiteral (data));
       break;
       
     case XPR_NUMLIT:
-      //      cstring_copy (exprData_getLiteral (data));
       break;
     case XPR_POSTOP:
 
@@ -1913,7 +1800,6 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
   exprNode t1;
 
   bool handledExprNode;
-  //  char * mes;
   exprData data;
   constraintList ret;
 
@@ -1981,9 +1867,6 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
                                    (exprData_getOpB (data) ) );
        break;
     case XPR_SIZEOFT:
-      
-      //      ctype_unparse (qtype_getType (exprData_getType (data) ) );
-      
       break;
       
     case XPR_SIZEOF:
@@ -1997,8 +1880,8 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       ret = constraintList_addListFree (ret,
                                     exprNode_traversRequiresConstraints
                                    (exprData_getFcn (data) ) );
-      /*@i11*/      //   exprNodeList_unparse (exprData_getArgs (data) );
-         break;
+      /*@i11*/ /* exprNodeList_unparse (exprData_getArgs (data) ); */
+      break;
       
     case XPR_RETURN:
       ret = constraintList_addListFree (ret,
@@ -2007,29 +1890,24 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       break;
   
     case XPR_NULLRETURN:
-      //      cstring_makeLiteral ("return");;
       break;
             
     case XPR_FACCESS:
-          ret = constraintList_addListFree (ret,
-                                   exprNode_traversRequiresConstraints
-                                   (exprData_getFieldNode (data) ) );
-       //exprData_getFieldName (data) ;
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversRequiresConstraints
+                                       (exprData_getFieldNode (data) ) );
       break;
-   
+      
     case XPR_ARROW:
-        ret = constraintList_addListFree (ret,
-                                   exprNode_traversRequiresConstraints
-                                   (exprData_getFieldNode (data) ) );
-       //      exprData_getFieldName (data);
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversRequiresConstraints
+                                       (exprData_getFieldNode (data) ) );
       break;
    
     case XPR_STRINGLITERAL:
-      //      cstring_copy (exprData_getLiteral (data));
       break;
       
     case XPR_NUMLIT:
-      //      cstring_copy (exprData_getLiteral (data));
       break;
     case XPR_POSTOP:
 
@@ -2059,10 +1937,7 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
   exprNode t1;
 
   bool handledExprNode;
-  //  char * mes;
   exprData data;
-  //  constraintExpr tmp;
-  //  constraint cons;
   constraintList ret;
 
 
@@ -2140,9 +2015,6 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
                                    (exprData_getOpB (data) ) );
        break;
     case XPR_SIZEOFT:
-      
-      //      ctype_unparse (qtype_getType (exprData_getType (data) ) );
-      
       break;
       
     case XPR_SIZEOF:
@@ -2156,8 +2028,8 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       ret = constraintList_addListFree (ret,
                                     exprNode_traversEnsuresConstraints
                                    (exprData_getFcn (data) ) );
-      /*@i11*/      //   exprNodeList_unparse (exprData_getArgs (data) );
-         break;
+      /*@i11*/ /* exprNodeList_unparse (exprData_getArgs (data) ); */
+      break;
       
     case XPR_RETURN:
       ret = constraintList_addListFree (ret,
@@ -2166,29 +2038,24 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
       break;
   
     case XPR_NULLRETURN:
-      //      cstring_makeLiteral ("return");;
       break;
             
     case XPR_FACCESS:
-          ret = constraintList_addListFree (ret,
-                                   exprNode_traversEnsuresConstraints
-                                   (exprData_getFieldNode (data) ) );
-       //exprData_getFieldName (data) ;
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversEnsuresConstraints
+                                       (exprData_getFieldNode (data) ) );
       break;
    
     case XPR_ARROW:
-        ret = constraintList_addListFree (ret,
-                                   exprNode_traversEnsuresConstraints
-                                   (exprData_getFieldNode (data) ) );
-       //      exprData_getFieldName (data);
+      ret = constraintList_addListFree (ret,
+                                       exprNode_traversEnsuresConstraints
+                                       (exprData_getFieldNode (data) ) );
       break;
-   
+      
     case XPR_STRINGLITERAL:
-      //      cstring_copy (exprData_getLiteral (data));
       break;
       
     case XPR_NUMLIT:
-      //      cstring_copy (exprData_getLiteral (data));
       break;
     case XPR_POSTOP:
 
@@ -2206,15 +2073,12 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e)
     default:
       break;
     }
-DPRINTF( (message (
+
+  DPRINTF( (message (
                     "exprnode_traversEnsuresConstraints call for %s with constraintList of  is returning %s",
                     exprNode_unparse (e),
-            //              constraintList_print(e->ensuresConstraints),
-                    constraintList_print(ret)
-                    )
-           ));
+                    constraintList_print(ret))));
   
-
   return ret;
 }
 

diff --git a/src/constraintList.c b/src/constraintList.c
index 4059aab831aeb53fae42e774965b25eeeb02f8b6..8949732008aecf020f54e8b9a94f04b394311e46 100644 (file)
--- a/src/constraintList.c
+++ b/src/constraintList.c
@@ -91,7 +91,7 @@ constraintList_add (/*@returned@*/ constraintList s, /*@only@*/ constraint el)
   llassert (constraintList_isDefined (s));
 
   /*drl7x */
-  //   el = constraint_simplify (el);
+
   if (constraintList_resolve (el, s) )
     {
       constraint_free (el);
@@ -247,7 +247,7 @@ constraintList_printLocation (/*@temp@*/ constraintList s) /*@*/
        {
          st = message ("%q, %q", st, type);
        }
-    } //end for
+    } 
 
   return st;
 }
@@ -295,7 +295,7 @@ constraintList_print (/*@temp@*/ constraintList s) /*@*/
        {
          st = message ("%q, %q", st, type);
        }
-    } //end for
+    } 
 
   return st;
 }
@@ -480,7 +480,6 @@ constraintList constraintList_preserveCallInfo (/*@returned@*/ constraintList c,
 
   constraintList_elements_private (c, el)
   {
-    //  el = constraint_preserveOrig (el);
     el = constraint_setFcnPre(el);
     el = constraint_origAddGeneratingExpr (el, fcn);
   }

diff --git a/src/constraintOutput.c b/src/constraintOutput.c
index 6ed34684cc3e7eddc84deb4841056b8e1e39af8f..141cf324b52458032181ccac38d4bf93f77e8fd1 100644 (file)
--- a/src/constraintOutput.c
+++ b/src/constraintOutput.c
@@ -7,7 +7,4 @@
 # include "portab.h"
 
 
-//FLG_BUFF
-//FLG_NULLTERMINATED
-
 

diff --git a/src/constraintResolve.c b/src/constraintResolve.c
index a79c3ff4003e450e1d44f7602c554fd7057f0279..b70eeeddf2fdca6d79fc0a7b870107ff5200af54 100644 (file)
--- a/src/constraintResolve.c
+++ b/src/constraintResolve.c
@@ -3,7 +3,7 @@
 ** constraintResolve.c
 */
 
-//#define DEBUGPRINT 1
+/* #define DEBUGPRINT 1 */
 
 # include <ctype.h> /* for isdigit */
 # include "lclintMacros.nf"
@@ -56,8 +56,6 @@ static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constrai
   constraintList ret;
   constraintList temp;
 
-  //ret = constraintList_makeNew();
-
   llassert(constraintList_isDefined(list1) );
   llassert(constraintList_isDefined(list2) );
 
@@ -82,8 +80,6 @@ static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constrai
   
 
   return temp;
-  //ret = constraintList_addList (ret, list2);
-  //return ret;
 }
 
 
@@ -150,8 +146,6 @@ void exprNode_mergeResolve (exprNode parent, exprNode child1, exprNode child2)
        else
         {
           llassert(exprNode_isError(child2) );
-          //parent->requiresConstraints = constraintList_makeNew();
-          //parent->ensuresConstraints = constraintList_makeNew();
           return;
         }
      }
@@ -262,13 +256,11 @@ static /*@only@*/ constraintList reflectChangesNoOr (/*@observer@*/ /*@temp@*/ c
          temp = constraint_substitute (el, post1);
          if (!constraintList_resolve (temp, post1) )
            {
-             // try inequality substitution
-             //constraint temp2;
-             
-             // the inequality substitution may cause us to lose information
-             //so we don't want to store the result but we do it anyway
+             /* try inequality substitution
+                the inequality substitution may cause us to lose information
+                so we don't want to store the result but we do it anyway
+             */
              temp2 = constraint_copy (temp);
-             //                  if (context_getFlag (FLG_ORCONSTRAINT) )
              temp2 = inequalitySubstitute (temp2, post1); 
              if (!constraintList_resolve (temp2, post1) )
                {
@@ -363,61 +355,61 @@ static /*@only@*/ constraint doResolve (/*@only@*/ constraint c, constraintList
       
       if (!resolveOr (temp, post1) )
        {
-         // try inequality substitution
+         /* try inequality substitution */
          constraint temp2;
          
-             // the inequality substitution may cause us to lose information
-             //so we don't want to store the result but we do  anyway
-             temp2 = constraint_copy (c);
-             //                  if (context_getFlag (FLG_ORCONSTRAINT) )
-             temp2 = inequalitySubstitute (temp2, post1);
-             if (!resolveOr (temp2, post1) )
+         /* the inequality substitution may cause us to lose information
+            so we don't want to store the result but we do  anyway
+         */
+         temp2 = constraint_copy (c);
+         temp2 = inequalitySubstitute (temp2, post1);
+
+         if (!resolveOr (temp2, post1) )
+           {
+             constraint temp3;
+             temp3 = constraint_copy(temp2);
+             
+             temp3 = inequalitySubstituteStrong (temp3, post1);
+             if (!resolveOr (temp3, post1) )
                {
-                 constraint temp3;
-                 temp3 = constraint_copy(temp2);
-                 
-                 temp3 = inequalitySubstituteStrong (temp3, post1);
-                 if (!resolveOr (temp3, post1) )
-                   {
-                     temp2 = inequalitySubstituteUnsound (temp2, post1); 
-                     if (!resolveOr (temp2, post1) )
-                       {
-                         if (!constraint_same (temp, temp2) )
-                           temp = constraint_addOr (temp, temp2);
-
-                         if (!constraint_same (temp, temp3) && !constraint_same (temp3, temp2) )
-                           temp = constraint_addOr (temp, temp3);
-                         
-                         *resolved = FALSE;
-                         
-                         constraint_free(temp2);
-                         constraint_free(temp3);
-                         constraint_free(c);
-                         
-                         return temp;
-                       }
-                     constraint_free(temp2);
-                     constraint_free(temp3);
-                   }
-                 else
+                 temp2 = inequalitySubstituteUnsound (temp2, post1); 
+                 if (!resolveOr (temp2, post1) )
                    {
+                     if (!constraint_same (temp, temp2) )
+                       temp = constraint_addOr (temp, temp2);
+                     
+                     if (!constraint_same (temp, temp3) && !constraint_same (temp3, temp2) )
+                       temp = constraint_addOr (temp, temp3);
+                     
+                     *resolved = FALSE;
+                     
                      constraint_free(temp2);
                      constraint_free(temp3);
+                     constraint_free(c);
+                     
+                     return temp;
                    }
+                 constraint_free(temp2);
+                 constraint_free(temp3);
                }
              else
                {
                  constraint_free(temp2);
-               }                 
-
+                 constraint_free(temp3);
+               }
            }
-         constraint_free(temp);
+         else
+           {
+             constraint_free(temp2);
+           }             
+         
        }
- constraint_free(c);
- 
- *resolved = TRUE;
- return NULL;
-
+      constraint_free(temp);
+    }
+  constraint_free(c);
+  
+  *resolved = TRUE;
+  return NULL;
 }
 
 static /*@only@*/ constraint doResolveOr (/*@observer@*/ /*@temp@*/ constraint c, constraintList post1, /*@out@*/bool * resolved)
@@ -564,10 +556,11 @@ static bool constraint_conflict (constraint c1, constraint c2)
          }
     }  
 
-  // This is a slight kludg to prevent circular constraints like
-  // strlen(str) == maxRead(s) + strlen(str);
+  /* This is a slight kludg to prevent circular constraints like
+     strlen(str) == maxRead(s) + strlen(str);
+  */
 
-  /*@i324234*/ //clean this up
+  /*@i324234*/ /* clean this up */
   
   if (c1->ar == EQ)
     if (c1->ar == c2->ar)
@@ -626,8 +619,11 @@ static bool conflict (constraint c, constraintList list)
 
 }
 
-//check if constraint in list1 conflicts with constraints in List2.  If so we
-//remove form list1 and change list2.
+/*
+  check if constraint in list1 conflicts with constraints in List2.  If so we
+  remove form list1 and change list2.
+*/
+
 constraintList constraintList_fixConflicts (constraintList list1, constraintList list2)
 {
   constraintList ret;
@@ -701,7 +697,6 @@ static bool arithType_canResolve (arithType ar1, arithType ar2)
 
     case LT:
     case LTE:
-      //      llassert(FALSE); 
       if ( (ar2 == LT) || (ar2 == LTE) || (ar2 == EQ) )
        return TRUE;
       break;
@@ -770,7 +765,6 @@ bool constraint_isAlwaysTrue (/*@observer@*/ /*@temp@*/ constraint c)
   l = constraintExpr_copy (c->lexpr);
   r = constraintExpr_copy (c->expr);
 
-  //  l = constraintExpr_propagateConstants (l, &lHasConstant, &lConstant);
   r = constraintExpr_propagateConstants (r, &rHasConstant, &rConstant);
 
   if (constraintExpr_similar (l,r) && (rHasConstant ) )
@@ -944,7 +938,7 @@ bool constraint_search (constraint c, constraintExpr old) /*@*/
   return ret;
 }
 
-//adjust file locs and stuff
+/* adjust file locs and stuff */
 static constraint constraint_adjust (/*@returned@*/ constraint substitute, /*@observer@*/ constraint old)
 {
   fileloc loc1, loc2, loc3;
@@ -954,13 +948,10 @@ static constraint constraint_adjust (/*@returned@*/ constraint substitute, /*@ob
                   ));
 
   loc1 = constraint_getFileloc (old);
-
   loc2 = constraintExpr_getFileloc (substitute->lexpr);
-
   loc3 = constraintExpr_getFileloc (substitute->expr);
-
   
-  // special case of an equality that "contains itself"
+  /* special case of an equality that "contains itself" */
   if (constraintExpr_search (substitute->expr, substitute->lexpr) )
       if (fileloc_closer (loc1, loc3, loc2))
       {
@@ -996,17 +987,12 @@ constraint  inequalitySubstitute  (/*@returned@*/ constraint c, constraintList p
   constraintList_elements (p, el)
     {
       if ( (el->ar == LT )  )
-        //      if (!constraint_conflict (c, el) )
+       /* if (!constraint_conflict (c, el) ) */ /*@i523 explain this! */
           {
-            //constraint temp;
             constraintExpr  temp2;
             
             /*@i22*/
 
-            //temp = constraint_copy(el);
-            
-            //      temp = constraint_adjust(temp, c);
-
             if (constraintExpr_same (el->expr, c->expr) )
               {
                 DPRINTF((message ("inequalitySubstitute Replacing %q in %q with  %q",
@@ -1053,17 +1039,12 @@ static constraint  inequalitySubstituteStrong  (/*@returned@*/ constraint c, con
       DPRINTF (( message ("inequalitySubstituteStrong examining substituting %s on %s", constraint_print(el), constraint_print(c) ) ));      
 
       if ( (el->ar == LT ) ||  (el->ar == LTE )  )
-        //      if (!constraint_conflict (c, el) )
+       /* if (!constraint_conflict (c, el) ) */ /*@i523@*/
           {
-            //constraint temp;
             constraintExpr  temp2;
             
             /*@i22*/
 
-            //temp = constraint_copy(el);
-            
-            //      temp = constraint_adjust(temp, c);
-
             if (constraintExpr_same (el->lexpr, c->expr) )
               {
                 DPRINTF((message ("inequalitySubstitute Replacing %s in %s with  %s",
@@ -1110,14 +1091,10 @@ static constraint  inequalitySubstituteUnsound  (/*@returned@*/ constraint c, co
     {
   DPRINTF (( message ("inequalitySubstituteUnsound examining substituting %s on %s", constraint_print(el), constraint_print(c) ) ));      
        if ( ( el->ar == LTE) || (el->ar == LT) )
-        //      if (!constraint_conflict (c, el) )
+        /* if (!constraint_conflict (c, el) ) */ /*@i532@*/
           {
-            // constraint temp;
             constraintExpr  temp2;
-            
-            //temp = constraint_copy(el);
-            
-            //      temp = constraint_adjust(temp, c);
+
             temp2   = constraintExpr_copy (el->expr);
             
             if (el->ar == LT)
@@ -1196,7 +1173,7 @@ return ret;
   constraintList_elements(target, el)
   { 
     constraint temp;
-    //drl possible problem : warning make sure that a side effect is not expected
+    /* drl possible problem : warning make sure that a side effect is not expected */
 
     temp = constraint_substitute(el, subList);
     ret = constraintList_add (ret, temp);

diff --git a/src/constraintTerm.c b/src/constraintTerm.c
index 215430ff855ec259bdf7d66f1da01e2cfa5662c2..bac71fc45ff02306c7f57682625519577a3314e7 100644 (file)
--- a/src/constraintTerm.c
+++ b/src/constraintTerm.c
@@ -2,7 +2,7 @@
 ** constraintExpr.c
 */
 
-//#define DEBUGPRINT 1
+/* #define DEBUGPRINT 1 */
 
 # include <ctype.h> /* for isdigit */
 # include "lclintMacros.nf"
@@ -15,8 +15,6 @@
 
 /*@-czechfcns@*/
 
-//#include "constraintExpr.h"
-
 /*@access exprNode @*/
 
 bool constraintTerm_isDefined (constraintTerm t)
@@ -47,7 +45,7 @@ void constraintTerm_free (/*@only@*/ constraintTerm term)
       /* type was set incorrectly */
       llcontbug (message("constraintTerm_free type was set incorrectly"));
     }
-  //  term->value.intlit = 0;
+
   term->kind =  ERRORBADCONSTRAINTTERMTYPE;
   free (term);
 }
@@ -257,7 +255,7 @@ static cstring constraintTerm_getName (constraintTerm term)
   switch (term->kind)
     {
     case EXPRNODE:
-      /*@i334*/  //wtf
+      /*@i334*/  /*wtf*/
       s = message ("%s", exprNode_unparse (term->value.expr) );
       break;
     case INTLITERAL:
@@ -285,18 +283,13 @@ constraintTerm_doSRefFixBaseParam (/*@returned@*/constraintTerm term, exprNodeLi
   switch (term->kind)
     {
     case EXPRNODE:
-      /*@i334*/  //wtf
-      //   s = message ("%s @ %s ", exprNode_unparse (term->value.expr),
-      //          fileloc_unparse (term->loc) );
+      /*@i334*/  /*wtf*/
       break;
     case INTLITERAL:
-      //  s = message (" %d ", term->value.intlit);
-       break;
+      break;
       
     case SREF:
       term->value.sref = sRef_fixBaseParam (term->value.sref, arglist);
-      //      s = message ("%s ", sRef_unparse (term->value.sref) );
-
       break;
     default:
       BADEXIT;
@@ -315,7 +308,7 @@ cstring constraintTerm_print (constraintTerm term)  /*@*/
   switch (term->kind)
     {
     case EXPRNODE:
-      /*@i334*/  //wtf
+      /*@i334*/  /*wtf*/
       s = message ("%s @ %q", exprNode_unparse (term->value.expr),
                   fileloc_unparse (term->loc) );
       break;
@@ -613,8 +606,7 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
            s = sRef_makeParam (param, t, stateInfo_makeLoc (g_currentloc));
            free (ostr2);
          }
-       else  //This must be an identified that we can search for
-         // in usymTab
+       else  /* This must be an identified that we can search for in usymTab */
          {
            cstring termStr = cstring_makeLiteralTemp(term);
 
@@ -635,8 +627,7 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
        cstring termStr;
                
        term = reader_getWord(&str);
-       //This must be an identifier that we can search for
-         // in usymTab
+       /* This must be an identifier that we can search for in usymTab */
        termStr = cstring_makeLiteralTemp(term);
        
        ue = usymtab_lookup (termStr);

diff --git a/src/cpplib.c b/src/cpplib.c
index 86fc538f7e342524a3225d319fb1e50c919610fc..73c09951f3e10e4de6b26eec4e3f30b13ee1de3a 100644 (file)
--- a/src/cpplib.c
+++ b/src/cpplib.c
@@ -799,6 +799,7 @@ cppReader_appendIncludeChain (cppReader *pfile,
   opts->last_include = last;
 }
 
+# if 0
 static /*@unused@*/ void 
 cppReader_showIncludeChain (cppReader *pfile)
 {
@@ -819,6 +820,7 @@ cppReader_showIncludeChain (cppReader *pfile)
       fprintf (stderr, "No includes\n");
     }
 }
+# endif
 
 cstring 
 cppReader_getIncludePath ()

diff --git a/src/cscanner.l b/src/cscanner.l
index 0038eaa456428b0a5798ea814cdbbaf60302a820..ad3c04c5a250d29374a99a30cbda3b5ca3ac1daa 100644 (file)
--- a/src/cscanner.l
+++ b/src/cscanner.l
@@ -60,6 +60,7 @@ ULSuffix                ({U}{L}|{L}{U})
 */
 
 # include "lclintMacros.nf"
+# include <unistd.h>
 # include "basic.h"
 
 # include "cgrammar.h"
@@ -79,14 +80,7 @@ static char savechar = '\0';
 /*@notfunction@*/
 # define yyinput() (incColumn (), getc (yyin))
 
-/*@-noparams@*/
-/*@-incondefs@*/
-extern /*@external@*/ int read ();
-/*@=incondefs@*/
-/*@=noparams@*/
-
 static /*@owned@*/ cstring lastidprocessed = cstring_undefined;
-
 static int lminput (void);
 static int tokLength = 0;
 static bool inSpecPart = FALSE;

diff --git a/src/exprChecks.c b/src/exprChecks.c
index de0a46606c687923bfd385f829d6fb870f805f8b..9612a7cfcd0965dfc62a5afa4dda98dd6ee82c85 100644 (file)
--- a/src/exprChecks.c
+++ b/src/exprChecks.c
@@ -921,21 +921,20 @@ void exprNode_checkFunction (/*@unused@*/ uentry ue, /*@only@*/ exprNode fcnBody
 
   /*@owned@*/ exprNode body;
 
- //  return;
-
- //  context_setFlag(FLG_ORCONSTRAINT, TRUE);
   context_enterInnerContext ();
 
   body = fcnBody;
 
-  // if we're not going to be printing any errors for buffer overflows
-  //we can skip the checking to improve performance
-  //
-  //FLG_DEBUGFUNCTIONCONSTRAINT controls wheather we perform the check anyway
-  // in order to find potential problems like asserts and seg faults...
+  /*
+    if we're not going to be printing any errors for buffer overflows
+    we can skip the checking to improve performance
+    
+    FLG_DEBUGFUNCTIONCONSTRAINT controls wheather we perform the check anyway
+    in order to find potential problems like asserts and seg faults...
+  */
 
   if  (!context_getFlag(FLG_DEBUGFUNCTIONCONSTRAINT)  )
-    // check if errors will printed
+    /* check if errors will printed */
     if (! (context_getFlag(FLG_DEBUGFUNCTIONCONSTRAINT) ||
           context_getFlag(FLG_FUNCTIONCONSTRAINT) ||
           context_getFlag(FLG_ARRAYBOUNDS) ||
@@ -1054,19 +1053,25 @@ void exprNode_checkFunction (/*@unused@*/ uentry ue, /*@only@*/ exprNode fcnBody
      }
    
    if (constraintList_isDefined(post) )
-     constraintList_free(post);
+     {
+       constraintList_free(post);
+     }
    
    body->ensuresConstraints = constraintList_sort(body->ensuresConstraints);
    
-   constraintList_printError(body->ensuresConstraints, g_currentloc);
+   if ( context_getFlag (FLG_FUNCTIONPOST) )
+     {
+       constraintList_printError(body->ensuresConstraints, g_currentloc);
+     }
    
    
-   //   ConPrint (message ("Unable to resolve function constraints:\n%s", constraintList_printDetailed(body->requiresConstraints) ), g_currentloc);
+   /*   ConPrint (message ("Unable to resolve function constraints:\n%s", constraintList_printDetailed(body->requiresConstraints) ), g_currentloc);
 
-   //   ConPrint (message ("LCLint has found function post conditions:\n%s", constraintList_printDetailed(body->ensuresConstraints) ), g_currentloc);
+       ConPrint (message ("LCLint has found function post conditions:\n%s", constraintList_printDetailed(body->ensuresConstraints) ), g_currentloc);
   
-     //  printf ("The required constraints are:\n%s", constraintList_printDetailed(body->requiresConstraints) );
-     //   printf ("The ensures constraints are:\n%s", constraintList_printDetailed(body->ensuresConstraints) );
+       printf ("The required constraints are:\n%s", constraintList_printDetailed(body->requiresConstraints) );
+       printf ("The ensures constraints are:\n%s", constraintList_printDetailed(body->ensuresConstraints) );
+   */
    
    if (constraintList_isDefined(c) )
      constraintList_free(c);

diff --git a/src/exprNode.c b/src/exprNode.c
index ee2dcacc8713b174cd1bbf7e0a5deddaf579e319..e9f4375398ac3b8f0a560dedb45a2f1e0f69b0f9 100644 (file)
--- a/src/exprNode.c
+++ b/src/exprNode.c
@@ -4249,53 +4249,54 @@ exprNode_postOp (/*@only@*/ exprNode e, /*@only@*/ lltok op)
   /*DRL 6/8/01 I decided to disable all LCLint Warning here since the code 
     probably needs a rewrite any way */
 
+  /*@i65234@*/
   /*@ignore@*/
 
-  //  updateEnvironmentForPostOp (e);
-
-       /* start modifications */
-       /* added by Seejo on 4/16/2000 */
-
-       /* Arithmetic operations on pointers wil modify the size/len/null terminated 
-                status */
-       if ((sRef_isPossiblyNullTerminated (e->sref)) || (sRef_isNullTerminated(e->sref))) {
-
-               ret->sref = sRef_copy (e->sref);
-
-               /* Operator : ++ */
-               if (lltok_getTok (op) == INC_OP) {
-                       if (sRef_getSize(e->sref) > 0) {
-
-                               sRef_setSize (ret->sref, sRef_getSize(e->sref) - 1);
-                               
-                               if (sRef_getLen(e->sref) == 1) { /* i.e. the first character is \0 */
-                                       /* Assumption: there is only 1 \0 in the buffer */
-                                       /* This will not be correct if there are 2 \0's in the buffer */
-                                       sRef_setNotNullTerminatedState(ret->sref);
-                                       sRef_resetLen(ret->sref);
-                               } else {
-                                       sRef_setNullTerminatedState(ret->sref);
-                                       sRef_setLen (ret->sref, sRef_getLen(e->sref) - 1);
-                               }
-                               if (sRef_isNullTerminated (ret->sref))
-                                       printf ("ret->sref is Null Terminated\n");
-                               else if (sRef_isPossiblyNullTerminated (ret->sref))
-                                       printf ("ret->sref is Possibly Null Terminated\n");
-                               else if (sRef_isNotNullTerminated (ret->sref))
-                                       printf ("ret->sref is Not Null Terminated\n");
-                       }
-               }
-
-               /* Operator : -- */
-               if (lltok_getTok (op) == DEC_OP) {
-                       if (sRef_getSize(e->sref) >= 0) {
-                               sRef_setSize (ret->sref, sRef_getSize(e->sref) + 1);
-                               sRef_setLen (ret->sref, sRef_getLen(e->sref) + 1);
-                       }
-               }
-       }
-       /*@end@*/
-       /* end modifications */
+  /* updateEnvironmentForPostOp (e); */
+  
+  /* start modifications */
+  /* added by Seejo on 4/16/2000 */
+  
+  /* Arithmetic operations on pointers wil modify the size/len/null terminated 
+     status */
+  if ((sRef_isPossiblyNullTerminated (e->sref)) || (sRef_isNullTerminated(e->sref))) {
+    
+    ret->sref = sRef_copy (e->sref);
+    
+    /* Operator : ++ */
+    if (lltok_getTok (op) == INC_OP) {
+      if (sRef_getSize(e->sref) > 0) {
+       
+       sRef_setSize (ret->sref, sRef_getSize(e->sref) - 1);
+       
+       if (sRef_getLen(e->sref) == 1) { /* i.e. the first character is \0 */
+         /* Assumption: there is only 1 \0 in the buffer */
+         /* This will not be correct if there are 2 \0's in the buffer */
+         sRef_setNotNullTerminatedState(ret->sref);
+         sRef_resetLen(ret->sref);
+       } else {
+         sRef_setNullTerminatedState(ret->sref);
+         sRef_setLen (ret->sref, sRef_getLen(e->sref) - 1);
+       }
+       if (sRef_isNullTerminated (ret->sref))
+         printf ("ret->sref is Null Terminated\n");
+       else if (sRef_isPossiblyNullTerminated (ret->sref))
+         printf ("ret->sref is Possibly Null Terminated\n");
+       else if (sRef_isNotNullTerminated (ret->sref))
+         printf ("ret->sref is Not Null Terminated\n");
+      }
+    }
+    
+    /* Operator : -- */
+    if (lltok_getTok (op) == DEC_OP) {
+      if (sRef_getSize(e->sref) >= 0) {
+       sRef_setSize (ret->sref, sRef_getSize(e->sref) + 1);
+       sRef_setLen (ret->sref, sRef_getLen(e->sref) + 1);
+      }
+    }
+  }
+  /*@end@*/
+  /* end modifications */
 
   return ret;
 }
@@ -5271,10 +5272,6 @@ exprNode_makeOp (/*@keep@*/ exprNode e1, /*@keep@*/ exprNode e2,
              /* Arithmetic operations on pointers wil modify the size/len/null terminated 
                 status */
              if ((sRef_isPossiblyNullTerminated (e1->sref)) || (sRef_isNullTerminated(e1->sref))) {
-                               //if (sRef_isKnown (e->sref)) {
-                               //ret->sref = sRef_makeAddress (e->sref);
-                               //}
-               
                int val;
                /*drl 1-4-2001
                  added ugly fixed to stop
@@ -5365,56 +5362,52 @@ exprNode_makeOp (/*@keep@*/ exprNode e1, /*@keep@*/ exprNode e2,
                                 status */
 
            if ((sRef_isPossiblyNullTerminated (e2->sref)) || (sRef_isNullTerminated(e2->sref))) {
-                               //if (sRef_isKnown (e->sref)) {
-                               //ret->sref = sRef_makeAddress (e->sref);
-                               //}
-
-                        int val = (int) multiVal_forceInt (e1->val);
-
-                       /* Operator : + or += */
-                   if ((lltok_getTok (op) == TPLUS) || (lltok_getTok(op) == ADD_ASSIGN)) {
-                               if (sRef_getSize(e2->sref) >= val) {/* Incrementing the pointer by 
-                                                                                                                                          val should not result in a 
-                                                                                                                                                  size < 0 (size = 0 is ok !) */
-                                       
-                                       sRef_setSize (ret->sref, sRef_getSize(e2->sref) - val);
-                                       
-                                       if (sRef_getLen(e2->sref) == val) { /* i.e. the character at posn val is \0 */
-                                               sRef_setNotNullTerminatedState(ret->sref);
-                                               sRef_resetLen (ret->sref);
-                                       } else {
-                                               sRef_setNullTerminatedState(ret->sref);
-                                               sRef_setLen (ret->sref, sRef_getLen(e2->sref) - val);
-                                       }
-                               }
-                       }
-                       
-                       /* Operator : - or -= */
-                        if ((lltok_getTok (op) == TMINUS) || (lltok_getTok (op) == SUB_ASSIGN)) {
-                               if (sRef_getSize(e2->sref) >= 0) {
-                                       sRef_setSize (ret->sref, sRef_getSize(e2->sref) + val);
-                                       sRef_setLen (ret->sref, sRef_getLen(e2->sref) + val);
-                               }
-                       }
-                }
-
-           /* end modifications */
-
-             sRef_setNullError (ret->sref);
-
-             /*
-             ** Fixed for 2.2c: the alias state of ptr + int is dependent,
-             ** since is points to storage that should not be deallocated
-             ** through this pointer.
-             */
-
-             if (sRef_isOnly (ret->sref) 
-                 || sRef_isFresh (ret->sref)) {
-               sRef_setAliasKind (ret->sref, AK_DEPENDENT, exprNode_loc (ret));
+             int val = (int) multiVal_forceInt (e1->val);
+             
+             /* Operator : + or += */
+             if ((lltok_getTok (op) == TPLUS) || (lltok_getTok(op) == ADD_ASSIGN)) {
+               if (sRef_getSize(e2->sref) >= val) {/* Incrementing the pointer by 
+                                                      val should not result in a 
+                                                      size < 0 (size = 0 is ok !) */
+                 
+                 sRef_setSize (ret->sref, sRef_getSize(e2->sref) - val);
+                 
+                 if (sRef_getLen(e2->sref) == val) { /* i.e. the character at posn val is \0 */
+                   sRef_setNotNullTerminatedState(ret->sref);
+                   sRef_resetLen (ret->sref);
+                 } else {
+                   sRef_setNullTerminatedState(ret->sref);
+                   sRef_setLen (ret->sref, sRef_getLen(e2->sref) - val);
+                 }
+               }
              }
-
-             tret = e2->typ;
-             ret->sref = e2->sref;
+             
+             /* Operator : - or -= */
+             if ((lltok_getTok (op) == TMINUS) || (lltok_getTok (op) == SUB_ASSIGN)) {
+               if (sRef_getSize(e2->sref) >= 0) {
+                 sRef_setSize (ret->sref, sRef_getSize(e2->sref) + val);
+                 sRef_setLen (ret->sref, sRef_getLen(e2->sref) + val);
+               }
+             }
+           }
+           
+           /* end modifications */
+           
+           sRef_setNullError (ret->sref);
+           
+           /*
+           ** Fixed for 2.2c: the alias state of ptr + int is dependent,
+           ** since is points to storage that should not be deallocated
+           ** through this pointer.
+           */
+           
+           if (sRef_isOnly (ret->sref) 
+               || sRef_isFresh (ret->sref)) {
+             sRef_setAliasKind (ret->sref, AK_DEPENDENT, exprNode_loc (ret));
+           }
+           
+           tret = e2->typ;
+           ret->sref = e2->sref;
            }
          else
            {
@@ -10746,8 +10739,9 @@ long exprNode_getLongValue (exprNode e) {
     lltok t = exprData_getUopTok (e->edata);
     return fileloc_copy(lltok_getLoc (t));
   } else {
-    //drl possible problem : warning fix
-    //    llcontbug (message ("Cannot get next sequence point: %s", exprNode_unparse (e)));
+    /* drl possible problem : warning fix
+       llcontbug (message ("Cannot get next sequence point: %s", exprNode_unparse (e)));
+    */
     return fileloc_undefined;
   }
  }

diff --git a/src/forjunk.c b/src/forjunk.c
index 0941da45be04150b1dfe41a9ead21449c26a81e0..e8e1ec0f6b1fe8754b7b05c695bea151588a4945 100644 (file)
--- a/src/forjunk.c
+++ b/src/forjunk.c
@@ -2,7 +2,7 @@
 ** forjunk.c
 */
 
-//#define DEBUGPRINT 1
+/* #define DEBUGPRINT 1 */
 
 # include <ctype.h> /* for isdigit */
 # include "lclintMacros.nf"
@@ -41,9 +41,7 @@ static bool isInc (/*@observer@*/ constraintExpr c) /*@*/
  return FALSE;
 }
 
-
-
-// look for constraints like cexrp = cexrp + 1
+/* look for constraints like cexrp = cexrp + 1 */
 static bool incVar (/*@notnull@*/ constraint c) /*@*/
 {
   constraintExpr t1;
@@ -119,7 +117,7 @@ static bool canGetForTimes (/*@notnull@*/ exprNode forPred, /*@notnull@*/ exprNo
       return FALSE;
     }
 
-  //should check preop too
+  /* should check preop too */
   if (inc->kind != XPR_POSTOP)
     {
       return FALSE;
@@ -254,7 +252,7 @@ static /*@only@*/ constraintExpr getForTimes (/*@notnull@*/ exprNode forPred, /*
       llassert ( FALSE );
     }
 
-  //should check preop too
+  /* should check preop too */
   if (inc->kind != XPR_POSTOP)
     {
       llassert (FALSE );
@@ -381,7 +379,7 @@ static void doAdjust(/*@unused@*/ exprNode e, /*@unused@*/ exprNode forPred, /*@
   
   constraintList_elements (forBody->ensuresConstraints, el)
     {
-      // look for var = var + 1
+      /* look for var = var + 1 */
       if (incVar(el) )
        {
          DPRINTF((message ("Found inc variable constraint : %s", constraint_print (el) )  ));

diff --git a/src/lastversion b/src/lastversion
index 8793e42f4e3cde935973163352f1dc076e886312..a0a3a4c65078bbbb3e0a30b3dc63240113e3834d 100644 (file)
--- a/src/lastversion
+++ b/src/lastversion
@@ -1 +1 @@
-3.0.0.9
+3.0.0.10

diff --git a/src/lclint.lcd b/src/lclint.lcd
index f308e2a2e242b73e6fdc10cf9bbbe4cbb6876d05..b382299814f95ccdf2ad79462e3fcdd9d7cadd11 100644 (file)
--- a/src/lclint.lcd
+++ b/src/lclint.lcd
@@ -1,5 +1,5 @@
 ;;LCLint Dump: lclint.lcd
-;;LCLint 3.0.0.9 --- 23 July 2001
+;;LCLint 3.0.0.10 --- 20 August 2001
 ;;lib:172
 ;;ctTable
 0 u-2 19 38
@@ -65,7 +65,7 @@
 0 s11|&
 0 s12|&
 0 s23|&
-0 s24|-1 10873 -1
+0 s24|-1 10867 -1
 0 s25|&
 0 s26|-1 383 -1
 0 s27|&
@@ -689,7 +689,7 @@
 0 s409|&
 0 s410|-1 -1 904
 0 s411|&
-0 s412|-1 10872 -1
+0 s412|-1 10866 -1
 0 s413|&
 0 s414|&
 0 s415|&
@@ -1019,7 +1019,7 @@
 0 s2323|&
 0 s2324|-1 1016 -1
 1 t1015|1015&
-0 s2325|-1 17652 -1
+0 s2325|-1 17644 -1
 0 s2326|-1 1019 -1
 1 t1018|1018&
 0 s2327|&
@@ -1045,17 +1045,17 @@
 0 s2341|&
 0 s2342|-1 1042 -1
 1 t1041|1041&
-0 a2343|-1 17687 -1
+0 a2343|-1 17679 -1
 0 s2344|&
 0 s2345|-1 1046 -1
 1 t1045|1045&
-0 a2346|-1 14332 -1
+0 a2346|-1 14324 -1
 0 s2347|-1 1049 -1
 1 t1048|1048&
 0 a2348|-1 6299 -1
 0 s2349|-1 1052 -1
 1 t1051|1051&
-0 s2350|-1 10678 -1
+0 s2350|-1 10672 -1
 0 a2351|&
 0 s2352|-1 4862 -1
 0 s2353|-1 1057 -1
@@ -1063,19 +1063,19 @@
 0 a2354|&
 0 s2355|-1 1060 -1
 1 t1059|1059&
-0 a2356|-1 17122 -1
+0 a2356|-1 17114 -1
 0 s2357|-1 1063 -1
 1 t1062|1062&
 0 a2358|&
 0 s2359|-1 1066 -1
 1 t1065|1065&
-0 a2360|-1 16914 -1
+0 a2360|-1 16906 -1
 0 s2361|-1 1069 -1
 1 t1068|1068&
 0 a2362|&
 0 s2363|-1 1072 -1
 1 t1071|1071&
-0 a2364|-1 14333 -1
+0 a2364|-1 14325 -1
 0 s2365|-1 1075 -1
 1 t1074|1074&
 0 a2366|&
@@ -1084,7 +1084,7 @@
 0 a2368|&
 0 s2369|-1 1081 -1
 1 t1080|1080&
-0 a2370|-1 16770 -1
+0 a2370|-1 16762 -1
 0 s2371|-1 1084 -1
 1 t1083|1083&
 0 a2372|&
@@ -1111,7 +1111,7 @@
 0 a2387|&
 0 s2388|-1 1108 -1
 1 t1107|1107&
-0 a2389|-1 13268 -1
+0 a2389|-1 13260 -1
 0 s2390|-1 1111 -1
 1 t1110|1110&
 0 a2391|&
@@ -1123,7 +1123,7 @@
 0 a2395|&
 0 s2396|-1 1120 -1
 1 t1119|1119&
-0 a2397|-1 13237 -1
+0 a2397|-1 13229 -1
 0 s2398|-1 1123 -1
 1 t1122|1122&
 0 a2399|&
@@ -1138,7 +1138,7 @@
 0 a2405|&
 0 s2406|-1 1135 -1
 1 t1134|1134&
-0 a2407|-1 12208 -1
+0 a2407|-1 12200 -1
 0 s2408|-1 1138 -1
 1 t1137|1137&
 0 a2409|&
@@ -1165,7 +1165,7 @@
 0 a2423|&
 0 s2424|-1 1162 -1
 1 t1161|1161&
-0 a2425|-1 20387 -1
+0 a2425|-1 20379 -1
 0 s2426|-1 1165 -1
 1 t1164|1164&
 0 a2427|&
@@ -1186,19 +1186,19 @@
 0 a2437|&
 0 s2438|-1 1183 -1
 1 t1182|1182&
-0 a2439|-1 20426 -1
+0 a2439|-1 20418 -1
 0 s2440|-1 1186 -1
 1 t1185|1185&
 0 a2441|&
 0 s2442|-1 1189 -1
 1 t1188|1188&
-0 a2443|-1 20325 -1
+0 a2443|-1 20317 -1
 0 s2444|-1 1192 -1
 1 t1191|1191&
 0 a2445|&
 0 s2446|-1 1195 -1
 1 t1194|1194&
-0 a2447|-1 20362 -1
+0 a2447|-1 20354 -1
 0 s2448|-1 1198 -1
 1 t1197|1197&
 0 a2449|&
@@ -1208,7 +1208,7 @@
 0 a2452|-1 7508 -1
 0 s2453|-1 1205 -1
 1 t1204|1204&
-0 a2454|-1 9980 -1
+0 a2454|-1 9974 -1
 0 s2455|-1 1208 -1
 1 t1207|1207&
 0 a2456|&
@@ -1262,8 +1262,8 @@
 3 f0 (5|$#,)!
 3 f10 (5|$#,)!
 0 s2476|&
-0 s2477|-1 13583 11048
-0 s2478|-1 -1 16520
+0 s2477|-1 13575 11040
+0 s2478|-1 -1 16512
 3 f0 (1259|@5|0@5@7&#,)!
 3 f19 (1259|@5|0@5@7&#,)!
 3 f23 (1259|@5|0@5@7&#,)!
@@ -1489,7 +1489,7 @@
 3 f20 (63|@7|$#,)!
 3 f0 (20|0@5@17&#,)!
 3 f1 (20|0@5@17&#,)!
-0 s2596|-1 12461 -1
+0 s2596|-1 12453 -1
 3 e!6{NO,YES,MAYBE}!
 0 s2601|&
 0 s2602|&
@@ -1515,7 +1515,7 @@
 3 f1490 (4|$#,)!
 3 f0 (23|0@0@6&#,!.,)!
 3 f1211 (23|0@0@6&#,!.,)!
-0 a2606|-1 20990 -1
+0 a2606|-1 20982 -1
 3 f0 (1513|$#,)!
 3 f2 (1513|$#,)!
 3 f0 (1513|$#,)!
@@ -1696,9 +1696,9 @@
 3 f0 (1513|$#,5|$#,)!
 3 f1 (1513|$#,5|$#,)!
 0 s2689|&
-0 s2690|-1 10555 -1
-0 s2691|-1 10738 -1
-0 s2692|-1 10583 -1
+0 s2690|-1 10549 -1
+0 s2691|-1 10732 -1
+0 s2692|-1 10577 -1
 3 ecpp_token{CPP_EOF,CPP_OTHER,CPP_COMMENT,CPP_HSPACE,CPP_VSPACE,CPP_NAME,CPP_NUMBER,CPP_CHAR,CPP_STRING,CPP_DIRECTIVE,CPP_LPAREN,CPP_RPAREN,CPP_LBRACE,CPP_RBRACE,CPP_COMMA,CPP_SEMICOLON,CPP_3DOTS,CPP_POP}!
 0 s2711|&
 0 s2712|&
@@ -1724,7 +1724,7 @@
 3 f1 ()!
 3 e!8{SKIP_FLAG,INVALID_FLAG,FLG_LIKELYBOOL,FLG_IMPABSTRACT,FLG_ACCESSALL,FLG_ACCESSMODULE,FLG_ACCESSFILE,FLG_ACCESSCZECH,FLG_ACCESSSLOVAK,FLG_ACCESSCZECHOSLOVAK,FLG_ABSTRACT,FLG_MUTREP,FLG_GLOBALIAS,FLG_CHECKSTRICTGLOBALIAS,FLG_CHECKEDGLOBALIAS,FLG_CHECKMODGLOBALIAS,FLG_UNCHECKEDGLOBALIAS,FLG_ALIASUNIQUE,FLG_MAYALIASUNIQUE,FLG_MUSTNOTALIAS,FLG_RETALIAS,FLG_NOPARAMS,FLG_OLDSTYLE,FLG_GNUEXTENSIONS,FLG_USEVARARGS,FLG_WARNPOSIX,FLG_EXITARG,FLG_EVALORDER,FLG_EVALORDERUNCON,FLG_BOOLFALSE,FLG_BOOLTYPE,FLG_BOOLTRUE,FLG_NOACCESS,FLG_NOCOMMENTS,FLG_UNRECOGCOMMENTS,FLG_UNRECOGFLAGCOMMENTS,FLG_CONTINUECOMMENT,FLG_NESTCOMMENT,FLG_TMPCOMMENTS,FLG_LINTCOMMENTS,FLG_WARNLINTCOMMENTS,FLG_DECLUNDEF,FLG_SPECUNDEF,FLG_SPECUNDECL,FLG_LOOPEXEC,FLG_CONTROL,FLG_INFLOOPS,FLG_INFLOOPSUNCON,FLG_DEEPBREAK,FLG_LOOPLOOPBREAK,FLG_SWITCHLOOPBREAK,FLG_LOOPSWITCHBREAK,FLG_SWITCHSWITCHBREAK,FLG_LOOPLOOPCONTINUE,FLG_UNREACHABLE,FLG_WHILEEMPTY,FLG_WHILEBLOCK,FLG_FOREMPTY,FLG_FORBLOCK,FLG_IFEMPTY,FLG_IFBLOCK,FLG_ALLEMPTY,FLG_ALLBLOCK,FLG_ELSEIFCOMPLETE,FLG_NORETURN,FLG_CASEBREAK,FLG_MISSCASE,FLG_FIRSTCASE,FLG_GRAMMAR,FLG_NOPP,FLG_SHADOW,FLG_INCONDEFSLIB,FLG_WARNOVERLOAD,FLG_NESTEDEXTERN,FLG_REDECL,FLG_REDEF,FLG_INCONDEFS,FLG_IMPTYPE,FLG_MATCHFIELDS,FLG_USEDEF,FLG_IMPOUTS,FLG_TMPDIR,FLG_LARCHPATH,FLG_LCLIMPORTDIR,FLG_SYSTEMDIRS,FLG_SKIPANSIHEADERS,FLG_SKIPPOSIXHEADERS,FLG_SYSTEMDIRERRORS,FLG_SYSTEMDIREXPAND,FLG_INCLUDEPATH,FLG_SPECPATH,FLG_QUIET,FLG_USESTDERR,FLG_SHOWSUMMARY,FLG_SHOWSCAN,FLG_STATS,FLG_TIMEDIST,FLG_SHOWUSES,FLG_NOEFFECT,FLG_NOEFFECTUNCON,FLG_EXPORTANY,FLG_EXPORTFCN,FLG_EXPORTMACRO,FLG_EXPORTTYPE,FLG_EXPORTVAR,FLG_EXPORTCONST,FLG_EXPORTITER,FLG_REPEXPOSE,FLG_RETEXPOSE,FLG_ASSIGNEXPOSE,FLG_CASTEXPOSE,FLG_LINELEN,FLG_INDENTSPACES,FLG_SHOWCOL,FLG_PARENFILEFORMAT,FLG_SHOWFUNC,FLG_SHOWALLCONJS,FLG_IMPCONJ,FLG_EXPECT,FLG_LCLEXPECT,FLG_PARTIAL,FLG_GLOBALS,FLG_USEALLGLOBS,FLG_INTERNALGLOBS,FLG_INTERNALGLOBSNOGLOBS,FLG_WARNMISSINGGLOBALS,FLG_WARNMISSINGGLOBALSNOGLOBS,FLG_GLOBUNSPEC,FLG_ALLGLOBALS,FLG_CHECKSTRICTGLOBALS,FLG_IMPCHECKEDSPECGLOBALS,FLG_IMPCHECKMODSPECGLOBALS,FLG_IMPCHECKEDSTRICTSPECGLOBALS,FLG_IMPCHECKEDGLOBALS,FLG_IMPCHECKMODGLOBALS,FLG_IMPCHECKEDSTRICTGLOBALS,FLG_IMPCHECKEDSTATICS,FLG_IMPCHECKMODSTATICS,FLG_IMPCHECKMODINTERNALS,FLG_IMPCHECKEDSTRICTSTATICS,FLG_MODGLOBS,FLG_MODGLOBSUNSPEC,FLG_MODSTRICTGLOBSUNSPEC,FLG_MODGLOBSUNCHECKED,FLG_KEEP,FLG_DOLH,FLG_DOLCS,FLG_SINGLEINCLUDE,FLG_NEVERINCLUDE,FLG_SKIPSYSHEADERS,FLG_WARNFLAGS,FLG_WARNUNIXLIB,FLG_BADFLAG,FLG_FORCEHINTS,FLG_HELP,FLG_HINTS,FLG_RETVAL,FLG_RETVALOTHER,FLG_RETVALBOOL,FLG_RETVALINT,FLG_OPTF,FLG_INIT,FLG_NOF,FLG_NEEDSPEC,FLG_NEWDECL,FLG_ITER,FLG_HASYIELD,FLG_DUMP,FLG_MERGE,FLG_NOLIB,FLG_ANSILIB,FLG_STRICTLIB,FLG_UNIXLIB,FLG_UNIXSTRICTLIB,FLG_POSIXLIB,FLG_POSIXSTRICTLIB,FLG_WHICHLIB,FLG_MTSFILE,FLG_COMMENTCHAR,FLG_ALLMACROS,FLG_LIBMACROS,FLG_SPECMACROS,FLG_FCNMACROS,FLG_CONSTMACROS,FLG_MACROMATCHNAME,FLG_MACRONEXTLINE,FLG_MACROSTMT,FLG_MACROEMPTY,FLG_MACROPARAMS,FLG_MACROASSIGN,FLG_SEFPARAMS,FLG_SEFUNSPEC,FLG_MACROPARENS,FLG_MACRODECL,FLG_MACROFCNDECL,FLG_MACROCONSTDECL,FLG_MACROREDEF,FLG_MACROUNDEF,FLG_RETSTACK,FLG_USERELEASED,FLG_STRICTUSERELEASED,FLG_COMPDEF,FLG_COMPMEMPASS,FLG_MUSTDEFINE,FLG_UNIONDEF,FLG_MEMIMPLICIT,FLG_PARAMIMPTEMP,FLG_ALLIMPONLY,FLG_CODEIMPONLY,FLG_SPECALLIMPONLY,FLG_GLOBIMPONLY,FLG_RETIMPONLY,FLG_STRUCTIMPONLY,FLG_SPECGLOBIMPONLY,FLG_SPECRETIMPONLY,FLG_SPECSTRUCTIMPONLY,FLG_DEPARRAYS,FLG_COMPDESTROY,FLG_STRICTDESTROY,FLG_MUSTFREE,FLG_BRANCHSTATE,FLG_STRICTBRANCHSTATE,FLG_MEMCHECKS,FLG_MEMTRANS,FLG_EXPOSETRANS,FLG_OBSERVERTRANS,FLG_DEPENDENTTRANS,FLG_NEWREFTRANS,FLG_ONLYTRANS,FLG_ONLYUNQGLOBALTRANS,FLG_OWNEDTRANS,FLG_FRESHTRANS,FLG_SHAREDTRANS,FLG_TEMPTRANS,FLG_KEPTTRANS,FLG_KEEPTRANS,FLG_IMMEDIATETRANS,FLG_REFCOUNTTRANS,FLG_STATICTRANS,FLG_UNKNOWNTRANS,FLG_STATICINITTRANS,FLG_UNKNOWNINITTRANS,FLG_READONLYSTRINGS,FLG_READONLYTRANS,FLG_PASSUNKNOWN,FLG_MODIFIES,FLG_MUSTMOD,FLG_MODOBSERVER,FLG_MODOBSERVERUNCON,FLG_MODINTERNALSTRICT,FLG_MODFILESYSTEM,FLG_MODUNSPEC,FLG_MODNOMODS,FLG_MODUNCON,FLG_MODUNCONNOMODS,FLG_GLOBALSIMPMODIFIESNOTHING,FLG_MODIFIESIMPNOGLOBALS,FLG_NAMECHECKS,FLG_CZECH,FLG_CZECHFUNCTIONS,FLG_CZECHVARS,FLG_CZECHMACROS,FLG_CZECHCONSTANTS,FLG_CZECHTYPES,FLG_SLOVAK,FLG_SLOVAKFUNCTIONS,FLG_SLOVAKMACROS,FLG_SLOVAKVARS,FLG_SLOVAKCONSTANTS,FLG_SLOVAKTYPES,FLG_CZECHOSLOVAK,FLG_CZECHOSLOVAKFUNCTIONS,FLG_CZECHOSLOVAKMACROS,FLG_CZECHOSLOVAKVARS,FLG_CZECHOSLOVAKCONSTANTS,FLG_CZECHOSLOVAKTYPES,FLG_ANSIRESERVED,FLG_CPPNAMES,FLG_ANSIRESERVEDLOCAL,FLG_DISTINCTEXTERNALNAMES,FLG_EXTERNALNAMELEN,FLG_EXTERNALNAMECASEINSENSITIVE,FLG_DISTINCTINTERNALNAMES,FLG_INTERNALNAMELEN,FLG_INTERNALNAMECASEINSENSITIVE,FLG_INTERNALNAMELOOKALIKE,FLG_MACROVARPREFIX,FLG_MACROVARPREFIXEXCLUDE,FLG_TAGPREFIX,FLG_TAGPREFIXEXCLUDE,FLG_ENUMPREFIX,FLG_ENUMPREFIXEXCLUDE,FLG_FILESTATICPREFIX,FLG_FILESTATICPREFIXEXCLUDE,FLG_GLOBPREFIX,FLG_GLOBPREFIXEXCLUDE,FLG_TYPEPREFIX,FLG_TYPEPREFIXEXCLUDE,FLG_EXTERNALPREFIX,FLG_EXTERNALPREFIXEXCLUDE,FLG_LOCALPREFIX,FLG_LOCALPREFIXEXCLUDE,FLG_UNCHECKEDMACROPREFIX,FLG_UNCHECKEDMACROPREFIXEXCLUDE,FLG_CONSTPREFIX,FLG_CONSTPREFIXEXCLUDE,FLG_ITERPREFIX,FLG_ITERPREFIXEXCLUDE,FLG_DECLPARAMPREFIX,FLG_DECLPARAMNAME,FLG_DECLPARAMMATCH,FLG_DECLPARAMPREFIXEXCLUDE,FLG_CONTROLNESTDEPTH,FLG_STRINGLITERALLEN,FLG_NUMSTRUCTFIELDS,FLG_NUMENUMMEMBERS,FLG_INCLUDENEST,FLG_ANSILIMITS,FLG_NAME,FLG_UNCLASSIFIED,FLG_NULL,FLG_NULLTERMINATED,FLG_ARRAYREAD,FLG_ARRAYWRITE,FLG_FUNCTIONPOST,FLG_PARENCONSTRAINT,FLG_DEBUGFUNCTIONCONSTRAINT,FLG_ARRAYBOUNDS,FLG_ARRAYBOUNDSREAD,FLG_FUNCTIONCONSTRAINT,FLG_CHECKPOST,FLG_CONSTRAINTLOCATION,FLG_IMPLICTCONSTRAINT,FLG_ORCONSTRAINT,FLG_NULLTERMINATEDWARNING,FLG_NULLDEREF,FLG_FCNDEREF,FLG_NULLPASS,FLG_NULLRET,FLG_NULLSTATE,FLG_NULLASSIGN,FLG_BOOLCOMPARE,FLG_REALCOMPARE,FLG_POINTERARITH,FLG_NULLPOINTERARITH,FLG_PTRNUMCOMPARE,FLG_STRICTOPS,FLG_BITWISEOPS,FLG_SHIFTSIGNED,FLG_BOOLOPS,FLG_PTRNEGATE,FLG_SIZEOFTYPE,FLG_SIZEOFFORMALARRAY,FLG_FIXEDFORMALARRAY,FLG_INCOMPLETETYPE,FLG_FORMALARRAY,FLG_PREDASSIGN,FLG_PREDBOOL,FLG_PREDBOOLINT,FLG_PREDBOOLOTHERS,FLG_PREDBOOLPTR,FLG_DEFINE,FLG_UNDEFINE,FLG_GLOBSTATE,FLG_SUPCOUNTS,FLG_LIMIT,FLG_SYNTAX,FLG_TRYTORECOVER,FLG_PREPROC,FLG_TYPE,FLG_FULLINITBLOCK,FLG_ENUMMEMBERS,FLG_MAINTYPE,FLG_FORMATTYPE,FLG_FORMATCONST,FLG_FORMATCODE,FLG_FORWARDDECL,FLG_ABSTVOIDP,FLG_CASTFCNPTR,FLG_CHARINDEX,FLG_ENUMINDEX,FLG_BOOLINT,FLG_CHARINT,FLG_ENUMINT,FLG_FLOATDOUBLE,FLG_IGNOREQUALS,FLG_DUPLICATEQUALS,FLG_IGNORESIGNS,FLG_NUMLITERAL,FLG_CHARINTLITERAL,FLG_RELAXQUALS,FLG_RELAXTYPES,FLG_CHARUNSIGNEDCHAR,FLG_MATCHANYINTEGRAL,FLG_LONGUNSIGNEDINTEGRAL,FLG_LONGINTEGRAL,FLG_LONGUNSIGNEDUNSIGNEDINTEGRAL,FLG_LONGSIGNEDINTEGRAL,FLG_ZEROPTR,FLG_ZEROBOOL,FLG_REPEATUNRECOG,FLG_SYSTEMUNRECOG,FLG_UNRECOG,FLG_TOPUNUSED,FLG_EXPORTLOCAL,FLG_EXPORTHEADER,FLG_EXPORTHEADERVAR,FLG_FIELDUNUSED,FLG_ENUMMEMUNUSED,FLG_CONSTUNUSED,FLG_FUNCUNUSED,FLG_PARAMUNUSED,FLG_TYPEUNUSED,FLG_VARUNUSED,FLG_UNUSEDSPECIAL,FLG_REDUNDANTSHAREQUAL,FLG_MISPLACEDSHAREQUAL,FLG_ANNOTATIONERROR,FLG_COMMENTERROR,FLG_SHOWSOURCELOC,FLG_BUGSLIMIT,FLG_FILEEXTENSIONS,FLG_WARNUSE,FLG_STATETRANSFER,FLG_STATEMERGE,FLG_ITS4MOSTRISKY,FLG_ITS4VERYRISKY,FLG_ITS4RISKY,FLG_ITS4MODERATERISK,FLG_ITS4LOWRISK,FLG_BUFFEROVERFLOWHIGH,FLG_BUFFEROVERFLOW,FLG_TOCTOU,FLG_MULTITHREADED,FLG_SUPERUSER,FLG_IMPLEMENTATIONOPTIONAL,LAST_FLAG}!
 0 s3161|&
-0 s3162|-1 -1 13555
+0 s3162|-1 -1 13547
 3 f1 (1722|@3|&#,)!
 3 e!9{FK_ABSTRACT,FK_ANSI,FK_BEHAVIOR,FK_COMMENTS,FK_COMPLETE,FK_CONTROL,FK_DEBUG,FK_DECL,FK_DEF,FK_DIRECT,FK_DISPLAY,FK_EFFECT,FK_EXPORT,FK_EXPOSURE,FK_FORMAT,FK_GLOBAL,FK_GLOBALS,FK_HEADERS,FK_HELP,FK_IGNORERET,FK_INIT,FK_ITER,FK_LIBS,FK_LIMITS,FK_MACROS,FK_MEMORY,FK_MODIFIES,FK_NAMES,FK_NONE,FK_NULL,FK_NT,FK_OPS,FK_PRED,FK_PREPROC,FK_SECRET,FK_SUPPRESS,FK_SYNTAX,FK_TYPE,FK_TYPEEQ,FK_NUMBERS,FK_POINTER,FK_UNRECOG,FK_USE,FK_BOOL,FK_ALIAS,FK_PROTOS,FK_SPEC,FK_IMPLICIT,FK_FILES,FK_ERRORS,FK_UNSPEC,FK_SPEED,FK_PARAMS,FK_DEAD,FK_SECURITY,FK_LEAK,FK_ARRAY,FK_OBSOLETE,FK_PREFIX,FK_WARNUSE}!
 0 s3228|&
@@ -2362,7 +2362,7 @@
 3 Ss_cstringSList{5|@1|^#nelements,5|@1|^#nspace,2356|@1|11@3@3&#elements,}!
 0 s3468|-1 2359 -1
 1 t2358|2358&
-0 a3469|-1 20925 -1
+0 a3469|-1 20917 -1
 3 f0 (2360|0@5@7&#,)!
 3 f2 (2360|0@5@7&#,)!
 3 f0 (2360|@7|0@5@7&#,)!
@@ -2700,7 +2700,7 @@
 1 t2694|2694&
 3 Ss_mappair{1037|@1|^#domain,1037|@1|^#range,2695|@1|0@5@3&#next,}!
 0 s3603|-1 2698 -1
-1 t2697|2697 19988 -1
+1 t2697|2697 19980 -1
 0 s3604|-1 2700 -1
 1 t2699|2699&
 3 S!18{6|@1|^#count,2700|@1|0@3@2&#buckets,}^2703
@@ -2726,7 +2726,7 @@
 3 S!20{2715|@1|^#kind,1036|@1|^#handle,1037|@1|^#name,1037|@1|11@0@0&#tag,2|@1|11@0@0&#realtag,1036|@1|^#baseSort,1036|@1|11@0@0&#objSort,2720|@1|0@5@3&#members,2|@1|^#export,2|@1|^#mutable,2|@1|^#abstract,2|@1|^#imported,}^2723
 0 s3633|&
 1 t2721|2721&
-0 s3634|-1 19289 -1
+0 s3634|-1 19281 -1
 3 f0 (1036|$#,)!
 3 f1211 (1036|$#,)!
 3 f0 (1036|$#,)!
@@ -2835,7 +2835,7 @@
 3 S!24{1032|@1|0@5@3&#type,1039|@1|0@5@3&#paramdecl,2829|@1|^#kind,}^2832
 0 s3730|&
 1 t2830|2830&
-0 s3731|-1 17764 -1
+0 s3731|-1 17756 -1
 3 f0 (2833|0@5@2&#,)!
 3 f1 (2833|0@5@2&#,)!
 3 f0 (2833|0@5@7&#,)!
@@ -3037,7 +3037,7 @@
 3 S!30{3031|@1|^#kind,1043|@1|0@5@3&#val,}^3034
 0 s3844|&
 1 t3032|3032&
-0 s3845|-1 17840 -1
+0 s3845|-1 17832 -1
 3 f0 (3035|0@5@2&#,)!
 3 f1 (3035|0@5@2&#,)!
 3 f0 (1043|0@5@2&#,)!
@@ -3114,7 +3114,7 @@
 3 S!35{5|@1|^#entries,5|@1|^#nspace,3061|@1|11@3@3&#elements,}^3111
 0 s3890|&
 1 t3109|3109&
-0 a3891|-1 17565 -1
+0 a3891|-1 17557 -1
 3 f1 (3112|@7|6@5@7&#,1036|@3|&#,)!
 3 f0 (3112|0@5@7&#,)!
 3 f2 (3112|0@5@7&#,)!
@@ -3141,7 +3141,7 @@
 3 S!36{1036|@1|^#sort,1043|@1|0@5@3&#tok,}^3138
 0 s3905|&
 1 t3136|3136&
-0 s3906|-1 17729 -1
+0 s3906|-1 17721 -1
 3 f0 (3139|0@5@2&#,)!
 3 f1 (3139|0@5@2&#,)!
 0 s3908|-1 3143 -1
@@ -3164,7 +3164,7 @@
 3 S!38{1043|@1|0@5@3&#id,1040|@1|0@5@3&#type,2|@1|^#isRedecl,}^3161
 0 s3919|&
 1 t3159|3159&
-0 s3920|-1 17584 -1
+0 s3920|-1 17576 -1
 3 f0 (3162|$#,)!
 3 f1211 (3162|$#,)!
 3 f0 (3162|0@5@2&#,)!
@@ -3189,7 +3189,7 @@
 3 S!40{3162|@1|0@0@3&#declarator,1020|@1|0@0@3&#body,}^3186
 0 s3934|&
 1 t3184|3184&
-0 s3935|-1 17543 -1
+0 s3935|-1 17535 -1
 3 f0 (3187|0@5@2&#,)!
 3 f1 (3187|0@5@2&#,)!
 3 f0 (3187|$#,)!
@@ -3237,7 +3237,7 @@
 3 S!47{1043|@1|0@5@3&#varid,2|@1|^#isObj,1032|@1|0@5@3&#type,1036|@1|^#sort,}^3234
 0 s3963|&
 1 t3232|3232&
-0 s3964|-1 17803 -1
+0 s3964|-1 17795 -1
 3 f0 (3235|$#,)!
 3 f3235 (3235|$#,)!
 3 f0 (3235|0@5@2&#,)!
@@ -3262,7 +3262,7 @@
 3 S!49{1043|@1|0@5@3&#quant,3245|@1|0@0@3&#vars,2|@1|^#isForall,}^3259
 0 s3978|&
 1 t3257|3257&
-0 s3979|-1 17816 -1
+0 s3979|-1 17808 -1
 3 f0 (3260|$#,)!
 3 f3260 (3260|$#,)!
 3 f0 (3260|0@5@2&#,)!
@@ -3292,7 +3292,7 @@
 3 S!53{3284|@1|^#kind,3285|@1|^#content,}^3289
 0 s4000|&
 1 t3287|3287&
-0 s4001|-1 17631 -1
+0 s4001|-1 17623 -1
 3 f0 (3290|$#,)!
 3 f3290 (3290|$#,)!
 3 f0 (3290|$#,)!
@@ -3331,7 +3331,7 @@
 3 S!56{1043|@1|0@5@3&#varid,1032|@1|0@5@3&#sortspec,1017|@1|0@0@3&#term,1036|@1|^#sort,}^3328
 0 s4018|&
 1 t3326|3326&
-0 s4019|-1 17597 -1
+0 s4019|-1 17589 -1
 3 f0 (3329|0@5@2&#,)!
 3 f1 (3329|0@5@2&#,)!
 0 s4021|-1 3333 -1
@@ -3357,7 +3357,7 @@
 3 S!60{5|@1|^#wrapped,3349|@1|^#kind,3350|@1|^#content,}^3354
 0 s4038|&
 1 t3352|3352&
-0 s4039|-1 17781 -1
+0 s4039|-1 17773 -1
 3 f0 (3355|0@5@2&#,)!
 3 f1 (3355|0@5@2&#,)!
 3 f0 (3355|$#,)!
@@ -3394,7 +3394,7 @@
 3 S!65{3162|@1|0@0@3&#declarator,1017|@1|0@5@3&#value,}^3391
 0 s4069|&
 1 t3389|3389&
-0 s4070|-1 17516 -1
+0 s4070|-1 17508 -1
 3 f0 (3392|$#,)!
 3 f2 (3392|$#,)!
 3 f0 (3392|0@5@2&#,)!
@@ -3426,7 +3426,7 @@
 3 S!69{2|@1|^#isSpecial,1047|@1|11@5@18&#sref,2|@1|^#isGlobal,2|@1|^#isPrivate,3420|@1|^#qualifier,1032|@1|0@5@3&#type,3402|@1|0@0@3&#decls,}^3423
 0 s4091|&
 1 t3421|3421&
-0 s4092|-1 17792 -1
+0 s4092|-1 17784 -1
 3 f0 (3424|0@5@2&#,)!
 3 f1 (3424|0@5@2&#,)!
 3 f0 (3424|0@5@7&#,)!
@@ -3460,7 +3460,7 @@
 3 S!72{1043|@1|0@5@3&#name,1032|@1|0@5@3&#typespec,3162|@1|0@0@3&#declarator,3444|@1|0@0@3&#globals,3434|@1|0@0@3&#inits,3337|@1|0@0@3&#lets,1023|@1|0@5@3&#checks,1023|@1|0@5@3&#require,3323|@1|0@5@3&#modify,1023|@1|0@5@3&#ensures,1023|@1|0@5@3&#claim,1833|@1|^#special,}^3457
 0 s4109|&
 1 t3455|3455&
-0 s4110|-1 17753 -1
+0 s4110|-1 17745 -1
 3 f0 (3458|0@5@2&#,)!
 3 f1 (3458|0@5@2&#,)!
 3 f0 (3458|0@5@7&#,)!
@@ -3506,7 +3506,7 @@
 3 S!76{1032|@1|0@5@3&#lcltypespec,3172|@1|0@0@3&#declarators,}^3503
 0 s4131|&
 1 t3501|3501&
-0 s4132|-1 17608 -1
+0 s4132|-1 17600 -1
 3 f0 (3504|0@5@2&#,)!
 3 f1 (3504|0@5@2&#,)!
 3 f0 (3504|$#,)!
@@ -3585,7 +3585,7 @@
 3 S!88{2|@1|^#isTypeName,3579|@1|0@5@3&#typename,1014|@1|0@5@3&#opform,}^3582
 0 s4179|&
 1 t3580|3580&
-0 s4180|-1 17740 -1
+0 s4180|-1 17732 -1
 3 f0 (3583|0@5@2&#,)!
 3 f1 (3583|0@5@2&#,)!
 3 f0 (3583|0@5@7&#,)!
@@ -3628,7 +3628,7 @@
 3 S!94{1043|@1|0@5@3&#tok,2986|@1|0@5@3&#domain,1043|@1|0@5@3&#range,6|@1|^#key,}^3625
 0 s4228|&
 1 t3623|3623&
-0 s4229|-1 17450 -1
+0 s4229|-1 17442 -1
 3 f0 (3626|0@5@7&#,)!
 3 f1211 (3626|0@5@7&#,)!
 3 f0 (3626|0@5@2&#,)!
@@ -3691,7 +3691,7 @@
 3 S!99{3677|@1|0@5@2&#name,3626|@1|0@0@18&#signature,}^3688
 0 s4259|&
 1 t3686|3686&
-0 s4260|-1 17477 -1
+0 s4260|-1 17469 -1
 0 s4261|-1 3695 -1
 3 f0 (3689|0@0@2&#,)!
 3 f1 (3689|0@0@2&#,)!
@@ -3724,7 +3724,7 @@
 3 S!103{1043|@1|0@5@3&#tok,3583|@1|0@0@3&#typename,2|@1|^#isCType,3717|@1|^#content,}^3721
 0 s4277|&
 1 t3719|3719&
-0 s4278|-1 17829 -1
+0 s4278|-1 17821 -1
 3 f0 (3722|0@5@2&#,)!
 3 f1 (3722|0@5@2&#,)!
 3 f0 (3722|0@5@7&#,)!
@@ -3763,7 +3763,7 @@
 3 S!108{2986|@1|0@5@3&#traitid,3755|@1|0@5@3&#rename,}^3760
 0 s4297|&
 1 t3758|3758&
-0 s4298|-1 17718 -1
+0 s4298|-1 17710 -1
 3 f0 (3761|0@5@2&#,)!
 3 f1 (3761|0@5@2&#,)!
 0 s4300|-1 3765 -1
@@ -3811,7 +3811,7 @@
 3 S!118{3803|@1|^#kind,3804|@1|^#content,}^3808
 0 s4339|&
 1 t3806|3806&
-0 s4340|-1 17554 -1
+0 s4340|-1 17546 -1
 3 f0 (3809|$#,)!
 3 f1211 (3809|$#,)!
 3 f0 (3809|0@5@2&#,)!
@@ -4192,7 +4192,7 @@
 3 S!122{1043|@1|0@5@3&#id,2|@1|^#export,3667|@1|0@0@2&#signature,3147|@1|0@5@2&#globals,}^4189
 0 s4538|&
 1 t4187|4187&
-0 s4539|-1 19621 -1
+0 s4539|-1 19613 -1
 3 S!123{1043|@1|0@5@3&#id,1036|@1|^#basedOn,2|@1|^#abstract,2|@1|^#modifiable,2|@1|^#export,}^4193
 0 s4540|&
 1 t4191|4191&
@@ -4233,14 +4233,14 @@
 0 s4577|-1 4229 -1
 1 t4228|4228&
 3 Ss_htEntry{4227|@1|0@0@2&#data,4229|@1|0@0@2&#next,}!
-0 s4578|-1 19594 -1
+0 s4578|-1 19586 -1
 0 s4579|-1 4233 -1
-1 t4232|4232 19646 -1
+1 t4232|4232 19638 -1
 0 s4580|-1 4235 -1
 1 t4234|4234&
 3 S!134{6|@1|^#count,6|@1|^#size,4235|@1|0@3@2&#buckets,}!
 0 s4581|&
-0 s4582|-1 19473 -1
+0 s4582|-1 19465 -1
 0 s4583|-1 4240 -1
 1 t4239|4239&
 0 s4584|&
@@ -4369,13 +4369,13 @@
 3 S!136{1211|@1|0@5@2&#key,5|@1|^#val,}^4366
 0 s4660|&
 1 t4364|4364&
-0 s4661|-1 14047 -1
+0 s4661|-1 14039 -1
 0 s4662|-1 4369 -1
 1 t4368|4368&
 3 S!137{5|@1|^#size,5|@1|^#nspace,4369|@1|0@0@2&#entries,}^4372
 0 s4663|&
 1 t4370|4370&
-0 s4664|-1 14074 -1
+0 s4664|-1 14066 -1
 0 s4665|-1 4375 -1
 1 t4374|4374&
 3 Ss_cstringTable{5|@1|^#size,5|@1|^#nentries,4375|@1|0@0@2&#buckets,}!
@@ -4404,13 +4404,13 @@
 3 S!138{1211|@1|0@5@2&#key,20|@1|0@0@2&#val,}^4401
 0 s4677|&
 1 t4399|4399&
-0 s4678|-1 14428 -1
+0 s4678|-1 14420 -1
 0 s4679|-1 4404 -1
 1 t4403|4403&
 3 S!139{5|@1|^#size,5|@1|^#nspace,4404|@1|0@0@2&#entries,}^4407
 0 s4680|&
 1 t4405|4405&
-0 s4681|-1 14455 -1
+0 s4681|-1 14447 -1
 0 s4682|-1 4410 -1
 1 t4409|4409&
 3 Ss_genericTable{5|@1|^#size,5|@1|^#nentries,4410|@1|0@0@2&#buckets,}!
@@ -4470,7 +4470,7 @@
 3 f1211 (4440|0@5@7&#,)!
 3 f0 (4440|0@5@2&#,)!
 3 f1 (4440|0@5@2&#,)!
-0 s4710|-1 16883 -1
+0 s4710|-1 16875 -1
 3 f0 (1211|0@5@2&#,)!
 3 f4468 (1211|0@5@2&#,)!
 0 s4711|-1 4472 -1
@@ -4808,7 +4808,7 @@
 3 S!149{5|@1|^#entries,5|@1|^#nspace,4802|@1|11@3@3&#elements,}^4805
 0 s4924|&
 1 t4803|4803&
-0 a4925|-1 17207 -1
+0 a4925|-1 17199 -1
 3 f0 ()!
 3 f4806 ()!
 3 f0 (4806|0@5@7&#,4798|$#,)!
@@ -5085,7 +5085,7 @@
 3 S!153{5|@1|^#level,5|@1|^#index,}^5082
 0 s5064|&
 1 t5080|5080&
-0 s5065|-1 14555 -1
+0 s5065|-1 14547 -1
 0 s5066|-1 5085 -1
 1 t5084|5084&
 0 s5067|&
@@ -8190,7 +8190,7 @@
 3 S!204{8182|@1|^#kind,1722|@1|^#code,8183|@1|11@0@0&#info,1082|@1|0@5@3&#loc,}^8187
 0 s6715|&
 1 t8185|8185&
-0 s6716|-1 17101 -1
+0 s6716|-1 17093 -1
 3 f0 (8188|$#,)!
 3 f2 (8188|$#,)!
 3 f0 (8188|$#,)!
@@ -8250,7 +8250,7 @@
 3 S!206{1082|@1|0@5@3&#fl,1211|@1|0@5@3&#def,2|@1|^#defined,2|@1|^#scomment,}^8247
 0 s6740|&
 1 t8245|8245&
-0 s6741|-1 12043 -1
+0 s6741|-1 12035 -1
 0 s6742|-1 8250 -1
 1 t8249|8249&
 3 S!207{5|@1|^#nspace,5|@1|^#entries,8250|@1|11@0@2&#contents,}^8253
@@ -8279,7 +8279,7 @@
 3 S!209{2|@1|^#ftemp,2|@1|^#fsystem,2|@1|^#fspecial,1211|@1|0@5@3&#fname,1211|@1|0@5@3&#basename,8273|@1|^#ftype,1513|@1|^#fder,}^8276
 0 s6763|&
 1 t8274|8274&
-0 s6764|-1 13968 -1
+0 s6764|-1 13960 -1
 0 s6765|-1 8279 -1
 1 t8278|8278&
 3 S!210{5|@1|^#nentries,5|@1|^#nspace,1085|@1|0@5@3&#htable,8279|@1|11@0@2&#elements,}^8282
@@ -8361,7 +8361,7 @@
 3 S!211{1082|@1|0@5@3&#loc,1211|@1|0@5@3&#msg,}^8358
 0 s6798|&
 1 t8356|8356&
-0 s6799|-1 14277 -1
+0 s6799|-1 14269 -1
 0 s6800|-1 8361 -1
 1 t8360|8360&
 3 S!212{5|@1|^#nelements,5|@1|^#nspace,8361|@1|11@0@2&#elements,}^8364
@@ -9691,8 +9691,6 @@
 3 f0 ()!
 3 f5 ()!
 3 f0 ()!
-3 f5 ()!
-3 f0 ()!
 3 f4 ()!
 3 f0 ()!
 3 f17 ()!
@@ -9802,8 +9800,8 @@
 3 f1 (5|^#,)!
 3 f1 (20|^#,)!
 3 Sskeyword{23|@1|0@5@18@3@0#name,5|@1|^#token,}!
-0 s7452|-1 -1 9801
-2 y9800|9800&
+0 s7452|-1 -1 9799
+2 y9798|9798&
 3 f0 (1211|0@5@7&#,)!
 3 f2 (1211|0@5@7&#,)!
 3 f0 ()!
@@ -9869,7 +9867,7 @@
 3 f0 ()!
 3 f1 ()!
 3 U!226{1058|@1|0@0@3&#tok,1142|@1|0@0@3&#mtdecl,1145|@1|0@5@3&#mtpiece,1148|@1|0@5@3&#mtpieces,1151|@1|0@5@3&#mtcontext,1154|@1|0@0@3&#mtvalues,1157|@1|0@0@3&#mtdefaults,1160|@1|0@5@3&#mtdeflist,1166|@1|0@0@3&#mtannotations,1169|@1|0@5@3&#mtannotlist,1172|@1|0@0@3&#mtannotdecl,1175|@1|0@0@3&#mtmerge,1178|@1|0@0@3&#mtmergeitem,1181|@1|0@5@3&#mtmergeclauselist,1184|@1|0@0@3&#mtmergeclause,1187|@1|0@5@3&#mttransferclauselist,1190|@1|0@0@3&#mttransferclause,1199|@1|0@0@3&#mttransferaction,1193|@1|0@5@3&#mtlosereferencelist,1196|@1|0@0@3&#mtlosereference,2392|@1|0@5@2&#cstringlist,1213|@1|^#ctyp,5610|@1|0@5@2&#qtyp,5|@1|^#count,}!
-0 s7455|&
+0 s7457|&
 3 f0 ()!
 3 f5 ()!
 3 f0 (1094|0@5@7&#,)!
@@ -9918,25 +9916,25 @@
 3 f1 (23|$#,)!
 3 f0 (211|$#,5|$#,9592|$#,)!
 3 f1 (211|$#,5|$#,9592|$#,)!
-0 s7465|-1 9917 -1
-1 t9916|9916&
-3 S!228{5|@1|^#nelements,5|@1|^#nspace,9917|@1|11@3@3&#elements,}^9920
+0 s7465|-1 9915 -1
+1 t9914|9914&
+3 S!228{5|@1|^#nelements,5|@1|^#nspace,9915|@1|11@3@3&#elements,}^9918
 0 s7466|&
-1 t9918|9918&
+1 t9916|9916&
 0 a7467|&
-3 f1 (9921|@7|&#,1067|@3|6@5@19@2@0#,)!
+3 f1 (9919|@7|&#,1067|@3|6@5@19@2@0#,)!
 3 f0 ()!
-3 f9921 ()!
+3 f9919 ()!
 3 f0 (1067|0@5@18@2@0#,)!
-3 f9921 (1067|0@5@18@2@0#,)!
-3 f0 (9921|$#,1067|0@5@18@2@0#,)!
-3 f1 (9921|$#,1067|0@5@18@2@0#,)!
-3 f0 (9921|$#,)!
-3 f1211 (9921|$#,)!
-3 f0 (9921|0@0@2&#,)!
-3 f1 (9921|0@0@2&#,)!
-3 f0 (9921|@5|$#,9921|0@0@2&#,)!
-3 f9921 (9921|@5|$#,9921|0@0@2&#,)!
+3 f9919 (1067|0@5@18@2@0#,)!
+3 f0 (9919|$#,1067|0@5@18@2@0#,)!
+3 f1 (9919|$#,1067|0@5@18@2@0#,)!
+3 f0 (9919|$#,)!
+3 f1211 (9919|$#,)!
+3 f0 (9919|0@0@2&#,)!
+3 f1 (9919|0@0@2&#,)!
+3 f0 (9919|@5|$#,9919|0@0@2&#,)!
+3 f9919 (9919|@5|$#,9919|0@0@2&#,)!
 3 f0 (1067|0@5@18&#,)!
 3 f2 (1067|0@5@18&#,)!
 3 f0 (1067|0@5@18&#,)!
@@ -9947,8 +9945,6 @@
 3 f1206 (1067|0@5@18&#,)!
 3 f0 (1067|0@5@18&#,)!
 3 f1206 (1067|0@5@18&#,)!
-3 f0 (1067|@5|0@5@7&#,)!
-3 f1067 (1067|@5|0@5@7&#,)!
 3 f0 (1067|4@5@7&#,4309|$#,1082|0@5@7&#,)!
 3 f1 (1067|4@5@7&#,4309|$#,1082|0@5@7&#,)!
 3 f0 (1067|0@5@18&#,4309|$#,)!
@@ -9960,7 +9956,7 @@
 3 C1.2/1|!
 3 f0 (1067|0@5@18&#,)!
 3 f2 (1067|0@5@18&#,)!
-3 f9955 (1067|0@5@18&#,)!
+3 f9951 (1067|0@5@18&#,)!
 3 f7490 (1067|0@5@18&#,)!
 3 f0 (1067|0@5@18&#,)!
 3 f2 (1067|0@5@18&#,)!
@@ -9976,15 +9972,13 @@
 3 f1067 (1067|@5|0@5@7&#,1067|0@5@18&#,1067|0@5@18&#,)!
 3 f0 (1073|0@5@19@3@0#,)!
 3 f1206 (1073|0@5@19@3@0#,)!
-3 f0 (1067|@5|0@5@7&#,)!
-3 f1067 (1067|@5|0@5@7&#,)!
 3 f0 (1067|0@5@18&#,1067|0@5@18&#,1067|0@5@18&#,)!
 3 f1 (1067|0@5@18&#,1067|0@5@18&#,1067|0@5@18&#,)!
 3 f0 (1067|@5|0@5@7&#,)!
 3 f1067 (1067|@5|0@5@7&#,)!
 1 t1206|1206&
-3 f0 (1067|0@5@18&#,1067|0@5@18&#,9980|15@0@1&#,9980|15@0@1&#,9980|15@0@1&#,9980|15@0@1&#,)!
-3 f1 (1067|0@5@18&#,1067|0@5@18&#,9980|15@0@1&#,9980|15@0@1&#,9980|15@0@1&#,9980|15@0@1&#,)!
+3 f0 (1067|0@5@18&#,1067|0@5@18&#,9974|15@0@1&#,9974|15@0@1&#,9974|15@0@1&#,9974|15@0@1&#,)!
+3 f1 (1067|0@5@18&#,1067|0@5@18&#,9974|15@0@1&#,9974|15@0@1&#,9974|15@0@1&#,9974|15@0@1&#,)!
 3 f0 (1067|0@5@7&#,)!
 3 f1 (1067|0@5@7&#,)!
 3 f0 (1067|@5|0@5@7&#,)!
@@ -10428,9 +10422,9 @@
 3 f0 (1206|@5|0@5@7&#,)!
 3 f1206 (1206|@5|0@5@7&#,)!
 3 ?!
-3 f10425 (20|$#,20|$#,)!
-3 f5 (20|$#,20|$#,)^10428
-1 t10427|10427&
+3 f10419 (20|$#,20|$#,)!
+3 f5 (20|$#,20|$#,)^10422
+1 t10421|10421&
 3 f0 (1203|@5|0@5@7&#,1206|0@5@7&#,)!
 3 f1203 (1203|@5|0@5@7&#,1206|0@5@7&#,)!
 3 f0 (7392|$#,1209|0@5@19@3@0#,7392|$#,1209|0@5@19@3@0#,)!
@@ -10552,45 +10546,45 @@
 3 f0 (1067|0@5@18&#,1067|0@5@18&#,1067|0@5@18&#,)!
 3 f1 (1067|0@5@18&#,1067|0@5@18&#,1067|0@5@18&#,)!
 3 ?!
-3 f10549 (1715|$#,)!
-3 f1698 (1715|$#,)^10552
-1 t10551|10551&
+3 f10543 (1715|$#,)!
+3 f1698 (1715|$#,)^10546
+1 t10545|10545&
 0 s7481|&
 3 ?!
 1 t1694|1694&
-3 f10554 (10555|$#,1715|$#,)!
-3 f1 (10555|$#,1715|$#,)^10558
-1 t10557|10557&
+3 f10548 (10549|$#,1715|$#,)!
+3 f1 (10549|$#,1715|$#,)^10552
+1 t10551|10551&
 0 s7482|&
-0 s7483|-1 10561 -1
-1 t10560|10560 11142 -1
-3 Sparse_marker{10555|@1|0@0@18&#buf,10561|@1|0@5@18&#next,5|@1|^#position,}!
-0 s7484|-1 10564 -1
-1 t10563|10563&
-3 Sarglist{10564|@1|0@5@3&#next,23|@1|0@0@18&#name,5|@1|^#length,5|@1|^#argno,5|@1|^#rest_args,}!
+0 s7483|-1 10555 -1
+1 t10554|10554 11134 -1
+3 Sparse_marker{10549|@1|0@0@18&#buf,10555|@1|0@5@18&#next,5|@1|^#position,}!
+0 s7484|-1 10558 -1
+1 t10557|10557&
+3 Sarglist{10558|@1|0@5@3&#next,23|@1|0@0@18&#name,5|@1|^#length,5|@1|^#argno,5|@1|^#rest_args,}!
 3 f0 (1715|$#,)!
 3 f1698 (1715|$#,)!
 3 C1.5/1|!
 3 f0 (1715|$#,)!
 3 f5 (1715|$#,)!
-3 f10568 (1715|$#,)!
+3 f10562 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
-0 s7488|-1 10575 -1
-1 t10574|10574&
-0 s7489|-1 10577 -1
-1 t10576|10576&
-3 ScppBuffer{23|@1|0@5@2&#buf,23|@1|0@5@18@2@0#cur,23|@1|0@5@18@2@0#rlimit,23|@1|0@5@18@2@0#alimit,23|@1|0@5@18@2@0#prev,1211|@1|0@5@18&#fname,1211|@1|0@5@18@2@0#nominal_fname,10575|@1|0@5@18&#dir,9|@1|^#line_base,5|@1|^#lineno,5|@1|^#colno,10553|@1|0@0@3&#underflow,10559|@1|0@0@3&#cleanup,1053|@1|0@0@18&#hnode,10561|@1|0@5@18&#marks,10577|@1|0@5@18@2@0#if_stack,4|@1|^#system_header_p,4|@1|^#seen_eof,2|@1|^#has_escapes,}!
+0 s7488|-1 10569 -1
+1 t10568|10568&
+0 s7489|-1 10571 -1
+1 t10570|10570&
+3 ScppBuffer{23|@1|0@5@2&#buf,23|@1|0@5@18@2@0#cur,23|@1|0@5@18@2@0#rlimit,23|@1|0@5@18@2@0#alimit,23|@1|0@5@18@2@0#prev,1211|@1|0@5@18&#fname,1211|@1|0@5@18@2@0#nominal_fname,10569|@1|0@5@18&#dir,9|@1|^#line_base,5|@1|^#lineno,5|@1|^#colno,10547|@1|0@0@3&#underflow,10553|@1|0@0@3&#cleanup,1053|@1|0@0@18&#hnode,10555|@1|0@5@18&#marks,10571|@1|0@5@18@2@0#if_stack,4|@1|^#system_header_p,4|@1|^#seen_eof,2|@1|^#has_escapes,}!
 0 s7490|&
-0 s7491|-1 10612 -1
+0 s7491|-1 10606 -1
 2 F0/0|0&
 2 F1694/0|1694&
 1 t1696|1696&
-3 ScppReader{10553|@1|0@0@3&#get_token,10555|@1|0@5@18&#buffer,10582|@1|^#buffer_stack,5|@1|^#errors,10583|@1|0@0@3&#opts,23|@1|0@3@3&#token_buffer,63|@1|^#token_buffer_size,23|@1|0@0@18@2@0#limit,5|@1|^#multiline_string_line,5|@1|^#system_include_depth,10575|@1|0@5@17&#all_include_files,5|@1|^#max_include_len,10577|@1|0@5@3&#if_stack,4|@1|^#pcp_inside_if,4|@1|^#input_stack_listing_current,2|@1|^#no_macro_expand,2|@1|^#show_column,4|@1|^#parsing_include_directive,4|@1|^#output_escapes,4|@1|^#only_seen_white,5|@1|^#lineno,445|@1|0@5@18@3@0#timebuf,}!
+3 ScppReader{10547|@1|0@0@3&#get_token,10549|@1|0@5@18&#buffer,10576|@1|^#buffer_stack,5|@1|^#errors,10577|@1|0@0@3&#opts,23|@1|0@3@3&#token_buffer,63|@1|^#token_buffer_size,23|@1|0@0@18@2@0#limit,5|@1|^#multiline_string_line,5|@1|^#system_include_depth,10569|@1|0@5@17&#all_include_files,5|@1|^#max_include_len,10571|@1|0@5@3&#if_stack,4|@1|^#pcp_inside_if,4|@1|^#input_stack_listing_current,2|@1|^#no_macro_expand,2|@1|^#show_column,4|@1|^#parsing_include_directive,4|@1|^#output_escapes,4|@1|^#only_seen_white,5|@1|^#lineno,445|@1|0@5@18@3@0#timebuf,}!
 3 f0 (1715|$#,)!
 3 f2 (1715|$#,)!
-3 f0 (10555|$#,)!
-3 f5 (10555|$#,)!
+3 f0 (10549|$#,)!
+3 f5 (10549|$#,)!
 3 f0 (1715|@7|$#,)!
 3 f63 (1715|@7|$#,)!
 3 f0 (1715|$#,)!
@@ -10604,20 +10598,20 @@
 3 f1 (1715|@7|15@0@1&#,63|$#,)!
 3 f0 (1715|15@0@1&#,)!
 3 f19 (1715|15@0@1&#,)!
-3 f10583 (1715|15@0@1&#,)!
+3 f10577 (1715|15@0@1&#,)!
 3 f0 (1715|15@0@1&#,)!
 3 f19 (1715|15@0@1&#,)!
-3 f10555 (1715|15@0@1&#,)!
-3 f0 (10555|$#,)!
-3 f19 (10555|$#,)!
-3 f10555 (10555|$#,)!
+3 f10549 (1715|15@0@1&#,)!
+3 f0 (10549|$#,)!
+3 f19 (10549|$#,)!
+3 f10549 (10549|$#,)!
 3 f0 (1715|15@0@1&#,)!
 3 f19 (1715|15@0@1&#,)!
-3 f10555 (1715|15@0@1&#,)!
-1 t10580|10580&
+3 f10549 (1715|15@0@1&#,)!
+1 t10574|10574&
 3 e!229{DUMP_NONE,DUMP_NAMES,DUMP_DEFINITIONS}!
 0 s7500|&
-3 ScppOptions{1211|@1|0@5@18&#in_fname,1211|@1|0@5@18&#out_fname,10612|@1|0@0@3&#map_list,2|@1|^#verbose,2|@1|^#cplusplus,2|@1|^#cplusplus_comments,5|@1|^#lang_asm,2|@1|^#for_lint,2|@1|^#chill,2|@1|^#put_out_comments,2|@1|^#no_trigraphs,2|@1|^#print_include_names,2|@1|^#pedantic_errors,2|@1|^#warn_comments,2|@1|^#warn_stringify,2|@1|^#warnings_are_errors,2|@1|^#no_output,2|@1|^#no_line_commands,4|@1|^#output_conditionals,4|@1|^#ignore_srcdir,2|@1|^#dollars_in_ident,2|@1|^#traditional,2|@1|^#c89,2|@1|^#pedantic,2|@1|^#done_initializing,10575|@1|0@0@17&#include,10575|@1|0@0@18&#first_bracket_include,10575|@1|0@0@18&#first_system_include,10575|@1|0@0@18@2@0#last_include,10575|@1|0@0@3&#after_include,10575|@1|0@0@18@2@0#last_after_include,10575|@1|0@0@3&#before_system,10575|@1|0@0@18@2@0#last_before_system,23|@1|0@0@3&#include_prefix,4|@1|^#inhibit_predefs,4|@1|^#no_standard_includes,4|@1|^#no_standard_cplusplus_includes,10614|@1|^#dump_macros,5|@1|^#debug_output,}!
+3 ScppOptions{1211|@1|0@5@18&#in_fname,1211|@1|0@5@18&#out_fname,10606|@1|0@0@3&#map_list,2|@1|^#verbose,2|@1|^#cplusplus,2|@1|^#cplusplus_comments,5|@1|^#lang_asm,2|@1|^#for_lint,2|@1|^#chill,2|@1|^#put_out_comments,2|@1|^#no_trigraphs,2|@1|^#print_include_names,2|@1|^#pedantic_errors,2|@1|^#warn_comments,2|@1|^#warn_stringify,2|@1|^#warnings_are_errors,2|@1|^#no_output,2|@1|^#no_line_commands,4|@1|^#output_conditionals,4|@1|^#ignore_srcdir,2|@1|^#dollars_in_ident,2|@1|^#traditional,2|@1|^#c89,2|@1|^#pedantic,2|@1|^#done_initializing,10569|@1|0@0@17&#include,10569|@1|0@0@18&#first_bracket_include,10569|@1|0@0@18&#first_system_include,10569|@1|0@0@18@2@0#last_include,10569|@1|0@0@3&#after_include,10569|@1|0@0@18@2@0#last_after_include,10569|@1|0@0@3&#before_system,10569|@1|0@0@18@2@0#last_before_system,23|@1|0@0@3&#include_prefix,4|@1|^#inhibit_predefs,4|@1|^#no_standard_includes,4|@1|^#no_standard_cplusplus_includes,10608|@1|^#dump_macros,5|@1|^#debug_output,}!
 3 f0 (1715|15@0@1&#,)!
 3 f2 (1715|15@0@1&#,)!
 3 f0 (1715|$#,)!
@@ -10626,45 +10620,45 @@
 0 s7535|&
 0 s7536|&
 0 s7537|&
-0 s7538|-1 10625 -1
-1 t10624|10624&
-3 Smacrodef{10625|@1|0@5@3&#defn,23|@1|0@3@18&#symnam,5|@1|^#symlen,}!
-0 s7539|-1 10674 -1
-0 s7540|-1 10629 -1
-1 t10628|10628 11240 -1
-3 Sreflist{10629|@1|0@5@18&#next,2|@1|^#stringify,2|@1|^#raw_before,2|@1|^#raw_after,2|@1|^#rest_args,5|@1|^#nchars,5|@1|^#argno,}!
+0 s7538|-1 10619 -1
+1 t10618|10618&
+3 Smacrodef{10619|@1|0@5@3&#defn,23|@1|0@3@18&#symnam,5|@1|^#symlen,}!
+0 s7539|-1 10668 -1
+0 s7540|-1 10623 -1
+1 t10622|10622 11232 -1
+3 Sreflist{10623|@1|0@5@18&#next,2|@1|^#stringify,2|@1|^#raw_before,2|@1|^#raw_after,2|@1|^#rest_args,5|@1|^#nchars,5|@1|^#argno,}!
 3 U!230{23|@1|0@5@3&#argnames,}!
 0 s7541|&
-3 Sdefinition{5|@1|^#nargs,63|@1|^#length,2|@1|^#predefined,23|@1|0@0@18&#expansion,9|@1|^#line,1211|@1|0@5@18@2@0#file,2|@1|^#noExpand,2|@1|^#rest_args,10629|@1|0@5@3&#pattern,10631|@1|^#args,}!
-3 Sif_stack{10577|@1|0@5@3&#next,1211|@1|0@5@18@3@0#fname,5|@1|^#lineno,5|@1|^#if_succeeded,23|@1|0@5@18&#control_macro,10621|@1|^#type,}!
-0 s7542|-1 11103 -1
-3 f0 (10555|0@5@7&#,24|4@0@7&#,24|4@5@7&#,)!
-3 f1 (10555|0@5@7&#,24|4@0@7&#,24|4@5@7&#,)!
+3 Sdefinition{5|@1|^#nargs,63|@1|^#length,2|@1|^#predefined,23|@1|0@0@18&#expansion,9|@1|^#line,1211|@1|0@5@18@2@0#file,2|@1|^#noExpand,2|@1|^#rest_args,10623|@1|0@5@3&#pattern,10625|@1|^#args,}!
+3 Sif_stack{10571|@1|0@5@3&#next,1211|@1|0@5@18@3@0#fname,5|@1|^#lineno,5|@1|^#if_succeeded,23|@1|0@5@18&#control_macro,10615|@1|^#type,}!
+0 s7542|-1 11095 -1
+3 f0 (10549|0@5@7&#,24|4@0@7&#,24|4@5@7&#,)!
+3 f1 (10549|0@5@7&#,24|4@0@7&#,24|4@5@7&#,)!
 3 f0 (1715|$#,)!
 3 f19 (1715|$#,)!
-3 f10555 (1715|$#,)!
+3 f10549 (1715|$#,)!
 3 f0 (1715|$#,63|$#,)!
 3 f1 (1715|$#,63|$#,)!
 3 f0 (1715|$#,315|$#,)!
 3 f5 (1715|$#,315|$#,)!
 3 f0 (1715|$#,)!
 3 f19 (1715|$#,)!
-3 f10555 (1715|$#,)!
+3 f10549 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
-0 s7551|-1 10651 -1
-1 t10650|10650&
-3 Sfile_name_list{10575|@1|0@5@17&#next,1211|@1|0@5@18&#fname,23|@1|0@5@18&#control_macro,2|@1|^#c_system_include_path,10651|@1|11@3@18@2@0#name_map,2|@1|^#got_name_map,}!
-3 f0 (1715|15@0@1&#,10575|0@0@4&#,)!
-3 f1 (1715|15@0@1&#,10575|0@0@4&#,)!
+0 s7551|-1 10645 -1
+1 t10644|10644&
+3 Sfile_name_list{10569|@1|0@5@17&#next,1211|@1|0@5@18&#fname,23|@1|0@5@18&#control_macro,2|@1|^#c_system_include_path,10645|@1|11@3@18@2@0#name_map,2|@1|^#got_name_map,}!
+3 f0 (1715|15@0@1&#,10569|0@0@4&#,)!
+3 f1 (1715|15@0@1&#,10569|0@0@4&#,)!
 3 f0 (1715|$#,23|$#,)!
 3 f1 (1715|$#,23|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 3 f0 (1715|4@0@7&#,)!
 3 f1 (1715|4@0@7&#,)!
-3 f0 (10583|4@0@7&#,)!
-3 f1 (10583|4@0@7&#,)!
+3 f0 (10577|4@0@7&#,)!
+3 f1 (10577|4@0@7&#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 3 f0 (1715|$#,1211|0@5@7&#,)!
@@ -10673,19 +10667,19 @@
 3 f2 (4|$#,)!
 3 f0 (1715|$#,23|$#,1211|0@5@7&#,)!
 3 f5 (1715|$#,23|$#,1211|0@5@7&#,)!
-0 s7562|-1 11215 -1
+0 s7562|-1 11207 -1
 3 f0 (1715|$#,23|$#,5|$#,)!
-3 f10671 (1715|$#,23|$#,5|$#,)!
-1 t10627|10627&
-3 Uu_hashvalue{5|@1|^#ival,23|@1|0@0@17&#cpval,10674|@1|0@0@17&#defn,}!
+3 f10665 (1715|$#,23|$#,5|$#,)!
+1 t10621|10621&
+3 Uu_hashvalue{5|@1|^#ival,23|@1|0@0@17&#cpval,10668|@1|0@0@17&#defn,}!
 0 s7565|&
 0 s7566|&
 1 t1053|1053&
-3 Ss_hashNode{1053|@1|0@5@2&#next,1053|@1|0@5@18&#prev,10678|@1|0@5@18&#bucket_hdr,10621|@1|^#type,5|@1|^#length,1211|@1|0@5@3&#name,10677|@1|^#value,}!
+3 Ss_hashNode{1053|@1|0@5@2&#next,1053|@1|0@5@18&#prev,10672|@1|0@5@18&#bucket_hdr,10615|@1|^#type,5|@1|^#length,1211|@1|0@5@3&#name,10671|@1|^#value,}!
 3 f0 (1053|0@0@19@2@0#,)!
 3 f1 (1053|0@0@19@2@0#,)!
-3 f0 (23|$#,5|$#,10621|$#,5|$#,23|0@5@2&#,5|$#,)!
-3 f1053 (23|$#,5|$#,10621|$#,5|$#,23|0@5@2&#,5|$#,)!
+3 f0 (23|$#,5|$#,10615|$#,5|$#,23|0@5@2&#,5|$#,)!
+3 f1053 (23|$#,5|$#,10615|$#,5|$#,23|0@5@2&#,5|$#,)!
 3 f0 ()!
 3 f1 ()!
 3 f0 (23|$#,5|$#,5|$#,)!
@@ -10698,8 +10692,8 @@
 3 f1 ()!
 3 f0 (23|$#,5|$#,5|$#,)!
 3 f5 (23|$#,5|$#,5|$#,)!
-3 f0 (23|$#,5|$#,10625|0@0@2&#,5|$#,)!
-3 f1053 (23|$#,5|$#,10625|0@0@2&#,5|$#,)!
+3 f0 (23|$#,5|$#,10619|0@0@2&#,5|$#,)!
+3 f1053 (23|$#,5|$#,10619|0@0@2&#,5|$#,)!
 3 f0 (1715|$#,1211|0@5@2&#,)!
 3 f1 (1715|$#,1211|0@5@2&#,)!
 3 f0 (1715|$#,1211|0@5@7&#,)!
@@ -10769,15 +10763,15 @@
 3 f0 (1211|0@5@7&#,)!
 3 f1211 (1211|0@5@7&#,)!
 3 f0 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
-3 f10763 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
+3 f10757 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
 3 f0 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
-3 f10763 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
+3 f10757 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
 3 f0 (1211|0@5@7&#,)!
 3 f2 (1211|0@5@7&#,)!
 3 f0 (1211|0@5@7&#,1211|@5|0@5@7&#,)!
 3 f1211 (1211|0@5@7&#,1211|@5|0@5@7&#,)!
 3 f0 (1211|0@5@7&#,1383|4@0@7&#,)!
-3 f10763 (1211|0@5@7&#,1383|4@0@7&#,)!
+3 f10757 (1211|0@5@7&#,1383|4@0@7&#,)!
 3 f0 ()!
 3 f1211 ()!
 3 f0 (1211|0@5@7&#,)!
@@ -10800,8 +10794,8 @@
 3 f5 (23|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
-3 f0 (1715|$#,10561|$#,)!
-3 f1698 (1715|$#,10561|$#,)!
+3 f0 (1715|$#,10555|$#,)!
+3 f1698 (1715|$#,10555|$#,)!
 3 f0 (1715|$#,23|$#,)!
 3 f2 (1715|$#,23|$#,)!
 3 f0 (1211|0@5@7&#,)!
@@ -10816,11 +10810,11 @@
 2 F2/256|2&
 3 f0 (1715|15@0@1&#,)!
 3 f19 (1715|15@0@1&#,)!
-3 f10555 (1715|15@0@1&#,)!
+3 f10549 (1715|15@0@1&#,)!
 3 f0 (1715|$#,5|$#,)!
 3 f5 (1715|$#,5|$#,)!
-3 f0 (10555|@7|$#,)!
-3 f5 (10555|@7|$#,)!
+3 f0 (10549|@7|$#,)!
+3 f5 (10549|@7|$#,)!
 3 f0 (1715|@7|$#,23|$#,63|@7|$#,)!
 3 f1 (1715|@7|$#,23|$#,63|@7|$#,)!
 3 f0 (1715|$#,4|$#,)!
@@ -10838,64 +10832,64 @@
 3 f0 (1715|$#,)!
 3 f19 (1715|$#,)!
 3 f23 (1715|$#,)!
-3 f0 (10555|$#,5|$#,)!
-3 f1 (10555|$#,5|$#,)!
+3 f0 (10549|$#,5|$#,)!
+3 f1 (10549|$#,5|$#,)!
 3 f0 (1715|$#,5|$#,)!
 3 f1 (1715|$#,5|$#,)!
 3 f0 (1715|$#,)!
 3 f5 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f5 (1715|$#,)!
-3 f0 (10561|4@0@7&#,1715|$#,)!
-3 f1 (10561|4@0@7&#,1715|$#,)!
-3 f0 (10561|$#,)!
-3 f1 (10561|$#,)!
-3 f0 (10561|$#,1715|$#,)!
-3 f1 (10561|$#,1715|$#,)!
-3 f0 (10561|$#,1715|$#,)!
-3 f1 (10561|$#,1715|$#,)!
-3 f0 (10555|@7|$#,)!
-3 f19 (10555|@7|$#,)!
-3 f23 (10555|@7|$#,)!
-3 f0 (1715|$#,23|0@5@17&#,63|$#,)!
-3 f19 (1715|$#,23|0@5@17&#,63|$#,)!
-3 f10555 (1715|$#,23|0@5@17&#,63|$#,)!
-3 f0 (1715|$#,10575|0@0@4&#,10575|0@0@18&#,)!
-3 f1 (1715|$#,10575|0@0@4&#,10575|0@0@18&#,)!
-3 f0 (10555|$#,1715|$#,)!
-3 f1 (10555|$#,1715|$#,)!
-3 f0 (1715|$#,)!
-3 f1698 (1715|$#,)!
+3 f0 (10555|4@0@7&#,1715|$#,)!
+3 f1 (10555|4@0@7&#,1715|$#,)!
+3 f0 (10555|$#,)!
+3 f1 (10555|$#,)!
 3 f0 (10555|$#,1715|$#,)!
 3 f1 (10555|$#,1715|$#,)!
 3 f0 (10555|$#,1715|$#,)!
 3 f1 (10555|$#,1715|$#,)!
+3 f0 (10549|@7|$#,)!
+3 f19 (10549|@7|$#,)!
+3 f23 (10549|@7|$#,)!
+3 f0 (1715|$#,23|0@5@17&#,63|$#,)!
+3 f19 (1715|$#,23|0@5@17&#,63|$#,)!
+3 f10549 (1715|$#,23|0@5@17&#,63|$#,)!
+3 f0 (1715|$#,10569|0@0@4&#,10569|0@0@18&#,)!
+3 f1 (1715|$#,10569|0@0@4&#,10569|0@0@18&#,)!
+3 f0 (10549|$#,1715|$#,)!
+3 f1 (10549|$#,1715|$#,)!
+3 f0 (1715|$#,)!
+3 f1698 (1715|$#,)!
+3 f0 (10549|$#,1715|$#,)!
+3 f1 (10549|$#,1715|$#,)!
+3 f0 (10549|$#,1715|$#,)!
+3 f1 (10549|$#,1715|$#,)!
 3 f0 (1715|$#,)!
 3 f5 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 1 t687|687&
 1 t63|63&
-3 f0 (5|$#,10872|4@0@7&#,10873|4@0@7&#,)!
-3 f5 (5|$#,10872|4@0@7&#,10873|4@0@7&#,)!
+3 f0 (5|$#,10866|4@0@7&#,10867|4@0@7&#,)!
+3 f5 (5|$#,10866|4@0@7&#,10867|4@0@7&#,)!
 3 f0 (5|$#,23|4@0@7&#,5|$#,)!
 3 f5 (5|$#,23|4@0@7&#,5|$#,)!
-3 f0 (10555|0@5@7&#,)!
-3 f2 (10555|0@5@7&#,)!
+3 f0 (10549|0@5@7&#,)!
+3 f2 (10549|0@5@7&#,)!
 3 f0 (1715|$#,23|$#,)!
 3 f1 (1715|$#,23|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
-3 f0 (10738|$#,)!
-3 f1 (10738|$#,)!
+3 f0 (10732|$#,)!
+3 f1 (10732|$#,)!
 3 C1.5/1|!
-3 f0 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10575|0@5@18&#,)!
-3 f5 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10575|0@5@18&#,)!
-3 f10886 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10575|0@5@18&#,)!
+3 f0 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10569|0@5@18&#,)!
+3 f5 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10569|0@5@18&#,)!
+3 f10880 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10569|0@5@18&#,)!
 3 f0 (1715|$#,1211|0@5@7&#,)!
 3 f1 (1715|$#,1211|0@5@7&#,)!
-3 f0 (1715|$#,5|$#,10621|$#,23|0@5@18&#,)!
-3 f1 (1715|$#,5|$#,10621|$#,23|0@5@18&#,)!
+3 f0 (1715|$#,5|$#,10615|$#,23|0@5@18&#,)!
+3 f1 (1715|$#,5|$#,10615|$#,23|0@5@18&#,)!
 3 f0 (1715|$#,23|$#,5|$#,)!
 3 f9 (1715|$#,23|$#,5|$#,)!
 3 f0 (1715|$#,5|$#,)!
@@ -10908,58 +10902,58 @@
 3 f2 (1715|$#,1211|0@5@7&#,)!
 3 f0 (1715|$#,1211|0@5@7&#,)!
 3 f19 (1715|$#,1211|0@5@7&#,)!
-3 f10651 (1715|$#,1211|0@5@7&#,)!
+3 f10645 (1715|$#,1211|0@5@7&#,)!
 3 f0 (5|$#,211|$#,)!
 3 f1211 (5|$#,211|$#,)!
-3 f0 (1715|$#,1211|0@5@17&#,10575|0@5@7&#,)!
-3 f5 (1715|$#,1211|0@5@17&#,10575|0@5@7&#,)!
+3 f0 (1715|$#,1211|0@5@17&#,10569|0@5@7&#,)!
+3 f5 (1715|$#,1211|0@5@17&#,10569|0@5@7&#,)!
 3 f0 (1715|$#,23|0@0@17&#,63|$#,1053|0@0@18&#,)!
 3 f1 (1715|$#,23|0@0@17&#,63|$#,1053|0@0@18&#,)!
 3 efile_change_code{same_file,enter_file,leave_file}!
 0 s7633|&
 3 ?!
-3 f10915 ()!
-3 f5 ()^10918
-1 t10917|10917&
-3 Sdirective{5|@1|^#length,!10918@6@5@1@0@0$$@0#func,1211|@1|0@5@18@3@0#name,10621|@1|^#type,2|@1|^#command_reads_line,2|@1|^#traditional_comments,2|@1|^#pass_thru,}!
-0 s7634|-1 10921 10953
-1 t10920|10920&
-3 f0 (1715|$#,10921|0@5@7&#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|0@5@7&#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|0@5@7&#,23|$#,23|$#,2|$#,)!
-3 f5 (1715|$#,10921|0@5@7&#,23|$#,23|$#,2|$#,)!
-3 f0 (1715|$#,10921|0@5@7&#,)!
-3 f5 (1715|$#,10921|0@5@7&#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
+3 f10909 ()!
+3 f5 ()^10912
+1 t10911|10911&
+3 Sdirective{5|@1|^#length,!10912@6@5@1@0@0$$@0#func,1211|@1|0@5@18@3@0#name,10615|@1|^#type,2|@1|^#command_reads_line,2|@1|^#traditional_comments,2|@1|^#pass_thru,}!
+0 s7634|-1 10915 10947
+1 t10914|10914&
+3 f0 (1715|$#,10915|0@5@7&#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|0@5@7&#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|0@5@7&#,23|$#,23|$#,2|$#,)!
+3 f5 (1715|$#,10915|0@5@7&#,23|$#,23|$#,2|$#,)!
+3 f0 (1715|$#,10915|0@5@7&#,)!
+3 f5 (1715|$#,10915|0@5@7&#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
 3 Sdefault_include{1211|@1|0@5@18@3@0#fname,5|@1|^#cplusplus,5|@1|^#cxx_aware,}!
-0 s7636|-1 11149 10952
-2 y10951|10951&
-2 y10920|10920&
-3 f0 (10575|$#,)!
-3 f1211 (10575|$#,)!
-3 f0 (10738|$#,)!
-3 f1 (10738|$#,)!
+0 s7636|-1 11141 10946
+2 y10945|10945&
+2 y10914|10914&
+3 f0 (10569|$#,)!
+3 f1211 (10569|$#,)!
+3 f0 (10732|$#,)!
+3 f1 (10732|$#,)!
 3 f0 (4|$#,)!
 3 f2 (4|$#,)!
 3 f0 (1715|$#,23|$#,)!
@@ -10968,81 +10962,79 @@
 3 f1 (1715|$#,63|$#,)!
 3 f0 (1715|$#,23|$#,)!
 3 f1 (1715|$#,23|$#,)!
-3 f0 (1715|$#,10575|0@0@4&#,10575|0@0@18&#,)!
-3 f1 (1715|$#,10575|0@0@4&#,10575|0@0@18&#,)!
-3 f0 (1715|$#,)!
-3 f1 (1715|$#,)!
+3 f0 (1715|$#,10569|0@0@4&#,10569|0@0@18&#,)!
+3 f1 (1715|$#,10569|0@0@4&#,10569|0@0@18&#,)!
 3 f0 ()!
 3 f1211 ()!
-3 f0 (1715|15@0@1&#,10575|0@0@4&#,)!
-3 f1 (1715|15@0@1&#,10575|0@0@4&#,)!
+3 f0 (1715|15@0@1&#,10569|0@0@4&#,)!
+3 f1 (1715|15@0@1&#,10569|0@0@4&#,)!
 3 f0 (1715|$#,23|$#,)!
 3 f1 (1715|$#,23|$#,)!
-3 f0 (10583|4@0@7&#,)!
-3 f1 (10583|4@0@7&#,)!
+3 f0 (10577|4@0@7&#,)!
+3 f1 (10577|4@0@7&#,)!
 3 f0 (1715|$#,)!
 3 f1698 (1715|$#,)!
-3 f0 (10555|$#,1715|$#,)!
-3 f1 (10555|$#,1715|$#,)!
-3 f0 (10555|$#,1715|$#,)!
-3 f1 (10555|$#,1715|$#,)!
-3 f0 (10555|$#,1715|$#,)!
-3 f1 (10555|$#,1715|$#,)!
+3 f0 (10549|$#,1715|$#,)!
+3 f1 (10549|$#,1715|$#,)!
+3 f0 (10549|$#,1715|$#,)!
+3 f1 (10549|$#,1715|$#,)!
+3 f0 (10549|$#,1715|$#,)!
+3 f1 (10549|$#,1715|$#,)!
 3 f0 (1715|$#,28|0@5@7&#,)!
 3 f5 (1715|$#,28|0@5@7&#,)!
 3 C1.5/1|!
 3 f0 (1715|$#,)!
 3 f5 (1715|$#,)!
-3 f10988 (1715|$#,)!
-3 f10568 (1715|$#,)!
+3 f10980 (1715|$#,)!
+3 f10562 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f5 (1715|$#,)!
-3 f0 (23|$#,23|$#,1715|$#,10921|$#,)!
-3 f1 (23|$#,23|$#,1715|$#,10921|$#,)!
-3 f0 (1715|$#,23|$#,23|$#,5|$#,10564|0@5@7&#,)!
-3 f19 (1715|$#,23|$#,23|$#,5|$#,10564|0@5@7&#,)!
-3 f10674 (1715|$#,23|$#,23|$#,5|$#,10564|0@5@7&#,)!
+3 f0 (23|$#,23|$#,1715|$#,10915|$#,)!
+3 f1 (23|$#,23|$#,1715|$#,10915|$#,)!
+3 f0 (1715|$#,23|$#,23|$#,5|$#,10558|0@5@7&#,)!
+3 f19 (1715|$#,23|$#,23|$#,5|$#,10558|0@5@7&#,)!
+3 f10668 (1715|$#,23|$#,23|$#,5|$#,10558|0@5@7&#,)!
 3 f0 (23|$#,23|$#,1715|$#,2|$#,2|$#,)!
-3 f10623 (23|$#,23|$#,1715|$#,2|$#,2|$#,)!
+3 f10617 (23|$#,23|$#,1715|$#,2|$#,2|$#,)!
 3 f0 (1715|$#,23|$#,1211|0@5@7&#,)!
 3 f5 (1715|$#,23|$#,1211|0@5@7&#,)!
-3 f0 (10674|$#,10674|$#,)!
-3 f2 (10674|$#,10674|$#,)!
+3 f0 (10668|$#,10668|$#,)!
+3 f2 (10668|$#,10668|$#,)!
 3 f0 (2|$#,23|$#,5|$#,23|$#,5|$#,2|$#,)!
 3 f2 (2|$#,23|$#,5|$#,23|$#,5|$#,2|$#,)!
-3 f0 (1715|$#,10921|0@5@7&#,23|$#,23|$#,2|$#,)!
-3 f5 (1715|$#,10921|0@5@7&#,23|$#,23|$#,2|$#,)!
-3 f0 (1715|$#,10921|0@5@7&#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|0@5@7&#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|0@5@7&#,23|$#,23|$#,2|$#,)!
+3 f5 (1715|$#,10915|0@5@7&#,23|$#,23|$#,2|$#,)!
+3 f0 (1715|$#,10915|0@5@7&#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|0@5@7&#,23|$#,23|$#,)!
 3 Sargdata{9|@1|^#raw,63|@1|^#expanded,63|@1|^#stringified,5|@1|^#raw_length,5|@1|^#expand_length,5|@1|^#stringified_length,2|@1|^#newlines,5|@1|^#use_count,}!
-0 s7637|-1 11063 -1
+0 s7637|-1 11055 -1
 3 f0 (1715|$#,23|$#,63|$#,)!
 3 f19 (1715|$#,23|0@5@17&#,63|$#,)!
-3 f10555 (1715|$#,23|0@5@17&#,63|$#,)!
+3 f10549 (1715|$#,23|0@5@17&#,63|$#,)!
 3 f0 (1715|$#,)!
 3 f19 (1715|$#,)!
-3 f10555 (1715|$#,)!
+3 f10549 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 3 f0 (1715|$#,23|$#,63|$#,)!
 3 f1 (1715|$#,23|$#,63|$#,)!
 3 f0 (23|$#,23|$#,24|$#,24|$#,)!
 3 f1 (23|$#,23|$#,24|$#,24|$#,)!
-3 f0 (10555|$#,)!
-3 f1 (10555|$#,)!
-3 f0 (10555|0@5@7&#,24|4@0@7&#,24|4@5@7&#,)!
-3 f1 (10555|0@5@7&#,24|4@0@7&#,24|4@5@7&#,)!
+3 f0 (10549|$#,)!
+3 f1 (10549|$#,)!
+3 f0 (10549|0@5@7&#,24|4@0@7&#,24|4@5@7&#,)!
+3 f1 (10549|0@5@7&#,24|4@0@7&#,24|4@5@7&#,)!
 3 f0 (1715|$#,)!
 3 f19 (1715|$#,)!
-3 f10555 (1715|$#,)!
+3 f10549 (1715|$#,)!
 3 f0 (23|$#,23|$#,)!
 3 f9 (23|$#,23|$#,)!
-3 f0 (1715|$#,2|$#,10914|$#,)!
-3 f1 (1715|$#,2|$#,10914|$#,)!
+3 f0 (1715|$#,2|$#,10908|$#,)!
+3 f1 (1715|$#,2|$#,10908|$#,)!
 3 f0 (1715|$#,5|$#,)!
 3 f1698 (1715|$#,5|$#,)!
 3 f0 (23|$#,5|$#,)!
@@ -11055,25 +11047,25 @@
 3 f1 (1053|$#,1715|$#,)!
 3 f0 (1715|$#,23|$#,)!
 3 f1 (1715|$#,23|$#,)!
-3 f0 (23|0@0@19@3@0#,1213|$#,5|$#,10621|$#,5|$#,23|0@5@2&#,5|$#,)!
-3 f1 (23|0@0@19@3@0#,1213|$#,5|$#,10621|$#,5|$#,23|0@5@2&#,5|$#,)!
-3 f0 (23|0@0@19@3@0#,1213|$#,5|$#,10621|$#,5|$#,23|0@5@2&#,5|$#,)!
-3 f1 (23|0@0@19@3@0#,1213|$#,5|$#,10621|$#,5|$#,23|0@5@2&#,5|$#,)!
+3 f0 (23|0@0@19@3@0#,1213|$#,5|$#,10615|$#,5|$#,23|0@5@2&#,5|$#,)!
+3 f1 (23|0@0@19@3@0#,1213|$#,5|$#,10615|$#,5|$#,23|0@5@2&#,5|$#,)!
+3 f0 (23|0@0@19@3@0#,1213|$#,5|$#,10615|$#,5|$#,23|0@5@2&#,5|$#,)!
+3 f1 (23|0@0@19@3@0#,1213|$#,5|$#,10615|$#,5|$#,23|0@5@2&#,5|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 3 f0 (4|$#,4|$#,)!
 3 f2 (4|$#,4|$#,)!
 3 f0 (1715|$#,1053|0@0@18&#,)!
 3 f1 (1715|$#,1053|0@0@18&#,)!
-1 t11017|11017&
+1 t11009|11009&
 3 f0 (1715|$#,23|0@0@17&#,63|$#,1053|0@0@18&#,)!
 3 f1 (1715|$#,23|0@0@17&#,63|$#,1053|0@0@18&#,)!
 3 f0 (1715|$#,)!
 3 f1698 (1715|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
 2 F0/1|0&
-2 F10574/1|10574&
+2 F10568/1|10568&
 3 f0 (1715|$#,1211|0@5@7&#,)!
 3 f2 (1715|$#,1211|0@5@7&#,)!
 3 f0 (1715|$#,1211|0@5@7&#,)!
@@ -11081,113 +11073,113 @@
 3 f0 (1715|$#,23|@5|$#,23|$#,23|$#,5|$#,)!
 3 f19 (1715|$#,23|@5|$#,23|$#,23|$#,5|$#,)!
 3 f23 (1715|$#,23|@5|$#,23|$#,23|$#,5|$#,)!
-3 f0 (1715|$#,10921|0@5@7&#,)!
-3 f5 (1715|$#,10921|0@5@7&#,)!
+3 f0 (1715|$#,10915|0@5@7&#,)!
+3 f5 (1715|$#,10915|0@5@7&#,)!
 2 F0/0|0&
 2 F1053/0|1053&
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
 3 f0 (1715|$#,23|$#,5|$#,)!
 3 f9 (1715|$#,23|$#,5|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,5|$#,10621|$#,23|0@5@18&#,)!
-3 f1 (1715|$#,5|$#,10621|$#,23|0@5@18&#,)!
-1 t10635|10635&
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,5|$#,10615|$#,23|0@5@18&#,)!
+3 f1 (1715|$#,5|$#,10615|$#,23|0@5@18&#,)!
+1 t10629|10629&
 3 f0 (1715|$#,5|$#,)!
 3 f1 (1715|$#,5|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f0 (1715|$#,10921|$#,23|$#,23|$#,)!
-3 f5 (1715|$#,10921|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f0 (1715|$#,10915|$#,23|$#,23|$#,)!
+3 f5 (1715|$#,10915|$#,23|$#,23|$#,)!
 3 f0 (1715|$#,1211|0@5@7&#,)!
 3 f1 (1715|$#,1211|0@5@7&#,)!
 3 f0 (1715|$#,)!
 3 f1698 (1715|$#,)!
 3 f0 (1715|$#,5|$#,)!
 3 f1 (1715|$#,5|$#,)!
-3 Sfile_name_map{10651|@1|0@0@3&#map_next,1211|@1|0@5@3&#map_from,1211|@1|0@5@3&#map_to,}!
+3 Sfile_name_map{10645|@1|0@0@3&#map_next,1211|@1|0@5@3&#map_from,1211|@1|0@5@3&#map_to,}!
 3 f0 (5|$#,211|$#,)!
 3 f1211 (5|$#,211|$#,)!
-3 Sfile_name_map_list{10612|@1|0@0@3&#map_list_next,1211|@1|0@5@3&#map_list_name,10651|@1|0@0@3&#map_list_map,}!
+3 Sfile_name_map_list{10606|@1|0@0@3&#map_list_next,1211|@1|0@5@3&#map_list_name,10645|@1|0@0@3&#map_list_map,}!
 3 f0 (1715|$#,1211|0@5@7&#,)!
 3 f19 (1715|$#,1211|0@5@7&#,)!
-3 f10651 (1715|$#,1211|0@5@7&#,)!
-3 f0 (1715|$#,1211|0@5@17&#,10575|0@5@7&#,)!
-3 f5 (1715|$#,1211|0@5@17&#,10575|0@5@7&#,)!
-3 f0 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10575|0@5@18&#,)!
-3 f5 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10575|0@5@18&#,)!
-3 f10886 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10575|0@5@18&#,)!
+3 f10645 (1715|$#,1211|0@5@7&#,)!
+3 f0 (1715|$#,1211|0@5@17&#,10569|0@5@7&#,)!
+3 f5 (1715|$#,1211|0@5@17&#,10569|0@5@7&#,)!
+3 f0 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10569|0@5@18&#,)!
+3 f5 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10569|0@5@18&#,)!
+3 f10880 (1715|$#,5|$#,1211|0@5@7&#,2|$#,10569|0@5@18&#,)!
 3 f0 (1715|4@0@7&#,)!
 3 f1 (1715|4@0@7&#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
-3 f0 (5|$#,10872|4@0@7&#,10873|4@0@7&#,)!
-3 f5 (5|$#,10872|4@0@7&#,10873|4@0@7&#,)!
+3 f0 (5|$#,10866|4@0@7&#,10867|4@0@7&#,)!
+3 f5 (5|$#,10866|4@0@7&#,10867|4@0@7&#,)!
 3 f0 (5|$#,23|4@0@7&#,5|$#,)!
 3 f5 (5|$#,23|4@0@7&#,5|$#,)!
-3 f0 (10561|4@0@7&#,1715|$#,)!
-3 f1 (10561|4@0@7&#,1715|$#,)!
-3 f0 (10561|$#,)!
-3 f1 (10561|$#,)!
-1 t10561|10561&
-3 f0 (10561|$#,1715|$#,)!
-3 f1 (10561|$#,1715|$#,)!
-3 f0 (10561|$#,1715|$#,)!
-3 f1 (10561|$#,1715|$#,)!
+3 f0 (10555|4@0@7&#,1715|$#,)!
+3 f1 (10555|4@0@7&#,1715|$#,)!
+3 f0 (10555|$#,)!
+3 f1 (10555|$#,)!
+1 t10555|10555&
+3 f0 (10555|$#,1715|$#,)!
+3 f1 (10555|$#,1715|$#,)!
+3 f0 (10555|$#,1715|$#,)!
+3 f1 (10555|$#,1715|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
-1 t10951|10951&
+1 t10945|10945&
 3 f0 (1715|$#,1211|0@5@7&#,)!
 3 f5 (1715|$#,1211|0@5@7&#,)!
 3 f0 (1715|$#,)!
 3 f19 (1715|15@0@1&#,)!
-3 f10555 (1715|15@0@1&#,)!
+3 f10549 (1715|15@0@1&#,)!
 3 f0 (1715|$#,)!
 3 f19 (1715|15@0@1&#,)!
-3 f10555 (1715|15@0@1&#,)!
-3 f0 (10555|$#,)!
-3 f19 (10555|@7|$#,)!
-3 f23 (10555|@7|$#,)!
-3 f0 (10555|$#,)!
-3 f5 (10555|$#,)!
-3 f0 (10555|0@5@7&#,)!
-3 f2 (10555|0@5@7&#,)!
+3 f10549 (1715|15@0@1&#,)!
+3 f0 (10549|$#,)!
+3 f19 (10549|@7|$#,)!
+3 f23 (10549|@7|$#,)!
+3 f0 (10549|$#,)!
+3 f5 (10549|$#,)!
+3 f0 (10549|0@5@7&#,)!
+3 f2 (10549|0@5@7&#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 3 f0 (1715|$#,23|$#,)!
 3 f2 (1715|$#,23|$#,)!
-3 f0 (1715|$#,10561|$#,)!
-3 f1698 (1715|$#,10561|$#,)!
+3 f0 (1715|$#,10555|$#,)!
+3 f1698 (1715|$#,10555|$#,)!
 3 f0 (23|$#,)!
 3 f5 (23|$#,)!
 3 f0 (1211|0@5@7&#,)!
 3 f2 (1211|0@5@7&#,)!
 3 f0 (1715|$#,5|$#,)!
 3 f5 (1715|$#,5|$#,)!
-3 f0 (10555|$#,)!
-3 f19 (10555|$#,)!
-3 f10555 (10555|$#,)!
-3 f0 (10555|$#,5|$#,)!
-3 f1 (10555|$#,5|$#,)!
+3 f0 (10549|$#,)!
+3 f19 (10549|$#,)!
+3 f10549 (10549|$#,)!
+3 f0 (10549|$#,5|$#,)!
+3 f1 (10549|$#,5|$#,)!
 3 f0 (5|@7|$#,5|$#,5|$#,)!
 3 f2 (5|@7|$#,5|$#,5|$#,)!
 3 f0 (1715|$#,)!
-3 f10671 (1715|$#,)!
+3 f10665 (1715|$#,)!
 3 f0 (1715|$#,)!
 3 f1 (1715|$#,)!
 3 f0 (1715|$#,9|$#,2|$#,63|$#,)!
@@ -11196,13 +11188,13 @@
 3 f9 (9|$#,2|$#,10|$#,)!
 3 Soperation{7|@1|^#op,4|@1|11@0@0&#rprio,4|@1|11@0@0&#flags,2|@1|11@0@0&#unsignedp,9|@1|11@0@0&#value,}!
 3 f0 (1715|$#,23|$#,5|$#,)!
-3 f10671 (1715|$#,23|$#,5|$#,)!
+3 f10665 (1715|$#,23|$#,5|$#,)!
 3 Stoken{23|@1|0@5@18@3@0#operator,5|@1|^#token,}!
-0 s7674|-1 11200 11197
-2 y11196|11196&
+0 s7674|-1 11192 11189
+2 y11188|11188&
 3 f0 (1715|$#,)!
-3 f10671 (1715|$#,)!
-1 t11196|11196&
+3 f10665 (1715|$#,)!
+1 t11188|11188&
 2 F0/0|0&
 2 F4/0|4&
 3 f0 (1715|$#,315|$#,)!
@@ -11216,33 +11208,33 @@
 3 f0 (1715|$#,)!
 3 f9 (1715|$#,)!
 2 F0/0|0&
-2 F10671/0|10671&
-1 t10671|10671&
-0 s7691|-1 11233 -1
-0 s7692|-1 11228 -1
+2 F10665/0|10665&
+1 t10665|10665&
+0 s7691|-1 11225 -1
+0 s7692|-1 11220 -1
 2 F0/0|0&
-2 F11216/0|11216&
+2 F11208/0|11208&
 2 F0/0|0&
-2 F11216/0|11216&
+2 F11208/0|11208&
 3 f0 (1053|0@5@2&#,)!
 3 f1 (1053|0@5@2&#,)!
 3 f0 (6|$#,4|$#,)!
 3 f6 (6|$#,4|$#,)!
 3 f0 (6|$#,)!
 3 f6 (6|$#,)!
-1 t11217|11217&
-3 f0 (1053|0@5@7&#,11228|0@5@18&#,1053|15@5@18&#,)!
-3 f1053 (1053|0@5@7&#,11228|0@5@18&#,1053|15@5@18&#,)!
+1 t11209|11209&
+3 f0 (1053|0@5@7&#,11220|0@5@18&#,1053|15@5@18&#,)!
+3 f1053 (1053|0@5@7&#,11220|0@5@18&#,1053|15@5@18&#,)!
 3 f0 ()!
 3 f1 ()!
-1 t11216|11216&
+1 t11208|11208&
 3 f0 ()!
 3 f1 ()!
 3 f0 (1053|0@5@2&#,)!
 3 f1 (1053|0@5@2&#,)!
-3 f0 (1053|0@5@7&#,10678|0@5@18&#,1053|15@5@18&#,)!
-3 f1053 (1053|0@5@7&#,10678|0@5@18&#,1053|15@5@18&#,)!
-1 t10629|10629&
+3 f0 (1053|0@5@7&#,10672|0@5@18&#,1053|15@5@18&#,)!
+3 f1053 (1053|0@5@7&#,10672|0@5@18&#,1053|15@5@18&#,)!
+1 t10623|10623&
 3 f0 (23|$#,5|$#,5|$#,)!
 3 f5 (23|$#,5|$#,5|$#,)!
 3 f0 (23|$#,5|$#,5|$#,)!
@@ -11251,10 +11243,10 @@
 3 f1053 (23|$#,5|$#,5|$#,)!
 3 f0 (1053|0@0@19@2@0#,)!
 3 f1 (1053|0@0@19@2@0#,)!
-3 f0 (23|$#,5|$#,10621|$#,5|$#,23|0@5@2&#,5|$#,)!
-3 f1053 (23|$#,5|$#,10621|$#,5|$#,23|0@5@2&#,5|$#,)!
-3 f0 (23|$#,5|$#,10625|0@0@2&#,5|$#,)!
-3 f1053 (23|$#,5|$#,10625|0@0@2&#,5|$#,)!
+3 f0 (23|$#,5|$#,10615|$#,5|$#,23|0@5@2&#,5|$#,)!
+3 f1053 (23|$#,5|$#,10615|$#,5|$#,23|0@5@2&#,5|$#,)!
+3 f0 (23|$#,5|$#,10619|0@0@2&#,5|$#,)!
+3 f1053 (23|$#,5|$#,10619|0@0@2&#,5|$#,)!
 3 f0 ()!
 3 f1 ()!
 3 f0 (1715|$#,)!
@@ -12235,359 +12227,359 @@
 3 f1 (1050|0@5@7&#,1050|0@5@7&#,)!
 3 f0 (1213|$#,)!
 3 f1 (1213|$#,)!
-0 s7712|-1 12234 -1
-1 t12233|12233&
+0 s7712|-1 12226 -1
+1 t12225|12225&
 0 a7713|&
-3 S!232{5336|@1|^#kind,12235|@1|0@5@3&#ctbase,1213|@1|^#base,1213|@1|^#ptr,1213|@1|^#array,1211|@1|0@5@3&#unparse,}^12238
+3 S!232{5336|@1|^#kind,12227|@1|0@5@3&#ctbase,1213|@1|^#base,1213|@1|^#ptr,1213|@1|^#array,1211|@1|0@5@3&#unparse,}^12230
 0 s7714|&
-1 t12236|12236&
-0 s7715|-1 12598 -1
-0 s7716|-1 12241 -1
-1 t12240|12240&
-3 S!233{5|@1|^#size,5|@1|^#nspace,12241|@1|0@3@2&#entries,}!
+1 t12228|12228&
+0 s7715|-1 12590 -1
+0 s7716|-1 12233 -1
+1 t12232|12232&
+3 S!233{5|@1|^#size,5|@1|^#nspace,12233|@1|0@3@2&#entries,}!
 0 s7717|&
 0 s7718|&
-3 f0 (12239|@7|$#,)!
-3 f2 (12239|@7|$#,)!
+3 f0 (12231|@7|$#,)!
+3 f2 (12231|@7|$#,)!
 3 f0 (4799|$#,)!
-3 f12235 (4799|$#,)!
-3 f0 (12239|$#,)!
-3 f1211 (12239|$#,)!
-3 f0 (5336|$#,12235|0@5@4&#,1213|$#,1213|$#,1213|$#,1211|0@5@4&#,)!
-3 f12239 (5336|$#,12235|0@5@4&#,1213|$#,1213|$#,1213|$#,1211|0@5@4&#,)!
-3 f0 (5336|$#,12235|0@5@2&#,)!
-3 f12239 (5336|$#,12235|0@5@2&#,)!
-3 f0 (12239|$#,)!
-3 f1211 (12239|$#,)!
-3 f0 ()!
-3 f1 ()!
-3 f0 (5336|$#,12235|0@5@4&#,1213|$#,)!
-3 f1213 (5336|$#,12235|0@5@4&#,1213|$#,)!
-3 f0 (12239|0@0@4&#,)!
-3 f1213 (12239|0@0@4&#,)!
-3 f0 (12239|$#,)!
-3 f2 (12239|$#,)!
+3 f12227 (4799|$#,)!
+3 f0 (12231|$#,)!
+3 f1211 (12231|$#,)!
+3 f0 (5336|$#,12227|0@5@4&#,1213|$#,1213|$#,1213|$#,1211|0@5@4&#,)!
+3 f12231 (5336|$#,12227|0@5@4&#,1213|$#,1213|$#,1213|$#,1211|0@5@4&#,)!
+3 f0 (5336|$#,12227|0@5@2&#,)!
+3 f12231 (5336|$#,12227|0@5@2&#,)!
+3 f0 (12231|$#,)!
+3 f1211 (12231|$#,)!
+3 f0 ()!
+3 f1 ()!
+3 f0 (5336|$#,12227|0@5@4&#,1213|$#,)!
+3 f1213 (5336|$#,12227|0@5@4&#,1213|$#,)!
+3 f0 (12231|0@0@4&#,)!
+3 f1213 (12231|0@0@4&#,)!
+3 f0 (12231|$#,)!
+3 f2 (12231|$#,)!
 3 f0 (1213|$#,9|$#,)!
-3 f12235 (1213|$#,9|$#,)!
-3 f0 (12235|0@2@2&#,)!
-3 f1213 (12235|0@2@2&#,)!
+3 f12227 (1213|$#,9|$#,)!
+3 f0 (12227|0@2@2&#,)!
+3 f1213 (12227|0@2@2&#,)!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
+3 f12227 (1213|$#,)!
 3 f0 (1213|$#,1213|$#,2|$#,)!
 3 f1213 (1213|$#,1213|$#,2|$#,)!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
+3 f12227 (1213|$#,)!
 3 f0 (1213|$#,)!
-3 f12239 (1213|$#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f12235 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@18&#,)!
-3 f2 (12235|0@2@18&#,)!
-3 f0 (12235|0@2@18&#,)!
-3 f2 (12235|0@2@18&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f4476 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f1211 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f1211 (12235|0@5@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f12235 (12235|0@2@7&#,)!
-3 f0 (12235|0@5@2&#,)!
-3 f1 (12235|0@5@2&#,)!
+3 f12231 (1213|$#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f12227 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@18&#,)!
+3 f2 (12227|0@2@18&#,)!
+3 f0 (12227|0@2@18&#,)!
+3 f2 (12227|0@2@18&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f4476 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f1211 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f1211 (12227|0@5@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f12227 (12227|0@2@7&#,)!
+3 f0 (12227|0@5@2&#,)!
+3 f1 (12227|0@5@2&#,)!
 3 f0 (4341|$#,)!
-3 f12235 (4341|$#,)!
+3 f12227 (4341|$#,)!
 3 f0 ()!
-3 f12235 ()!
+3 f12227 ()!
 3 f0 ()!
-3 f12235 ()!
+3 f12227 ()!
 3 f0 (4799|$#,)!
-3 f12235 (4799|$#,)!
+3 f12227 (4799|$#,)!
 3 f0 (1211|0@5@2&#,4866|0@5@2&#,)!
-3 f12235 (1211|0@5@2&#,4866|0@5@2&#,)!
+3 f12227 (1211|0@5@2&#,4866|0@5@2&#,)!
 3 f0 (1211|0@5@4&#,4866|0@5@2&#,)!
-3 f12235 (1211|0@5@4&#,4866|0@5@2&#,)!
+3 f12227 (1211|0@5@4&#,4866|0@5@2&#,)!
 3 f0 (1211|0@5@4&#,4476|0@0@4&#,)!
-3 f12235 (1211|0@5@4&#,4476|0@0@4&#,)!
-3 f0 ()!
-3 f12235 ()!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,2|$#,2|$#,2|$#,2|$#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,2|$#,2|$#,2|$#,2|$#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f2 (12235|0@2@7&#,)!
+3 f12227 (1211|0@5@4&#,4476|0@0@4&#,)!
+3 f0 ()!
+3 f12227 ()!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,2|$#,2|$#,2|$#,2|$#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,2|$#,2|$#,2|$#,2|$#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f2 (12227|0@2@7&#,)!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
+3 f12227 (1213|$#,)!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
+3 f12227 (1213|$#,)!
 3 f0 (1213|$#,4866|0@5@2&#,)!
 3 f1213 (1213|$#,4866|0@5@2&#,)!
-3 f0 (12235|0@2@18&#,)!
-3 f12235 (12235|0@2@18&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1213 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1213 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f4866 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f4866 (12235|0@2@7&#,)!
+3 f0 (12227|0@2@18&#,)!
+3 f12227 (12227|0@2@18&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1213 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1213 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f4866 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f4866 (12227|0@2@7&#,)!
 3 f0 (1213|$#,1213|$#,)!
 3 f1213 (1213|$#,1213|$#,)!
 3 f0 (1213|$#,1213|$#,)!
 3 f1213 (1213|$#,1213|$#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f2 (12235|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f2 (12227|0@2@7&#,)!
 3 f0 ()!
 3 f5 ()!
-3 S!234{1213|@1|^#rval,4866|@1|0@5@2&#params,}^12343
+3 S!234{1213|@1|^#rval,4866|@1|0@5@2&#params,}^12335
 0 s7719|&
-1 t12341|12341&
+1 t12333|12333&
 0 s7720|&
-3 S!235{1211|@1|0@5@3&#name,4866|@1|0@5@3&#fields,}^12347
+3 S!235{1211|@1|0@5@3&#name,4866|@1|0@5@3&#fields,}^12339
 0 s7721|&
-1 t12345|12345&
+1 t12337|12337&
 0 s7722|&
-3 S!236{1213|@1|^#a,1213|@1|^#b,2|@1|^#isExplicit,}^12351
+3 S!236{1213|@1|^#a,1213|@1|^#b,2|@1|^#isExplicit,}^12343
 0 s7723|&
-1 t12349|12349&
+1 t12341|12341&
 0 s7724|&
-3 S!237{1211|@1|0@5@3&#tag,4476|@1|0@0@3&#members,}^12355
+3 S!237{1211|@1|0@5@3&#tag,4476|@1|0@0@3&#members,}^12347
 0 s7725|&
-1 t12353|12353&
+1 t12345|12345&
 0 s7726|&
-3 S!238{1213|@1|^#base,9|@1|^#size,}^12359
+3 S!238{1213|@1|^#base,9|@1|^#size,}^12351
 0 s7727|&
-1 t12357|12357&
+1 t12349|12349&
 0 s7728|&
-3 U!239{4341|@1|^#prim,4799|@1|^#tid,1213|@1|^#base,12344|@1|0@0@3&#fcn,12348|@1|0@0@3&#su,12356|@1|0@0@3&#cenum,12352|@1|0@0@3&#conj,12360|@1|0@0@3&#farray,}!
+3 U!239{4341|@1|^#prim,4799|@1|^#tid,1213|@1|^#base,12336|@1|0@0@3&#fcn,12340|@1|0@0@3&#su,12348|@1|0@0@3&#cenum,12344|@1|0@0@3&#conj,12352|@1|0@0@3&#farray,}!
 0 s7729|&
 0 s7730|&
-3 Ss_ctbase{5333|@1|^#type,12363|@1|^#contents,}!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f4799 (12235|0@5@7&#,)!
-3 f0 (12235|0@2@7&#,5333|$#,)!
-3 f2 (12235|0@2@7&#,5333|$#,)!
-3 f0 (12235|0@2@7&#,5333|$#,5333|$#,)!
-3 f2 (12235|0@2@7&#,5333|$#,5333|$#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f12235 (12235|0@2@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
+3 Ss_ctbase{5333|@1|^#type,12355|@1|^#contents,}!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f4799 (12227|0@5@7&#,)!
+3 f0 (12227|0@2@7&#,5333|$#,)!
+3 f2 (12227|0@2@7&#,5333|$#,)!
+3 f0 (12227|0@2@7&#,5333|$#,5333|$#,)!
+3 f2 (12227|0@2@7&#,5333|$#,5333|$#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f12227 (12227|0@2@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
 3 f0 (1213|$#,)!
 3 f5336 (1213|$#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
 3 f0 (5333|$#,)!
 3 f2 (5333|$#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f4799 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f1211 (12235|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f4799 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f1211 (12227|0@5@7&#,)!
 3 f0 (315|$#,)!
-3 f12235 (315|$#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,2|$#,)!
-3 f5 (12235|0@5@7&#,12235|0@5@7&#,2|$#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,)!
+3 f12227 (315|$#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,2|$#,)!
+3 f5 (12227|0@5@7&#,12227|0@5@7&#,2|$#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,)!
 3 f0 (1213|$#,1213|$#,2|$#,)!
-3 f12235 (1213|$#,1213|$#,2|$#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1213 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1213 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f2 (12235|0@2@7&#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,)!
+3 f12227 (1213|$#,1213|$#,2|$#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1213 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1213 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f2 (12227|0@2@7&#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,)!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
-3 f0 (12235|0@2@18&#,)!
-3 f2 (12235|0@2@18&#,)!
-3 f0 (12235|0@2@6&#,)!
-3 f2 (12235|0@2@6&#,)!
-3 f0 (12235|0@2@6&#,)!
-3 f2 (12235|0@2@6&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1211 (12235|0@2@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f1211 (12235|0@5@7&#,)!
-3 f0 ()!
-3 f12235 ()!
+3 f12227 (1213|$#,)!
+3 f0 (12227|0@2@18&#,)!
+3 f2 (12227|0@2@18&#,)!
+3 f0 (12227|0@2@6&#,)!
+3 f2 (12227|0@2@6&#,)!
+3 f0 (12227|0@2@6&#,)!
+3 f2 (12227|0@2@6&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1211 (12227|0@2@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f1211 (12227|0@5@7&#,)!
+3 f0 ()!
+3 f12227 ()!
 3 f0 (1213|$#,4866|0@5@2&#,)!
-3 f12235 (1213|$#,4866|0@5@2&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f12235 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@18&#,)!
-3 f2 (12235|0@2@18&#,)!
-3 f0 (12235|0@2@18&#,)!
-3 f2 (12235|0@2@18&#,)!
-3 f0 (12235|0@2@18&#,)!
-3 f2 (12235|0@2@18&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f2 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@6&#,)!
-3 f2 (12235|0@2@6&#,)!
-3 f0 (12235|0@2@6&#,)!
-3 f2 (12235|0@2@6&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f4799 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f4799 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f1211 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f1211 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f1211 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,1211|0@5@2&#,)!
-3 f1211 (12235|0@5@7&#,1211|0@5@2&#,)!
+3 f12227 (1213|$#,4866|0@5@2&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f12227 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@18&#,)!
+3 f2 (12227|0@2@18&#,)!
+3 f0 (12227|0@2@18&#,)!
+3 f2 (12227|0@2@18&#,)!
+3 f0 (12227|0@2@18&#,)!
+3 f2 (12227|0@2@18&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f2 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@6&#,)!
+3 f2 (12227|0@2@6&#,)!
+3 f0 (12227|0@2@6&#,)!
+3 f2 (12227|0@2@6&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f4799 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f4799 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f1211 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f1211 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f1211 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,1211|0@5@2&#,)!
+3 f1211 (12227|0@5@7&#,1211|0@5@2&#,)!
 1 t1487|1487&
-3 f0 (12461|$#,)!
-3 f12235 (12461|$#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f1211 (12235|0@5@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f12235 (12235|0@2@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f4476 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@2&#,)!
-3 f1 (12235|0@5@2&#,)!
+3 f0 (12453|$#,)!
+3 f12227 (12453|$#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f1211 (12227|0@5@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f12227 (12227|0@2@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f4476 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@2&#,)!
+3 f1 (12227|0@5@2&#,)!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,2|$#,2|$#,2|$#,2|$#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,2|$#,2|$#,2|$#,2|$#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f0 ()!
-3 f12235 ()!
+3 f12227 (1213|$#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,2|$#,2|$#,2|$#,2|$#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,2|$#,2|$#,2|$#,2|$#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f0 ()!
+3 f12227 ()!
 3 f0 (4341|$#,)!
-3 f12235 (4341|$#,)!
+3 f12227 (4341|$#,)!
 3 f0 ()!
-3 f12235 ()!
+3 f12227 ()!
 3 f0 ()!
-3 f12235 ()!
+3 f12227 ()!
 3 f0 (4799|$#,)!
-3 f12235 (4799|$#,)!
+3 f12227 (4799|$#,)!
 3 f0 (1211|0@5@4&#,4476|0@0@4&#,)!
-3 f12235 (1211|0@5@4&#,4476|0@0@4&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1211 (12235|0@2@7&#,)!
+3 f12227 (1211|0@5@4&#,4476|0@0@4&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1211 (12227|0@2@7&#,)!
 3 f0 (4799|$#,)!
-3 f12235 (4799|$#,)!
+3 f12227 (4799|$#,)!
 3 f0 ()!
-3 f12235 ()!
+3 f12227 ()!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
+3 f12227 (1213|$#,)!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
+3 f12227 (1213|$#,)!
 3 f0 (1213|$#,9|$#,)!
-3 f12235 (1213|$#,9|$#,)!
+3 f12227 (1213|$#,9|$#,)!
 3 f0 (1213|$#,4866|0@5@2&#,)!
 3 f1213 (1213|$#,4866|0@5@2&#,)!
 3 f0 (1213|$#,4866|0@5@2&#,)!
 3 f1213 (1213|$#,4866|0@5@2&#,)!
 3 f0 (1213|$#,4866|0@5@2&#,)!
-3 f12235 (1213|$#,4866|0@5@2&#,)!
-3 f0 (12235|0@2@18&#,)!
-3 f12235 (12235|0@2@18&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
+3 f12227 (1213|$#,4866|0@5@2&#,)!
+3 f0 (12227|0@2@18&#,)!
+3 f12227 (12227|0@2@18&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
 3 f0 (1213|$#,1213|$#,2|$#,)!
-3 f12235 (1213|$#,1213|$#,2|$#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1213 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1213 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f2 (12235|0@2@7&#,)!
+3 f12227 (1213|$#,1213|$#,2|$#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1213 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1213 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f2 (12227|0@2@7&#,)!
 3 f0 (1211|0@5@2&#,4866|0@5@2&#,)!
-3 f12235 (1211|0@5@2&#,4866|0@5@2&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f4866 (12235|0@2@7&#,)!
+3 f12227 (1211|0@5@2&#,4866|0@5@2&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f4866 (12227|0@2@7&#,)!
 3 f0 (1211|0@5@4&#,4866|0@5@2&#,)!
-3 f12235 (1211|0@5@4&#,4866|0@5@2&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1213 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f1213 (12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f4866 (12235|0@2@7&#,)!
+3 f12227 (1211|0@5@4&#,4866|0@5@2&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1213 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f1213 (12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f4866 (12227|0@2@7&#,)!
 3 f0 (1213|$#,)!
 3 f2 (1213|$#,)!
 3 f0 (1213|$#,1213|$#,)!
 3 f1213 (1213|$#,1213|$#,)!
 3 f0 (1213|$#,1213|$#,)!
 3 f1213 (1213|$#,1213|$#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f12235 (12235|0@2@7&#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,2|$#,)!
-3 f5 (12235|0@5@7&#,12235|0@5@7&#,2|$#,)!
-3 f0 (12235|0@2@7&#,12235|0@2@7&#,)!
-3 f5 (12235|0@2@7&#,12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,12235|0@2@7&#,)!
-3 f2 (12235|0@2@7&#,12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,12235|0@2@7&#,)!
-3 f2 (12235|0@2@7&#,12235|0@2@7&#,)!
-3 f0 (12235|0@2@7&#,5333|$#,)!
-3 f2 (12235|0@2@7&#,5333|$#,)!
-3 f0 (12235|0@2@7&#,5333|$#,5333|$#,)!
-3 f2 (12235|0@2@7&#,5333|$#,5333|$#,)!
-3 f0 (12235|0@2@7&#,)!
-3 f2 (12235|0@2@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f2 (12235|0@5@7&#,12235|0@5@7&#,)!
-3 f0 (12235|0@5@7&#,)!
-3 f9 (12235|0@5@7&#,)!
-3 f0 (12239|0@0@2&#,)!
-3 f1 (12239|0@0@2&#,)!
-3 f0 ()!
-3 f1 ()!
-3 f0 (5336|$#,12235|0@5@2&#,)!
-3 f12239 (5336|$#,12235|0@5@2&#,)!
-3 f0 (5336|$#,12235|0@5@4&#,1213|$#,1213|$#,1213|$#,1211|0@5@4&#,)!
-3 f12239 (5336|$#,12235|0@5@4&#,1213|$#,1213|$#,1213|$#,1211|0@5@4&#,)!
-3 f0 (12239|$#,)!
-3 f1211 (12239|$#,)!
-3 f0 (12239|$#,)!
-3 f2 (12239|$#,)!
-3 f0 (12239|$#,)!
-3 f1211 (12239|$#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f12227 (12227|0@2@7&#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,2|$#,)!
+3 f5 (12227|0@5@7&#,12227|0@5@7&#,2|$#,)!
+3 f0 (12227|0@2@7&#,12227|0@2@7&#,)!
+3 f5 (12227|0@2@7&#,12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,12227|0@2@7&#,)!
+3 f2 (12227|0@2@7&#,12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,12227|0@2@7&#,)!
+3 f2 (12227|0@2@7&#,12227|0@2@7&#,)!
+3 f0 (12227|0@2@7&#,5333|$#,)!
+3 f2 (12227|0@2@7&#,5333|$#,)!
+3 f0 (12227|0@2@7&#,5333|$#,5333|$#,)!
+3 f2 (12227|0@2@7&#,5333|$#,5333|$#,)!
+3 f0 (12227|0@2@7&#,)!
+3 f2 (12227|0@2@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f2 (12227|0@5@7&#,12227|0@5@7&#,)!
+3 f0 (12227|0@5@7&#,)!
+3 f9 (12227|0@5@7&#,)!
+3 f0 (12231|0@0@2&#,)!
+3 f1 (12231|0@0@2&#,)!
+3 f0 ()!
+3 f1 ()!
+3 f0 (5336|$#,12227|0@5@2&#,)!
+3 f12231 (5336|$#,12227|0@5@2&#,)!
+3 f0 (5336|$#,12227|0@5@4&#,1213|$#,1213|$#,1213|$#,1211|0@5@4&#,)!
+3 f12231 (5336|$#,12227|0@5@4&#,1213|$#,1213|$#,1213|$#,1211|0@5@4&#,)!
+3 f0 (12231|$#,)!
+3 f1211 (12231|$#,)!
+3 f0 (12231|$#,)!
+3 f2 (12231|$#,)!
+3 f0 (12231|$#,)!
+3 f1211 (12231|$#,)!
 3 f0 (23|0@0@18&#,)!
-3 f12239 (23|0@0@18&#,)!
-3 f0 (12239|$#,)!
-3 f1211 (12239|$#,)!
-3 f0 (12239|$#,)!
-3 f1211 (12239|$#,)!
+3 f12231 (23|0@0@18&#,)!
+3 f0 (12231|$#,)!
+3 f1211 (12231|$#,)!
+3 f0 (12231|$#,)!
+3 f1211 (12231|$#,)!
 3 f0 ()!
 3 f1211 ()!
 3 f0 ()!
@@ -12600,15 +12592,15 @@
 3 f1 ()!
 3 f0 ()!
 3 f1 ()!
-1 t12239|12239&
-3 f0 (5336|$#,12235|0@5@4&#,1213|$#,)!
-3 f1213 (5336|$#,12235|0@5@4&#,1213|$#,)!
-3 f0 (12235|0@2@2&#,)!
-3 f1213 (12235|0@2@2&#,)!
-3 f0 (12239|0@0@4&#,)!
-3 f1213 (12239|0@0@4&#,)!
-3 f0 (12239|0@0@2&#,)!
-3 f1213 (12239|0@0@2&#,)!
+1 t12231|12231&
+3 f0 (5336|$#,12227|0@5@4&#,1213|$#,)!
+3 f1213 (5336|$#,12227|0@5@4&#,1213|$#,)!
+3 f0 (12227|0@2@2&#,)!
+3 f1213 (12227|0@2@2&#,)!
+3 f0 (12231|0@0@4&#,)!
+3 f1213 (12231|0@0@4&#,)!
+3 f0 (12231|0@0@2&#,)!
+3 f1213 (12231|0@0@2&#,)!
 3 f0 (1213|$#,)!
 3 f1213 (1213|$#,)!
 3 f0 (1213|$#,)!
@@ -12748,11 +12740,11 @@
 3 f0 (1213|$#,)!
 3 f2 (1213|$#,)!
 3 ?!
-3 f12745 (1213|$#,)!
-3 f2 (1213|$#,)^12748
-1 t12747|12747&
-3 f0 (4987|$#,12748|$#,)!
-3 f2 (4987|$#,12748|$#,)!
+3 f12737 (1213|$#,)!
+3 f2 (1213|$#,)^12740
+1 t12739|12739&
+3 f0 (4987|$#,12740|$#,)!
+3 f2 (4987|$#,12740|$#,)!
 3 f0 (4987|$#,)!
 3 f2 (4987|$#,)!
 3 f0 (4987|$#,)!
@@ -12890,11 +12882,11 @@
 3 f0 (1213|$#,1213|$#,)!
 3 f1213 (1213|$#,1213|$#,)!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
+3 f12227 (1213|$#,)!
 3 f0 (1213|$#,)!
-3 f12235 (1213|$#,)!
+3 f12227 (1213|$#,)!
 3 f0 (1213|$#,)!
-3 f12239 (1213|$#,)!
+3 f12231 (1213|$#,)!
 3 f0 (1213|$#,)!
 3 f9 (1213|$#,)!
 3 f0 (3415|$#,2|$#,)!
@@ -13386,57 +13378,57 @@
 3 e!240{TT_FCNRETURN,TT_DOASSIGN,TT_FIELDASSIGN,TT_FCNPASS,TT_GLOBPASS,TT_GLOBRETURN,TT_PARAMRETURN,TT_LEAVETRANS,TT_GLOBINIT}!
 0 s7764|&
 0 s7765|&
-3 f0 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1047|0@5@19@2@0#,1047|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1047|0@5@19@2@0#,1047|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1050|0@5@7&#,13383|$#,)!
-3 f1 (1050|0@5@7&#,13383|$#,)!
-3 f0 (1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1050|0@5@7&#,13383|$#,)!
-3 f1 (1050|0@5@7&#,13383|$#,)!
-3 f0 (1067|0@5@7&#,1047|0@5@19@2@0#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,2|$#,2|$#,2|$#,1082|0@5@7&#,13383|$#,5|$#,2|$#,)!
-3 f1490 (1067|0@5@7&#,1047|0@5@19@2@0#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,2|$#,2|$#,2|$#,1082|0@5@7&#,13383|$#,5|$#,2|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1047|0@5@19@2@0#,1047|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1047|0@5@19@2@0#,1047|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1050|0@5@7&#,13375|$#,)!
+3 f1 (1050|0@5@7&#,13375|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1050|0@5@7&#,13375|$#,)!
+3 f1 (1050|0@5@7&#,13375|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@19@2@0#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,2|$#,2|$#,2|$#,1082|0@5@7&#,13375|$#,5|$#,2|$#,)!
+3 f1490 (1067|0@5@7&#,1047|0@5@19@2@0#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,2|$#,2|$#,2|$#,1082|0@5@7&#,13375|$#,5|$#,2|$#,)!
 3 f0 (1047|0@5@7&#,)!
 3 f1047 (1047|0@5@7&#,)!
 3 f0 (1047|0@5@18&#,1082|0@5@7&#,)!
 3 f2 (1047|0@5@18&#,1082|0@5@7&#,)!
 3 f0 (4536|$#,4536|$#,)!
 3 f4536 (4536|$#,4536|$#,)!
-3 f0 (13383|$#,4536|$#,)!
-3 f1211 (13383|$#,4536|$#,)!
-3 f0 (13383|$#,1067|0@5@7&#,1067|0@5@7&#,1067|0@5@7&#,)!
-3 f1211 (13383|$#,1067|0@5@7&#,1067|0@5@7&#,1067|0@5@7&#,)!
-3 f0 (13383|$#,4539|$#,)!
-3 f1211 (13383|$#,4539|$#,)!
-3 f0 (13383|$#,)!
-3 f1211 (13383|$#,)!
-3 f0 (1067|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,13383|$#,)!
-3 f1211 (1067|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,13383|$#,)!
-3 f0 (13383|$#,)!
-3 f1211 (13383|$#,)!
+3 f0 (13375|$#,4536|$#,)!
+3 f1211 (13375|$#,4536|$#,)!
+3 f0 (13375|$#,1067|0@5@7&#,1067|0@5@7&#,1067|0@5@7&#,)!
+3 f1211 (13375|$#,1067|0@5@7&#,1067|0@5@7&#,1067|0@5@7&#,)!
+3 f0 (13375|$#,4539|$#,)!
+3 f1211 (13375|$#,4539|$#,)!
+3 f0 (13375|$#,)!
+3 f1211 (13375|$#,)!
+3 f0 (1067|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,13375|$#,)!
+3 f1211 (1067|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,13375|$#,)!
+3 f0 (13375|$#,)!
+3 f1211 (13375|$#,)!
 3 f0 (1047|0@5@7&#,)!
 3 f1211 (1047|0@5@7&#,)!
 3 f0 (1047|0@5@7&#,)!
 3 f1211 (1047|0@5@7&#,)!
-3 f0 (1067|0@5@7&#,1047|0@5@19@2@0#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,2|$#,2|$#,2|$#,1082|0@5@7&#,13383|$#,5|$#,2|$#,)!
-3 f1490 (1067|0@5@7&#,1047|0@5@19@2@0#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,2|$#,2|$#,2|$#,1082|0@5@7&#,13383|$#,5|$#,2|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@19@2@0#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,2|$#,2|$#,2|$#,1082|0@5@7&#,13375|$#,5|$#,2|$#,)!
+3 f1490 (1067|0@5@7&#,1047|0@5@19@2@0#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,2|$#,2|$#,2|$#,1082|0@5@7&#,13375|$#,5|$#,2|$#,)!
 3 e!241{DSC_GLOB,DSC_LOCAL,DSC_PARAM,DSC_STRUCT}!
 0 s7770|&
 0 s7771|&
-3 f0 (13422|$#,)!
-3 f1211 (13422|$#,)!
-3 f0 (1067|0@5@7&#,1047|0@5@7&#,2|$#,1082|0@5@7&#,5|$#,13422|$#,2|$#,)!
-3 f2 (1067|0@5@7&#,1047|0@5@7&#,2|$#,1082|0@5@7&#,5|$#,13422|$#,2|$#,)!
+3 f0 (13414|$#,)!
+3 f1211 (13414|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@7&#,2|$#,1082|0@5@7&#,5|$#,13414|$#,2|$#,)!
+3 f2 (1067|0@5@7&#,1047|0@5@7&#,2|$#,1082|0@5@7&#,5|$#,13414|$#,2|$#,)!
 3 f0 (1047|0@5@7&#,1082|0@5@7&#,)!
 3 f2 (1047|0@5@7&#,1082|0@5@7&#,)!
 3 f0 (1047|0@5@7&#,1082|0@5@7&#,)!
 3 f1 (1047|0@5@7&#,1082|0@5@7&#,)!
 3 f0 (1047|0@5@7&#,1082|0@5@7&#,)!
 3 f1 (1047|0@5@7&#,1082|0@5@7&#,)!
-3 f0 (1067|0@5@7&#,1047|0@5@7&#,2|$#,1082|0@5@7&#,5|$#,13422|$#,2|$#,)!
-3 f2 (1067|0@5@7&#,1047|0@5@7&#,2|$#,1082|0@5@7&#,5|$#,13422|$#,2|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@7&#,2|$#,1082|0@5@7&#,5|$#,13414|$#,2|$#,)!
+3 f2 (1067|0@5@7&#,1047|0@5@7&#,2|$#,1082|0@5@7&#,5|$#,13414|$#,2|$#,)!
 3 f0 (1067|0@5@7&#,1050|0@5@7&#,)!
 3 f1 (1067|0@5@7&#,1050|0@5@7&#,)!
 3 f0 (1050|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,5|$#,)!
@@ -13449,38 +13441,38 @@
 3 f1 (1050|0@5@7&#,)!
 3 f0 (1050|0@5@7&#,)!
 3 f1 (1050|0@5@7&#,)!
-3 f0 (1050|0@5@7&#,13383|$#,)!
-3 f1 (1050|0@5@7&#,13383|$#,)!
-3 f0 (1050|0@5@7&#,13383|$#,)!
-3 f1 (1050|0@5@7&#,13383|$#,)!
+3 f0 (1050|0@5@7&#,13375|$#,)!
+3 f1 (1050|0@5@7&#,13375|$#,)!
+3 f0 (1050|0@5@7&#,13375|$#,)!
+3 f1 (1050|0@5@7&#,13375|$#,)!
 3 f0 (1047|0@5@7&#,)!
 3 f1 (1047|0@5@7&#,)!
-3 f0 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1082|0@5@7&#,13383|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1082|0@5@7&#,13375|$#,)!
 3 f0 (1067|0@5@7&#,1067|0@5@7&#,)!
 3 f1 (1067|0@5@7&#,1067|0@5@7&#,)!
 3 f0 (1067|0@5@7&#,1067|0@5@7&#,)!
 3 f1 (1067|0@5@7&#,1067|0@5@7&#,)!
-3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@19@2@0#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@19@2@0#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1067|0@5@7&#,1047|0@5@19@2@0#,2|$#,1067|0@5@7&#,1047|0@5@19@2@0#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1067|0@5@7&#,1047|0@5@19@2@0#,2|$#,1067|0@5@7&#,1047|0@5@19@2@0#,2|$#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1047|0@5@19@2@0#,1047|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1047|0@5@19@2@0#,1047|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f0 (1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1082|0@5@7&#,13383|$#,)!
-3 f1 (1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1082|0@5@7&#,13383|$#,)!
+3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@19@2@0#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@19@2@0#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1047|0@5@7&#,1067|0@5@7&#,2|$#,1047|0@5@7&#,1067|0@5@7&#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@19@2@0#,2|$#,1067|0@5@7&#,1047|0@5@19@2@0#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1067|0@5@7&#,1047|0@5@19@2@0#,2|$#,1067|0@5@7&#,1047|0@5@19@2@0#,2|$#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1047|0@5@19@2@0#,1047|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1047|0@5@19@2@0#,1047|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f0 (1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1082|0@5@7&#,13375|$#,)!
+3 f1 (1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1047|0@5@18&#,1067|0@5@7&#,1082|0@5@7&#,13375|$#,)!
 3 f0 (1047|0@5@7&#,)!
 3 f1047 (1047|0@5@7&#,)!
 3 f0 (1047|0@5@18&#,1082|0@5@7&#,)!
@@ -13917,7 +13909,7 @@
 0 s7791|&
 0 s7792|&
 3 f0 (315|$#,)!
-3 f13913 (315|$#,)!
+3 f13905 (315|$#,)!
 3 f0 (23|0@0@6&#,!.,)!
 3 f1211 (23|0@0@6&#,!.,)!
 3 f0 (1094|0@5@7&#,)!
@@ -14174,10 +14166,10 @@
 3 f1 (4|$#,1722|$#,)!
 3 f0 (1722|$#,)!
 3 f1 (1722|$#,)!
-0 s7798|-1 14173 -1
-1 t14172|14172&
-3 f0 (315|@5|$#,14173|4@0@7&#,5|$#,24|&#,)!
-3 f1 (315|@5|$#,14173|4@0@7&#,5|$#,24|&#,)!
+0 s7798|-1 14165 -1
+1 t14164|14164&
+3 f0 (315|@5|$#,14165|4@0@7&#,5|$#,24|&#,)!
+3 f1 (315|@5|$#,14165|4@0@7&#,5|$#,24|&#,)!
 3 f0 (1211|0@5@2&#,1082|0@5@7&#,)!
 3 f1 (1211|0@5@2&#,1082|0@5@7&#,)!
 3 f0 ()!
@@ -14384,40 +14376,40 @@
 3 f1490 (4|$#,)!
 3 f0 (1490|$#,1490|$#,)!
 3 f5 (1490|$#,1490|$#,)!
-0 s7800|-1 14383 -1
-1 t14382|14382&
-3 S!243{5|@1|^#entries,5|@1|^#nspace,14383|@1|11@3@3&#elements,}^14386
+0 s7800|-1 14375 -1
+1 t14374|14374&
+3 S!243{5|@1|^#entries,5|@1|^#nspace,14375|@1|11@3@3&#elements,}^14378
 0 s7801|&
-1 t14384|14384&
+1 t14376|14376&
 0 a7802|&
-3 f0 (14387|0@5@7&#,)!
-3 f2 (14387|0@5@7&#,)!
-3 f0 (14387|@7|0@5@7&#,)!
-3 f2 (14387|@7|0@5@7&#,)!
-3 f0 (14387|0@5@7&#,)!
-3 f2 (14387|0@5@7&#,)!
-3 f0 (14387|0@5@7&#,)!
-3 f1211 (14387|0@5@7&#,)!
-3 f0 (14387|0@5@2&#,)!
-3 f1 (14387|0@5@2&#,)!
-3 f0 (14387|0@5@7&#,)!
-3 f1 (14387|0@5@7&#,)!
-3 f0 (14387|@5|0@5@7&#,1047|15@5@17&#,)!
-3 f14387 (14387|@5|0@5@7&#,1047|15@5@17&#,)!
-3 f0 ()!
-3 f14387 ()!
-3 f0 (14387|0@2@7&#,)!
-3 f1 (14387|0@2@7&#,)!
-3 f0 (14387|@5|0@5@7&#,1047|15@5@17&#,)!
-3 f14387 (14387|@5|0@5@7&#,1047|15@5@17&#,)!
-3 f0 (14387|0@5@7&#,)!
-3 f1 (14387|0@5@7&#,)!
-3 f0 (14387|0@5@7&#,)!
-3 f5 (14387|0@5@7&#,)!
-3 f0 (14387|0@5@7&#,)!
-3 f1211 (14387|0@5@7&#,)!
-3 f0 (14387|0@5@2&#,)!
-3 f1 (14387|0@5@2&#,)!
+3 f0 (14379|0@5@7&#,)!
+3 f2 (14379|0@5@7&#,)!
+3 f0 (14379|@7|0@5@7&#,)!
+3 f2 (14379|@7|0@5@7&#,)!
+3 f0 (14379|0@5@7&#,)!
+3 f2 (14379|0@5@7&#,)!
+3 f0 (14379|0@5@7&#,)!
+3 f1211 (14379|0@5@7&#,)!
+3 f0 (14379|0@5@2&#,)!
+3 f1 (14379|0@5@2&#,)!
+3 f0 (14379|0@5@7&#,)!
+3 f1 (14379|0@5@7&#,)!
+3 f0 (14379|@5|0@5@7&#,1047|15@5@17&#,)!
+3 f14379 (14379|@5|0@5@7&#,1047|15@5@17&#,)!
+3 f0 ()!
+3 f14379 ()!
+3 f0 (14379|0@2@7&#,)!
+3 f1 (14379|0@2@7&#,)!
+3 f0 (14379|@5|0@5@7&#,1047|15@5@17&#,)!
+3 f14379 (14379|@5|0@5@7&#,1047|15@5@17&#,)!
+3 f0 (14379|0@5@7&#,)!
+3 f1 (14379|0@5@7&#,)!
+3 f0 (14379|0@5@7&#,)!
+3 f5 (14379|0@5@7&#,)!
+3 f0 (14379|0@5@7&#,)!
+3 f1211 (14379|0@5@7&#,)!
+3 f0 (14379|0@5@2&#,)!
+3 f1 (14379|0@5@2&#,)!
 3 f0 (4408|0@5@7&#,)!
 3 f2 (4408|0@5@7&#,)!
 3 f0 (1211|0@5@4&#,20|0@0@4&#,)!
@@ -14573,10 +14565,10 @@
 3 C1.1050/1|!
 3 f0 (1064|0@2@7&#,1050|0@5@2&#,)!
 3 f1050 (1064|0@2@7&#,1050|0@5@2&#,)!
-3 f14568 (1064|0@2@7&#,1050|0@5@2&#,)!
+3 f14560 (1064|0@2@7&#,1050|0@5@2&#,)!
 3 f0 (1064|0@2@7&#,1050|0@5@2&#,)!
 3 f1050 (1064|0@2@7&#,1050|0@5@2&#,)!
-3 f14568 (1064|0@2@7&#,1050|0@5@2&#,)!
+3 f14560 (1064|0@2@7&#,1050|0@5@2&#,)!
 3 f0 (1064|0@2@7&#,1050|0@5@4&#,2|$#,)!
 3 f4798 (1064|0@2@7&#,1050|0@5@4&#,2|$#,)!
 3 f0 (1050|0@5@2&#,)!
@@ -14822,9 +14814,9 @@
 3 f0 ()!
 3 f1 ()!
 3 ?!
-3 f14819 (20|$#,20|$#,)!
-3 f5 (20|$#,20|$#,)^14822
-1 t14821|14821&
+3 f14811 (20|$#,20|$#,)!
+3 f5 (20|$#,20|$#,)^14814
+1 t14813|14813&
 3 f0 ()!
 3 f1064 ()!
 3 f0 ()!
@@ -14970,31 +14962,31 @@
 3 f0 (1047|0@5@7&#,1082|0@5@7&#,)!
 3 f1 (1047|0@5@7&#,1082|0@5@7&#,)!
 3 ?!
+3 f14959 (1047|0@5@7&#,1082|0@5@7&#,)!
+3 f1 (1047|0@5@7&#,1082|0@5@7&#,)^14962
+1 t14961|14961&
+3 f0 (14962|$#,1047|0@5@7&#,1082|0@5@7&#,)!
+3 f1 (14962|$#,1047|0@5@7&#,1082|0@5@7&#,)!
+3 f0 (1047|0@5@7&#,)!
+3 f5 (1047|0@5@7&#,)!
+3 ?!
 3 f14967 (1047|0@5@7&#,1082|0@5@7&#,)!
 3 f1 (1047|0@5@7&#,1082|0@5@7&#,)^14970
 1 t14969|14969&
 3 f0 (14970|$#,1047|0@5@7&#,1082|0@5@7&#,)!
 3 f1 (14970|$#,1047|0@5@7&#,1082|0@5@7&#,)!
-3 f0 (1047|0@5@7&#,)!
-3 f5 (1047|0@5@7&#,)!
-3 ?!
-3 f14975 (1047|0@5@7&#,1082|0@5@7&#,)!
-3 f1 (1047|0@5@7&#,1082|0@5@7&#,)^14978
-1 t14977|14977&
-3 f0 (14978|$#,1047|0@5@7&#,1082|0@5@7&#,)!
-3 f1 (14978|$#,1047|0@5@7&#,1082|0@5@7&#,)!
 3 ?!
-3 f14981 (1047|0@5@7&#,1047|0@5@7&#,)!
-3 f1 (1047|0@5@7&#,1047|0@5@7&#,)^14984
-1 t14983|14983&
-3 f0 (14984|$#,1047|0@5@7&#,1047|0@5@7&#,)!
-3 f1 (14984|$#,1047|0@5@7&#,1047|0@5@7&#,)!
+3 f14973 (1047|0@5@7&#,1047|0@5@7&#,)!
+3 f1 (1047|0@5@7&#,1047|0@5@7&#,)^14976
+1 t14975|14975&
+3 f0 (14976|$#,1047|0@5@7&#,1047|0@5@7&#,)!
+3 f1 (14976|$#,1047|0@5@7&#,1047|0@5@7&#,)!
 3 ?!
-3 f14987 (1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
-3 f1 (1047|0@5@7&#,4536|$#,1082|0@5@7&#,)^14990
-1 t14989|14989&
-3 f0 (14990|$#,1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
-3 f1 (14990|$#,1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
+3 f14979 (1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
+3 f1 (1047|0@5@7&#,4536|$#,1082|0@5@7&#,)^14982
+1 t14981|14981&
+3 f0 (14982|$#,1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
+3 f1 (14982|$#,1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
 3 f0 (5|$#,)!
 3 f6480 (5|$#,)!
 3 f0 (1047|0@5@7&#,1047|0@5@7&#,)!
@@ -15086,11 +15078,11 @@
 3 f0 (1047|0@2@7&#,1047|0@2@19@2@0#,)!
 3 f1 (1047|0@2@7&#,1047|0@2@19@2@0#,)!
 3 ?!
-3 f15083 (1047|0@5@7&#,)!
-3 f2 (1047|0@5@7&#,)^15086
-1 t15085|15085&
-3 f0 (15086|$#,1047|0@5@7&#,)!
-3 f2 (15086|$#,1047|0@5@7&#,)!
+3 f15075 (1047|0@5@7&#,)!
+3 f2 (1047|0@5@7&#,)^15078
+1 t15077|15077&
+3 f0 (15078|$#,1047|0@5@7&#,)!
+3 f2 (15078|$#,1047|0@5@7&#,)!
 3 f0 ()!
 3 f2 ()!
 3 f0 (1047|0@5@7&#,1213|$#,)!
@@ -15666,47 +15658,47 @@
 3 f0 (1047|@5|0@2@7&#,1047|0@5@7&#,)!
 3 f1047 (1047|@5|0@2@7&#,1047|0@5@7&#,)!
 3 ?!
-3 f15663 (1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,)!
-3 f2 (1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,)^15666
-1 t15665|15665&
+3 f15655 (1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,)!
+3 f2 (1047|0@5@7&#,1067|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,)^15658
+1 t15657|15657&
 3 ?!
-3 f15667 (1047|0@5@7&#,)!
-3 f2 (1047|0@5@7&#,)^15670
-1 t15669|15669&
-3 f0 (15666|$#,15670|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1067|0@5@7&#,)!
-3 f1 (15666|$#,15670|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1067|0@5@7&#,)!
+3 f15659 (1047|0@5@7&#,)!
+3 f2 (1047|0@5@7&#,)^15662
+1 t15661|15661&
+3 f0 (15658|$#,15662|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1067|0@5@7&#,)!
+3 f1 (15658|$#,15662|0@5@7&#,1047|0@5@7&#,1067|0@5@7&#,1067|0@5@7&#,)!
 3 f0 (1218|$#,1047|0@5@7&#,)!
 3 f2 (1218|$#,1047|0@5@7&#,)!
 3 ?!
-3 f15675 (1047|0@5@7&#,)!
-3 f2 (1047|0@5@7&#,)^15678
-1 t15677|15677&
-3 f0 (15678|$#,1047|0@5@7&#,)!
-3 f2 (15678|$#,1047|0@5@7&#,)!
+3 f15667 (1047|0@5@7&#,)!
+3 f2 (1047|0@5@7&#,)^15670
+1 t15669|15669&
+3 f0 (15670|$#,1047|0@5@7&#,)!
+3 f2 (15670|$#,1047|0@5@7&#,)!
 3 ?!
-3 f15681 (1047|0@5@7&#,1082|0@5@7&#,)!
-3 f1 (1047|0@5@7&#,1082|0@5@7&#,)^15684
-1 t15683|15683&
-3 f0 (15684|$#,1047|0@5@7&#,1082|0@5@7&#,)!
-3 f1 (15684|$#,1047|0@5@7&#,1082|0@5@7&#,)!
+3 f15673 (1047|0@5@7&#,1082|0@5@7&#,)!
+3 f1 (1047|0@5@7&#,1082|0@5@7&#,)^15676
+1 t15675|15675&
+3 f0 (15676|$#,1047|0@5@7&#,1082|0@5@7&#,)!
+3 f1 (15676|$#,1047|0@5@7&#,1082|0@5@7&#,)!
 3 ?!
-3 f15687 (1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
-3 f1 (1047|0@5@7&#,4536|$#,1082|0@5@7&#,)^15690
-1 t15689|15689&
-3 f0 (15690|$#,1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
-3 f1 (15690|$#,1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
+3 f15679 (1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
+3 f1 (1047|0@5@7&#,4536|$#,1082|0@5@7&#,)^15682
+1 t15681|15681&
+3 f0 (15682|$#,1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
+3 f1 (15682|$#,1047|0@5@7&#,4536|$#,1082|0@5@7&#,)!
 3 ?!
-3 f15693 (1047|0@5@7&#,1082|0@5@7&#,)!
-3 f1 (1047|0@5@7&#,1082|0@5@7&#,)^15696
-1 t15695|15695&
-3 f0 (15696|$#,1047|0@5@7&#,1082|0@5@7&#,)!
-3 f1 (15696|$#,1047|0@5@7&#,1082|0@5@7&#,)!
+3 f15685 (1047|0@5@7&#,1082|0@5@7&#,)!
+3 f1 (1047|0@5@7&#,1082|0@5@7&#,)^15688
+1 t15687|15687&
+3 f0 (15688|$#,1047|0@5@7&#,1082|0@5@7&#,)!
+3 f1 (15688|$#,1047|0@5@7&#,1082|0@5@7&#,)!
 3 ?!
-3 f15699 (1047|0@5@7&#,1047|0@5@7&#,)!
-3 f1 (1047|0@5@7&#,1047|0@5@7&#,)^15702
-1 t15701|15701&
-3 f0 (15702|$#,1047|0@5@7&#,1047|0@5@7&#,)!
-3 f1 (15702|$#,1047|0@5@7&#,1047|0@5@7&#,)!
+3 f15691 (1047|0@5@7&#,1047|0@5@7&#,)!
+3 f1 (1047|0@5@7&#,1047|0@5@7&#,)^15694
+1 t15693|15693&
+3 f0 (15694|$#,1047|0@5@7&#,1047|0@5@7&#,)!
+3 f1 (15694|$#,1047|0@5@7&#,1047|0@5@7&#,)!
 3 f0 (1047|0@2@7&#,1047|0@2@7&#,)!
 3 f1 (1047|0@2@7&#,1047|0@2@7&#,)!
 3 f0 (1047|0@2@7&#,1047|0@2@7&#,2193|$#,1082|0@5@7&#,)!
@@ -15893,58 +15885,58 @@
 3 f2 (1211|0@5@7&#,)!
 3 f0 (1211|0@5@7&#,)!
 3 f1211 (1211|0@5@7&#,)!
-3 S!245{5|@1|^#nelements,5|@1|^#free,4436|@1|11@3@3&#elements,}^15893
+3 S!245{5|@1|^#nelements,5|@1|^#free,4436|@1|11@3@3&#elements,}^15885
 0 s7828|&
-1 t15891|15891&
+1 t15883|15883&
 0 a7829|&
-3 f0 (15894|0@5@7&#,)!
-3 f2 (15894|0@5@7&#,)!
-3 f0 (15894|@7|0@5@7&#,)!
-3 f5 (15894|@7|0@5@7&#,)!
-3 f0 (15894|0@5@7&#,)!
-3 f5 (15894|0@5@7&#,)!
-3 f0 (15894|0@5@7&#,)!
-3 f1 (15894|0@5@7&#,)!
-3 f0 (15894|0@5@7&#,)!
-3 f1 (15894|0@5@7&#,)!
-3 f0 ()!
-3 f15894 ()!
-3 f0 (15894|0@5@7&#,)!
-3 f1082 (15894|0@5@7&#,)!
-3 f0 (15894|0@5@7&#,1082|0@5@2&#,)!
-3 f2 (15894|0@5@7&#,1082|0@5@2&#,)!
-3 f0 (15894|0@5@7&#,)!
-3 f1211 (15894|0@5@7&#,)!
-3 f0 (15894|0@5@2&#,)!
-3 f1 (15894|0@5@2&#,)!
-3 S!246{5|@1|^#entries,5|@1|^#nspace,24|@1|11@3@3&#elements,}^15917
+3 f0 (15886|0@5@7&#,)!
+3 f2 (15886|0@5@7&#,)!
+3 f0 (15886|@7|0@5@7&#,)!
+3 f5 (15886|@7|0@5@7&#,)!
+3 f0 (15886|0@5@7&#,)!
+3 f5 (15886|0@5@7&#,)!
+3 f0 (15886|0@5@7&#,)!
+3 f1 (15886|0@5@7&#,)!
+3 f0 (15886|0@5@7&#,)!
+3 f1 (15886|0@5@7&#,)!
+3 f0 ()!
+3 f15886 ()!
+3 f0 (15886|0@5@7&#,)!
+3 f1082 (15886|0@5@7&#,)!
+3 f0 (15886|0@5@7&#,1082|0@5@2&#,)!
+3 f2 (15886|0@5@7&#,1082|0@5@2&#,)!
+3 f0 (15886|0@5@7&#,)!
+3 f1211 (15886|0@5@7&#,)!
+3 f0 (15886|0@5@2&#,)!
+3 f1 (15886|0@5@2&#,)!
+3 S!246{5|@1|^#entries,5|@1|^#nspace,24|@1|11@3@3&#elements,}^15909
 0 s7840|&
-1 t15915|15915&
+1 t15907|15907&
 0 a7841|&
-3 f1 (15918|@7|&#,5|@3|&#,)!
-3 f0 ()!
-3 f15918 ()!
-3 f0 (15918|$#,)!
-3 f2 (15918|$#,)!
-3 f0 (15918|$#,)!
-3 f5 (15918|$#,)!
-3 f0 (15918|$#,5|$#,)!
-3 f2 (15918|$#,5|$#,)!
-3 f0 (15918|$#,5|$#,)!
-3 f2 (15918|$#,5|$#,)!
-3 f0 (15918|$#,)!
-3 f1211 (15918|$#,)!
-3 f0 (15918|0@0@2&#,)!
-3 f1 (15918|0@0@2&#,)!
-3 f0 (15918|$#,)!
-3 f1211 (15918|$#,)!
+3 f1 (15910|@7|&#,5|@3|&#,)!
+3 f0 ()!
+3 f15910 ()!
+3 f0 (15910|$#,)!
+3 f2 (15910|$#,)!
+3 f0 (15910|$#,)!
+3 f5 (15910|$#,)!
+3 f0 (15910|$#,5|$#,)!
+3 f2 (15910|$#,5|$#,)!
+3 f0 (15910|$#,5|$#,)!
+3 f2 (15910|$#,5|$#,)!
+3 f0 (15910|$#,)!
+3 f1211 (15910|$#,)!
+3 f0 (15910|0@0@2&#,)!
+3 f1 (15910|0@0@2&#,)!
+3 f0 (15910|$#,)!
+3 f1211 (15910|$#,)!
 3 S!247{1211|@1|0@5@3&#file,1054|@1|^#daccess,}!
 0 s7851|&
-0 s7852|-1 15942 -1
+0 s7852|-1 15934 -1
 3 e!248{CX_ERROR,CX_GLOBAL,CX_INNER,CX_FUNCTION,CX_FCNDECLARATION,CX_MACROFCN,CX_MACROCONST,CX_UNKNOWNMACRO,CX_ITERDEF,CX_ITEREND,CX_OLDSTYLESCOPE,CX_LCL,CX_LCLLIB,CX_MT}!
 0 s7867|&
 0 s7868|&
-1 t15938|15938&
+1 t15930|15930&
 2 F0/0|0&
 2 F2/0|2&
 2 F0/0|0&
@@ -15961,7 +15953,7 @@
 2 F1212/0|1212&
 3 U!249{2|@1|^#glob,5|@1|^#cdepth,1050|@1|0@5@18@2@0#fcn,}!
 0 s7869|&
-3 S!250{5|@1|^#linesprocessed,5|@1|^#speclinesprocessed,8230|@1|0@0@3&#markers,2|@1|^#macroMissingParams,2|@1|^#preprocessing,2|@1|^#incommandline,2|@1|^#insuppressregion,2|@1|^#inDerivedFile,2|@1|^#instandardlib,2|@1|^#inimport,2|@1|^#inheader,2|@1|^#inmacrocache,2|@1|^#protectVars,2|@1|^#neednl,2|@1|^#showfunction,2|@1|^#savedFlags,2|@1|^#justpopped,2|@1|^#anyExports,2|@1|^#inFunctionHeader,1722|@1|^#library,1490|@1|^#isNullGuarded,1082|@1|0@5@3&#saveloc,1082|@1|0@5@3&#pushloc,8380|@1|0@0@3&#clauses,2193|@1|^#inclause,5|@1|^#numerrors,15894|@1|0@5@3&#locstack,8283|@1|0@5@3&#ftab,1211|@1|0@5@3&#msgAnnote,1047|@1|0@5@18@3@0#aliasAnnote,1047|@1|0@5@18@3@0#aliasAnnoteAls,8365|@1|0@5@3&#msgLog,8254|@1|0@0@3&#mc,1073|@1|0@5@18@3@0#mods,1054|@1|^#facct,1054|@1|^#acct,1054|@1|^#nacct,1200|@1|0@5@18@3@0#globs,1200|@1|0@5@2&#globs_used,5|@1|^#nmods,5|@1|^#maxmods,15942|@1|11@0@3&#moduleaccess,15941|@1|^#kind,15941|@1|^#savekind,1213|@1|^#boolType,15944|@1|^#flags,15946|@1|^#saveflags,15948|@1|^#setGlobally,15950|@1|^#setLocally,15952|@1|^#values,15954|@1|^#counters,15956|@1|^#strings,8168|@1|0@5@3&#modrecs,1099|@1|0@5@3&#stateTable,1100|@1|0@5@3&#annotTable,15957|@1|^#cont,}!
+3 S!250{5|@1|^#linesprocessed,5|@1|^#speclinesprocessed,8230|@1|0@0@3&#markers,2|@1|^#macroMissingParams,2|@1|^#preprocessing,2|@1|^#incommandline,2|@1|^#insuppressregion,2|@1|^#inDerivedFile,2|@1|^#instandardlib,2|@1|^#inimport,2|@1|^#inheader,2|@1|^#inmacrocache,2|@1|^#protectVars,2|@1|^#neednl,2|@1|^#showfunction,2|@1|^#savedFlags,2|@1|^#justpopped,2|@1|^#anyExports,2|@1|^#inFunctionHeader,1722|@1|^#library,1490|@1|^#isNullGuarded,1082|@1|0@5@3&#saveloc,1082|@1|0@5@3&#pushloc,8380|@1|0@0@3&#clauses,2193|@1|^#inclause,5|@1|^#numerrors,15886|@1|0@5@3&#locstack,8283|@1|0@5@3&#ftab,1211|@1|0@5@3&#msgAnnote,1047|@1|0@5@18@3@0#aliasAnnote,1047|@1|0@5@18@3@0#aliasAnnoteAls,8365|@1|0@5@3&#msgLog,8254|@1|0@0@3&#mc,1073|@1|0@5@18@3@0#mods,1054|@1|^#facct,1054|@1|^#acct,1054|@1|^#nacct,1200|@1|0@5@18@3@0#globs,1200|@1|0@5@2&#globs_used,5|@1|^#nmods,5|@1|^#maxmods,15934|@1|11@0@3&#moduleaccess,15933|@1|^#kind,15933|@1|^#savekind,1213|@1|^#boolType,15936|@1|^#flags,15938|@1|^#saveflags,15940|@1|^#setGlobally,15942|@1|^#setLocally,15944|@1|^#values,15946|@1|^#counters,15948|@1|^#strings,8168|@1|0@5@3&#modrecs,1099|@1|0@5@3&#stateTable,1100|@1|0@5@3&#annotTable,15949|@1|^#cont,}!
 0 s7870|&
 3 f0 (1722|$#,)!
 3 f1211 (1722|$#,)!
@@ -16511,17 +16503,17 @@
 3 f1 ()!
 3 S!251{1726|@1|^#kind,23|@1|0@5@18@3@0#name,23|@1|0@5@18@3@0#describe,}!
 0 s7871|&
-0 s7872|-1 -1 16510
-2 y16509|16509&
+0 s7872|-1 -1 16502
+2 y16501|16501&
 3 e!252{ARG_NONE,ARG_VALUE,ARG_STRING,ARG_SPECIAL}!
 0 s7877|&
 0 s7878|&
-3 S!253{1726|@1|^#main,1726|@1|^#sub,2|@1|^#isSpecial,2|@1|^#isIdem,2|@1|^#isGlobal,2|@1|^#isModeFlag,16513|@1|^#argtype,23|@1|0@0@18@3@0#flag,1722|@1|^#code,23|@1|0@5@18@3@0#desc,1261|@1|0@5@3@3@0#hint,5|@1|^#nreported,5|@1|^#nsuppressed,}!
+3 S!253{1726|@1|^#main,1726|@1|^#sub,2|@1|^#isSpecial,2|@1|^#isIdem,2|@1|^#isGlobal,2|@1|^#isModeFlag,16505|@1|^#argtype,23|@1|0@0@18@3@0#flag,1722|@1|^#code,23|@1|0@5@18@3@0#desc,1261|@1|0@5@3@3@0#hint,5|@1|^#nreported,5|@1|^#nsuppressed,}!
 0 s7879|&
-0 s7880|-1 -1 16517
-2 y16516|16516&
+0 s7880|-1 -1 16509
+2 y16508|16508&
 0 s7881|&
-3 f1 (16516|@3|6@0@19@3@0#,)!
+3 f1 (16508|@3|6@0@19@3@0#,)!
 2 y1261|1261&
 3 f1 (1261|@3|6@5@19@3@0#,)!
 3 f0 (1722|$#,)!
@@ -16684,8 +16676,8 @@
 3 f5 (23|$#,786|4@0@7&#,)!
 3 f0 (23|$#,)!
 3 f2 (23|$#,)!
-3 f0 (315|$#,315|4@0@7&#,10873|4@0@7&#,)!
-3 f2 (315|$#,315|4@0@7&#,10873|4@0@7&#,)!
+3 f0 (315|$#,315|4@0@7&#,10867|4@0@7&#,)!
+3 f2 (315|$#,315|4@0@7&#,10867|4@0@7&#,)!
 3 f0 (1211|0@5@7&#,)!
 3 f1211 (1211|0@5@7&#,)!
 3 f0 (1211|0@5@7&#,1211|@5|0@5@7&#,)!
@@ -16693,21 +16685,21 @@
 3 f0 ()!
 3 f1211 ()!
 3 f0 (1211|0@5@7&#,1383|4@0@7&#,)!
-3 f10763 (1211|0@5@7&#,1383|4@0@7&#,)!
+3 f10757 (1211|0@5@7&#,1383|4@0@7&#,)!
 3 f0 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
-3 f10763 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
+3 f10757 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
 2 F0/0|0&
 2 F4/0|4&
 3 f0 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
-3 f10763 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
+3 f10757 (1211|0@5@7&#,1211|0@5@7&#,1383|4@0@7&#,)!
 2 F0/0|0&
 2 F4/0|4&
 3 f0 (1211|0@5@7&#,)!
 3 f2 (1211|0@5@7&#,)!
 3 f0 (23|$#,)!
 3 f2 (23|$#,)!
-3 f0 (12461|$#,12461|4@0@7&#,10873|4@0@7&#,)!
-3 f2 (12461|$#,12461|4@0@7&#,10873|4@0@7&#,)!
+3 f0 (12453|$#,12453|4@0@7&#,10867|4@0@7&#,)!
+3 f2 (12453|$#,12453|4@0@7&#,10867|4@0@7&#,)!
 3 f0 (1211|0@5@7&#,)!
 3 f1211 (1211|0@5@7&#,)!
 3 f0 (23|0@5@7&#,)!
@@ -16771,28 +16763,28 @@
 3 f0 (8380|0@0@2&#,)!
 3 f1 (8380|0@0@2&#,)!
 3 f0 ()!
-3 f15894 ()!
+3 f15886 ()!
 1 t1082|1082&
 3 f0 ()!
-3 f15894 ()!
-3 f0 (15894|0@2@7&#,)!
-3 f1 (15894|0@2@7&#,)!
-3 f0 (15894|@5|0@5@7&#,1082|0@5@4&#,)!
-3 f1 (15894|@5|0@5@7&#,1082|0@5@4&#,)!
-3 f0 (15894|0@5@7&#,)!
-3 f1082 (15894|0@5@7&#,)!
-3 f0 (15894|0@5@7&#,)!
-3 f1 (15894|0@5@7&#,)!
-3 f0 (15894|0@5@7&#,1082|0@5@2&#,)!
-3 f2 (15894|0@5@7&#,1082|0@5@2&#,)!
-3 f0 (15894|0@5@7&#,)!
-3 f1211 (15894|0@5@7&#,)!
-3 f0 (15894|0@5@7&#,)!
-3 f5 (15894|0@5@7&#,)!
-3 f0 (15894|0@5@7&#,)!
-3 f1 (15894|0@5@7&#,)!
-3 f0 (15894|0@5@2&#,)!
-3 f1 (15894|0@5@2&#,)!
+3 f15886 ()!
+3 f0 (15886|0@2@7&#,)!
+3 f1 (15886|0@2@7&#,)!
+3 f0 (15886|@5|0@5@7&#,1082|0@5@4&#,)!
+3 f1 (15886|@5|0@5@7&#,1082|0@5@4&#,)!
+3 f0 (15886|0@5@7&#,)!
+3 f1082 (15886|0@5@7&#,)!
+3 f0 (15886|0@5@7&#,)!
+3 f1 (15886|0@5@7&#,)!
+3 f0 (15886|0@5@7&#,1082|0@5@2&#,)!
+3 f2 (15886|0@5@7&#,1082|0@5@2&#,)!
+3 f0 (15886|0@5@7&#,)!
+3 f1211 (15886|0@5@7&#,)!
+3 f0 (15886|0@5@7&#,)!
+3 f5 (15886|0@5@7&#,)!
+3 f0 (15886|0@5@7&#,)!
+3 f1 (15886|0@5@7&#,)!
+3 f0 (15886|0@5@2&#,)!
+3 f1 (15886|0@5@2&#,)!
 3 f0 ()!
 3 f2392 ()!
 3 f0 ()!
@@ -16820,9 +16812,9 @@
 3 f0 (2392|0@5@7&#,)!
 3 f1 (2392|0@5@7&#,)!
 3 ?!
-3 f16817 (20|$#,20|$#,)!
-3 f5 (20|$#,20|$#,)^16820
-1 t16819|16819&
+3 f16809 (20|$#,20|$#,)!
+3 f5 (20|$#,20|$#,)^16812
+1 t16811|16811&
 3 f0 (2392|0@5@7&#,1211|0@5@7&#,)!
 3 f5 (2392|0@5@7&#,1211|0@5@7&#,)!
 3 f0 (2392|0@5@7&#,1211|0@5@7&#,)!
@@ -16856,9 +16848,9 @@
 3 f0 (2360|0@5@7&#,)!
 3 f1 (2360|0@5@7&#,)!
 3 ?!
-3 f16853 (20|$#,20|$#,)!
-3 f5 (20|$#,20|$#,)^16856
-1 t16855|16855&
+3 f16845 (20|$#,20|$#,)!
+3 f5 (20|$#,20|$#,)^16848
+1 t16847|16847&
 3 f0 ()!
 3 f8168 ()!
 3 f0 (8168|0@2@7&#,)!
@@ -16908,8 +16900,8 @@
 3 f1211 (4476|$#,)!
 3 f0 (4476|$#,)!
 3 f1211 (4476|$#,)!
-3 f0 (12461|$#,)!
-3 f4476 (12461|$#,)!
+3 f0 (12453|$#,)!
+3 f4476 (12453|$#,)!
 3 f0 (4476|0@0@2&#,)!
 3 f1 (4476|0@0@2&#,)!
 3 f0 (4506|0@0@2&#,)!
@@ -16944,19 +16936,19 @@
 3 f0 (4309|0@0@2&#,)!
 3 f1 (4309|0@0@2&#,)!
 3 f0 ()!
-3 f9921 ()!
-3 f0 (9921|$#,)!
-3 f1 (9921|$#,)!
-3 f0 (9921|$#,1067|0@5@18@2@0#,)!
-3 f1 (9921|$#,1067|0@5@18@2@0#,)!
-3 f0 (9921|@5|$#,9921|0@0@2&#,)!
-3 f9921 (9921|@5|$#,9921|0@0@2&#,)!
+3 f9919 ()!
+3 f0 (9919|$#,)!
+3 f1 (9919|$#,)!
+3 f0 (9919|$#,1067|0@5@18@2@0#,)!
+3 f1 (9919|$#,1067|0@5@18@2@0#,)!
+3 f0 (9919|@5|$#,9919|0@0@2&#,)!
+3 f9919 (9919|@5|$#,9919|0@0@2&#,)!
 3 f0 (1067|0@5@18@2@0#,)!
-3 f9921 (1067|0@5@18@2@0#,)!
-3 f0 (9921|$#,)!
-3 f1211 (9921|$#,)!
-3 f0 (9921|0@0@2&#,)!
-3 f1 (9921|0@0@2&#,)!
+3 f9919 (1067|0@5@18@2@0#,)!
+3 f0 (9919|$#,)!
+3 f1211 (9919|$#,)!
+3 f0 (9919|0@0@2&#,)!
+3 f1 (9919|0@0@2&#,)!
 3 f0 ()!
 3 f4866 ()!
 3 f0 (1050|0@5@4&#,)!
@@ -17190,21 +17182,21 @@
 3 f0 (1200|0@5@7&#,1200|0@5@7&#,)!
 3 f5 (1200|0@5@7&#,1200|0@5@7&#,)!
 3 f0 ()!
-3 f15918 ()!
-3 f0 (15918|$#,)!
-3 f1 (15918|$#,)!
-3 f0 (15918|$#,5|$#,)!
-3 f2 (15918|$#,5|$#,)!
-3 f0 (15918|$#,5|$#,)!
-3 f2 (15918|$#,5|$#,)!
-3 f0 (15918|$#,)!
-3 f1211 (15918|$#,)!
-3 f0 (15918|$#,)!
-3 f1211 (15918|$#,)!
-3 f0 (15918|0@0@2&#,)!
-3 f1 (15918|0@0@2&#,)!
-0 s7887|-1 17202 -1
-1 t17201|17201&
+3 f15910 ()!
+3 f0 (15910|$#,)!
+3 f1 (15910|$#,)!
+3 f0 (15910|$#,5|$#,)!
+3 f2 (15910|$#,5|$#,)!
+3 f0 (15910|$#,5|$#,)!
+3 f2 (15910|$#,5|$#,)!
+3 f0 (15910|$#,)!
+3 f1211 (15910|$#,)!
+3 f0 (15910|$#,)!
+3 f1211 (15910|$#,)!
+3 f0 (15910|0@0@2&#,)!
+3 f1 (15910|0@0@2&#,)!
+0 s7887|-1 17194 -1
+1 t17193|17193&
 3 f0 (4806|0@5@2&#,)!
 3 f1 (4806|0@5@2&#,)!
 3 f0 ()!
@@ -17369,17 +17361,17 @@
 3 f0 (1073|0@5@7&#,)!
 3 f1073 (1073|0@5@7&#,)!
 3 ?!
-3 f17366 (1047|0@5@7&#,1047|0@5@7&#,)!
-3 f2 (1047|0@5@7&#,1047|0@5@7&#,)^17369
-1 t17368|17368&
-3 f0 (17369|$#,1073|0@5@7&#,1047|0@5@7&#,)!
-3 f2 (17369|$#,1073|0@5@7&#,1047|0@5@7&#,)!
+3 f17358 (1047|0@5@7&#,1047|0@5@7&#,)!
+3 f2 (1047|0@5@7&#,1047|0@5@7&#,)^17361
+1 t17360|17360&
+3 f0 (17361|$#,1073|0@5@7&#,1047|0@5@7&#,)!
+3 f2 (17361|$#,1073|0@5@7&#,1047|0@5@7&#,)!
 3 ?!
-3 f17372 (1047|0@5@7&#,)!
-3 f2 (1047|0@5@7&#,)^17375
-1 t17374|17374&
-3 f0 (17375|$#,1073|0@5@7&#,)!
-3 f2 (17375|$#,1073|0@5@7&#,)!
+3 f17364 (1047|0@5@7&#,)!
+3 f2 (1047|0@5@7&#,)^17367
+1 t17366|17366&
+3 f0 (17367|$#,1073|0@5@7&#,)!
+3 f2 (17367|$#,1073|0@5@7&#,)!
 3 f0 (1073|0@5@7&#,)!
 3 f2 (1073|0@5@7&#,)!
 3 f0 (1073|0@5@7&#,1047|0@5@7&#,)!
@@ -17904,9 +17896,9 @@
 3 e!255{CHC_NULL,IDCHAR,OPCHAR,SLASHCHAR,WHITECHAR,CHC_EXTENSION,SINGLECHAR,PERMCHAR}!
 0 s7916|&
 0 s7917|&
-3 S!256{17901|@1|^#code,2|@1|^#endCommentChar,}!
+3 S!256{17893|@1|^#code,2|@1|^#endCommentChar,}!
 0 s7918|&
-0 s7919|-1 -1 17963
+0 s7919|-1 -1 17955
 3 f0 (23|$#,)!
 3 f1 (23|$#,)!
 3 f0 ()!
@@ -17920,11 +17912,11 @@
 3 f0 ()!
 3 f1 ()!
 3 f0 (4|$#,)!
-3 f17901 (4|$#,)!
+3 f17893 (4|$#,)!
 3 f0 (4|$#,)!
 3 f2 (4|$#,)!
-3 f0 (4|$#,17901|$#,)!
-3 f1 (4|$#,17901|$#,)!
+3 f0 (4|$#,17893|$#,)!
+3 f1 (4|$#,17893|$#,)!
 3 f0 (4|$#,2|$#,)!
 3 f1 (4|$#,2|$#,)!
 3 f0 ()!
@@ -17962,10 +17954,10 @@
 3 f0 (23|0@0@6&#,)!
 3 f1 (23|0@0@6&#,)!
 2 F0/0|0&
-2 F17904/0|17904&
+2 F17896/0|17896&
 2 F0/0|0&
 2 F4/0|4&
-2 y17904|17904&
+2 y17896|17896&
 3 f0 (23|$#,)!
 3 f1 (23|$#,)!
 3 f0 ()!
@@ -17981,11 +17973,11 @@
 3 f0 ()!
 3 f1 ()!
 3 f0 (4|$#,)!
-3 f17901 (4|$#,)!
+3 f17893 (4|$#,)!
 3 f0 (4|$#,)!
 3 f2 (4|$#,)!
-3 f0 (4|$#,17901|$#,)!
-3 f1 (4|$#,17901|$#,)!
+3 f0 (4|$#,17893|$#,)!
+3 f1 (4|$#,17893|$#,)!
 3 f0 (4|$#,2|$#,)!
 3 f1 (4|$#,2|$#,)!
 3 e!257{INITFILE1,INITLINES1,INITLINES2,INITLINES3,INITLINE1,INITLINE2,CLASSIFICATION1,CLASSIFICATION2,CLASSIFICATION3,CHARCLASS1,CHARCLASS2,CHARCLASS3,CHARCLASS4,CHARCLASS5,CHARCLASS6,LRC_ENDCOMMENT1,LRC_ENDCOMMENT2,IDCHARS1,IDCHARS2,OPCHARS1,OPCHARS2,LRC_EXTENSIONCHAR1,SINGCHARS1,SINGCHARS2,WHITECHARS1,WHITECHARS2,LRC_ENDCOMMENTCHAR1,IDCHAR1,OPCHAR1,SINGCHAR1,WHITECHAR1,TOKENCLASS1,TOKENCLASS2,TOKENCLASS3,TOKENCLASS4,TOKENCLASS5,TOKENCLASS6,TOKENCLASS7,TOKENCLASS8,TOKENCLASS9,TOKENCLASS10,TOKENCLASS11,TOKENCLASS12,TOKENCLASS13,QUANTIFIERSYMTOKS1,QUANTIFIERSYMTOKS2,LOGICALOPTOKS1,LOGICALOPTOKS2,LRC_EQOPTOKS1,LRC_EQOPTOKS2,LRC_EQUATIONSYMTOKS1,LRC_EQUATIONSYMTOKS2,LRC_EQSEPSYMTOKS1,LRC_EQSEPSYMTOKS2,SELECTSYMTOKS1,SELECTSYMTOKS2,OPENSYMTOKS1,OPENSYMTOKS2,SEPSYMTOKS1,SEPSYMTOKS2,CLOSESYMTOKS1,CLOSESYMTOKS2,SIMPLEIDTOKS1,SIMPLEIDTOKS2,MAPSYMTOKS1,MAPSYMTOKS2,MARKERSYMTOKS1,MARKERSYMTOKS2,COMMENTSYMTOKS1,COMMENTSYMTOKS2,QUANTIFIERSYMTOK1,LOGICALOPTOK1,LRC_EQOPTOK1,LRC_EQUATIONSYMTOK1,LRC_EQSEPSYMTOK1,SELECTSYMTOK1,OPENSYMTOK1,SEPSYMTOK1,CLOSESYMTOK1,SIMPLEIDTOK1,MAPSYMTOK1,MARKERSYMTOK1,COMMENTSYMTOK1,SYNCLASS1,OLDTOKEN1,NEWTOKEN1}!
@@ -18119,8 +18111,8 @@
 3 f3112 (3677|0@5@7&#,3888|$#,1036|$#,)!
 3 S!259{1236|@1|^#pt,2819|@1|^#ts,}!
 0 s8047|&
-0 s8048|-1 -1 18118
-2 y18117|18117&
+0 s8048|-1 -1 18110
+2 y18109|18109&
 3 f0 (1236|$#,)!
 3 f1037 (1236|$#,)!
 3 f0 (1236|$#,)!
@@ -18243,16 +18235,16 @@
 3 f1 ()!
 3 f0 ()!
 3 f1 ()!
-3 f0 (17988|$#,)!
-3 f1 (17988|$#,)!
-3 f0 (17901|$#,)!
-3 f1 (17901|$#,)!
+3 f0 (17980|$#,)!
+3 f1 (17980|$#,)!
+3 f0 (17893|$#,)!
+3 f1 (17893|$#,)!
 3 f0 ()!
 3 f1 ()!
 3 f0 ()!
 3 f1 ()!
-3 f0 (17901|$#,)!
-3 f1 (17901|$#,)!
+3 f0 (17893|$#,)!
+3 f1 (17893|$#,)!
 3 f0 (1044|$#,)!
 3 f1 (1044|$#,)!
 3 f0 ()!
@@ -18357,16 +18349,16 @@
 3 f1 ()!
 3 f0 ()!
 3 f1 ()!
-3 f0 (17988|$#,)!
-3 f1 (17988|$#,)!
-3 f0 (17901|$#,)!
-3 f1 (17901|$#,)!
+3 f0 (17980|$#,)!
+3 f1 (17980|$#,)!
+3 f0 (17893|$#,)!
+3 f1 (17893|$#,)!
 3 f0 ()!
 3 f1 ()!
 3 f0 ()!
 3 f1 ()!
-3 f0 (17901|$#,)!
-3 f1 (17901|$#,)!
+3 f0 (17893|$#,)!
+3 f1 (17893|$#,)!
 3 f0 (1044|$#,)!
 3 f1 (1044|$#,)!
 3 f0 ()!
@@ -19081,11 +19073,11 @@
 3 f0 ()!
 3 f1 ()!
 3 f0 (4|$#,)!
-3 f17901 (4|$#,)!
+3 f17893 (4|$#,)!
 3 f0 (4|$#,)!
 3 f2 (4|$#,)!
-3 f0 (4|$#,17901|$#,)!
-3 f1 (4|$#,17901|$#,)!
+3 f0 (4|$#,17893|$#,)!
+3 f1 (4|$#,17893|$#,)!
 3 f0 (4|$#,2|$#,)!
 3 f1 (4|$#,2|$#,)!
 3 f0 ()!
@@ -19146,9 +19138,9 @@
 3 f0 (23|0@0@6&#,)!
 3 f1 (23|0@0@6&#,)!
 2 F0/0|0&
-2 F17904/0|17904&
+2 F17896/0|17896&
 2 F0/0|0&
-2 F19130/0|19130&
+2 F19122/0|19122&
 2 F0/0|0&
 2 F2/0|2&
 2 F0/0|0&
@@ -19194,9 +19186,9 @@
 3 f0 (4|$#,)!
 3 f2 (4|$#,)!
 3 f0 (4|$#,)!
-3 f17901 (4|$#,)!
-3 f0 (4|$#,17901|$#,)!
-3 f1 (4|$#,17901|$#,)!
+3 f17893 (4|$#,)!
+3 f0 (4|$#,17893|$#,)!
+3 f1 (4|$#,17893|$#,)!
 3 f0 (4|$#,2|$#,)!
 3 f1 (4|$#,2|$#,)!
 3 f0 ()!
@@ -19289,8 +19281,8 @@
 3 f1037 (1037|$#,1037|$#,)!
 3 f0 (1043|0@5@7&#,1036|$#,2724|$#,)!
 3 f1 (1043|0@5@7&#,1036|$#,2724|$#,)!
-0 s8090|-1 19288 -1
-1 t19287|19287&
+0 s8090|-1 19280 -1
+1 t19279|19279&
 1 t2724|2724&
 3 f0 (2720|0@5@2&#,)!
 3 f1 (2720|0@5@2&#,)!
@@ -19476,8 +19468,8 @@
 3 f0 (23|$#,)!
 3 f2 (23|$#,)!
 1 t4238|4238&
-3 f0 (19473|$#,211|$#,2|$#,)!
-3 f1 (19473|$#,211|$#,2|$#,)!
+3 f0 (19465|$#,211|$#,2|$#,)!
+3 f1 (19465|$#,211|$#,2|$#,)!
 3 f0 (4211|0@0@2&#,)!
 3 f1 (4211|0@0@2&#,)!
 3 f0 (4241|$#,)!
@@ -19491,71 +19483,71 @@
 0 s8097|&
 3 U!262{4190|@1|0@0@2&#fct,4226|@1|0@0@2&#scope,4194|@1|0@0@2&#type,4201|@1|0@0@2&#var,}!
 0 s8098|&
-3 S!263{19486|@1|^#kind,19487|@1|^#info,}!
+3 S!263{19478|@1|^#kind,19479|@1|^#info,}!
 0 s8099|&
-0 s8100|-1 19492 -1
-1 t19491|19491&
-3 S!264{6|@1|^#size,6|@1|^#allocated,19492|@1|0@3@3&#entries,2|@1|^#exporting,}!
+0 s8100|-1 19484 -1
+1 t19483|19483&
+3 S!264{6|@1|^#size,6|@1|^#allocated,19484|@1|0@3@3&#entries,2|@1|^#exporting,}!
 0 s8101|&
-0 s8102|-1 19496 -1
-1 t19495|19495&
-3 Ss_symtableStruct{19496|@1|0@0@3&#idTable,19473|@1|0@0@3&#hTable,2704|@1|0@0@3&#type2sort,}!
-3 f0 (19492|$#,)!
-3 f1043 (19492|$#,)!
-3 f0 (19496|$#,)!
-3 f19 (19496|$#,)!
-3 f19492 (19496|$#,)!
-3 f0 (19496|$#,1037|$#,)!
-3 f19 (19496|$#,1037|$#,)!
-3 f19492 (19496|$#,1037|$#,)!
-3 f0 (19496|$#,1037|$#,)!
-3 f19 (19496|$#,1037|$#,)!
-3 f19492 (19496|$#,1037|$#,)!
+0 s8102|-1 19488 -1
+1 t19487|19487&
+3 Ss_symtableStruct{19488|@1|0@0@3&#idTable,19465|@1|0@0@3&#hTable,2704|@1|0@0@3&#type2sort,}!
+3 f0 (19484|$#,)!
+3 f1043 (19484|$#,)!
+3 f0 (19488|$#,)!
+3 f19 (19488|$#,)!
+3 f19484 (19488|$#,)!
+3 f0 (19488|$#,1037|$#,)!
+3 f19 (19488|$#,1037|$#,)!
+3 f19484 (19488|$#,1037|$#,)!
+3 f0 (19488|$#,1037|$#,)!
+3 f19 (19488|$#,1037|$#,)!
+3 f19484 (19488|$#,1037|$#,)!
 3 f0 ()!
 3 f19 ()!
-3 f19496 ()!
-3 f0 (19491|$#,)!
-3 f1 (19491|$#,)!
+3 f19488 ()!
+3 f0 (19483|$#,)!
+3 f1 (19483|$#,)!
 3 f0 (4227|$#,)!
 3 f4186 (4227|$#,)!
-3 f0 (19473|0@0@2&#,)!
-3 f1 (19473|0@0@2&#,)!
+3 f0 (19465|0@0@2&#,)!
+3 f1 (19465|0@0@2&#,)!
 3 f0 (6|$#,)!
 3 f19 (6|$#,)!
-3 f19473 (6|$#,)!
-3 f0 (19473|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
-3 f19 (19473|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
-3 f4227 (19473|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
-3 f0 (19473|$#,4227|0@0@2&#,)!
-3 f2 (19473|$#,4227|0@0@2&#,)!
-3 f0 (19473|$#,4227|0@0@2&#,)!
-3 f19 (19473|$#,4227|0@0@2&#,)!
-3 f4227 (19473|$#,4227|0@0@2&#,)!
-3 f0 (19496|0@0@2&#,)!
-3 f1 (19496|0@0@2&#,)!
+3 f19465 (6|$#,)!
+3 f0 (19465|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
+3 f19 (19465|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
+3 f4227 (19465|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
+3 f0 (19465|$#,4227|0@0@2&#,)!
+3 f2 (19465|$#,4227|0@0@2&#,)!
+3 f0 (19465|$#,4227|0@0@2&#,)!
+3 f19 (19465|$#,4227|0@0@2&#,)!
+3 f4227 (19465|$#,4227|0@0@2&#,)!
+3 f0 (19488|0@0@2&#,)!
+3 f1 (19488|0@0@2&#,)!
 3 f0 (4201|0@0@2&#,)!
 3 f1 (4201|0@0@2&#,)!
 3 f0 (4201|$#,)!
 3 f4201 (4201|$#,)!
 3 f0 (4241|0@0@2&#,)!
 3 f1 (4241|0@0@2&#,)!
-3 f0 (19496|0@0@2&#,)!
-3 f1 (19496|0@0@2&#,)!
+3 f0 (19488|0@0@2&#,)!
+3 f1 (19488|0@0@2&#,)!
 3 f0 (4190|0@0@2&#,)!
 3 f1 (4190|0@0@2&#,)!
 3 f0 (4194|0@0@2&#,)!
 3 f1 (4194|0@0@2&#,)!
 3 f0 (4226|0@0@2&#,)!
 3 f1 (4226|0@0@2&#,)!
-3 f0 (19491|$#,)!
-3 f1 (19491|$#,)!
-3 f0 (19492|$#,)!
-3 f1043 (19492|$#,)!
+3 f0 (19483|$#,)!
+3 f1 (19483|$#,)!
+3 f0 (19484|$#,)!
+3 f1043 (19484|$#,)!
 3 f0 ()!
 3 f4241 ()!
 3 f0 ()!
 3 f19 ()!
-3 f19496 ()!
+3 f19488 ()!
 3 f0 (3677|$#,)!
 3 f1037 (3677|$#,)!
 3 f0 (4227|$#,3626|0@0@17&#,)!
@@ -19594,8 +19586,8 @@
 3 f4226 (4241|$#,)!
 3 f0 (4241|$#,2|$#,)!
 3 f1 (4241|$#,2|$#,)!
-3 f0 (19473|$#,211|$#,2|$#,)!
-3 f1 (19473|$#,211|$#,2|$#,)!
+3 f0 (19465|$#,211|$#,2|$#,)!
+3 f1 (19465|$#,211|$#,2|$#,)!
 1 t4231|4231&
 3 f0 (4241|$#,211|$#,2|$#,)!
 3 f1 (4241|$#,211|$#,2|$#,)!
@@ -19613,10 +19605,10 @@
 2 F4/0|4&
 3 f0 (23|$#,)!
 3 f2 (23|$#,)!
-0 s8103|-1 19614 -1
+0 s8103|-1 19606 -1
 3 f0 (23|$#,1094|0@5@7&#,2704|$#,)!
 3 f1 (23|$#,1094|0@5@7&#,2704|$#,)!
-1 t19611|19611&
+1 t19603|19603&
 2 F0/0|0&
 2 F4/0|4&
 2 F0/20|0&
@@ -19628,37 +19620,37 @@
 3 f1 (1094|0@5@7&#,1043|0@5@7&#,2704|$#,)!
 3 f0 (4241|$#,211|$#,2|$#,)!
 3 f1 (4241|$#,211|$#,2|$#,)!
-3 f0 (19496|$#,)!
-3 f19 (19496|$#,)!
-3 f19492 (19496|$#,)!
-3 f0 (19496|$#,1037|$#,)!
-3 f19 (19496|$#,1037|$#,)!
-3 f19492 (19496|$#,1037|$#,)!
-3 f0 (19496|$#,1037|$#,)!
-3 f19 (19496|$#,1037|$#,)!
-3 f19492 (19496|$#,1037|$#,)!
+3 f0 (19488|$#,)!
+3 f19 (19488|$#,)!
+3 f19484 (19488|$#,)!
+3 f0 (19488|$#,1037|$#,)!
+3 f19 (19488|$#,1037|$#,)!
+3 f19484 (19488|$#,1037|$#,)!
+3 f0 (19488|$#,1037|$#,)!
+3 f19 (19488|$#,1037|$#,)!
+3 f19484 (19488|$#,1037|$#,)!
 3 f0 (4227|$#,)!
 3 f4186 (4227|$#,)!
 3 f0 (4227|0@5@2&#,)!
 3 f1 (4227|0@5@2&#,)!
 3 f0 (4233|0@5@2&#,)!
 3 f1 (4233|0@5@2&#,)!
-3 f0 (19473|0@0@2&#,)!
-3 f1 (19473|0@0@2&#,)!
+3 f0 (19465|0@0@2&#,)!
+3 f1 (19465|0@0@2&#,)!
 3 f0 (6|$#,)!
 3 f19 (6|$#,)!
-3 f19473 (6|$#,)!
+3 f19465 (6|$#,)!
 1 t4233|4233&
-3 f0 (19473|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
-3 f19 (19473|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
-3 f4227 (19473|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
-3 f0 (19473|$#,4227|0@0@2&#,)!
-3 f2 (19473|$#,4227|0@0@2&#,)!
-3 f0 (19473|$#,4227|0@0@2&#,)!
-3 f19 (19473|$#,4227|0@0@2&#,)!
-3 f4227 (19473|$#,4227|0@0@2&#,)!
-3 f0 (19473|$#,)!
-3 f1 (19473|$#,)!
+3 f0 (19465|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
+3 f19 (19465|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
+3 f4227 (19465|$#,4186|$#,4214|$#,3677|0@5@7&#,)!
+3 f0 (19465|$#,4227|0@0@2&#,)!
+3 f2 (19465|$#,4227|0@0@2&#,)!
+3 f0 (19465|$#,4227|0@0@2&#,)!
+3 f19 (19465|$#,4227|0@0@2&#,)!
+3 f4227 (19465|$#,4227|0@0@2&#,)!
+3 f0 (19465|$#,)!
+3 f1 (19465|$#,)!
 3 f0 (4241|$#,)!
 3 f1 (4241|$#,)!
 3 f0 (3028|$#,)!
@@ -19774,16 +19766,16 @@
 3 f1 ()!
 3 f0 ()!
 3 f1 ()!
-3 f0 (19671|$#,)!
-3 f1 (19671|$#,)!
-3 f0 (17901|$#,)!
-3 f1 (17901|$#,)!
+3 f0 (19663|$#,)!
+3 f1 (19663|$#,)!
+3 f0 (17893|$#,)!
+3 f1 (17893|$#,)!
 3 f0 ()!
 3 f1 ()!
 3 f0 ()!
 3 f1 ()!
-3 f0 (17901|$#,)!
-3 f1 (17901|$#,)!
+3 f0 (17893|$#,)!
+3 f1 (17893|$#,)!
 3 f0 (1044|$#,)!
 3 f1 (1044|$#,)!
 3 f0 ()!
@@ -19890,16 +19882,16 @@
 3 f1 ()!
 3 f0 ()!
 3 f1 ()!
-3 f0 (19671|$#,)!
-3 f1 (19671|$#,)!
-3 f0 (17901|$#,)!
-3 f1 (17901|$#,)!
+3 f0 (19663|$#,)!
+3 f1 (19663|$#,)!
+3 f0 (17893|$#,)!
+3 f1 (17893|$#,)!
 3 f0 ()!
 3 f1 ()!
 3 f0 ()!
 3 f1 ()!
-3 f0 (17901|$#,)!
-3 f1 (17901|$#,)!
+3 f0 (17893|$#,)!
+3 f1 (17893|$#,)!
 3 f0 (1044|$#,)!
 3 f1 (1044|$#,)!
 3 f0 ()!
@@ -19945,18 +19937,18 @@
 3 f0 ()!
 3 f1 ()!
 0 s8111|&
-3 S!266{1037|@1|^#HashNext,19942|@1|^#i,}!
+3 S!266{1037|@1|^#HashNext,19934|@1|^#i,}!
 0 s8112|&
-0 s8113|-1 19954 -1
+0 s8113|-1 19946 -1
 3 f0 (6|$#,)!
 3 f1 (6|$#,)!
 3 f0 (23|0@0@9&#,)!
-3 f19942 (23|0@0@9&#,)!
+3 f19934 (23|0@0@9&#,)!
 3 f0 (6|$#,)!
 3 f1 (6|$#,)!
 3 f0 (23|$#,10|$#,)!
 3 f1037 (23|$#,10|$#,)!
-1 t19945|19945&
+1 t19937|19937&
 3 f0 (1211|0@5@6&#,)!
 3 f1037 (1211|0@5@6&#,)!
 3 f0 (23|0@0@6&#,)!
@@ -19972,7 +19964,7 @@
 3 f0 (6|$#,)!
 3 f1 (6|$#,)!
 3 f0 (23|0@0@9&#,)!
-3 f19942 (23|0@0@9&#,)!
+3 f19934 (23|0@0@9&#,)!
 3 f0 (6|$#,)!
 3 f1 (6|$#,)!
 3 f0 (23|$#,10|$#,)!
@@ -20480,7 +20472,7 @@
 3 f0 (1067|0@5@7&#,)!
 3 f1 (1067|0@5@7&#,)!
 3 f0 (1067|0@5@18&#,)!
-3 f9921 (1067|0@5@18&#,)!
+3 f9919 (1067|0@5@18&#,)!
 3 f0 (1067|0@5@7&#,1211|0@5@18&#,)!
 3 f1 (1067|0@5@7&#,1211|0@5@18&#,)!
 3 f0 (1067|0@5@7&#,1047|0@5@19@2@0#,1082|0@5@7&#,)!
@@ -20794,7 +20786,7 @@
 3 f0 (1213|$#,1067|0@5@7&#,)!
 3 f2 (1213|$#,1067|0@5@7&#,)!
 3 f0 (1067|0@5@18&#,)!
-3 f9921 (1067|0@5@18&#,)!
+3 f9919 (1067|0@5@18&#,)!
 3 f0 (1067|@5|0@5@7&#,)!
 3 f1067 (1067|@5|0@5@7&#,)!
 3 f0 (1067|@5|0@5@7&#,)!
@@ -20928,8 +20920,8 @@
 3 f0 (5|$#,)!
 3 f1 (5|$#,)!
 1 t2360|2360&
-3 f0 (211|$#,20925|$#,)!
-3 f1 (211|$#,20925|$#,)!
+3 f0 (211|$#,20917|$#,)!
+3 f1 (211|$#,20917|$#,)!
 3 f0 ()!
 3 f1 ()!
 3 f0 (23|$#,)!
@@ -20983,8 +20975,8 @@
 3 f1 ()!
 3 f0 (5|$#,)!
 3 f1 (5|$#,)!
-3 f0 (211|$#,20925|$#,)!
-3 f1 (211|$#,20925|$#,)!
+3 f0 (211|$#,20917|$#,)!
+3 f1 (211|$#,20917|$#,)!
 3 f0 (9668|0@5@7&#,2|$#,)!
 3 f9668 (9668|0@5@7&#,2|$#,)!
 3 f0 (23|$#,315|4@0@7&#,)!
@@ -21547,7 +21539,7 @@
 ^214 340@6@0@6@0@0^$@0#exit
 ^215 346$@0@s1@1@s1$@0#atexit
 ^216 349@6@5@1@0@0^@19@3@0#getenv
-^217 16709$@0@s3@1@s3$@0#system
+^217 16701$@0@s3@1@s3$@0#system
 ^218 358@6@5@1@0@0^@18@0@0#bsearch
 ^219 364$@0@g22@6@0@1@tp0,g22$@0#qsort
 ^220 366$^$@0#abs
@@ -21795,7 +21787,7 @@
 ^572 788$@0@g22@6@0@1@g22,tp1$@0#fstat
 ^573 790$@0@s3,g22@6@0@1@s3,g22$@0#mkdir
 ^574 792$@0@s3,g22@6@0@1@s3,g22$@0#mkfifo
-^575 16679$@0@g22@6@0@1@g22,tp1$@0#stat
+^575 16671$@0@g22@6@0@1@g22,tp1$@0#stat
 ^576 796$@0@s3@1@s3$@0#umask
 *7 (Struct tag)
 ^577 797@798#@tms
@@ -21889,7 +21881,7 @@
 ^748 947$@0@g22@6@0@1@g22$@0#tcgetpgrp
 ^749 949$@0@g22@6@0,s3@1@g22,s3$@0#tcsetpgrp
 ^750 952@6@5@1@0@0@0@g22@6@0@1@g22@19@3@0#ttyname
-^751 16713$@0@s3,g22@6@0@1@s3,g22$@0#unlink
+^751 16705$@0@s3,g22@6@0@1@s3,g22$@0#unlink
 ^752 956$@0@g22@6@0@1@g22$@0#write
 *7 (Struct tag)
 ^753 957@958#@utimbuf
@@ -21926,7 +21918,7 @@
 ^1012 1304$$$@0#mstring_free
 ^1013 1302@6@2@1@0@0^@2@0@0#mstring_createEmpty
 ^1014 1306$^$@0#int_compare
-^1015 20988$$$@0#generic_compare
+^1015 20980$$$@0#generic_compare
 *3 (Variable)
 ^1016 0|@11|^#GET
 *1 (Constant)
@@ -22224,7 +22216,7 @@
 ^1282 0$#LLERROR_H
 *4 (Function)
 ^1283 2431$$$@0#check
-^1284 20989@6@0@8@0@0$$@0#llassert
+^1284 20981@6@0@8@0@0$$@0#llassert
 ^1285 2437@6@0@8@0@0$$@0#llassertretnull
 ^1286 2439@6@0@8@0@0$$@0#llassertprotect
 ^1287 2441@6@0@8@0@0$$@0#llassertfatal
@@ -22990,11 +22982,11 @@
 *3 (Variable)
 ^1937 0|@11|^#yyinput#RETURN_INT#RETURN_FLOAT#RETURN_CHAR#RETURN_TOK#RETURN_TYPE#RETURN_STRING#RETURN_EXPR#YY_NO_PUSH_STATE#YY_NO_POP_STATE#YY_NO_TOP_STATE#YY_READ_BUF_SIZE#YY_INPUT#yyterminate#YY_START_STACK_INCR#YY_FATAL_ERROR#YY_DECL#YY_USER_ACTION#YY_BREAK#YY_RULE_SETUP#YY_EXIT_FAILURE
 *1 (Constant)
-^1958 0$#MTGRAMMAR_H
+^1958 0$#LLBASIC_H#LLGLOBALS_H#MTGRAMMAR_H
 *3 (Variable)
-^1959 0|@11|^#MT_BADTOK#MT_END#MT_STATE#MT_GLOBAL#MT_CONTEXT#MT_ONEOF#MT_DEFAULTS#MT_DEFAULT#MT_REFERENCE#MT_PARAMETER#MT_RESULT#MT_CLAUSE#MT_LITERAL#MT_NULL#MT_ANNOTATIONS#MT_ARROW#MT_MERGE#MT_TRANSFERS#MT_PRECONDITIONS#MT_POSTCONDITIONS#MT_LOSEREFERENCE#MT_AS#MT_ERROR#MT_PLUS#MT_STAR#MT_BAR#MT_LPAREN#MT_RPAREN#MT_LBRACKET#MT_RBRACKET#MT_LBRACE#MT_RBRACE#MT_COMMA#MT_CHAR#MT_INT#MT_FLOAT#MT_DOUBLE#MT_VOID#MT_ANYTYPE#MT_INTEGRALTYPE#MT_UNSIGNEDINTEGRALTYPE#MT_SIGNEDINTEGRALTYPE#MT_CONST#MT_VOLATILE#MT_STRINGLIT#MT_IDENT
+^1961 0|@11|^#MT_BADTOK#MT_END#MT_STATE#MT_GLOBAL#MT_CONTEXT#MT_ONEOF#MT_DEFAULTS#MT_DEFAULT#MT_REFERENCE#MT_PARAMETER#MT_RESULT#MT_CLAUSE#MT_LITERAL#MT_NULL#MT_ANNOTATIONS#MT_ARROW#MT_MERGE#MT_TRANSFERS#MT_PRECONDITIONS#MT_POSTCONDITIONS#MT_LOSEREFERENCE#MT_AS#MT_ERROR#MT_PLUS#MT_STAR#MT_BAR#MT_LPAREN#MT_RPAREN#MT_LBRACKET#MT_RBRACKET#MT_LBRACE#MT_RBRACE#MT_COMMA#MT_CHAR#MT_INT#MT_FLOAT#MT_DOUBLE#MT_VOID#MT_ANYTYPE#MT_INTEGRALTYPE#MT_UNSIGNEDINTEGRALTYPE#MT_SIGNEDINTEGRALTYPE#MT_CONST#MT_VOLATILE#MT_STRINGLIT#MT_IDENT
 *1 (Constant)
-^2005 0$#MTSCANNER_H#LLBASIC_H#LLGLOBALS_H
+^2007 0$#MTSCANNER_H
 *4 (Function)
 ^2008 9597$$$@0#yyparse
 ^2009 1007$$$@0#yylex
@@ -23006,22 +22998,22 @@
 *1 (Constant)
 ^2017 0$#exprNodeSList_H
 *4 (Function)
-^2018 10586$^$@0#cppFatalErrors
+^2018 10580$^$@0#cppFatalErrors
 *3 (Variable)
 ^2019 0|@11|^#CPP_OUT_BUFFER
 *4 (Function)
-^2020 10590$^$@0#cppReader_getWritten
-^2021 10593$^@19@2@0#cppReader_getPWritten
-^2022 10595$$$@0#cppReader_reserve
-^2023 10597$@0@@1@tp0$@0#cppReader_putStrN
-^2024 10599$@0@@1@tp0$@0@S:2.0.0.p0,tp0,ftoken_buffer.tp0$2.4.0.flimit.tp0$#cppReader_setWritten
-^2025 10602$$@18@2@0@S:2.0.0.fopts.tp0$#CPPOPTIONS
+^2020 10584$^$@0#cppReader_getWritten
+^2021 10587$^@19@2@0#cppReader_getPWritten
+^2022 10589$$$@0#cppReader_reserve
+^2023 10591$@0@@1@tp0$@0#cppReader_putStrN
+^2024 10593$@0@@1@tp0$@0@S:2.0.0.p0,tp0,ftoken_buffer.tp0$2.4.0.flimit.tp0$#cppReader_setWritten
+^2025 10596$$@18@2@0@S:2.0.0.fopts.tp0$#CPPOPTIONS
 *3 (Variable)
 ^2026 0|@11|^#CPPBUFFER
 *4 (Function)
-^2027 10611$^@19@2@0@S:2.0.0.fbuffer_stack.tp0$#cppReader_nullBuffer
-^2028 10617$@0@@1@s0$@0@S:2.0.0.fopts.tp0$#cppReader_isTraditional
-^2029 10619$^$@0#cppReader_isPedantic
+^2027 10605$^@19@2@0@S:2.0.0.fbuffer_stack.tp0$#cppReader_nullBuffer
+^2028 10611$@0@@1@s0$@0@S:2.0.0.fopts.tp0$#cppReader_isTraditional
+^2029 10613$^$@0#cppReader_isPedantic
 *3 (Variable)
 ^2030 0|@11|^#HOST_BITS_PER_WIDE_INT#HOST_WIDE_INT
 *1 (Constant)
@@ -23057,30 +23049,30 @@
 *1 (Constant)
 ^2065 0$#FATAL_EXIT_CODE#STRUCTNAMES#NAMECHECKS_H
 *4 (Function)
-^2068 12246$^$@0#ctentry_isBogus
+^2068 12238$^$@0#ctentry_isBogus
 *3 (Variable)
 ^2069 0|@11|^#ctentry_getBase#ctentry_getKind#ctentry_getArray#ctentry_getPtr#ctentry_isArray#ctentry_isComplex#ctentry_isPlain#ctentry_isPointer#ctentry_setArray#ctentry_setPtr#ctbase_fixUser
 *4 (Function)
-^2080 12340$$$@0#cttable_lastIndex
+^2080 12332$$$@0#cttable_lastIndex
 *1 (Constant)
 ^2081 0$#CVAR_H#USYMTAB_INTERFACE_H
 *4 (Function)
-^2083 12906$$$@0#declareConstant
-^2084 12908$$$@0#declareVar
-^2085 12910$$$@0#declareType
-^2086 12912$$$@0#declareFcn
-^2087 12914$$$@0#declarePrivConstant
-^2088 12916$$$@0#declarePrivVar
-^2089 12918$$$@0#declarePrivType
-^2090 12920$$$@0#declarePrivFcn
+^2083 12898$$$@0#declareConstant
+^2084 12900$$$@0#declareVar
+^2085 12902$$$@0#declareType
+^2086 12904$$$@0#declareFcn
+^2087 12906$$$@0#declarePrivConstant
+^2088 12908$$$@0#declarePrivVar
+^2089 12910$$$@0#declarePrivType
+^2090 12912$$$@0#declarePrivFcn
 *3 (Variable)
 ^2091 0|@11|^#GETPRINTF
 *1 (Constant)
 ^2092 0$#RANDOMNUMBERS_H#sRefTABLE_H
 *4 (Function)
-^2094 14389@6@0@1@0@53^$@0#sRefTable_isNull
-^2095 14393@6@0@1@0@54^$@0#sRefTable_isDefined
-^2096 14391@6@0@1@0@53^$@0#sRefTable_isEmpty
+^2094 14381@6@0@1@0@53^$@0#sRefTable_isNull
+^2095 14385@6@0@1@0@54^$@0#sRefTable_isDefined
+^2096 14383@6@0@1@0@53^$@0#sRefTable_isEmpty
 *3 (Variable)
 ^2097 0|@11|^#OR#AND#PREDTEST
 *1 (Constant)
@@ -23090,13 +23082,13 @@
 *1 (Constant)
 ^2235 0$#LCLSCAN_H#FILELOCSTACK_H
 *4 (Function)
-^2237 15896@6@0@1@0@54^$@0#filelocStack_isDefined
-^2238 15898$^$@0#filelocStack_size
+^2237 15888@6@0@1@0@54^$@0#filelocStack_isDefined
+^2238 15890$^$@0#filelocStack_size
 *1 (Constant)
 ^2239 0$#intSET_H
 *4 (Function)
-^2240 15923$$$@0#intSet_isEmpty
-^2241 15925$$$@0#intSet_size
+^2240 15915$$$@0#intSet_isEmpty
+^2241 15917$$$@0#intSet_size
 *3 (Variable)
 ^2242 0|@11|^#SETFLAGS#DOSET#modeFlag#plainFlag#specialFlag#plainSpecialFlag#idemSpecialFlag#valueFlag#modeValueFlag#specialValueFlag#debugFlag#debugValueFlag#specialDebugFlag#globalFlag#idemGlobalFlag#globalValueFlag#regStringFlag#idemStringFlag#globalStringFlag#extraArgFlag#globalExtraArgFlag
 *1 (Constant)
@@ -23114,9 +23106,9 @@
 *1 (Constant)
 ^2318 0$#LLGRAMMAR2_H
 *4 (Function)
-^2319 19981$$$@0#MMASH
+^2319 19973$$$@0#MMASH
 ^2320 0$$$@0#exprNode_swap
-^2321 9805$$$@0#swallowMacro
+^2321 9803$$$@0#swallowMacro
 *7 (Struct tag)
 ^2322 3613@1012#@s_opFormNode
 *0 (Datatype)
@@ -23169,7 +23161,7 @@
 *0 (Datatype)
 ^2348 1049@+@=@0@5@0@0@1050#uentry
 *7 (Struct tag)
-^2349 10679@1051#@s_hashNode
+^2349 10673@1051#@s_hashNode
 *0 (Datatype)
 ^2350 1052@-@+@0@0@0@0@1053#hashNode
 ^2351 5@+@-@0@0@0@0@1054#typeIdSet
@@ -23387,52 +23379,52 @@
 ^2463 1227@-@+@0@0@0@0@1228#sRefModVal
 ^2464 1232@-@+@0@0@0@0@1233#sRefShower
 *4 (Function)
-^2465 16607$@0@@1@p0$@0#sfree
+^2465 16599$@0@@1@p0$@0#sfree
 *0 (Datatype)
 ^2466 6@-@-@0@0@0@0@1236#bits
 ^2467 10@-@-@0@0@0@0@1237#Handle
 *4 (Function)
-^2468 16623$^@3@0@0#FormatInt
-^2469 16627$$$@0#firstWord
-^2470 16665$^$@0#size_toInt
-^2471 16667$^$@0#size_toLong
-^2472 16663$^$@0#size_fromInt
-^2473 16671$^$@0#longUnsigned_toInt
-^2474 16673$^$@0#long_toInt
-^2475 16661$^$@0#longUnsigned_fromInt
+^2468 16615$^@3@0@0#FormatInt
+^2469 16619$$$@0#firstWord
+^2470 16657$^$@0#size_toInt
+^2471 16659$^$@0#size_toLong
+^2472 16655$^$@0#size_fromInt
+^2473 16663$^$@0#longUnsigned_toInt
+^2474 16665$^$@0#long_toInt
+^2475 16653$^$@0#longUnsigned_fromInt
 *0 (Datatype)
 ^2476 23@-@+@0@0@0@0@1259#mstring
 ^2477 23@-@+@0@0@19@3@1260#ob_mstring
 ^2478 23@-@+@0@5@19@3@1261#bn_mstring
 *4 (Function)
-^2479 16652@6@2@1@0@0^@19@3@0#mstring_safePrint
-^2480 16632$^@3@0@0#mstring_spaces
-^2481 16637$^@3@0@0#mstring_concat
-^2482 16640$@0@@1@tp0,tp1@3@0@0#mstring_concatFree
-^2483 16643$$@3@0@0#mstring_concatFree1
-^2484 16646$$@3@0@0#mstring_append
-^2485 16649$^@3@0@0#mstring_copy
-^2486 16675$^$@0#mstring_equalPrefix
-^2487 16677$^$@0#mstring_equal
-^2488 16634$^$@0#mstring_containsChar
-^2489 16629$@0@@1@tp0$@0#mstring_markFree
-^2490 16655@6@2@1@0@0^@2@0@0#mstring_create
-^2491 15888$^$@0#isHeaderFile
-^2492 16657$@0@@1@p0$@0#fputline
-^2493 16659$^$@0#int_log
-^2494 16669$^$@0#char_fromInt
-^2495 15886@6@5@1@0@0$@19@2@0#removePreDirs
+^2479 16644@6@2@1@0@0^@19@3@0#mstring_safePrint
+^2480 16624$^@3@0@0#mstring_spaces
+^2481 16629$^@3@0@0#mstring_concat
+^2482 16632$@0@@1@tp0,tp1@3@0@0#mstring_concatFree
+^2483 16635$$@3@0@0#mstring_concatFree1
+^2484 16638$$@3@0@0#mstring_append
+^2485 16641$^@3@0@0#mstring_copy
+^2486 16667$^$@0#mstring_equalPrefix
+^2487 16669$^$@0#mstring_equal
+^2488 16626$^$@0#mstring_containsChar
+^2489 16621$@0@@1@tp0$@0#mstring_markFree
+^2490 16647@6@2@1@0@0^@2@0@0#mstring_create
+^2491 15880$^$@0#isHeaderFile
+^2492 16649$@0@@1@p0$@0#fputline
+^2493 16651$^$@0#int_log
+^2494 16661$^$@0#char_fromInt
+^2495 15878@6@5@1@0@0$@19@2@0#removePreDirs
 ^2496 1320$$$@0#yywrap
-^2497 13794@6@2@1@0@0^@3@0@0#cstring_create
-^2498 13701@6@2@1@0@0$@2@0@0#cstring_newEmpty
-^2499 13776@6@2@1@0@0$@3@0@0#cstring_appendChar
-^2500 13784@6@5@1@0@0^@3@0@0#cstring_concatLength
-^2501 13790@6@2@1@0@0$@3@0@0#cstring_prependChar
-^2502 13788@6@2@1@0@0$@3@0@0#cstring_prependCharO
-^2503 13774@6@5@1@0@0^@3@0@0#cstring_downcase
-^2504 13719@6@5@1@0@0^@3@0@0#cstring_copy
-^2505 13721@6@5@1@0@0^@3@0@0#cstring_copyLength
-^2506 13711$^$@0#cstring_toPosInt
+^2497 13786@6@2@1@0@0^@3@0@0#cstring_create
+^2498 13693@6@2@1@0@0$@2@0@0#cstring_newEmpty
+^2499 13768@6@2@1@0@0$@3@0@0#cstring_appendChar
+^2500 13776@6@5@1@0@0^@3@0@0#cstring_concatLength
+^2501 13782@6@2@1@0@0$@3@0@0#cstring_prependChar
+^2502 13780@6@2@1@0@0$@3@0@0#cstring_prependCharO
+^2503 13766@6@5@1@0@0^@3@0@0#cstring_downcase
+^2504 13711@6@5@1@0@0^@3@0@0#cstring_copy
+^2505 13713@6@5@1@0@0^@3@0@0#cstring_copyLength
+^2506 13703$^$@0#cstring_toPosInt
 *2 (Enum member)
 ^2507 1341$#CGE_SAME#CGE_DISTINCT#CGE_CASE#CGE_LOOKALIKE
 *9 (Enum tag)
@@ -23440,57 +23432,57 @@
 *0 (Datatype)
 ^2512 1342@-@-@0@0@0@0@1343#cmpcode
 *4 (Function)
-^2513 13733$^$@0#cstring_genericEqual
-^2514 13725$$$@0#cstring_replaceLit
-^2515 13703$^$@0#cstring_firstChar
-^2516 13717$^$@0#cstring_lastChar
-^2517 13705$$$@0#cstring_getChar
-^2518 13715$$$@0#cstring_setChar
-^2519 13760@6@2@1@0@0^@19@2@0#cstring_toCharsSafe
-^2520 13762$^$@0#cstring_length
-^2521 13729$^$@0#cstring_contains
-^2522 13723$^$@0#cstring_containsChar
-^2523 13737$^$@0#cstring_equal
-^2524 13741$^$@0#cstring_equalCaseInsensitive
-^2525 13739$^$@0#cstring_equalLen
-^2526 13743$^$@0#cstring_equalLenCaseInsensitive
-^2527 13745$^$@0#cstring_equalPrefix
-^2528 13747$^$@0#cstring_equalCanonicalPrefix
-^2529 13751$^$@0#cstring_compare
-^2530 13749$^$@0#cstring_xcompare
-^2531 13792$^$@0#cstring_hasNonAlphaNumBar
-^2532 13770@6@5@1@0@0^@3@0@0#cstring_elide
-^2533 13768@6@5@1@0@0@0@@1@p0$@0#cstring_clip
-^2534 13727$@0@@1@p0$@0#cstring_stripChars
-^2535 13800@6@5@1@0@0$@18@0@0#cstring_bsearch
-^2536 13735$$$@0#cstring_equalFree
-^2537 13757@6@5@1@0@0^$@0#cstring_fromChars
-^2538 13755$$$@0#cstring_free
+^2513 13725$^$@0#cstring_genericEqual
+^2514 13717$$$@0#cstring_replaceLit
+^2515 13695$^$@0#cstring_firstChar
+^2516 13709$^$@0#cstring_lastChar
+^2517 13697$$$@0#cstring_getChar
+^2518 13707$$$@0#cstring_setChar
+^2519 13752@6@2@1@0@0^@19@2@0#cstring_toCharsSafe
+^2520 13754$^$@0#cstring_length
+^2521 13721$^$@0#cstring_contains
+^2522 13715$^$@0#cstring_containsChar
+^2523 13729$^$@0#cstring_equal
+^2524 13733$^$@0#cstring_equalCaseInsensitive
+^2525 13731$^$@0#cstring_equalLen
+^2526 13735$^$@0#cstring_equalLenCaseInsensitive
+^2527 13737$^$@0#cstring_equalPrefix
+^2528 13739$^$@0#cstring_equalCanonicalPrefix
+^2529 13743$^$@0#cstring_compare
+^2530 13741$^$@0#cstring_xcompare
+^2531 13784$^$@0#cstring_hasNonAlphaNumBar
+^2532 13762@6@5@1@0@0^@3@0@0#cstring_elide
+^2533 13760@6@5@1@0@0@0@@1@p0$@0#cstring_clip
+^2534 13719$@0@@1@p0$@0#cstring_stripChars
+^2535 13792@6@5@1@0@0$@18@0@0#cstring_bsearch
+^2536 13727$$$@0#cstring_equalFree
+^2537 13749@6@5@1@0@0^$@0#cstring_fromChars
+^2538 13747$$$@0#cstring_free
 *1 (Constant)
 ^2539 1211@i0@0@4#cstring_undefined
 *4 (Function)
-^2540 13764@6@5@1@0@0^@3@0@0#cstring_capitalize
-^2541 13766@6@5@1@0@0@0@@1@p0@3@0@0#cstring_capitalizeFree
-^2542 13772@6@5@1@0@0^@3@0@0#cstring_fill
-^2543 13709@6@5@1@0@0^@3@0@0#cstring_prefix
-^2544 13707@6@5@1@0@0^@19@3@0#cstring_suffix
-^2545 13786@6@5@1@0@0^@3@0@0#cstring_concat
-^2546 13778@6@5@1@0@0@0@@1@p0,p1@3@0@0#cstring_concatFree
-^2547 13780@6@5@1@0@0@0@@1@p0@3@0@0#cstring_concatFree1
-^2548 13782@6@5@1@0@0@0@@1@p0@3@0@0#cstring_concatChars
-^2549 13798$^$@0#cstring_toSymbol
-^2550 13753$@0@@1@p0$@0#cstring_markOwned
-^2551 13713@6@5@1@0@0^@3@0@0#cstring_beforeChar
+^2540 13756@6@5@1@0@0^@3@0@0#cstring_capitalize
+^2541 13758@6@5@1@0@0@0@@1@p0@3@0@0#cstring_capitalizeFree
+^2542 13764@6@5@1@0@0^@3@0@0#cstring_fill
+^2543 13701@6@5@1@0@0^@3@0@0#cstring_prefix
+^2544 13699@6@5@1@0@0^@19@3@0#cstring_suffix
+^2545 13778@6@5@1@0@0^@3@0@0#cstring_concat
+^2546 13770@6@5@1@0@0@0@@1@p0,p1@3@0@0#cstring_concatFree
+^2547 13772@6@5@1@0@0@0@@1@p0@3@0@0#cstring_concatFree1
+^2548 13774@6@5@1@0@0@0@@1@p0@3@0@0#cstring_concatChars
+^2549 13790$^$@0#cstring_toSymbol
+^2550 13745$@0@@1@p0$@0#cstring_markOwned
+^2551 13705@6@5@1@0@0^@3@0@0#cstring_beforeChar
 *6 (Iterator finalizer)
 ^2552 0@137#end_cstring_chars
 *5 (Iterator)
 ^2553 1447@137#cstring_chars
 *4 (Function)
-^2554 13802@6@5@1@0@0^@19@3@0#cstring_advanceWhiteSpace
-^2555 13796@6@2@1@0@0^@2@0@0#cstring_copySegment
-^2556 16614@4@0@1@0@0$@2@0@0#dimalloc
-^2557 16617$$@2@0@0#dicalloc
-^2558 16620@4@2@1@0@0$@2@0@0#direalloc
+^2554 13794@6@5@1@0@0^@19@3@0#cstring_advanceWhiteSpace
+^2555 13788@6@2@1@0@0^@2@0@0#cstring_copySegment
+^2556 16606@4@0@1@0@0$@2@0@0#dimalloc
+^2557 16609$$@2@0@0#dicalloc
+^2558 16612@4@2@1@0@0$@2@0@0#direalloc
 *1 (Constant)
 ^2559 10$#INITSYNTABLE
 ^2560 17$#DELTASYNTABLE
@@ -23501,7 +23493,7 @@
 ^2570 23$#INITFILENAME#IO_SUFFIX#LCLINIT_SUFFIX#CTRAITSYMSNAME#CTRAITSPECNAME#CTRAITFILENAMEN
 ^2576 5$#LLSUCCESS#LLFAILURE#LLGIVEUP#LLINTERRUPT#DEFAULTMAXMODS#GIVEUPPARSE#MAXDEPTH#ALIASSEARCHLIMIT#DEFAULT_OPTLEVEL#SMALLBASESIZE#MIDBASESIZE#LARGEBASESIZE#BIGBASESIZE#HUGEBASESIZE#FTHASHSIZE#CBASESIZE#CGLOBBASESIZE#CGLOBHASHSIZE#LLHASHSIZE
 *4 (Function)
-^2595 16609$@0@s1@1@s1$@0#sfreeEventually
+^2595 16601$@0@s1@1@s1$@0#sfreeEventually
 *0 (Datatype)
 ^2596 23@-@+@0@0@18@0@1487#d_char
 *1 (Constant)
@@ -23513,9 +23505,9 @@
 *0 (Datatype)
 ^2602 1489@-@-@0@0@0@0@1490#ynm
 *4 (Function)
-^2603 14381$^$@0#ynm_compare
-^2604 14379$^$@0#ynm_fromCodeChar
-^2605 13917@6@5@1@3@0^@2@0@0#message
+^2603 14373$^$@0#ynm_compare
+^2604 14371$^$@0#ynm_fromCodeChar
+^2605 13909@6@5@1@3@0^@2@0@0#message
 *0 (Datatype)
 ^2606 5@+@-@0@0@0@0@1513#fileId
 *1 (Constant)
@@ -23528,62 +23520,62 @@
 ^2619 1523@-@-@0@0@0@0@1524#flkind
 ^2620 1082@-@+@0@5@2@0@1526#o_fileloc
 *4 (Function)
-^2621 13816@6@5@1@0@0@0@@1@p0@3@0@0#fileloc_update
-^2622 13878@6@5@1@0@0^@3@0@0#fileloc_create
-^2623 13846$^$@0#fileloc_isSystemFile
-^2624 13848$^$@0#fileloc_isXHFile
-^2625 13876@6@5@1@0@0^@3@0@0#fileloc_createSpec
-^2626 13854@6@5@1@0@0^@3@0@0#fileloc_createLib
-^2627 13856@6@5@1@0@0^@3@0@0#fileloc_createRc
-^2628 13808@6@5@1@0@0^@3@0@0#fileloc_decColumn
-^2629 13812$@0@@1@p0$@0#fileloc_subColumn
+^2621 13808@6@5@1@0@0@0@@1@p0@3@0@0#fileloc_update
+^2622 13870@6@5@1@0@0^@3@0@0#fileloc_create
+^2623 13838$^$@0#fileloc_isSystemFile
+^2624 13840$^$@0#fileloc_isXHFile
+^2625 13868@6@5@1@0@0^@3@0@0#fileloc_createSpec
+^2626 13846@6@5@1@0@0^@3@0@0#fileloc_createLib
+^2627 13848@6@5@1@0@0^@3@0@0#fileloc_createRc
+^2628 13800@6@5@1@0@0^@3@0@0#fileloc_decColumn
+^2629 13804$@0@@1@p0$@0#fileloc_subColumn
 ^2630 1546@6@5@1@0@0^@3@0@0#fileloc_getBuiltin
 ^2631 1548@6@5@1@0@0^@19@3@0#fileloc_observeBuiltin
 ^2632 1550@6@5@1@0@0^@3@0@0#fileloc_createBuiltin
-^2633 13872@6@5@1@0@0^@3@0@0#fileloc_createImport
-^2634 13894$^$@0#fileloc_isSpecialFile
-^2635 13844$^$@0#fileloc_sameBaseFile
-^2636 13880@6@5@1@0@0^@19@3@0#fileloc_filename
-^2637 13886$^$@0#fileloc_column
-^2638 13888@6@5@1@0@0^@3@0@0#fileloc_unparse
-^2639 13890@6@5@1@0@0^@3@0@0#fileloc_unparseRaw
-^2640 13892@6@5@1@0@0^@3@0@0#fileloc_unparseRawCol
-^2641 13840$^$@0#fileloc_sameFile
-^2642 13838$^$@0#fileloc_sameFileAndLine
-^2643 13820$$$@0#fileloc_free
-^2644 13822$$$@0#fileloc_reallyFree
-^2645 13884$^$@0#fileloc_lineno
-^2646 13826$^$@0#fileloc_equal
-^2647 13832$^$@0#fileloc_lessthan
-^2648 13828$^$@0#fileloc_compare
-^2649 13824@6@5@1@0@0^@19@3@0#fileloc_getBase
-^2650 13896$^$@0#fileloc_isHeader
-^2651 13898$^$@0#fileloc_isSpec
-^2652 13900$^$@0#fileloc_isRealSpec
-^2653 13814@6@5@1@0@0^@3@0@0#fileloc_copy
-^2654 13906@6@5@1@0@0^@3@0@0#fileloc_unparseDirect
-^2655 13834$^$@0#fileloc_notAfter
-^2656 13850$^$@0#fileloc_almostSameFile
-^2657 13810@6@5@1@0@0^@3@0@0#fileloc_noColumn
-^2658 13860@6@5@1@0@0^@19@3@0#fileloc_getExternal
-^2659 13858@6@5@1@0@0^@3@0@0#fileloc_createExternal
+^2633 13864@6@5@1@0@0^@3@0@0#fileloc_createImport
+^2634 13886$^$@0#fileloc_isSpecialFile
+^2635 13836$^$@0#fileloc_sameBaseFile
+^2636 13872@6@5@1@0@0^@19@3@0#fileloc_filename
+^2637 13878$^$@0#fileloc_column
+^2638 13880@6@5@1@0@0^@3@0@0#fileloc_unparse
+^2639 13882@6@5@1@0@0^@3@0@0#fileloc_unparseRaw
+^2640 13884@6@5@1@0@0^@3@0@0#fileloc_unparseRawCol
+^2641 13832$^$@0#fileloc_sameFile
+^2642 13830$^$@0#fileloc_sameFileAndLine
+^2643 13812$$$@0#fileloc_free
+^2644 13814$$$@0#fileloc_reallyFree
+^2645 13876$^$@0#fileloc_lineno
+^2646 13818$^$@0#fileloc_equal
+^2647 13824$^$@0#fileloc_lessthan
+^2648 13820$^$@0#fileloc_compare
+^2649 13816@6@5@1@0@0^@19@3@0#fileloc_getBase
+^2650 13888$^$@0#fileloc_isHeader
+^2651 13890$^$@0#fileloc_isSpec
+^2652 13892$^$@0#fileloc_isRealSpec
+^2653 13806@6@5@1@0@0^@3@0@0#fileloc_copy
+^2654 13898@6@5@1@0@0^@3@0@0#fileloc_unparseDirect
+^2655 13826$^$@0#fileloc_notAfter
+^2656 13842$^$@0#fileloc_almostSameFile
+^2657 13802@6@5@1@0@0^@3@0@0#fileloc_noColumn
+^2658 13852@6@5@1@0@0^@19@3@0#fileloc_getExternal
+^2659 13850@6@5@1@0@0^@3@0@0#fileloc_createExternal
 *1 (Constant)
 ^2660 1082@i0@0@4#fileloc_undefined
 *4 (Function)
-^2661 13902$^$@0#fileloc_isLib
-^2662 13852@6@5@1@0@0^@3@0@0#fileloc_fromTok
+^2661 13894$^$@0#fileloc_isLib
+^2662 13844@6@5@1@0@0^@3@0@0#fileloc_fromTok
 *1 (Constant)
 ^2663 5$#UNKNOWN_LINE#UNKNOWN_COLUMN
 *4 (Function)
-^2665 13818@6@5@1@0@0^@3@0@0#fileloc_updateFileId
-^2666 13866@6@5@1@0@0^@3@0@0#fileloc_makePreproc
-^2667 13868@6@5@1@0@0^@3@0@0#fileloc_makePreprocPrevious
-^2668 13836$^$@0#fileloc_isStandardLibrary
-^2669 13904$^$@0#fileloc_isStandardLib
-^2670 13882@6@5@1@0@0^@3@0@0#fileloc_unparseFilename
-^2671 13830$^$@0#fileloc_withinLines
-^2672 13908$^$@0#fileloc_isUser
-^2673 13842$^$@0#fileloc_sameModule
+^2665 13810@6@5@1@0@0^@3@0@0#fileloc_updateFileId
+^2666 13858@6@5@1@0@0^@3@0@0#fileloc_makePreproc
+^2667 13860@6@5@1@0@0^@3@0@0#fileloc_makePreprocPrevious
+^2668 13828$^$@0#fileloc_isStandardLibrary
+^2669 13896$^$@0#fileloc_isStandardLib
+^2670 13874@6@5@1@0@0^@3@0@0#fileloc_unparseFilename
+^2671 13822$^$@0#fileloc_withinLines
+^2672 13900$^$@0#fileloc_isUser
+^2673 13834$^$@0#fileloc_sameModule
 *3 (Variable)
 ^2674 1082|@1|0@5@17&#g_currentloc
 ^2675 211|@1|^#g_msgstream
@@ -23598,15 +23590,15 @@
 ^2685 23|@1|0@5@2&#g_currentSpecName
 *4 (Function)
 ^2686 1666$$$@0#setCodePoint
-^2687 16506$$$@0#printCodePoint
+^2687 16498$$$@0#printCodePoint
 *1 (Constant)
 ^2688 5$#PRINTBREADTH
 *7 (Struct tag)
-^2689 10578@1693#@cppBuffer
+^2689 10572@1693#@cppBuffer
 *0 (Datatype)
 ^2690 1693@-@+@0@0@0@0@1694#cppBuffer
 *7 (Struct tag)
-^2691 10615@1695#@cppOptions
+^2691 10609@1695#@cppOptions
 *0 (Datatype)
 ^2692 1695@-@+@0@0@0@0@1696#cppOptions
 *2 (Enum member)
@@ -23614,20 +23606,20 @@
 *9 (Enum tag)
 ^2711 1697@1698#&cpp_token
 *7 (Struct tag)
-^2712 10584@1699#@cppReader
+^2712 10578@1699#@cppReader
 *0 (Datatype)
 ^2713 1699@-@+@0@0@0@0@1700#cppReader
 *3 (Variable)
 ^2714 1700|@1|^#g_cppState
 *4 (Function)
 ^2715 1702@6@5@1@0@0$@2@0@0#cppReader_getIncludePath
-^2716 10742$$$@0#cppProcess
-^2717 10744$$$@0#cppAddIncludeDir
+^2716 10736$$$@0#cppProcess
+^2717 10738$$$@0#cppAddIncludeDir
 ^2718 1708$$$@0#cppReader_initMod
-^2719 10746$$$@0#cppDoDefine
-^2720 10748$$$@0#cppDoUndefine
+^2719 10740$$$@0#cppDoDefine
+^2720 10742$$$@0#cppDoUndefine
 ^2721 1714$$$@0#cppReader_saveDefinitions
-^2722 11270@6@5@1@0@0$@3@0@0#cppReader_getLoc
+^2722 11262@6@5@1@0@0$@3@0@0#cppReader_getLoc
 ^2723 1719$$$@0#cppReader_initialize
 *2 (Enum member)
 ^2724 1720$#SKIP_FLAG#INVALID_FLAG#FLG_LIKELYBOOL#FLG_IMPABSTRACT#FLG_ACCESSALL#FLG_ACCESSMODULE#FLG_ACCESSFILE#FLG_ACCESSCZECH#FLG_ACCESSSLOVAK#FLG_ACCESSCZECHOSLOVAK#FLG_ABSTRACT#FLG_MUTREP#FLG_GLOBALIAS#FLG_CHECKSTRICTGLOBALIAS#FLG_CHECKEDGLOBALIAS#FLG_CHECKMODGLOBALIAS#FLG_UNCHECKEDGLOBALIAS#FLG_ALIASUNIQUE#FLG_MAYALIASUNIQUE#FLG_MUSTNOTALIAS#FLG_RETALIAS#FLG_NOPARAMS#FLG_OLDSTYLE#FLG_GNUEXTENSIONS#FLG_USEVARARGS#FLG_WARNPOSIX#FLG_EXITARG#FLG_EVALORDER#FLG_EVALORDERUNCON#FLG_BOOLFALSE#FLG_BOOLTYPE#FLG_BOOLTRUE#FLG_NOACCESS#FLG_NOCOMMENTS#FLG_UNRECOGCOMMENTS#FLG_UNRECOGFLAGCOMMENTS#FLG_CONTINUECOMMENT#FLG_NESTCOMMENT#FLG_TMPCOMMENTS#FLG_LINTCOMMENTS#FLG_WARNLINTCOMMENTS#FLG_DECLUNDEF#FLG_SPECUNDEF#FLG_SPECUNDECL#FLG_LOOPEXEC#FLG_CONTROL#FLG_INFLOOPS#FLG_INFLOOPSUNCON#FLG_DEEPBREAK#FLG_LOOPLOOPBREAK#FLG_SWITCHLOOPBREAK#FLG_LOOPSWITCHBREAK#FLG_SWITCHSWITCHBREAK#FLG_LOOPLOOPCONTINUE#FLG_UNREACHABLE#FLG_WHILEEMPTY#FLG_WHILEBLOCK#FLG_FOREMPTY#FLG_FORBLOCK#FLG_IFEMPTY#FLG_IFBLOCK#FLG_ALLEMPTY#FLG_ALLBLOCK#FLG_ELSEIFCOMPLETE#FLG_NORETURN#FLG_CASEBREAK#FLG_MISSCASE#FLG_FIRSTCASE#FLG_GRAMMAR#FLG_NOPP#FLG_SHADOW#FLG_INCONDEFSLIB#FLG_WARNOVERLOAD#FLG_NESTEDEXTERN#FLG_REDECL#FLG_REDEF#FLG_INCONDEFS#FLG_IMPTYPE#FLG_MATCHFIELDS#FLG_USEDEF#FLG_IMPOUTS#FLG_TMPDIR#FLG_LARCHPATH#FLG_LCLIMPORTDIR#FLG_SYSTEMDIRS#FLG_SKIPANSIHEADERS#FLG_SKIPPOSIXHEADERS#FLG_SYSTEMDIRERRORS#FLG_SYSTEMDIREXPAND#FLG_INCLUDEPATH#FLG_SPECPATH#FLG_QUIET#FLG_USESTDERR#FLG_SHOWSUMMARY#FLG_SHOWSCAN#FLG_STATS#FLG_TIMEDIST#FLG_SHOWUSES#FLG_NOEFFECT#FLG_NOEFFECTUNCON#FLG_EXPORTANY#FLG_EXPORTFCN#FLG_EXPORTMACRO#FLG_EXPORTTYPE#FLG_EXPORTVAR#FLG_EXPORTCONST#FLG_EXPORTITER#FLG_REPEXPOSE#FLG_RETEXPOSE#FLG_ASSIGNEXPOSE#FLG_CASTEXPOSE#FLG_LINELEN#FLG_INDENTSPACES#FLG_SHOWCOL#FLG_PARENFILEFORMAT#FLG_SHOWFUNC#FLG_SHOWALLCONJS#FLG_IMPCONJ#FLG_EXPECT#FLG_LCLEXPECT#FLG_PARTIAL#FLG_GLOBALS#FLG_USEALLGLOBS#FLG_INTERNALGLOBS#FLG_INTERNALGLOBSNOGLOBS#FLG_WARNMISSINGGLOBALS#FLG_WARNMISSINGGLOBALSNOGLOBS#FLG_GLOBUNSPEC#FLG_ALLGLOBALS#FLG_CHECKSTRICTGLOBALS#FLG_IMPCHECKEDSPECGLOBALS#FLG_IMPCHECKMODSPECGLOBALS#FLG_IMPCHECKEDSTRICTSPECGLOBALS#FLG_IMPCHECKEDGLOBALS#FLG_IMPCHECKMODGLOBALS#FLG_IMPCHECKEDSTRICTGLOBALS#FLG_IMPCHECKEDSTATICS#FLG_IMPCHECKMODSTATICS#FLG_IMPCHECKMODINTERNALS#FLG_IMPCHECKEDSTRICTSTATICS#FLG_MODGLOBS#FLG_MODGLOBSUNSPEC#FLG_MODSTRICTGLOBSUNSPEC#FLG_MODGLOBSUNCHECKED#FLG_KEEP#FLG_DOLH#FLG_DOLCS#FLG_SINGLEINCLUDE#FLG_NEVERINCLUDE#FLG_SKIPSYSHEADERS#FLG_WARNFLAGS#FLG_WARNUNIXLIB#FLG_BADFLAG#FLG_FORCEHINTS#FLG_HELP#FLG_HINTS#FLG_RETVAL#FLG_RETVALOTHER#FLG_RETVALBOOL#FLG_RETVALINT#FLG_OPTF#FLG_INIT#FLG_NOF#FLG_NEEDSPEC#FLG_NEWDECL#FLG_ITER#FLG_HASYIELD#FLG_DUMP#FLG_MERGE#FLG_NOLIB#FLG_ANSILIB#FLG_STRICTLIB#FLG_UNIXLIB#FLG_UNIXSTRICTLIB#FLG_POSIXLIB#FLG_POSIXSTRICTLIB#FLG_WHICHLIB#FLG_MTSFILE#FLG_COMMENTCHAR#FLG_ALLMACROS#FLG_LIBMACROS#FLG_SPECMACROS#FLG_FCNMACROS#FLG_CONSTMACROS#FLG_MACROMATCHNAME#FLG_MACRONEXTLINE#FLG_MACROSTMT#FLG_MACROEMPTY#FLG_MACROPARAMS#FLG_MACROASSIGN#FLG_SEFPARAMS#FLG_SEFUNSPEC#FLG_MACROPARENS#FLG_MACRODECL#FLG_MACROFCNDECL#FLG_MACROCONSTDECL#FLG_MACROREDEF#FLG_MACROUNDEF#FLG_RETSTACK#FLG_USERELEASED#FLG_STRICTUSERELEASED#FLG_COMPDEF#FLG_COMPMEMPASS#FLG_MUSTDEFINE#FLG_UNIONDEF#FLG_MEMIMPLICIT#FLG_PARAMIMPTEMP#FLG_ALLIMPONLY#FLG_CODEIMPONLY#FLG_SPECALLIMPONLY#FLG_GLOBIMPONLY#FLG_RETIMPONLY#FLG_STRUCTIMPONLY#FLG_SPECGLOBIMPONLY#FLG_SPECRETIMPONLY#FLG_SPECSTRUCTIMPONLY#FLG_DEPARRAYS#FLG_COMPDESTROY#FLG_STRICTDESTROY#FLG_MUSTFREE#FLG_BRANCHSTATE#FLG_STRICTBRANCHSTATE#FLG_MEMCHECKS#FLG_MEMTRANS#FLG_EXPOSETRANS#FLG_OBSERVERTRANS#FLG_DEPENDENTTRANS#FLG_NEWREFTRANS#FLG_ONLYTRANS#FLG_ONLYUNQGLOBALTRANS#FLG_OWNEDTRANS#FLG_FRESHTRANS#FLG_SHAREDTRANS#FLG_TEMPTRANS#FLG_KEPTTRANS#FLG_KEEPTRANS#FLG_IMMEDIATETRANS#FLG_REFCOUNTTRANS#FLG_STATICTRANS#FLG_UNKNOWNTRANS#FLG_STATICINITTRANS#FLG_UNKNOWNINITTRANS#FLG_READONLYSTRINGS#FLG_READONLYTRANS#FLG_PASSUNKNOWN#FLG_MODIFIES#FLG_MUSTMOD#FLG_MODOBSERVER#FLG_MODOBSERVERUNCON#FLG_MODINTERNALSTRICT#FLG_MODFILESYSTEM#FLG_MODUNSPEC#FLG_MODNOMODS#FLG_MODUNCON#FLG_MODUNCONNOMODS#FLG_GLOBALSIMPMODIFIESNOTHING#FLG_MODIFIESIMPNOGLOBALS#FLG_NAMECHECKS#FLG_CZECH#FLG_CZECHFUNCTIONS#FLG_CZECHVARS#FLG_CZECHMACROS#FLG_CZECHCONSTANTS#FLG_CZECHTYPES#FLG_SLOVAK#FLG_SLOVAKFUNCTIONS#FLG_SLOVAKMACROS#FLG_SLOVAKVARS#FLG_SLOVAKCONSTANTS#FLG_SLOVAKTYPES#FLG_CZECHOSLOVAK#FLG_CZECHOSLOVAKFUNCTIONS#FLG_CZECHOSLOVAKMACROS#FLG_CZECHOSLOVAKVARS#FLG_CZECHOSLOVAKCONSTANTS#FLG_CZECHOSLOVAKTYPES#FLG_ANSIRESERVED#FLG_CPPNAMES#FLG_ANSIRESERVEDLOCAL#FLG_DISTINCTEXTERNALNAMES#FLG_EXTERNALNAMELEN#FLG_EXTERNALNAMECASEINSENSITIVE#FLG_DISTINCTINTERNALNAMES#FLG_INTERNALNAMELEN#FLG_INTERNALNAMECASEINSENSITIVE#FLG_INTERNALNAMELOOKALIKE#FLG_MACROVARPREFIX#FLG_MACROVARPREFIXEXCLUDE#FLG_TAGPREFIX#FLG_TAGPREFIXEXCLUDE#FLG_ENUMPREFIX#FLG_ENUMPREFIXEXCLUDE#FLG_FILESTATICPREFIX#FLG_FILESTATICPREFIXEXCLUDE#FLG_GLOBPREFIX#FLG_GLOBPREFIXEXCLUDE#FLG_TYPEPREFIX#FLG_TYPEPREFIXEXCLUDE#FLG_EXTERNALPREFIX#FLG_EXTERNALPREFIXEXCLUDE#FLG_LOCALPREFIX#FLG_LOCALPREFIXEXCLUDE#FLG_UNCHECKEDMACROPREFIX#FLG_UNCHECKEDMACROPREFIXEXCLUDE#FLG_CONSTPREFIX#FLG_CONSTPREFIXEXCLUDE#FLG_ITERPREFIX#FLG_ITERPREFIXEXCLUDE#FLG_DECLPARAMPREFIX#FLG_DECLPARAMNAME#FLG_DECLPARAMMATCH#FLG_DECLPARAMPREFIXEXCLUDE#FLG_CONTROLNESTDEPTH#FLG_STRINGLITERALLEN#FLG_NUMSTRUCTFIELDS#FLG_NUMENUMMEMBERS#FLG_INCLUDENEST#FLG_ANSILIMITS#FLG_NAME#FLG_UNCLASSIFIED#FLG_NULL#FLG_NULLTERMINATED#FLG_ARRAYREAD#FLG_ARRAYWRITE#FLG_FUNCTIONPOST#FLG_PARENCONSTRAINT#FLG_DEBUGFUNCTIONCONSTRAINT#FLG_ARRAYBOUNDS#FLG_ARRAYBOUNDSREAD#FLG_FUNCTIONCONSTRAINT#FLG_CHECKPOST#FLG_CONSTRAINTLOCATION#FLG_IMPLICTCONSTRAINT#FLG_ORCONSTRAINT#FLG_NULLTERMINATEDWARNING#FLG_NULLDEREF#FLG_FCNDEREF#FLG_NULLPASS#FLG_NULLRET#FLG_NULLSTATE#FLG_NULLASSIGN#FLG_BOOLCOMPARE#FLG_REALCOMPARE#FLG_POINTERARITH#FLG_NULLPOINTERARITH#FLG_PTRNUMCOMPARE#FLG_STRICTOPS#FLG_BITWISEOPS#FLG_SHIFTSIGNED#FLG_BOOLOPS#FLG_PTRNEGATE#FLG_SIZEOFTYPE#FLG_SIZEOFFORMALARRAY#FLG_FIXEDFORMALARRAY#FLG_INCOMPLETETYPE#FLG_FORMALARRAY#FLG_PREDASSIGN#FLG_PREDBOOL#FLG_PREDBOOLINT#FLG_PREDBOOLOTHERS#FLG_PREDBOOLPTR#FLG_DEFINE#FLG_UNDEFINE#FLG_GLOBSTATE#FLG_SUPCOUNTS#FLG_LIMIT#FLG_SYNTAX#FLG_TRYTORECOVER#FLG_PREPROC#FLG_TYPE#FLG_FULLINITBLOCK#FLG_ENUMMEMBERS#FLG_MAINTYPE#FLG_FORMATTYPE#FLG_FORMATCONST#FLG_FORMATCODE#FLG_FORWARDDECL#FLG_ABSTVOIDP#FLG_CASTFCNPTR#FLG_CHARINDEX#FLG_ENUMINDEX#FLG_BOOLINT#FLG_CHARINT#FLG_ENUMINT#FLG_FLOATDOUBLE#FLG_IGNOREQUALS#FLG_DUPLICATEQUALS#FLG_IGNORESIGNS#FLG_NUMLITERAL#FLG_CHARINTLITERAL#FLG_RELAXQUALS#FLG_RELAXTYPES#FLG_CHARUNSIGNEDCHAR#FLG_MATCHANYINTEGRAL#FLG_LONGUNSIGNEDINTEGRAL#FLG_LONGINTEGRAL#FLG_LONGUNSIGNEDUNSIGNEDINTEGRAL#FLG_LONGSIGNEDINTEGRAL#FLG_ZEROPTR#FLG_ZEROBOOL#FLG_REPEATUNRECOG#FLG_SYSTEMUNRECOG#FLG_UNRECOG#FLG_TOPUNUSED#FLG_EXPORTLOCAL#FLG_EXPORTHEADER#FLG_EXPORTHEADERVAR#FLG_FIELDUNUSED#FLG_ENUMMEMUNUSED#FLG_CONSTUNUSED#FLG_FUNCUNUSED#FLG_PARAMUNUSED#FLG_TYPEUNUSED#FLG_VARUNUSED#FLG_UNUSEDSPECIAL#FLG_REDUNDANTSHAREQUAL#FLG_MISPLACEDSHAREQUAL#FLG_ANNOTATIONERROR#FLG_COMMENTERROR#FLG_SHOWSOURCELOC#FLG_BUGSLIMIT#FLG_FILEEXTENSIONS#FLG_WARNUSE#FLG_STATETRANSFER#FLG_STATEMERGE#FLG_ITS4MOSTRISKY#FLG_ITS4VERYRISKY#FLG_ITS4RISKY#FLG_ITS4MODERATERISK#FLG_ITS4LOWRISK#FLG_BUFFEROVERFLOWHIGH#FLG_BUFFEROVERFLOW#FLG_TOCTOU#FLG_MULTITHREADED#FLG_SUPERUSER#FLG_IMPLEMENTATIONOPTIONAL#LAST_FLAG
@@ -23649,38 +23641,38 @@
 *0 (Datatype)
 ^3229 1725@-@-@0@0@0@0@1726#flagkind
 *4 (Function)
-^3230 16563$$$@0#listAllCategories
+^3230 16555$$$@0#listAllCategories
 ^3231 1730$$$@0#printAlphaFlags
-^3232 16565$$$@0#printAllFlags
-^3233 16545$$$@0#flagcode_recordError
-^3234 16547$$$@0#flagcode_recordSuppressed
-^3235 16549$$$@0#flagcode_numReported
-^3236 16605$$$@0#flagcode_isNamePrefixFlag
-^3237 16569@6@5@1@0@0$@2@0@0#describeFlag
-^3238 16579$$$@0#identifyFlag
-^3239 16581$$$@0#setValueFlag
-^3240 16583$$$@0#setStringFlag
-^3241 16575@6@5@1@0@0^@19@3@0#flagcode_unparse
-^3242 16597$^$@0#flagcode_valueIndex
-^3243 16601$^$@0#flagcode_stringIndex
-^3244 16551@6@5@1@0@0$@19@3@0#flagcodeHint
-^3245 16555$^$@0#identifyCategory
-^3246 16561$@0@g2675@0@0@1@g2675$@0#printCategory
-^3247 16593$$$@0#flagcode_hasValue
-^3248 16595$$$@0#flagcode_hasString
-^3249 16591$$$@0#flagcode_hasArgument
+^3232 16557$$$@0#printAllFlags
+^3233 16537$$$@0#flagcode_recordError
+^3234 16539$$$@0#flagcode_recordSuppressed
+^3235 16541$$$@0#flagcode_numReported
+^3236 16597$$$@0#flagcode_isNamePrefixFlag
+^3237 16561@6@5@1@0@0$@2@0@0#describeFlag
+^3238 16571$$$@0#identifyFlag
+^3239 16573$$$@0#setValueFlag
+^3240 16575$$$@0#setStringFlag
+^3241 16567@6@5@1@0@0^@19@3@0#flagcode_unparse
+^3242 16589$^$@0#flagcode_valueIndex
+^3243 16593$^$@0#flagcode_stringIndex
+^3244 16543@6@5@1@0@0$@19@3@0#flagcodeHint
+^3245 16547$^$@0#identifyCategory
+^3246 16553$@0@g2675@0@0@1@g2675$@0#printCategory
+^3247 16585$$$@0#flagcode_hasValue
+^3248 16587$$$@0#flagcode_hasString
+^3249 16583$$$@0#flagcode_hasArgument
 *1 (Constant)
 ^3250 1211@@0@5#DEFAULT_MODE
 *4 (Function)
 ^3251 1780$$$@0#flags_initMod
-^3252 16589$$$@0#isMode
+^3252 16581$$$@0#isMode
 ^3253 1784@6@5@1@0@0$@2@0@0#describeModes
 ^3254 1786$$$@0#summarizeErrors
-^3255 16539$$$@0#flagcode_isNameChecksFlag
-^3256 16535$$$@0#flagcode_isIdemFlag
-^3257 16537$$$@0#flagcode_isModeFlag
-^3258 16531$$$@0#flagcode_isSpecialFlag
-^3259 16533$$$@0#flagcode_isGlobalFlag
+^3255 16531$$$@0#flagcode_isNameChecksFlag
+^3256 16527$$$@0#flagcode_isIdemFlag
+^3257 16529$$$@0#flagcode_isModeFlag
+^3258 16523$$$@0#flagcode_isSpecialFlag
+^3259 16525$$$@0#flagcode_isGlobalFlag
 *7 (Struct tag)
 ^3260 1797@1798#@!10
 *0 (Datatype)
@@ -23692,16 +23684,16 @@
 *1 (Constant)
 ^3264 1803@i0@0@4#flagSpec_undefined
 *4 (Function)
-^3265 17138@6@5@1@0@0$@2@0@0#flagSpec_createPlain
-^3266 17140@6@5@1@0@0$@2@0@0#flagSpec_createOr
-^3267 17144@6@5@1@0@0^@2@0@0#flagSpec_copy
-^3268 17146@6@5@1@0@0^@2@0@0#flagSpec_unparse
-^3269 17142$$$@0#flagSpec_free
-^3270 17148@6@5@1@0@0^@2@0@0#flagSpec_dump
-^3271 17150@6@5@1@0@0@0@@1@p0@2@0@0#flagSpec_undump
-^3272 17152$^$@0#flagSpec_getDominant
-^3273 17156$^$@0#flagSpec_getFirstOn
-^3274 17154$^$@0#flagSpec_isOn
+^3265 17130@6@5@1@0@0$@2@0@0#flagSpec_createPlain
+^3266 17132@6@5@1@0@0$@2@0@0#flagSpec_createOr
+^3267 17136@6@5@1@0@0^@2@0@0#flagSpec_copy
+^3268 17138@6@5@1@0@0^@2@0@0#flagSpec_unparse
+^3269 17134$$$@0#flagSpec_free
+^3270 17140@6@5@1@0@0^@2@0@0#flagSpec_dump
+^3271 17142@6@5@1@0@0@0@@1@p0@2@0@0#flagSpec_undump
+^3272 17144$^$@0#flagSpec_getDominant
+^3273 17148$^$@0#flagSpec_getFirstOn
+^3274 17146$^$@0#flagSpec_isOn
 *2 (Enum member)
 ^3275 1827$#QU_UNKNOWN#QU_CONST#QU_VOLATILE#QU_INLINE#QU_EXTERN#QU_STATIC#QU_AUTO#QU_REGISTER#QU_SHORT#QU_LONG#QU_SIGNED#QU_UNSIGNED#QU_OUT#QU_IN#QU_ONLY#QU_IMPONLY#QU_TEMP#QU_SHARED#QU_KEEP#QU_KEPT#QU_PARTIAL#QU_SPECIAL#QU_NULL#QU_RELNULL#QU_ISNULL#QU_NULLTERMINATED#QU_SETBUFFERSIZE#QU_EXPOSED#QU_RETURNED#QU_OBSERVER#QU_UNIQUE#QU_OWNED#QU_DEPENDENT#QU_RELDEF#QU_YIELD#QU_NEVEREXIT#QU_EXITS#QU_MAYEXIT#QU_TRUEEXIT#QU_FALSEEXIT#QU_UNUSED#QU_EXTERNAL#QU_SEF#QU_NOTNULL#QU_ABSTRACT#QU_CONCRETE#QU_MUTABLE#QU_IMMUTABLE#QU_REFCOUNTED#QU_REFS#QU_NEWREF#QU_KILLREF#QU_TEMPREF#QU_TRUENULL#QU_FALSENULL#QU_CHECKED#QU_UNCHECKED#QU_CHECKEDSTRICT#QU_CHECKMOD#QU_UNDEF#QU_KILLED#QU_PRINTFLIKE#QU_SCANFLIKE#QU_MESSAGELIKE#QU_USERANNOT#QU_LAST
 *9 (Enum tag)
@@ -23713,42 +23705,42 @@
 *0 (Datatype)
 ^3344 1832@+@-@0@0@0@0@1833#qual
 *4 (Function)
-^3345 12087@6@5@1@0@0$@2@0@0#qual_dump
-^3346 12089$@0@@1@tp0$@0#qual_undump
-^3347 12079$^$@0#qual_fromInt
-^3348 12081@6@5@1@0@0^@19@3@0#qual_unparse
-^3349 12083$^$@0#qual_match
-^3350 12085@6@5@1@0@0^@19@3@0#qual_getAnnotationInfo
-^3351 12071$^$@0#qual_createPlain
-^3352 12075$^$@0#qual_createMetaState
+^3345 12079@6@5@1@0@0$@2@0@0#qual_dump
+^3346 12081$@0@@1@tp0$@0#qual_undump
+^3347 12071$^$@0#qual_fromInt
+^3348 12073@6@5@1@0@0^@19@3@0#qual_unparse
+^3349 12075$^$@0#qual_match
+^3350 12077@6@5@1@0@0^@19@3@0#qual_getAnnotationInfo
+^3351 12063$^$@0#qual_createPlain
+^3352 12067$^$@0#qual_createMetaState
 *7 (Struct tag)
 ^3353 2138@2139#@!13
 *0 (Datatype)
 ^3354 2138@-@-@0@0@0@0@2140#lltok
 *4 (Function)
-^3355 14950$@0@@1@s0$@0#lltok_create
-^3356 14948@6@5@1@0@0^@19@3@0#lltok_unparse
-^3357 14952$$$@0@S:2.3.0.floc.p0$#lltok_release
-^3358 14954@6@5@1@0@0$@2@0@0@S:2.3.0.floc.p0$#lltok_stealLoc
-^3359 14910$$$@0#lltok_isSemi
-^3360 14918$$$@0#lltok_isEq_Op
-^3361 14912$$$@0#lltok_isMult
-^3362 14914$$$@0#lltok_isInc_Op
-^3363 14920$$$@0#lltok_isAnd_Op
-^3364 14922$$$@0#lltok_isOr_Op
-^3365 14924$$$@0#lltok_isNot_Op
-^3366 14926$$$@0#lltok_isLt_Op
-^3367 14928$$$@0#lltok_isGt_Op
-^3368 14930$$$@0#lltok_isGe_Op
-^3369 14932$$$@0#lltok_isLe_Op
-^3370 14934$$$@0#lltok_isPlus_Op
-^3371 14936$$$@0#lltok_isMinus_Op
-^3372 14916$$$@0#lltok_isDec_Op
-^3373 14938$$$@0#lltok_isAmpersand_Op
-^3374 14940$$$@0#lltok_isExcl_Op
-^3375 14942$$$@0#lltok_isTilde_Op
-^3376 14944$$$@0#lltok_isEnsures
-^3377 14946$$$@0#lltok_isRequires
+^3355 14942$@0@@1@s0$@0#lltok_create
+^3356 14940@6@5@1@0@0^@19@3@0#lltok_unparse
+^3357 14944$$$@0@S:2.3.0.floc.p0$#lltok_release
+^3358 14946@6@5@1@0@0$@2@0@0@S:2.3.0.floc.p0$#lltok_stealLoc
+^3359 14902$$$@0#lltok_isSemi
+^3360 14910$$$@0#lltok_isEq_Op
+^3361 14904$$$@0#lltok_isMult
+^3362 14906$$$@0#lltok_isInc_Op
+^3363 14912$$$@0#lltok_isAnd_Op
+^3364 14914$$$@0#lltok_isOr_Op
+^3365 14916$$$@0#lltok_isNot_Op
+^3366 14918$$$@0#lltok_isLt_Op
+^3367 14920$$$@0#lltok_isGt_Op
+^3368 14922$$$@0#lltok_isGe_Op
+^3369 14924$$$@0#lltok_isLe_Op
+^3370 14926$$$@0#lltok_isPlus_Op
+^3371 14928$$$@0#lltok_isMinus_Op
+^3372 14908$$$@0#lltok_isDec_Op
+^3373 14930$$$@0#lltok_isAmpersand_Op
+^3374 14932$$$@0#lltok_isExcl_Op
+^3375 14934$$$@0#lltok_isTilde_Op
+^3376 14936$$$@0#lltok_isEnsures
+^3377 14938$$$@0#lltok_isRequires
 *2 (Enum member)
 ^3378 2191$#NOCLAUSE#TRUECLAUSE#FALSECLAUSE#ANDCLAUSE#ORCLAUSE#WHILECLAUSE#DOWHILECLAUSE#FORCLAUSE#CASECLAUSE#SWITCHCLAUSE#CONDCLAUSE#ITERCLAUSE#TRUEEXITCLAUSE#FALSEEXITCLAUSE
 *9 (Enum tag)
@@ -23756,39 +23748,39 @@
 *0 (Datatype)
 ^3393 2192@-@-@0@0@0@0@2193#clause
 *4 (Function)
-^3394 13136@6@5@1@0@0^@19@3@0#clause_nameAlternate
-^3395 13134@6@5@1@0@0^@19@3@0#clause_nameTaken
-^3396 13138@6@5@1@0@0^@19@3@0#clause_nameFlip
-^3397 13144$^$@0#clause_isConditional
-^3398 13140$^$@0#clause_isBreakable
-^3399 13142$^$@0#clause_isLoop
-^3400 13146$^$@0#clause_isSwitch
-^3401 13148$^$@0#clause_isCase
-^3402 13150$^$@0#clause_isNone
-^3403 13132@6@5@1@0@0^@19@3@0#clause_unparse
-^3404 13152$^@3@0@0#globalsClause_create
-^3405 13154@6@5@1@0@0^@19@3@0#globalsClause_getGlobs
-^3406 13156@6@5@1@0@0@0@@1@p0@2@0@0#globalsClause_takeGlobs
-^3407 13160@6@5@1@0@0^@3@0@0#globalsClause_unparse
-^3408 13158$$$@0#globalsClause_free
-^3409 13162$^@3@0@0#modifiesClause_createNoMods
-^3410 13170@6@5@1@0@0$@19@3@0#modifiesClause_getMods
-^3411 13172@6@5@1@0@0$@2@0@0#modifiesClause_takeMods
-^3412 13164$^@3@0@0#modifiesClause_create
-^3413 13168@6@5@1@0@0^@3@0@0#modifiesClause_unparse
-^3414 13166$$$@0#modifiesClause_free
+^3394 13128@6@5@1@0@0^@19@3@0#clause_nameAlternate
+^3395 13126@6@5@1@0@0^@19@3@0#clause_nameTaken
+^3396 13130@6@5@1@0@0^@19@3@0#clause_nameFlip
+^3397 13136$^$@0#clause_isConditional
+^3398 13132$^$@0#clause_isBreakable
+^3399 13134$^$@0#clause_isLoop
+^3400 13138$^$@0#clause_isSwitch
+^3401 13140$^$@0#clause_isCase
+^3402 13142$^$@0#clause_isNone
+^3403 13124@6@5@1@0@0^@19@3@0#clause_unparse
+^3404 13144$^@3@0@0#globalsClause_create
+^3405 13146@6@5@1@0@0^@19@3@0#globalsClause_getGlobs
+^3406 13148@6@5@1@0@0@0@@1@p0@2@0@0#globalsClause_takeGlobs
+^3407 13152@6@5@1@0@0^@3@0@0#globalsClause_unparse
+^3408 13150$$$@0#globalsClause_free
+^3409 13154$^@3@0@0#modifiesClause_createNoMods
+^3410 13162@6@5@1@0@0$@19@3@0#modifiesClause_getMods
+^3411 13164@6@5@1@0@0$@2@0@0#modifiesClause_takeMods
+^3412 13156$^@3@0@0#modifiesClause_create
+^3413 13160@6@5@1@0@0^@3@0@0#modifiesClause_unparse
+^3414 13158$$$@0#modifiesClause_free
 *1 (Constant)
 ^3415 1133@i0@0@4#warnClause_undefined
 *4 (Function)
-^3416 13176@6@5@1@0@0^@3@0@0#warnClause_create
-^3417 13178@6@5@1@0@0^@2@0@0#warnClause_copy
-^3418 13180@6@5@1@0@0^@19@3@0#warnClause_getFlag
-^3419 13190@6@5@1@0@0^@2@0@0#warnClause_dump
-^3420 13192@6@5@1@0@0@0@@1@p0@2@0@0#warnClause_undump
-^3421 13184@6@0@1@0@54^$@0#warnClause_hasMessage
-^3422 13186@6@5@1@0@0^@19@3@0#warnClause_getMessage
-^3423 13182@6@5@1@0@0^@2@0@0#warnClause_unparse
-^3424 13188$$$@0#warnClause_free
+^3416 13168@6@5@1@0@0^@3@0@0#warnClause_create
+^3417 13170@6@5@1@0@0^@2@0@0#warnClause_copy
+^3418 13172@6@5@1@0@0^@19@3@0#warnClause_getFlag
+^3419 13182@6@5@1@0@0^@2@0@0#warnClause_dump
+^3420 13184@6@5@1@0@0@0@@1@p0@2@0@0#warnClause_undump
+^3421 13176@6@0@1@0@54^$@0#warnClause_hasMessage
+^3422 13178@6@5@1@0@0^@19@3@0#warnClause_getMessage
+^3423 13174@6@5@1@0@0^@2@0@0#warnClause_unparse
+^3424 13180$$$@0#warnClause_free
 *2 (Enum member)
 ^3425 2267$#FCK_GLOBALS#FCK_MODIFIES#FCK_WARN#FCK_STATE#FCK_ENSURES#FCK_REQUIRES#FCK_DEAD
 *9 (Enum tag)
@@ -23800,37 +23792,37 @@
 *1 (Constant)
 ^3435 1121@i0@0@4#functionClause_undefined
 *4 (Function)
-^3436 13196@6@5@1@0@0^@3@0@0#functionClause_createGlobals
-^3437 13198@6@5@1@0@0^@3@0@0#functionClause_createModifies
-^3438 13206@6@5@1@0@0^@3@0@0#functionClause_createWarn
-^3439 13200@6@5@1@0@0^@3@0@0#functionClause_createState
-^3440 13202@6@5@1@0@0^@3@0@0#functionClause_createEnsures
-^3441 13204@6@5@1@0@0^@3@0@0#functionClause_createRequires
-^3442 13230$^@19@2@0#functionClause_getGlobals
-^3443 13228$^@19@2@0#functionClause_getModifies
-^3444 13212$^@19@2@0#functionClause_getState
-^3445 13224@6@5@1@0@0^@19@2@0#functionClause_getWarn
-^3446 13216@6@5@1@0@0^@19@2@0#functionClause_getEnsures
-^3447 13220@6@5@1@0@0^@19@2@0#functionClause_getRequires
-^3448 13214$@0@@1@p0@2@0@0#functionClause_takeState
-^3449 13218@6@5@1@0@0@0@@1@p0@2@0@0#functionClause_takeEnsures
-^3450 13222@6@5@1@0@0@0@@1@p0@2@0@0#functionClause_takeRequires
-^3451 13226@6@5@1@0@0@0@@1@p0@2@0@0#functionClause_takeWarn
-^3452 13210$^$@0#functionClause_matchKind
-^3453 13232$$$@0#functionClause_free
-^3454 13208@6@5@1@0@0^@2@0@0#functionClause_unparse
+^3436 13188@6@5@1@0@0^@3@0@0#functionClause_createGlobals
+^3437 13190@6@5@1@0@0^@3@0@0#functionClause_createModifies
+^3438 13198@6@5@1@0@0^@3@0@0#functionClause_createWarn
+^3439 13192@6@5@1@0@0^@3@0@0#functionClause_createState
+^3440 13194@6@5@1@0@0^@3@0@0#functionClause_createEnsures
+^3441 13196@6@5@1@0@0^@3@0@0#functionClause_createRequires
+^3442 13222$^@19@2@0#functionClause_getGlobals
+^3443 13220$^@19@2@0#functionClause_getModifies
+^3444 13204$^@19@2@0#functionClause_getState
+^3445 13216@6@5@1@0@0^@19@2@0#functionClause_getWarn
+^3446 13208@6@5@1@0@0^@19@2@0#functionClause_getEnsures
+^3447 13212@6@5@1@0@0^@19@2@0#functionClause_getRequires
+^3448 13206$@0@@1@p0@2@0@0#functionClause_takeState
+^3449 13210@6@5@1@0@0@0@@1@p0@2@0@0#functionClause_takeEnsures
+^3450 13214@6@5@1@0@0@0@@1@p0@2@0@0#functionClause_takeRequires
+^3451 13218@6@5@1@0@0@0@@1@p0@2@0@0#functionClause_takeWarn
+^3452 13202$^$@0#functionClause_matchKind
+^3453 13224$$$@0#functionClause_free
+^3454 13200@6@5@1@0@0^@2@0@0#functionClause_unparse
 *0 (Datatype)
 ^3455 1121@-@+@0@5@2@0@2329#o_functionClause
 *1 (Constant)
 ^3456 1124@i0@0@4#functionClauseList_undefined
 *4 (Function)
-^3457 13249@6@5@1@0@0^@3@0@0#functionClauseList_unparseSep
+^3457 13241@6@5@1@0@0^@3@0@0#functionClauseList_unparseSep
 ^3458 2343@6@5@1@0@0^@2@0@0#functionClauseList_new
-^3459 13241@6@5@1@0@0^@2@0@0#functionClauseList_single
-^3460 13243@6@5@1@0@0@0@@1@p0$@0#functionClauseList_add
-^3461 13245@6@5@1@0@0@0@@1@p0$@0#functionClauseList_prepend
-^3462 13247@6@5@1@0@0$@2@0@0#functionClauseList_unparse
-^3463 13251$$$@0#functionClauseList_free
+^3459 13233@6@5@1@0@0^@2@0@0#functionClauseList_single
+^3460 13235@6@5@1@0@0@0@@1@p0$@0#functionClauseList_add
+^3461 13237@6@5@1@0@0@0@@1@p0$@0#functionClauseList_prepend
+^3462 13239@6@5@1@0@0$@2@0@0#functionClauseList_unparse
+^3463 13243$$$@0#functionClauseList_free
 *1 (Constant)
 ^3464 5$#functionClauseListBASESIZE
 *6 (Iterator finalizer)
@@ -23846,16 +23838,16 @@
 *1 (Constant)
 ^3470 2360@i0@0@4#cstringSList_undefined
 *4 (Function)
-^3471 16844@6@5@1@0@0^@3@0@0#cstringSList_unparseSep
+^3471 16836@6@5@1@0@0^@3@0@0#cstringSList_unparseSep
 ^3472 2370@6@5@1@0@0^@2@0@0#cstringSList_new
-^3473 16836@6@5@1@0@0^@2@0@0#cstringSList_single
-^3474 16838@6@5@1@0@0@0@@1@p0$@0#cstringSList_add
-^3475 16852$$$@0#cstringSList_alphabetize
-^3476 16840@6@5@1@0@0^@19@3@0#cstringSList_get
-^3477 16848@6@5@1@0@0^@2@0@0#cstringSList_unparseAbbrev
-^3478 16842@6@5@1@0@0$@2@0@0#cstringSList_unparse
-^3479 16850$$$@0#cstringSList_free
-^3480 16846$$$@0#cstringSList_printSpaced
+^3473 16828@6@5@1@0@0^@2@0@0#cstringSList_single
+^3474 16830@6@5@1@0@0@0@@1@p0$@0#cstringSList_add
+^3475 16844$$$@0#cstringSList_alphabetize
+^3476 16832@6@5@1@0@0^@19@3@0#cstringSList_get
+^3477 16840@6@5@1@0@0^@2@0@0#cstringSList_unparseAbbrev
+^3478 16834@6@5@1@0@0$@2@0@0#cstringSList_unparse
+^3479 16842$$$@0#cstringSList_free
+^3480 16838$$$@0#cstringSList_printSpaced
 *1 (Constant)
 ^3481 5$#cstringSListBASESIZE
 *6 (Iterator finalizer)
@@ -23869,20 +23861,20 @@
 *1 (Constant)
 ^3486 2392@i0@0@4#cstringList_undefined
 *4 (Function)
-^3487 16808@6@5@1@0@0^@3@0@0#cstringList_unparseSep
+^3487 16800@6@5@1@0@0^@3@0@0#cstringList_unparseSep
 ^3488 2402@6@5@1@0@0^@2@0@0#cstringList_new
-^3489 16800@6@5@1@0@0^@2@0@0#cstringList_single
-^3490 16802@6@5@1@0@0@0@@1@p0$@0#cstringList_add
-^3491 16804@6@5@1@0@0@0@@1@p0@2@0@0#cstringList_prepend
-^3492 16824$^$@0#cstringList_contains
-^3493 16822$^$@0#cstringList_getIndex
-^3494 16828@6@5@1@0@0^@19@3@0#cstringList_get
-^3495 16816$$$@0#cstringList_alphabetize
-^3496 16812@6@5@1@0@0^@2@0@0#cstringList_unparseAbbrev
-^3497 16806@6@5@1@0@0$@2@0@0#cstringList_unparse
-^3498 16814$$$@0#cstringList_free
-^3499 16810$$$@0#cstringList_printSpaced
-^3500 16826@6@5@1@0@0^@2@0@0#cstringList_copy
+^3489 16792@6@5@1@0@0^@2@0@0#cstringList_single
+^3490 16794@6@5@1@0@0@0@@1@p0$@0#cstringList_add
+^3491 16796@6@5@1@0@0@0@@1@p0@2@0@0#cstringList_prepend
+^3492 16816$^$@0#cstringList_contains
+^3493 16814$^$@0#cstringList_getIndex
+^3494 16820@6@5@1@0@0^@19@3@0#cstringList_get
+^3495 16808$$$@0#cstringList_alphabetize
+^3496 16804@6@5@1@0@0^@2@0@0#cstringList_unparseAbbrev
+^3497 16798@6@5@1@0@0$@2@0@0#cstringList_unparse
+^3498 16806$$$@0#cstringList_free
+^3499 16802$$$@0#cstringList_printSpaced
+^3500 16818@6@5@1@0@0^@2@0@0#cstringList_copy
 *1 (Constant)
 ^3501 5$#cstringListBASESIZE
 *6 (Iterator finalizer)
@@ -23890,82 +23882,82 @@
 *5 (Iterator)
 ^3503 2427@145#cstringList_elements
 *4 (Function)
-^3504 14268$$$@0#doCheck
-^3505 14153$@0@g2675@0@0@1@g2675$@0#llmsg
-^3506 14155$@0@g155@6@0@1@g155$@0#lldiagmsg
-^3507 14157$@0@g2675@0@0@1@g2675$@0#llmsgplain
-^3508 14163$@1@g2674@6@5,g2675@6@0@1@g2675$@0#llhint
-^3509 14212@6@0@6@0@0@1@g2674@6@5,g155@6@0@1@g155$@0#xllfatalbug
-^3510 14193$@0@g2675@0@0@1@g2675$@0#xllgenerror
-^3511 14195$@0@g2675@0@0@1@g2675$@0#xllgenhinterror
-^3512 14181$@0@g2675@0@0@1@g2675$@0#llgenmsg
-^3513 14222@6@0@6@0@0@0@g2675@0@0@1@g2675$@0#llfatalerror
-^3514 14224@6@0@6@0@0@1@g2674@6@5,g155@6@0@1@g155$@0#llfatalerrorLoc
-^3515 14264$@1@g2675@6@0,g2674@6@5@1@g2675$@0#llparseerror
-^3516 14238@6@0@6@0@0@0@g2675@0@0@1@g2675$@0#lclplainfatalerror
-^3517 14214@6@0@6@0@0@0@g2675@0@0@1@g2675$@0#lclfatalbug
-^3518 14230$^$@0#lclNumberErrors
-^3519 14228$@0@s1@1@s1$@0#lclHadNewError
-^3520 14236@6@0@6@0@0$$@0#lclfatalerror
-^3521 14232$$$@0#xlclerror
-^3522 14220$$$@0#lclbug
-^3523 14234$$$@0#lclplainerror
-^3524 14226$$$@0#lclHadError
-^3525 14240$$$@0#lclRedeclarationError
-^3526 14159$@0@g2675@0@0@1@g2675$@0#llerror_flagWarning
-^3527 14218@6@0@6@0@0@1@g2675@6@0,g2674@6@5@1@tg2675$@0#llbugaux
-^3528 14272$@0@g2675@0@0@1@tg2675$@0#llquietbugaux
+^3504 14260$$$@0#doCheck
+^3505 14145$@0@g2675@0@0@1@g2675$@0#llmsg
+^3506 14147$@0@g155@6@0@1@g155$@0#lldiagmsg
+^3507 14149$@0@g2675@0@0@1@g2675$@0#llmsgplain
+^3508 14155$@1@g2674@6@5,g2675@6@0@1@g2675$@0#llhint
+^3509 14204@6@0@6@0@0@1@g2674@6@5,g155@6@0@1@g155$@0#xllfatalbug
+^3510 14185$@0@g2675@0@0@1@g2675$@0#xllgenerror
+^3511 14187$@0@g2675@0@0@1@g2675$@0#xllgenhinterror
+^3512 14173$@0@g2675@0@0@1@g2675$@0#llgenmsg
+^3513 14214@6@0@6@0@0@0@g2675@0@0@1@g2675$@0#llfatalerror
+^3514 14216@6@0@6@0@0@1@g2674@6@5,g155@6@0@1@g155$@0#llfatalerrorLoc
+^3515 14256$@1@g2675@6@0,g2674@6@5@1@g2675$@0#llparseerror
+^3516 14230@6@0@6@0@0@0@g2675@0@0@1@g2675$@0#lclplainfatalerror
+^3517 14206@6@0@6@0@0@0@g2675@0@0@1@g2675$@0#lclfatalbug
+^3518 14222$^$@0#lclNumberErrors
+^3519 14220$@0@s1@1@s1$@0#lclHadNewError
+^3520 14228@6@0@6@0@0$$@0#lclfatalerror
+^3521 14224$$$@0#xlclerror
+^3522 14212$$$@0#lclbug
+^3523 14226$$$@0#lclplainerror
+^3524 14218$$$@0#lclHadError
+^3525 14232$$$@0#lclRedeclarationError
+^3526 14151$@0@g2675@0@0@1@g2675$@0#llerror_flagWarning
+^3527 14210@6@0@6@0@0@1@g2675@6@0,g2674@6@5@1@tg2675$@0#llbugaux
+^3528 14264$@0@g2675@0@0@1@tg2675$@0#llquietbugaux
 ^3529 2507$@1@g2675@6@0,g2674@6@5,s1@1@g2675,s1$@0#cleanupMessages
-^3530 14258$@0@g2675@0@0,s1@1@tg2675,s1$@0#xoptgenerror2
-^3531 14260$@0@g2675@0@0,s1@1@tg2675,s1$@0#xoptgenerror2n
-^3532 14256$@0@g2675@0@0,s1@1@tg2675,s1$@0#xlloptgenerror
-^3533 14262$@0@g2675@0@0,s1@1@tg2675,s1$@0#xllnoptgenerror
-^3534 14191$@0@g2675@0@0,s1@1@tg2675,s1$@0#xllgenformattypeerror
-^3535 14189$@0@g2675@0@0,s1@1@tg2675,s1$@0#xllgentypeerror
-^3536 14266$@0@g2675@0@0,s1@1@g2675,s1$@0#xfsgenerror
-^3537 14202$@0@g2675@0@0@1@g2675$@0#xllforceerror
-^3538 14254$@0@g2675@0@0@1@g2675,p4$@0#xcppoptgenerror
-^3539 14183$@0@g2675@0@0@1@g2675$@0#llgenindentmsg
-^3540 14216$$$@0#checkParseError
-^3541 14246$$$@0#ppllerror
-^3542 14244$$$@0#genppllerrorhint
-^3543 14242$$$@0#genppllerror
-^3544 14248$$$@0#pplldiagmsg
-^3545 14250$$$@0#loadllmsg
-^3546 14185$$$@0#llgenindentmsgnoloc
-^3547 14270@6@5@1@0@0^@19@3@0#lldecodeerror
-^3548 14149$@0@s1,g2675@0@0@1@s1,g2675$@0#prepareMessage
-^3549 14151$@0@s1,g2675@0@0@1@s1,g2675$@0#closeMessage
-^3550 14274$@0@s3@1@s3$@0#llflush
-^3551 15870$^$@0#fileLib_isLCLFile
-^3552 15868$^$@0#fileLib_isCExtension
-^3553 15880@6@5@1@0@0$@3@0@0#fileLib_addExtension
-^3554 15872@6@5@1@0@0^@3@0@0#fileLib_withoutExtension
-^3555 15874@6@5@1@0@0^@3@0@0#fileLib_removePath
-^3556 15876@6@5@1@0@0^@3@0@0#fileLib_removePathFree
-^3557 15878@6@5@1@0@0^@3@0@0#fileLib_removeAnyExtension
-^3558 15890@6@5@1@0@0^@3@0@0#fileLib_cleanName
-^3559 15882$^$@0#fileLib_hasExtension
-^3560 15884@6@5@1@0@0^@19@3@0#fileLib_getExtension
+^3530 14250$@0@g2675@0@0,s1@1@tg2675,s1$@0#xoptgenerror2
+^3531 14252$@0@g2675@0@0,s1@1@tg2675,s1$@0#xoptgenerror2n
+^3532 14248$@0@g2675@0@0,s1@1@tg2675,s1$@0#xlloptgenerror
+^3533 14254$@0@g2675@0@0,s1@1@tg2675,s1$@0#xllnoptgenerror
+^3534 14183$@0@g2675@0@0,s1@1@tg2675,s1$@0#xllgenformattypeerror
+^3535 14181$@0@g2675@0@0,s1@1@tg2675,s1$@0#xllgentypeerror
+^3536 14258$@0@g2675@0@0,s1@1@g2675,s1$@0#xfsgenerror
+^3537 14194$@0@g2675@0@0@1@g2675$@0#xllforceerror
+^3538 14246$@0@g2675@0@0@1@g2675,p4$@0#xcppoptgenerror
+^3539 14175$@0@g2675@0@0@1@g2675$@0#llgenindentmsg
+^3540 14208$$$@0#checkParseError
+^3541 14238$$$@0#ppllerror
+^3542 14236$$$@0#genppllerrorhint
+^3543 14234$$$@0#genppllerror
+^3544 14240$$$@0#pplldiagmsg
+^3545 14242$$$@0#loadllmsg
+^3546 14177$$$@0#llgenindentmsgnoloc
+^3547 14262@6@5@1@0@0^@19@3@0#lldecodeerror
+^3548 14141$@0@s1,g2675@0@0@1@s1,g2675$@0#prepareMessage
+^3549 14143$@0@s1,g2675@0@0@1@s1,g2675$@0#closeMessage
+^3550 14266$@0@s3@1@s3$@0#llflush
+^3551 15862$^$@0#fileLib_isLCLFile
+^3552 15860$^$@0#fileLib_isCExtension
+^3553 15872@6@5@1@0@0$@3@0@0#fileLib_addExtension
+^3554 15864@6@5@1@0@0^@3@0@0#fileLib_withoutExtension
+^3555 15866@6@5@1@0@0^@3@0@0#fileLib_removePath
+^3556 15868@6@5@1@0@0^@3@0@0#fileLib_removePathFree
+^3557 15870@6@5@1@0@0^@3@0@0#fileLib_removeAnyExtension
+^3558 15882@6@5@1@0@0^@3@0@0#fileLib_cleanName
+^3559 15874$^$@0#fileLib_hasExtension
+^3560 15876@6@5@1@0@0^@19@3@0#fileLib_getExtension
 *1 (Constant)
 ^3561 1211@@0@5#MTS_EXTENSION#LCL_EXTENSION#LH_EXTENSION#C_EXTENSION#LHTMP_EXTENSION#XH_EXTENSION
 ^3567 5$#STUBMAXRECORDSIZE
 ^3568 1094@i0@0@4#inputStream_undefined
 *4 (Function)
-^3569 13921$$$@0#inputStream_free
-^3570 13919$@0@s3@1@p0,s3$@0#inputStream_close
-^3571 13923@6@5@1@0@0^@3@0@0#inputStream_create
-^3572 13925@6@5@1@0@0^@3@0@0#inputStream_fromString
-^3573 13934@6@5@1@0@0@0@@1@p0@18@0@0#inputStream_nextLine
-^3574 13927$@0@@1@p0$@0#inputStream_nextChar
-^3575 13931$@0@@1@p0$@0#inputStream_peekChar
-^3576 13929$@0@@1@p0$@0#inputStream_peekNChar
-^3577 13936$@0@s3@1@p0,s3$@0#inputStream_open
-^3578 13938$@0@@1@p1$@0#inputStream_getPath
-^3579 13943@6@5@1@0@0^@19@3@0#inputStream_fileName
-^3580 13945$^$@0#inputStream_isOpen
-^3581 13947$^$@0#inputStream_thisLineNumber
-^3582 13941$^@19@2@0#inputStream_getFile
+^3569 13913$$$@0#inputStream_free
+^3570 13911$@0@s3@1@p0,s3$@0#inputStream_close
+^3571 13915@6@5@1@0@0^@3@0@0#inputStream_create
+^3572 13917@6@5@1@0@0^@3@0@0#inputStream_fromString
+^3573 13926@6@5@1@0@0@0@@1@p0@18@0@0#inputStream_nextLine
+^3574 13919$@0@@1@p0$@0#inputStream_nextChar
+^3575 13923$@0@@1@p0$@0#inputStream_peekChar
+^3576 13921$@0@@1@p0$@0#inputStream_peekNChar
+^3577 13928$@0@s3@1@p0,s3$@0#inputStream_open
+^3578 13930$@0@@1@p1$@0#inputStream_getPath
+^3579 13935@6@5@1@0@0^@19@3@0#inputStream_fileName
+^3580 13937$^$@0#inputStream_isOpen
+^3581 13939$^$@0#inputStream_thisLineNumber
+^3582 13933$^@19@2@0#inputStream_getFile
 *7 (Struct tag)
 ^3583 2657@2658#@!17
 *0 (Datatype)
@@ -23978,19 +23970,19 @@
 ^3587 2665@146#qualList_elements
 *4 (Function)
 ^3588 2671@6@5@1@0@0^@3@0@0#qualList_new
-^3589 17062@6@5@1@0@0@0@@1@p0$@0#qualList_add
-^3590 17068@6@5@1@0@0^@2@0@0#qualList_unparse
-^3591 17076$$$@0#qualList_free
-^3592 17064@6@5@1@0@0$$@0#qualList_appendList
-^3593 17066@6@5@1@0@0$@3@0@0#qualList_copy
-^3594 17070@6@5@1@0@0$@2@0@0#qualList_toCComments
-^3595 17058$$$@0#qualList_clear
+^3589 17054@6@5@1@0@0@0@@1@p0$@0#qualList_add
+^3590 17060@6@5@1@0@0^@2@0@0#qualList_unparse
+^3591 17068$$$@0#qualList_free
+^3592 17056@6@5@1@0@0$$@0#qualList_appendList
+^3593 17058@6@5@1@0@0$@3@0@0#qualList_copy
+^3594 17062@6@5@1@0@0$@2@0@0#qualList_toCComments
+^3595 17050$$$@0#qualList_clear
 *1 (Constant)
 ^3596 5$#qualListBASESIZE
 *4 (Function)
-^3597 17072$$$@0#qualList_hasAliasQualifier
-^3598 17074$$$@0#qualList_hasExposureQualifier
-^3599 17078$$$@0#qualList_hasNullTerminatedQualifier
+^3597 17064$$$@0#qualList_hasAliasQualifier
+^3598 17066$$$@0#qualList_hasExposureQualifier
+^3599 17070$$$@0#qualList_hasNullTerminatedQualifier
 *1 (Constant)
 ^3600 1044$#LEOFTOKEN#NOTTOKEN
 *7 (Struct tag)
@@ -24003,10 +23995,10 @@
 *0 (Datatype)
 ^3606 2703@+@=@0@0@0@0@2704#mapping
 *4 (Function)
-^3607 19987$$@2@0@0#mapping_create
-^3608 19990$$$@0#mapping_find
-^3609 19992$$$@0#mapping_bind
-^3610 19985$$$@0#mapping_free
+^3607 19979$$@2@0@0#mapping_create
+^3608 19982$$$@0#mapping_find
+^3609 19984$$$@0#mapping_bind
+^3610 19977$$$@0#mapping_free
 *1 (Constant)
 ^3611 23$#BEGINSORTTABLE#SORTTABLEEND
 *2 (Enum member)
@@ -24026,49 +24018,49 @@
 *0 (Datatype)
 ^3634 2723@-@+@0@0@0@0@2724#sortNode
 *4 (Function)
-^3635 19409@6@5@1@0@0^@3@0@0#sort_unparse
-^3636 19460@6@5@1@0@0^@19@2@0#sort_unparseName
-^3637 19305$^$@0#sort_makeSort
-^3638 19311$^$@0#sort_makeSyn
-^3639 19313$^$@0#sort_makeFormal
-^3640 19315$^$@0#sort_makeGlobal
-^3641 19319$^$@0#sort_makePtr
-^3642 19321$^$@0#sort_makePtrN
-^3643 19327$^$@0#sort_makeVal
-^3644 19317$^$@0#sort_makeObj
-^3645 19295$@1@s1@1@s1$@0#sort_destroyMod
-^3646 19323$^$@0#sort_makeArr
-^3647 19325$^$@0#sort_makeVec
-^3648 19331$^$@0#sort_makeMutable
-^3649 19329$^$@0#sort_makeImmutable
-^3650 19333$^$@0#sort_makeStr
-^3651 19347$^$@0#sort_makeUnion
-^3652 19359$^$@0#sort_makeEnum
-^3653 19335$@0@s1@1@s1$@0#sort_updateStr
-^3654 19349$@0@s1@1@s1$@0#sort_updateUnion
-^3655 19361$@0@s1@1@s1$@0#sort_updateEnum
-^3656 19337$@0@s1@1@s1$@0#sort_makeTuple
-^3657 19351$@0@s1@1@s1$@0#sort_makeUnionVal
-^3658 19455$^$@0#sort_getLsymbol
-^3659 19458$^@19@3@0#sort_getName
-^3660 19401$^@19@3@0#sort_lookup
-^3661 19403$^@19@3@0#sort_quietLookup
-^3662 19389$^$@0#sort_lookupName
-^3663 19433$@0@@1@p0$@0#sort_dump
-^3664 19387$@1@s1@1@s1$@0#sort_init
-^3665 19451$^$@0#sort_compatible
-^3666 19453$^$@0#sort_compatible_modulo_cstring
-^3667 19419$^$@0#sort_getUnderlying
-^3668 19425$^$@0#sort_mutable
-^3669 19297$@0@s1@1@s1$@0#sort_makeNoSort
-^3670 19299$^$@0#sort_makeHOFSort
-^3671 19468$^$@0#sort_isHOFSortKind
-^3672 19431$^$@0#sort_isValidSort
-^3673 19427$@0@s1@1@s1$@0#sort_setExporting
-^3674 19399$@0@g2675@0@0@1@g2675$@0#sort_printStats
-^3675 19449$^$@0#sort_equal
-^3676 19466$@0@s1@1@s1$@0#sort_fromLsymbol
-^3677 19447$@0@s1@1@p0,s1$@0#sort_import
+^3635 19401@6@5@1@0@0^@3@0@0#sort_unparse
+^3636 19452@6@5@1@0@0^@19@2@0#sort_unparseName
+^3637 19297$^$@0#sort_makeSort
+^3638 19303$^$@0#sort_makeSyn
+^3639 19305$^$@0#sort_makeFormal
+^3640 19307$^$@0#sort_makeGlobal
+^3641 19311$^$@0#sort_makePtr
+^3642 19313$^$@0#sort_makePtrN
+^3643 19319$^$@0#sort_makeVal
+^3644 19309$^$@0#sort_makeObj
+^3645 19287$@1@s1@1@s1$@0#sort_destroyMod
+^3646 19315$^$@0#sort_makeArr
+^3647 19317$^$@0#sort_makeVec
+^3648 19323$^$@0#sort_makeMutable
+^3649 19321$^$@0#sort_makeImmutable
+^3650 19325$^$@0#sort_makeStr
+^3651 19339$^$@0#sort_makeUnion
+^3652 19351$^$@0#sort_makeEnum
+^3653 19327$@0@s1@1@s1$@0#sort_updateStr
+^3654 19341$@0@s1@1@s1$@0#sort_updateUnion
+^3655 19353$@0@s1@1@s1$@0#sort_updateEnum
+^3656 19329$@0@s1@1@s1$@0#sort_makeTuple
+^3657 19343$@0@s1@1@s1$@0#sort_makeUnionVal
+^3658 19447$^$@0#sort_getLsymbol
+^3659 19450$^@19@3@0#sort_getName
+^3660 19393$^@19@3@0#sort_lookup
+^3661 19395$^@19@3@0#sort_quietLookup
+^3662 19381$^$@0#sort_lookupName
+^3663 19425$@0@@1@p0$@0#sort_dump
+^3664 19379$@1@s1@1@s1$@0#sort_init
+^3665 19443$^$@0#sort_compatible
+^3666 19445$^$@0#sort_compatible_modulo_cstring
+^3667 19411$^$@0#sort_getUnderlying
+^3668 19417$^$@0#sort_mutable
+^3669 19289$@0@s1@1@s1$@0#sort_makeNoSort
+^3670 19291$^$@0#sort_makeHOFSort
+^3671 19460$^$@0#sort_isHOFSortKind
+^3672 19423$^$@0#sort_isValidSort
+^3673 19419$@0@s1@1@s1$@0#sort_setExporting
+^3674 19391$@0@g2675@0@0@1@g2675$@0#sort_printStats
+^3675 19441$^$@0#sort_equal
+^3676 19458$@0@s1@1@s1$@0#sort_fromLsymbol
+^3677 19439$@0@s1@1@p0,s1$@0#sort_import
 *3 (Variable)
 ^3678 1036|@1|^#sort_bool#sort_capBool#sort_int#sort_char#sort_cstring#sort_float#sort_double
 *2 (Enum member)
@@ -24085,8 +24077,8 @@
 ^3721 2818@-@-@0@0@0@0@2819#TypeSpec
 ^3722 1236@-@-@0@0@0@0@2820#lclctype
 *4 (Function)
-^3723 18122$$$@0#lclctype_toSort
-^3724 18120$$$@0#lclctype_toSortDebug
+^3723 18114$$$@0#lclctype_toSort
+^3724 18112$$$@0#lclctype_toSortDebug
 *2 (Enum member)
 ^3725 2827$#PNORMAL#PYIELD#PELIPSIS
 *9 (Enum tag)
@@ -24098,10 +24090,10 @@
 *0 (Datatype)
 ^3731 2832@-@+@0@0@0@0@2833#paramNode
 *4 (Function)
-^3732 18991$$$@0#paramNode_free
-^3733 18989@6@5@1@0@0$@3@0@0#paramNode_copy
-^3734 18819@6@5@1@0@0$@2@0@0#paramNode_unparse
-^3735 18825@6@5@1@0@0$@2@0@0#paramNode_unparseComments
+^3732 18983$$$@0#paramNode_free
+^3733 18981@6@5@1@0@0$@3@0@0#paramNode_copy
+^3734 18811@6@5@1@0@0$@2@0@0#paramNode_unparse
+^3735 18817@6@5@1@0@0$@2@0@0#paramNode_unparseComments
 *0 (Datatype)
 ^3736 2833@-@+@0@5@2@0@2846#o_paramNode
 *7 (Struct tag)
@@ -24113,26 +24105,26 @@
 *5 (Iterator)
 ^3740 2852@149#paramNodeList_elements
 *4 (Function)
-^3741 17766@6@5@1@0@0$@2@0@0#paramNodeList_single
+^3741 17758@6@5@1@0@0$@2@0@0#paramNodeList_single
 ^3742 2862@6@5@1@0@0$@2@0@0#paramNodeList_new
-^3743 17770@6@5@1@0@0$$@0#paramNodeList_add
-^3744 17774@6@5@1@0@0$@2@0@0#paramNodeList_unparse
-^3745 17778$$$@0#paramNodeList_free
-^3746 17772@6@5@1@0@0$@2@0@0#paramNodeList_copy
-^3747 17776@6@5@1@0@0$@2@0@0#paramNodeList_unparseComments
+^3743 17762@6@5@1@0@0$$@0#paramNodeList_add
+^3744 17766@6@5@1@0@0$@2@0@0#paramNodeList_unparse
+^3745 17770$$$@0#paramNodeList_free
+^3746 17764@6@5@1@0@0$@2@0@0#paramNodeList_copy
+^3747 17768@6@5@1@0@0$@2@0@0#paramNodeList_unparseComments
 *1 (Constant)
 ^3748 5$#paramNodeListBASESIZE
 ^3749 2851@i0@0@4#paramNodeList_undefined
 ^3750 1037@@0@6#lsymbol_undefined
 *4 (Function)
-^3751 19958$^$@0#lsymbol_fromChars
-^3752 19956$^$@0#lsymbol_fromString
-^3753 19966@6@5@1@0@0^@19@2@0#lsymbol_toChars
-^3754 19963$^@19@2@0#lsymbol_toCharsSafe
-^3755 19960@6@5@1@0@0^@19@3@0#lsymbol_toString
-^3756 19980$$$@0#lsymbol_printStats
-^3757 19976$@1@s1@1@s1$@0#lsymbol_initMod
-^3758 19978$@1@s1@1@s1$@0#lsymbol_destroyMod
+^3751 19950$^$@0#lsymbol_fromChars
+^3752 19948$^$@0#lsymbol_fromString
+^3753 19958@6@5@1@0@0^@19@2@0#lsymbol_toChars
+^3754 19955$^@19@2@0#lsymbol_toCharsSafe
+^3755 19952@6@5@1@0@0^@19@3@0#lsymbol_toString
+^3756 19972$$$@0#lsymbol_printStats
+^3757 19968$@1@s1@1@s1$@0#lsymbol_initMod
+^3758 19970$@1@s1@1@s1$@0#lsymbol_destroyMod
 *1 (Constant)
 ^3759 5$#HT_MAXINDEX
 *2 (Enum member)
@@ -24145,8 +24137,8 @@
 *1 (Constant)
 ^3767 1043@i0@0@4#ltoken_undefined
 *4 (Function)
-^3768 19093@6@5@1@0@0^@3@0@0#ltoken_createType
-^3769 19089@6@5@1@0@0^@3@0@0#ltoken_create
+^3768 19085@6@5@1@0@0^@3@0@0#ltoken_createType
+^3769 19081@6@5@1@0@0^@3@0@0#ltoken_create
 *3 (Variable)
 ^3770 1043|@1|0@5@18&#ltoken_forall#ltoken_exists#ltoken_true#ltoken_false#ltoken_not#ltoken_and#ltoken_or#ltoken_implies#ltoken_eq#ltoken_neq#ltoken_equals#ltoken_eqsep#ltoken_select#ltoken_open#ltoken_sep#ltoken_close#ltoken_id#ltoken_arrow#ltoken_marker#ltoken_pre#ltoken_post#ltoken_comment
 ^3792 1043|@1|6@5@18&#ltoken_compose#ltoken_if
@@ -24154,17 +24146,17 @@
 ^3798 1043|@1|6@5@18&#ltoken_farrow
 ^3799 1043|@1|0@5@18&#ltoken_lbracked#ltoken_rbracket
 *4 (Function)
-^3801 19099@6@5@1@0@0^@3@0@0#ltoken_unparseCodeName
-^3802 19101@6@5@1@0@0$@19@3@0#ltoken_unparse
-^3803 19105$^$@0#ltoken_getRawText
-^3804 18585$^$@22#ltoken_similar
-^3805 19103@6@5@1@0@0^@3@0@0#ltoken_copy
-^3806 19111$$$@0#ltoken_free
-^3807 19095@6@5@1@0@0^@3@0@0#ltoken_createFull
-^3808 19091@6@5@1@0@0^@3@0@0#ltoken_createRaw
-^3809 19107@6@5@1@0@0^@3@0@0#ltoken_unparseLoc
-^3810 19109$$$@0#ltoken_markOwned
-^3811 19113$^$@0#ltoken_isSingleChar
+^3801 19091@6@5@1@0@0^@3@0@0#ltoken_unparseCodeName
+^3802 19093@6@5@1@0@0$@19@3@0#ltoken_unparse
+^3803 19097$^$@0#ltoken_getRawText
+^3804 18577$^$@22#ltoken_similar
+^3805 19095@6@5@1@0@0^@3@0@0#ltoken_copy
+^3806 19103$$$@0#ltoken_free
+^3807 19087@6@5@1@0@0^@3@0@0#ltoken_createFull
+^3808 19083@6@5@1@0@0^@3@0@0#ltoken_createRaw
+^3809 19099@6@5@1@0@0^@3@0@0#ltoken_unparseLoc
+^3810 19101$$$@0#ltoken_markOwned
+^3811 19105$^$@0#ltoken_isSingleChar
 *7 (Struct tag)
 ^3812 2983@2984#@!27
 *0 (Datatype)
@@ -24177,19 +24169,19 @@
 ^3816 2986@i0@0@4#ltokenList_undefined
 *4 (Function)
 ^3817 2999@6@2@1@0@0^@2@0@0#ltokenList_new
-^3818 17695$@0@@1@p0$@0#ltokenList_addh
-^3819 17697$@0@@1@p0$@0#ltokenList_reset
-^3820 17701$@0@@1@p0$@0#ltokenList_advance
-^3821 17713@6@5@1@0@0^@2@0@0#ltokenList_unparse
-^3822 17715$$$@0#ltokenList_free
-^3823 17703@6@5@1@0@0^@19@3@0#ltokenList_head
-^3824 17711@6@5@1@0@0^@19@3@0#ltokenList_current
-^3825 17707@6@5@1@0@0^@2@0@0#ltokenList_copy
-^3826 17689@6@2@1@0@0$@2@0@0#ltokenList_singleton
-^3827 17693@6@5@1@0@0$$@0#ltokenList_push
-^3828 17705$^$@0#ltokenList_equal
-^3829 17699$^$@0#ltokenList_isFinished
-^3830 17709$@0@@1@p0$@0#ltokenList_removeCurrent
+^3818 17687$@0@@1@p0$@0#ltokenList_addh
+^3819 17689$@0@@1@p0$@0#ltokenList_reset
+^3820 17693$@0@@1@p0$@0#ltokenList_advance
+^3821 17705@6@5@1@0@0^@2@0@0#ltokenList_unparse
+^3822 17707$$$@0#ltokenList_free
+^3823 17695@6@5@1@0@0^@19@3@0#ltokenList_head
+^3824 17703@6@5@1@0@0^@19@3@0#ltokenList_current
+^3825 17699@6@5@1@0@0^@2@0@0#ltokenList_copy
+^3826 17681@6@2@1@0@0$@2@0@0#ltokenList_singleton
+^3827 17685@6@5@1@0@0$$@0#ltokenList_push
+^3828 17697$^$@0#ltokenList_equal
+^3829 17691$^$@0#ltokenList_isFinished
+^3830 17701$@0@@1@p0$@0#ltokenList_removeCurrent
 *1 (Constant)
 ^3831 5$#ltokenListBASESIZE
 *2 (Enum member)
@@ -24209,10 +24201,10 @@
 *0 (Datatype)
 ^3845 3034@-@+@0@0@0@0@3035#importNode
 *4 (Function)
-^3846 18981$$$@0#importNode_free
-^3847 18627$$@2@0@0#importNode_makePlain
-^3848 18629$$@2@0@0#importNode_makeBracketed
-^3849 18633$$@2@0@0#importNode_makeQuoted
+^3846 18973$$$@0#importNode_free
+^3847 18619$$@2@0@0#importNode_makePlain
+^3848 18621$$@2@0@0#importNode_makeBracketed
+^3849 18625$$@2@0@0#importNode_makeQuoted
 *0 (Datatype)
 ^3850 3035@-@+@0@0@2@0@3044#o_importNode
 *7 (Struct tag)
@@ -24225,25 +24217,25 @@
 ^3854 3050@152#importNodeList_elements
 *4 (Function)
 ^3855 3052$$@2@0@0#importNodeList_new
-^3856 17844$$$@0#importNodeList_add
-^3857 17846@6@5@1@0@0$@2@0@0#importNodeList_unparse
-^3858 17848$$$@0#importNodeList_free
+^3856 17836$$$@0#importNodeList_add
+^3857 17838@6@5@1@0@0$@2@0@0#importNodeList_unparse
+^3858 17840$$$@0#importNodeList_free
 *1 (Constant)
 ^3859 5$#importNodeListBASESIZE
 *4 (Function)
-^3860 18637$$$@0#checkBrackets
+^3860 18629$$$@0#checkBrackets
 *7 (Struct tag)
 ^3861 3062@3063#@!32
 *0 (Datatype)
 ^3862 3064@+@=@0@0@0@0@3065#sortList
 *4 (Function)
 ^3863 3067$$@2@0@0#sortList_new
-^3864 17530$$$@0#sortList_addh
-^3865 17532$$$@0#sortList_reset
-^3866 17534$$$@0#sortList_advance
-^3867 17538@6@5@1@0@0$@2@0@0#sortList_unparse
-^3868 17540$$$@0#sortList_free
-^3869 17536$$$@0#sortList_current
+^3864 17522$$$@0#sortList_addh
+^3865 17524$$$@0#sortList_reset
+^3866 17526$$$@0#sortList_advance
+^3867 17530@6@5@1@0@0$@2@0@0#sortList_unparse
+^3868 17532$$$@0#sortList_free
+^3869 17528$$$@0#sortList_current
 *1 (Constant)
 ^3870 5$#sortListBASESIZE
 *7 (Struct tag)
@@ -24256,8 +24248,8 @@
 ^3874 3085@154#lsymbolList_elements
 *4 (Function)
 ^3875 3087$$@2@0@0#lsymbolList_new
-^3876 17647$$$@0#lsymbolList_addh
-^3877 17649$$$@0#lsymbolList_free
+^3876 17639$$$@0#lsymbolList_addh
+^3877 17641$$$@0#lsymbolList_free
 *1 (Constant)
 ^3878 5$#lsymbolListBASESIZE
 *7 (Struct tag)
@@ -24272,10 +24264,10 @@
 ^3883 3098@155#lsymbolSet_elements
 *4 (Function)
 ^3884 3100@6@5@1@0@0^@2@0@0#lsymbolSet_new
-^3885 17439$@0@@1@p0$@0#lsymbolSet_insert
-^3886 17441$^$@0#lsymbolSet_member
-^3887 17443@6@5@1@0@0^@2@0@0#lsymbolSet_unparse
-^3888 17445$$$@0#lsymbolSet_free
+^3885 17431$@0@@1@p0$@0#lsymbolSet_insert
+^3886 17433$^$@0#lsymbolSet_member
+^3887 17435@6@5@1@0@0^@2@0@0#lsymbolSet_unparse
+^3888 17437$$$@0#lsymbolSet_free
 *1 (Constant)
 ^3889 5$#lsymbolSetBASESIZE
 *7 (Struct tag)
@@ -24290,14 +24282,14 @@
 ^3894 3112@i0@0@4#sortSet_undefined
 *4 (Function)
 ^3895 3119@6@5@1@0@0$@2@0@0#sortSet_new
-^3896 17499$$$@0#sortSet_insert
-^3897 17503$$$@0#sortSet_member
-^3898 17505@6@5@1@0@0$@2@0@0#sortSet_unparse
-^3899 17507@6@5@1@0@0$@2@0@0#sortSet_unparseClean
-^3900 17509@6@5@1@0@0$@2@0@0#sortSet_unparseOr
-^3901 17511$$$@0#sortSet_free
-^3902 17501$$$@0#sortSet_choose
-^3903 17513@6@5@1@0@0$@2@0@0#sortSet_copy
+^3896 17491$$$@0#sortSet_insert
+^3897 17495$$$@0#sortSet_member
+^3898 17497@6@5@1@0@0$@2@0@0#sortSet_unparse
+^3899 17499@6@5@1@0@0$@2@0@0#sortSet_unparseClean
+^3900 17501@6@5@1@0@0$@2@0@0#sortSet_unparseOr
+^3901 17503$$$@0#sortSet_free
+^3902 17493$$$@0#sortSet_choose
+^3903 17505@6@5@1@0@0$@2@0@0#sortSet_copy
 *1 (Constant)
 ^3904 5$#sortSetBASESIZE
 *7 (Struct tag)
@@ -24305,7 +24297,7 @@
 *0 (Datatype)
 ^3906 3138@-@+@0@0@0@0@3139#pairNode
 *4 (Function)
-^3907 18987$$$@0#pairNode_free
+^3907 18979$$$@0#pairNode_free
 *0 (Datatype)
 ^3908 3139@-@+@0@0@2@0@3142#o_pairNode
 *7 (Struct tag)
@@ -24320,9 +24312,9 @@
 ^3913 3147@i0@0@4#pairNodeList_undefined
 *4 (Function)
 ^3914 3152@6@5@1@0@0^@2@0@0#pairNodeList_new
-^3915 17733$@0@@1@p0$@0#pairNodeList_addh
-^3916 17735@6@5@1@0@0^@2@0@0#pairNodeList_unparse
-^3917 17737$$$@0#pairNodeList_free
+^3915 17725$@0@@1@p0$@0#pairNodeList_addh
+^3916 17727@6@5@1@0@0^@2@0@0#pairNodeList_unparse
+^3917 17729$$$@0#pairNodeList_free
 *1 (Constant)
 ^3918 5$#pairNodeListBASESIZE
 *7 (Struct tag)
@@ -24330,8 +24322,8 @@
 *0 (Datatype)
 ^3920 3161@-@+@0@0@0@0@3162#declaratorNode
 *4 (Function)
-^3921 18723@6@5@1@0@0$@2@0@0#declaratorNode_unparse
-^3922 18957$$$@0#declaratorNode_free
+^3921 18715@6@5@1@0@0$@2@0@0#declaratorNode_unparse
+^3922 18949$$$@0#declaratorNode_free
 *0 (Datatype)
 ^3923 3162@-@+@0@0@2@0@3167#o_declaratorNode
 *7 (Struct tag)
@@ -24344,10 +24336,10 @@
 ^3927 3173@158#declaratorNodeList_elements
 *4 (Function)
 ^3928 3175$$@2@0@0#declaratorNodeList_new
-^3929 17588$$$@0#declaratorNodeList_add
-^3930 17590@6@5@1@0@0$@2@0@0#declaratorNodeList_unparse
-^3931 17594$$$@0#declaratorNodeList_free
-^3932 17592$$@3@0@0#declaratorNodeList_copy
+^3929 17580$$$@0#declaratorNodeList_add
+^3930 17582@6@5@1@0@0$@2@0@0#declaratorNodeList_unparse
+^3931 17586$$$@0#declaratorNodeList_free
+^3932 17584$$@3@0@0#declaratorNodeList_copy
 *1 (Constant)
 ^3933 5$#declaratorNodeListBASESIZE
 *7 (Struct tag)
@@ -24355,8 +24347,8 @@
 *0 (Datatype)
 ^3935 3186@-@+@0@0@0@0@3187#declaratorInvNode
 *4 (Function)
-^3936 18963$$$@0#declaratorInvNode_free
-^3937 18767@6@5@1@0@0$@2@0@0#declaratorInvNode_unparse
+^3936 18955$$$@0#declaratorInvNode_free
+^3937 18759@6@5@1@0@0$@2@0@0#declaratorInvNode_unparse
 *0 (Datatype)
 ^3938 3187@-@+@0@0@2@0@3192#o_declaratorInvNode
 *7 (Struct tag)
@@ -24369,9 +24361,9 @@
 ^3942 3198@159#declaratorInvNodeList_elements
 *4 (Function)
 ^3943 3202$$@2@0@0#declaratorInvNodeList_new
-^3944 17547$$$@0#declaratorInvNodeList_add
-^3945 17549@6@5@1@0@0$@2@0@0#declaratorInvNodeList_unparse
-^3946 17551$$$@0#declaratorInvNodeList_free
+^3944 17539$$$@0#declaratorInvNodeList_add
+^3945 17541@6@5@1@0@0$@2@0@0#declaratorInvNodeList_unparse
+^3946 17543$$$@0#declaratorInvNodeList_free
 *1 (Constant)
 ^3947 5$#declaratorInvNodeListBASESIZE
 *2 (Enum member)
@@ -24386,9 +24378,9 @@
 *8 (Union tag)
 ^3956 3216@3217#$!45
 *4 (Function)
-^3957 18731$$$@0#typeExpr_free
-^3958 18735@6@5@1@0@0$@2@0@0#typeExpr_unparse
-^3959 18737@6@5@1@0@0$@2@0@0#typeExpr_unparseNoBase
+^3957 18723$$$@0#typeExpr_free
+^3958 18727@6@5@1@0@0$@2@0@0#typeExpr_unparse
+^3959 18729@6@5@1@0@0$@2@0@0#typeExpr_unparseNoBase
 *0 (Datatype)
 ^3960 1040@-@+@0@0@0@0@3225#abstDeclaratorNode
 *7 (Struct tag)
@@ -24400,8 +24392,8 @@
 *0 (Datatype)
 ^3964 3234@-@+@0@0@0@0@3235#varNode
 *4 (Function)
-^3965 19015$$@3@0@0#varNode_copy
-^3966 19017$$$@0#varNode_free
+^3965 19007$$@3@0@0#varNode_copy
+^3966 19009$$$@0#varNode_free
 *0 (Datatype)
 ^3967 3235@-@+@0@0@2@0@3240#o_varNode
 *7 (Struct tag)
@@ -24414,10 +24406,10 @@
 ^3971 3246@161#varNodeList_elements
 *4 (Function)
 ^3972 3248$$@2@0@0#varNodeList_new
-^3973 17807$$$@0#varNodeList_add
-^3974 17813$$@3@0@0#varNodeList_copy
-^3975 17809@6@5@1@0@0$@2@0@0#varNodeList_unparse
-^3976 17811$$$@0#varNodeList_free
+^3973 17799$$$@0#varNodeList_add
+^3974 17805$$@3@0@0#varNodeList_copy
+^3975 17801@6@5@1@0@0$@2@0@0#varNodeList_unparse
+^3976 17803$$$@0#varNodeList_free
 *1 (Constant)
 ^3977 5$#varNodeListBASESIZE
 *7 (Struct tag)
@@ -24425,8 +24417,8 @@
 *0 (Datatype)
 ^3979 3259@-@+@0@0@0@0@3260#quantifierNode
 *4 (Function)
-^3980 18995$$@3@0@0#quantifierNode_copy
-^3981 18997$$$@0#quantifierNode_free
+^3980 18987$$@3@0@0#quantifierNode_copy
+^3981 18989$$$@0#quantifierNode_free
 *0 (Datatype)
 ^3982 3260@-@+@0@0@2@0@3265#o_quantifierNode
 *7 (Struct tag)
@@ -24439,10 +24431,10 @@
 ^3986 3271@162#quantifierNodeList_elements
 *4 (Function)
 ^3987 3273$$@2@0@0#quantifierNodeList_new
-^3988 17820$$$@0#quantifierNodeList_add
-^3989 17824@6@5@1@0@0$@2@0@0#quantifierNodeList_unparse
-^3990 17826$$$@0#quantifierNodeList_free
-^3991 17822$$@2@0@0#quantifierNodeList_copy
+^3988 17812$$$@0#quantifierNodeList_add
+^3989 17816@6@5@1@0@0$@2@0@0#quantifierNodeList_unparse
+^3990 17818$$$@0#quantifierNodeList_free
+^3991 17814$$@2@0@0#quantifierNodeList_copy
 *1 (Constant)
 ^3992 5$#quantifierNodeListBASESIZE
 *2 (Enum member)
@@ -24458,8 +24450,8 @@
 *0 (Datatype)
 ^4001 3289@-@+@0@0@0@0@3290#storeRefNode
 *4 (Function)
-^4002 19001$$@3@0@0#storeRefNode_copy
-^4003 19003$$$@0#storeRefNode_free
+^4002 18993$$@3@0@0#storeRefNode_copy
+^4003 18995$$$@0#storeRefNode_free
 *0 (Datatype)
 ^4004 3290@-@+@0@0@2@0@3303#o_storeRefNode
 *7 (Struct tag)
@@ -24472,10 +24464,10 @@
 ^4008 3309@163#storeRefNodeList_elements
 *4 (Function)
 ^4009 3311$$@2@0@0#storeRefNodeList_new
-^4010 17635$$$@0#storeRefNodeList_add
-^4011 17639@6@5@1@0@0$@2@0@0#storeRefNodeList_unparse
-^4012 17641$$$@0#storeRefNodeList_free
-^4013 17637$$@2@0@0#storeRefNodeList_copy
+^4010 17627$$$@0#storeRefNodeList_add
+^4011 17631@6@5@1@0@0$@2@0@0#storeRefNodeList_unparse
+^4012 17633$$$@0#storeRefNodeList_free
+^4013 17629$$@2@0@0#storeRefNodeList_copy
 *1 (Constant)
 ^4014 5$#storeRefNodeListBASESIZE
 *7 (Struct tag)
@@ -24483,13 +24475,13 @@
 *0 (Datatype)
 ^4016 3322@-@+@0@0@0@0@3323#modifyNode
 *4 (Function)
-^4017 18883@6@5@1@0@0$@2@0@0#modifyNode_unparse
+^4017 18875@6@5@1@0@0$@2@0@0#modifyNode_unparse
 *7 (Struct tag)
 ^4018 3326@3327#@!56
 *0 (Datatype)
 ^4019 3328@-@+@0@0@0@0@3329#letDeclNode
 *4 (Function)
-^4020 18985$$$@0#letDeclNode_free
+^4020 18977$$$@0#letDeclNode_free
 *0 (Datatype)
 ^4021 3329@-@+@0@0@2@0@3332#o_letDeclNode
 *7 (Struct tag)
@@ -24502,9 +24494,9 @@
 ^4025 3338@164#letDeclNodeList_elements
 *4 (Function)
 ^4026 3340$$@2@0@0#letDeclNodeList_new
-^4027 17601$$$@0#letDeclNodeList_add
-^4028 17603@6@5@1@0@0$@2@0@0#letDeclNodeList_unparse
-^4029 17605$$$@0#letDeclNodeList_free
+^4027 17593$$$@0#letDeclNodeList_add
+^4028 17595@6@5@1@0@0$@2@0@0#letDeclNodeList_unparse
+^4029 17597$$$@0#letDeclNodeList_free
 *1 (Constant)
 ^4030 5$#letDeclNodeListBASESIZE
 *2 (Enum member)
@@ -24520,8 +24512,8 @@
 *0 (Datatype)
 ^4039 3354@-@+@0@0@0@0@3355#programNode
 *4 (Function)
-^4040 18993$$$@0#programNode_free
-^4041 18885@6@5@1@0@0$@2@0@0#programNode_unparse
+^4040 18985$$$@0#programNode_free
+^4041 18877@6@5@1@0@0$@2@0@0#programNode_unparse
 *0 (Datatype)
 ^4042 3355@-@+@0@0@2@0@3360#o_programNode
 *6 (Iterator finalizer)
@@ -24530,9 +24522,9 @@
 ^4044 3363@18#programNodeList_elements
 *4 (Function)
 ^4045 3365$$@2@0@0#programNodeList_new
-^4046 17785$$$@0#programNodeList_addh
-^4047 17787@6@5@1@0@0$@2@0@0#programNodeList_unparse
-^4048 17789$$$@0#programNodeList_free
+^4046 17777$$$@0#programNodeList_addh
+^4047 17779@6@5@1@0@0$@2@0@0#programNodeList_unparse
+^4048 17781$$$@0#programNodeList_free
 *1 (Constant)
 ^4049 5$#programNodeListBASESIZE
 *2 (Enum member)
@@ -24546,7 +24538,7 @@
 *0 (Datatype)
 ^4060 3378@-@+@0@0@0@0@3379#exposedNode
 *4 (Function)
-^4061 18763@6@5@1@0@0$@2@0@0#exposedNode_unparse
+^4061 18755@6@5@1@0@0$@2@0@0#exposedNode_unparse
 *2 (Enum member)
 ^4062 3382$#TK_ABSTRACT#TK_EXPOSED#TK_UNION
 *9 (Enum tag)
@@ -24562,8 +24554,8 @@
 *0 (Datatype)
 ^4070 3391@-@+@0@0@0@0@3392#initDeclNode
 *4 (Function)
-^4071 18973$$$@0#initDeclNode_isRedeclaration
-^4072 18983$$$@0#initDeclNode_free
+^4071 18965$$$@0#initDeclNode_isRedeclaration
+^4072 18975$$$@0#initDeclNode_free
 *0 (Datatype)
 ^4073 3392@-@+@0@0@2@0@3397#o_initDeclNode
 *7 (Struct tag)
@@ -24576,9 +24568,9 @@
 ^4077 3403@166#initDeclNodeList_elements
 *4 (Function)
 ^4078 3405$$@2@0@0#initDeclNodeList_new
-^4079 17520$$$@0#initDeclNodeList_add
-^4080 17522@6@5@1@0@0$@2@0@0#initDeclNodeList_unparse
-^4081 17524$$$@0#initDeclNodeList_free
+^4079 17512$$$@0#initDeclNodeList_add
+^4080 17514@6@5@1@0@0$@2@0@0#initDeclNodeList_unparse
+^4081 17516$$$@0#initDeclNodeList_free
 *1 (Constant)
 ^4082 5$#initDeclNodeListBASESIZE
 *7 (Struct tag)
@@ -24586,7 +24578,7 @@
 *0 (Datatype)
 ^4084 3414@-@+@0@0@0@0@3415#constDeclarationNode
 *4 (Function)
-^4085 18595@6@5@1@0@0$@2@0@0#constDeclarationNode_unparse
+^4085 18587@6@5@1@0@0$@2@0@0#constDeclarationNode_unparse
 *2 (Enum member)
 ^4086 3418$#QLF_NONE#QLF_CONST#QLF_VOLATILE
 *9 (Enum tag)
@@ -24598,8 +24590,8 @@
 *0 (Datatype)
 ^4092 3423@-@+@0@0@0@0@3424#varDeclarationNode
 *4 (Function)
-^4093 19013$$$@0#varDeclarationNode_free
-^4094 18591@6@5@1@0@0^@2@0@0#varDeclarationNode_unparse
+^4093 19005$$$@0#varDeclarationNode_free
+^4094 18583@6@5@1@0@0^@2@0@0#varDeclarationNode_unparse
 *0 (Datatype)
 ^4095 3424@-@+@0@0@2@0@3429#o_varDeclarationNode
 *7 (Struct tag)
@@ -24612,9 +24604,9 @@
 ^4099 3435@167#varDeclarationNodeList_elements
 *4 (Function)
 ^4100 3437$^@2@0@0#varDeclarationNodeList_new
-^4101 17796$@0@@1@p0$@0#varDeclarationNodeList_addh
-^4102 17798@6@5@1@0@0^@2@0@0#varDeclarationNodeList_unparse
-^4103 17800$$$@0#varDeclarationNodeList_free
+^4101 17788$@0@@1@p0$@0#varDeclarationNodeList_addh
+^4102 17790@6@5@1@0@0^@2@0@0#varDeclarationNodeList_unparse
+^4103 17792$$$@0#varDeclarationNodeList_free
 *1 (Constant)
 ^4104 5$#varDeclarationNodeListBASESIZE
 *0 (Datatype)
@@ -24624,14 +24616,14 @@
 *0 (Datatype)
 ^4107 3451@-@+@0@0@0@0@3452#claimNode
 *4 (Function)
-^4108 18873@6@5@1@0@0$@2@0@0#claimNode_unparse
+^4108 18865@6@5@1@0@0$@2@0@0#claimNode_unparse
 *7 (Struct tag)
 ^4109 3455@3456#@!72
 *0 (Datatype)
 ^4110 3457@-@+@0@0@0@0@3458#fcnNode
 *4 (Function)
-^4111 18961$$$@0#fcnNode_free
-^4112 18589@6@5@1@0@0$@2@0@0#fcnNode_unparse
+^4111 18953$$$@0#fcnNode_free
+^4112 18581@6@5@1@0@0$@2@0@0#fcnNode_unparse
 *0 (Datatype)
 ^4113 3458@-@+@0@0@2@0@3463#o_fcnNode
 *7 (Struct tag)
@@ -24646,9 +24638,9 @@
 ^4118 3468@i0@0@4#fcnNodeList_undefined
 *4 (Function)
 ^4119 3479@6@5@1@0@0$@2@0@0#fcnNodeList_new
-^4120 17757@6@5@1@0@0$$@0#fcnNodeList_add
-^4121 17759@6@5@1@0@0$@2@0@0#fcnNodeList_unparse
-^4122 17761$$$@0#fcnNodeList_free
+^4120 17749@6@5@1@0@0$$@0#fcnNodeList_add
+^4121 17751@6@5@1@0@0$@2@0@0#fcnNodeList_unparse
+^4122 17753$$$@0#fcnNodeList_free
 *1 (Constant)
 ^4123 5$#fcnNodeListBASESIZE
 *7 (Struct tag)
@@ -24656,21 +24648,21 @@
 *0 (Datatype)
 ^4125 3488@-@+@0@0@0@0@3489#iterNode
 *4 (Function)
-^4126 18587@6@5@1@0@0^@2@0@0#iterNode_unparse
-^4127 18769@6@5@1@0@0$@2@0@0#abstBodyNode_unparse
+^4126 18579@6@5@1@0@0^@2@0@0#iterNode_unparse
+^4127 18761@6@5@1@0@0$@2@0@0#abstBodyNode_unparse
 *7 (Struct tag)
 ^4128 3495@3496#@!75
 *0 (Datatype)
 ^4129 3497@-@+@0@0@0@0@3498#abstractNode
 *4 (Function)
-^4130 18757@6@5@1@0@0$@2@0@0#abstractNode_unparse
+^4130 18749@6@5@1@0@0$@2@0@0#abstractNode_unparse
 *7 (Struct tag)
 ^4131 3501@3502#@!76
 *0 (Datatype)
 ^4132 3503@-@+@0@0@0@0@3504#stDeclNode
 *4 (Function)
-^4133 19007$$$@0#stDeclNode_free
-^4134 19005$$@3@0@0#stDeclNode_copy
+^4133 18999$$$@0#stDeclNode_free
+^4134 18997$$@3@0@0#stDeclNode_copy
 *0 (Datatype)
 ^4135 3504@-@+@0@0@2@0@3509#o_stDeclNode
 *7 (Struct tag)
@@ -24683,10 +24675,10 @@
 ^4139 3515@170#stDeclNodeList_elements
 *4 (Function)
 ^4140 3519$$@2@0@0#stDeclNodeList_new
-^4141 17612$$$@0#stDeclNodeList_add
-^4142 17616@6@5@1@0@0$@2@0@0#stDeclNodeList_unparse
-^4143 17618$$$@0#stDeclNodeList_free
-^4144 17614$$@2@0@0#stDeclNodeList_copy
+^4141 17604$$$@0#stDeclNodeList_add
+^4142 17608@6@5@1@0@0$@2@0@0#stDeclNodeList_unparse
+^4143 17610$$$@0#stDeclNodeList_free
+^4144 17606$$@2@0@0#stDeclNodeList_copy
 *1 (Constant)
 ^4145 5$#stDeclNodeListBASESIZE
 *7 (Struct tag)
@@ -24694,7 +24686,7 @@
 *0 (Datatype)
 ^4147 3530@-@+@0@0@0@0@3531#taggedUnionNode
 *4 (Function)
-^4148 18773@6@5@1@0@0^@2@0@0#taggedUnionNode_unparse
+^4148 18765@6@5@1@0@0^@2@0@0#taggedUnionNode_unparse
 *8 (Union tag)
 ^4149 3534@3535#$!79
 *7 (Struct tag)
@@ -24702,7 +24694,7 @@
 *0 (Datatype)
 ^4151 3538@-@+@0@0@0@0@3539#typeNode
 *4 (Function)
-^4152 18593@6@5@1@0@0^@2@0@0#typeNode_unparse
+^4152 18585@6@5@1@0@0^@2@0@0#typeNode_unparse
 *2 (Enum member)
 ^4153 3542$#SU_STRUCT#SU_UNION
 *9 (Enum tag)
@@ -24714,13 +24706,13 @@
 *0 (Datatype)
 ^4158 3547@-@+@0@0@0@0@3548#strOrUnionNode
 *4 (Function)
-^4159 18707@6@5@1@0@0$@3@0@0#strOrUnionNode_unparse
+^4159 18699@6@5@1@0@0$@3@0@0#strOrUnionNode_unparse
 *7 (Struct tag)
 ^4160 3551@3552#@!83
 *0 (Datatype)
 ^4161 3553@-@+@0@0@0@0@3554#enumSpecNode
 *4 (Function)
-^4162 18701@6@5@1@0@0^@2@0@0#enumSpecNode_unparse
+^4162 18693@6@5@1@0@0^@2@0@0#enumSpecNode_unparse
 *2 (Enum member)
 ^4163 3557$#LTS_TYPE#LTS_STRUCTUNION#LTS_ENUM#LTS_CONJ
 *9 (Enum tag)
@@ -24737,9 +24729,9 @@
 *1 (Constant)
 ^4173 1032@i0@0@6#lclTypeSpecNode_undefined
 *4 (Function)
-^4174 18941@6@5@1@0@0^@2@0@0#lclTypeSpecNode_copy
-^4175 18695@6@5@1@0@0^@2@0@0#lclTypeSpecNode_unparse
-^4176 18823@6@5@1@0@0^@2@0@0#lclTypeSpecNode_unparseComments
+^4174 18933@6@5@1@0@0^@2@0@0#lclTypeSpecNode_copy
+^4175 18687@6@5@1@0@0^@2@0@0#lclTypeSpecNode_unparse
+^4176 18815@6@5@1@0@0^@2@0@0#lclTypeSpecNode_unparseComments
 *7 (Struct tag)
 ^4177 3576@3577#@!87
 *0 (Datatype)
@@ -24749,8 +24741,8 @@
 *0 (Datatype)
 ^4180 3582@-@+@0@0@0@0@3583#typeNameNode
 *4 (Function)
-^4181 19011$$$@0#typeNameNode_free
-^4182 18683@6@5@1@0@0$@2@0@0#typeNameNode_unparse
+^4181 19003$$$@0#typeNameNode_free
+^4182 18675@6@5@1@0@0$@2@0@0#typeNameNode_unparse
 *0 (Datatype)
 ^4183 3583@-@+@0@0@2@0@3588#o_typeNameNode
 *7 (Struct tag)
@@ -24763,9 +24755,9 @@
 ^4187 3594@172#typeNameNodeList_elements
 *4 (Function)
 ^4188 3600$$@2@0@0#typeNameNodeList_new
-^4189 17744$$$@0#typeNameNodeList_add
-^4190 17746@6@5@1@0@0$@2@0@0#typeNameNodeList_unparse
-^4191 17748$$$@0#typeNameNodeList_free
+^4189 17736$$$@0#typeNameNodeList_add
+^4190 17738@6@5@1@0@0$@2@0@0#typeNameNodeList_unparse
+^4191 17740$$$@0#typeNameNodeList_free
 *1 (Constant)
 ^4192 5$#typeNameNodeListBASESIZE
 *2 (Enum member)
@@ -24779,7 +24771,7 @@
 *0 (Datatype)
 ^4213 3610@-@-@0@0@0@0@3612#opFormUnion
 *4 (Function)
-^4214 18677@6@5@1@0@0^@2@0@0#opFormNode_unparse
+^4214 18669@6@5@1@0@0^@2@0@0#opFormNode_unparse
 *7 (Struct tag)
 ^4215 3616@3617#@!92
 *0 (Datatype)
@@ -24795,10 +24787,10 @@
 *0 (Datatype)
 ^4229 3625@-@+@0@0@0@0@3626#sigNode
 *4 (Function)
-^4230 18665@6@5@1@0@0^@2@0@0#sigNode_unparse
-^4231 18955$$$@0#sigNode_free
-^4232 18967$^@2@0@0#sigNode_copy
-^4233 18667$$$@0#sigNode_markOwned
+^4230 18657@6@5@1@0@0^@2@0@0#sigNode_unparse
+^4231 18947$$$@0#sigNode_free
+^4232 18959$^@2@0@0#sigNode_copy
+^4233 18659$$$@0#sigNode_markOwned
 *0 (Datatype)
 ^4234 3626@-@+@0@0@17@0@3635#o_sigNode
 *7 (Struct tag)
@@ -24813,12 +24805,12 @@
 ^4239 3640@i0@0@4#sigNodeSet_undefined
 *4 (Function)
 ^4240 3651@6@5@1@0@0^@2@0@0#sigNodeSet_new
-^4241 17452@6@5@1@0@0^@2@0@0#sigNodeSet_singleton
-^4242 17456$@0@@1@p0$@0#sigNodeSet_insert
-^4243 17460@6@5@1@0@0^@2@0@0#sigNodeSet_unparse
-^4244 17464@6@5@1@0@0^@2@0@0#sigNodeSet_unparsePossibleAritys
-^4245 17466$$$@0#sigNodeSet_free
-^4246 17462@6@5@1@0@0^@2@0@0#sigNodeSet_unparseSomeSigs
+^4241 17444@6@5@1@0@0^@2@0@0#sigNodeSet_singleton
+^4242 17448$@0@@1@p0$@0#sigNodeSet_insert
+^4243 17452@6@5@1@0@0^@2@0@0#sigNodeSet_unparse
+^4244 17456@6@5@1@0@0^@2@0@0#sigNodeSet_unparsePossibleAritys
+^4245 17458$$$@0#sigNodeSet_free
+^4246 17454@6@5@1@0@0^@2@0@0#sigNodeSet_unparseSomeSigs
 *1 (Constant)
 ^4247 5$#sigNodeSetBASESIZE
 *7 (Struct tag)
@@ -24826,8 +24818,8 @@
 *0 (Datatype)
 ^4249 3666@-@+@0@0@0@0@3667#signNode
 *4 (Function)
-^4250 18919@6@5@1@0@0^@2@0@0#signNode_unparse
-^4251 18917$$$@0#signNode_free
+^4250 18911@6@5@1@0@0^@2@0@0#signNode_unparse
+^4251 18909$$$@0#signNode_free
 *8 (Union tag)
 ^4252 3672@3673#$!97
 *7 (Struct tag)
@@ -24835,18 +24827,18 @@
 *0 (Datatype)
 ^4254 3676@-@+@0@0@0@0@3677#nameNode
 *4 (Function)
-^4255 18949$$$@0#nameNode_free
-^4256 18969@6@5@1@0@0^@2@0@0#nameNode_copy
-^4257 18661@6@5@1@0@0^@2@0@0#nameNode_unparse
-^4258 18971$^@2@0@0#nameNode_copySafe
+^4255 18941$$$@0#nameNode_free
+^4256 18961@6@5@1@0@0^@2@0@0#nameNode_copy
+^4257 18653@6@5@1@0@0^@2@0@0#nameNode_unparse
+^4258 18963$^@2@0@0#nameNode_copySafe
 *7 (Struct tag)
 ^4259 3686@3687#@!99
 *0 (Datatype)
 ^4260 3688@-@+@0@0@0@0@3689#lslOp
 ^4261 3689@-@+@0@0@2@0@3690#o_lslOp
 *4 (Function)
-^4262 18953$$$@0#lslOp_free
-^4263 18965$$@2@0@0#lslOp_copy
+^4262 18945$$$@0#lslOp_free
+^4263 18957$$@2@0@0#lslOp_copy
 *7 (Struct tag)
 ^4264 3696@3697#@!100
 *0 (Datatype)
@@ -24859,10 +24851,10 @@
 ^4268 3699@i0@0@4#lslOpSet_undefined
 *4 (Function)
 ^4269 3706@6@5@1@0@0^@2@0@0#lslOpSet_new
-^4270 17483$@0@@1@p0$@0#lslOpSet_insert
-^4271 17487@6@5@1@0@0^@2@0@0#lslOpSet_unparse
-^4272 17491$$$@0#lslOpSet_free
-^4273 17489@6@5@1@0@0^@2@0@0#lslOpSet_copy
+^4270 17475$@0@@1@p0$@0#lslOpSet_insert
+^4271 17479@6@5@1@0@0^@2@0@0#lslOpSet_unparse
+^4272 17483$$$@0#lslOpSet_free
+^4273 17481@6@5@1@0@0^@2@0@0#lslOpSet_copy
 *1 (Constant)
 ^4274 5$#lslOpSetBASESIZE
 *7 (Struct tag)
@@ -24874,8 +24866,8 @@
 *0 (Datatype)
 ^4278 3721@-@+@0@0@0@0@3722#replaceNode
 *4 (Function)
-^4279 18999$$$@0#replaceNode_free
-^4280 18655@6@5@1@0@0$@2@0@0#replaceNode_unparse
+^4279 18991$$$@0#replaceNode_free
+^4280 18647@6@5@1@0@0$@2@0@0#replaceNode_unparse
 *0 (Datatype)
 ^4281 3722@-@+@0@0@2@0@3727#o_replaceNode
 *7 (Struct tag)
@@ -24888,9 +24880,9 @@
 ^4285 3733@176#replaceNodeList_elements
 *4 (Function)
 ^4286 3739$$@2@0@0#replaceNodeList_new
-^4287 17833$$$@0#replaceNodeList_add
-^4288 17835@6@5@1@0@0$@2@0@0#replaceNodeList_unparse
-^4289 17837$$$@0#replaceNodeList_free
+^4287 17825$$$@0#replaceNodeList_add
+^4288 17827@6@5@1@0@0$@2@0@0#replaceNodeList_unparse
+^4289 17829$$$@0#replaceNodeList_free
 *1 (Constant)
 ^4290 5$#replaceNodeListBASESIZE
 *7 (Struct tag)
@@ -24904,13 +24896,13 @@
 *0 (Datatype)
 ^4295 3754@-@+@0@0@0@0@3755#renamingNode
 *4 (Function)
-^4296 18649@6@5@1@0@0$@2@0@0#renamingNode_unparse
+^4296 18641@6@5@1@0@0$@2@0@0#renamingNode_unparse
 *7 (Struct tag)
 ^4297 3758@3759#@!108
 *0 (Datatype)
 ^4298 3760@-@+@0@0@0@0@3761#traitRefNode
 *4 (Function)
-^4299 19009$$$@0#traitRefNode_free
+^4299 19001$$$@0#traitRefNode_free
 *0 (Datatype)
 ^4300 3761@-@+@0@0@2@0@3764#o_traitRefNode
 *7 (Struct tag)
@@ -24923,9 +24915,9 @@
 ^4304 3770@177#traitRefNodeList_elements
 *4 (Function)
 ^4305 3772$$@2@0@0#traitRefNodeList_new
-^4306 17722$$$@0#traitRefNodeList_add
-^4307 17724@6@5@1@0@0$@2@0@0#traitRefNodeList_unparse
-^4308 17726$$$@0#traitRefNodeList_free
+^4306 17714$$$@0#traitRefNodeList_add
+^4307 17716@6@5@1@0@0$@2@0@0#traitRefNodeList_unparse
+^4308 17718$$$@0#traitRefNodeList_free
 *1 (Constant)
 ^4309 5$#traitRefNodeListBASESIZE
 *2 (Enum member)
@@ -24941,7 +24933,7 @@
 *0 (Datatype)
 ^4320 3786@-@+@0@0@0@0@3787#exportNode
 *4 (Function)
-^4321 18577@6@5@1@0@0$@2@0@0#exportNode_unparse
+^4321 18569@6@5@1@0@0$@2@0@0#exportNode_unparse
 *2 (Enum member)
 ^4322 3790$#PRIV_CONST#PRIV_VAR#PRIV_TYPE#PRIV_FUNCTION
 *9 (Enum tag)
@@ -24955,7 +24947,7 @@
 *0 (Datatype)
 ^4330 3797@-@+@0@0@0@0@3798#privateNode
 *4 (Function)
-^4331 18579@6@5@1@0@0$@2@0@0#privateNode_unparse
+^4331 18571@6@5@1@0@0$@2@0@0#privateNode_unparse
 *2 (Enum member)
 ^4332 3801$#INF_IMPORTS#INF_USES#INF_EXPORT#INF_PRIVATE
 *9 (Enum tag)
@@ -24969,8 +24961,8 @@
 *0 (Datatype)
 ^4340 3808@-@+@0@0@0@0@3809#interfaceNode
 *4 (Function)
-^4341 19027@6@5@1@0@0$@3@0@0#interfaceNode_unparse
-^4342 19029$$$@0#interfaceNode_free
+^4341 19019@6@5@1@0@0$@3@0@0#interfaceNode_unparse
+^4342 19021$$$@0#interfaceNode_free
 *0 (Datatype)
 ^4343 3809@-@+@0@0@2@0@3814#o_interfaceNode
 *7 (Struct tag)
@@ -24983,15 +24975,15 @@
 ^4347 3820@178#interfaceNodeList_elements
 *4 (Function)
 ^4348 3822$$@2@0@0#interfaceNodeList_new
-^4349 17558$$$@0#interfaceNodeList_addh
-^4350 17560$$$@0#interfaceNodeList_addl
-^4351 17562$$$@0#interfaceNodeList_free
+^4349 17550$$$@0#interfaceNodeList_addh
+^4350 17552$$$@0#interfaceNodeList_addl
+^4351 17554$$$@0#interfaceNodeList_free
 *1 (Constant)
 ^4352 5$#interfaceNodeListGROWLOW#interfaceNodeListGROWHI#interfaceNodeListBASESIZE
 *4 (Function)
-^4355 18977$^@3@0@0#termNode_copySafe
-^4356 18879@6@5@1@0@0^@3@0@0#termNode_unparse
-^4357 18975$$$@0#termNode_free
+^4355 18969$^@3@0@0#termNode_copySafe
+^4356 18871@6@5@1@0@0^@3@0@0#termNode_unparse
+^4357 18967$$$@0#termNode_free
 *0 (Datatype)
 ^4358 1017@-@+@0@0@2@0@3838#o_termNode
 *6 (Iterator finalizer)
@@ -25000,25 +24992,25 @@
 ^4360 3841@20#termNodeList_elements
 *4 (Function)
 ^4361 3849$$@2@0@0#termNodeList_new
-^4362 17658$$$@0#termNodeList_push
-^4363 17656$$$@0#termNodeList_addh
-^4364 17660$$$@0#termNodeList_addl
-^4365 17662$@0@@1@p0$@0#termNodeList_reset
-^4366 17664$@0@@1@p0$@0#termNodeList_finish
-^4367 17666$@0@@1@p0$@0#termNodeList_advance
-^4368 17674$^@19@2@0#termNodeList_getN
-^4369 17676@6@5@1@0@0$@2@0@0#termNodeList_unparse
-^4370 17678@6@5@1@0@0$@2@0@0#termNodeList_unparseTail
-^4371 17680@6@5@1@0@0$@2@0@0#termNodeList_unparseToCurrent
-^4372 17682@6@5@1@0@0$@2@0@0#termNodeList_unparseSecondToCurrent
-^4373 17684$$$@0#termNodeList_free
-^4374 17668$$@19@2@0#termNodeList_head
-^4375 17672$$@19@2@0#termNodeList_current
-^4376 17670$$@2@0@0#termNodeList_copy
+^4362 17650$$$@0#termNodeList_push
+^4363 17648$$$@0#termNodeList_addh
+^4364 17652$$$@0#termNodeList_addl
+^4365 17654$@0@@1@p0$@0#termNodeList_reset
+^4366 17656$@0@@1@p0$@0#termNodeList_finish
+^4367 17658$@0@@1@p0$@0#termNodeList_advance
+^4368 17666$^@19@2@0#termNodeList_getN
+^4369 17668@6@5@1@0@0$@2@0@0#termNodeList_unparse
+^4370 17670@6@5@1@0@0$@2@0@0#termNodeList_unparseTail
+^4371 17672@6@5@1@0@0$@2@0@0#termNodeList_unparseToCurrent
+^4372 17674@6@5@1@0@0$@2@0@0#termNodeList_unparseSecondToCurrent
+^4373 17676$$$@0#termNodeList_free
+^4374 17660$$@19@2@0#termNodeList_head
+^4375 17664$$@19@2@0#termNodeList_current
+^4376 17662$$@2@0@0#termNodeList_copy
 *1 (Constant)
 ^4377 5$#termNodeListGROWLOW#termNodeListGROWHI#termNodeListBASESIZE
 *4 (Function)
-^4380 18887@6@2@1@0@0$@2@0@0#stmtNode_unparse
+^4380 18879@6@2@1@0@0$@2@0@0#stmtNode_unparse
 *0 (Datatype)
 ^4381 3112@-@+@0@5@18@0@3883#o_sortSet
 *7 (Struct tag)
@@ -25031,13 +25023,13 @@
 ^4385 3889@181#sortSetList_elements
 *4 (Function)
 ^4386 3893$$@2@0@0#sortSetList_new
-^4387 17569$$$@0#sortSetList_addh
-^4388 17571$$$@0#sortSetList_reset
-^4389 17573$$$@0#sortSetList_advance
-^4390 17579@6@5@1@0@0$@2@0@0#sortSetList_unparse
-^4391 17581$$$@0#sortSetList_free
-^4392 17575@6@5@1@0@0$@19@3@0#sortSetList_head
-^4393 17577@6@5@1@0@0$@19@3@0#sortSetList_current
+^4387 17561$$$@0#sortSetList_addh
+^4388 17563$$$@0#sortSetList_reset
+^4389 17565$$$@0#sortSetList_advance
+^4390 17571@6@5@1@0@0$@2@0@0#sortSetList_unparse
+^4391 17573$$$@0#sortSetList_free
+^4392 17567@6@5@1@0@0$@19@3@0#sortSetList_head
+^4393 17569@6@5@1@0@0$@19@3@0#sortSetList_current
 *1 (Constant)
 ^4394 5$#sortSetListBASESIZE
 *0 (Datatype)
@@ -25048,140 +25040,140 @@
 ^4397 3912@+@=@0@0@0@0@3913#lslOpList
 *4 (Function)
 ^4398 3915$$@2@0@0#lslOpList_new
-^4399 17624$$$@0#lslOpList_add
-^4400 17626@6@5@1@0@0$@2@0@0#lslOpList_unparse
-^4401 17628$$$@0#lslOpList_free
+^4399 17616$$$@0#lslOpList_add
+^4400 17618@6@5@1@0@0$@2@0@0#lslOpList_unparse
+^4401 17620$$$@0#lslOpList_free
 *1 (Constant)
 ^4402 5$#lslOpListBASESIZE
 *4 (Function)
-^4403 18889$$@2@0@0#makelslOpNode
-^4404 18891@6@5@1@0@0$@2@0@0#lslOp_unparse
+^4403 18881$$@2@0@0#makelslOpNode
+^4404 18883@6@5@1@0@0$@2@0@0#lslOp_unparse
 ^4405 3927$$$@0#abstract_init
-^4406 18541$$$@0#resetImports
-^4407 18551$$$@0#consInterfaceNode
-^4408 18553$$@2@0@0#makeInterfaceNodeImports
-^4409 18657$^@2@0@0#makeNameNodeForm
-^4410 18659$^@2@0@0#makeNameNodeId
-^4411 18555$^@2@0@0#makeInterfaceNodeUses
-^4412 18557$^@2@0@0#interfaceNode_makeConst
-^4413 18559$^@2@0@0#interfaceNode_makeVar
-^4414 18561$^@2@0@0#interfaceNode_makeType
-^4415 18563$^@2@0@0#interfaceNode_makeFcn
-^4416 18565$^@2@0@0#interfaceNode_makeClaim
-^4417 18567$^@2@0@0#interfaceNode_makeIter
-^4418 18569$^@2@0@0#interfaceNode_makePrivConst
-^4419 18571$^@2@0@0#interfaceNode_makePrivVar
-^4420 18573$^@2@0@0#interfaceNode_makePrivType
-^4421 18575$^@2@0@0#interfaceNode_makePrivFcn
-^4422 18623$^@2@0@0#makeAbstractTypeNode
-^4423 18625$^@2@0@0#makeExposedTypeNode
-^4424 18639$^@2@0@0#makeTraitRefNode
-^4425 18643@6@5@1@0@0^@2@0@0#printLeaves2
-^4426 18645@6@5@1@0@0^@2@0@0#printRawLeaves2
-^4427 18669@6@5@1@0@0^@2@0@0#sigNode_unparseText
-^4428 18647$^@2@0@0#makeRenamingNode
-^4429 18653$^@2@0@0#makeReplaceNode
-^4430 18663$^@2@0@0#makesigNode
-^4431 18651$^@2@0@0#makeReplaceNameNode
-^4432 18673$^@2@0@0#makeOpFormNode
-^4433 18679$^@2@0@0#makeTypeNameNode
-^4434 18681$^@2@0@0#makeTypeNameNodeOp
-^4435 18685@6@5@1@0@0^@2@0@0#makeLclTypeSpecNodeConj
-^4436 18687@6@5@1@0@0^@2@0@0#makeLclTypeSpecNodeType
-^4437 18689@6@5@1@0@0^@2@0@0#makeLclTypeSpecNodeSU
-^4438 18691@6@5@1@0@0^@2@0@0#makeLclTypeSpecNodeEnum
-^4439 18693@6@5@1@0@0@0@@1@p0@2@0@0#lclTypeSpecNode_addQual
-^4440 18697$$@2@0@0#makeEnumSpecNode
-^4441 18699$$@2@0@0#makeEnumSpecNode2
-^4442 18703$$@2@0@0#makestrOrUnionNode
-^4443 18705$$@2@0@0#makeForwardstrOrUnionNode
-^4444 18709$$@2@0@0#makestDeclNode
-^4445 18745$$@2@0@0#makeConstDeclarationNode
-^4446 18751$$@2@0@0#makeVarDeclarationNode
-^4447 18749$$@3@0@0#makeFileSystemNode
-^4448 18747$$@3@0@0#makeInternalStateNode
-^4449 18753$$@2@0@0#makeInitDeclNode
-^4450 18755$$@2@0@0#makeAbstractNode
-^4451 18771@6@5@1@0@0$@2@0@0#abstBodyNode_unparseExposed
-^4452 18761$$@2@0@0#makeExposedNode
-^4453 18765$$@2@0@0#makeDeclaratorInvNode
-^4454 18777$$@2@0@0#fcnNode_fromDeclarator
-^4455 18781$$@2@0@0#makeFcnNode
-^4456 18779$$@2@0@0#makeIterNode
-^4457 18783$$@2@0@0#makeClaimNode
-^4458 18785$$@2@0@0#makeIntraClaimNode
-^4459 18787$$@2@0@0#makeRequiresNode
-^4460 18789$$@2@0@0#makeChecksNode
-^4461 18791$$@2@0@0#makeEnsuresNode
-^4462 18793$$@2@0@0#makeLclPredicateNode
-^4463 18807$$@2@0@0#makeStmtNode
-^4464 18619$$@2@0@0#makeProgramNodeAction
-^4465 18621$$@2@0@0#makeProgramNode
-^4466 18597$$@2@0@0#makeStoreRefNodeTerm
-^4467 18599$$@2@0@0#makeStoreRefNodeType
-^4468 18605$$@2@0@0#makeModifyNodeSpecial
-^4469 18601$$@3@0@0#makeStoreRefNodeInternal
-^4470 18603$$@3@0@0#makeStoreRefNodeSystem
-^4471 18607$$@2@0@0#makeModifyNodeRef
-^4472 18617$$@2@0@0#makeLetDeclNode
-^4473 18801$$@2@0@0#makeAbstBodyNode
-^4474 18803$$@2@0@0#makeExposedBodyNode
-^4475 18805$$@2@0@0#makeAbstBodyNode2
-^4476 18937$$$@0#markYieldParamNode
-^4477 18797$$@2@0@0#makeArrayQualNode
-^4478 18795$$@2@0@0#makeQuantifierNode
-^4479 18799$$@2@0@0#makeVarNode
-^4480 18715$$@2@0@0#makeTypeExpr
-^4481 18717$$@2@0@0#makeDeclaratorNode
-^4482 18711$$@2@0@0#makeFunctionNode
-^4483 18741$$@2@0@0#makePointerNode
-^4484 18743$$@2@0@0#makeArrayNode
-^4485 18811$$@2@0@0#makeParamNode
-^4486 18827$$@2@0@0#makeIfTermNode
-^4487 18835$$@2@0@0#makeQuantifiedTermNode
-^4488 18831$$@2@0@0#makeInfixTermNode
-^4489 18837$$@2@0@0#makePostfixTermNode
-^4490 18839$$@2@0@0#makePostfixTermNode2
-^4491 18841$$@2@0@0#makePrefixTermNode
-^4492 18845$$@19@2@0#CollapseInfixTermNode
-^4493 18857$$@2@0@0#makeMatchedNode
-^4494 18855$$@2@0@0#makeSqBracketedNode
-^4495 18853$$@2@0@0#updateSqBracketedNode
-^4496 18851$$$@0#updateMatchedNode
-^4497 18859$$@2@0@0#makeSimpleTermNode
-^4498 18861$$@2@0@0#makeSelectTermNode
-^4499 18863$$@2@0@0#makeMapTermNode
-^4500 18865$$@2@0@0#makeLiteralTermNode
-^4501 18867$$@2@0@0#makeUnchangedTermNode1
-^4502 18869$$@2@0@0#makeUnchangedTermNode2
-^4503 18871$$@2@0@0#makeSizeofTermNode
-^4504 18843$$@2@0@0#makeOpCallTermNode
-^4505 18929$$$@0#sigNode_rangeSort
-^4506 18931$$@2@0@0#sigNode_domain
-^4507 18895$$$@0#sameNameNode
-^4508 18901$$@2@0@0#makeCTypesNode
-^4509 18903$$@2@0@0#makeTypeSpecifier
-^4510 18905$$$@0#sigNode_equal
-^4511 18911$$$@0#lclTypeSpecNode2sort
-^4512 18907$$$@0#typeExpr2ptrSort
-^4513 18913$$$@0#checkAndEnterTag
-^4514 18923$$$@0#enteringFcnScope
-^4515 18925$$$@0#enteringClaimScope
-^4516 18611@6@5@1@0@0$@19@3@0#nameNode_errorToken
-^4517 18609@6@5@1@0@0$@19@3@0#termNode_errorToken
-^4518 18613@6@5@1@0@0$@19@3@0#lclTypeSpecNode_errorToken
-^4519 18933$$$@0#opFormUnion_createAnyOp
-^4520 18935$$$@0#opFormUnion_createMiddle
-^4521 18547$$$@0#LCLBuiltins
-^4522 18813$$@2@0@0#paramNode_elipsis
-^4523 18849$$$@0#pushInfixOpPartNode
-^4524 18733@6@5@1@0@0$@2@0@0#declaratorNode_unparseCode
-^4525 18739@6@5@1@0@0$@2@0@0#typeExpr_name
-^4526 18759$$$@0#setExposedType
-^4527 18545$$$@0#declareForwardType
-^4528 18725$$@2@0@0#declaratorNode_copy
-^4529 18951$$$@0#lslOp_equal
-^4530 19057$@0@s1@1@s1$@0#lsymbol_setbool
+^4406 18533$$$@0#resetImports
+^4407 18543$$$@0#consInterfaceNode
+^4408 18545$$@2@0@0#makeInterfaceNodeImports
+^4409 18649$^@2@0@0#makeNameNodeForm
+^4410 18651$^@2@0@0#makeNameNodeId
+^4411 18547$^@2@0@0#makeInterfaceNodeUses
+^4412 18549$^@2@0@0#interfaceNode_makeConst
+^4413 18551$^@2@0@0#interfaceNode_makeVar
+^4414 18553$^@2@0@0#interfaceNode_makeType
+^4415 18555$^@2@0@0#interfaceNode_makeFcn
+^4416 18557$^@2@0@0#interfaceNode_makeClaim
+^4417 18559$^@2@0@0#interfaceNode_makeIter
+^4418 18561$^@2@0@0#interfaceNode_makePrivConst
+^4419 18563$^@2@0@0#interfaceNode_makePrivVar
+^4420 18565$^@2@0@0#interfaceNode_makePrivType
+^4421 18567$^@2@0@0#interfaceNode_makePrivFcn
+^4422 18615$^@2@0@0#makeAbstractTypeNode
+^4423 18617$^@2@0@0#makeExposedTypeNode
+^4424 18631$^@2@0@0#makeTraitRefNode
+^4425 18635@6@5@1@0@0^@2@0@0#printLeaves2
+^4426 18637@6@5@1@0@0^@2@0@0#printRawLeaves2
+^4427 18661@6@5@1@0@0^@2@0@0#sigNode_unparseText
+^4428 18639$^@2@0@0#makeRenamingNode
+^4429 18645$^@2@0@0#makeReplaceNode
+^4430 18655$^@2@0@0#makesigNode
+^4431 18643$^@2@0@0#makeReplaceNameNode
+^4432 18665$^@2@0@0#makeOpFormNode
+^4433 18671$^@2@0@0#makeTypeNameNode
+^4434 18673$^@2@0@0#makeTypeNameNodeOp
+^4435 18677@6@5@1@0@0^@2@0@0#makeLclTypeSpecNodeConj
+^4436 18679@6@5@1@0@0^@2@0@0#makeLclTypeSpecNodeType
+^4437 18681@6@5@1@0@0^@2@0@0#makeLclTypeSpecNodeSU
+^4438 18683@6@5@1@0@0^@2@0@0#makeLclTypeSpecNodeEnum
+^4439 18685@6@5@1@0@0@0@@1@p0@2@0@0#lclTypeSpecNode_addQual
+^4440 18689$$@2@0@0#makeEnumSpecNode
+^4441 18691$$@2@0@0#makeEnumSpecNode2
+^4442 18695$$@2@0@0#makestrOrUnionNode
+^4443 18697$$@2@0@0#makeForwardstrOrUnionNode
+^4444 18701$$@2@0@0#makestDeclNode
+^4445 18737$$@2@0@0#makeConstDeclarationNode
+^4446 18743$$@2@0@0#makeVarDeclarationNode
+^4447 18741$$@3@0@0#makeFileSystemNode
+^4448 18739$$@3@0@0#makeInternalStateNode
+^4449 18745$$@2@0@0#makeInitDeclNode
+^4450 18747$$@2@0@0#makeAbstractNode
+^4451 18763@6@5@1@0@0$@2@0@0#abstBodyNode_unparseExposed
+^4452 18753$$@2@0@0#makeExposedNode
+^4453 18757$$@2@0@0#makeDeclaratorInvNode
+^4454 18769$$@2@0@0#fcnNode_fromDeclarator
+^4455 18773$$@2@0@0#makeFcnNode
+^4456 18771$$@2@0@0#makeIterNode
+^4457 18775$$@2@0@0#makeClaimNode
+^4458 18777$$@2@0@0#makeIntraClaimNode
+^4459 18779$$@2@0@0#makeRequiresNode
+^4460 18781$$@2@0@0#makeChecksNode
+^4461 18783$$@2@0@0#makeEnsuresNode
+^4462 18785$$@2@0@0#makeLclPredicateNode
+^4463 18799$$@2@0@0#makeStmtNode
+^4464 18611$$@2@0@0#makeProgramNodeAction
+^4465 18613$$@2@0@0#makeProgramNode
+^4466 18589$$@2@0@0#makeStoreRefNodeTerm
+^4467 18591$$@2@0@0#makeStoreRefNodeType
+^4468 18597$$@2@0@0#makeModifyNodeSpecial
+^4469 18593$$@3@0@0#makeStoreRefNodeInternal
+^4470 18595$$@3@0@0#makeStoreRefNodeSystem
+^4471 18599$$@2@0@0#makeModifyNodeRef
+^4472 18609$$@2@0@0#makeLetDeclNode
+^4473 18793$$@2@0@0#makeAbstBodyNode
+^4474 18795$$@2@0@0#makeExposedBodyNode
+^4475 18797$$@2@0@0#makeAbstBodyNode2
+^4476 18929$$$@0#markYieldParamNode
+^4477 18789$$@2@0@0#makeArrayQualNode
+^4478 18787$$@2@0@0#makeQuantifierNode
+^4479 18791$$@2@0@0#makeVarNode
+^4480 18707$$@2@0@0#makeTypeExpr
+^4481 18709$$@2@0@0#makeDeclaratorNode
+^4482 18703$$@2@0@0#makeFunctionNode
+^4483 18733$$@2@0@0#makePointerNode
+^4484 18735$$@2@0@0#makeArrayNode
+^4485 18803$$@2@0@0#makeParamNode
+^4486 18819$$@2@0@0#makeIfTermNode
+^4487 18827$$@2@0@0#makeQuantifiedTermNode
+^4488 18823$$@2@0@0#makeInfixTermNode
+^4489 18829$$@2@0@0#makePostfixTermNode
+^4490 18831$$@2@0@0#makePostfixTermNode2
+^4491 18833$$@2@0@0#makePrefixTermNode
+^4492 18837$$@19@2@0#CollapseInfixTermNode
+^4493 18849$$@2@0@0#makeMatchedNode
+^4494 18847$$@2@0@0#makeSqBracketedNode
+^4495 18845$$@2@0@0#updateSqBracketedNode
+^4496 18843$$$@0#updateMatchedNode
+^4497 18851$$@2@0@0#makeSimpleTermNode
+^4498 18853$$@2@0@0#makeSelectTermNode
+^4499 18855$$@2@0@0#makeMapTermNode
+^4500 18857$$@2@0@0#makeLiteralTermNode
+^4501 18859$$@2@0@0#makeUnchangedTermNode1
+^4502 18861$$@2@0@0#makeUnchangedTermNode2
+^4503 18863$$@2@0@0#makeSizeofTermNode
+^4504 18835$$@2@0@0#makeOpCallTermNode
+^4505 18921$$$@0#sigNode_rangeSort
+^4506 18923$$@2@0@0#sigNode_domain
+^4507 18887$$$@0#sameNameNode
+^4508 18893$$@2@0@0#makeCTypesNode
+^4509 18895$$@2@0@0#makeTypeSpecifier
+^4510 18897$$$@0#sigNode_equal
+^4511 18903$$$@0#lclTypeSpecNode2sort
+^4512 18899$$$@0#typeExpr2ptrSort
+^4513 18905$$$@0#checkAndEnterTag
+^4514 18915$$$@0#enteringFcnScope
+^4515 18917$$$@0#enteringClaimScope
+^4516 18603@6@5@1@0@0$@19@3@0#nameNode_errorToken
+^4517 18601@6@5@1@0@0$@19@3@0#termNode_errorToken
+^4518 18605@6@5@1@0@0$@19@3@0#lclTypeSpecNode_errorToken
+^4519 18925$$$@0#opFormUnion_createAnyOp
+^4520 18927$$$@0#opFormUnion_createMiddle
+^4521 18539$$$@0#LCLBuiltins
+^4522 18805$$@2@0@0#paramNode_elipsis
+^4523 18841$$$@0#pushInfixOpPartNode
+^4524 18725@6@5@1@0@0$@2@0@0#declaratorNode_unparseCode
+^4525 18731@6@5@1@0@0$@2@0@0#typeExpr_name
+^4526 18751$$$@0#setExposedType
+^4527 18537$$$@0#declareForwardType
+^4528 18717$$@2@0@0#declaratorNode_copy
+^4529 18943$$$@0#lslOp_equal
+^4530 19049$@0@s1@1@s1$@0#lsymbol_setbool
 ^4531 4179$$$@0#lsymbol_getbool
 ^4532 4181$$$@0#lsymbol_getBool
 ^4533 4183$$$@0#lsymbol_getTRUE
@@ -25251,37 +25243,37 @@
 *0 (Datatype)
 ^4582 4236@-@-@0@0@0@0@4238#symHashTable
 *7 (Struct tag)
-^4583 19497@4239#@s_symtableStruct
+^4583 19489@4239#@s_symtableStruct
 *0 (Datatype)
 ^4584 4240@-@+@0@0@0@0@4241#symtable
 *4 (Function)
-^4585 19550$^@2@0@0#symtable_new
-^4586 19569$$$@0#symtable_enterScope
-^4587 19571$$$@0#symtable_exitScope
-^4588 19573$$$@0#symtable_enterFct
-^4589 19575$$$@0#symtable_enterType
-^4590 19579$$$@0#symtable_enterVar
-^4591 19559$$$@0#symtable_enterOp
-^4592 19561$$$@0#symtable_enterTag
-^4593 19563$$$@0#symtable_enterTagForce
-^4594 19581$$$@0#symtable_exists
-^4595 19583@6@5@1@0@0$@19@3@0#symtable_typeInfo
-^4596 19585@6@5@1@0@0$@19@3@0#symtable_varInfo
-^4597 19587@6@5@1@0@0$@19@3@0#symtable_varInfoInScope
-^4598 19565@6@5@1@0@0$@19@3@0#symtable_opInfo
-^4599 19567@6@5@1@0@0$@19@3@0#symtable_tagInfo
-^4600 19591$$$@0#symtable_export
-^4601 19596$$$@0#symtable_dump
-^4602 19623$$$@0#symtable_import
-^4603 19658$$$@0#symtable_printStats
-^4604 19577$$$@0#lsymbol_sortFromType
-^4605 19660@6@5@1@0@0$@3@0@0#tagKind_unparse
-^4606 19598$$$@0#lsymbol_translateSort
-^4607 19532$$$@0#varInfo_free
-^4608 19670@6@5@1@0@0$@2@0@0#symtable_opsWithLegalDomain
-^4609 19664@6@5@1@0@0$@19@3@0#symtable_possibleOps
-^4610 19666$$$@0#symtable_opExistsWithArity
-^4611 19536$$$@0#symtable_free
+^4585 19542$^@2@0@0#symtable_new
+^4586 19561$$$@0#symtable_enterScope
+^4587 19563$$$@0#symtable_exitScope
+^4588 19565$$$@0#symtable_enterFct
+^4589 19567$$$@0#symtable_enterType
+^4590 19571$$$@0#symtable_enterVar
+^4591 19551$$$@0#symtable_enterOp
+^4592 19553$$$@0#symtable_enterTag
+^4593 19555$$$@0#symtable_enterTagForce
+^4594 19573$$$@0#symtable_exists
+^4595 19575@6@5@1@0@0$@19@3@0#symtable_typeInfo
+^4596 19577@6@5@1@0@0$@19@3@0#symtable_varInfo
+^4597 19579@6@5@1@0@0$@19@3@0#symtable_varInfoInScope
+^4598 19557@6@5@1@0@0$@19@3@0#symtable_opInfo
+^4599 19559@6@5@1@0@0$@19@3@0#symtable_tagInfo
+^4600 19583$$$@0#symtable_export
+^4601 19588$$$@0#symtable_dump
+^4602 19615$$$@0#symtable_import
+^4603 19650$$$@0#symtable_printStats
+^4604 19569$$$@0#lsymbol_sortFromType
+^4605 19652@6@5@1@0@0$@3@0@0#tagKind_unparse
+^4606 19590$$$@0#lsymbol_translateSort
+^4607 19524$$$@0#varInfo_free
+^4608 19662@6@5@1@0@0$@2@0@0#symtable_opsWithLegalDomain
+^4609 19656@6@5@1@0@0$@19@3@0#symtable_possibleOps
+^4610 19658$$$@0#symtable_opExistsWithArity
+^4611 19528$$$@0#symtable_free
 *0 (Datatype)
 ^4612 1067@-@+@0@5@2@0@4304#o_exprNode
 *7 (Struct tag)
@@ -25294,18 +25286,18 @@
 ^4616 4310@183#exprNodeList_elements
 *4 (Function)
 ^4617 4316$$@2@0@0#exprNodeList_new
-^4618 16934@6@5@1@0@0^@19@2@0#exprNodeList_nth
-^4619 16932$$$@0#exprNodeList_push
-^4620 16930$$@2@0@0#exprNodeList_singleton
-^4621 16918$$$@0#exprNodeList_addh
-^4622 16920$$$@0#exprNodeList_reset
-^4623 16922$$$@0#exprNodeList_advance
-^4624 16936@6@5@1@0@0^@2@0@0#exprNodeList_unparse
-^4625 16938$$$@0#exprNodeList_free
-^4626 16940$$$@0#exprNodeList_freeShallow
-^4627 16924@6@5@1@0@0$@19@3@0#exprNodeList_head
-^4628 16926@6@5@1@0@0^@19@3@0#exprNodeList_current
-^4629 16928@6@5@1@0@0^@19@2@0#exprNodeList_getN
+^4618 16926@6@5@1@0@0^@19@2@0#exprNodeList_nth
+^4619 16924$$$@0#exprNodeList_push
+^4620 16922$$@2@0@0#exprNodeList_singleton
+^4621 16910$$$@0#exprNodeList_addh
+^4622 16912$$$@0#exprNodeList_reset
+^4623 16914$$$@0#exprNodeList_advance
+^4624 16928@6@5@1@0@0^@2@0@0#exprNodeList_unparse
+^4625 16930$$$@0#exprNodeList_free
+^4626 16932$$$@0#exprNodeList_freeShallow
+^4627 16916@6@5@1@0@0$@19@3@0#exprNodeList_head
+^4628 16918@6@5@1@0@0^@19@3@0#exprNodeList_current
+^4629 16920@6@5@1@0@0^@19@2@0#exprNodeList_getN
 *1 (Constant)
 ^4630 5$#exprNodeListBASESIZE
 *0 (Datatype)
@@ -25314,11 +25306,11 @@
 ^4632 5$#CTX_UNKNOWN#CTX_VOID#CTX_BOOL#CTX_UCHAR#CTX_CHAR#CTX_INT#CTX_UINT#CTX_SINT#CTX_USINT#CTX_LINT#CTX_ULINT#CTX_LLINT#CTX_ULLINT#CTX_ANYINTEGRAL#CTX_UNSIGNEDINTEGRAL#CTX_SIGNEDINTEGRAL#CTX_FLOAT#CTX_DOUBLE#CTX_LDOUBLE#CTX_LAST
 ^4652 4341$#cprim_int
 *4 (Function)
-^4653 12024$^$@0#cprim_closeEnough
-^4654 12022$^$@0#cprim_closeEnoughDeep
-^4655 12028@6@5@1@0@0^@2@0@0#cprim_unparse
-^4656 12018$$$@0#cprim_fromInt
-^4657 12030$$$@0#cprim_isInt
+^4653 12016$^$@0#cprim_closeEnough
+^4654 12014$^$@0#cprim_closeEnoughDeep
+^4655 12020@6@5@1@0@0^@2@0@0#cprim_unparse
+^4656 12010$$$@0#cprim_fromInt
+^4657 12022$$$@0#cprim_isInt
 *1 (Constant)
 ^4658 5$#HBUCKET_BASESIZE#HBUCKET_DNE
 *7 (Struct tag)
@@ -25334,15 +25326,15 @@
 *1 (Constant)
 ^4666 1085@i0@0@4#cstringTable_undefined
 *4 (Function)
-^4667 14073@6@5@1@0@0^@2@0@0#cstringTable_create
-^4668 14084$@0@@1@p0$@0#cstringTable_insert
-^4669 14086$$$@0#cstringTable_lookup
-^4670 14078@6@5@1@0@0$@2@0@0#cstringTable_stats
-^4671 14063$$$@0#cstringTable_free
-^4672 14092$@0@@1@p0$@0#cstringTable_remove
-^4673 14076@6@5@1@0@0^@3@0@0#cstringTable_unparse
-^4674 14088$@0@@1@p0$@0#cstringTable_update
-^4675 14090$$$@0#cstringTable_replaceKey
+^4667 14065@6@5@1@0@0^@2@0@0#cstringTable_create
+^4668 14076$@0@@1@p0$@0#cstringTable_insert
+^4669 14078$$$@0#cstringTable_lookup
+^4670 14070@6@5@1@0@0$@2@0@0#cstringTable_stats
+^4671 14055$$$@0#cstringTable_free
+^4672 14084$@0@@1@p0$@0#cstringTable_remove
+^4673 14068@6@5@1@0@0^@3@0@0#cstringTable_unparse
+^4674 14080$@0@@1@p0$@0#cstringTable_update
+^4675 14082$$$@0#cstringTable_replaceKey
 *1 (Constant)
 ^4676 5$#GHBUCKET_BASESIZE
 *7 (Struct tag)
@@ -25358,15 +25350,15 @@
 *1 (Constant)
 ^4683 1088@i0@0@4#genericTable_undefined
 *4 (Function)
-^4684 14454@6@5@1@0@0$@2@0@0#genericTable_create
-^4685 14423$$$@0#genericTable_size
-^4686 14463$$$@0#genericTable_insert
-^4687 14466@6@5@1@0@0$@19@2@0#genericTable_lookup
-^4688 14472$^$@0#genericTable_contains
-^4689 14459@6@5@1@0@0$@2@0@0#genericTable_stats
-^4690 14444$$$@0#genericTable_free
-^4691 14470$@0@@1@p0$@0#genericTable_remove
-^4692 14468$@0@@1@p0$@0#genericTable_update
+^4684 14446@6@5@1@0@0$@2@0@0#genericTable_create
+^4685 14415$$$@0#genericTable_size
+^4686 14455$$$@0#genericTable_insert
+^4687 14458@6@5@1@0@0$@19@2@0#genericTable_lookup
+^4688 14464$^$@0#genericTable_contains
+^4689 14451@6@5@1@0@0$@2@0@0#genericTable_stats
+^4690 14436$$$@0#genericTable_free
+^4691 14462$@0@@1@p0$@0#genericTable_remove
+^4692 14460$@0@@1@p0$@0#genericTable_update
 *6 (Iterator finalizer)
 ^4693 0@49#end_genericTable_elements
 *5 (Iterator)
@@ -25382,15 +25374,15 @@
 *5 (Iterator)
 ^4699 4445@185#filelocList_elements
 *4 (Function)
-^4700 17048$^$@0#filelocList_realSize
-^4701 17036@6@5@1@0@0$$@0#filelocList_append
+^4700 17040$^$@0#filelocList_realSize
+^4701 17028@6@5@1@0@0$$@0#filelocList_append
 ^4702 4455@6@5@1@0@0^@2@0@0#filelocList_new
-^4703 17044@6@5@1@0@0@0@@1@p0$@0#filelocList_add
-^4704 17042@6@5@1@0@0@0@@1@p0$@0#filelocList_addDifferentFile
-^4705 17038@6@5@1@0@0@0@@1@p0$@0#filelocList_addUndefined
-^4706 17050@6@5@1@0@0$@2@0@0#filelocList_unparseUses
-^4707 17046@6@5@1@0@0$@2@0@0#filelocList_unparse
-^4708 17052$$$@0#filelocList_free
+^4703 17036@6@5@1@0@0@0@@1@p0$@0#filelocList_add
+^4704 17034@6@5@1@0@0@0@@1@p0$@0#filelocList_addDifferentFile
+^4705 17030@6@5@1@0@0@0@@1@p0$@0#filelocList_addUndefined
+^4706 17042@6@5@1@0@0$@2@0@0#filelocList_unparseUses
+^4707 17038@6@5@1@0@0$@2@0@0#filelocList_unparse
+^4708 17044$$$@0#filelocList_free
 *1 (Constant)
 ^4709 5$#filelocListBASESIZE
 *0 (Datatype)
@@ -25406,24 +25398,24 @@
 ^4715 4477@186#enumNameList_elements
 *4 (Function)
 ^4716 4481$$@2@0@0#enumNameList_new
-^4717 16897$$$@0#enumNameList_member
-^4718 16893$$$@0#enumNameList_push
-^4719 16891$@0@@1@p0$@0#enumNameList_addh
-^4720 16901@6@5@1@0@0^@2@0@0#enumNameList_unparse
-^4721 16909$$$@0#enumNameList_free
-^4722 16887$^$@0#enumNameList_match
-^4723 16885$^@2@0@0#enumNameList_single
-^4724 16899$^@2@0@0#enumNameList_subtract
-^4725 16895$^@2@0@0#enumNameList_copy
-^4726 16907$$@2@0@0#enumNameList_undump
-^4727 16905@6@5@1@0@0$@2@0@0#enumNameList_dump
-^4728 16903@6@5@1@0@0$@2@0@0#enumNameList_unparseBrief
+^4717 16889$$$@0#enumNameList_member
+^4718 16885$$$@0#enumNameList_push
+^4719 16883$@0@@1@p0$@0#enumNameList_addh
+^4720 16893@6@5@1@0@0^@2@0@0#enumNameList_unparse
+^4721 16901$$$@0#enumNameList_free
+^4722 16879$^$@0#enumNameList_match
+^4723 16877$^@2@0@0#enumNameList_single
+^4724 16891$^@2@0@0#enumNameList_subtract
+^4725 16887$^@2@0@0#enumNameList_copy
+^4726 16899$$@2@0@0#enumNameList_undump
+^4727 16897@6@5@1@0@0$@2@0@0#enumNameList_dump
+^4728 16895@6@5@1@0@0$@2@0@0#enumNameList_unparseBrief
 *1 (Constant)
 ^4729 5$#enumNameListBASESIZE
 *0 (Datatype)
 ^4730 4476@+@=@0@0@0@0@4506#enumNameSList
 *4 (Function)
-^4731 16911$$$@0#enumNameSList_free
+^4731 16903$$$@0#enumNameSList_free
 *2 (Enum member)
 ^4732 4521$#SS_UNKNOWN#SS_UNUSEABLE#SS_UNDEFINED#SS_MUNDEFINED#SS_ALLOCATED#SS_PDEFINED#SS_DEFINED#SS_PARTIAL#SS_DEAD#SS_HOFFA#SS_FIXED#SS_RELDEF#SS_UNDEFGLOB#SS_KILLED#SS_UNDEFKILLED#SS_SPECIAL#SS_LAST
 *9 (Enum tag)
@@ -25455,27 +25447,27 @@
 *0 (Datatype)
 ^4796 4538@-@-@0@0@0@0@4539#exkind
 *4 (Function)
-^4797 13528$^$@0#alkind_equal
-^4798 13494@6@5@1@0@0^@19@3@0#sstate_unparse
-^4799 13522$^$@0#alkind_fromQual
-^4800 13504$^$@0#alkind_derive
-^4801 13506@6@5@1@0@0^@19@3@0#alkind_unparse
-^4802 13514@6@5@1@0@0^@19@3@0#alkind_capName
-^4803 13486$^$@0#alkind_fromInt
-^4804 13488$^$@0#nstate_fromInt
-^4805 13500@6@5@1@0@0^@19@3@0#nstate_unparse
-^4806 13502$^$@0#nstate_compare
-^4807 13496$^$@0#nstate_possiblyNull
-^4808 13498$^$@0#nstate_perhapsNull
-^4809 13490$^$@0#sstate_fromInt
-^4810 13492$^$@0#exkind_fromInt
-^4811 13516$^$@0#exkind_fromQual
-^4812 13508@6@5@1@0@0^@19@3@0#exkind_unparse
-^4813 13510@6@5@1@0@0^@19@3@0#exkind_capName
-^4814 13512@6@5@1@0@0^@19@3@0#exkind_unparseError
-^4815 13518$^$@0#sstate_fromQual
-^4816 13526$^$@0#alkind_compatible
-^4817 13530$^$@0#alkind_fixImplicit
+^4797 13520$^$@0#alkind_equal
+^4798 13486@6@5@1@0@0^@19@3@0#sstate_unparse
+^4799 13514$^$@0#alkind_fromQual
+^4800 13496$^$@0#alkind_derive
+^4801 13498@6@5@1@0@0^@19@3@0#alkind_unparse
+^4802 13506@6@5@1@0@0^@19@3@0#alkind_capName
+^4803 13478$^$@0#alkind_fromInt
+^4804 13480$^$@0#nstate_fromInt
+^4805 13492@6@5@1@0@0^@19@3@0#nstate_unparse
+^4806 13494$^$@0#nstate_compare
+^4807 13488$^$@0#nstate_possiblyNull
+^4808 13490$^$@0#nstate_perhapsNull
+^4809 13482$^$@0#sstate_fromInt
+^4810 13484$^$@0#exkind_fromInt
+^4811 13508$^$@0#exkind_fromQual
+^4812 13500@6@5@1@0@0^@19@3@0#exkind_unparse
+^4813 13502@6@5@1@0@0^@19@3@0#exkind_capName
+^4814 13504@6@5@1@0@0^@19@3@0#exkind_unparseError
+^4815 13510$^$@0#sstate_fromQual
+^4816 13518$^$@0#alkind_compatible
+^4817 13522$^$@0#alkind_fixImplicit
 *2 (Enum member)
 ^4818 4632$#XK_ERROR#XK_UNKNOWN#XK_NEVERESCAPE#XK_GOTO#XK_MAYGOTO#XK_MAYEXIT#XK_MUSTEXIT#XK_TRUEEXIT#XK_FALSEEXIT#XK_MUSTRETURN#XK_MAYRETURN#XK_MAYRETURNEXIT#XK_MUSTRETURNEXIT
 *9 (Enum tag)
@@ -25485,13 +25477,13 @@
 *1 (Constant)
 ^4833 4634$#XK_LAST
 *4 (Function)
-^4834 13520$^$@0#exitkind_fromQual
-^4835 13538$^$@0#exitkind_couldExit
-^4836 13544$^$@0#exitkind_couldEscape
-^4837 13546$^$@0#exitkind_fromInt
-^4838 13532@6@5@1@0@0^@19@3@0#exitkind_unparse
-^4839 13534$^$@0#exitkind_makeConditional
-^4840 13536$^$@0#exitkind_combine
+^4834 13512$^$@0#exitkind_fromQual
+^4835 13530$^$@0#exitkind_couldExit
+^4836 13536$^$@0#exitkind_couldEscape
+^4837 13538$^$@0#exitkind_fromInt
+^4838 13524@6@5@1@0@0^@19@3@0#exitkind_unparse
+^4839 13526$^$@0#exitkind_makeConditional
+^4840 13528$^$@0#exitkind_combine
 *0 (Datatype)
 ^4841 1047@-@+@0@5@19@2@4665#ex_sRef
 *6 (Iterator finalizer)
@@ -25510,54 +25502,54 @@
 ^4848 5$#sRefSetBASESIZE
 ^4849 1073@i0@0@4#sRefSet_undefined
 *4 (Function)
-^4850 17427$^$@0#sRefSet_equal
-^4851 17379$^$@0#sRefSet_hasRealElement
-^4852 17391$^$@0#sRefSet_hasUnconstrained
-^4853 17405@6@5@1@0@0^@3@0@0#sRefSet_unparsePlain
-^4854 17393@6@5@1@0@0^@3@0@0#sRefSet_unparseUnconstrained
-^4855 17395@6@5@1@0@0^@3@0@0#sRefSet_unparseUnconstrainedPlain
-^4856 17411$$$@0#sRefSet_fixSrefs
-^4857 17337$$$@0#sRefSet_delete
-^4858 17399@6@5@1@0@0$@19@2@0#sRefSet_lookupMember
-^4859 17383$^$@0#sRefSet_isSameMember
-^4860 17385$^$@0#sRefSet_isSameNameMember
-^4861 17361@6@5@1@0@0$@2@0@0#sRefSet_newCopy
-^4862 17365@6@5@1@0@0$@2@0@0#sRefSet_newDeepCopy
-^4863 17401$^$@0#sRefSet_size
-^4864 17345@6@5@1@0@0$$@0#sRefSet_unionFree
+^4850 17419$^$@0#sRefSet_equal
+^4851 17371$^$@0#sRefSet_hasRealElement
+^4852 17383$^$@0#sRefSet_hasUnconstrained
+^4853 17397@6@5@1@0@0^@3@0@0#sRefSet_unparsePlain
+^4854 17385@6@5@1@0@0^@3@0@0#sRefSet_unparseUnconstrained
+^4855 17387@6@5@1@0@0^@3@0@0#sRefSet_unparseUnconstrainedPlain
+^4856 17403$$$@0#sRefSet_fixSrefs
+^4857 17329$$$@0#sRefSet_delete
+^4858 17391@6@5@1@0@0$@19@2@0#sRefSet_lookupMember
+^4859 17375$^$@0#sRefSet_isSameMember
+^4860 17377$^$@0#sRefSet_isSameNameMember
+^4861 17353@6@5@1@0@0$@2@0@0#sRefSet_newCopy
+^4862 17357@6@5@1@0@0$@2@0@0#sRefSet_newDeepCopy
+^4863 17393$^$@0#sRefSet_size
+^4864 17337@6@5@1@0@0$$@0#sRefSet_unionFree
 ^4865 4708@6@5@1@0@0^@2@0@0#sRefSet_new
-^4866 17327@6@5@1@0@0$@2@0@0#sRefSet_single
-^4867 17331@6@5@1@0@0$$@0#sRefSet_insert
-^4868 17387$^$@0#sRefSet_member
-^4869 17381$^$@0#sRefSet_containsSameObject
-^4870 17403@6@5@1@0@0^@2@0@0#sRefSet_unparse
-^4871 17413$@0@@1@p0$@0#sRefSet_free
-^4872 17333$@0@@1@p0$@0#sRefSet_clear
-^4873 17417@6@5@1@0@0^@2@0@0#sRefSet_addIndirection
-^4874 17415@6@5@1@0@0^@2@0@0#sRefSet_removeIndirection
-^4875 17347@6@5@1@0@0@0@@1@p0$@0#sRefSet_union
-^4876 17357$@0@@1@p0$@0#sRefSet_levelPrune
-^4877 17335$@0@@1@p0$@0#sRefSet_clearStatics
-^4878 17355@6@5@1@0@0$$@0#sRefSet_levelUnion
-^4879 17353@6@5@1@0@0$@2@0@0#sRefSet_intersect
-^4880 17423@6@5@1@0@0$@2@0@0#sRefSet_fetchKnown
-^4881 17421@6@5@1@0@0$@2@0@0#sRefSet_fetchUnknown
-^4882 17419@6@5@1@0@0$@2@0@0#sRefSet_accessField
-^4883 17351@6@5@1@0@0$@2@0@0#sRefSet_realNewUnion
-^4884 17407@6@5@1@0@0^@2@0@0#sRefSet_unparseDebug
-^4885 17409@6@5@1@0@0^@3@0@0#sRefSet_unparseFull
-^4886 17425$^$@0#sRefSet_compare
-^4887 17397$@0@@1@p1$@0#sRefSet_modifyMember
-^4888 17429@6@5@1@0@0@0@@1@tp0@2@0@0#sRefSet_undump
-^4889 17431@6@5@1@0@0^@2@0@0#sRefSet_dump
-^4890 17343$@0@@1@p0$@0#sRefSet_deleteBase
-^4891 17339@6@5@1@0@0^@19@2@0#sRefSet_choose
-^4892 17341@6@5@1@0@0^@19@2@0#sRefSet_mergeIntoOne
-^4893 17363@6@5@1@0@0^@2@0@0#sRefSet_levelCopy
-^4894 17349@6@5@1@0@0@0@@1@p0$@0#sRefSet_unionExcept
-^4895 17359@6@5@1@0@0@0@@1@p0$@0#sRefSet_copyInto
-^4896 17389$^$@0#sRefSet_hasStatic
-^4897 17433$@0@@1@p0$@0#sRefSet_markImmutable
+^4866 17319@6@5@1@0@0$@2@0@0#sRefSet_single
+^4867 17323@6@5@1@0@0$$@0#sRefSet_insert
+^4868 17379$^$@0#sRefSet_member
+^4869 17373$^$@0#sRefSet_containsSameObject
+^4870 17395@6@5@1@0@0^@2@0@0#sRefSet_unparse
+^4871 17405$@0@@1@p0$@0#sRefSet_free
+^4872 17325$@0@@1@p0$@0#sRefSet_clear
+^4873 17409@6@5@1@0@0^@2@0@0#sRefSet_addIndirection
+^4874 17407@6@5@1@0@0^@2@0@0#sRefSet_removeIndirection
+^4875 17339@6@5@1@0@0@0@@1@p0$@0#sRefSet_union
+^4876 17349$@0@@1@p0$@0#sRefSet_levelPrune
+^4877 17327$@0@@1@p0$@0#sRefSet_clearStatics
+^4878 17347@6@5@1@0@0$$@0#sRefSet_levelUnion
+^4879 17345@6@5@1@0@0$@2@0@0#sRefSet_intersect
+^4880 17415@6@5@1@0@0$@2@0@0#sRefSet_fetchKnown
+^4881 17413@6@5@1@0@0$@2@0@0#sRefSet_fetchUnknown
+^4882 17411@6@5@1@0@0$@2@0@0#sRefSet_accessField
+^4883 17343@6@5@1@0@0$@2@0@0#sRefSet_realNewUnion
+^4884 17399@6@5@1@0@0^@2@0@0#sRefSet_unparseDebug
+^4885 17401@6@5@1@0@0^@3@0@0#sRefSet_unparseFull
+^4886 17417$^$@0#sRefSet_compare
+^4887 17389$@0@@1@p1$@0#sRefSet_modifyMember
+^4888 17421@6@5@1@0@0@0@@1@tp0@2@0@0#sRefSet_undump
+^4889 17423@6@5@1@0@0^@2@0@0#sRefSet_dump
+^4890 17335$@0@@1@p0$@0#sRefSet_deleteBase
+^4891 17331@6@5@1@0@0^@19@2@0#sRefSet_choose
+^4892 17333@6@5@1@0@0^@19@2@0#sRefSet_mergeIntoOne
+^4893 17355@6@5@1@0@0^@2@0@0#sRefSet_levelCopy
+^4894 17341@6@5@1@0@0@0@@1@p0$@0#sRefSet_unionExcept
+^4895 17351@6@5@1@0@0@0@@1@p0$@0#sRefSet_copyInto
+^4896 17381$^$@0#sRefSet_hasStatic
+^4897 17425$@0@@1@p0$@0#sRefSet_markImmutable
 *2 (Enum member)
 ^4898 4773$#KINVALID#KDATATYPE#KCONST#KENUMCONST#KVAR#KFCN#KITER#KENDITER#KSTRUCTTAG#KUNIONTAG#KENUMTAG#KELIPSMARKER
 *9 (Enum tag)
@@ -25568,13 +25560,13 @@
 ^4912 4775$#KELAST
 ^4913 5$#KGLOBALMARKER
 *4 (Function)
-^4914 14474$^$@0#ekind_fromInt
+^4914 14466$^$@0#ekind_fromInt
 *1 (Constant)
 ^4915 4775$#ekind_variable#ekind_function
 *4 (Function)
-^4917 14480@6@5@1@0@0^@19@3@0#ekind_capName
-^4918 14476@6@5@1@0@0^@19@3@0#ekind_unparse
-^4919 14478@6@5@1@0@0^@19@3@0#ekind_unparseLong
+^4917 14472@6@5@1@0@0^@19@3@0#ekind_capName
+^4918 14468@6@5@1@0@0^@19@3@0#ekind_unparse
+^4919 14470@6@5@1@0@0^@19@3@0#ekind_unparseLong
 *0 (Datatype)
 ^4920 5@-@-@0@0@0@0@4798#usymId
 ^4921 4798@-@-@0@0@0@0@4799#typeId
@@ -25587,20 +25579,20 @@
 ^4925 4805@+@=@0@5@0@0@4806#usymIdSet
 *4 (Function)
 ^4926 4808@6@5@1@0@0$@3@0@0#usymIdSet_new
-^4927 17311$^$@0#usymIdSet_member
-^4928 17309@6@5@1@0@0$@3@0@0#usymIdSet_subtract
-^4929 17313$$$@0#usymIdSet_free
-^4930 17319@6@5@1@0@0$@2@0@0#usymIdSet_unparse
-^4931 17315@6@5@1@0@0$@2@0@0#usymIdSet_dump
-^4932 17317@6@5@1@0@0$@3@0@0#usymIdSet_undump
-^4933 17297@6@5@1@0@0$@2@0@0#usymIdSet_single
-^4934 17321$$$@0#usymIdSet_compare
+^4927 17303$^$@0#usymIdSet_member
+^4928 17301@6@5@1@0@0$@3@0@0#usymIdSet_subtract
+^4929 17305$$$@0#usymIdSet_free
+^4930 17311@6@5@1@0@0$@2@0@0#usymIdSet_unparse
+^4931 17307@6@5@1@0@0$@2@0@0#usymIdSet_dump
+^4932 17309@6@5@1@0@0$@3@0@0#usymIdSet_undump
+^4933 17289@6@5@1@0@0$@2@0@0#usymIdSet_single
+^4934 17313$$$@0#usymIdSet_compare
 *1 (Constant)
 ^4935 5$#usymIdSetBASESIZE
 *4 (Function)
-^4936 17307@6@5@1@0@0^@3@0@0#usymIdSet_newUnion
-^4937 17303@6@5@1@0@0^@3@0@0#usymIdSet_add
-^4938 17305@6@5@1@0@0$@2@0@0#usymIdSet_removeFresh
+^4936 17299@6@5@1@0@0^@3@0@0#usymIdSet_newUnion
+^4937 17295@6@5@1@0@0^@3@0@0#usymIdSet_add
+^4938 17297@6@5@1@0@0$@2@0@0#usymIdSet_removeFresh
 *1 (Constant)
 ^4939 4806@i0@0@4#usymIdSet_undefined
 *6 (Iterator finalizer)
@@ -25614,16 +25606,16 @@
 *5 (Iterator)
 ^4944 4841@41#sRefList_elements
 *4 (Function)
-^4945 17094$^$@0#sRefList_size
+^4945 17086$^$@0#sRefList_size
 *1 (Constant)
 ^4946 1076@i0@0@4#sRefList_undefined
 *4 (Function)
 ^4947 4851@6@5@1@0@0$@2@0@0#sRefList_new
-^4948 17084@6@5@1@0@0$@2@0@0#sRefList_single
-^4949 17088@6@2@1@0@0@0@@1@p0$@0#sRefList_add
-^4950 17092@6@5@1@0@0^@3@0@0#sRefList_unparse
-^4951 17096$$$@0#sRefList_free
-^4952 17090@6@5@1@0@0^@2@0@0#sRefList_copy
+^4948 17076@6@5@1@0@0$@2@0@0#sRefList_single
+^4949 17080@6@2@1@0@0@0@@1@p0$@0#sRefList_add
+^4950 17084@6@5@1@0@0^@3@0@0#sRefList_unparse
+^4951 17088$$$@0#sRefList_free
+^4952 17082@6@5@1@0@0^@2@0@0#sRefList_copy
 *1 (Constant)
 ^4953 5$#sRefListBASESIZE
 *7 (Struct tag)
@@ -25635,47 +25627,47 @@
 *5 (Iterator)
 ^4957 4867@190#uentryList_elements
 *4 (Function)
-^4958 16962$@0@@1@p0$@0#uentryList_clear
-^4959 17014$^$@0#uentryList_size
+^4958 16954$@0@@1@p0$@0#uentryList_clear
+^4959 17006$^$@0#uentryList_size
 *1 (Constant)
 ^4960 4866@@0@4#uentryList_missingParams
 *4 (Function)
-^4961 17016@6@0@1@0@53^$@0#uentryList_isMissingParams
+^4961 17008@6@0@1@0@53^$@0#uentryList_isMissingParams
 *1 (Constant)
 ^4962 4866@i0@0@4#uentryList_undefined
 *4 (Function)
 ^4963 4883@6@2@1@0@0$@2@0@0#uentryList_new
-^4964 16964@6@5@1@0@0@0@@1@p0$@0#uentryList_add
-^4965 16958@6@5@1@0@0^@2@0@0#uentryList_single
-^4966 16986@6@5@1@0@0^@19@2@0#uentryList_getN
-^4967 16968@6@5@1@0@0^@3@0@0#uentryList_unparseFull
-^4968 16966@6@5@1@0@0^@3@0@0#uentryList_unparse
-^4969 16974@6@5@1@0@0^@3@0@0#uentryList_unparseAbbrev
-^4970 16970@6@5@1@0@0^@3@0@0#uentryList_unparseParams
-^4971 16982$$$@0#uentryList_free
-^4972 16984$^$@0#uentryList_isVoid
-^4973 16980@6@5@1@0@0^@2@0@0#uentryList_copy
-^4974 16988$@0@@1@p0$@0#uentryList_fixMissingNames
-^4975 16994$^$@0#uentryList_compareStrict
-^4976 16992$^$@0#uentryList_compareParams
-^4977 16996$^$@0#uentryList_compareFields
-^4978 17026$^$@0#uentryList_equivFields
-^4979 17000@6@5@1@0@0^@3@0@0#uentryList_dumpParams
-^4980 17006@6@5@1@0@0@0@@1@tp0@3@0@0#uentryList_undump
-^4981 17018$^$@0#uentryList_hasReturned
-^4982 17012$@0@@1@p0$@0#uentryList_advanceSafe
-^4983 17010$^$@0#uentryList_isFinished
-^4984 17008$@0@@1@p0$@0#uentryList_reset
-^4985 16998@6@5@1@0@0^@19@2@0#uentryList_current
-^4986 16978$^$@0#uentryList_lookupRealName
-^4987 17020@6@5@1@0@0^@19@2@0#uentryList_lookupField
-^4988 17022@6@5@1@0@0$@3@0@0#uentryList_mergeFields
-^4989 17024$$$@0#uentryList_showFieldDifference
-^4990 17004@6@5@1@0@0$@2@0@0#uentryList_undumpFields
-^4991 17002@6@5@1@0@0$@2@0@0#uentryList_dumpFields
-^4992 16990$$$@0#uentryList_fixImpParams
-^4993 17028$$$@0#uentryList_matchFields
-^4994 16972$$$@0#uentryList_matchParams
+^4964 16956@6@5@1@0@0@0@@1@p0$@0#uentryList_add
+^4965 16950@6@5@1@0@0^@2@0@0#uentryList_single
+^4966 16978@6@5@1@0@0^@19@2@0#uentryList_getN
+^4967 16960@6@5@1@0@0^@3@0@0#uentryList_unparseFull
+^4968 16958@6@5@1@0@0^@3@0@0#uentryList_unparse
+^4969 16966@6@5@1@0@0^@3@0@0#uentryList_unparseAbbrev
+^4970 16962@6@5@1@0@0^@3@0@0#uentryList_unparseParams
+^4971 16974$$$@0#uentryList_free
+^4972 16976$^$@0#uentryList_isVoid
+^4973 16972@6@5@1@0@0^@2@0@0#uentryList_copy
+^4974 16980$@0@@1@p0$@0#uentryList_fixMissingNames
+^4975 16986$^$@0#uentryList_compareStrict
+^4976 16984$^$@0#uentryList_compareParams
+^4977 16988$^$@0#uentryList_compareFields
+^4978 17018$^$@0#uentryList_equivFields
+^4979 16992@6@5@1@0@0^@3@0@0#uentryList_dumpParams
+^4980 16998@6@5@1@0@0@0@@1@tp0@3@0@0#uentryList_undump
+^4981 17010$^$@0#uentryList_hasReturned
+^4982 17004$@0@@1@p0$@0#uentryList_advanceSafe
+^4983 17002$^$@0#uentryList_isFinished
+^4984 17000$@0@@1@p0$@0#uentryList_reset
+^4985 16990@6@5@1@0@0^@19@2@0#uentryList_current
+^4986 16970$^$@0#uentryList_lookupRealName
+^4987 17012@6@5@1@0@0^@19@2@0#uentryList_lookupField
+^4988 17014@6@5@1@0@0$@3@0@0#uentryList_mergeFields
+^4989 17016$$$@0#uentryList_showFieldDifference
+^4990 16996@6@5@1@0@0$@2@0@0#uentryList_undumpFields
+^4991 16994@6@5@1@0@0$@2@0@0#uentryList_dumpFields
+^4992 16982$$$@0#uentryList_fixImpParams
+^4993 17020$$$@0#uentryList_matchFields
+^4994 16964$$$@0#uentryList_matchParams
 *1 (Constant)
 ^4995 5$#uentryListBASESIZE
 *6 (Iterator finalizer)
@@ -25684,20 +25676,20 @@
 ^4997 4948@129#globSet_allElements
 *4 (Function)
 ^4998 4954@6@5@1@0@0^@2@0@0#globSet_new
-^4999 17164@6@5@1@0@0$@3@0@0#globSet_single
-^5000 17162@6@5@1@0@0@0@@1@p0$@0#globSet_insert
-^5001 17172$^$@0#globSet_member
-^5002 17174@6@5@1@0@0^@19@2@0#globSet_lookup
-^5003 17178$$$@0#globSet_free
-^5004 17184@6@5@1@0@0^@2@0@0#globSet_unparse
-^5005 17180@6@5@1@0@0^@2@0@0#globSet_dump
-^5006 17182@6@5@1@0@0@0@@1@tp0@2@0@0#globSet_undump
-^5007 17166$@0@@1@p0$@0#globSet_markImmutable
-^5008 17168@6@5@1@0@0@0@@1@p0$@0#globSet_copyInto
-^5009 17170@6@5@1@0@0^@2@0@0#globSet_newCopy
-^5010 17176$^$@0#globSet_hasStatic
-^5011 17186$$$@0#globSet_compare
-^5012 17160$$$@0#globSet_clear
+^4999 17156@6@5@1@0@0$@3@0@0#globSet_single
+^5000 17154@6@5@1@0@0@0@@1@p0$@0#globSet_insert
+^5001 17164$^$@0#globSet_member
+^5002 17166@6@5@1@0@0^@19@2@0#globSet_lookup
+^5003 17170$$$@0#globSet_free
+^5004 17176@6@5@1@0@0^@2@0@0#globSet_unparse
+^5005 17172@6@5@1@0@0^@2@0@0#globSet_dump
+^5006 17174@6@5@1@0@0@0@@1@tp0@2@0@0#globSet_undump
+^5007 17158$@0@@1@p0$@0#globSet_markImmutable
+^5008 17160@6@5@1@0@0@0@@1@p0$@0#globSet_copyInto
+^5009 17162@6@5@1@0@0^@2@0@0#globSet_newCopy
+^5010 17168$^$@0#globSet_hasStatic
+^5011 17178$$$@0#globSet_compare
+^5012 17152$$$@0#globSet_clear
 *1 (Constant)
 ^5013 1200@@0@4#globSet_undefined
 *7 (Struct tag)
@@ -25706,11 +25698,11 @@
 ^5015 4990@+@=@0@5@0@0@4991#ctypeList
 *4 (Function)
 ^5016 4995@6@5@1@0@0$@2@0@0#ctypeList_new
-^5017 16872$@0@@1@p0$@0#ctypeList_addh
-^5018 16876@6@5@1@0@0@0@@1@p0@2@0@0#ctypeList_append
-^5019 16874@6@5@1@0@0@0@@1@p0@3@0@0#ctypeList_add
-^5020 16878@6@5@1@0@0^@2@0@0#ctypeList_unparse
-^5021 16880$@0@@1@p0$@0#ctypeList_free
+^5017 16864$@0@@1@p0$@0#ctypeList_addh
+^5018 16868@6@5@1@0@0@0@@1@p0@2@0@0#ctypeList_append
+^5019 16866@6@5@1@0@0@0@@1@p0@3@0@0#ctypeList_add
+^5020 16870@6@5@1@0@0^@2@0@0#ctypeList_unparse
+^5021 16872$@0@@1@p0$@0#ctypeList_free
 *1 (Constant)
 ^5022 4991@i0@0@4#ctypeList_undefined
 *6 (Iterator finalizer)
@@ -25730,31 +25722,31 @@
 ^5030 5024@43#aliasTable_elements
 *4 (Function)
 ^5031 5026@6@5@1@0@0^@3@0@0#aliasTable_new
-^5032 14345$@0@@1@p0,p1$@0#aliasTable_clearAliases
-^5033 14355@6@5@1@0@0^@2@0@0#aliasTable_canAlias
-^5034 14361@6@5@1@0@0^@3@0@0#aliasTable_copy
-^5035 14371@6@5@1@0@0^@2@0@0#aliasTable_unparse
-^5036 14375$$$@0#aliasTable_free
-^5037 14339@6@5@1@0@0@0@@1@p0$@0#aliasTable_addMustAlias
-^5038 14367@6@5@1@0@0@0@@1@p0$@0#aliasTable_levelUnion
-^5039 14369@6@5@1@0@0@0@@1@s0@3@0@0#aliasTable_levelUnionNew
-^5040 14377$@0@g2675@0@0@1@g2675$@0#aliasTable_checkGlobs
-^5041 14353@6@5@1@0@0^@2@0@0#aliasTable_aliasedBy
-^5042 14373$$$@0#aliasTable_fixSrefs
-^5043 14365@6@5@1@0@0$$@0#aliasTable_levelUnionSeq
+^5032 14337$@0@@1@p0,p1$@0#aliasTable_clearAliases
+^5033 14347@6@5@1@0@0^@2@0@0#aliasTable_canAlias
+^5034 14353@6@5@1@0@0^@3@0@0#aliasTable_copy
+^5035 14363@6@5@1@0@0^@2@0@0#aliasTable_unparse
+^5036 14367$$$@0#aliasTable_free
+^5037 14331@6@5@1@0@0@0@@1@p0$@0#aliasTable_addMustAlias
+^5038 14359@6@5@1@0@0@0@@1@p0$@0#aliasTable_levelUnion
+^5039 14361@6@5@1@0@0@0@@1@s0@3@0@0#aliasTable_levelUnionNew
+^5040 14369$@0@g2675@0@0@1@g2675$@0#aliasTable_checkGlobs
+^5041 14345@6@5@1@0@0^@2@0@0#aliasTable_aliasedBy
+^5042 14365$$$@0#aliasTable_fixSrefs
+^5043 14357@6@5@1@0@0$$@0#aliasTable_levelUnionSeq
 *1 (Constant)
 ^5044 5$#aliasTableBASESIZE
 *4 (Function)
-^5045 16745@6@5@1@0@0@0@@1@tp0,p1$@0#reader_readLine
-^5046 16725$@0@@1@tp0$@0#reader_getInt
-^5047 16727$@0@@1@tp0$@0#reader_loadChar
-^5048 16729$@0@@1@tp0$@0#reader_getDouble
-^5049 16740$@0@@1@tp0$@0#reader_doCheckChar
-^5050 16738$@0@@1@tp0$@0#reader_optCheckChar
-^5051 16732@6@5@1@0@0@0@@1@tp0@2@0@0#reader_getWord
-^5052 16734@6@5@1@0@0@0@@1@tp0@3@0@0#reader_readUntil
-^5053 16736@6@5@1@0@0@0@@1@tp0@3@0@0#reader_readUntilOne
-^5054 16742$@0@@1@tp1$@0#reader_checkUngetc
+^5045 16737@6@5@1@0@0@0@@1@tp0,p1$@0#reader_readLine
+^5046 16717$@0@@1@tp0$@0#reader_getInt
+^5047 16719$@0@@1@tp0$@0#reader_loadChar
+^5048 16721$@0@@1@tp0$@0#reader_getDouble
+^5049 16732$@0@@1@tp0$@0#reader_doCheckChar
+^5050 16730$@0@@1@tp0$@0#reader_optCheckChar
+^5051 16724@6@5@1@0@0@0@@1@tp0@2@0@0#reader_getWord
+^5052 16726@6@5@1@0@0@0@@1@tp0@3@0@0#reader_readUntil
+^5053 16728@6@5@1@0@0@0@@1@tp0@3@0@0#reader_readUntilOne
+^5054 16734$@0@@1@tp1$@0#reader_checkUngetc
 *1 (Constant)
 ^5055 1064@@0@4#GLOBAL_ENV
 *2 (Enum member)
@@ -25775,122 +25767,122 @@
 ^5070 5093$@1@s1@1@$@0#usymtab_inGlobalScope
 ^5071 5095$@1@s1@1@$@0#usymtab_inFunctionScope
 ^5072 5097$@1@s1@1@$@0#usymtab_inFileScope
-^5073 14702$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_checkFinalScope
-^5074 14698$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_allUsed
-^5075 14692$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_allDefined
-^5076 14648$@1@s1@1@s1$@0#usymtab_prepareDump
-^5077 14650$@1@s1@1@tp0$@0#usymtab_dump
-^5078 14652$@1@s1@1@p0,s1,tp0$@0#usymtab_load
-^5079 14718@6@5@1@0@0@1@s1@1@@18@2@0#usymtab_getRefQuiet
-^5080 14858$@1@s1,g18@6@0@1@g18$@0#usymtab_printLocal
-^5081 14712@6@5@1@0@0@1@s1@1@@18@2@0#usymtab_getParam
+^5073 14694$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_checkFinalScope
+^5074 14690$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_allUsed
+^5075 14684$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_allDefined
+^5076 14640$@1@s1@1@s1$@0#usymtab_prepareDump
+^5077 14642$@1@s1@1@tp0$@0#usymtab_dump
+^5078 14644$@1@s1@1@p0,s1,tp0$@0#usymtab_load
+^5079 14710@6@5@1@0@0@1@s1@1@@18@2@0#usymtab_getRefQuiet
+^5080 14850$@1@s1,g18@6@0@1@g18$@0#usymtab_printLocal
+^5081 14704@6@5@1@0@0@1@s1@1@@18@2@0#usymtab_getParam
 ^5082 5117$@1@s1@1@s1$@0#usymtab_free
 ^5083 5119$@1@s1@1@$@0#usymtab_inDeepScope
-^5084 14738@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_lookupExpose
-^5085 14742@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupGlob
-^5086 14740@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_lookupExposeGlob
-^5087 14622@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupUnionTag
-^5088 14620@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupStructTag
-^5089 14746@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupEither
-^5090 14748$@1@s1@1@$@0#usymtab_lookupType
-^5091 14810$@1@s1@1@$@0#usymtab_isDefinitelyNull
-^5092 14812$@1@s1@1@$@0#usymtab_isDefinitelyNullDeep
-^5093 14602$@1@s1@1@s1,p0$@0#usymtab_supExposedTypeEntry
-^5094 14596$@1@s1@1@s1,p0$@0#usymtab_supTypeEntry
-^5095 14598@6@5@1@0@0@1@s1@1@s1@19@2@0#usymtab_supReturnTypeEntry
-^5096 14736@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupSafe
-^5097 14630@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_getGlobalEntry
-^5098 14760$@1@s1@1@$@0#usymtab_exists
-^5099 14780$@1@s1@1@$@0#usymtab_existsVar
-^5100 14764$@1@s1@1@$@0#usymtab_existsGlob
-^5101 14770$@1@s1@1@$@0#usymtab_existsType
-^5102 14766$@1@s1@1@$@0#usymtab_existsEither
-^5103 14772$@1@s1@1@$@0#usymtab_existsTypeEither
-^5104 14626$@1@s1@1@$@0#usymtab_getId
-^5105 14618$@1@s1@1@$@0#usymtab_getTypeId
-^5106 14586$@1@s1@1@s1,p0$@0#usymtab_supEntry
-^5107 14798$@1@s1@1@s1,p0$@0#usymtab_replaceEntry
-^5108 14606$@1@s1@1@s1,p0$@0#usymtab_supEntrySref
-^5109 14608$@1@s1@1@s1,p0$@0#usymtab_supGlobalEntry
-^5110 14580$@0@s1@1@s1,p0$@0#usymtab_addGlobalEntry
-^5111 14590@6@5@1@0@0@1@s1@1@s1,p0@19@2@0#usymtab_supEntryReturn
-^5112 14578$@1@s1@1@s1,p0$@0#usymtab_addEntry
-^5113 14750$@1@s1@1@s0$@0#usymtab_lookupAbstractType
-^5114 14800$@1@s1@1@$@0#usymtab_matchForwardStruct
-^5115 14778$@1@s1@1@$@0#usymtab_existsEnumTag
-^5116 14776$@1@s1@1@$@0#usymtab_existsUnionTag
-^5117 14774$@1@s1@1@$@0#usymtab_existsStructTag
+^5084 14730@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_lookupExpose
+^5085 14734@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupGlob
+^5086 14732@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_lookupExposeGlob
+^5087 14614@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupUnionTag
+^5088 14612@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupStructTag
+^5089 14738@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupEither
+^5090 14740$@1@s1@1@$@0#usymtab_lookupType
+^5091 14802$@1@s1@1@$@0#usymtab_isDefinitelyNull
+^5092 14804$@1@s1@1@$@0#usymtab_isDefinitelyNullDeep
+^5093 14594$@1@s1@1@s1,p0$@0#usymtab_supExposedTypeEntry
+^5094 14588$@1@s1@1@s1,p0$@0#usymtab_supTypeEntry
+^5095 14590@6@5@1@0@0@1@s1@1@s1@19@2@0#usymtab_supReturnTypeEntry
+^5096 14728@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupSafe
+^5097 14622@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_getGlobalEntry
+^5098 14752$@1@s1@1@$@0#usymtab_exists
+^5099 14772$@1@s1@1@$@0#usymtab_existsVar
+^5100 14756$@1@s1@1@$@0#usymtab_existsGlob
+^5101 14762$@1@s1@1@$@0#usymtab_existsType
+^5102 14758$@1@s1@1@$@0#usymtab_existsEither
+^5103 14764$@1@s1@1@$@0#usymtab_existsTypeEither
+^5104 14618$@1@s1@1@$@0#usymtab_getId
+^5105 14610$@1@s1@1@$@0#usymtab_getTypeId
+^5106 14578$@1@s1@1@s1,p0$@0#usymtab_supEntry
+^5107 14790$@1@s1@1@s1,p0$@0#usymtab_replaceEntry
+^5108 14598$@1@s1@1@s1,p0$@0#usymtab_supEntrySref
+^5109 14600$@1@s1@1@s1,p0$@0#usymtab_supGlobalEntry
+^5110 14572$@0@s1@1@s1,p0$@0#usymtab_addGlobalEntry
+^5111 14582@6@5@1@0@0@1@s1@1@s1,p0@19@2@0#usymtab_supEntryReturn
+^5112 14570$@1@s1@1@s1,p0$@0#usymtab_addEntry
+^5113 14742$@1@s1@1@s0$@0#usymtab_lookupAbstractType
+^5114 14792$@1@s1@1@$@0#usymtab_matchForwardStruct
+^5115 14770$@1@s1@1@$@0#usymtab_existsEnumTag
+^5116 14768$@1@s1@1@$@0#usymtab_existsUnionTag
+^5117 14766$@1@s1@1@$@0#usymtab_existsStructTag
 *6 (Iterator finalizer)
 ^5118 0@33#end_usymtab_entries
 *5 (Iterator)
 ^5119 5204@33#usymtab_entries
 *4 (Function)
 ^5120 5206$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_displayAllUses
-^5121 14846$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_printOut
-^5122 14850$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_printAll
+^5121 14838$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_printOut
+^5122 14842$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_printAll
 ^5123 5212$@1@s1@1@s1$@0#usymtab_enterScope
-^5124 14662$@1@s1@1@s1$@0#usymtab_enterFunctionScope
-^5125 14704$@1@s1@1@s1$@0#usymtab_quietExitScope
-^5126 14708$@1@s1@1@s1$@0#usymtab_exitScope
-^5127 14802$@0@s1@1@s1$@0#usymtab_addGuards
-^5128 14548$@0@s1@1@s1$@0#usymtab_setExitCode
+^5124 14654$@1@s1@1@s1$@0#usymtab_enterFunctionScope
+^5125 14696$@1@s1@1@s1$@0#usymtab_quietExitScope
+^5126 14700$@1@s1@1@s1$@0#usymtab_exitScope
+^5127 14794$@0@s1@1@s1$@0#usymtab_addGuards
+^5128 14540$@0@s1@1@s1$@0#usymtab_setExitCode
 ^5129 5224$@1@s1@1@s1$@0#usymtab_exitFile
 ^5130 5226$@1@s1@1@s1$@0#usymtab_enterFile
-^5131 14624@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupEnumTag
-^5132 14646$@1@s1@1@$@0#usymtab_convertId
-^5133 14559$@1@s1@1@s1$@0#usymtab_initMod
+^5131 14616@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupEnumTag
+^5132 14638$@1@s1@1@$@0#usymtab_convertId
+^5133 14551$@1@s1@1@s1$@0#usymtab_initMod
 ^5134 5234$@0@s1@1@s1$@0#usymtab_initBool
 ^5135 5236$@1@s1@1@s1$@0#usymtab_initGlobalMarker
-^5136 14694$@1@s1@1@s1$@0#usymtab_exportHeader
-^5137 14752$@1@s1@1@$@0#usymtab_structFieldsType
-^5138 14754$@1@s1@1@$@0#usymtab_unionFieldsType
-^5139 14758$@1@s1@1@$@0#usymtab_enumEnumNameListType
-^5140 14634@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_getTypeEntrySafe
-^5141 14676$@0@s1@1@s1$@0#usymtab_popOrBranch
-^5142 14680$@0@s1@1@s1$@0#usymtab_popAndBranch
-^5143 14668$@0@s1@1@s1$@0#usymtab_trueBranch
-^5144 14690$@0@s1@1@s1$@0#usymtab_altBranch
-^5145 14670$@0@s1@1@s1$@0#usymtab_popTrueBranch
-^5146 14674$@0@s1@1@s1$@0#usymtab_popTrueExecBranch
-^5147 14686$@0@s1@1@s1$@0#usymtab_popBranches
-^5148 14806$@0@s1@1@s1$@0#usymtab_unguard
-^5149 14808$@1@s1@1@$@0#usymtab_isGuarded
+^5136 14686$@1@s1@1@s1$@0#usymtab_exportHeader
+^5137 14744$@1@s1@1@$@0#usymtab_structFieldsType
+^5138 14746$@1@s1@1@$@0#usymtab_unionFieldsType
+^5139 14750$@1@s1@1@$@0#usymtab_enumEnumNameListType
+^5140 14626@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_getTypeEntrySafe
+^5141 14668$@0@s1@1@s1$@0#usymtab_popOrBranch
+^5142 14672$@0@s1@1@s1$@0#usymtab_popAndBranch
+^5143 14660$@0@s1@1@s1$@0#usymtab_trueBranch
+^5144 14682$@0@s1@1@s1$@0#usymtab_altBranch
+^5145 14662$@0@s1@1@s1$@0#usymtab_popTrueBranch
+^5146 14666$@0@s1@1@s1$@0#usymtab_popTrueExecBranch
+^5147 14678$@0@s1@1@s1$@0#usymtab_popBranches
+^5148 14798$@0@s1@1@s1$@0#usymtab_unguard
+^5149 14800$@1@s1@1@$@0#usymtab_isGuarded
 ^5150 5266$@1@s1,g2675@0@0@1@tg2675$@0#usymtab_printGuards
-^5151 14706$@1@s1@1@s1$@0#usymtab_quietPlainExitScope
+^5151 14698$@1@s1@1@s1$@0#usymtab_quietPlainExitScope
 ^5152 5270$@1@s1,g18@6@0@1@tg18$@0#usymtab_printComplete
-^5153 14768$@1@s1@1@$@0#usymtab_existsGlobEither
-^5154 14636$@1@s1@1@$@0#usymtab_isBoolType
-^5155 14638@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_getTypeEntryName
-^5156 14632@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_getTypeEntry
-^5157 14600$@1@s1@1@s1,p0$@0#usymtab_supAbstractTypeEntry
-^5158 14604$@1@s1@1@s1,p0$@0#usymtab_supForwardTypeEntry
-^5159 14594@6@5@1@0@0@1@s1@1@s1,p0@19@2@0#usymtab_supGlobalEntryReturn
-^5160 14592@6@5@1@0@0@1@s1@1@s1,p0@19@2@0#usymtab_supEntrySrefReturn
-^5161 14710$@1@s1@1@$@25#uentry_directParamNo
-^5162 14678$@0@s1@1@s1$@0#usymtab_newCase
-^5163 14666$@0@s1@1@s1$@0#usymtab_switchBranch
+^5153 14760$@1@s1@1@$@0#usymtab_existsGlobEither
+^5154 14628$@1@s1@1@$@0#usymtab_isBoolType
+^5155 14630@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_getTypeEntryName
+^5156 14624@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_getTypeEntry
+^5157 14592$@1@s1@1@s1,p0$@0#usymtab_supAbstractTypeEntry
+^5158 14596$@1@s1@1@s1,p0$@0#usymtab_supForwardTypeEntry
+^5159 14586@6@5@1@0@0@1@s1@1@s1,p0@19@2@0#usymtab_supGlobalEntryReturn
+^5160 14584@6@5@1@0@0@1@s1@1@s1,p0@19@2@0#usymtab_supEntrySrefReturn
+^5161 14702$@1@s1@1@$@25#uentry_directParamNo
+^5162 14670$@0@s1@1@s1$@0#usymtab_newCase
+^5163 14658$@0@s1@1@s1$@0#usymtab_switchBranch
 ^5164 5294@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_unparseStack
-^5165 14682$@0@s1@1@s1$@0#usymtab_exitSwitch
-^5166 14744@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupGlobSafe
-^5167 14842@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_aliasedBy
-^5168 14840@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_canAlias
-^5169 14836$@0@s1@1@s1,p0$@0#usymtab_clearAlias
-^5170 14832$@0@s1@1@s1$@0#usymtab_addMustAlias
-^5171 14834$@0@s1@1@s1$@0#usymtab_addForceMustAlias
+^5165 14674$@0@s1@1@s1$@0#usymtab_exitSwitch
+^5166 14736@6@5@1@0@0@1@s1@1@@19@3@0#usymtab_lookupGlobSafe
+^5167 14834@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_aliasedBy
+^5168 14832@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_canAlias
+^5169 14828$@0@s1@1@s1,p0$@0#usymtab_clearAlias
+^5170 14824$@0@s1@1@s1$@0#usymtab_addMustAlias
+^5171 14826$@0@s1@1@s1$@0#usymtab_addForceMustAlias
 ^5172 5310@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_unparseAliases
-^5173 14610@6@5@1@0@0@1@s1@1@s1,p0@19@2@0#usymtab_supReturnFileEntry
-^5174 14550$@1@s1@1@$@0#usymtab_isAltDefinitelyNullDeep
-^5175 14762$@1@s1@1@$@0#usymtab_existsReal
-^5176 14838@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_allAliases
-^5177 14696$@1@s1@1@s1$@0#usymtab_exportLocal
+^5173 14602@6@5@1@0@0@1@s1@1@s1,p0@19@2@0#usymtab_supReturnFileEntry
+^5174 14542$@1@s1@1@$@0#usymtab_isAltDefinitelyNullDeep
+^5175 14754$@1@s1@1@$@0#usymtab_existsReal
+^5176 14830@6@5@1@0@0@1@s1@1@@2@0@0#usymtab_allAliases
+^5177 14688$@1@s1@1@s1$@0#usymtab_exportLocal
 ^5178 5322$@0@s1@1@s1$@0#usymtab_popCaseBranch
 *1 (Constant)
 ^5179 5$#globScope#fileScope#paramsScope#functionScope
 ^5183 1064@i0@0@4#usymtab_undefined
 *4 (Function)
-^5184 14864$@1@s1,g2675@0@0@1@tg2675,p0$@0#usymtab_checkDistinctName
-^5185 14866@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_lookupGlobalMarker
-^5186 14490$@1@s1@1@$@0#usymtab_getCurrentDepth
+^5184 14856$@1@s1,g2675@0@0@1@tg2675,p0$@0#usymtab_checkDistinctName
+^5185 14858@6@5@1@0@0@1@s1@1@@19@2@0#usymtab_lookupGlobalMarker
+^5186 14482$@1@s1@1@$@0#usymtab_getCurrentDepth
 *2 (Enum member)
 ^5187 5331$#CT_UNKNOWN#CT_PRIM#CT_USER#CT_ABST#CT_ENUM#CT_PTR#CT_ARRAY#CT_FIXEDARRAY#CT_FCN#CT_STRUCT#CT_UNION#CT_ENUMLIST#CT_BOOL#CT_CONJ#CT_EXPFCN
 *9 (Enum tag)
@@ -25908,134 +25900,134 @@
 *1 (Constant)
 ^5222 1213$#ctype_undefined#ctype_dne#ctype_unknown#ctype_void#ctype_char#ctype_uchar#ctype_double#ctype_ldouble#ctype_float#ctype_int#ctype_uint#ctype_sint#ctype_lint#ctype_usint#ctype_ulint#ctype_llint#ctype_ullint#ctype_bool#ctype_string#ctype_anyintegral#ctype_unsignedintegral#ctype_signedintegral#ctype_voidPointer
 *4 (Function)
-^5245 12644$$$@0#ctype_forceRealType
-^5246 12792$$$@0#ctype_forceMatch
-^5247 12782$$$@0#ctype_genMatch
-^5248 12642$^$@0#ctype_isSimple
-^5249 12652$^$@0#ctype_isAbstract
-^5250 12800$^$@0#ctype_isArray
-^5251 12804$^$@0#ctype_isFixedArray
-^5252 12802$^$@0#ctype_isIncompleteArray
-^5253 12806$^$@0#ctype_isArrayPtr
-^5254 12712$^$@0#ctype_isBool
-^5255 12710$^$@0#ctype_isManifestBool
-^5256 12704$^$@0#ctype_isChar
-^5257 12706$^$@0#ctype_isUnsignedChar
-^5258 12708$^$@0#ctype_isSignedChar
-^5259 12702$^$@0#ctype_isString
-^5260 12766$^$@0#ctype_isConj
-^5261 12714$^$@0#ctype_isDirectBool
-^5262 12744$^$@0#ctype_isDirectInt
-^5263 12832$^$@0#ctype_isEnum
-^5264 12688$^$@0#ctype_isExpFcn
-^5265 12828$^$@0#ctype_isFirstVoid
-^5266 12756$^$@0#ctype_isForceRealBool
-^5267 12754$^$@0#ctype_isForceRealInt
-^5268 12752$^$@0#ctype_isForceRealNumeric
-^5269 12686$^$@0#ctype_isFunction
-^5270 12692$^$@0#ctype_isArbitraryIntegral
-^5271 12694$^$@0#ctype_isUnsignedIntegral
-^5272 12696$^$@0#ctype_isSignedIntegral
-^5273 12698$^$@0#ctype_isInt
-^5274 12700$^$@0#ctype_isRegularInt
-^5275 12858$^$@0#ctype_isMutable
-^5276 12654$^$@0#ctype_isImmutableAbstract
-^5277 12724$^$@0#ctype_isNumeric
-^5278 12798$^$@0#ctype_isPointer
-^5279 12716$^$@0#ctype_isReal
-^5280 12718$^$@0#ctype_isFloat
-^5281 12720$^$@0#ctype_isDouble
-^5282 12722$^$@0#ctype_isSigned
-^5283 12872$^$@0#ctype_isUnsigned
-^5284 12740$^$@0#ctype_isRealAP
-^5285 12656$^$@0#ctype_isRealAbstract
-^5286 12738$^$@0#ctype_isRealArray
-^5287 12732$^$@0#ctype_isRealBool
-^5288 12742$^$@0#ctype_isRealFunction
-^5289 12728$^$@0#ctype_isRealInt
-^5290 12726$^$@0#ctype_isRealNumeric
-^5291 12734$^$@0#ctype_isRealPointer
-^5292 12736$^$@0#ctype_isRealSU
-^5293 12730$^$@0#ctype_isRealVoid
-^5294 12836$^$@0#ctype_isStruct
-^5295 12842$^$@0#ctype_isStructorUnion
-^5296 12648$^$@0#ctype_isUA
-^5297 12838$^$@0#ctype_isUnion
-^5298 12690$^$@0#ctype_isVoid
-^5299 12796$^$@0#ctype_isVoidPointer
-^5300 12862$^$@0#ctype_isVisiblySharable
-^5301 12790$^$@0#ctype_match
-^5302 12794$^$@0#ctype_matchArg
-^5303 12784$^$@0#ctype_sameName
-^5304 12820@6@5@1@0@0^@2@0@0#ctype_dump
-^5305 12834@6@5@1@0@0^@19@3@0#ctype_enumTag
-^5306 12812@6@5@1@0@0^@19@3@0#ctype_unparse
-^5307 12816@6@5@1@0@0^@19@3@0#ctype_unparseDeep
-^5308 12814@6@5@1@0@0^@19@3@0#ctype_unparseSafe
-^5309 12618$^$@0#ctkind_fromInt
-^5310 12788$^$@0#ctype_matchDef
-^5311 12818$$$@0#ctype_undump
-^5312 12824$$$@0#ctype_adjustPointers
-^5313 12664$^$@0#ctype_baseArrayPtr
-^5314 12864$$$@0#ctype_combine
-^5315 12636$^$@0#ctype_createAbstract
-^5316 12830$$$@0#ctype_createEnum
-^5317 12852$^$@0#ctype_createForwardStruct
-^5318 12854$^$@0#ctype_createForwardUnion
-^5319 12774$$$@0#ctype_createStruct
-^5320 12778$$$@0#ctype_createUnion
-^5321 12846$$$@0#ctype_createUnnamedStruct
-^5322 12848$$$@0#ctype_createUnnamedUnion
-^5323 12634$$$@0#ctype_createUser
-^5324 12850$^$@0#ctype_isUnnamedSU
-^5325 12650$^$@0#ctype_isUser
-^5326 12682$$$@0#ctype_expectFunction
-^5327 12844$$$@0#ctype_fixArrayPtr
-^5328 12822$^$@0#ctype_getBaseType
-^5329 12662$$$@0#ctype_makeArray
-^5330 12660$$$@0#ctype_makeFixedArray
-^5331 12764$$$@0#ctype_makeConj
-^5332 12676$$$@0#ctype_makeParamsFunction
-^5333 12680$^$@0#ctype_makeFunction
-^5334 12678$^$@0#ctype_makeNFParamsFunction
-^5335 12658$$$@0#ctype_makePointer
-^5336 12684$$$@0#ctype_makeRawFunction
-^5337 12670$^$@0#ctype_newBase
-^5338 12640$^$@0#ctype_realType
-^5339 12646$^$@0#ctype_realishType
-^5340 12856$^$@0#ctype_removePointers
-^5341 12866$^$@0#ctype_resolve
-^5342 12840$^$@0#ctype_resolveNumerics
-^5343 12666$^$@0#ctype_getReturnType
-^5344 12860$^$@0#ctype_isRefCounted
-^5345 12668@6@5@1@0@0^@19@3@0#ctype_argsFunction
-^5346 12826$^@19@3@0#ctype_elist
-^5347 12776@6@5@1@0@0^@19@3@0#ctype_getFields
-^5348 12674$^$@0#ctype_compare
-^5349 12638$$$@0#ctype_count
-^5350 12760$$$@0#ctype_makeExplicitConj
-^5351 12808$$$@0#ctype_typeId
-^5352 12868$$$@0#ctype_fromQual
-^5353 12870$$$@0#ctype_isAnyFloat
-^5354 12880$$$@0#ctype_isStackAllocated
+^5245 12636$$$@0#ctype_forceRealType
+^5246 12784$$$@0#ctype_forceMatch
+^5247 12774$$$@0#ctype_genMatch
+^5248 12634$^$@0#ctype_isSimple
+^5249 12644$^$@0#ctype_isAbstract
+^5250 12792$^$@0#ctype_isArray
+^5251 12796$^$@0#ctype_isFixedArray
+^5252 12794$^$@0#ctype_isIncompleteArray
+^5253 12798$^$@0#ctype_isArrayPtr
+^5254 12704$^$@0#ctype_isBool
+^5255 12702$^$@0#ctype_isManifestBool
+^5256 12696$^$@0#ctype_isChar
+^5257 12698$^$@0#ctype_isUnsignedChar
+^5258 12700$^$@0#ctype_isSignedChar
+^5259 12694$^$@0#ctype_isString
+^5260 12758$^$@0#ctype_isConj
+^5261 12706$^$@0#ctype_isDirectBool
+^5262 12736$^$@0#ctype_isDirectInt
+^5263 12824$^$@0#ctype_isEnum
+^5264 12680$^$@0#ctype_isExpFcn
+^5265 12820$^$@0#ctype_isFirstVoid
+^5266 12748$^$@0#ctype_isForceRealBool
+^5267 12746$^$@0#ctype_isForceRealInt
+^5268 12744$^$@0#ctype_isForceRealNumeric
+^5269 12678$^$@0#ctype_isFunction
+^5270 12684$^$@0#ctype_isArbitraryIntegral
+^5271 12686$^$@0#ctype_isUnsignedIntegral
+^5272 12688$^$@0#ctype_isSignedIntegral
+^5273 12690$^$@0#ctype_isInt
+^5274 12692$^$@0#ctype_isRegularInt
+^5275 12850$^$@0#ctype_isMutable
+^5276 12646$^$@0#ctype_isImmutableAbstract
+^5277 12716$^$@0#ctype_isNumeric
+^5278 12790$^$@0#ctype_isPointer
+^5279 12708$^$@0#ctype_isReal
+^5280 12710$^$@0#ctype_isFloat
+^5281 12712$^$@0#ctype_isDouble
+^5282 12714$^$@0#ctype_isSigned
+^5283 12864$^$@0#ctype_isUnsigned
+^5284 12732$^$@0#ctype_isRealAP
+^5285 12648$^$@0#ctype_isRealAbstract
+^5286 12730$^$@0#ctype_isRealArray
+^5287 12724$^$@0#ctype_isRealBool
+^5288 12734$^$@0#ctype_isRealFunction
+^5289 12720$^$@0#ctype_isRealInt
+^5290 12718$^$@0#ctype_isRealNumeric
+^5291 12726$^$@0#ctype_isRealPointer
+^5292 12728$^$@0#ctype_isRealSU
+^5293 12722$^$@0#ctype_isRealVoid
+^5294 12828$^$@0#ctype_isStruct
+^5295 12834$^$@0#ctype_isStructorUnion
+^5296 12640$^$@0#ctype_isUA
+^5297 12830$^$@0#ctype_isUnion
+^5298 12682$^$@0#ctype_isVoid
+^5299 12788$^$@0#ctype_isVoidPointer
+^5300 12854$^$@0#ctype_isVisiblySharable
+^5301 12782$^$@0#ctype_match
+^5302 12786$^$@0#ctype_matchArg
+^5303 12776$^$@0#ctype_sameName
+^5304 12812@6@5@1@0@0^@2@0@0#ctype_dump
+^5305 12826@6@5@1@0@0^@19@3@0#ctype_enumTag
+^5306 12804@6@5@1@0@0^@19@3@0#ctype_unparse
+^5307 12808@6@5@1@0@0^@19@3@0#ctype_unparseDeep
+^5308 12806@6@5@1@0@0^@19@3@0#ctype_unparseSafe
+^5309 12610$^$@0#ctkind_fromInt
+^5310 12780$^$@0#ctype_matchDef
+^5311 12810$$$@0#ctype_undump
+^5312 12816$$$@0#ctype_adjustPointers
+^5313 12656$^$@0#ctype_baseArrayPtr
+^5314 12856$$$@0#ctype_combine
+^5315 12628$^$@0#ctype_createAbstract
+^5316 12822$$$@0#ctype_createEnum
+^5317 12844$^$@0#ctype_createForwardStruct
+^5318 12846$^$@0#ctype_createForwardUnion
+^5319 12766$$$@0#ctype_createStruct
+^5320 12770$$$@0#ctype_createUnion
+^5321 12838$$$@0#ctype_createUnnamedStruct
+^5322 12840$$$@0#ctype_createUnnamedUnion
+^5323 12626$$$@0#ctype_createUser
+^5324 12842$^$@0#ctype_isUnnamedSU
+^5325 12642$^$@0#ctype_isUser
+^5326 12674$$$@0#ctype_expectFunction
+^5327 12836$$$@0#ctype_fixArrayPtr
+^5328 12814$^$@0#ctype_getBaseType
+^5329 12654$$$@0#ctype_makeArray
+^5330 12652$$$@0#ctype_makeFixedArray
+^5331 12756$$$@0#ctype_makeConj
+^5332 12668$$$@0#ctype_makeParamsFunction
+^5333 12672$^$@0#ctype_makeFunction
+^5334 12670$^$@0#ctype_makeNFParamsFunction
+^5335 12650$$$@0#ctype_makePointer
+^5336 12676$$$@0#ctype_makeRawFunction
+^5337 12662$^$@0#ctype_newBase
+^5338 12632$^$@0#ctype_realType
+^5339 12638$^$@0#ctype_realishType
+^5340 12848$^$@0#ctype_removePointers
+^5341 12858$^$@0#ctype_resolve
+^5342 12832$^$@0#ctype_resolveNumerics
+^5343 12658$^$@0#ctype_getReturnType
+^5344 12852$^$@0#ctype_isRefCounted
+^5345 12660@6@5@1@0@0^@19@3@0#ctype_argsFunction
+^5346 12818$^@19@3@0#ctype_elist
+^5347 12768@6@5@1@0@0^@19@3@0#ctype_getFields
+^5348 12666$^$@0#ctype_compare
+^5349 12630$$$@0#ctype_count
+^5350 12752$$$@0#ctype_makeExplicitConj
+^5351 12800$$$@0#ctype_typeId
+^5352 12860$$$@0#ctype_fromQual
+^5353 12862$$$@0#ctype_isAnyFloat
+^5354 12872$$$@0#ctype_isStackAllocated
 *1 (Constant)
 ^5355 1213$#ctype_missingParamsMarker
 *4 (Function)
-^5356 12786$$$@0#ctype_almostEqual
+^5356 12778$$$@0#ctype_almostEqual
 *1 (Constant)
 ^5357 1213$#ctype_elipsMarker
 *4 (Function)
-^5358 12810@6@5@1@0@0$@3@0@0#ctype_unparseDeclaration
-^5359 12672$^$@0#ctype_sameAltTypes
-^5360 12626$$$@0#ctype_dumpTable
-^5361 12624$$$@0#ctype_loadTable
+^5358 12802@6@5@1@0@0$@3@0@0#ctype_unparseDeclaration
+^5359 12664$^$@0#ctype_sameAltTypes
+^5360 12618$$$@0#ctype_dumpTable
+^5361 12616$$$@0#ctype_loadTable
 ^5362 5594$$$@0#ctype_destroyMod
 ^5363 5596$$$@0#ctype_initTable
 ^5364 5598@6@5@1@0@0$@2@0@0#ctype_unparseTable
 ^5365 5600$$$@0#ctype_printTable
-^5366 12886$^$@0#ctype_widest
-^5367 12894$$$@0#ctype_getArraySize
-^5368 12632$^$@0#ctype_isUserBool
+^5366 12878$^$@0#ctype_widest
+^5367 12886$$$@0#ctype_getArraySize
+^5368 12624$^$@0#ctype_isUserBool
 *7 (Struct tag)
 ^5369 5607@5608#@!156
 *0 (Datatype)
@@ -26043,40 +26035,40 @@
 *1 (Constant)
 ^5371 5610@i0@0@4#qtype_undefined
 *4 (Function)
-^5372 12099@6@5@1@0@0$$@0#qtype_addQualList
-^5373 12103@6@5@1@0@0$$@0#qtype_mergeImplicitAlt
-^5374 12119@6@5@1@0@0$@2@0@0#qtype_copy
-^5375 12091@6@2@1@0@0^@3@0@0#qtype_create
+^5372 12091@6@5@1@0@0$$@0#qtype_addQualList
+^5373 12095@6@5@1@0@0$$@0#qtype_mergeImplicitAlt
+^5374 12111@6@5@1@0@0$@2@0@0#qtype_copy
+^5375 12083@6@2@1@0@0^@3@0@0#qtype_create
 ^5376 5630@6@5@1@0@0^@2@0@0#qtype_unknown
-^5377 12097@6@5@1@0@0$$@0#qtype_addQual
-^5378 12107@6@5@1@0@0$$@0#qtype_combine
-^5379 12105@6@5@1@0@0$$@0#qtype_mergeAlt
-^5380 12109@6@5@1@0@0$$@0#qtype_resolve
-^5381 12117$$$@0#qtype_adjustPointers
-^5382 12111@6@5@1@0@0^@2@0@0#qtype_unparse
-^5383 12113@6@5@1@0@0$$@0#qtype_newBase
-^5384 12115@6@5@1@0@0$$@0#qtype_newQbase
-^5385 12093$$$@0#qtype_free
+^5377 12089@6@5@1@0@0$$@0#qtype_addQual
+^5378 12099@6@5@1@0@0$$@0#qtype_combine
+^5379 12097@6@5@1@0@0$$@0#qtype_mergeAlt
+^5380 12101@6@5@1@0@0$$@0#qtype_resolve
+^5381 12109$$$@0#qtype_adjustPointers
+^5382 12103@6@5@1@0@0^@2@0@0#qtype_unparse
+^5383 12105@6@5@1@0@0$$@0#qtype_newBase
+^5384 12107@6@5@1@0@0$$@0#qtype_newQbase
+^5385 12085$$$@0#qtype_free
 *1 (Constant)
 ^5386 1061@i0@0@4#idDecl_undefined
 *4 (Function)
-^5387 13102$$$@0#idDecl_free
-^5388 13100@6@5@1@0@0$@2@0@0#idDecl_create
-^5389 13098@6@5@1@0@0$@2@0@0#idDecl_createClauses
-^5390 13104@6@5@1@0@0$@2@0@0#idDecl_unparse
-^5391 13106@6@5@1@0@0$@2@0@0#idDecl_unparseC
-^5392 13110@6@5@1@0@0$@19@2@0#idDecl_getTyp
-^5393 13120$$$@0#idDecl_setTyp
-^5394 13128@6@5@1@0@0$$@0#idDecl_expectFunction
-^5395 13122@6@5@1@0@0$$@0#idDecl_replaceCtype
-^5396 13124@6@5@1@0@0$$@0#idDecl_fixBase
-^5397 13126@6@5@1@0@0$$@0#idDecl_fixParamBase
-^5398 13130$@0@@1@p0$@0#idDecl_addClauses
-^5399 13112$^$@0#idDecl_getCtype
-^5400 13114@6@5@1@0@0^@19@2@0#idDecl_getQuals
-^5401 13116@6@5@1@0@0^@19@2@0#idDecl_getClauses
-^5402 13108@6@5@1@0@0^@19@3@0#idDecl_observeId
-^5403 13118$$$@0#idDecl_addQual
+^5387 13094$$$@0#idDecl_free
+^5388 13092@6@5@1@0@0$@2@0@0#idDecl_create
+^5389 13090@6@5@1@0@0$@2@0@0#idDecl_createClauses
+^5390 13096@6@5@1@0@0$@2@0@0#idDecl_unparse
+^5391 13098@6@5@1@0@0$@2@0@0#idDecl_unparseC
+^5392 13102@6@5@1@0@0$@19@2@0#idDecl_getTyp
+^5393 13112$$$@0#idDecl_setTyp
+^5394 13120@6@5@1@0@0$$@0#idDecl_expectFunction
+^5395 13114@6@5@1@0@0$$@0#idDecl_replaceCtype
+^5396 13116@6@5@1@0@0$$@0#idDecl_fixBase
+^5397 13118@6@5@1@0@0$$@0#idDecl_fixParamBase
+^5398 13122$@0@@1@p0$@0#idDecl_addClauses
+^5399 13104$^$@0#idDecl_getCtype
+^5400 13106@6@5@1@0@0^@19@2@0#idDecl_getQuals
+^5401 13108@6@5@1@0@0^@19@2@0#idDecl_getClauses
+^5402 13100@6@5@1@0@0^@19@3@0#idDecl_observeId
+^5403 13110$$$@0#idDecl_addQual
 *2 (Enum member)
 ^5404 5688$#MVLONG#MVCHAR#MVDOUBLE#MVSTRING
 *9 (Enum tag)
@@ -26092,26 +26084,26 @@
 *1 (Constant)
 ^5413 5696@i0@0@6#multiVal_undefined
 *4 (Function)
-^5414 14890@6@5@1@0@0^@18@3@0#multiVal_forceString
-^5415 14888$^$@0#multiVal_forceDouble
-^5416 14886$^$@0#multiVal_forceChar
-^5417 14884$^$@0#multiVal_forceInt
-^5418 14878@6@5@1@0@0^@2@0@0#multiVal_makeString
-^5419 14876@6@5@1@0@0^@2@0@0#multiVal_makeDouble
-^5420 14874@6@5@1@0@0^@2@0@0#multiVal_makeChar
-^5421 14872@6@5@1@0@0^@2@0@0#multiVal_makeInt
+^5414 14882@6@5@1@0@0^@18@3@0#multiVal_forceString
+^5415 14880$^$@0#multiVal_forceDouble
+^5416 14878$^$@0#multiVal_forceChar
+^5417 14876$^$@0#multiVal_forceInt
+^5418 14870@6@5@1@0@0^@2@0@0#multiVal_makeString
+^5419 14868@6@5@1@0@0^@2@0@0#multiVal_makeDouble
+^5420 14866@6@5@1@0@0^@2@0@0#multiVal_makeChar
+^5421 14864@6@5@1@0@0^@2@0@0#multiVal_makeInt
 ^5422 5720@6@5@1@0@0^@2@0@0#multiVal_unknown
-^5423 14880@6@5@1@0@0^@2@0@0#multiVal_copy
-^5424 14908$$$@0#multiVal_free
-^5425 14882@6@5@1@0@0^@3@0@0#multiVal_invert
-^5426 14892@6@0@1@0@54^$@0#multiVal_isInt
-^5427 14894@6@0@1@0@54^$@0#multiVal_isChar
-^5428 14896@6@0@1@0@54^$@0#multiVal_isDouble
-^5429 14898@6@0@1@0@54^$@0#multiVal_isString
-^5430 14904@6@5@1@0@0@0@@1@tp0@2@0@0#multiVal_undump
-^5431 14902@6@5@1@0@0^@2@0@0#multiVal_dump
-^5432 14900@6@5@1@0@0^@2@0@0#multiVal_unparse
-^5433 14906$^$@0#multiVal_compare
+^5423 14872@6@5@1@0@0^@2@0@0#multiVal_copy
+^5424 14900$$$@0#multiVal_free
+^5425 14874@6@5@1@0@0^@3@0@0#multiVal_invert
+^5426 14884@6@0@1@0@54^$@0#multiVal_isInt
+^5427 14886@6@0@1@0@54^$@0#multiVal_isChar
+^5428 14888@6@0@1@0@54^$@0#multiVal_isDouble
+^5429 14890@6@0@1@0@54^$@0#multiVal_isString
+^5430 14896@6@5@1@0@0@0@@1@tp0@2@0@0#multiVal_undump
+^5431 14894@6@5@1@0@0^@2@0@0#multiVal_dump
+^5432 14892@6@5@1@0@0^@2@0@0#multiVal_unparse
+^5433 14898$^$@0#multiVal_compare
 *2 (Enum member)
 ^5434 5745$#SP_USES#SP_DEFINES#SP_ALLOCATES#SP_RELEASES#SP_SETS#SP_QUAL#SP_GLOBAL
 *9 (Enum tag)
@@ -26126,59 +26118,59 @@
 ^5447 5749@-@-@0@0@0@0@5750#stateConstraint
 ^5448 1136@-@+@0@0@2@0@5752#o_stateClause
 *4 (Function)
-^5449 12173@6@5@1@0@0^@3@0@0#stateClause_unparse
-^5450 12143@6@5@1@0@0^@3@0@0#stateClause_getEffectFunction
-^5451 12201@6@5@1@0@0^@3@0@0#stateClause_getEnsuresFunction
-^5452 12203@6@5@1@0@0^@3@0@0#stateClause_getRequiresBodyFunction
-^5453 12199$^$@0#stateClause_getStateParameter
-^5454 12145@6@5@1@0@0^@3@0@0#stateClause_getReturnEffectFunction
-^5455 12141@6@5@1@0@0^@3@0@0#stateClause_getEntryFunction
-^5456 12127$^$@0#stateClause_isBefore
-^5457 12125$^$@0#stateClause_isBeforeOnly
-^5458 12129$^$@0#stateClause_isAfter
-^5459 12131$^$@0#stateClause_isEnsures
-^5460 12165$^$@0#stateClause_sameKind
-^5461 12149$^$@0#stateClause_preErrorCode
-^5462 12153@6@5@1@0@0^@19@3@0#stateClause_preErrorString
-^5463 12155$^$@0#stateClause_postErrorCode
-^5464 12157@6@5@1@0@0^@19@3@0#stateClause_postErrorString
-^5465 12135$^@3@0@0#stateClause_getPreTestFunction
-^5466 12137$^@3@0@0#stateClause_getPostTestFunction
-^5467 12139$^@3@0@0#stateClause_getPostTestShower
-^5468 12123$^@3@0@0#stateClause_create
-^5469 12183$^@3@0@0#stateClause_createPlain
-^5470 12175$^@3@0@0#stateClause_createDefines
-^5471 12177$^@3@0@0#stateClause_createUses
-^5472 12185$^@3@0@0#stateClause_createAllocates
-^5473 12181$^@3@0@0#stateClause_createReleases
-^5474 12179$^@3@0@0#stateClause_createSets
-^5475 12205@6@5@1@0@0^@19@3@0#stateClause_loc
-^5476 12133$^$@0#stateClause_isMemoryAllocation
-^5477 12167$$$@0#stateClause_free
-^5478 12159@6@5@1@0@0^@3@0@0#stateClause_dump
-^5479 12161$@0@@1@tp0@3@0@0#stateClause_undump
-^5480 12163$^@3@0@0#stateClause_copy
-^5481 12187$^$@0#stateClause_matchKind
-^5482 12189$^$@0#stateClause_hasEnsures
-^5483 12191$^$@0#stateClause_hasRequires
-^5484 12193$^$@0#stateClause_setsMetaState
-^5485 12195$^$@0#stateClause_getMetaQual
-^5486 12228$@0@g2675@0@0@1@p0,g2675$@0#stateClauseList_checkAll
+^5449 12165@6@5@1@0@0^@3@0@0#stateClause_unparse
+^5450 12135@6@5@1@0@0^@3@0@0#stateClause_getEffectFunction
+^5451 12193@6@5@1@0@0^@3@0@0#stateClause_getEnsuresFunction
+^5452 12195@6@5@1@0@0^@3@0@0#stateClause_getRequiresBodyFunction
+^5453 12191$^$@0#stateClause_getStateParameter
+^5454 12137@6@5@1@0@0^@3@0@0#stateClause_getReturnEffectFunction
+^5455 12133@6@5@1@0@0^@3@0@0#stateClause_getEntryFunction
+^5456 12119$^$@0#stateClause_isBefore
+^5457 12117$^$@0#stateClause_isBeforeOnly
+^5458 12121$^$@0#stateClause_isAfter
+^5459 12123$^$@0#stateClause_isEnsures
+^5460 12157$^$@0#stateClause_sameKind
+^5461 12141$^$@0#stateClause_preErrorCode
+^5462 12145@6@5@1@0@0^@19@3@0#stateClause_preErrorString
+^5463 12147$^$@0#stateClause_postErrorCode
+^5464 12149@6@5@1@0@0^@19@3@0#stateClause_postErrorString
+^5465 12127$^@3@0@0#stateClause_getPreTestFunction
+^5466 12129$^@3@0@0#stateClause_getPostTestFunction
+^5467 12131$^@3@0@0#stateClause_getPostTestShower
+^5468 12115$^@3@0@0#stateClause_create
+^5469 12175$^@3@0@0#stateClause_createPlain
+^5470 12167$^@3@0@0#stateClause_createDefines
+^5471 12169$^@3@0@0#stateClause_createUses
+^5472 12177$^@3@0@0#stateClause_createAllocates
+^5473 12173$^@3@0@0#stateClause_createReleases
+^5474 12171$^@3@0@0#stateClause_createSets
+^5475 12197@6@5@1@0@0^@19@3@0#stateClause_loc
+^5476 12125$^$@0#stateClause_isMemoryAllocation
+^5477 12159$$$@0#stateClause_free
+^5478 12151@6@5@1@0@0^@3@0@0#stateClause_dump
+^5479 12153$@0@@1@tp0@3@0@0#stateClause_undump
+^5480 12155$^@3@0@0#stateClause_copy
+^5481 12179$^$@0#stateClause_matchKind
+^5482 12181$^$@0#stateClause_hasEnsures
+^5483 12183$^$@0#stateClause_hasRequires
+^5484 12185$^$@0#stateClause_setsMetaState
+^5485 12187$^$@0#stateClause_getMetaQual
+^5486 12220$@0@g2675@0@0@1@p0,g2675$@0#stateClauseList_checkAll
 *1 (Constant)
 ^5487 1139@i0@0@4#stateClauseList_undefined
 *4 (Function)
-^5488 12171@6@5@1@0@0^@3@0@85#stateClause_unparseKind
-^5489 12212@6@5@1@0@0@0@@1@p0$@0#stateClauseList_add
-^5490 12214@6@5@1@0@0^@3@0@0#stateClauseList_unparse
-^5491 12218$$$@0#stateClauseList_free
-^5492 12216@6@5@1@0@0^@2@0@0#stateClauseList_copy
-^5493 12220@6@5@1@0@0^@3@0@0#stateClauseList_dump
-^5494 12222@6@5@1@0@0@0@@1@tp0@3@0@0#stateClauseList_undump
-^5495 12224$^$@0#stateClauseList_compare
+^5488 12163@6@5@1@0@0^@3@0@85#stateClause_unparseKind
+^5489 12204@6@5@1@0@0@0@@1@p0$@0#stateClauseList_add
+^5490 12206@6@5@1@0@0^@3@0@0#stateClauseList_unparse
+^5491 12210$$$@0#stateClauseList_free
+^5492 12208@6@5@1@0@0^@2@0@0#stateClauseList_copy
+^5493 12212@6@5@1@0@0^@3@0@0#stateClauseList_dump
+^5494 12214@6@5@1@0@0@0@@1@tp0@3@0@0#stateClauseList_undump
+^5495 12216$^$@0#stateClauseList_compare
 *1 (Constant)
 ^5496 5$#stateClauseListBASESIZE
 *4 (Function)
-^5497 12230$@0@g2675@0@0@1@g2675$@0#stateClauseList_checkEqual
+^5497 12222$@0@g2675@0@0@1@g2675$@0#stateClauseList_checkEqual
 *6 (Iterator finalizer)
 ^5498 0@87#end_stateClauseList_elements
 *5 (Iterator)
@@ -26252,229 +26244,229 @@
 *1 (Constant)
 ^5555 1050@i0@0@4#uentry_undefined
 *4 (Function)
-^5556 11634$$$@0#uentry_compareStrict
+^5556 11626$$$@0#uentry_compareStrict
 *1 (Constant)
 ^5557 5$#PARAMUNKNOWN
 *4 (Function)
-^5558 11710$^$@0#uentry_isMaybeAbstract
-^5559 11704$@0@@1@p0$@0#uentry_setAbstract
-^5560 11706$@0@@1@p0$@0#uentry_setConcrete
-^5561 11992$@0@@1@p0$@0#uentry_setHasNameError
-^5562 11582$^$@0#uentry_isForward
-^5563 11496@6@0@1@0@54^$@0#uentry_isFileStatic
-^5564 11498@6@0@1@0@54^$@0#uentry_isExported
-^5565 11520$^$@0#uentry_isSpecialFunction
-^5566 11510$^$@0#uentry_isMessageLike
-^5567 11508$^$@0#uentry_isScanfLike
-^5568 11506$^$@0#uentry_isPrintfLike
-^5569 11518$@0@@1@p0$@0#uentry_setMessageLike
-^5570 11516$@0@@1@p0$@0#uentry_setScanfLike
-^5571 11514$@0@@1@p0$@0#uentry_setPrintfLike
-^5572 11994$@0@g2675@0@0@1@g2675,p0$@0#uentry_checkName
-^5573 11570$@0@@1@p0$@0#uentry_addAccessType
-^5574 11882$@0@g2675@0@0@1@g2675$@0#uentry_showWhereAny
-^5575 11426$$$@0#uentry_checkParams
-^5576 11960$$$@0#uentry_mergeUses
-^5577 11444$$$@0#uentry_setExtern
-^5578 11978$$$@0#uentry_setUsed
-^5579 11534$$$@0#uentry_setDefState
-^5580 11930$$$@0#uentry_mergeConstantValue
-^5581 11786@6@5@1@0@0^@19@3@0#uentry_whereEarliest
-^5582 11764@6@5@1@0@0^@19@3@0#uentry_rawName
-^5583 11784@6@5@1@0@0^@19@3@0#uentry_whereDeclared
-^5584 11628$^$@0#uentry_equiv
-^5585 11750@6@0@1@0@54^$@0#uentry_hasName
-^5586 11752@6@0@1@0@54^$@0#uentry_hasRealName
-^5587 11708@6@0@1@0@54^$@0#uentry_isAbstractDatatype
-^5588 11622@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isAnyTag
-^5589 11702@6@0@1@0@54^$@0#uentry_isDatatype
-^5590 11804@6@0@1@0@54^$@0#uentry_isCodeDefined
-^5591 11806@6@0@1@0@54^$@0@S:2.0.0.fwhereDeclared.tp0$#uentry_isDeclared
-^5592 11988@6@5@1@0@0^@19@3@0#uentry_ekindName
-^5593 11990@6@5@1@0@0^@19@3@0#uentry_ekindNameLC
-^5594 11884$$$@0#uentry_showWhereDefined
-^5595 11746@6@0@1@0@54^$@0#uentry_isEndIter
-^5596 11620@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isEnumTag
-^5597 11700@6@0@1@0@54^$@0#uentry_isFakeTag
-^5598 11744@6@0@1@0@54^$@0#uentry_isIter
-^5599 11712@6@0@1@0@54^$@0#uentry_isMutableDatatype
-^5600 11716@6@0@1@0@54^$@0#uentry_isParam
-^5601 11718@6@0@1@0@54^$@0#uentry_isExpandedMacro
-^5602 11720@6@0@1@0@54^$@0#uentry_isSefParam
-^5603 11724@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0,finfo.tp0$#uentry_isAnyParam
-^5604 11748@6@0@1@0@54^$@0#uentry_isRealFunction
-^5605 11694@6@0@1@0@54^$@0#uentry_isSpecified
-^5606 11616@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isStructTag
-^5607 11618@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isUnionTag
-^5608 11698@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isVar
-^5609 11692@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isVariable
-^5610 11676@6@5@1@0@0$@3@0@0#uentry_dump
-^5611 11678@6@5@1@0@0$@3@0@0#uentry_dumpParam
-^5612 11770@6@5@1@0@0^@19@3@0#uentry_observeRealName
-^5613 11768@6@5@1@0@0^@3@0@0@S:2.0.0.fukind.tp0,finfo.tp0,funame.tp0$#uentry_getName
-^5614 11684@6@5@1@0@0^@3@0@0#uentry_unparse
-^5615 11682@6@5@1@0@0^@3@0@0#uentry_unparseAbbrev
-^5616 11686@6@5@1@0@0^@3@0@0#uentry_unparseFull
-^5617 11478$@0@@1@p0$@0#uentry_setMutable
-^5618 11824$^$@0#uentry_getAbstractType
-^5619 11826$@1@s1@1@$@0#uentry_getRealType
-^5620 11774$^$@0#uentry_getType
-^5621 11758$^$@0#uentry_getKind
-^5622 11782@6@5@1@0@0^@19@3@0#uentry_whereDefined
-^5623 11780@6@5@1@0@0^@19@3@0#uentry_whereSpecified
-^5624 11636$$$@0#uentry_compare
-^5625 11808@6@5@1@0@0^@19@2@0#uentry_getSref
-^5626 11756@6@5@1@0@0^@19@3@0#uentry_getMods
-^5627 11690$^$@0#uentry_accessType
-^5628 11778@6@5@1@0@0^@19@3@0#uentry_whereEither
-^5629 11578@6@2@1@0@0^@3@0@0#uentry_makeExpandedMacro
-^5630 11926$@0@g2675@0@0@1@g2675$@0#uentry_checkMatchParam
-^5631 11660@6@5@1@0@0^@19@3@0#uentry_getStateClauseList
-^5632 11878$@0@g2675@0@0@1@g2675$@0#uentry_showWhereLastExtra
-^5633 11440$$$@0#uentry_setRefCounted
-^5634 11422@6@2@1@0@0$@2@0@0#uentry_makeUnnamedVariable
-^5635 11586@6@2@1@0@0$@3@0@0#uentry_makeUnspecFunction
-^5636 11574@6@2@1@0@0$@3@0@0#uentry_makePrivFunction2
-^5637 11418@6@2@1@0@0^@3@0@0#uentry_makeSpecEnumConstant
-^5638 11610@6@2@1@0@0^@3@0@0#uentry_makeEnumTag
-^5639 11584@6@2@1@0@0^@3@0@0#uentry_makeTypeListFunction
-^5640 11576@6@2@1@0@0$@3@0@0#uentry_makeSpecFunction
-^5641 11414@6@2@1@0@0^@3@0@0#uentry_makeEnumConstant
-^5642 11416@6@2@1@0@0^@3@0@0#uentry_makeEnumInitializedConstant
-^5643 11530@6@2@1@0@0^@2@0@0#uentry_makeConstant
-^5644 11528@6@2@1@0@0^@2@0@0#uentry_makeConstantAux
-^5645 11590@6@2@1@0@0^@2@0@0#uentry_makeDatatype
-^5646 11588@6@2@1@0@0^@2@0@0#uentry_makeDatatypeAux
-^5647 11626@6@2@1@0@0^@3@0@0#uentry_makeElipsisMarker
-^5648 11564$@0@@1@p0$@0#uentry_makeVarFunction
-^5649 11566$@0@@1@p0$@0#uentry_makeConstantFunction
-^5650 11600@6@2@1@0@0^@3@0@0#uentry_makeEndIter
-^5651 11614@6@2@1@0@0^@3@0@0#uentry_makeEnumTagLoc
-^5652 11580@6@2@1@0@0^@3@0@0#uentry_makeForwardFunction
-^5653 11572@6@2@1@0@0$@3@0@0#uentry_makeFunction
-^5654 11596@6@2@1@0@0^@3@0@0#uentry_makeIter
-^5655 11522@6@2@1@0@0^@3@0@0#uentry_makeParam
-^5656 11606@6@2@1@0@0$@3@0@0#uentry_makeStructTag
-^5657 11604@6@2@1@0@0$@3@0@0#uentry_makeStructTagLoc
-^5658 11608@6@2@1@0@0$@3@0@0#uentry_makeUnionTag
-^5659 11612@6@2@1@0@0$@3@0@0#uentry_makeUnionTagLoc
-^5660 11562@6@2@1@0@0$@3@0@0#uentry_makeVariable
-^5661 11420@6@2@1@0@0$@2@0@0#uentry_makeVariableLoc
-^5662 11526@6@2@1@0@0$@2@0@0#uentry_makeVariableParam
-^5663 11450@6@2@1@0@0$@2@0@0#uentry_makeVariableSrefParam
-^5664 11434@6@2@1@0@0$@2@0@0#uentry_makeIdFunction
-^5665 11424@6@2@1@0@0$@2@0@0#uentry_makeIdDatatype
-^5666 11592@6@2@1@0@0$@2@0@0#uentry_makeBoolDatatype
-^5667 11948$$$@0#uentry_mergeDefinition
-^5668 11942$$$@0#uentry_mergeEntries
-^5669 11830@6@5@1@0@0$@3@0@0#uentry_nameCopy
-^5670 11674@6@5@1@0@0$@3@0@0#uentry_undump
-^5671 11762@6@5@1@0@0^@19@3@0#uentry_getParams
-^5672 11816$@0@@1@p0$@0#uentry_resetParams
-^5673 11754@6@5@1@0@0^@19@3@0#uentry_getGlobs
-^5674 11736$$$@0#uentry_nullPred
-^5675 11868$$$@0#uentry_free
-^5676 11832$$$@0#uentry_setDatatype
-^5677 11802$@0@@1@p0$@0@S:2.0.0.fwhereDefined.tp0,fukind.tp0,funame.tp0,finfo.tp0$#uentry_setDefined
-^5678 11946$$$@0#uentry_checkDecl
-^5679 11944$$$@0#uentry_clearDecl
-^5680 11798$$$@0#uentry_setDeclared
-^5681 11796$$$@0#uentry_setDeclaredOnly
-^5682 11794$$$@0#uentry_setDeclaredForceOnly
-^5683 11788$$$@0#uentry_setFunctionDefined
-^5684 11812$$$@0#uentry_setName
-^5685 11820$$$@0#uentry_setParam
-^5686 11822$$$@0#uentry_setSref
-^5687 11442$$$@0#uentry_setStatic
-^5688 11460$@0@@1@p0,p1$@0#uentry_setModifies
-^5689 11464$^$@0#uentry_hasWarning
-^5690 11466$@0@@1@p0$@0#uentry_addWarning
-^5691 11456$@0@@1@p0$@0#uentry_setStateClauseList
-^5692 11814$$$@0#uentry_setType
-^5693 11908@6@5@1@0@0$@19@3@0#uentry_checkedName
-^5694 11886$@0@g2675@0@0@1@g2675$@0#uentry_showWhereLastPlain
-^5695 11892$@0@g2675@0@0@1@g2675$@0#uentry_showWhereSpecifiedExtra
-^5696 11890$@0@g2675@0@0@1@g2675$@0#uentry_showWhereSpecified
-^5697 11874$@0@g2675@0@0@1@g2675$@0#uentry_showWhereLast
-^5698 11880$@0@g2675@0@0@1@g2675$@0#uentry_showWhereDeclared
-^5699 11524@6@2@1@0@0^@2@0@0#uentry_makeIdVariable
-^5700 11956@6@5@1@0@0^@3@0@0#uentry_copy
-^5701 11870$$$@0#uentry_freeComplete
-^5702 11800$@0@@1@p0$@0#uentry_clearDefined
-^5703 11400@6@5@1@0@0^@19@3@0#uentry_specDeclName
-^5704 11976$@0@@1@p0,p1$@0#uentry_mergeState
-^5705 11958$@0@@1@p0,p1$@0#uentry_setState
-^5706 11818$@0@@1@p0$@0#uentry_setRefParam
-^5707 11792$@0@@1@p0$@0#uentry_setDeclaredForce
-^5708 11500$^$@0#uentry_isNonLocal
-^5709 11502$^$@0#uentry_isGlobalVariable
-^5710 11504$^$@0#uentry_isVisibleExternally
-^5711 11722$^$@0#uentry_isRefParam
-^5712 11654$^$@0#uentry_hasGlobs
-^5713 11662$^$@0#uentry_hasMods
-^5714 11656$^$@0#uentry_hasStateClauseList
-^5715 11658$^$@0#uentry_hasConditions
-^5716 11734$^$@0#uentry_getExitCode
-^5717 11986$$$@0#uentry_checkYieldParam
-^5718 11488$^$@0#uentry_isOnly
-^5719 11494$^$@0#uentry_isUnique
-^5720 11486$@0@@1@p0$@0#uentry_reflectQualifiers
-^5721 11728$^$@0#uentry_isOut
-^5722 11730$^$@0#uentry_isPartial
-^5723 11732$^$@0#uentry_isStateSpecial
-^5724 11738$^$@0#uentry_possiblyNull
-^5725 11828$@1@s1@1@$@0#uentry_getForceRealType
-^5726 11740$^$@0#uentry_getAliasKind
-^5727 11742$^$@0#uentry_getExpKind
-^5728 11760@6@5@1@0@0^@19@3@0#uentry_getConstantValue
-^5729 11452$@0@@1@p0$@0#uentry_fixupSref
-^5730 11568$@0@@1@p0,p1$@0#uentry_setGlobals
-^5731 11558$^$@0#uentry_isYield
-^5732 11532@6@2@1@0@0^@3@0@0#uentry_makeIdConstant
-^5733 11772@6@5@1@0@0^@19@3@0#uentry_getRealName
-^5734 11630$^$@0#uentry_xcomparealpha
-^5735 11632$^$@0#uentry_xcompareuses
-^5736 11398@6@5@1@0@0^@19@3@0#uentry_specOrDefName
-^5737 11950$$$@0#uentry_copyState
-^5738 11952$$$@0#uentry_sameKind
-^5739 11982@6@5@1@0@0$@19@2@0#uentry_returnedRef
-^5740 11980$$$@0#uentry_isReturned
-^5741 11714$$$@0#uentry_isRefCountedDatatype
-^5742 11726$$$@0#uentry_getDefState
-^5743 11672$$$@0#uentry_markFree
-^5744 11810@6@5@1@0@0$@18@0@0#uentry_getOrigSref
-^5745 11624$@1@s1@1@s1$@0#uentry_destroyMod
-^5746 11876$$$@0#uentry_showDefSpecInfo
-^5747 11866$$$@0#uentry_markOwned
-^5748 11776@6@5@1@0@0^@19@3@0#uentry_whereLast
-^5749 11446$@0@@1@p0$@0#uentry_setParamNo
-^5750 11536$^$@0#uentry_isCheckedUnknown
-^5751 11544$^$@0#uentry_isCheckedModify
-^5752 11540$^$@0#uentry_isUnchecked
-^5753 11542$^$@0#uentry_isChecked
-^5754 11538$^$@0#uentry_isCheckMod
-^5755 11546$^$@0#uentry_isCheckedStrict
-^5756 11548$@0@@1@p0$@0#uentry_setUnchecked
-^5757 11550$@0@@1@p0$@0#uentry_setChecked
-^5758 11552$@0@@1@p0$@0#uentry_setCheckMod
-^5759 11554$@0@@1@p0$@0#uentry_setCheckedStrict
-^5760 11688$$$@0#uentry_hasAccessType
+^5558 11702$^$@0#uentry_isMaybeAbstract
+^5559 11696$@0@@1@p0$@0#uentry_setAbstract
+^5560 11698$@0@@1@p0$@0#uentry_setConcrete
+^5561 11984$@0@@1@p0$@0#uentry_setHasNameError
+^5562 11574$^$@0#uentry_isForward
+^5563 11488@6@0@1@0@54^$@0#uentry_isFileStatic
+^5564 11490@6@0@1@0@54^$@0#uentry_isExported
+^5565 11512$^$@0#uentry_isSpecialFunction
+^5566 11502$^$@0#uentry_isMessageLike
+^5567 11500$^$@0#uentry_isScanfLike
+^5568 11498$^$@0#uentry_isPrintfLike
+^5569 11510$@0@@1@p0$@0#uentry_setMessageLike
+^5570 11508$@0@@1@p0$@0#uentry_setScanfLike
+^5571 11506$@0@@1@p0$@0#uentry_setPrintfLike
+^5572 11986$@0@g2675@0@0@1@g2675,p0$@0#uentry_checkName
+^5573 11562$@0@@1@p0$@0#uentry_addAccessType
+^5574 11874$@0@g2675@0@0@1@g2675$@0#uentry_showWhereAny
+^5575 11418$$$@0#uentry_checkParams
+^5576 11952$$$@0#uentry_mergeUses
+^5577 11436$$$@0#uentry_setExtern
+^5578 11970$$$@0#uentry_setUsed
+^5579 11526$$$@0#uentry_setDefState
+^5580 11922$$$@0#uentry_mergeConstantValue
+^5581 11778@6@5@1@0@0^@19@3@0#uentry_whereEarliest
+^5582 11756@6@5@1@0@0^@19@3@0#uentry_rawName
+^5583 11776@6@5@1@0@0^@19@3@0#uentry_whereDeclared
+^5584 11620$^$@0#uentry_equiv
+^5585 11742@6@0@1@0@54^$@0#uentry_hasName
+^5586 11744@6@0@1@0@54^$@0#uentry_hasRealName
+^5587 11700@6@0@1@0@54^$@0#uentry_isAbstractDatatype
+^5588 11614@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isAnyTag
+^5589 11694@6@0@1@0@54^$@0#uentry_isDatatype
+^5590 11796@6@0@1@0@54^$@0#uentry_isCodeDefined
+^5591 11798@6@0@1@0@54^$@0@S:2.0.0.fwhereDeclared.tp0$#uentry_isDeclared
+^5592 11980@6@5@1@0@0^@19@3@0#uentry_ekindName
+^5593 11982@6@5@1@0@0^@19@3@0#uentry_ekindNameLC
+^5594 11876$$$@0#uentry_showWhereDefined
+^5595 11738@6@0@1@0@54^$@0#uentry_isEndIter
+^5596 11612@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isEnumTag
+^5597 11692@6@0@1@0@54^$@0#uentry_isFakeTag
+^5598 11736@6@0@1@0@54^$@0#uentry_isIter
+^5599 11704@6@0@1@0@54^$@0#uentry_isMutableDatatype
+^5600 11708@6@0@1@0@54^$@0#uentry_isParam
+^5601 11710@6@0@1@0@54^$@0#uentry_isExpandedMacro
+^5602 11712@6@0@1@0@54^$@0#uentry_isSefParam
+^5603 11716@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0,finfo.tp0$#uentry_isAnyParam
+^5604 11740@6@0@1@0@54^$@0#uentry_isRealFunction
+^5605 11686@6@0@1@0@54^$@0#uentry_isSpecified
+^5606 11608@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isStructTag
+^5607 11610@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isUnionTag
+^5608 11690@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isVar
+^5609 11684@6@0@1@0@54^$@0@S:2.0.0.fukind.tp0$#uentry_isVariable
+^5610 11668@6@5@1@0@0$@3@0@0#uentry_dump
+^5611 11670@6@5@1@0@0$@3@0@0#uentry_dumpParam
+^5612 11762@6@5@1@0@0^@19@3@0#uentry_observeRealName
+^5613 11760@6@5@1@0@0^@3@0@0@S:2.0.0.fukind.tp0,finfo.tp0,funame.tp0$#uentry_getName
+^5614 11676@6@5@1@0@0^@3@0@0#uentry_unparse
+^5615 11674@6@5@1@0@0^@3@0@0#uentry_unparseAbbrev
+^5616 11678@6@5@1@0@0^@3@0@0#uentry_unparseFull
+^5617 11470$@0@@1@p0$@0#uentry_setMutable
+^5618 11816$^$@0#uentry_getAbstractType
+^5619 11818$@1@s1@1@$@0#uentry_getRealType
+^5620 11766$^$@0#uentry_getType
+^5621 11750$^$@0#uentry_getKind
+^5622 11774@6@5@1@0@0^@19@3@0#uentry_whereDefined
+^5623 11772@6@5@1@0@0^@19@3@0#uentry_whereSpecified
+^5624 11628$$$@0#uentry_compare
+^5625 11800@6@5@1@0@0^@19@2@0#uentry_getSref
+^5626 11748@6@5@1@0@0^@19@3@0#uentry_getMods
+^5627 11682$^$@0#uentry_accessType
+^5628 11770@6@5@1@0@0^@19@3@0#uentry_whereEither
+^5629 11570@6@2@1@0@0^@3@0@0#uentry_makeExpandedMacro
+^5630 11918$@0@g2675@0@0@1@g2675$@0#uentry_checkMatchParam
+^5631 11652@6@5@1@0@0^@19@3@0#uentry_getStateClauseList
+^5632 11870$@0@g2675@0@0@1@g2675$@0#uentry_showWhereLastExtra
+^5633 11432$$$@0#uentry_setRefCounted
+^5634 11414@6@2@1@0@0$@2@0@0#uentry_makeUnnamedVariable
+^5635 11578@6@2@1@0@0$@3@0@0#uentry_makeUnspecFunction
+^5636 11566@6@2@1@0@0$@3@0@0#uentry_makePrivFunction2
+^5637 11410@6@2@1@0@0^@3@0@0#uentry_makeSpecEnumConstant
+^5638 11602@6@2@1@0@0^@3@0@0#uentry_makeEnumTag
+^5639 11576@6@2@1@0@0^@3@0@0#uentry_makeTypeListFunction
+^5640 11568@6@2@1@0@0$@3@0@0#uentry_makeSpecFunction
+^5641 11406@6@2@1@0@0^@3@0@0#uentry_makeEnumConstant
+^5642 11408@6@2@1@0@0^@3@0@0#uentry_makeEnumInitializedConstant
+^5643 11522@6@2@1@0@0^@2@0@0#uentry_makeConstant
+^5644 11520@6@2@1@0@0^@2@0@0#uentry_makeConstantAux
+^5645 11582@6@2@1@0@0^@2@0@0#uentry_makeDatatype
+^5646 11580@6@2@1@0@0^@2@0@0#uentry_makeDatatypeAux
+^5647 11618@6@2@1@0@0^@3@0@0#uentry_makeElipsisMarker
+^5648 11556$@0@@1@p0$@0#uentry_makeVarFunction
+^5649 11558$@0@@1@p0$@0#uentry_makeConstantFunction
+^5650 11592@6@2@1@0@0^@3@0@0#uentry_makeEndIter
+^5651 11606@6@2@1@0@0^@3@0@0#uentry_makeEnumTagLoc
+^5652 11572@6@2@1@0@0^@3@0@0#uentry_makeForwardFunction
+^5653 11564@6@2@1@0@0$@3@0@0#uentry_makeFunction
+^5654 11588@6@2@1@0@0^@3@0@0#uentry_makeIter
+^5655 11514@6@2@1@0@0^@3@0@0#uentry_makeParam
+^5656 11598@6@2@1@0@0$@3@0@0#uentry_makeStructTag
+^5657 11596@6@2@1@0@0$@3@0@0#uentry_makeStructTagLoc
+^5658 11600@6@2@1@0@0$@3@0@0#uentry_makeUnionTag
+^5659 11604@6@2@1@0@0$@3@0@0#uentry_makeUnionTagLoc
+^5660 11554@6@2@1@0@0$@3@0@0#uentry_makeVariable
+^5661 11412@6@2@1@0@0$@2@0@0#uentry_makeVariableLoc
+^5662 11518@6@2@1@0@0$@2@0@0#uentry_makeVariableParam
+^5663 11442@6@2@1@0@0$@2@0@0#uentry_makeVariableSrefParam
+^5664 11426@6@2@1@0@0$@2@0@0#uentry_makeIdFunction
+^5665 11416@6@2@1@0@0$@2@0@0#uentry_makeIdDatatype
+^5666 11584@6@2@1@0@0$@2@0@0#uentry_makeBoolDatatype
+^5667 11940$$$@0#uentry_mergeDefinition
+^5668 11934$$$@0#uentry_mergeEntries
+^5669 11822@6@5@1@0@0$@3@0@0#uentry_nameCopy
+^5670 11666@6@5@1@0@0$@3@0@0#uentry_undump
+^5671 11754@6@5@1@0@0^@19@3@0#uentry_getParams
+^5672 11808$@0@@1@p0$@0#uentry_resetParams
+^5673 11746@6@5@1@0@0^@19@3@0#uentry_getGlobs
+^5674 11728$$$@0#uentry_nullPred
+^5675 11860$$$@0#uentry_free
+^5676 11824$$$@0#uentry_setDatatype
+^5677 11794$@0@@1@p0$@0@S:2.0.0.fwhereDefined.tp0,fukind.tp0,funame.tp0,finfo.tp0$#uentry_setDefined
+^5678 11938$$$@0#uentry_checkDecl
+^5679 11936$$$@0#uentry_clearDecl
+^5680 11790$$$@0#uentry_setDeclared
+^5681 11788$$$@0#uentry_setDeclaredOnly
+^5682 11786$$$@0#uentry_setDeclaredForceOnly
+^5683 11780$$$@0#uentry_setFunctionDefined
+^5684 11804$$$@0#uentry_setName
+^5685 11812$$$@0#uentry_setParam
+^5686 11814$$$@0#uentry_setSref
+^5687 11434$$$@0#uentry_setStatic
+^5688 11452$@0@@1@p0,p1$@0#uentry_setModifies
+^5689 11456$^$@0#uentry_hasWarning
+^5690 11458$@0@@1@p0$@0#uentry_addWarning
+^5691 11448$@0@@1@p0$@0#uentry_setStateClauseList
+^5692 11806$$$@0#uentry_setType
+^5693 11900@6@5@1@0@0$@19@3@0#uentry_checkedName
+^5694 11878$@0@g2675@0@0@1@g2675$@0#uentry_showWhereLastPlain
+^5695 11884$@0@g2675@0@0@1@g2675$@0#uentry_showWhereSpecifiedExtra
+^5696 11882$@0@g2675@0@0@1@g2675$@0#uentry_showWhereSpecified
+^5697 11866$@0@g2675@0@0@1@g2675$@0#uentry_showWhereLast
+^5698 11872$@0@g2675@0@0@1@g2675$@0#uentry_showWhereDeclared
+^5699 11516@6@2@1@0@0^@2@0@0#uentry_makeIdVariable
+^5700 11948@6@5@1@0@0^@3@0@0#uentry_copy
+^5701 11862$$$@0#uentry_freeComplete
+^5702 11792$@0@@1@p0$@0#uentry_clearDefined
+^5703 11392@6@5@1@0@0^@19@3@0#uentry_specDeclName
+^5704 11968$@0@@1@p0,p1$@0#uentry_mergeState
+^5705 11950$@0@@1@p0,p1$@0#uentry_setState
+^5706 11810$@0@@1@p0$@0#uentry_setRefParam
+^5707 11784$@0@@1@p0$@0#uentry_setDeclaredForce
+^5708 11492$^$@0#uentry_isNonLocal
+^5709 11494$^$@0#uentry_isGlobalVariable
+^5710 11496$^$@0#uentry_isVisibleExternally
+^5711 11714$^$@0#uentry_isRefParam
+^5712 11646$^$@0#uentry_hasGlobs
+^5713 11654$^$@0#uentry_hasMods
+^5714 11648$^$@0#uentry_hasStateClauseList
+^5715 11650$^$@0#uentry_hasConditions
+^5716 11726$^$@0#uentry_getExitCode
+^5717 11978$$$@0#uentry_checkYieldParam
+^5718 11480$^$@0#uentry_isOnly
+^5719 11486$^$@0#uentry_isUnique
+^5720 11478$@0@@1@p0$@0#uentry_reflectQualifiers
+^5721 11720$^$@0#uentry_isOut
+^5722 11722$^$@0#uentry_isPartial
+^5723 11724$^$@0#uentry_isStateSpecial
+^5724 11730$^$@0#uentry_possiblyNull
+^5725 11820$@1@s1@1@$@0#uentry_getForceRealType
+^5726 11732$^$@0#uentry_getAliasKind
+^5727 11734$^$@0#uentry_getExpKind
+^5728 11752@6@5@1@0@0^@19@3@0#uentry_getConstantValue
+^5729 11444$@0@@1@p0$@0#uentry_fixupSref
+^5730 11560$@0@@1@p0,p1$@0#uentry_setGlobals
+^5731 11550$^$@0#uentry_isYield
+^5732 11524@6@2@1@0@0^@3@0@0#uentry_makeIdConstant
+^5733 11764@6@5@1@0@0^@19@3@0#uentry_getRealName
+^5734 11622$^$@0#uentry_xcomparealpha
+^5735 11624$^$@0#uentry_xcompareuses
+^5736 11390@6@5@1@0@0^@19@3@0#uentry_specOrDefName
+^5737 11942$$$@0#uentry_copyState
+^5738 11944$$$@0#uentry_sameKind
+^5739 11974@6@5@1@0@0$@19@2@0#uentry_returnedRef
+^5740 11972$$$@0#uentry_isReturned
+^5741 11706$$$@0#uentry_isRefCountedDatatype
+^5742 11718$$$@0#uentry_getDefState
+^5743 11664$$$@0#uentry_markFree
+^5744 11802@6@5@1@0@0$@18@0@0#uentry_getOrigSref
+^5745 11616$@1@s1@1@s1$@0#uentry_destroyMod
+^5746 11868$$$@0#uentry_showDefSpecInfo
+^5747 11858$$$@0#uentry_markOwned
+^5748 11768@6@5@1@0@0^@19@3@0#uentry_whereLast
+^5749 11438$@0@@1@p0$@0#uentry_setParamNo
+^5750 11528$^$@0#uentry_isCheckedUnknown
+^5751 11536$^$@0#uentry_isCheckedModify
+^5752 11532$^$@0#uentry_isUnchecked
+^5753 11534$^$@0#uentry_isChecked
+^5754 11530$^$@0#uentry_isCheckMod
+^5755 11538$^$@0#uentry_isCheckedStrict
+^5756 11540$@0@@1@p0$@0#uentry_setUnchecked
+^5757 11542$@0@@1@p0$@0#uentry_setChecked
+^5758 11544$@0@@1@p0$@0#uentry_setCheckMod
+^5759 11546$@0@@1@p0$@0#uentry_setCheckedStrict
+^5760 11680$$$@0#uentry_hasAccessType
 *1 (Constant)
 ^5761 1211@@0@5#GLOBAL_MARKER_NAME
 *4 (Function)
-^5762 12004$$$@0#uentry_setNullTerminatedState
-^5763 12002$$$@0#uentry_setPossiblyNullTerminatedState
-^5764 12006$$$@0#uentry_setSize
-^5765 12008$$$@0#uentry_setLen
+^5762 11996$$$@0#uentry_setNullTerminatedState
+^5763 11994$$$@0#uentry_setPossiblyNullTerminatedState
+^5764 11998$$$@0#uentry_setSize
+^5765 12000$$$@0#uentry_setLen
 ^5766 6373@6@5@1@0@0$@3@0@0#uentry_makeGlobalMarker
-^5767 12000$^$@0#uentry_isGlobalMarker
-^5768 11996@6@5@1@0@0$@19@2@0#uentry_makeUnrecognized
-^5769 12010$^$@0#uentry_hasMetaStateEnsures
-^5770 12012@6@5@1@0@0$@2@0@0#uentry_getMetaStateEnsures
-^5771 11406@6@5@1@0@0$@3@0@0#uentry_getFcnPreconditions
-^5772 11408@6@5@1@0@0$@3@0@0#uentry_getFcnPostconditions
-^5773 11470$$$@0#uentry_setPostconditions
-^5774 11468$$$@0#uentry_setPreconditions
+^5767 11992$^$@0#uentry_isGlobalMarker
+^5768 11988@6@5@1@0@0$@19@2@0#uentry_makeUnrecognized
+^5769 12002$^$@0#uentry_hasMetaStateEnsures
+^5770 12004@6@5@1@0@0$@2@0@0#uentry_getMetaStateEnsures
+^5771 11398@6@5@1@0@0$@3@0@0#uentry_getFcnPreconditions
+^5772 11400@6@5@1@0@0$@3@0@0#uentry_getFcnPostconditions
+^5773 11462$$$@0#uentry_setPostconditions
+^5774 11460$$$@0#uentry_setPreconditions
 *7 (Struct tag)
 ^5775 6390@6391#@!173
 *0 (Datatype)
@@ -26482,41 +26474,41 @@
 *1 (Constant)
 ^5777 6393@i0@0@6#stateInfo_undefined
 *4 (Function)
-^5778 20034$$$@0#stateInfo_free
-^5779 20036@6@5@1@0@0$@2@0@0#stateInfo_update
-^5780 20038@6@5@1@0@0$@2@0@0#stateInfo_updateLoc
-^5781 20040@6@5@1@0@0$@2@0@0#stateInfo_updateRefLoc
-^5782 20042@6@5@1@0@0$@2@0@0#stateInfo_copy
-^5783 20044@6@2@1@0@0$@2@0@0#stateInfo_currentLoc
-^5784 20046@6@2@1@0@0$@2@0@0#stateInfo_makeLoc
-^5785 20048@6@5@1@0@0$@2@0@0#stateInfo_makeRefLoc
-^5786 20052@6@5@1@0@0$@19@3@0#stateInfo_getLoc
-^5787 20050@6@5@1@0@0^@2@0@0#stateInfo_unparse
-^5788 14102@6@2@1@0@0^@3@0@0#stateValue_create
-^5789 14104@6@2@1@0@0^@3@0@0#stateValue_createImplicit
+^5778 20026$$$@0#stateInfo_free
+^5779 20028@6@5@1@0@0$@2@0@0#stateInfo_update
+^5780 20030@6@5@1@0@0$@2@0@0#stateInfo_updateLoc
+^5781 20032@6@5@1@0@0$@2@0@0#stateInfo_updateRefLoc
+^5782 20034@6@5@1@0@0$@2@0@0#stateInfo_copy
+^5783 20036@6@2@1@0@0$@2@0@0#stateInfo_currentLoc
+^5784 20038@6@2@1@0@0$@2@0@0#stateInfo_makeLoc
+^5785 20040@6@5@1@0@0$@2@0@0#stateInfo_makeRefLoc
+^5786 20044@6@5@1@0@0$@19@3@0#stateInfo_getLoc
+^5787 20042@6@5@1@0@0^@2@0@0#stateInfo_unparse
+^5788 14094@6@2@1@0@0^@3@0@0#stateValue_create
+^5789 14096@6@2@1@0@0^@3@0@0#stateValue_createImplicit
 *1 (Constant)
 ^5790 1097@i0@0@4#stateValue_undefined
 *4 (Function)
-^5791 14124$^$@0#stateValue_isImplicit
-^5792 14122$^$@0#stateValue_getValue
-^5793 14116$@0@@1@p0$@0#stateValue_update
-^5794 14128$^$@0#stateValue_hasLoc
-^5795 14126@6@5@1@0@0^@19@3@0#stateValue_getInfo
-^5796 14112$@0@@1@p0$@0#stateValue_updateValue
-^5797 14114$@0@@1@p0$@0#stateValue_updateValueLoc
-^5798 14118$$$@0#stateValue_show
-^5799 14106@6@5@1@0@0^@3@0@0#stateValue_copy
-^5800 14120@6@5@1@0@0^@2@0@0#stateValue_unparseValue
-^5801 14110@6@5@1@0@0^@3@0@0#stateValue_unparse
-^5802 14108$^$@0#stateValue_sameValue
+^5791 14116$^$@0#stateValue_isImplicit
+^5792 14114$^$@0#stateValue_getValue
+^5793 14108$@0@@1@p0$@0#stateValue_update
+^5794 14120$^$@0#stateValue_hasLoc
+^5795 14118@6@5@1@0@0^@19@3@0#stateValue_getInfo
+^5796 14104$@0@@1@p0$@0#stateValue_updateValue
+^5797 14106$@0@@1@p0$@0#stateValue_updateValueLoc
+^5798 14110$$$@0#stateValue_show
+^5799 14098@6@5@1@0@0^@3@0@0#stateValue_copy
+^5800 14112@6@5@1@0@0^@2@0@0#stateValue_unparseValue
+^5801 14102@6@5@1@0@0^@3@0@0#stateValue_unparse
+^5802 14100$^$@0#stateValue_sameValue
 *1 (Constant)
 ^5803 5$#stateValue_error
 ^5804 1098@@0@4#valueTable_undefined
 *4 (Function)
-^5805 14098$$$@0#valueTable_insert
-^5806 14096@6@5@1@0@0^@2@0@0#valueTable_unparse
-^5807 14100$@0@@1@p0$@0#valueTable_update
-^5808 14094@6@5@1@0@0$@2@0@0#valueTable_copy
+^5805 14090$$$@0#valueTable_insert
+^5806 14088@6@5@1@0@0^@2@0@0#valueTable_unparse
+^5807 14092$@0@@1@p0$@0#valueTable_update
+^5808 14086@6@5@1@0@0$@2@0@0#valueTable_copy
 *6 (Iterator finalizer)
 ^5809 0@57#end_valueTable_elements
 *5 (Iterator)
@@ -26554,307 +26546,307 @@
 *0 (Datatype)
 ^5846 6502@-@+@0@0@0@0@6503#sinfo
 *4 (Function)
-^5847 15656$$$@0#sRef_perhapsNull
-^5848 15632$$$@0#sRef_possiblyNull
-^5849 15658$$$@0#sRef_definitelyNull
-^5850 15800$$$@0#sRef_definitelyNullContext
-^5851 15802$$$@0#sRef_definitelyNullAltContext
-^5852 15440$$$@0#sRef_setNullError
-^5853 15438$$$@0#sRef_setNullUnknown
-^5854 15424$$$@0#sRef_setNotNull
-^5855 15428$$$@0#sRef_setNullState
-^5856 15426$$$@0#sRef_setNullStateN
-^5857 15432$$$@0#sRef_setNullStateInnerComplete
-^5858 15434$$$@0#sRef_setPosNull
-^5859 15436$$$@0#sRef_setDefNull
+^5847 15648$$$@0#sRef_perhapsNull
+^5848 15624$$$@0#sRef_possiblyNull
+^5849 15650$$$@0#sRef_definitelyNull
+^5850 15792$$$@0#sRef_definitelyNullContext
+^5851 15794$$$@0#sRef_definitelyNullAltContext
+^5852 15432$$$@0#sRef_setNullError
+^5853 15430$$$@0#sRef_setNullUnknown
+^5854 15416$$$@0#sRef_setNotNull
+^5855 15420$$$@0#sRef_setNullState
+^5856 15418$$$@0#sRef_setNullStateN
+^5857 15424$$$@0#sRef_setNullStateInnerComplete
+^5858 15426$$$@0#sRef_setPosNull
+^5859 15428$$$@0#sRef_setDefNull
 *1 (Constant)
 ^5860 1047@i0@0@4#sRef_undefined
 *4 (Function)
-^5861 15080$^$@0#sRef_isRecursiveField
-^5862 15382$@0@@1@p0$@0#sRef_copyRealDerivedComplete
-^5863 15782$^$@0#sRef_getNullState
-^5864 15778$^$@0#sRef_isNotNull
-^5865 15772$^$@0#sRef_isDefinitelyNull
-^5866 15732@6@0@1@0@54^$@0#sRef_isLocalVar
-^5867 15730@6@0@1@0@54^$@0#sRef_isNSLocalVar
-^5868 15734@6@0@1@0@54^$@0#sRef_isRealLocalVar
-^5869 15736@6@0@1@0@54^$@0#sRef_isLocalParamVar
-^5870 15780$^$@0#sRef_getAliasKind
-^5871 15720@6@5@1@0@0$@19@2@0#sRef_buildArrow
-^5872 15718@6@5@1@0@0$@19@2@0#sRef_makeArrow
-^5873 15612$^$@0#sRef_isAllocIndexRef
-^5874 15362$@0@@1@p0$@0#sRef_setAliasKind
-^5875 15404$@0@@1@p0$@0#sRef_setPdefined
-^5876 15564$^$@0#sRef_hasDerived
-^5877 15566$$$@0#sRef_clearDerived
-^5878 15568$$$@0#sRef_clearDerivedComplete
-^5879 15254@6@5@1@0@0$@19@2@0#sRef_getBaseSafe
-^5880 15528@6@5@1@0@0^@19@3@0#sRef_derivedFields
-^5881 15596$^$@0#sRef_sameName
-^5882 15502$^$@0#sRef_isDirectParam
-^5883 15572@6@5@1@0@0$@19@2@0#sRef_makeAnyArrayFetch
-^5884 15532$^$@0#sRef_isUnknownArrayFetch
-^5885 15390$$$@0#sRef_setPartialDefinedComplete
-^5886 15482$^$@0#sRef_isMacroParamRef
+^5861 15072$^$@0#sRef_isRecursiveField
+^5862 15374$@0@@1@p0$@0#sRef_copyRealDerivedComplete
+^5863 15774$^$@0#sRef_getNullState
+^5864 15770$^$@0#sRef_isNotNull
+^5865 15764$^$@0#sRef_isDefinitelyNull
+^5866 15724@6@0@1@0@54^$@0#sRef_isLocalVar
+^5867 15722@6@0@1@0@54^$@0#sRef_isNSLocalVar
+^5868 15726@6@0@1@0@54^$@0#sRef_isRealLocalVar
+^5869 15728@6@0@1@0@54^$@0#sRef_isLocalParamVar
+^5870 15772$^$@0#sRef_getAliasKind
+^5871 15712@6@5@1@0@0$@19@2@0#sRef_buildArrow
+^5872 15710@6@5@1@0@0$@19@2@0#sRef_makeArrow
+^5873 15604$^$@0#sRef_isAllocIndexRef
+^5874 15354$@0@@1@p0$@0#sRef_setAliasKind
+^5875 15396$@0@@1@p0$@0#sRef_setPdefined
+^5876 15556$^$@0#sRef_hasDerived
+^5877 15558$$$@0#sRef_clearDerived
+^5878 15560$$$@0#sRef_clearDerivedComplete
+^5879 15246@6@5@1@0@0$@19@2@0#sRef_getBaseSafe
+^5880 15520@6@5@1@0@0^@19@3@0#sRef_derivedFields
+^5881 15588$^$@0#sRef_sameName
+^5882 15494$^$@0#sRef_isDirectParam
+^5883 15564@6@5@1@0@0$@19@2@0#sRef_makeAnyArrayFetch
+^5884 15524$^$@0#sRef_isUnknownArrayFetch
+^5885 15382$$$@0#sRef_setPartialDefinedComplete
+^5886 15474$^$@0#sRef_isMacroParamRef
 ^5887 6610$@1@s1@1@s1$@0#sRef_destroyMod
-^5888 15088$$$@0#sRef_deepPred
-^5889 15680$$$@0#sRef_aliasCompleteSimplePred
-^5890 15376$$$@0#sRef_clearExKindComplete
-^5891 15744@6@5@1@0@0^@19@3@0#sRef_nullMessage
-^5892 15318$^$@0#sRef_isSystemState
-^5893 15320$^$@0#sRef_isGlobalMarker
-^5894 15310$^$@0#sRef_isInternalState
-^5895 15316$^$@0#sRef_isResult
-^5896 15312$^$@0#sRef_isSpecInternalState
-^5897 15314$^$@0#sRef_isSpecState
-^5898 15308$^$@0#sRef_isNothing
-^5899 15510$^$@0#sRef_isFileOrGlobalScope
-^5900 15506$^$@0#sRef_isReference
-^5901 15208$^$@0#sRef_deriveType
-^5902 15210$^$@0#sRef_getType
-^5903 15798$@0@@1@p0$@0#sRef_markImmutable
-^5904 15476@6@0@1@0@54^$@0#sRef_isAddress
-^5905 15480@6@0@1@0@54^$@0#sRef_isArrayFetch
-^5906 15486@6@0@1@0@54^$@0#sRef_isConst
-^5907 15484@6@0@1@0@54^$@0#sRef_isCvar
-^5908 15494@6@0@1@0@54^$@0#sRef_isField
-^5909 15500@6@0@1@0@54^$@0#sRef_isParam
-^5910 15504@6@0@1@0@54^$@0#sRef_isPointer
-^5911 15520$$$@0#sRef_setType
-^5912 15522$$$@0#sRef_setTypeFull
-^5913 15630$$$@0#sRef_mergeNullState
-^5914 15420$$$@0#sRef_setLastReference
-^5915 15154$@0@@1@p0$@0#sRef_canModify
-^5916 15152$@0@@1@p0$@0#sRef_canModifyVal
-^5917 15508$^$@0#sRef_isIReference
-^5918 15242$^$@0#sRef_isIndexKnown
-^5919 15148$^$@0#sRef_isModified
-^5920 15138$^$@0#sRef_isExternallyVisible
-^5921 15170$^$@0#sRef_compare
-^5922 15184$^$@0#sRef_realSame
-^5923 15186$^$@0#sRef_sameObject
-^5924 15188$^$@0#sRef_same
-^5925 15180$^$@0#sRef_similar
-^5926 15250@6@5@1@0@0^@19@3@0#sRef_getField
-^5927 15216@6@5@1@0@0^@2@0@0#sRef_unparse
-^5928 15160@6@5@1@0@0^@19@3@0#sRef_stateVerb
-^5929 15162@6@5@1@0@0^@19@3@0#sRef_stateAltVerb
-^5930 15212@6@5@1@0@0^@2@0@0#sRef_unparseOpt
-^5931 15220@6@5@1@0@0^@2@0@0#sRef_unparseDebug
-^5932 15468$@0@@1@p0$@0#sRef_killComplete
-^5933 15244$^$@0#sRef_getIndex
-^5934 15598@6@5@1@0@0$@18@0@0#sRef_fixOuterRef
-^5935 15392$$$@0#sRef_setDefinedComplete
-^5936 15398$$$@0#sRef_setDefinedNCComplete
-^5937 15146$^$@0#sRef_getParam
-^5938 15234$^$@0#sRef_lexLevel
-^5939 15364$$$@0#sRef_setOrigAliasKind
-^5940 15608@6@5@1@0@0@0@@1@p0,p1@19@2@0#sRef_fixBase
-^5941 15350$@0@g2675@0@0@1@g2675$@0#sRef_showNotReallyDefined
+^5888 15080$$$@0#sRef_deepPred
+^5889 15672$$$@0#sRef_aliasCompleteSimplePred
+^5890 15368$$$@0#sRef_clearExKindComplete
+^5891 15736@6@5@1@0@0^@19@3@0#sRef_nullMessage
+^5892 15310$^$@0#sRef_isSystemState
+^5893 15312$^$@0#sRef_isGlobalMarker
+^5894 15302$^$@0#sRef_isInternalState
+^5895 15308$^$@0#sRef_isResult
+^5896 15304$^$@0#sRef_isSpecInternalState
+^5897 15306$^$@0#sRef_isSpecState
+^5898 15300$^$@0#sRef_isNothing
+^5899 15502$^$@0#sRef_isFileOrGlobalScope
+^5900 15498$^$@0#sRef_isReference
+^5901 15200$^$@0#sRef_deriveType
+^5902 15202$^$@0#sRef_getType
+^5903 15790$@0@@1@p0$@0#sRef_markImmutable
+^5904 15468@6@0@1@0@54^$@0#sRef_isAddress
+^5905 15472@6@0@1@0@54^$@0#sRef_isArrayFetch
+^5906 15478@6@0@1@0@54^$@0#sRef_isConst
+^5907 15476@6@0@1@0@54^$@0#sRef_isCvar
+^5908 15486@6@0@1@0@54^$@0#sRef_isField
+^5909 15492@6@0@1@0@54^$@0#sRef_isParam
+^5910 15496@6@0@1@0@54^$@0#sRef_isPointer
+^5911 15512$$$@0#sRef_setType
+^5912 15514$$$@0#sRef_setTypeFull
+^5913 15622$$$@0#sRef_mergeNullState
+^5914 15412$$$@0#sRef_setLastReference
+^5915 15146$@0@@1@p0$@0#sRef_canModify
+^5916 15144$@0@@1@p0$@0#sRef_canModifyVal
+^5917 15500$^$@0#sRef_isIReference
+^5918 15234$^$@0#sRef_isIndexKnown
+^5919 15140$^$@0#sRef_isModified
+^5920 15130$^$@0#sRef_isExternallyVisible
+^5921 15162$^$@0#sRef_compare
+^5922 15176$^$@0#sRef_realSame
+^5923 15178$^$@0#sRef_sameObject
+^5924 15180$^$@0#sRef_same
+^5925 15172$^$@0#sRef_similar
+^5926 15242@6@5@1@0@0^@19@3@0#sRef_getField
+^5927 15208@6@5@1@0@0^@2@0@0#sRef_unparse
+^5928 15152@6@5@1@0@0^@19@3@0#sRef_stateVerb
+^5929 15154@6@5@1@0@0^@19@3@0#sRef_stateAltVerb
+^5930 15204@6@5@1@0@0^@2@0@0#sRef_unparseOpt
+^5931 15212@6@5@1@0@0^@2@0@0#sRef_unparseDebug
+^5932 15460$@0@@1@p0$@0#sRef_killComplete
+^5933 15236$^$@0#sRef_getIndex
+^5934 15590@6@5@1@0@0$@18@0@0#sRef_fixOuterRef
+^5935 15384$$$@0#sRef_setDefinedComplete
+^5936 15390$$$@0#sRef_setDefinedNCComplete
+^5937 15138$^$@0#sRef_getParam
+^5938 15226$^$@0#sRef_lexLevel
+^5939 15356$$$@0#sRef_setOrigAliasKind
+^5940 15600@6@5@1@0@0@0@@1@p0,p1@19@2@0#sRef_fixBase
+^5941 15342$@0@g2675@0@0@1@g2675$@0#sRef_showNotReallyDefined
 ^5942 6730$@0@s1@1@s1$@0#sRef_enterFunctionScope
 ^5943 6732$@0@s1@1@s1$@0#sRef_setGlobalScope
 ^5944 6734$^$@0#sRef_inGlobalScope
 ^5945 6736$@0@s1@1@s1$@0#sRef_exitFunctionScope
 ^5946 6738$@0@s1@1@s1$@0#sRef_clearGlobalScopeSafe
 ^5947 6740$@0@s1@1@s1$@0#sRef_setGlobalScopeSafe
-^5948 15542@6@2@1@0@0$@19@2@0#sRef_buildArrayFetch
-^5949 15544@6@2@1@0@0$@19@2@0#sRef_buildArrayFetchKnown
-^5950 15524@6@5@1@0@0@0@@1@p0@19@2@0#sRef_buildField
-^5951 15552@6@5@1@0@0@0@@1@p0@19@2@0#sRef_buildPointer
-^5952 15248@6@5@1@0@0$@19@2@0#sRef_makeAddress
-^5953 15224@6@2@1@0@0^@18@0@0#sRef_makeUnconstrained
-^5954 15228@6@0@1@0@54^$@0#sRef_isUnconstrained
-^5955 15226@6@5@1@0@0^@19@3@0#sRef_unconstrainedName
-^5956 15574@6@2@1@0@0^@19@2@0#sRef_makeArrayFetch
-^5957 15576@6@2@1@0@0$@19@2@0#sRef_makeArrayFetchKnown
-^5958 15290@6@2@1@0@0$@18@0@0#sRef_makeConj
-^5959 15232@6@2@1@0@0$@18@0@0#sRef_makeCvar
-^5960 15592@6@2@1@0@0$@18@0@0#sRef_makeConst
-^5961 15578@6@5@1@0@0$@19@2@0#sRef_makeField
-^5962 15236@6@2@1@0@0$@18@0@0#sRef_makeGlobal
-^5963 15580@6@5@1@0@0^@19@2@0#sRef_makeNCField
-^5964 15464$@0@@1@p0$@0#sRef_maybeKill
-^5965 15264@6@2@1@0@0^@18@0@0#sRef_makeObject
-^5966 15590@6@2@1@0@0^@18@0@0#sRef_makeType
-^5967 15240@6@2@1@0@0^@18@0@0#sRef_makeParam
-^5968 15570@6@5@1@0@0@0@@1@p0@19@2@0#sRef_makePointer
-^5969 15324$@0@@1@p0$@0#sRef_makeSafe
-^5970 15326$@0@@1@p0$@0#sRef_makeUnsafe
+^5948 15534@6@2@1@0@0$@19@2@0#sRef_buildArrayFetch
+^5949 15536@6@2@1@0@0$@19@2@0#sRef_buildArrayFetchKnown
+^5950 15516@6@5@1@0@0@0@@1@p0@19@2@0#sRef_buildField
+^5951 15544@6@5@1@0@0@0@@1@p0@19@2@0#sRef_buildPointer
+^5952 15240@6@5@1@0@0$@19@2@0#sRef_makeAddress
+^5953 15216@6@2@1@0@0^@18@0@0#sRef_makeUnconstrained
+^5954 15220@6@0@1@0@54^$@0#sRef_isUnconstrained
+^5955 15218@6@5@1@0@0^@19@3@0#sRef_unconstrainedName
+^5956 15566@6@2@1@0@0^@19@2@0#sRef_makeArrayFetch
+^5957 15568@6@2@1@0@0$@19@2@0#sRef_makeArrayFetchKnown
+^5958 15282@6@2@1@0@0$@18@0@0#sRef_makeConj
+^5959 15224@6@2@1@0@0$@18@0@0#sRef_makeCvar
+^5960 15584@6@2@1@0@0$@18@0@0#sRef_makeConst
+^5961 15570@6@5@1@0@0$@19@2@0#sRef_makeField
+^5962 15228@6@2@1@0@0$@18@0@0#sRef_makeGlobal
+^5963 15572@6@5@1@0@0^@19@2@0#sRef_makeNCField
+^5964 15456$@0@@1@p0$@0#sRef_maybeKill
+^5965 15256@6@2@1@0@0^@18@0@0#sRef_makeObject
+^5966 15582@6@2@1@0@0^@18@0@0#sRef_makeType
+^5967 15232@6@2@1@0@0^@18@0@0#sRef_makeParam
+^5968 15562@6@5@1@0@0@0@@1@p0@19@2@0#sRef_makePointer
+^5969 15316$@0@@1@p0$@0#sRef_makeSafe
+^5970 15318$@0@@1@p0$@0#sRef_makeUnsafe
 ^5971 6788@6@5@1@0@0^@18@0@0#sRef_makeUnknown
-^5972 15296@6@5@1@0@0^@18@0@0#sRef_makeNothing
-^5973 15298@6@5@1@0@0^@18@0@0#sRef_makeInternalState
-^5974 15300@6@5@1@0@0^@18@0@0#sRef_makeSpecState
-^5975 15304@6@5@1@0@0^@18@0@0#sRef_makeGlobalMarker
-^5976 15302@6@5@1@0@0^@18@0@0#sRef_makeSystemState
-^5977 15306@6@2@1@0@0^@18@0@0#sRef_makeResult
-^5978 15748@6@5@1@0@0@0@@1@p0@19@2@0#sRef_fixResultType
-^5979 15238$@0@@1@p0$@0#sRef_setParamNo
-^5980 15588@6@2@1@0@0$@18@0@0#sRef_makeNew
-^5981 15322$^$@0#sRef_getScopeIndex
-^5982 15140@6@5@1@0@0$@19@2@0#sRef_getBaseUentry
-^5983 15194@6@5@1@0@0@0@@1@p0@19@2@0#sRef_fixBaseParam
-^5984 15192@6@5@1@0@0$@2@0@0#sRef_fixConstraintParam
-^5985 15402$$$@0#sRef_isUnionField
-^5986 15150$$$@0#sRef_setModified
-^5987 15604$$$@0#sRef_resetState
-^5988 15606$$$@0#sRef_resetStateComplete
-^5989 15600$$$@0#sRef_storeState
-^5990 15252@6@5@1@0@0^@19@2@0#sRef_getBase
-^5991 15258@6@5@1@0@0^@19@2@0#sRef_getRootBase
-^5992 15144@6@5@1@0@0$@19@3@0#sRef_getUentry
-^5993 15204@6@5@1@0@0^@3@0@0#sRef_dump
-^5994 15206@6@5@1@0@0^@3@0@0#sRef_dumpGlobal
-^5995 15200@6@5@1@0@0@0@@1@tp0@19@2@0#sRef_undump
-^5996 15196@6@5@1@0@0@0@@1@tp0@19@2@0#sRef_undumpGlobal
-^5997 15472@6@5@1@0@0$@2@0@0#sRef_saveCopy
-^5998 15474@6@5@1@0@0$@18@0@0#sRef_copy
-^5999 15332@6@5@1@0@0^@3@0@0#sRef_unparseState
-^6000 15336$^$@0#sRef_isWriteable
-^6001 15342$^$@0#sRef_isReadable
-^6002 15340$^$@0#sRef_isStrictReadable
-^6003 15338$^$@0#sRef_hasNoStorage
-^6004 15622$@0@g2675@0@0@1@g2675$@0#sRef_showExpInfo
-^6005 15394$@0@@1@p0$@0#sRef_setDefined
-^6006 15384$@0@@1@p0$@0#sRef_setUndefined
-^6007 15444$@0@@1@p0$@0#sRef_setOnly
-^6008 15446$@0@@1@p0$@0#sRef_setDependent
-^6009 15448$@0@@1@p0$@0#sRef_setOwned
-^6010 15450$@0@@1@p0$@0#sRef_setKept
-^6011 15456$@0@@1@p0$@0#sRef_setKeptComplete
-^6012 15460$@0@@1@p0$@0#sRef_setFresh
-^6013 15418$@0@@1@p0$@0#sRef_setShared
-^6014 15628$@0@g2675@0@0@1@g2675$@0#sRef_showAliasInfo
-^6015 15624$@0@g2675@0@0@1@g2675$@0#sRef_showMetaStateInfo
-^6016 15626$@0@g2675@0@0@1@g2675$@0#sRef_showNullInfo
-^6017 15620$@0@g2675@0@0@1@g2675$@0#sRef_showStateInfo
-^6018 15092$@0@@1@p0$@0#sRef_setStateFromType
-^6019 15462$@0@@1@p0$@0#sRef_kill
-^6020 15414$@0@@1@p0$@0#sRef_setAllocated
-^6021 15412$@0@@1@p0$@0#sRef_setAllocatedShallowComplete
-^6022 15408$@0@@1@p0$@0#sRef_setAllocatedComplete
-^6023 15584@6@5@1@0@0^@2@0@0#sRef_unparseKindNamePlain
-^6024 15512@6@0@1@0@54^$@0#sRef_isRealGlobal
-^6025 15514@6@0@1@0@54^$@0#sRef_isFileStatic
-^6026 15638$^$@0#sRef_getScope
-^6027 15634@6@5@1@0@0^@19@3@0#sRef_getScopeName
-^6028 15640@6@0@1@0@54^$@0#sRef_isDead
-^6029 15642@6@0@1@0@54^$@0#sRef_isDeadStorage
-^6030 15646$^$@0#sRef_isStateLive
-^6031 15644@6@0@1@0@54^$@0#sRef_isPossiblyDead
-^6032 15648@6@0@1@0@53^$@0#sRef_isStateUndefined
-^6033 15654$^$@0#sRef_isUnuseable
-^6034 15558@6@5@1@0@0@0@@1@p0@19@2@0#sRef_constructDeref
-^6035 15560@6@5@1@0@0@0@@1@p0@19@2@0#sRef_constructDeadDeref
-^6036 15650$^$@0#sRef_isJustAllocated
-^6037 15774@6@0@1@0@54^$@0#sRef_isAllocated
-^6038 15796$@0@@1@p0$@0#sRef_makeStateSpecial
-^6039 15348$^$@0#sRef_isReallyDefined
-^6040 15750$^$@0#sRef_isOnly
-^6041 15752$^$@0#sRef_isDependent
-^6042 15754$^$@0#sRef_isOwned
-^6043 15756$^$@0#sRef_isKeep
-^6044 15758$^$@0#sRef_isTemp
-^6045 15776$^$@0#sRef_isStack
-^6046 15760$^$@0#sRef_isLocalState
-^6047 15762$^$@0#sRef_isUnique
-^6048 15764$^$@0#sRef_isShared
-^6049 15766$^$@0#sRef_isExposed
-^6050 15768$^$@0#sRef_isObserver
-^6051 15770$^$@0#sRef_isFresh
-^6052 15076$@0@s1@1@s1$@0#sRef_protectDerivs
-^6053 15078$@0@s1@1@s1$@0#sRef_clearProtectDerivs
-^6054 15366$^$@0#sRef_getExKind
-^6055 15368$^$@0#sRef_getOrigExKind
-^6056 15378$@0@@1@p0$@0#sRef_setExKind
-^6057 15374$@0@@1@p0$@0#sRef_setExposed
-^6058 15498$^$@0#sRef_isAnyParam
-^6059 15116@6@5@1@0@0^@19@3@0#sRef_getAliasInfoRef
-^6060 15106$^$@0#sRef_hasAliasInfoRef
-^6061 15554@6@5@1@0@0@0@@1@p0@19@2@0#sRef_constructPointer
-^6062 15516$^$@0#sRef_isAliasCheckedGlobal
-^6063 15182$^$@0#sRef_includedBy
-^6064 15266@6@5@1@0@0^@18@2@0#sRef_makeExternal
-^6065 15178$^$@0#sRef_similarRelaxed
-^6066 15582@6@5@1@0@0^@2@0@0#sRef_unparseKindName
-^6067 15586$@0@@1@p0$@0#sRef_copyState
-^6068 15488$^$@0#sRef_isObject
-^6069 15334$^$@0#sRef_isNotUndefined
-^6070 15490$^$@0#sRef_isExternal
-^6071 15330@6@5@1@0@0^@3@0@0#sRef_unparseDeep
-^6072 15328@6@5@1@0@0^@3@0@0#sRef_unparseFull
-^6073 15636@6@5@1@0@0^@19@3@0#sRef_unparseScope
-^6074 15274$@0@@1@p0,p1$@0#sRef_mergeState
-^6075 15276$@0@@1@p0,p1$@0#sRef_mergeOptState
-^6076 15270$@0@@1@p0$@0#sRef_mergeStateQuiet
-^6077 15272$@0@@1@p0$@0#sRef_mergeStateQuietReverse
-^6078 15550$@0@@1@p0$@0#sRef_setStateFromUentry
-^6079 15538$^$@0#sRef_isStackAllocated
-^6080 15090$^$@0#sRef_modInFunction
-^6081 15358$@0@@1@p0$@0#sRef_clearAliasState
-^6082 15416$@0@@1@p0$@0#sRef_setPartial
-^6083 15660$@0@@1@p0$@0#sRef_setDerivNullState
+^5972 15288@6@5@1@0@0^@18@0@0#sRef_makeNothing
+^5973 15290@6@5@1@0@0^@18@0@0#sRef_makeInternalState
+^5974 15292@6@5@1@0@0^@18@0@0#sRef_makeSpecState
+^5975 15296@6@5@1@0@0^@18@0@0#sRef_makeGlobalMarker
+^5976 15294@6@5@1@0@0^@18@0@0#sRef_makeSystemState
+^5977 15298@6@2@1@0@0^@18@0@0#sRef_makeResult
+^5978 15740@6@5@1@0@0@0@@1@p0@19@2@0#sRef_fixResultType
+^5979 15230$@0@@1@p0$@0#sRef_setParamNo
+^5980 15580@6@2@1@0@0$@18@0@0#sRef_makeNew
+^5981 15314$^$@0#sRef_getScopeIndex
+^5982 15132@6@5@1@0@0$@19@2@0#sRef_getBaseUentry
+^5983 15186@6@5@1@0@0@0@@1@p0@19@2@0#sRef_fixBaseParam
+^5984 15184@6@5@1@0@0$@2@0@0#sRef_fixConstraintParam
+^5985 15394$$$@0#sRef_isUnionField
+^5986 15142$$$@0#sRef_setModified
+^5987 15596$$$@0#sRef_resetState
+^5988 15598$$$@0#sRef_resetStateComplete
+^5989 15592$$$@0#sRef_storeState
+^5990 15244@6@5@1@0@0^@19@2@0#sRef_getBase
+^5991 15250@6@5@1@0@0^@19@2@0#sRef_getRootBase
+^5992 15136@6@5@1@0@0$@19@3@0#sRef_getUentry
+^5993 15196@6@5@1@0@0^@3@0@0#sRef_dump
+^5994 15198@6@5@1@0@0^@3@0@0#sRef_dumpGlobal
+^5995 15192@6@5@1@0@0@0@@1@tp0@19@2@0#sRef_undump
+^5996 15188@6@5@1@0@0@0@@1@tp0@19@2@0#sRef_undumpGlobal
+^5997 15464@6@5@1@0@0$@2@0@0#sRef_saveCopy
+^5998 15466@6@5@1@0@0$@18@0@0#sRef_copy
+^5999 15324@6@5@1@0@0^@3@0@0#sRef_unparseState
+^6000 15328$^$@0#sRef_isWriteable
+^6001 15334$^$@0#sRef_isReadable
+^6002 15332$^$@0#sRef_isStrictReadable
+^6003 15330$^$@0#sRef_hasNoStorage
+^6004 15614$@0@g2675@0@0@1@g2675$@0#sRef_showExpInfo
+^6005 15386$@0@@1@p0$@0#sRef_setDefined
+^6006 15376$@0@@1@p0$@0#sRef_setUndefined
+^6007 15436$@0@@1@p0$@0#sRef_setOnly
+^6008 15438$@0@@1@p0$@0#sRef_setDependent
+^6009 15440$@0@@1@p0$@0#sRef_setOwned
+^6010 15442$@0@@1@p0$@0#sRef_setKept
+^6011 15448$@0@@1@p0$@0#sRef_setKeptComplete
+^6012 15452$@0@@1@p0$@0#sRef_setFresh
+^6013 15410$@0@@1@p0$@0#sRef_setShared
+^6014 15620$@0@g2675@0@0@1@g2675$@0#sRef_showAliasInfo
+^6015 15616$@0@g2675@0@0@1@g2675$@0#sRef_showMetaStateInfo
+^6016 15618$@0@g2675@0@0@1@g2675$@0#sRef_showNullInfo
+^6017 15612$@0@g2675@0@0@1@g2675$@0#sRef_showStateInfo
+^6018 15084$@0@@1@p0$@0#sRef_setStateFromType
+^6019 15454$@0@@1@p0$@0#sRef_kill
+^6020 15406$@0@@1@p0$@0#sRef_setAllocated
+^6021 15404$@0@@1@p0$@0#sRef_setAllocatedShallowComplete
+^6022 15400$@0@@1@p0$@0#sRef_setAllocatedComplete
+^6023 15576@6@5@1@0@0^@2@0@0#sRef_unparseKindNamePlain
+^6024 15504@6@0@1@0@54^$@0#sRef_isRealGlobal
+^6025 15506@6@0@1@0@54^$@0#sRef_isFileStatic
+^6026 15630$^$@0#sRef_getScope
+^6027 15626@6@5@1@0@0^@19@3@0#sRef_getScopeName
+^6028 15632@6@0@1@0@54^$@0#sRef_isDead
+^6029 15634@6@0@1@0@54^$@0#sRef_isDeadStorage
+^6030 15638$^$@0#sRef_isStateLive
+^6031 15636@6@0@1@0@54^$@0#sRef_isPossiblyDead
+^6032 15640@6@0@1@0@53^$@0#sRef_isStateUndefined
+^6033 15646$^$@0#sRef_isUnuseable
+^6034 15550@6@5@1@0@0@0@@1@p0@19@2@0#sRef_constructDeref
+^6035 15552@6@5@1@0@0@0@@1@p0@19@2@0#sRef_constructDeadDeref
+^6036 15642$^$@0#sRef_isJustAllocated
+^6037 15766@6@0@1@0@54^$@0#sRef_isAllocated
+^6038 15788$@0@@1@p0$@0#sRef_makeStateSpecial
+^6039 15340$^$@0#sRef_isReallyDefined
+^6040 15742$^$@0#sRef_isOnly
+^6041 15744$^$@0#sRef_isDependent
+^6042 15746$^$@0#sRef_isOwned
+^6043 15748$^$@0#sRef_isKeep
+^6044 15750$^$@0#sRef_isTemp
+^6045 15768$^$@0#sRef_isStack
+^6046 15752$^$@0#sRef_isLocalState
+^6047 15754$^$@0#sRef_isUnique
+^6048 15756$^$@0#sRef_isShared
+^6049 15758$^$@0#sRef_isExposed
+^6050 15760$^$@0#sRef_isObserver
+^6051 15762$^$@0#sRef_isFresh
+^6052 15068$@0@s1@1@s1$@0#sRef_protectDerivs
+^6053 15070$@0@s1@1@s1$@0#sRef_clearProtectDerivs
+^6054 15358$^$@0#sRef_getExKind
+^6055 15360$^$@0#sRef_getOrigExKind
+^6056 15370$@0@@1@p0$@0#sRef_setExKind
+^6057 15366$@0@@1@p0$@0#sRef_setExposed
+^6058 15490$^$@0#sRef_isAnyParam
+^6059 15108@6@5@1@0@0^@19@3@0#sRef_getAliasInfoRef
+^6060 15098$^$@0#sRef_hasAliasInfoRef
+^6061 15546@6@5@1@0@0@0@@1@p0@19@2@0#sRef_constructPointer
+^6062 15508$^$@0#sRef_isAliasCheckedGlobal
+^6063 15174$^$@0#sRef_includedBy
+^6064 15258@6@5@1@0@0^@18@2@0#sRef_makeExternal
+^6065 15170$^$@0#sRef_similarRelaxed
+^6066 15574@6@5@1@0@0^@2@0@0#sRef_unparseKindName
+^6067 15578$@0@@1@p0$@0#sRef_copyState
+^6068 15480$^$@0#sRef_isObject
+^6069 15326$^$@0#sRef_isNotUndefined
+^6070 15482$^$@0#sRef_isExternal
+^6071 15322@6@5@1@0@0^@3@0@0#sRef_unparseDeep
+^6072 15320@6@5@1@0@0^@3@0@0#sRef_unparseFull
+^6073 15628@6@5@1@0@0^@19@3@0#sRef_unparseScope
+^6074 15266$@0@@1@p0,p1$@0#sRef_mergeState
+^6075 15268$@0@@1@p0,p1$@0#sRef_mergeOptState
+^6076 15262$@0@@1@p0$@0#sRef_mergeStateQuiet
+^6077 15264$@0@@1@p0$@0#sRef_mergeStateQuietReverse
+^6078 15542$@0@@1@p0$@0#sRef_setStateFromUentry
+^6079 15530$^$@0#sRef_isStackAllocated
+^6080 15082$^$@0#sRef_modInFunction
+^6081 15350$@0@@1@p0$@0#sRef_clearAliasState
+^6082 15408$@0@@1@p0$@0#sRef_setPartial
+^6083 15652$@0@@1@p0$@0#sRef_setDerivNullState
 ^6084 7042$@0@s1@1@s1$@0#sRef_clearGlobalScope
-^6085 15268@6@5@1@0@0$@18@0@0#sRef_makeDerived
-^6086 15352$^$@0#sRef_getDefState
-^6087 15354$$$@0#sRef_setDefState
-^6088 15614$$$@0#sRef_showRefLost
-^6089 15616$$$@0#sRef_showRefKilled
-^6090 15142@6@5@1@0@0$@19@2@0#sRef_updateSref
-^6091 15784$$$@0#sRef_reflectAnnotation
-^6092 15794@6@5@1@0@0^@19@3@0#sRef_getValueTable
-^6093 15672$$$@0#sRef_aliasCheckPred
-^6094 15674$$$@0#sRef_aliasCheckSimplePred
-^6095 15618$$$@0#sRef_showStateInconsistent
-^6096 15458$$$@0#sRef_setDependentComplete
-^6097 15360$$$@0#sRef_setAliasKindComplete
-^6098 15478$^$@0#sRef_isThroughArrayFetch
-^6099 15714@6@2@1@0@0^@19@2@0#sRef_getConjA
-^6100 15716@6@2@1@0@0^@19@2@0#sRef_getConjB
-^6101 15214@6@5@1@0@0^@2@0@0#sRef_unparsePreOpt
-^6102 15594$^$@0#sRef_hasName
-^6103 15518$$$@0#sRef_free
-^6104 15372$@0@@1@p0$@0#sRef_setObserver
-^6105 15430$$$@0#sRef_setNullTerminatedStateInnerComplete
-^6106 15804$$$@0#sRef_getNullTerminatedState
-^6107 15806$$$@0#sRef_setNullTerminatedState
-^6108 15808$$$@0#sRef_setPossiblyNullTerminatedState
-^6109 15810$$$@0#sRef_setNotNullTerminatedState
-^6110 15814$$$@0#sRef_setSize
-^6111 15812$$$@0#sRef_setLen
-^6112 15818$^$@0#sRef_isFixedArray
-^6113 15820$^$@0#sRef_getArraySize
-^6114 15746@6@5@1@0@0$@19@3@0#sRef_ntMessage
-^6115 15816$@0@@1@p0$@0#sRef_resetLen
-^6116 15786$@0@@1@p0$@0#sRef_setMetaStateValueComplete
-^6117 15788$@0@@1@p0$@0#sRef_setMetaStateValue
-^6118 15792@6@5@1@0@0^@19@3@0#sRef_getMetaStateValue
-^6119 15790$@0@@1@p0$@0#sRef_checkMetaStateValue
-^6120 15822$@0@@1@p0$@0#sRef_setValue
-^6121 15824$^$@0#sRef_hasValue
-^6122 15826@6@5@1@0@0^@19@3@0#sRef_getValue
-^6123 15070@6@0@5@0@0@0@g155@6@0@1@g155$@0#sRef_checkValid
+^6085 15260@6@5@1@0@0$@18@0@0#sRef_makeDerived
+^6086 15344$^$@0#sRef_getDefState
+^6087 15346$$$@0#sRef_setDefState
+^6088 15606$$$@0#sRef_showRefLost
+^6089 15608$$$@0#sRef_showRefKilled
+^6090 15134@6@5@1@0@0$@19@2@0#sRef_updateSref
+^6091 15776$$$@0#sRef_reflectAnnotation
+^6092 15786@6@5@1@0@0^@19@3@0#sRef_getValueTable
+^6093 15664$$$@0#sRef_aliasCheckPred
+^6094 15666$$$@0#sRef_aliasCheckSimplePred
+^6095 15610$$$@0#sRef_showStateInconsistent
+^6096 15450$$$@0#sRef_setDependentComplete
+^6097 15352$$$@0#sRef_setAliasKindComplete
+^6098 15470$^$@0#sRef_isThroughArrayFetch
+^6099 15706@6@2@1@0@0^@19@2@0#sRef_getConjA
+^6100 15708@6@2@1@0@0^@19@2@0#sRef_getConjB
+^6101 15206@6@5@1@0@0^@2@0@0#sRef_unparsePreOpt
+^6102 15586$^$@0#sRef_hasName
+^6103 15510$$$@0#sRef_free
+^6104 15364$@0@@1@p0$@0#sRef_setObserver
+^6105 15422$$$@0#sRef_setNullTerminatedStateInnerComplete
+^6106 15796$$$@0#sRef_getNullTerminatedState
+^6107 15798$$$@0#sRef_setNullTerminatedState
+^6108 15800$$$@0#sRef_setPossiblyNullTerminatedState
+^6109 15802$$$@0#sRef_setNotNullTerminatedState
+^6110 15806$$$@0#sRef_setSize
+^6111 15804$$$@0#sRef_setLen
+^6112 15810$^$@0#sRef_isFixedArray
+^6113 15812$^$@0#sRef_getArraySize
+^6114 15738@6@5@1@0@0$@19@3@0#sRef_ntMessage
+^6115 15808$@0@@1@p0$@0#sRef_resetLen
+^6116 15778$@0@@1@p0$@0#sRef_setMetaStateValueComplete
+^6117 15780$@0@@1@p0$@0#sRef_setMetaStateValue
+^6118 15784@6@5@1@0@0^@19@3@0#sRef_getMetaStateValue
+^6119 15782$@0@@1@p0$@0#sRef_checkMetaStateValue
+^6120 15814$@0@@1@p0$@0#sRef_setValue
+^6121 15816$^$@0#sRef_hasValue
+^6122 15818@6@5@1@0@0^@19@3@0#sRef_getValue
+^6123 15062@6@0@5@0@0@0@g155@6@0@1@g155$@0#sRef_checkValid
 *1 (Constant)
 ^6124 1070@i0@0@4#guardSet_undefined
 *4 (Function)
-^6125 17289@6@0@1@0@54$$@0#guardSet_isEmpty
+^6125 17281@6@0@1@0@54$$@0#guardSet_isEmpty
 ^6126 7147@6@5@1@0@0$@2@0@0#guardSet_new
-^6127 17277@6@5@1@0@0$$@0#guardSet_addTrueGuard
-^6128 17279@6@5@1@0@0$$@0#guardSet_addFalseGuard
-^6129 17261@6@5@1@0@0$$@0#guardSet_or
-^6130 17263@6@5@1@0@0$$@0#guardSet_and
-^6131 17257$@0@@1@p0$@0#guardSet_delete
-^6132 17281@6@5@1@0@0$@2@0@0#guardSet_unparse
-^6133 17283$$$@0#guardSet_free
-^6134 17255@6@5@1@0@0^@18@2@0#guardSet_getTrueGuards
-^6135 17259@6@5@1@0@0^@18@2@0#guardSet_getFalseGuards
-^6136 17265@6@5@1@0@0@0@@1@p0@3@0@0#guardSet_union
-^6137 17273@6@5@1@0@0^@2@0@0#guardSet_invert
-^6138 17275@6@5@1@0@0^@2@0@0#guardSet_copy
-^6139 17285$^$@0#guardSet_isGuarded
-^6140 17287$^$@0#guardSet_mustBeNull
-^6141 17267@6@5@1@0@0@0@@1@p0@3@0@0#guardSet_levelUnion
-^6142 17269@6@5@1@0@0@0@@1@p1,p0$@0#guardSet_levelUnionFree
-^6143 17271$$$@0#guardSet_flip
+^6127 17269@6@5@1@0@0$$@0#guardSet_addTrueGuard
+^6128 17271@6@5@1@0@0$$@0#guardSet_addFalseGuard
+^6129 17253@6@5@1@0@0$$@0#guardSet_or
+^6130 17255@6@5@1@0@0$$@0#guardSet_and
+^6131 17249$@0@@1@p0$@0#guardSet_delete
+^6132 17273@6@5@1@0@0$@2@0@0#guardSet_unparse
+^6133 17275$$$@0#guardSet_free
+^6134 17247@6@5@1@0@0^@18@2@0#guardSet_getTrueGuards
+^6135 17251@6@5@1@0@0^@18@2@0#guardSet_getFalseGuards
+^6136 17257@6@5@1@0@0@0@@1@p0@3@0@0#guardSet_union
+^6137 17265@6@5@1@0@0^@2@0@0#guardSet_invert
+^6138 17267@6@5@1@0@0^@2@0@0#guardSet_copy
+^6139 17277$^$@0#guardSet_isGuarded
+^6140 17279$^$@0#guardSet_mustBeNull
+^6141 17259@6@5@1@0@0@0@@1@p0@3@0@0#guardSet_levelUnion
+^6142 17261@6@5@1@0@0@0@@1@p1,p0$@0#guardSet_levelUnionFree
+^6143 17263$$$@0#guardSet_flip
 *8 (Union tag)
 ^6144 7182@7183#$!181
 *0 (Datatype)
@@ -26870,31 +26862,31 @@
 *0 (Datatype)
 ^6153 7190@+@=@0@0@0@0@7191#constraintTerm
 *4 (Function)
-^6154 10010$^$@0#constraintTerm_isDefined
-^6155 10032$$$@0#constraintTerm_getKind
-^6156 10034@6@5@1@0@0$@19@2@0#constraintTerm_getSRef
-^6157 10012$$$@0#constraintTerm_free
-^6158 10028$@0@@1@p0$@0#constraintTerm_simplify
-^6159 10036$^@2@0@0#constraintTerm_makeExprNode
-^6160 10040$^@3@0@0#constraintTerm_copy
-^6161 10060$^$@0#constraintTerm_similar
-^6162 10052$^$@0#constraintTerm_canGetValue
-^6163 10054$^$@0#constraintTerm_getValue
-^6164 10030@6@5@1@0@0^@3@0@0#constraintTerm_getFileloc
-^6165 10016$^$@0#constraintTerm_isIntLiteral
-^6166 10048@6@5@1@0@0^@3@0@0#constraintTerm_print
-^6167 10038$^@3@0@0#constraintTerm_makesRef
-^6168 10058$^$@0#constraintTerm_probSame
-^6169 10042$@0@@1@p0$@0#constraintTerm_setFileloc
-^6170 10050$^@3@0@0#constraintTerm_makeIntLiteral
-^6171 10024$^$@0#constraintTerm_isStringLiteral
-^6172 10026@6@5@1@0@0^@3@0@0#constraintTerm_getStringLiteral
-^6173 10046$@0@@1@p0$@0#constraintTerm_doSRefFixBaseParam
-^6174 10062$$$@0#constraintTerm_dump
-^6175 10064$$@2@0@0#constraintTerm_undump
-^6176 10018$^$@0#constraintTerm_isInitBlock
-^6177 10022$^$@0#constraintTerm_getInitBlockLength
-^6178 10020$^$@0#constraintTerm_isExprNode
+^6154 10004$^$@0#constraintTerm_isDefined
+^6155 10026$$$@0#constraintTerm_getKind
+^6156 10028@6@5@1@0@0$@19@2@0#constraintTerm_getSRef
+^6157 10006$$$@0#constraintTerm_free
+^6158 10022$@0@@1@p0$@0#constraintTerm_simplify
+^6159 10030$^@2@0@0#constraintTerm_makeExprNode
+^6160 10034$^@3@0@0#constraintTerm_copy
+^6161 10054$^$@0#constraintTerm_similar
+^6162 10046$^$@0#constraintTerm_canGetValue
+^6163 10048$^$@0#constraintTerm_getValue
+^6164 10024@6@5@1@0@0^@3@0@0#constraintTerm_getFileloc
+^6165 10010$^$@0#constraintTerm_isIntLiteral
+^6166 10042@6@5@1@0@0^@3@0@0#constraintTerm_print
+^6167 10032$^@3@0@0#constraintTerm_makesRef
+^6168 10052$^$@0#constraintTerm_probSame
+^6169 10036$@0@@1@p0$@0#constraintTerm_setFileloc
+^6170 10044$^@3@0@0#constraintTerm_makeIntLiteral
+^6171 10018$^$@0#constraintTerm_isStringLiteral
+^6172 10020@6@5@1@0@0^@3@0@0#constraintTerm_getStringLiteral
+^6173 10040$@0@@1@p0$@0#constraintTerm_doSRefFixBaseParam
+^6174 10056$$$@0#constraintTerm_dump
+^6175 10058$$@2@0@0#constraintTerm_undump
+^6176 10012$^$@0#constraintTerm_isInitBlock
+^6177 10016$^$@0#constraintTerm_getInitBlockLength
+^6178 10014$^$@0#constraintTerm_isExprNode
 *2 (Enum member)
 ^6179 7242$#BINARYOP_UNDEFINED#PLUS#MINUS
 *9 (Enum tag)
@@ -26920,24 +26912,24 @@
 *0 (Datatype)
 ^6196 7256@-@+@0@0@0@0@7257#constraintExprData
 *4 (Function)
-^6197 10074$$$@0#constraintExprData_freeBinaryExpr
-^6198 10078$$$@0#constraintExprData_freeUnaryExpr
-^6199 10082$$$@0#constraintExprData_freeTerm
-^6200 10086$$$@0#constraintExprData_termSetTerm
-^6201 10088$^@19@3@0#constraintExprData_termGetTerm
-^6202 10090$^$@0#constraintExprData_unaryExprGetOp
-^6203 10092@6@5@1@0@0^@19@3@0#constraintExprData_unaryExprGetExpr
-^6204 10094$$$@0#constraintExprData_unaryExprSetOp
-^6205 10096$$$@0#constraintExprData_unaryExprSetExpr
-^6206 10098$^$@0#constraintExprData_binaryExprGetOp
-^6207 10100@6@5@1@0@0^@19@3@0#constraintExprData_binaryExprGetExpr1
-^6208 10102@6@5@1@0@0^@19@3@0#constraintExprData_binaryExprGetExpr2
-^6209 10104$$$@0#constraintExprData_binaryExprSetExpr1
-^6210 10106$$$@0#constraintExprData_binaryExprSetExpr2
-^6211 10108$$$@0#constraintExprData_binaryExprSetOp
-^6212 10076$$@2@0@0#constraintExprData_copyBinaryExpr
-^6213 10080$$@2@0@0#constraintExprData_copyUnaryExpr
-^6214 10084$$@2@0@0#constraintExprData_copyTerm
+^6197 10068$$$@0#constraintExprData_freeBinaryExpr
+^6198 10072$$$@0#constraintExprData_freeUnaryExpr
+^6199 10076$$$@0#constraintExprData_freeTerm
+^6200 10080$$$@0#constraintExprData_termSetTerm
+^6201 10082$^@19@3@0#constraintExprData_termGetTerm
+^6202 10084$^$@0#constraintExprData_unaryExprGetOp
+^6203 10086@6@5@1@0@0^@19@3@0#constraintExprData_unaryExprGetExpr
+^6204 10088$$$@0#constraintExprData_unaryExprSetOp
+^6205 10090$$$@0#constraintExprData_unaryExprSetExpr
+^6206 10092$^$@0#constraintExprData_binaryExprGetOp
+^6207 10094@6@5@1@0@0^@19@3@0#constraintExprData_binaryExprGetExpr1
+^6208 10096@6@5@1@0@0^@19@3@0#constraintExprData_binaryExprGetExpr2
+^6209 10098$$$@0#constraintExprData_binaryExprSetExpr1
+^6210 10100$$$@0#constraintExprData_binaryExprSetExpr2
+^6211 10102$$$@0#constraintExprData_binaryExprSetOp
+^6212 10070$$@2@0@0#constraintExprData_copyBinaryExpr
+^6213 10074$$@2@0@0#constraintExprData_copyUnaryExpr
+^6214 10078$$@2@0@0#constraintExprData_copyTerm
 *2 (Enum member)
 ^6215 7296$#binaryexpr#unaryExpr#term
 *9 (Enum tag)
@@ -26947,48 +26939,48 @@
 *1 (Constant)
 ^6220 1209@i0@0@4#constraintExpr_undefined
 *4 (Function)
-^6221 10118$$$@0#constraintExpr_free
-^6222 10202@6@5@1@0@0@0@@1@p0$@0#constraintExpr_setFileloc
-^6223 10134@6@5@1@0@0^@3@0@0#constraintExpr_copy
-^6224 10212@6@5@1@0@0^@2@0@0#constraintExpr_unparse
-^6225 10220@6@5@1@0@0^@3@0@0#constraintExpr_print
-^6226 10192$^$@0#constraintExpr_similar
-^6227 10194$^$@0#constraintExpr_same
-^6228 10198@6@5@1@0@0@0@@1@p0@2@0@0#constraintExpr_searchandreplace
-^6229 10228$^$@0#constraintExpr_canGetValue
-^6230 10226$^$@0#constraintExpr_getValue
-^6231 10224$^$@0#constraintExpr_compare
-^6232 10170@6@5@1@0@0$@2@0@0#constraintExpr_makeIntLiteral
-^6233 10168@6@5@1@0@0$@2@0@0#constraintExpr_makeValueExpr
-^6234 10164@6@5@1@0@0$@2@0@0#constraintExpr_makeMaxSetExpr
-^6235 10166@6@5@1@0@0$@2@0@0#constraintExpr_makeMaxReadExpr
-^6236 10186@6@5@1@0@0$@2@0@0#constraintExpr_makeIncConstraintExpr
-^6237 10180@6@5@1@0@0$@2@0@0#constraintExpr_makeDecConstraintExpr
-^6238 10210@6@5@1@0@0$@2@0@0#constraintExpr_simplify
-^6239 10206@6@5@1@0@0@0@@1@p0,p1@2@0@0#constraintExpr_solveBinaryExpr
-^6240 10196$$$@0#constraintExpr_search
-^6241 10230@6@5@1@0@0$@2@0@0#constraintExpr_getFileloc
-^6242 10160@6@5@1@0@0$@2@0@0#constraintExpr_makeSRefMaxset
-^6243 10158@6@5@1@0@0$@2@0@0#constraintExpr_makeSRefMaxRead
-^6244 10144@6@5@1@0@0$@2@0@0#constraintExpr_makeTermsRef
-^6245 10214@6@5@1@0@0$$@0#constraintExpr_doSRefFixBaseParam
-^6246 10138@6@5@1@0@0$@2@0@0#constraintExpr_makeExprNode
-^6247 10218@6@5@1@0@0$@2@0@0#constraintExpr_doFixResult
-^6248 10120@6@0@1@0@54^$@0#constraintExpr_isLit
-^6249 10184@6@5@1@0@0$@2@0@0#constraintExpr_makeAddExpr
-^6250 10182@6@5@1@0@0$@2@0@0#constraintExpr_makeSubtractExpr
-^6251 10162@6@5@1@0@0$@2@0@0#constraintExpr_parseMakeUnaryOp
-^6252 10176@6@5@1@0@0$@3@0@0#constraintExpr_parseMakeBinaryOp
-^6253 10222$^$@0#constraintExpr_hasMaxSet
-^6254 10216@6@5@1@0@0@0@@1@p0@2@0@0#constraintExpr_doSRefFixConstraintParam
-^6255 10126@6@5@1@0@0$@2@0@0#constraintExpr_propagateConstants
-^6256 10236@6@0@1@0@54^$@0#constraintExpr_isBinaryExpr
-^6257 10250$$$@0#constraintExpr_dump
-^6258 10252@6@5@1@0@0$@2@0@0#constraintExpr_undump
-^6259 10140@6@5@1@0@0$@2@0@0#constraintExpr_makeTermExprNode
-^6260 10238$^$@0#constraintExpr_isTerm
-^6261 10240$^@6@3@0#constraintExpr_getTerm
-^6262 10254$$$@0#constraintExpr_getDepth
+^6221 10112$$$@0#constraintExpr_free
+^6222 10196@6@5@1@0@0@0@@1@p0$@0#constraintExpr_setFileloc
+^6223 10128@6@5@1@0@0^@3@0@0#constraintExpr_copy
+^6224 10206@6@5@1@0@0^@2@0@0#constraintExpr_unparse
+^6225 10214@6@5@1@0@0^@3@0@0#constraintExpr_print
+^6226 10186$^$@0#constraintExpr_similar
+^6227 10188$^$@0#constraintExpr_same
+^6228 10192@6@5@1@0@0@0@@1@p0@2@0@0#constraintExpr_searchandreplace
+^6229 10222$^$@0#constraintExpr_canGetValue
+^6230 10220$^$@0#constraintExpr_getValue
+^6231 10218$^$@0#constraintExpr_compare
+^6232 10164@6@5@1@0@0$@2@0@0#constraintExpr_makeIntLiteral
+^6233 10162@6@5@1@0@0$@2@0@0#constraintExpr_makeValueExpr
+^6234 10158@6@5@1@0@0$@2@0@0#constraintExpr_makeMaxSetExpr
+^6235 10160@6@5@1@0@0$@2@0@0#constraintExpr_makeMaxReadExpr
+^6236 10180@6@5@1@0@0$@2@0@0#constraintExpr_makeIncConstraintExpr
+^6237 10174@6@5@1@0@0$@2@0@0#constraintExpr_makeDecConstraintExpr
+^6238 10204@6@5@1@0@0$@2@0@0#constraintExpr_simplify
+^6239 10200@6@5@1@0@0@0@@1@p0,p1@2@0@0#constraintExpr_solveBinaryExpr
+^6240 10190$$$@0#constraintExpr_search
+^6241 10224@6@5@1@0@0$@2@0@0#constraintExpr_getFileloc
+^6242 10154@6@5@1@0@0$@2@0@0#constraintExpr_makeSRefMaxset
+^6243 10152@6@5@1@0@0$@2@0@0#constraintExpr_makeSRefMaxRead
+^6244 10138@6@5@1@0@0$@2@0@0#constraintExpr_makeTermsRef
+^6245 10208@6@5@1@0@0$$@0#constraintExpr_doSRefFixBaseParam
+^6246 10132@6@5@1@0@0$@2@0@0#constraintExpr_makeExprNode
+^6247 10212@6@5@1@0@0$@2@0@0#constraintExpr_doFixResult
+^6248 10114@6@0@1@0@54^$@0#constraintExpr_isLit
+^6249 10178@6@5@1@0@0$@2@0@0#constraintExpr_makeAddExpr
+^6250 10176@6@5@1@0@0$@2@0@0#constraintExpr_makeSubtractExpr
+^6251 10156@6@5@1@0@0$@2@0@0#constraintExpr_parseMakeUnaryOp
+^6252 10170@6@5@1@0@0$@3@0@0#constraintExpr_parseMakeBinaryOp
+^6253 10216$^$@0#constraintExpr_hasMaxSet
+^6254 10210@6@5@1@0@0@0@@1@p0@2@0@0#constraintExpr_doSRefFixConstraintParam
+^6255 10120@6@5@1@0@0$@2@0@0#constraintExpr_propagateConstants
+^6256 10230@6@0@1@0@54^$@0#constraintExpr_isBinaryExpr
+^6257 10244$$$@0#constraintExpr_dump
+^6258 10246@6@5@1@0@0$@2@0@0#constraintExpr_undump
+^6259 10134@6@5@1@0@0$@2@0@0#constraintExpr_makeTermExprNode
+^6260 10232$^$@0#constraintExpr_isTerm
+^6261 10234$^@6@3@0#constraintExpr_getTerm
+^6262 10248$$$@0#constraintExpr_getDepth
 *2 (Enum member)
 ^6263 7390$#LT#LTE#GT#GTE#EQ#NONNEGATIVE#POSITIVE
 *9 (Enum tag)
@@ -26998,116 +26990,116 @@
 *1 (Constant)
 ^6272 1203@i0@0@4#constraint_undefined
 *4 (Function)
-^6273 10326$$$@0#constraint_free
-^6274 10284@6@5@1@0@0$@3@0@0#constraint_makeReadSafeExprNode
-^6275 10294@6@5@1@0@0$@2@0@0#constraint_makeWriteSafeExprNode
-^6276 10296@6@5@1@0@0$@2@0@0#constraint_makeReadSafeInt
-^6277 10300@6@5@1@0@0$@2@0@0#constraint_makeEnsureMaxReadAtLeast
-^6278 10268$@0@@1@p0$@0#constraint_overWrite
-^6279 10266@6@5@1@0@0$@2@0@0#constraint_copy
-^6280 10522$^$@45#fileloc_closer
-^6281 10328@6@5@1@0@0^@2@0@0#arithType_print
-^6282 10278@6@5@1@0@0$@2@0@0#constraint_getFileloc
-^6283 10342@6@5@1@0@0^@2@0@0#constraint_print
-^6284 10286@6@5@1@0@0$@2@0@0#constraint_makeWriteSafeInt
-^6285 10316@6@5@1@0@0@0@@1@p0$@35#exprNode_copyConstraints
-^6286 10306@6@5@1@0@0$@2@0@0#constraint_makeEnsureEqual
-^6287 10324@6@5@1@0@0$@2@0@0#constraint_makeMaxSetSideEffectPostIncrement
-^6288 10352@6@5@1@0@0@0@@1@p0$@0#constraint_preserveOrig
-^6289 10346@6@5@1@0@0$@2@0@0#constraint_doSRefFixBaseParam
-^6290 10340@6@5@1@0@0$@2@0@0#constraint_printDetailed
-^6291 10308@6@5@1@0@0$@2@0@0#constraint_makeEnsureLessThan
-^6292 10310@6@5@1@0@0$@2@0@0#constraint_makeEnsureLessThanEqual
-^6293 10312@6@5@1@0@0$@2@0@0#constraint_makeEnsureGreaterThan
-^6294 10314@6@5@1@0@0$@2@0@0#constraint_makeEnsureGreaterThanEqual
-^6295 10290@6@5@1@0@0$@2@0@0#constraint_makeSRefWriteSafeInt
-^6296 10298@6@5@1@0@0$@2@0@0#constraint_makeSRefReadSafeInt
-^6297 10334$$$@0#constraint_printError
-^6298 10350@6@5@1@0@0$@2@0@0#constraint_doSRefFixConstraintParam
-^6299 10288@6@5@1@0@0$@2@0@0#constraint_makeSRefSetBufferSize
-^6300 10348@6@5@1@0@0$@2@0@0#constraint_doFixResult
-^6301 10292@6@5@1@0@0$@2@0@0#constraint_makeEnsureLteMaxRead
-^6302 10322@6@5@1@0@0$@2@0@0#constraint_makeMaxSetSideEffectPostDecrement
-^6303 10498$^$@0#constraint_search
-^6304 10264@6@5@1@0@0$@2@0@0#makeConstraintParse3
-^6305 10272@6@5@1@0@0$$@0#constraint_addGeneratingExpr
-^6306 10282$$$@0#constraint_hasMaxSet
-^6307 9994$$$@35#exprNode_exprTraverse
-^6308 10000@6@5@1@0@0$@2@0@35#exprNode_traversRequiresConstraints
-^6309 10002@6@5@1@0@0$@2@0@35#exprNode_traversEnsuresConstraints
-^6310 10354@6@5@1@0@0$$@0#constraint_togglePost
-^6311 10262$$$@0#constraint_same
-^6312 10344@6@5@1@0@0^@2@0@0#constraint_printOr
-^6313 10330$$$@0#constraint_printErrorPostCondition
-^6314 10332@6@5@1@0@0^@3@0@0#constraint_printLocation
-^6315 10276@6@5@1@0@0$$@0#constraint_setFcnPre
-^6316 10274@6@5@1@0@0$$@0#constraint_origAddGeneratingExpr
-^6317 9959$$$@35#exprNode_generateConstraints
-^6318 10356@6@5@1@0@0$$@0#constraint_togglePostOrig
-^6319 10358$$$@0#constraint_hasOrig
-^6320 10318@6@5@1@0@0$@3@0@0#constraint_makeAddAssign
-^6321 10320@6@5@1@0@0$@3@0@0#constraint_makeSubtractAssign
-^6322 10360@6@5@1@0@0$@2@0@0#constraint_undump
-^6323 10362$$$@0#constraint_dump
-^6324 10548$$$@35#exprNode_forLoopHeuristics
-^6325 10364$^$@0#constraint_compare
-^6326 10366$$$@0#constraint_isPost
-^6327 10370$$$@0#constraint_tooDeep
-^6328 10462@6@5@1@0@0$@2@0@133#constraintList_reflectChanges
-^6329 10458@6@5@1@0@0$@2@0@133#constraintList_reflectChangesFreePre
-^6330 10508@6@5@1@0@0$@2@0@131#constraint_substitute
-^6331 10488$$$@133#constraintList_resolve
-^6332 10520@6@5@1@0@0$$@131#constraint_simplify
-^6333 10484@6@5@1@0@0$@2@0@133#constraintList_fixConflicts
-^6334 10456@6@5@1@0@0$@3@0@133#constraintList_subsumeEnsures
-^6335 10448@6@5@1@0@0$@3@0@133#constraintList_mergeEnsures
-^6336 10446@6@5@1@0@0$@2@0@133#constraintList_mergeEnsuresFreeFirst
-^6337 10492$$$@131#constraint_isAlwaysTrue
-^6338 10452@6@5@1@0@0$@2@0@133#constraintList_mergeRequires
-^6339 10450@6@5@1@0@0$@2@0@133#constraintList_mergeRequiresFreeFirst
-^6340 10472@6@5@1@0@0$@3@0@133#constraintList_reflectChangesOr
-^6341 10512@6@5@1@0@0$@2@0@133#constraintList_substitute
-^6342 10510@6@5@1@0@0$@2@0@133#constraintList_substituteFreeTarget
-^6343 10454$$$@35#exprNode_mergeResolve
+^6273 10320$$$@0#constraint_free
+^6274 10278@6@5@1@0@0$@3@0@0#constraint_makeReadSafeExprNode
+^6275 10288@6@5@1@0@0$@2@0@0#constraint_makeWriteSafeExprNode
+^6276 10290@6@5@1@0@0$@2@0@0#constraint_makeReadSafeInt
+^6277 10294@6@5@1@0@0$@2@0@0#constraint_makeEnsureMaxReadAtLeast
+^6278 10262$@0@@1@p0$@0#constraint_overWrite
+^6279 10260@6@5@1@0@0$@2@0@0#constraint_copy
+^6280 10516$^$@45#fileloc_closer
+^6281 10322@6@5@1@0@0^@2@0@0#arithType_print
+^6282 10272@6@5@1@0@0$@2@0@0#constraint_getFileloc
+^6283 10336@6@5@1@0@0^@2@0@0#constraint_print
+^6284 10280@6@5@1@0@0$@2@0@0#constraint_makeWriteSafeInt
+^6285 10310@6@5@1@0@0@0@@1@p0$@35#exprNode_copyConstraints
+^6286 10300@6@5@1@0@0$@2@0@0#constraint_makeEnsureEqual
+^6287 10318@6@5@1@0@0$@2@0@0#constraint_makeMaxSetSideEffectPostIncrement
+^6288 10346@6@5@1@0@0@0@@1@p0$@0#constraint_preserveOrig
+^6289 10340@6@5@1@0@0$@2@0@0#constraint_doSRefFixBaseParam
+^6290 10334@6@5@1@0@0$@2@0@0#constraint_printDetailed
+^6291 10302@6@5@1@0@0$@2@0@0#constraint_makeEnsureLessThan
+^6292 10304@6@5@1@0@0$@2@0@0#constraint_makeEnsureLessThanEqual
+^6293 10306@6@5@1@0@0$@2@0@0#constraint_makeEnsureGreaterThan
+^6294 10308@6@5@1@0@0$@2@0@0#constraint_makeEnsureGreaterThanEqual
+^6295 10284@6@5@1@0@0$@2@0@0#constraint_makeSRefWriteSafeInt
+^6296 10292@6@5@1@0@0$@2@0@0#constraint_makeSRefReadSafeInt
+^6297 10328$$$@0#constraint_printError
+^6298 10344@6@5@1@0@0$@2@0@0#constraint_doSRefFixConstraintParam
+^6299 10282@6@5@1@0@0$@2@0@0#constraint_makeSRefSetBufferSize
+^6300 10342@6@5@1@0@0$@2@0@0#constraint_doFixResult
+^6301 10286@6@5@1@0@0$@2@0@0#constraint_makeEnsureLteMaxRead
+^6302 10316@6@5@1@0@0$@2@0@0#constraint_makeMaxSetSideEffectPostDecrement
+^6303 10492$^$@0#constraint_search
+^6304 10258@6@5@1@0@0$@2@0@0#makeConstraintParse3
+^6305 10266@6@5@1@0@0$$@0#constraint_addGeneratingExpr
+^6306 10276$$$@0#constraint_hasMaxSet
+^6307 9988$$$@35#exprNode_exprTraverse
+^6308 9994@6@5@1@0@0$@2@0@35#exprNode_traversRequiresConstraints
+^6309 9996@6@5@1@0@0$@2@0@35#exprNode_traversEnsuresConstraints
+^6310 10348@6@5@1@0@0$$@0#constraint_togglePost
+^6311 10256$$$@0#constraint_same
+^6312 10338@6@5@1@0@0^@2@0@0#constraint_printOr
+^6313 10324$$$@0#constraint_printErrorPostCondition
+^6314 10326@6@5@1@0@0^@3@0@0#constraint_printLocation
+^6315 10270@6@5@1@0@0$$@0#constraint_setFcnPre
+^6316 10268@6@5@1@0@0$$@0#constraint_origAddGeneratingExpr
+^6317 9955$$$@35#exprNode_generateConstraints
+^6318 10350@6@5@1@0@0$$@0#constraint_togglePostOrig
+^6319 10352$$$@0#constraint_hasOrig
+^6320 10312@6@5@1@0@0$@3@0@0#constraint_makeAddAssign
+^6321 10314@6@5@1@0@0$@3@0@0#constraint_makeSubtractAssign
+^6322 10354@6@5@1@0@0$@2@0@0#constraint_undump
+^6323 10356$$$@0#constraint_dump
+^6324 10542$$$@35#exprNode_forLoopHeuristics
+^6325 10358$^$@0#constraint_compare
+^6326 10360$$$@0#constraint_isPost
+^6327 10364$$$@0#constraint_tooDeep
+^6328 10456@6@5@1@0@0$@2@0@133#constraintList_reflectChanges
+^6329 10452@6@5@1@0@0$@2@0@133#constraintList_reflectChangesFreePre
+^6330 10502@6@5@1@0@0$@2@0@131#constraint_substitute
+^6331 10482$$$@133#constraintList_resolve
+^6332 10514@6@5@1@0@0$$@131#constraint_simplify
+^6333 10478@6@5@1@0@0$@2@0@133#constraintList_fixConflicts
+^6334 10450@6@5@1@0@0$@3@0@133#constraintList_subsumeEnsures
+^6335 10442@6@5@1@0@0$@3@0@133#constraintList_mergeEnsures
+^6336 10440@6@5@1@0@0$@2@0@133#constraintList_mergeEnsuresFreeFirst
+^6337 10486$$$@131#constraint_isAlwaysTrue
+^6338 10446@6@5@1@0@0$@2@0@133#constraintList_mergeRequires
+^6339 10444@6@5@1@0@0$@2@0@133#constraintList_mergeRequiresFreeFirst
+^6340 10466@6@5@1@0@0$@3@0@133#constraintList_reflectChangesOr
+^6341 10506@6@5@1@0@0$@2@0@133#constraintList_substitute
+^6342 10504@6@5@1@0@0$@2@0@133#constraintList_substituteFreeTarget
+^6343 10448$$$@35#exprNode_mergeResolve
 *0 (Datatype)
 ^6344 1203@-@+@0@2@2@0@7547#o_constraint
 *1 (Constant)
 ^6345 1206@i0@0@4#constraintList_undefined
 *4 (Function)
-^6346 10408@6@5@1@0@0$@3@0@0#constraintList_single
-^6347 10384@6@5@1@0@0$$@0#constraintList_addListFree
-^6348 10406@6@5@1@0@0$$@0#constraintList_preserveCallInfo
+^6346 10402@6@5@1@0@0$@3@0@0#constraintList_single
+^6347 10378@6@5@1@0@0$$@0#constraintList_addListFree
+^6348 10400@6@5@1@0@0$$@0#constraintList_preserveCallInfo
 *6 (Iterator finalizer)
 ^6349 0@133#end_constraintList_elements
 *5 (Iterator)
 ^6350 7564@133#constraintList_elements
 *4 (Function)
 ^6351 7566@6@5@1@0@0^@2@0@0#constraintList_makeNew
-^6352 10378@6@5@1@0@0@0@@1@p0$@0#constraintList_add
-^6353 10382@6@5@1@0@0@0@@1@p0@2@0@0#constraintList_addList
-^6354 10402@6@5@1@0@0^@3@0@0#constraintList_copy
-^6355 10400$$$@0#constraintList_free
-^6356 10388@6@5@1@0@0^@2@0@0#constraintList_unparse
-^6357 10390@6@5@1@0@0^@2@0@0#constraintList_print
-^6358 10396@6@5@1@0@0^@3@0@0#constraintList_printDetailed
-^6359 10398@6@5@1@0@0$@2@0@0#constraintList_logicalOr
-^6360 10404@6@5@1@0@0$$@0#constraintList_preserveOrig
+^6352 10372@6@5@1@0@0@0@@1@p0$@0#constraintList_add
+^6353 10376@6@5@1@0@0@0@@1@p0@2@0@0#constraintList_addList
+^6354 10396@6@5@1@0@0^@3@0@0#constraintList_copy
+^6355 10394$$$@0#constraintList_free
+^6356 10382@6@5@1@0@0^@2@0@0#constraintList_unparse
+^6357 10384@6@5@1@0@0^@2@0@0#constraintList_print
+^6358 10390@6@5@1@0@0^@3@0@0#constraintList_printDetailed
+^6359 10392@6@5@1@0@0$@2@0@0#constraintList_logicalOr
+^6360 10398@6@5@1@0@0$$@0#constraintList_preserveOrig
 *1 (Constant)
 ^6361 5$#constraintListBASESIZE
 *4 (Function)
-^6362 10416@6@5@1@0@0@0@@1@p0@2@0@0#constraintList_doSRefFixBaseParam
-^6363 10418@6@5@1@0@0@0@@1@p0$@0#constraintList_togglePost
-^6364 10414@6@5@1@0@0@0@@1@p0@2@0@0#constraintList_doSRefFixConstraintParam
-^6365 10006@6@5@1@0@0^@3@0@35#exprNode_getPostConditions
-^6366 10412@6@5@1@0@0@0@@1@p0@2@0@0#constraintList_doFixResult
-^6367 10410@6@5@1@0@0@0@@1@p0$@0#constraintList_addGeneratingExpr
-^6368 9973@6@5@1@0@0$@2@0@133#constraintList_makeFixedArrayConstraints
-^6369 10392$$$@0#constraintList_printErrorPostConditions
-^6370 10394$$$@0#constraintList_printError
-^6371 10424@6@5@1@0@0$$@0#constraintList_sort
-^6372 10422$$$@0#constraintList_dump
-^6373 10420@6@5@1@0@0$@2@0@0#constraintList_undump
-^6374 10386@6@5@1@0@0$@2@0@0#constraintList_removeSurpressed
+^6362 10410@6@5@1@0@0@0@@1@p0@2@0@0#constraintList_doSRefFixBaseParam
+^6363 10412@6@5@1@0@0@0@@1@p0$@0#constraintList_togglePost
+^6364 10408@6@5@1@0@0@0@@1@p0@2@0@0#constraintList_doSRefFixConstraintParam
+^6365 10000@6@5@1@0@0^@3@0@35#exprNode_getPostConditions
+^6366 10406@6@5@1@0@0@0@@1@p0@2@0@0#constraintList_doFixResult
+^6367 10404@6@5@1@0@0@0@@1@p0$@0#constraintList_addGeneratingExpr
+^6368 9969@6@5@1@0@0$@2@0@133#constraintList_makeFixedArrayConstraints
+^6369 10386$$$@0#constraintList_printErrorPostConditions
+^6370 10388$$$@0#constraintList_printError
+^6371 10418@6@5@1@0@0$$@0#constraintList_sort
+^6372 10416$$$@0#constraintList_dump
+^6373 10414@6@5@1@0@0$@2@0@0#constraintList_undump
+^6374 10380@6@5@1@0@0$@2@0@0#constraintList_removeSurpressed
 *2 (Enum member)
 ^6375 7611$#XPR_PARENS#XPR_ASSIGN#XPR_CALL#XPR_EMPTY#XPR_VAR#XPR_OP#XPR_POSTOP#XPR_PREOP#XPR_SIZEOFT#XPR_SIZEOF#XPR_ALIGNOFT#XPR_ALIGNOF#XPR_OFFSETOF#XPR_CAST#XPR_FETCH#XPR_VAARG#XPR_ITER#XPR_FOR#XPR_FORPRED#XPR_GOTO#XPR_CONTINUE#XPR_BREAK#XPR_RETURN#XPR_NULLRETURN#XPR_COMMA#XPR_COND#XPR_IF#XPR_IFELSE#XPR_DOWHILE#XPR_WHILE#XPR_STMT#XPR_STMTLIST#XPR_SWITCH#XPR_INIT#XPR_FACCESS#XPR_ARROW#XPR_CONST#XPR_STRINGLITERAL#XPR_NUMLIT#XPR_BODY#XPR_NODE#XPR_ITERCALL#XPR_TOK#XPR_WHILEPRED#XPR_CASE#XPR_FTCASE#XPR_DEFAULT#XPR_FTDEFAULT#XPR_BLOCK#XPR_INITBLOCK#XPR_LABEL
 *9 (Enum tag)
@@ -27166,171 +27158,171 @@
 ^6452 7662@i0@0@6#exprData_undefined
 ^6453 1067@i0@0@4#exprNode_undefined
 *4 (Function)
-^6454 20564@6@5@1@0@0^@19@2@0#exprNode_getValue
-^6455 20840$^$@0#exprNode_getLongValue
-^6456 20762@6@5@1@0@0^@19@3@0#exprNode_unparseFirst
-^6457 20724@6@5@1@0@0^@19@3@0#exprNode_getForGuards
-^6458 20554$^$@0#exprNode_isNullValue
-^6459 20760@6@5@1@0@0^@19@2@0#exprNode_getSref
-^6460 20616@6@5@1@0@0@1@s1@1@@19@2@0#exprNode_getUentry
-^6461 20698$@0@@1@p0$@0#exprNode_produceGuards
-^6462 20766@6@5@1@0@0^@19@3@0#exprNode_loc
-^6463 20560@6@5@1@0@0^@3@0@0#exprNode_charLiteral
-^6464 20536@6@5@1@0@0^@19@3@0#exprNode_makeMustExit
-^6465 20662@6@5@1@0@0^@3@0@0#exprNode_cond
+^6454 20556@6@5@1@0@0^@19@2@0#exprNode_getValue
+^6455 20832$^$@0#exprNode_getLongValue
+^6456 20754@6@5@1@0@0^@19@3@0#exprNode_unparseFirst
+^6457 20716@6@5@1@0@0^@19@3@0#exprNode_getForGuards
+^6458 20546$^$@0#exprNode_isNullValue
+^6459 20752@6@5@1@0@0^@19@2@0#exprNode_getSref
+^6460 20608@6@5@1@0@0@1@s1@1@@19@2@0#exprNode_getUentry
+^6461 20690$@0@@1@p0$@0#exprNode_produceGuards
+^6462 20758@6@5@1@0@0^@19@3@0#exprNode_loc
+^6463 20552@6@5@1@0@0^@3@0@0#exprNode_charLiteral
+^6464 20528@6@5@1@0@0^@19@3@0#exprNode_makeMustExit
+^6465 20654@6@5@1@0@0^@3@0@0#exprNode_cond
 ^6466 7711@6@5@1@0@0^@3@0@0#exprNode_makeError
-^6467 20618@6@5@1@0@0^@3@0@0#exprNode_makeInitBlock
-^6468 20620@6@5@1@0@0^@3@0@0#exprNode_functionCall
-^6469 20576@6@2@1@0@0@1@s1@1@@3@0@0#exprNode_fromIdentifier
-^6470 20572@6@5@1@0@0@1@s1@1@@3@0@0#exprNode_fromUIO
-^6471 20624@6@5@1@0@0^@3@0@0#exprNode_fieldAccess
-^6472 20630@6@5@1@0@0^@3@0@0#exprNode_arrowAccess
-^6473 20632@6@5@1@0@0@0@@1@p0@3@0@0#exprNode_postOp
-^6474 20634@6@5@1@0@0^@3@0@0#exprNode_preOp
-^6475 20626@6@5@1@0@0^@3@0@0#exprNode_addParens
-^6476 20642@6@5@1@0@0^@3@0@0#exprNode_offsetof
-^6477 20638@6@5@1@0@0^@3@0@0#exprNode_sizeofType
-^6478 20644@6@5@1@0@0^@3@0@0#exprNode_sizeofExpr
-^6479 20640@6@5@1@0@0^@3@0@0#exprNode_alignofType
-^6480 20646@6@5@1@0@0^@3@0@0#exprNode_alignofExpr
-^6481 20656@6@5@1@0@0^@3@0@0#exprNode_op
-^6482 20660@6@5@1@0@0$@3@0@0#exprNode_assign
-^6483 20584@6@5@1@0@0@0@@1@p0,p1@3@0@0#exprNode_arrayFetch
-^6484 20528$$$@0#exprNode_free
-^6485 20664@6@5@1@0@0@1@s1@1@@3@0@0#exprNode_vaArg
-^6486 20570@6@5@1@0@0^@3@0@0#exprNode_stringLiteral
-^6487 20568@6@5@1@0@0^@3@0@0#exprNode_rawStringLiteral
-^6488 20740@6@5@1@0@0^@3@0@0#exprNode_comma
-^6489 20666@6@5@1@0@0$@3@0@0#exprNode_labelMarker
-^6490 20668@6@5@1@0@0$$@0#exprNode_notReached
-^6491 20676@6@5@1@0@0^@3@0@0#exprNode_caseMarker
-^6492 20688@6@5@1@0@0$@3@0@0#exprNode_concat
-^6493 20690@6@5@1@0@0^@3@0@0#exprNode_createTok
-^6494 20692@6@5@1@0@0$@3@0@0#exprNode_statement
-^6495 20700@6@5@1@0@0$@3@0@0#exprNode_makeBlock
-^6496 20708@6@5@1@0@0$@3@0@0#exprNode_if
-^6497 20710@6@5@1@0@0$@3@0@0#exprNode_ifelse
-^6498 20714@6@5@1@0@0$@3@0@0#exprNode_switch
-^6499 20718@6@5@1@0@0$@3@0@0#exprNode_while
-^6500 20720@6@5@1@0@0$@3@0@0#exprNode_doWhile
-^6501 20730@6@2@1@0@0$@2@0@0#exprNode_goto
-^6502 20732@6@5@1@0@0$@3@0@0#exprNode_continue
-^6503 20734@6@5@1@0@0$@3@0@0#exprNode_break
-^6504 20736@6@5@1@0@0$@3@0@0#exprNode_nullReturn
-^6505 20738@6@5@1@0@0$@3@0@0#exprNode_return
-^6506 20764@6@5@1@0@0^@18@3@0#exprNode_unparse
-^6507 20778$^$@0#exprNode_isCharLit
-^6508 20780$^$@0#exprNode_isNumLit
-^6509 20748@6@5@1@0@0$@3@0@0#exprNode_makeInitialization
-^6510 20746@6@5@1@0@0$@3@0@0#exprNode_makeEmptyInitialization
-^6511 20776$^$@0#exprNode_isInitializer
-^6512 20786$$$@0#exprNode_matchType
-^6513 20678@6@2@1@0@0$@2@0@0#exprNode_defaultMarker
-^6514 20750@6@5@1@0@0$@3@0@0#exprNode_iter
-^6515 20756@6@5@1@0@0$@3@0@0#exprNode_iterId
-^6516 20754@6@5@1@0@0$$@0#exprNode_iterExpr
-^6517 20752@6@5@1@0@0$@3@0@0#exprNode_iterNewId
-^6518 20758@6@5@1@0@0$@3@0@0#exprNode_iterStart
-^6519 20558@6@5@1@0@0$@3@0@0#exprNode_numLiteral
-^6520 20510$@1@s1@1@s1$@0#exprNode_initMod
-^6521 20722@6@5@1@0@0$@3@0@0#exprNode_for
-^6522 20728@6@5@1@0@0$@3@0@0#exprNode_forPred
-^6523 20562@6@5@1@0@0$@3@0@0#exprNode_floatLiteral
-^6524 20574@6@2@1@0@0$@3@0@0#exprNode_createId
-^6525 20648@6@5@1@0@0$@3@0@0#exprNode_cast
-^6526 20784$$$@0#exprNode_matchLiteral
-^6527 20820$$$@0#exprNode_checkUseParam
-^6528 20810$$$@0#exprNode_checkSet
-^6529 20812$$$@0#exprNode_checkMSet
-^6530 20696@6@5@1@0@0$$@0#exprNode_checkExpr
-^6531 20684$$$@0#exprNode_mustEscape
-^6532 20686$$$@0#exprNode_errorEscape
-^6533 20680$$$@0#exprNode_mayEscape
-^6534 20726@6@5@1@0@0$@3@0@0#exprNode_whilePred
-^6535 20836@6@5@1@0@0$$@0#exprNode_updateLocation
-^6536 20526$$$@0#exprNode_freeShallow
-^6537 20512$@1@s1@1@s1$@0#exprNode_destroyMod
-^6538 20704$^$@0#exprNode_isAssign
-^6539 20842@6@5@1@0@0$@19@3@0#exprNode_getfileloc
-^6540 20670$^$@0#exprNode_isDefaultMarker
-^6541 20672$^$@0#exprNode_isCaseMarker
-^6542 20674$^$@0#exprNode_isLabelMarker
-^6543 20566@6@5@1@0@0$@2@0@0#exprNode_combineLiterals
-^6544 20844@6@5@1@0@0$@2@0@0#exprNode_getNextSequencePoint
-^6545 20846@6@5@1@0@0$@3@0@0#exprNode_createNew
-^6546 20848$$$@0#exprNode_isInitBlock
-^6547 13695@6@5@1@0@0$@2@0@0#exprData_makeLiteral
-^6548 13697@6@5@1@0@0$@2@0@0#exprData_makeId
-^6549 13699@6@5@1@0@0$@2@0@0#exprData_makePair
-^6550 13591$$$@0#exprData_freeShallow
-^6551 13593$$$@0#exprData_free
-^6552 13595@6@5@1@0@0^@19@2@0#exprData_getInitNode
-^6553 13597@6@5@1@0@0^@19@2@0#exprData_getInitId
-^6554 13599@6@5@1@0@0^@19@2@0#exprData_getOpA
-^6555 13601@6@5@1@0@0^@19@2@0#exprData_getOpB
-^6556 13603$^@19@3@0#exprData_getOpTok
-^6557 13605@6@5@1@0@0^@19@2@0#exprData_getPairA
-^6558 13607@6@5@1@0@0^@19@2@0#exprData_getPairB
-^6559 13609@6@5@1@0@0^@19@2@0#exprData_getIterSname
-^6560 13611$^@19@2@0#exprData_getIterAlist
-^6561 13613@6@5@1@0@0^@19@2@0#exprData_getIterBody
-^6562 13615@6@5@1@0@0^@19@2@0#exprData_getIterEname
-^6563 13617@6@5@1@0@0^@19@2@0#exprData_getFcn
-^6564 13619$^@19@2@0#exprData_getArgs
-^6565 13621@6@5@1@0@0^@19@2@0#exprData_getTriplePred
-^6566 13623@6@5@1@0@0^@19@2@0#exprData_getIterCallIter
-^6567 13625$^@19@2@0#exprData_getIterCallArgs
-^6568 13627@6@5@1@0@0^@19@2@0#exprData_getTripleInit
-^6569 13629@6@5@1@0@0^@19@2@0#exprData_getTripleTrue
-^6570 13631@6@5@1@0@0^@19@2@0#exprData_getTripleTest
-^6571 13633@6@5@1@0@0^@19@2@0#exprData_getTripleFalse
-^6572 13635@6@5@1@0@0^@19@2@0#exprData_getTripleInc
-^6573 13637@6@5@1@0@0^@19@2@0#exprData_getFieldNode
-^6574 13639@6@5@1@0@0^@19@2@0#exprData_getFieldName
-^6575 13641$^@19@3@0#exprData_getUopTok
-^6576 13643@6@5@1@0@0^@19@2@0#exprData_getUopNode
-^6577 13645@6@5@1@0@0^@19@2@0#exprData_getCastNode
-^6578 13647$^@19@3@0#exprData_getCastTok
-^6579 13649@6@5@1@0@0^@19@2@0#exprData_getCastType
-^6580 13651@6@5@1@0@0^@19@2@0#exprData_getLiteral
-^6581 13653@6@5@1@0@0^@19@2@0#exprData_getId
-^6582 13655$^@19@3@0#exprData_getTok
-^6583 13657@6@5@1@0@0^@19@2@0#exprData_getType
-^6584 13659@6@5@1@0@0^@19@2@0#exprData_getOffsetType
-^6585 13661@6@5@1@0@0^@19@2@0#exprData_getOffsetName
-^6586 13663@6@5@1@0@0$@19@2@0#exprData_getSingle
-^6587 13665@6@5@1@0@0$@2@0@0#exprData_makeOp
-^6588 13667@6@5@1@0@0$@2@0@0#exprData_makeUop
-^6589 13669@6@5@1@0@0$@2@0@0#exprData_makeSingle
-^6590 13671@6@5@1@0@0$@2@0@0#exprData_makeTok
-^6591 13673@6@5@1@0@0$@2@0@0#exprData_makeIter
-^6592 13675@6@5@1@0@0$@2@0@0#exprData_makeTriple
-^6593 13677@6@5@1@0@0$@2@0@0#exprData_makeCall
-^6594 13679@6@5@1@0@0$@2@0@0#exprData_makeIterCall
-^6595 13681@6@5@1@0@0$@2@0@0#exprData_makeField
-^6596 13683@6@5@1@0@0$@2@0@0#exprData_makeOffsetof
-^6597 13685@6@5@1@0@0$@2@0@0#exprData_makeSizeofType
-^6598 13687@6@5@1@0@0$@2@0@0#exprData_makeCast
-^6599 13689@6@5@1@0@0$@2@0@0#exprData_makeInit
-^6600 13691@6@5@1@0@0$@2@0@0#exprData_makeCond
-^6601 13693@6@5@1@0@0$@2@0@0#exprData_makeFor
-^6602 17225$@0@s1@1@s1$@0#typeIdSet_emptySet
-^6603 17227$^$@0#typeIdSet_member
-^6604 17229$^$@0#typeIdSet_isEmpty
-^6605 17231$@0@s1@1@s1$@0#typeIdSet_single
-^6606 17233$@0@s1@1@s1$@0#typeIdSet_singleOpt
-^6607 17235$@0@s1@1@s1$@0#typeIdSet_insert
-^6608 17237$@0@s1@1@s1$@0#typeIdSet_removeFresh
-^6609 17239@6@5@1@0@0^@3@0@0#typeIdSet_unparse
-^6610 17243$@0@s1@1@s1$@0#typeIdSet_subtract
-^6611 17241$$$@0#typeIdSet_compare
-^6612 17245@6@5@1@0@0$@3@0@0#typeIdSet_dump
-^6613 17247$@0@s1@1@s1,tp0$@0#typeIdSet_undump
-^6614 17249$^$@0#typeIdSet_union
-^6615 17206$@1@s1@1@s1$@0#typeIdSet_initMod
-^6616 17209$@1@s1@1@s1$@0#typeIdSet_destroyMod
-^6617 17211$@0@@1@tp0$@0#typeIdSet_dumpTable
-^6618 17215$@0@s1@1@tp0,s1$@0#typeIdSet_loadTable
+^6467 20610@6@5@1@0@0^@3@0@0#exprNode_makeInitBlock
+^6468 20612@6@5@1@0@0^@3@0@0#exprNode_functionCall
+^6469 20568@6@2@1@0@0@1@s1@1@@3@0@0#exprNode_fromIdentifier
+^6470 20564@6@5@1@0@0@1@s1@1@@3@0@0#exprNode_fromUIO
+^6471 20616@6@5@1@0@0^@3@0@0#exprNode_fieldAccess
+^6472 20622@6@5@1@0@0^@3@0@0#exprNode_arrowAccess
+^6473 20624@6@5@1@0@0@0@@1@p0@3@0@0#exprNode_postOp
+^6474 20626@6@5@1@0@0^@3@0@0#exprNode_preOp
+^6475 20618@6@5@1@0@0^@3@0@0#exprNode_addParens
+^6476 20634@6@5@1@0@0^@3@0@0#exprNode_offsetof
+^6477 20630@6@5@1@0@0^@3@0@0#exprNode_sizeofType
+^6478 20636@6@5@1@0@0^@3@0@0#exprNode_sizeofExpr
+^6479 20632@6@5@1@0@0^@3@0@0#exprNode_alignofType
+^6480 20638@6@5@1@0@0^@3@0@0#exprNode_alignofExpr
+^6481 20648@6@5@1@0@0^@3@0@0#exprNode_op
+^6482 20652@6@5@1@0@0$@3@0@0#exprNode_assign
+^6483 20576@6@5@1@0@0@0@@1@p0,p1@3@0@0#exprNode_arrayFetch
+^6484 20520$$$@0#exprNode_free
+^6485 20656@6@5@1@0@0@1@s1@1@@3@0@0#exprNode_vaArg
+^6486 20562@6@5@1@0@0^@3@0@0#exprNode_stringLiteral
+^6487 20560@6@5@1@0@0^@3@0@0#exprNode_rawStringLiteral
+^6488 20732@6@5@1@0@0^@3@0@0#exprNode_comma
+^6489 20658@6@5@1@0@0$@3@0@0#exprNode_labelMarker
+^6490 20660@6@5@1@0@0$$@0#exprNode_notReached
+^6491 20668@6@5@1@0@0^@3@0@0#exprNode_caseMarker
+^6492 20680@6@5@1@0@0$@3@0@0#exprNode_concat
+^6493 20682@6@5@1@0@0^@3@0@0#exprNode_createTok
+^6494 20684@6@5@1@0@0$@3@0@0#exprNode_statement
+^6495 20692@6@5@1@0@0$@3@0@0#exprNode_makeBlock
+^6496 20700@6@5@1@0@0$@3@0@0#exprNode_if
+^6497 20702@6@5@1@0@0$@3@0@0#exprNode_ifelse
+^6498 20706@6@5@1@0@0$@3@0@0#exprNode_switch
+^6499 20710@6@5@1@0@0$@3@0@0#exprNode_while
+^6500 20712@6@5@1@0@0$@3@0@0#exprNode_doWhile
+^6501 20722@6@2@1@0@0$@2@0@0#exprNode_goto
+^6502 20724@6@5@1@0@0$@3@0@0#exprNode_continue
+^6503 20726@6@5@1@0@0$@3@0@0#exprNode_break
+^6504 20728@6@5@1@0@0$@3@0@0#exprNode_nullReturn
+^6505 20730@6@5@1@0@0$@3@0@0#exprNode_return
+^6506 20756@6@5@1@0@0^@18@3@0#exprNode_unparse
+^6507 20770$^$@0#exprNode_isCharLit
+^6508 20772$^$@0#exprNode_isNumLit
+^6509 20740@6@5@1@0@0$@3@0@0#exprNode_makeInitialization
+^6510 20738@6@5@1@0@0$@3@0@0#exprNode_makeEmptyInitialization
+^6511 20768$^$@0#exprNode_isInitializer
+^6512 20778$$$@0#exprNode_matchType
+^6513 20670@6@2@1@0@0$@2@0@0#exprNode_defaultMarker
+^6514 20742@6@5@1@0@0$@3@0@0#exprNode_iter
+^6515 20748@6@5@1@0@0$@3@0@0#exprNode_iterId
+^6516 20746@6@5@1@0@0$$@0#exprNode_iterExpr
+^6517 20744@6@5@1@0@0$@3@0@0#exprNode_iterNewId
+^6518 20750@6@5@1@0@0$@3@0@0#exprNode_iterStart
+^6519 20550@6@5@1@0@0$@3@0@0#exprNode_numLiteral
+^6520 20502$@1@s1@1@s1$@0#exprNode_initMod
+^6521 20714@6@5@1@0@0$@3@0@0#exprNode_for
+^6522 20720@6@5@1@0@0$@3@0@0#exprNode_forPred
+^6523 20554@6@5@1@0@0$@3@0@0#exprNode_floatLiteral
+^6524 20566@6@2@1@0@0$@3@0@0#exprNode_createId
+^6525 20640@6@5@1@0@0$@3@0@0#exprNode_cast
+^6526 20776$$$@0#exprNode_matchLiteral
+^6527 20812$$$@0#exprNode_checkUseParam
+^6528 20802$$$@0#exprNode_checkSet
+^6529 20804$$$@0#exprNode_checkMSet
+^6530 20688@6@5@1@0@0$$@0#exprNode_checkExpr
+^6531 20676$$$@0#exprNode_mustEscape
+^6532 20678$$$@0#exprNode_errorEscape
+^6533 20672$$$@0#exprNode_mayEscape
+^6534 20718@6@5@1@0@0$@3@0@0#exprNode_whilePred
+^6535 20828@6@5@1@0@0$$@0#exprNode_updateLocation
+^6536 20518$$$@0#exprNode_freeShallow
+^6537 20504$@1@s1@1@s1$@0#exprNode_destroyMod
+^6538 20696$^$@0#exprNode_isAssign
+^6539 20834@6@5@1@0@0$@19@3@0#exprNode_getfileloc
+^6540 20662$^$@0#exprNode_isDefaultMarker
+^6541 20664$^$@0#exprNode_isCaseMarker
+^6542 20666$^$@0#exprNode_isLabelMarker
+^6543 20558@6@5@1@0@0$@2@0@0#exprNode_combineLiterals
+^6544 20836@6@5@1@0@0$@2@0@0#exprNode_getNextSequencePoint
+^6545 20838@6@5@1@0@0$@3@0@0#exprNode_createNew
+^6546 20840$$$@0#exprNode_isInitBlock
+^6547 13687@6@5@1@0@0$@2@0@0#exprData_makeLiteral
+^6548 13689@6@5@1@0@0$@2@0@0#exprData_makeId
+^6549 13691@6@5@1@0@0$@2@0@0#exprData_makePair
+^6550 13583$$$@0#exprData_freeShallow
+^6551 13585$$$@0#exprData_free
+^6552 13587@6@5@1@0@0^@19@2@0#exprData_getInitNode
+^6553 13589@6@5@1@0@0^@19@2@0#exprData_getInitId
+^6554 13591@6@5@1@0@0^@19@2@0#exprData_getOpA
+^6555 13593@6@5@1@0@0^@19@2@0#exprData_getOpB
+^6556 13595$^@19@3@0#exprData_getOpTok
+^6557 13597@6@5@1@0@0^@19@2@0#exprData_getPairA
+^6558 13599@6@5@1@0@0^@19@2@0#exprData_getPairB
+^6559 13601@6@5@1@0@0^@19@2@0#exprData_getIterSname
+^6560 13603$^@19@2@0#exprData_getIterAlist
+^6561 13605@6@5@1@0@0^@19@2@0#exprData_getIterBody
+^6562 13607@6@5@1@0@0^@19@2@0#exprData_getIterEname
+^6563 13609@6@5@1@0@0^@19@2@0#exprData_getFcn
+^6564 13611$^@19@2@0#exprData_getArgs
+^6565 13613@6@5@1@0@0^@19@2@0#exprData_getTriplePred
+^6566 13615@6@5@1@0@0^@19@2@0#exprData_getIterCallIter
+^6567 13617$^@19@2@0#exprData_getIterCallArgs
+^6568 13619@6@5@1@0@0^@19@2@0#exprData_getTripleInit
+^6569 13621@6@5@1@0@0^@19@2@0#exprData_getTripleTrue
+^6570 13623@6@5@1@0@0^@19@2@0#exprData_getTripleTest
+^6571 13625@6@5@1@0@0^@19@2@0#exprData_getTripleFalse
+^6572 13627@6@5@1@0@0^@19@2@0#exprData_getTripleInc
+^6573 13629@6@5@1@0@0^@19@2@0#exprData_getFieldNode
+^6574 13631@6@5@1@0@0^@19@2@0#exprData_getFieldName
+^6575 13633$^@19@3@0#exprData_getUopTok
+^6576 13635@6@5@1@0@0^@19@2@0#exprData_getUopNode
+^6577 13637@6@5@1@0@0^@19@2@0#exprData_getCastNode
+^6578 13639$^@19@3@0#exprData_getCastTok
+^6579 13641@6@5@1@0@0^@19@2@0#exprData_getCastType
+^6580 13643@6@5@1@0@0^@19@2@0#exprData_getLiteral
+^6581 13645@6@5@1@0@0^@19@2@0#exprData_getId
+^6582 13647$^@19@3@0#exprData_getTok
+^6583 13649@6@5@1@0@0^@19@2@0#exprData_getType
+^6584 13651@6@5@1@0@0^@19@2@0#exprData_getOffsetType
+^6585 13653@6@5@1@0@0^@19@2@0#exprData_getOffsetName
+^6586 13655@6@5@1@0@0$@19@2@0#exprData_getSingle
+^6587 13657@6@5@1@0@0$@2@0@0#exprData_makeOp
+^6588 13659@6@5@1@0@0$@2@0@0#exprData_makeUop
+^6589 13661@6@5@1@0@0$@2@0@0#exprData_makeSingle
+^6590 13663@6@5@1@0@0$@2@0@0#exprData_makeTok
+^6591 13665@6@5@1@0@0$@2@0@0#exprData_makeIter
+^6592 13667@6@5@1@0@0$@2@0@0#exprData_makeTriple
+^6593 13669@6@5@1@0@0$@2@0@0#exprData_makeCall
+^6594 13671@6@5@1@0@0$@2@0@0#exprData_makeIterCall
+^6595 13673@6@5@1@0@0$@2@0@0#exprData_makeField
+^6596 13675@6@5@1@0@0$@2@0@0#exprData_makeOffsetof
+^6597 13677@6@5@1@0@0$@2@0@0#exprData_makeSizeofType
+^6598 13679@6@5@1@0@0$@2@0@0#exprData_makeCast
+^6599 13681@6@5@1@0@0$@2@0@0#exprData_makeInit
+^6600 13683@6@5@1@0@0$@2@0@0#exprData_makeCond
+^6601 13685@6@5@1@0@0$@2@0@0#exprData_makeFor
+^6602 17217$@0@s1@1@s1$@0#typeIdSet_emptySet
+^6603 17219$^$@0#typeIdSet_member
+^6604 17221$^$@0#typeIdSet_isEmpty
+^6605 17223$@0@s1@1@s1$@0#typeIdSet_single
+^6606 17225$@0@s1@1@s1$@0#typeIdSet_singleOpt
+^6607 17227$@0@s1@1@s1$@0#typeIdSet_insert
+^6608 17229$@0@s1@1@s1$@0#typeIdSet_removeFresh
+^6609 17231@6@5@1@0@0^@3@0@0#typeIdSet_unparse
+^6610 17235$@0@s1@1@s1$@0#typeIdSet_subtract
+^6611 17233$$$@0#typeIdSet_compare
+^6612 17237@6@5@1@0@0$@3@0@0#typeIdSet_dump
+^6613 17239$@0@s1@1@s1,tp0$@0#typeIdSet_undump
+^6614 17241$^$@0#typeIdSet_union
+^6615 17198$@1@s1@1@s1$@0#typeIdSet_initMod
+^6616 17201$@1@s1@1@s1$@0#typeIdSet_destroyMod
+^6617 17203$@0@@1@tp0$@0#typeIdSet_dumpTable
+^6618 17207$@0@s1@1@tp0,s1$@0#typeIdSet_loadTable
 *1 (Constant)
 ^6619 1054$#typeIdSet_undefined#typeIdSet_empty
 *0 (Datatype)
@@ -27344,78 +27336,78 @@
 *5 (Iterator)
 ^6625 8022@197#idDeclList_elements
 *4 (Function)
-^6626 17121$$@2@0@0#idDeclList_singleton
-^6627 17126$$$@0#idDeclList_add
-^6628 17128@6@5@1@0@0$@2@0@0#idDeclList_unparse
-^6629 17130$$$@0#idDeclList_free
+^6626 17113$$@2@0@0#idDeclList_singleton
+^6627 17118$$$@0#idDeclList_add
+^6628 17120@6@5@1@0@0$@2@0@0#idDeclList_unparse
+^6629 17122$$$@0#idDeclList_free
 *1 (Constant)
 ^6630 5$#idDeclListBASESIZE
 *4 (Function)
-^6631 12936$@0@s1@1@s1$@0#setArgsUsed
-^6632 12940$@0@s1@1@s1$@0#setSpecialFunction
+^6631 12928$@0@s1@1@s1$@0#setArgsUsed
+^6632 12932$@0@s1@1@s1$@0#setSpecialFunction
 ^6633 8036$^$@0#isFlipOldStyle
 ^6634 8038$^$@0#isNewStyle
-^6635 13056$^$@0#processingIterVars
-^6636 12966$$$@0#declareEnum
-^6637 13046$$$@0#declareStruct
-^6638 13042$$$@0#declareUnnamedStruct
-^6639 13048$$$@0#declareUnion
-^6640 13044$$$@0#declareUnnamedUnion
-^6641 12964$$$@0#declareUnnamedEnum
-^6642 13054$$$@0#handleEnum
-^6643 13050$$$@0#handleStruct
-^6644 13052$$$@0#handleUnion
-^6645 13068@6@5@1@0@0$@18@0@0#handleParamIdList
-^6646 13070@6@5@1@0@0$@18@0@0#handleParamTypeList
-^6647 12998@6@5@1@0@0$@3@0@0#fixUentryList
-^6648 13000@6@5@1@0@0^@3@0@0#fixUnnamedDecl
-^6649 13058@6@5@1@0@0$@19@2@0#getCurrentIter
-^6650 13038$$$@0#processNamedDecl
-^6651 13030$@0@s1@1@s1$@0#clabstract_declareType
-^6652 12992$@1@s1@1@$@0#clabstract_declareFunction
+^6635 13048$^$@0#processingIterVars
+^6636 12958$$$@0#declareEnum
+^6637 13038$$$@0#declareStruct
+^6638 13034$$$@0#declareUnnamedStruct
+^6639 13040$$$@0#declareUnion
+^6640 13036$$$@0#declareUnnamedUnion
+^6641 12956$$$@0#declareUnnamedEnum
+^6642 13046$$$@0#handleEnum
+^6643 13042$$$@0#handleStruct
+^6644 13044$$$@0#handleUnion
+^6645 13060@6@5@1@0@0$@18@0@0#handleParamIdList
+^6646 13062@6@5@1@0@0$@18@0@0#handleParamTypeList
+^6647 12990@6@5@1@0@0$@3@0@0#fixUentryList
+^6648 12992@6@5@1@0@0^@3@0@0#fixUnnamedDecl
+^6649 13050@6@5@1@0@0$@19@2@0#getCurrentIter
+^6650 13030$$$@0#processNamedDecl
+^6651 13022$@0@s1@1@s1$@0#clabstract_declareType
+^6652 12984$@1@s1@1@$@0#clabstract_declareFunction
 ^6653 8076$$$@0#doVaDcl
 ^6654 8078$$$@0#oldStyleDoneParams
-^6655 12974$$$@0#setCurrentParams
-^6656 12976$$$@0#clearCurrentParams
-^6657 13088@6@5@1@0@0$@19@2@0#fixModifiesId
-^6658 13090@6@5@1@0@0$@19@2@0#fixStateClausesId
+^6655 12966$$$@0#setCurrentParams
+^6656 12968$$$@0#clearCurrentParams
+^6657 13080@6@5@1@0@0$@19@2@0#fixModifiesId
+^6658 13082@6@5@1@0@0$@19@2@0#fixStateClausesId
 ^6659 8088$$$@0#setFlipOldStyle
 ^6660 8090$$$@0#setNewStyle
 ^6661 8092$$$@0#unsetProcessingGlobals
-^6662 13004$$$@0#setProcessingIterVars
-^6663 13022$$$@0#setProcessingTypedef
-^6664 13018$$$@0#setProcessingVars
-^6665 13002$$$@0#setStorageClass
+^6662 12996$$$@0#setProcessingIterVars
+^6663 13014$$$@0#setProcessingTypedef
+^6664 13010$$$@0#setProcessingVars
+^6665 12994$$$@0#setStorageClass
 ^6666 8102$$$@0#storeLoc
 ^6667 8104$$$@0#unsetProcessingTypedef
 ^6668 8106$$$@0#unsetProcessingVars
-^6669 12962@6@5@1@0@0$@2@0@0#makeCurrentParam
+^6669 12954@6@5@1@0@0$@2@0@0#makeCurrentParam
 ^6670 8110$$$@0#setProcessingGlobalsList
-^6671 13092@6@5@1@0@0$@19@2@0#modListArrayFetch
-^6672 13074@6@5@1@0@0$@19@2@0#modListPointer
-^6673 13076@6@5@1@0@0$@19@2@0#modListFieldAccess
-^6674 13080@6@5@1@0@0$@19@2@0#modListArrowAccess
-^6675 13078@6@5@1@0@0$@18@0@0#clabstract_unrecognizedGlobal
-^6676 12954@6@5@1@0@0$@18@0@0#clabstract_createGlobal
+^6671 13084@6@5@1@0@0$@19@2@0#modListArrayFetch
+^6672 13066@6@5@1@0@0$@19@2@0#modListPointer
+^6673 13068@6@5@1@0@0$@19@2@0#modListFieldAccess
+^6674 13072@6@5@1@0@0$@19@2@0#modListArrowAccess
+^6675 13070@6@5@1@0@0$@18@0@0#clabstract_unrecognizedGlobal
+^6676 12946@6@5@1@0@0$@18@0@0#clabstract_createGlobal
 ^6677 8124$$$@0#checkDoneParams
-^6678 12982$$$@0#exitParamsTemp
-^6679 12980$$$@0#enterParamsTemp
+^6678 12974$$$@0#exitParamsTemp
+^6679 12972$$$@0#enterParamsTemp
 ^6680 8130$$$@0#clearProcessingGlobMods
 ^6681 8132$$$@0#isProcessingGlobMods
 ^6682 8134$$$@0#setProcessingGlobMods
-^6683 12950$$$@0#setFunctionNoGlobals
-^6684 12960$$$@0#iterParamNo
-^6685 12958$$$@0#nextIterParam
-^6686 12956$$$@0#declareCIter
-^6687 13086$$$@0#checkModifiesId
-^6688 13082@6@5@1@0@0$@19@2@0#checkStateClausesId
-^6689 13034$$$@0#checkConstant
-^6690 13036$$$@0#checkValueConstant
-^6691 12994$@1@s1@1@$@0#declareStaticFunction
-^6692 13084@6@5@1@0@0$@3@0@0#checkbufferConstraintClausesId
-^6693 12970$$$@0#setImplictfcnConstraints
-^6694 12972@6@5@1@0@0$@19@3@0#getImplicitFcnConstraints
-^6695 13096@6@5@1@0@0$@18@0@0#clabstract_checkGlobal
+^6683 12942$$$@0#setFunctionNoGlobals
+^6684 12952$$$@0#iterParamNo
+^6685 12950$$$@0#nextIterParam
+^6686 12948$$$@0#declareCIter
+^6687 13078$$$@0#checkModifiesId
+^6688 13074@6@5@1@0@0$@19@2@0#checkStateClausesId
+^6689 13026$$$@0#checkConstant
+^6690 13028$$$@0#checkValueConstant
+^6691 12986$@1@s1@1@$@0#declareStaticFunction
+^6692 13076@6@5@1@0@0$@3@0@0#checkbufferConstraintClausesId
+^6693 12962$$$@0#setImplictfcnConstraints
+^6694 12964@6@5@1@0@0$@19@3@0#getImplicitFcnConstraints
+^6695 13088@6@5@1@0@0$@18@0@0#clabstract_checkGlobal
 ^6696 8162$@0@s1@1@s1$@0#clabstract_initMod
 *0 (Datatype)
 ^6697 1073@-@+@0@5@18@0@8163#d_sRefSet
@@ -27430,9 +27422,9 @@
 *1 (Constant)
 ^6702 8168@i0@0@4#sRefSetList_undefined
 *4 (Function)
-^6703 16862@6@5@1@0@0@0@@1@p0$@0#sRefSetList_add
-^6704 16866$$$@0#sRefSetList_free
-^6705 16864$$$@0#sRefSetList_clear
+^6703 16854@6@5@1@0@0@0@@1@p0$@0#sRefSetList_add
+^6704 16858$$$@0#sRefSetList_free
+^6705 16856$$$@0#sRefSetList_clear
 *1 (Constant)
 ^6706 5$#sRefSetListBASESIZE
 *2 (Enum member)
@@ -27448,18 +27440,18 @@
 *0 (Datatype)
 ^6716 8187@-@+@0@0@0@0@8188#flagMarker
 *4 (Function)
-^6717 14299$^@3@0@0#flagMarker_createLocalSet
-^6718 14303$^@3@0@0#flagMarker_createIgnoreOn
-^6719 14307$^@3@0@0#flagMarker_createIgnoreOff
-^6720 14305$^@3@0@0#flagMarker_createIgnoreCount
-^6721 14301$^@3@0@0#flagMarker_createSuppress
-^6722 14317$$$@0#flagMarker_free
-^6723 14319$^$@0#flagMarker_sameFile
-^6724 14315@6@5@1@0@0^@2@0@0#flagMarker_unparse
-^6725 14321$^$@0#flagMarker_beforeMarker
-^6726 14309$^$@0#flagMarker_getSet
-^6727 14311$^$@0#flagMarker_getCode
-^6728 14313$^$@0#flagMarker_getCount
+^6717 14291$^@3@0@0#flagMarker_createLocalSet
+^6718 14295$^@3@0@0#flagMarker_createIgnoreOn
+^6719 14299$^@3@0@0#flagMarker_createIgnoreOff
+^6720 14297$^@3@0@0#flagMarker_createIgnoreCount
+^6721 14293$^@3@0@0#flagMarker_createSuppress
+^6722 14309$$$@0#flagMarker_free
+^6723 14311$^$@0#flagMarker_sameFile
+^6724 14307@6@5@1@0@0^@2@0@0#flagMarker_unparse
+^6725 14313$^$@0#flagMarker_beforeMarker
+^6726 14301$^$@0#flagMarker_getSet
+^6727 14303$^$@0#flagMarker_getCode
+^6728 14305$^$@0#flagMarker_getCount
 *0 (Datatype)
 ^6729 8188@-@+@0@0@2@0@8225#o_flagMarker
 *7 (Struct tag)
@@ -27468,12 +27460,12 @@
 ^6731 8229@+@=@0@0@0@0@8230#flagMarkerList
 *4 (Function)
 ^6732 8232$^@2@0@0#flagMarkerList_new
-^6733 17111@6@5@1@0@0^@2@0@0#flagMarkerList_unparse
-^6734 17113$$$@0#flagMarkerList_free
-^6735 17105$@0@@1@p0$@0#flagMarkerList_add
-^6736 17117$^$@0#flagMarkerList_suppressError
-^6737 17107$@0@g2675@0@0@1@g2675$@0#flagMarkerList_checkSuppressCounts
-^6738 17119$^$@0#flagMarkerList_inIgnore
+^6733 17103@6@5@1@0@0^@2@0@0#flagMarkerList_unparse
+^6734 17105$$$@0#flagMarkerList_free
+^6735 17097$@0@@1@p0$@0#flagMarkerList_add
+^6736 17109$^$@0#flagMarkerList_suppressError
+^6737 17099$@0@g2675@0@0@1@g2675$@0#flagMarkerList_checkSuppressCounts
+^6738 17111$^$@0#flagMarkerList_inIgnore
 *1 (Constant)
 ^6739 5$#flagMarkerListBASESIZE
 *7 (Struct tag)
@@ -27486,14 +27478,14 @@
 *0 (Datatype)
 ^6744 8253@-@+@0@0@0@0@8254#macrocache
 *4 (Function)
-^6745 12063$$$@0#macrocache_processUndefinedElements
-^6746 12065@6@5@1@0@0$@19@3@0#macrocache_processFileElements
-^6747 12057@6@5@1@0@0^@2@0@0#macrocache_unparse
-^6748 12042$^@2@0@0#macrocache_create
-^6749 12051$$$@0#macrocache_addEntry
-^6750 12053$$$@0#macrocache_addComment
-^6751 12045$$$@0#macrocache_free
-^6752 12067$@0@s1@1@s1$@0#macrocache_finalize
+^6745 12055$$$@0#macrocache_processUndefinedElements
+^6746 12057@6@5@1@0@0$@19@3@0#macrocache_processFileElements
+^6747 12049@6@5@1@0@0^@2@0@0#macrocache_unparse
+^6748 12034$^@2@0@0#macrocache_create
+^6749 12043$$$@0#macrocache_addEntry
+^6750 12045$$$@0#macrocache_addComment
+^6751 12037$$$@0#macrocache_free
+^6752 12059$@0@s1@1@s1$@0#macrocache_finalize
 *1 (Constant)
 ^6753 5$#FTBASESIZE
 *2 (Enum member)
@@ -27514,35 +27506,35 @@
 *1 (Constant)
 ^6768 8283@i0@0@4#fileTable_undefined
 *4 (Function)
-^6769 14016@6@5@1@0@0^@19@3@0#fileTable_getName
-^6770 14020@6@5@1@0@0$@19@3@0#fileTable_getNameBase
-^6771 13978$@0@@1@p0$@0#fileTable_addFile
-^6772 13982$@0@@1@p0$@0#fileTable_addHeaderFile
-^6773 13994$@0@@1@p0$@0#fileTable_addXHFile
-^6774 13992$@0@@1@p0$@0#fileTable_addLibraryFile
-^6775 13998$@0@@1@p0$@0#fileTable_addLCLFile
-^6776 14006$$$@0#fileTable_addltemp
+^6769 14008@6@5@1@0@0^@19@3@0#fileTable_getName
+^6770 14012@6@5@1@0@0$@19@3@0#fileTable_getNameBase
+^6771 13970$@0@@1@p0$@0#fileTable_addFile
+^6772 13974$@0@@1@p0$@0#fileTable_addHeaderFile
+^6773 13986$@0@@1@p0$@0#fileTable_addXHFile
+^6774 13984$@0@@1@p0$@0#fileTable_addLibraryFile
+^6775 13990$@0@@1@p0$@0#fileTable_addLCLFile
+^6776 13998$$$@0#fileTable_addltemp
 ^6777 8305@6@2@1@0@0^@2@0@0#fileTable_create
-^6778 14010$^$@0#fileTable_lookup
-^6779 14004$@0@@1@p0$@0#fileTable_addCTempFile
-^6780 13980$@0@@1@p0$@0#fileTable_addFileOnly
-^6781 13996$@0@@1@p0$@0#fileTable_addImportFile
-^6782 14000$@0@@1@p0$@0#fileTable_addMacrosFile
-^6783 14002$@0@@1@p0$@0#fileTable_addMetastateFile
-^6784 14012$@0@@1@p0$@0#fileTable_setFilePath
-^6785 14018@6@5@1@0@0^@19@3@0#fileTable_getRootName
-^6786 13984$^$@0#fileTable_isHeader
-^6787 14022$$$@0#fileTable_sameBase
-^6788 14024$@0@s3@1@s3$@0#fileTable_cleanup
-^6789 14014$@0@@1@p0$@0#fileTable_lookupBase
-^6790 13961$@0@g2675@0@0@1@g2675$@0#fileTable_printTemps
-^6791 13959@6@5@1@0@0^@2@0@0#fileTable_unparse
-^6792 14008$^$@0#fileTable_exists
-^6793 14026$$$@0#fileTable_free
-^6794 13990$^$@0#fileTable_isSpecialFile
-^6795 13986$^$@0#fileTable_isSystemFile
-^6796 13988$^$@0#fileTable_isXHFile
-^6797 13974$$$@0#fileTable_noDelete
+^6778 14002$^$@0#fileTable_lookup
+^6779 13996$@0@@1@p0$@0#fileTable_addCTempFile
+^6780 13972$@0@@1@p0$@0#fileTable_addFileOnly
+^6781 13988$@0@@1@p0$@0#fileTable_addImportFile
+^6782 13992$@0@@1@p0$@0#fileTable_addMacrosFile
+^6783 13994$@0@@1@p0$@0#fileTable_addMetastateFile
+^6784 14004$@0@@1@p0$@0#fileTable_setFilePath
+^6785 14010@6@5@1@0@0^@19@3@0#fileTable_getRootName
+^6786 13976$^$@0#fileTable_isHeader
+^6787 14014$$$@0#fileTable_sameBase
+^6788 14016$@0@s3@1@s3$@0#fileTable_cleanup
+^6789 14006$@0@@1@p0$@0#fileTable_lookupBase
+^6790 13953$@0@g2675@0@0@1@g2675$@0#fileTable_printTemps
+^6791 13951@6@5@1@0@0^@2@0@0#fileTable_unparse
+^6792 14000$^$@0#fileTable_exists
+^6793 14018$$$@0#fileTable_free
+^6794 13982$^$@0#fileTable_isSpecialFile
+^6795 13978$^$@0#fileTable_isSystemFile
+^6796 13980$^$@0#fileTable_isXHFile
+^6797 13966$$$@0#fileTable_noDelete
 *7 (Struct tag)
 ^6798 8356@8357#@!211
 *0 (Datatype)
@@ -27556,9 +27548,9 @@
 ^6803 8365@i0@0@4#messageLog_undefined
 *4 (Function)
 ^6804 8369@6@5@1@0@0^@2@0@0#messageLog_new
-^6805 14293$@0@@1@p0$@0#messageLog_add
-^6806 14295@6@5@1@0@0^@2@0@0#messageLog_unparse
-^6807 14297$$$@0#messageLog_free
+^6805 14285$@0@@1@p0$@0#messageLog_add
+^6806 14287@6@5@1@0@0^@2@0@0#messageLog_unparse
+^6807 14289$$$@0#messageLog_free
 *1 (Constant)
 ^6808 5$#messageLogBASESIZE
 *7 (Struct tag)
@@ -27571,15 +27563,15 @@
 ^6812 8381@202#clauseStack_elements
 *4 (Function)
 ^6813 8387$^@2@0@0#clauseStack_new
-^6814 16751$@0@@1@p0$@0#clauseStack_push
-^6815 16753$@0@@1@p0$@0#clauseStack_pop
-^6816 16755$^$@0#clauseStack_top
-^6817 16763@6@5@1@0@0^@2@0@0#clauseStack_unparse
-^6818 16767$$$@0#clauseStack_free
-^6819 16765$@0@@1@p0$@0#clauseStack_clear
-^6820 16757$@0@@1@p0$@0#clauseStack_switchTop
-^6821 16759$@0@@1@p0$@0#clauseStack_removeFirst
-^6822 16761$^$@0#clauseStack_controlDepth
+^6814 16743$@0@@1@p0$@0#clauseStack_push
+^6815 16745$@0@@1@p0$@0#clauseStack_pop
+^6816 16747$^$@0#clauseStack_top
+^6817 16755@6@5@1@0@0^@2@0@0#clauseStack_unparse
+^6818 16759$$$@0#clauseStack_free
+^6819 16757$@0@@1@p0$@0#clauseStack_clear
+^6820 16749$@0@@1@p0$@0#clauseStack_switchTop
+^6821 16751$@0@@1@p0$@0#clauseStack_removeFirst
+^6822 16753$^$@0#clauseStack_controlDepth
 *1 (Constant)
 ^6823 5$#clauseStackBASESIZE
 *7 (Struct tag)
@@ -27595,28 +27587,28 @@
 *0 (Datatype)
 ^6829 8418@+@=@0@0@0@0@8419#stateCombinationTable
 *4 (Function)
-^6830 20058$$@2@0@0#stateCombinationTable_create
-^6831 20070$$$@0#stateCombinationTable_set
-^6832 20072$$$@0#stateCombinationTable_update
-^6833 20074$$$@0#stateCombinationTable_lookup
-^6834 20076$$$@0#stateCombinationTable_lookupLoseReference
-^6835 20066$$$@0#stateCombinationTable_free
-^6836 20060@6@5@1@0@0^@3@0@0#stateCombinationTable_unparse
-^6837 20148$@0@@1@s0@3@0@0#mttok_create
-^6838 20146@6@5@1@0@0^@2@0@0#mttok_unparse
-^6839 20152$$$@0#mttok_free
-^6840 20150@6@5@1@0@0@0@@1@p0@2@0@0#mttok_stealLoc
-^6841 20156$^$@0#mttok_isIdentifier
-^6842 20154$^$@0#mttok_isError
-^6843 9892$@0@s1@1@s1$@0#mtreader_readFile
-^6844 9894$@0@s1@1@s1$@0#mtreader_processDeclaration
-^6845 9896$@0@s1@1@s1$@0#mtreader_processGlobalDeclaration
-^6846 20158$^@3@0@0#mtDeclarationNode_create
-^6847 20168@6@5@1@0@0^@19@3@0#mtDeclarationNode_getName
-^6848 20166@6@5@1@0@0^@19@3@0#mtDeclarationNode_getLoc
-^6849 20160@6@5@1@0@0^@3@0@0#mtDeclarationNode_unparse
-^6850 20162$@0@s1@1@s1$@0#mtDeclarationNode_process
-^6851 20164$$$@0#mtDeclarationNode_free
+^6830 20050$$@2@0@0#stateCombinationTable_create
+^6831 20062$$$@0#stateCombinationTable_set
+^6832 20064$$$@0#stateCombinationTable_update
+^6833 20066$$$@0#stateCombinationTable_lookup
+^6834 20068$$$@0#stateCombinationTable_lookupLoseReference
+^6835 20058$$$@0#stateCombinationTable_free
+^6836 20052@6@5@1@0@0^@3@0@0#stateCombinationTable_unparse
+^6837 20140$@0@@1@s0@3@0@0#mttok_create
+^6838 20138@6@5@1@0@0^@2@0@0#mttok_unparse
+^6839 20144$$$@0#mttok_free
+^6840 20142@6@5@1@0@0@0@@1@p0@2@0@0#mttok_stealLoc
+^6841 20148$^$@0#mttok_isIdentifier
+^6842 20146$^$@0#mttok_isError
+^6843 9890$@0@s1@1@s1$@0#mtreader_readFile
+^6844 9892$@0@s1@1@s1$@0#mtreader_processDeclaration
+^6845 9894$@0@s1@1@s1$@0#mtreader_processGlobalDeclaration
+^6846 20150$^@3@0@0#mtDeclarationNode_create
+^6847 20160@6@5@1@0@0^@19@3@0#mtDeclarationNode_getName
+^6848 20158@6@5@1@0@0^@19@3@0#mtDeclarationNode_getLoc
+^6849 20152@6@5@1@0@0^@3@0@0#mtDeclarationNode_unparse
+^6850 20154$@0@s1@1@s1$@0#mtDeclarationNode_process
+^6851 20156$$$@0#mtDeclarationNode_free
 *2 (Enum member)
 ^6852 8476$#MTP_DEAD#MTP_CONTEXT#MTP_VALUES#MTP_DEFAULTS#MTP_DEFAULTVALUE#MTP_ANNOTATIONS#MTP_MERGE#MTP_TRANSFERS#MTP_PRECONDITIONS#MTP_POSTCONDITIONS#MTP_LOSERS
 *9 (Enum tag)
@@ -27626,38 +27618,38 @@
 *1 (Constant)
 ^6865 1145@i0@0@4#mtDeclarationPiece_undefined
 *4 (Function)
-^6866 20182@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createContext
-^6867 20184@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createValues
-^6868 20186@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createDefaults
-^6869 20188@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createValueDefault
-^6870 20190@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createAnnotations
-^6871 20192@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createMerge
-^6872 20194@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createTransfers
-^6873 20198@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createPostconditions
-^6874 20196@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createPreconditions
-^6875 20200@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createLosers
-^6876 20206@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getContext
-^6877 20208@6@5@1@0@0@0@@1@p0@2@0@0#mtDeclarationPiece_stealContext
-^6878 20226$^@19@3@0#mtDeclarationPiece_getValues
-^6879 20210$^@19@3@0#mtDeclarationPiece_getDefaults
-^6880 20214$^@19@3@0#mtDeclarationPiece_getAnnotations
-^6881 20216$^@19@3@0#mtDeclarationPiece_getMerge
-^6882 20218@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getTransfers
-^6883 20222@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getPostconditions
-^6884 20220@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getPreconditions
-^6885 20212@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getDefaultValue
-^6886 20224@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getLosers
-^6887 20204$^$@0#mtDeclarationPiece_matchKind
-^6888 20228$$$@0#mtDeclarationPiece_free
-^6889 20202@6@5@1@0@0^@2@0@0#mtDeclarationPiece_unparse
+^6866 20174@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createContext
+^6867 20176@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createValues
+^6868 20178@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createDefaults
+^6869 20180@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createValueDefault
+^6870 20182@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createAnnotations
+^6871 20184@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createMerge
+^6872 20186@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createTransfers
+^6873 20190@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createPostconditions
+^6874 20188@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createPreconditions
+^6875 20192@6@5@1@0@0^@3@0@0#mtDeclarationPiece_createLosers
+^6876 20198@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getContext
+^6877 20200@6@5@1@0@0@0@@1@p0@2@0@0#mtDeclarationPiece_stealContext
+^6878 20218$^@19@3@0#mtDeclarationPiece_getValues
+^6879 20202$^@19@3@0#mtDeclarationPiece_getDefaults
+^6880 20206$^@19@3@0#mtDeclarationPiece_getAnnotations
+^6881 20208$^@19@3@0#mtDeclarationPiece_getMerge
+^6882 20210@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getTransfers
+^6883 20214@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getPostconditions
+^6884 20212@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getPreconditions
+^6885 20204@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getDefaultValue
+^6886 20216@6@5@1@0@0^@19@3@0#mtDeclarationPiece_getLosers
+^6887 20196$^$@0#mtDeclarationPiece_matchKind
+^6888 20220$$$@0#mtDeclarationPiece_free
+^6889 20194@6@5@1@0@0^@2@0@0#mtDeclarationPiece_unparse
 *1 (Constant)
 ^6890 1148@i0@0@4#mtDeclarationPieces_undefined
 *4 (Function)
-^6891 20170@6@5@1@0@0^@3@0@0#mtDeclarationPieces_create
-^6892 20172@6@5@1@0@0@0@@1@p0@2@0@0#mtDeclarationPieces_append
-^6893 20176@6@5@1@0@0^@19@2@0#mtDeclarationPieces_findPiece
-^6894 20174@6@5@1@0@0^@3@0@0#mtDeclarationPieces_unparse
-^6895 20178$$$@0#mtDeclarationPieces_free
+^6891 20162@6@5@1@0@0^@3@0@0#mtDeclarationPieces_create
+^6892 20164@6@5@1@0@0@0@@1@p0@2@0@0#mtDeclarationPieces_append
+^6893 20168@6@5@1@0@0^@19@2@0#mtDeclarationPieces_findPiece
+^6894 20166@6@5@1@0@0^@3@0@0#mtDeclarationPieces_unparse
+^6895 20170$$$@0#mtDeclarationPieces_free
 *2 (Enum member)
 ^6896 8547$#MTC_ANY#MTC_PARAM#MTC_RESULT#MTC_REFERENCE#MTC_CLAUSE#MTC_LITERAL#MTC_NULL
 *9 (Enum tag)
@@ -27668,45 +27660,45 @@
 ^6905 5$#MTC_NUMCONTEXTS
 ^6906 1151@i0@0@4#mtContextNode_undefined
 *4 (Function)
-^6907 20260@6@5@1@0@0^@3@0@0#mtContextNode_unparse
+^6907 20252@6@5@1@0@0^@3@0@0#mtContextNode_unparse
 ^6908 8556@6@5@1@0@0^@3@0@0#mtContextNode_createAny
-^6909 20238@6@5@1@0@0^@3@0@0#mtContextNode_createParameter
-^6910 20242@6@5@1@0@0^@3@0@0#mtContextNode_createReference
-^6911 20240@6@5@1@0@0^@3@0@0#mtContextNode_createResult
-^6912 20244@6@5@1@0@0^@3@0@0#mtContextNode_createClause
-^6913 20248@6@5@1@0@0^@3@0@0#mtContextNode_createNull
-^6914 20246@6@5@1@0@0^@3@0@0#mtContextNode_createLiteral
-^6915 20250$$$@0#mtContextNode_free
-^6916 20266$^$@0#mtContextNode_isReference
-^6917 20268$^$@0#mtContextNode_isResult
-^6918 20264$^$@0#mtContextNode_isParameter
-^6919 20262$^$@0#mtContextNode_isClause
-^6920 20270$^$@0#mtContextNode_isLiteral
-^6921 20272$^$@0#mtContextNode_isNull
-^6922 20252$^$@0#mtContextNode_matchesEntry
-^6923 20254$^$@0#mtContextNode_matchesRef
-^6924 20256$^$@0#mtContextNode_matchesRefStrict
-^6925 20274$^@3@0@0#mtValuesNode_create
-^6926 20276$$$@0#mtValuesNode_free
-^6927 20278@6@5@1@0@0^@3@0@0#mtValuesNode_unparse
-^6928 20280$^@3@0@0#mtDefaultsNode_create
-^6929 20282$$$@0#mtDefaultsNode_free
-^6930 20284@6@5@1@0@0^@3@0@0#mtDefaultsNode_unparse
-^6931 20407@6@5@1@0@0^@3@0@0#mtDefaultsDecl_unparse
-^6932 20403$^@3@0@0#mtDefaultsDecl_create
-^6933 20405$$$@0#mtDefaultsDecl_free
+^6909 20230@6@5@1@0@0^@3@0@0#mtContextNode_createParameter
+^6910 20234@6@5@1@0@0^@3@0@0#mtContextNode_createReference
+^6911 20232@6@5@1@0@0^@3@0@0#mtContextNode_createResult
+^6912 20236@6@5@1@0@0^@3@0@0#mtContextNode_createClause
+^6913 20240@6@5@1@0@0^@3@0@0#mtContextNode_createNull
+^6914 20238@6@5@1@0@0^@3@0@0#mtContextNode_createLiteral
+^6915 20242$$$@0#mtContextNode_free
+^6916 20258$^$@0#mtContextNode_isReference
+^6917 20260$^$@0#mtContextNode_isResult
+^6918 20256$^$@0#mtContextNode_isParameter
+^6919 20254$^$@0#mtContextNode_isClause
+^6920 20262$^$@0#mtContextNode_isLiteral
+^6921 20264$^$@0#mtContextNode_isNull
+^6922 20244$^$@0#mtContextNode_matchesEntry
+^6923 20246$^$@0#mtContextNode_matchesRef
+^6924 20248$^$@0#mtContextNode_matchesRefStrict
+^6925 20266$^@3@0@0#mtValuesNode_create
+^6926 20268$$$@0#mtValuesNode_free
+^6927 20270@6@5@1@0@0^@3@0@0#mtValuesNode_unparse
+^6928 20272$^@3@0@0#mtDefaultsNode_create
+^6929 20274$$$@0#mtDefaultsNode_free
+^6930 20276@6@5@1@0@0^@3@0@0#mtDefaultsNode_unparse
+^6931 20399@6@5@1@0@0^@3@0@0#mtDefaultsDecl_unparse
+^6932 20395$^@3@0@0#mtDefaultsDecl_create
+^6933 20397$$$@0#mtDefaultsDecl_free
 *0 (Datatype)
 ^6934 1163@-@+@0@0@2@0@8620#o_mtDefaultsDecl
 *1 (Constant)
 ^6935 1160@i0@0@4#mtDefaultsDeclList_undefined
 *4 (Function)
-^6936 20399@6@5@1@0@0^@3@0@0#mtDefaultsDeclList_unparseSep
+^6936 20391@6@5@1@0@0^@3@0@0#mtDefaultsDeclList_unparseSep
 ^6937 8632@6@5@1@0@0^@2@0@0#mtDefaultsDeclList_new
-^6938 20391@6@5@1@0@0^@2@0@0#mtDefaultsDeclList_single
-^6939 20393@6@5@1@0@0@0@@1@p0$@0#mtDefaultsDeclList_add
-^6940 20395@6@5@1@0@0@0@@1@p0$@0#mtDefaultsDeclList_prepend
-^6941 20397@6@5@1@0@0$@2@0@0#mtDefaultsDeclList_unparse
-^6942 20401$$$@0#mtDefaultsDeclList_free
+^6938 20383@6@5@1@0@0^@2@0@0#mtDefaultsDeclList_single
+^6939 20385@6@5@1@0@0@0@@1@p0$@0#mtDefaultsDeclList_add
+^6940 20387@6@5@1@0@0@0@@1@p0$@0#mtDefaultsDeclList_prepend
+^6941 20389@6@5@1@0@0$@2@0@0#mtDefaultsDeclList_unparse
+^6942 20393$$$@0#mtDefaultsDeclList_free
 *1 (Constant)
 ^6943 5$#mtDefaultsDeclListBASESIZE
 *6 (Iterator finalizer)
@@ -27714,19 +27706,19 @@
 *5 (Iterator)
 ^6945 8643@101#mtDefaultsDeclList_elements
 *4 (Function)
-^6946 20286$^@3@0@0#mtAnnotationsNode_create
-^6947 20290@6@5@1@0@0^@3@0@0#mtAnnotationsNode_unparse
-^6948 20288$$$@0#mtAnnotationsNode_free
+^6946 20278$^@3@0@0#mtAnnotationsNode_create
+^6947 20282@6@5@1@0@0^@3@0@0#mtAnnotationsNode_unparse
+^6948 20280$$$@0#mtAnnotationsNode_free
 *1 (Constant)
 ^6949 1169@i0@0@4#mtAnnotationList_undefined
 *4 (Function)
-^6950 20312@6@5@1@0@0^@3@0@0#mtAnnotationList_unparseSep
+^6950 20304@6@5@1@0@0^@3@0@0#mtAnnotationList_unparseSep
 ^6951 8664@6@5@1@0@0^@2@0@0#mtAnnotationList_new
-^6952 20304@6@5@1@0@0^@2@0@0#mtAnnotationList_single
-^6953 20306@6@5@1@0@0@0@@1@p0$@0#mtAnnotationList_add
-^6954 20308@6@5@1@0@0@0@@1@p0$@0#mtAnnotationList_prepend
-^6955 20310@6@5@1@0@0$@2@0@0#mtAnnotationList_unparse
-^6956 20314$$$@0#mtAnnotationList_free
+^6952 20296@6@5@1@0@0^@2@0@0#mtAnnotationList_single
+^6953 20298@6@5@1@0@0@0@@1@p0$@0#mtAnnotationList_add
+^6954 20300@6@5@1@0@0@0@@1@p0$@0#mtAnnotationList_prepend
+^6955 20302@6@5@1@0@0$@2@0@0#mtAnnotationList_unparse
+^6956 20306$$$@0#mtAnnotationList_free
 *1 (Constant)
 ^6957 5$#mtAnnotationListBASESIZE
 *6 (Iterator finalizer)
@@ -27734,24 +27726,24 @@
 *5 (Iterator)
 ^6959 8675@107#mtAnnotationList_elements
 *4 (Function)
-^6960 20320@6@5@1@0@0^@3@0@0#mtAnnotationDecl_unparse
-^6961 20316$^@3@0@0#mtAnnotationDecl_create
-^6962 20318@6@5@1@0@0@0@@1@p0@2@0@0#mtAnnotationDecl_stealContext
-^6963 20292$^@3@0@0#mtMergeNode_create
-^6964 20294$$$@0#mtMergeNode_free
-^6965 20296@6@5@1@0@0^@3@0@0#mtMergeNode_unparse
+^6960 20312@6@5@1@0@0^@3@0@0#mtAnnotationDecl_unparse
+^6961 20308$^@3@0@0#mtAnnotationDecl_create
+^6962 20310@6@5@1@0@0@0@@1@p0@2@0@0#mtAnnotationDecl_stealContext
+^6963 20284$^@3@0@0#mtMergeNode_create
+^6964 20286$$$@0#mtMergeNode_free
+^6965 20288@6@5@1@0@0^@3@0@0#mtMergeNode_unparse
 *0 (Datatype)
 ^6966 1190@-@+@0@0@2@0@8700#o_mtTransferClause
 *1 (Constant)
 ^6967 1187@i0@0@4#mtTransferClauseList_undefined
 *4 (Function)
-^6968 20337@6@5@1@0@0^@3@0@0#mtTransferClauseList_unparseSep
+^6968 20329@6@5@1@0@0^@3@0@0#mtTransferClauseList_unparseSep
 ^6969 8712@6@5@1@0@0^@2@0@0#mtTransferClauseList_new
-^6970 20329@6@5@1@0@0^@2@0@0#mtTransferClauseList_single
-^6971 20331@6@5@1@0@0@0@@1@p0$@0#mtTransferClauseList_add
-^6972 20333@6@5@1@0@0@0@@1@p0$@0#mtTransferClauseList_prepend
-^6973 20335@6@5@1@0@0$@2@0@0#mtTransferClauseList_unparse
-^6974 20339$$$@0#mtTransferClauseList_free
+^6970 20321@6@5@1@0@0^@2@0@0#mtTransferClauseList_single
+^6971 20323@6@5@1@0@0@0@@1@p0$@0#mtTransferClauseList_add
+^6972 20325@6@5@1@0@0@0@@1@p0$@0#mtTransferClauseList_prepend
+^6973 20327@6@5@1@0@0$@2@0@0#mtTransferClauseList_unparse
+^6974 20331$$$@0#mtTransferClauseList_free
 *1 (Constant)
 ^6975 5$#mtTransferClauseListBASESIZE
 *6 (Iterator finalizer)
@@ -27759,21 +27751,21 @@
 *5 (Iterator)
 ^6977 8723@119#mtTransferClauseList_elements
 *4 (Function)
-^6978 20345@6@5@1@0@0^@3@0@0#mtTransferClause_unparse
-^6979 20341$^@3@0@0#mtTransferClause_create
-^6980 20343$$$@0#mtTransferClause_free
+^6978 20337@6@5@1@0@0^@3@0@0#mtTransferClause_unparse
+^6979 20333$^@3@0@0#mtTransferClause_create
+^6980 20335$$$@0#mtTransferClause_free
 *0 (Datatype)
 ^6981 1196@-@+@0@0@2@0@8739#o_mtLoseReference
 *1 (Constant)
 ^6982 1193@i0@0@4#mtLoseReferenceList_undefined
 *4 (Function)
-^6983 20374@6@5@1@0@0^@3@0@0#mtLoseReferenceList_unparseSep
+^6983 20366@6@5@1@0@0^@3@0@0#mtLoseReferenceList_unparseSep
 ^6984 8751@6@5@1@0@0^@2@0@0#mtLoseReferenceList_new
-^6985 20366@6@5@1@0@0^@2@0@0#mtLoseReferenceList_single
-^6986 20368@6@5@1@0@0@0@@1@p0$@0#mtLoseReferenceList_add
-^6987 20370@6@5@1@0@0@0@@1@p0$@0#mtLoseReferenceList_prepend
-^6988 20372@6@5@1@0@0$@2@0@0#mtLoseReferenceList_unparse
-^6989 20376$$$@0#mtLoseReferenceList_free
+^6985 20358@6@5@1@0@0^@2@0@0#mtLoseReferenceList_single
+^6986 20360@6@5@1@0@0@0@@1@p0$@0#mtLoseReferenceList_add
+^6987 20362@6@5@1@0@0@0@@1@p0$@0#mtLoseReferenceList_prepend
+^6988 20364@6@5@1@0@0$@2@0@0#mtLoseReferenceList_unparse
+^6989 20368$$$@0#mtLoseReferenceList_free
 *1 (Constant)
 ^6990 5$#mtLoseReferenceListBASESIZE
 *6 (Iterator finalizer)
@@ -27781,44 +27773,44 @@
 *5 (Iterator)
 ^6992 8762@123#mtLoseReferenceList_elements
 *4 (Function)
-^6993 20382@6@5@1@0@0^@3@0@0#mtLoseReference_unparse
-^6994 20378$^@3@0@0#mtLoseReference_create
-^6995 20380$$$@0#mtLoseReference_free
+^6993 20374@6@5@1@0@0^@3@0@0#mtLoseReference_unparse
+^6994 20370$^@3@0@0#mtLoseReference_create
+^6995 20372$$$@0#mtLoseReference_free
 *2 (Enum member)
 ^6996 8776$#MTAK_VALUE#MTAK_ERROR
 *9 (Enum tag)
 ^6998 8776@8777#&!219
 *4 (Function)
-^6999 20357$$$@0#mtTransferAction_free
-^7000 20355@6@5@1@0@0^@3@0@0#mtTransferAction_unparse
-^7001 20347$^@3@0@0#mtTransferAction_createValue
-^7002 20353@6@5@1@0@0^@19@3@0#mtTransferAction_getMessage
-^7003 20349$^@3@0@0#mtTransferAction_createError
-^7004 20351$^@3@0@0#mtTransferAction_createErrorMessage
+^6999 20349$$$@0#mtTransferAction_free
+^7000 20347@6@5@1@0@0^@3@0@0#mtTransferAction_unparse
+^7001 20339$^@3@0@0#mtTransferAction_createValue
+^7002 20345@6@5@1@0@0^@19@3@0#mtTransferAction_getMessage
+^7003 20341$^@3@0@0#mtTransferAction_createError
+^7004 20343$^@3@0@0#mtTransferAction_createErrorMessage
 *2 (Enum member)
 ^7005 8797$#MTMK_VALUE#MTMK_STAR
 *9 (Enum tag)
 ^7007 8797@8798#&!220
 *4 (Function)
-^7008 20415$$$@0#mtMergeItem_free
-^7009 20413@6@5@1@0@0^@3@0@0#mtMergeItem_unparse
-^7010 20409$^@3@0@0#mtMergeItem_createValue
-^7011 20411$^@3@0@0#mtMergeItem_createStar
-^7012 20421@6@5@1@0@0^@3@0@0#mtMergeClause_unparse
-^7013 20417$$@3@0@0#mtMergeClause_create
-^7014 20419$$$@0#mtMergeClause_free
+^7008 20407$$$@0#mtMergeItem_free
+^7009 20405@6@5@1@0@0^@3@0@0#mtMergeItem_unparse
+^7010 20401$^@3@0@0#mtMergeItem_createValue
+^7011 20403$^@3@0@0#mtMergeItem_createStar
+^7012 20413@6@5@1@0@0^@3@0@0#mtMergeClause_unparse
+^7013 20409$$@3@0@0#mtMergeClause_create
+^7014 20411$$$@0#mtMergeClause_free
 *0 (Datatype)
 ^7015 1184@-@+@0@0@2@0@8829#o_mtMergeClause
 *1 (Constant)
 ^7016 1181@i0@0@4#mtMergeClauseList_undefined
 *4 (Function)
-^7017 20438@6@5@1@0@0^@3@0@0#mtMergeClauseList_unparseSep
+^7017 20430@6@5@1@0@0^@3@0@0#mtMergeClauseList_unparseSep
 ^7018 8841@6@5@1@0@0^@2@0@0#mtMergeClauseList_new
-^7019 20430@6@5@1@0@0^@2@0@0#mtMergeClauseList_single
-^7020 20432@6@5@1@0@0@0@@1@p0$@0#mtMergeClauseList_add
-^7021 20434@6@5@1@0@0@0@@1@p0$@0#mtMergeClauseList_prepend
-^7022 20436@6@5@1@0@0$@2@0@0#mtMergeClauseList_unparse
-^7023 20440$$$@0#mtMergeClauseList_free
+^7019 20422@6@5@1@0@0^@2@0@0#mtMergeClauseList_single
+^7020 20424@6@5@1@0@0@0@@1@p0$@0#mtMergeClauseList_add
+^7021 20426@6@5@1@0@0@0@@1@p0$@0#mtMergeClauseList_prepend
+^7022 20428@6@5@1@0@0$@2@0@0#mtMergeClauseList_unparse
+^7023 20432$$$@0#mtMergeClauseList_free
 *1 (Constant)
 ^7024 5$#mtMergeClauseListBASESIZE
 *6 (Iterator finalizer)
@@ -27826,12 +27818,12 @@
 *5 (Iterator)
 ^7026 8852@115#mtMergeClauseList_elements
 *4 (Function)
-^7027 13253$$@3@0@0#metaStateConstraint_create
-^7028 13255@6@5@1@0@0^@3@0@0#metaStateConstraint_unparse
-^7029 13257$^@2@0@0#metaStateConstraint_copy
-^7030 13263$$$@0#metaStateConstraint_free
-^7031 13259$^@19@3@0#metaStateConstraint_getSpecifier
-^7032 13261@6@5@1@0@0^@19@3@0#metaStateConstraint_getExpression
+^7027 13245$$@3@0@0#metaStateConstraint_create
+^7028 13247@6@5@1@0@0^@3@0@0#metaStateConstraint_unparse
+^7029 13249$^@2@0@0#metaStateConstraint_copy
+^7030 13255$$$@0#metaStateConstraint_free
+^7031 13251$^@19@3@0#metaStateConstraint_getSpecifier
+^7032 13253@6@5@1@0@0^@19@3@0#metaStateConstraint_getExpression
 *0 (Datatype)
 ^7033 1109@-@+@0@0@19@3@8866#b_metaStateConstraint
 *1 (Constant)
@@ -27841,89 +27833,89 @@
 *5 (Iterator)
 ^7036 8873@69#metaStateConstraintList_elements
 *4 (Function)
-^7037 13272@6@5@1@0@0$$@0#metaStateConstraintList_append
-^7038 13278$^@19@3@0#metaStateConstraintList_getFirst
+^7037 13264@6@5@1@0@0$$@0#metaStateConstraintList_append
+^7038 13270$^@19@3@0#metaStateConstraintList_getFirst
 ^7039 8883@6@5@1@0@0^@2@0@0#metaStateConstraintList_new
-^7040 13274@6@5@1@0@0@0@@1@p0$@0#metaStateConstraintList_add
-^7041 13276@6@5@1@0@0^@3@0@0#metaStateConstraintList_single
-^7042 13280@6@5@1@0@0$@2@0@0#metaStateConstraintList_unparse
-^7043 13282$$$@0#metaStateConstraintList_free
+^7040 13266@6@5@1@0@0@0@@1@p0$@0#metaStateConstraintList_add
+^7041 13268@6@5@1@0@0^@3@0@0#metaStateConstraintList_single
+^7042 13272@6@5@1@0@0$@2@0@0#metaStateConstraintList_unparse
+^7043 13274$$$@0#metaStateConstraintList_free
 *1 (Constant)
 ^7044 5$#metaStateConstraintListBASESIZE
 *4 (Function)
-^7045 13300$$@3@0@0#metaStateSpecifier_create
-^7046 13302$$@3@0@0#metaStateSpecifier_createElipsis
-^7047 13304$^$@0#metaStateSpecifier_isElipsis
-^7048 13306@6@5@1@0@0^@19@2@0#metaStateSpecifier_getSref
-^7049 13308@6@5@1@0@0^@19@3@0#metaStateSpecifier_getMetaStateInfo
-^7050 13312@6@5@1@0@0^@3@0@0#metaStateSpecifier_unparse
-^7051 13310$^@3@0@0#metaStateSpecifier_copy
-^7052 13314$$$@0#metaStateSpecifier_free
+^7045 13292$$@3@0@0#metaStateSpecifier_create
+^7046 13294$$@3@0@0#metaStateSpecifier_createElipsis
+^7047 13296$^$@0#metaStateSpecifier_isElipsis
+^7048 13298@6@5@1@0@0^@19@2@0#metaStateSpecifier_getSref
+^7049 13300@6@5@1@0@0^@19@3@0#metaStateSpecifier_getMetaStateInfo
+^7050 13304@6@5@1@0@0^@3@0@0#metaStateSpecifier_unparse
+^7051 13302$^@3@0@0#metaStateSpecifier_copy
+^7052 13306$$$@0#metaStateSpecifier_free
 *1 (Constant)
 ^7053 1118@i0@0@4#metaStateExpression_undefined
 *4 (Function)
-^7054 13284@6@2@1@0@0$@3@0@0#metaStateExpression_create
-^7055 13286@6@2@1@0@0$@3@0@0#metaStateExpression_createMerge
-^7056 13292$^@19@3@0#metaStateExpression_getSpecifier
-^7057 13294$^$@0#metaStateExpression_isMerge
-^7058 13296@6@5@1@0@0^@19@3@0#metaStateExpression_getRest
-^7059 13290@6@5@1@0@0$@3@0@0#metaStateExpression_copy
-^7060 13288@6@5@1@0@0^@3@0@0#metaStateExpression_unparse
-^7061 13298$$$@0#metaStateExpression_free
+^7054 13276@6@2@1@0@0$@3@0@0#metaStateExpression_create
+^7055 13278@6@2@1@0@0$@3@0@0#metaStateExpression_createMerge
+^7056 13284$^@19@3@0#metaStateExpression_getSpecifier
+^7057 13286$^$@0#metaStateExpression_isMerge
+^7058 13288@6@5@1@0@0^@19@3@0#metaStateExpression_getRest
+^7059 13282@6@5@1@0@0$@3@0@0#metaStateExpression_copy
+^7060 13280@6@5@1@0@0^@3@0@0#metaStateExpression_unparse
+^7061 13290$$$@0#metaStateExpression_free
 *1 (Constant)
 ^7062 5$#metaState_error
 ^7063 1103@i0@0@4#metaStateInfo_undefined
 *4 (Function)
-^7064 20082@6@2@1@0@0$@3@0@0#metaStateInfo_create
-^7065 20100$^$@0#metaStateInfo_getDefaultValueContext
-^7066 20106$@0@@1@p0$@0#metaStateInfo_setDefaultValueContext
-^7067 20108$@0@@1@p0$@0#metaStateInfo_setDefaultRefValue
-^7068 20112$@0@@1@p0$@0#metaStateInfo_setDefaultParamValue
-^7069 20110$@0@@1@p0$@0#metaStateInfo_setDefaultResultValue
-^7070 20102$^$@0#metaStateInfo_getDefaultValue
-^7071 20114$^$@0#metaStateInfo_getDefaultRefValue
-^7072 20118$^$@0#metaStateInfo_getDefaultParamValue
-^7073 20116$^$@0#metaStateInfo_getDefaultResultValue
-^7074 20104$^$@0#metaStateInfo_getDefaultGlobalValue
-^7075 20090@6@5@1@0@0^@19@3@0#metaStateInfo_getContext
-^7076 20092@6@5@1@0@0^@19@3@0#metaStateInfo_getName
-^7077 20094@6@5@1@0@0^@19@3@0#metaStateInfo_getLoc
-^7078 20096$^@19@2@0#metaStateInfo_getTransferTable
-^7079 20098$^@19@2@0#metaStateInfo_getMergeTable
-^7080 20086@6@5@1@0@0^@2@0@0#metaStateInfo_unparse
-^7081 20088@6@5@1@0@0^@19@3@0#metaStateInfo_unparseValue
-^7082 20084$$$@0#metaStateInfo_free
+^7064 20074@6@2@1@0@0$@3@0@0#metaStateInfo_create
+^7065 20092$^$@0#metaStateInfo_getDefaultValueContext
+^7066 20098$@0@@1@p0$@0#metaStateInfo_setDefaultValueContext
+^7067 20100$@0@@1@p0$@0#metaStateInfo_setDefaultRefValue
+^7068 20104$@0@@1@p0$@0#metaStateInfo_setDefaultParamValue
+^7069 20102$@0@@1@p0$@0#metaStateInfo_setDefaultResultValue
+^7070 20094$^$@0#metaStateInfo_getDefaultValue
+^7071 20106$^$@0#metaStateInfo_getDefaultRefValue
+^7072 20110$^$@0#metaStateInfo_getDefaultParamValue
+^7073 20108$^$@0#metaStateInfo_getDefaultResultValue
+^7074 20096$^$@0#metaStateInfo_getDefaultGlobalValue
+^7075 20082@6@5@1@0@0^@19@3@0#metaStateInfo_getContext
+^7076 20084@6@5@1@0@0^@19@3@0#metaStateInfo_getName
+^7077 20086@6@5@1@0@0^@19@3@0#metaStateInfo_getLoc
+^7078 20088$^@19@2@0#metaStateInfo_getTransferTable
+^7079 20090$^@19@2@0#metaStateInfo_getMergeTable
+^7080 20078@6@5@1@0@0^@2@0@0#metaStateInfo_unparse
+^7081 20080@6@5@1@0@0^@19@3@0#metaStateInfo_unparseValue
+^7082 20076$$$@0#metaStateInfo_free
 *1 (Constant)
 ^7083 1099@i0@0@4#metaStateTable_undefined
 ^7084 5$#DEFAULT_MSTABLE_SIZE
 *4 (Function)
-^7085 20078$@0@@1@p0$@0#metaStateTable_insert
+^7085 20070$@0@@1@p0$@0#metaStateTable_insert
 *6 (Iterator finalizer)
 ^7086 0@59#end_metaStateTable_elements
 *5 (Iterator)
 ^7087 8993@59#metaStateTable_elements
 *4 (Function)
-^7088 20080@6@5@1@0@0$@3@0@0#metaStateTable_unparse
+^7088 20072@6@5@1@0@0$@3@0@0#metaStateTable_unparse
 *1 (Constant)
 ^7089 1091@i0@0@4#annotationInfo_undefined
 *4 (Function)
-^7090 20138$^$@0#annotationInfo_matchesContext
-^7091 20140$^$@0#annotationInfo_matchesContextRef
-^7092 20132@6@5@1@0@0^@19@3@0#annotationInfo_getState
-^7093 20136$^$@0#annotationInfo_getValue
-^7094 20128@6@5@1@0@0^@19@3@0#annotationInfo_getName
-^7095 20124@6@5@1@0@0^@2@0@0#annotationInfo_create
-^7096 20130@6@5@1@0@0$@19@3@0#annotationInfo_unparse
-^7097 20134@6@5@1@0@0^@19@3@0#annotationInfo_getLoc
-^7098 20126$$$@0#annotationInfo_free
-^7099 20142@6@5@1@0@0$@19@3@0#annotationInfo_dump
-^7100 20144@6@5@1@0@0@0@@1@tp0@19@3@0#annotationInfo_undump
+^7090 20130$^$@0#annotationInfo_matchesContext
+^7091 20132$^$@0#annotationInfo_matchesContextRef
+^7092 20124@6@5@1@0@0^@19@3@0#annotationInfo_getState
+^7093 20128$^$@0#annotationInfo_getValue
+^7094 20120@6@5@1@0@0^@19@3@0#annotationInfo_getName
+^7095 20116@6@5@1@0@0^@2@0@0#annotationInfo_create
+^7096 20122@6@5@1@0@0$@19@3@0#annotationInfo_unparse
+^7097 20126@6@5@1@0@0^@19@3@0#annotationInfo_getLoc
+^7098 20118$$$@0#annotationInfo_free
+^7099 20134@6@5@1@0@0$@19@3@0#annotationInfo_dump
+^7100 20136@6@5@1@0@0@0@@1@tp0@19@3@0#annotationInfo_undump
 *1 (Constant)
 ^7101 1100@@0@4#annotationTable_undefined
 ^7102 5$#DEFAULT_ANNOTTABLE_SIZE
 *4 (Function)
-^7103 20122$$$@0#annotationTable_insert
-^7104 20120@6@5@1@0@0$@2@0@0#annotationTable_unparse
+^7103 20114$$$@0#annotationTable_insert
+^7104 20112@6@5@1@0@0$@2@0@0#annotationTable_unparse
 *6 (Iterator finalizer)
 ^7105 0@61#end_annotationTable_elements
 *5 (Iterator)
@@ -27941,245 +27933,245 @@
 *1 (Constant)
 ^7114 1106@i0@0@4#functionConstraint_undefined
 *4 (Function)
-^7115 13334@6@5@1@0@0^@3@0@0#functionConstraint_copy
-^7116 13318@6@5@1@0@0$@3@0@0#functionConstraint_createBufferConstraint
-^7117 13320@6@5@1@0@0$@3@0@0#functionConstraint_createMetaStateConstraint
-^7118 13330$^$@0#functionConstraint_hasBufferConstraint
-^7119 13332$^$@0#functionConstraint_hasMetaStateConstraint
-^7120 13322@6@5@1@0@0$@3@0@0#functionConstraint_conjoin
-^7121 13326@6@5@1@0@0^@2@0@0#functionConstraint_getBufferConstraints
-^7122 13328@6@5@1@0@0^@2@0@0#functionConstraint_getMetaStateConstraints
-^7123 13324@6@5@1@0@0^@3@0@0#functionConstraint_unparse
-^7124 13336$$$@0#functionConstraint_free
-^7125 16376$$$@0#context_pushLoc
-^7126 16378$$$@0#context_popLoc
-^7127 16432$$$@0#context_doMerge
-^7128 16430$$$@0#context_doDump
-^7129 16066$$$@0#context_resetAllFlags
+^7115 13326@6@5@1@0@0^@3@0@0#functionConstraint_copy
+^7116 13310@6@5@1@0@0$@3@0@0#functionConstraint_createBufferConstraint
+^7117 13312@6@5@1@0@0$@3@0@0#functionConstraint_createMetaStateConstraint
+^7118 13322$^$@0#functionConstraint_hasBufferConstraint
+^7119 13324$^$@0#functionConstraint_hasMetaStateConstraint
+^7120 13314@6@5@1@0@0$@3@0@0#functionConstraint_conjoin
+^7121 13318@6@5@1@0@0^@2@0@0#functionConstraint_getBufferConstraints
+^7122 13320@6@5@1@0@0^@2@0@0#functionConstraint_getMetaStateConstraints
+^7123 13316@6@5@1@0@0^@3@0@0#functionConstraint_unparse
+^7124 13328$$$@0#functionConstraint_free
+^7125 16368$$$@0#context_pushLoc
+^7126 16370$$$@0#context_popLoc
+^7127 16424$$$@0#context_doMerge
+^7128 16422$$$@0#context_doDump
+^7129 16058$$$@0#context_resetAllFlags
 ^7130 9091@6@5@1@0@0^@3@0@0#context_unparseFlagMarkers
-^7131 16120$@0@s1@1@s1$@0#context_enterDoWhileClause
-^7132 16188$$$@0#context_hasMods
-^7133 16072$^$@0#context_isSystemDir
+^7131 16112$@0@s1@1@s1$@0#context_enterDoWhileClause
+^7132 16180$$$@0#context_hasMods
+^7133 16064$^$@0#context_isSystemDir
 ^7134 9099@6@5@1@0@0^@19@3@0#context_selectedLibrary
 ^7135 9101$^$@0#context_usingPosixLibrary
 ^7136 9103$^$@0#context_usingAnsiLibrary
 ^7137 9105$^$@0#context_getLibrary
-^7138 16054$@0@s1@1@s1$@0#context_setLibrary
-^7139 15986$@0@s1@1@s1$@0#context_setPreprocessing
-^7140 15988$@0@s1@1@s1$@0#context_clearPreprocessing
-^7141 15990$^$@0#context_isPreprocessing
-^7142 15992$^$@0#context_loadingLibrary
-^7143 15996$@0@s1@1@s1$@0#context_setInCommandLine
-^7144 15998$@0@s1@1@s1$@0#context_clearInCommandLine
-^7145 16000$^$@0#context_isInCommandLine
-^7146 15994$^$@0#context_inXHFile
-^7147 16280$$$@0#context_resetErrors
-^7148 16452$^$@0#context_getLinesProcessed
-^7149 16454$^$@0#context_getSpecLinesProcessed
-^7150 16464$^$@0#context_setBoolName
-^7151 16468@6@5@1@0@0^@19@3@0#context_getBoolName
-^7152 16466@6@5@1@0@0^@19@3@0#context_printBoolName
-^7153 16470@6@5@1@0@0^@19@3@0#context_getFalseName
-^7154 16472@6@5@1@0@0^@19@3@0#context_getTrueName
-^7155 16474@6@5@1@0@0^@19@3@0#context_getLarchPath
-^7156 16476@6@5@1@0@0^@19@3@0#context_getLCLImportDir
-^7157 16160$^$@0#context_checkExport
-^7158 16168$^$@0#context_checkGlobMod
-^7159 16162$$$@0#context_checkGlobUse
-^7160 16164$$$@0#context_checkAliasGlob
-^7161 16166$$$@0#context_checkInternalUse
-^7162 16252$$$@0#context_recordFileModifies
-^7163 16480$$$@0#context_clearJustPopped
-^7164 16482$$$@0#context_justPopped
-^7165 16126$$$@0#context_enterTrueClause
-^7166 16136$$$@0#context_enterFalseClause
-^7167 16214$$$@0#context_exitClause
-^7168 16302$$$@0#context_exitInnerSafe
-^7169 16294$@0@s1@1@s1$@0#context_exitInnerPlain
-^7170 16380$$$@0#context_inGlobalScope
-^7171 16382$$$@0#context_inInnerScope
-^7172 16384$$$@0#context_setProtectVars
-^7173 16400$^$@0#context_getLimit
-^7174 16402$^$@0#context_unlimitedMessages
-^7175 16404$$$@0#context_releaseVars
-^7176 16406$$$@0#context_sizeofReleaseVars
-^7177 16408$$$@0#context_inProtectVars
-^7178 16178$$$@0#context_hasFileAccess
-^7179 16410$$$@0#context_hideShowscan
-^7180 16412$$$@0#context_unhideShowscan
-^7181 16068$$$@0#context_setMode
-^7182 16190$$$@0#context_exitAllClauses
-^7183 16192$$$@0#context_exitAllClausesQuiet
-^7184 16414$$$@0#context_inHeader
-^7185 16416@6@5@1@0@0^@18@2@0#context_fileTable
-^7186 16420@6@5@1@0@0$@19@2@0#context_messageLog
-^7187 16418@6@5@1@0@0$@18@3@0#context_tmpdir
-^7188 16034$@0@s1@1@s1$@0#context_enterMTfile
-^7189 16036$@0@s1@1@s1$@0#context_exitMTfile
-^7190 16038$$$@0#context_enterLCLfile
-^7191 16044$$$@0#context_exitLCLfile
-^7192 16442$$$@0#context_enterImport
-^7193 16444$$$@0#context_leaveImport
-^7194 16456$@0@s1@1@s1$@0#context_processedSpecLine
-^7195 16398$^$@0#context_getLCLExpect
-^7196 16374$^$@0#context_msgLh
-^7197 16438$@1@s1@1@$@0#context_inLCLLib
-^7198 16440$@1@s1@1@$@0#context_inImport
-^7199 16458$@0@s1@1@s1$@0#context_resetSpecLines
-^7200 16326$$$@0#context_exitMacroCache
-^7201 16022$$$@0#context_enterSuppressRegion
-^7202 16032$$$@0#context_exitSuppressRegion
-^7203 16310$$$@0#context_enterMacroFile
-^7204 16060$$$@0#context_fileAccessTypes
-^7205 16074$$$@0#context_addFileAccessType
-^7206 16076$$$@0#context_removeFileAccessType
-^7207 16222@6@5@1@0@0$@19@3@0#context_getParams
-^7208 16070$$$@0#context_isSpecialFile
-^7209 16332@6@5@1@0@0^@19@3@0#context_inFunctionName
-^7210 16290$^$@0#context_currentFunctionType
-^7211 16324$$$@0#context_exitCFile
-^7212 16138$$$@0#context_enterConstantMacro
-^7213 16090$$$@0#context_enterMacro
-^7214 16144$$$@0#context_enterFunction
-^7215 16218$$$@0#context_exitFunction
-^7216 16282$@1@s1@1@s1$@0#context_initMod
-^7217 16292$$$@0#context_enterInnerContext
-^7218 16296$$$@0#context_exitInner
-^7219 16174$$$@0#context_globAccess
-^7220 16224@6@5@1@0@0$@19@3@0#context_getUsedGlobs
-^7221 16176$$$@0#context_hasAccess
-^7222 16184$$$@0#context_couldHaveAccess
-^7223 16288@6@5@1@0@0$@2@0@0#context_unparse
-^7224 16142$$$@0#context_setFunctionDefined
-^7225 16342$$$@0#context_setFlagTemp
-^7226 16490$$$@0#context_showFilelocStack
-^7227 16348$^$@0#context_getFlag
-^7228 16350$^$@0#context_flagOn
-^7229 16264$^$@0#context_getValue
-^7230 16262$@0@s1@1@s1$@0#context_setValueAndFlag
-^7231 16266$^$@0#context_getCounter
-^7232 16268$@0@s1@1@s1$@0#context_incCounter
-^7233 16270$@0@s1@1@s1$@0#context_decCounter
-^7234 16346$^$@0#context_maybeSet
-^7235 16278@6@5@1@0@0^@19@3@0#context_getString
-^7236 16274$@0@s1@1@s1$@0#context_setString
-^7237 16334$$$@0#context_userSetFlag
-^7238 16396$^$@0#context_getExpect
-^7239 16172@6@5@1@0@0$@19@3@0#context_modList
-^7240 16140@6@5@1@0@0^@19@2@0#context_getHeader
-^7241 16170$$$@0#context_usedGlobal
-^7242 16062$$$@0#context_resetModeFlags
-^7243 16284$$$@0#context_typeofZero
-^7244 16286$$$@0#context_typeofOne
-^7245 16308$$$@0#context_enterFile
-^7246 16092$$$@0#context_enterUnknownMacro
-^7247 16258$$$@0#context_getCommentMarkerChar
-^7248 16256$$$@0#context_setCommentMarkerChar
-^7249 16424$^$@0#context_inMacroConstant
-^7250 16216$$$@0#context_returnFunction
-^7251 16322$$$@0#context_processingMacros
-^7252 16328$$$@0#context_saveLocation
-^7253 16330@6@5@1@0@0$@2@0@0#context_getSaveLocation
-^7254 16462$$$@0#context_setFileId
-^7255 16356$@1@g2674@6@5@1@g2674$@0#context_setFilename
-^7256 16336$$$@0#context_fileSetFlag
-^7257 16180@6@5@1@0@0^@2@0@0#context_unparseAccess
-^7258 16312$^$@0#context_inFunction
-^7259 16314$^$@0#context_inFunctionLike
-^7260 16484$$$@0#context_setMacroMissingParams
-^7261 16486$$$@0#context_resetMacroMissingParams
-^7262 16488$^$@0#context_isMacroMissingParams
-^7263 16426$^$@0#context_inMacroUnknown
-^7264 16434@6@5@1@0@0^@19@3@0#context_getDump
-^7265 16436@6@5@1@0@0^@19@3@0#context_getMerge
-^7266 16030$$$@0#context_incLineno
-^7267 16020$^$@0#context_inSuppressRegion
-^7268 16200$$$@0#context_exitTrueClause
-^7269 16362$@1@s1@1@s1$@0#context_destroyMod
-^7270 16006$$$@0#context_addMacroCache
-^7271 16318$$$@0#context_processAllMacros
-^7272 16008$$$@0#context_addComment
-^7273 16026$$$@0#context_enterSuppressLine
-^7274 16018$^$@0#context_inSuppressZone
-^7275 16046$$$@0#context_dumpModuleAccess
-^7276 16058$$$@0#context_loadModuleAccess
-^7277 16448$^$@0#context_inIterDef
-^7278 16446$^$@0#context_inMacro
-^7279 16450$^$@0#context_inIterEnd
-^7280 16186$^$@0#context_getRetType
-^7281 16358$$$@0#context_enterIterDef
-^7282 16360$$$@0#context_enterIterEnd
-^7283 16230$$$@0#context_addBoolAccess
-^7284 16234$$$@0#context_canAccessBool
-^7285 16220$$$@0#context_quietExitFunction
-^7286 16364$^$@0#context_msgBoolInt
-^7287 16366$^$@0#context_msgCharInt
-^7288 16368$^$@0#context_msgEnumInt
-^7289 16370$^$@0#context_msgPointerArith
-^7290 16372$^$@0#context_msgStrictOps
-^7291 16300$$$@0#context_exitStructInnerContext
-^7292 16298$$$@0#context_enterStructInnerContext
-^7293 16316$^$@0#context_inRealFunction
-^7294 16112$$$@0#context_exitOrClause
-^7295 16110$$$@0#context_exitAndClause
-^7296 16096$$$@0#context_enterOrClause
-^7297 16094$$$@0#context_enterAndClause
-^7298 16124$$$@0#context_enterForClause
-^7299 16122$$$@0#context_enterWhileClause
-^7300 16118$$$@0#context_enterIterClause
-^7301 16202$$$@0#context_exitIterClause
-^7302 16206$$$@0#context_exitWhileClause
-^7303 16208$$$@0#context_exitDoWhileClause
-^7304 16210$$$@0#context_exitForClause
-^7305 16182@6@5@1@0@0^@2@0@0#context_unparseClauses
-^7306 16228@6@5@1@0@0^@19@3@0#context_getGlobs
-^7307 16242@6@5@1@0@0$@2@0@0#context_getMessageAnnote
-^7308 16240$$$@0#context_clearMessageAnnote
-^7309 16238$$$@0#context_hasMessageAnnote
-^7310 16236$$$@0#context_setMessageAnnote
-^7311 16014$$$@0#context_suppressFlagMsg
-^7312 16016$$$@0#context_suppressNotFlagMsg
-^7313 16132$$$@0#context_enterCaseClause
-^7314 16128$$$@0#context_enterSwitch
-^7315 16130$$$@0#context_exitSwitch
-^7316 16272$$$@0#context_showFunction
-^7317 16428$$$@0#context_setShownFunction
-^7318 16248$$$@0#context_clearAliasAnnote
-^7319 16250@6@5@1@0@0$@3@0@0#context_getAliasAnnote
-^7320 16246$$$@0#context_hasAliasAnnote
-^7321 16244$$$@0#context_setAliasAnnote
-^7322 16098$@1@s1@1@$@0#context_inDeepLoop
-^7323 16102$@1@s1@1@$@0#context_inDeepLoopSwitch
-^7324 16108$@1@s1@1@$@0#context_inConditional
-^7325 16100$@1@s1@1@$@0#context_inDeepSwitch
-^7326 16104$$$@0#context_breakClause
-^7327 16106$$$@0#context_nextBreakClause
-^7328 16386$@1@s1@1@$@0#context_anyErrors
-^7329 16388$@0@s1@1@s1$@0#context_hasError
-^7330 16390$@1@s1@1@$@0#context_numErrors
-^7331 16392$$$@0#context_neednl
-^7332 16394$$$@0#context_setNeednl
-^7333 16460$@1@s1@1@$@0#context_inGlobalContext
-^7334 16422$@1@s1@1@$@0#context_inMacroFunction
+^7138 16046$@0@s1@1@s1$@0#context_setLibrary
+^7139 15978$@0@s1@1@s1$@0#context_setPreprocessing
+^7140 15980$@0@s1@1@s1$@0#context_clearPreprocessing
+^7141 15982$^$@0#context_isPreprocessing
+^7142 15984$^$@0#context_loadingLibrary
+^7143 15988$@0@s1@1@s1$@0#context_setInCommandLine
+^7144 15990$@0@s1@1@s1$@0#context_clearInCommandLine
+^7145 15992$^$@0#context_isInCommandLine
+^7146 15986$^$@0#context_inXHFile
+^7147 16272$$$@0#context_resetErrors
+^7148 16444$^$@0#context_getLinesProcessed
+^7149 16446$^$@0#context_getSpecLinesProcessed
+^7150 16456$^$@0#context_setBoolName
+^7151 16460@6@5@1@0@0^@19@3@0#context_getBoolName
+^7152 16458@6@5@1@0@0^@19@3@0#context_printBoolName
+^7153 16462@6@5@1@0@0^@19@3@0#context_getFalseName
+^7154 16464@6@5@1@0@0^@19@3@0#context_getTrueName
+^7155 16466@6@5@1@0@0^@19@3@0#context_getLarchPath
+^7156 16468@6@5@1@0@0^@19@3@0#context_getLCLImportDir
+^7157 16152$^$@0#context_checkExport
+^7158 16160$^$@0#context_checkGlobMod
+^7159 16154$$$@0#context_checkGlobUse
+^7160 16156$$$@0#context_checkAliasGlob
+^7161 16158$$$@0#context_checkInternalUse
+^7162 16244$$$@0#context_recordFileModifies
+^7163 16472$$$@0#context_clearJustPopped
+^7164 16474$$$@0#context_justPopped
+^7165 16118$$$@0#context_enterTrueClause
+^7166 16128$$$@0#context_enterFalseClause
+^7167 16206$$$@0#context_exitClause
+^7168 16294$$$@0#context_exitInnerSafe
+^7169 16286$@0@s1@1@s1$@0#context_exitInnerPlain
+^7170 16372$$$@0#context_inGlobalScope
+^7171 16374$$$@0#context_inInnerScope
+^7172 16376$$$@0#context_setProtectVars
+^7173 16392$^$@0#context_getLimit
+^7174 16394$^$@0#context_unlimitedMessages
+^7175 16396$$$@0#context_releaseVars
+^7176 16398$$$@0#context_sizeofReleaseVars
+^7177 16400$$$@0#context_inProtectVars
+^7178 16170$$$@0#context_hasFileAccess
+^7179 16402$$$@0#context_hideShowscan
+^7180 16404$$$@0#context_unhideShowscan
+^7181 16060$$$@0#context_setMode
+^7182 16182$$$@0#context_exitAllClauses
+^7183 16184$$$@0#context_exitAllClausesQuiet
+^7184 16406$$$@0#context_inHeader
+^7185 16408@6@5@1@0@0^@18@2@0#context_fileTable
+^7186 16412@6@5@1@0@0$@19@2@0#context_messageLog
+^7187 16410@6@5@1@0@0$@18@3@0#context_tmpdir
+^7188 16026$@0@s1@1@s1$@0#context_enterMTfile
+^7189 16028$@0@s1@1@s1$@0#context_exitMTfile
+^7190 16030$$$@0#context_enterLCLfile
+^7191 16036$$$@0#context_exitLCLfile
+^7192 16434$$$@0#context_enterImport
+^7193 16436$$$@0#context_leaveImport
+^7194 16448$@0@s1@1@s1$@0#context_processedSpecLine
+^7195 16390$^$@0#context_getLCLExpect
+^7196 16366$^$@0#context_msgLh
+^7197 16430$@1@s1@1@$@0#context_inLCLLib
+^7198 16432$@1@s1@1@$@0#context_inImport
+^7199 16450$@0@s1@1@s1$@0#context_resetSpecLines
+^7200 16318$$$@0#context_exitMacroCache
+^7201 16014$$$@0#context_enterSuppressRegion
+^7202 16024$$$@0#context_exitSuppressRegion
+^7203 16302$$$@0#context_enterMacroFile
+^7204 16052$$$@0#context_fileAccessTypes
+^7205 16066$$$@0#context_addFileAccessType
+^7206 16068$$$@0#context_removeFileAccessType
+^7207 16214@6@5@1@0@0$@19@3@0#context_getParams
+^7208 16062$$$@0#context_isSpecialFile
+^7209 16324@6@5@1@0@0^@19@3@0#context_inFunctionName
+^7210 16282$^$@0#context_currentFunctionType
+^7211 16316$$$@0#context_exitCFile
+^7212 16130$$$@0#context_enterConstantMacro
+^7213 16082$$$@0#context_enterMacro
+^7214 16136$$$@0#context_enterFunction
+^7215 16210$$$@0#context_exitFunction
+^7216 16274$@1@s1@1@s1$@0#context_initMod
+^7217 16284$$$@0#context_enterInnerContext
+^7218 16288$$$@0#context_exitInner
+^7219 16166$$$@0#context_globAccess
+^7220 16216@6@5@1@0@0$@19@3@0#context_getUsedGlobs
+^7221 16168$$$@0#context_hasAccess
+^7222 16176$$$@0#context_couldHaveAccess
+^7223 16280@6@5@1@0@0$@2@0@0#context_unparse
+^7224 16134$$$@0#context_setFunctionDefined
+^7225 16334$$$@0#context_setFlagTemp
+^7226 16482$$$@0#context_showFilelocStack
+^7227 16340$^$@0#context_getFlag
+^7228 16342$^$@0#context_flagOn
+^7229 16256$^$@0#context_getValue
+^7230 16254$@0@s1@1@s1$@0#context_setValueAndFlag
+^7231 16258$^$@0#context_getCounter
+^7232 16260$@0@s1@1@s1$@0#context_incCounter
+^7233 16262$@0@s1@1@s1$@0#context_decCounter
+^7234 16338$^$@0#context_maybeSet
+^7235 16270@6@5@1@0@0^@19@3@0#context_getString
+^7236 16266$@0@s1@1@s1$@0#context_setString
+^7237 16326$$$@0#context_userSetFlag
+^7238 16388$^$@0#context_getExpect
+^7239 16164@6@5@1@0@0$@19@3@0#context_modList
+^7240 16132@6@5@1@0@0^@19@2@0#context_getHeader
+^7241 16162$$$@0#context_usedGlobal
+^7242 16054$$$@0#context_resetModeFlags
+^7243 16276$$$@0#context_typeofZero
+^7244 16278$$$@0#context_typeofOne
+^7245 16300$$$@0#context_enterFile
+^7246 16084$$$@0#context_enterUnknownMacro
+^7247 16250$$$@0#context_getCommentMarkerChar
+^7248 16248$$$@0#context_setCommentMarkerChar
+^7249 16416$^$@0#context_inMacroConstant
+^7250 16208$$$@0#context_returnFunction
+^7251 16314$$$@0#context_processingMacros
+^7252 16320$$$@0#context_saveLocation
+^7253 16322@6@5@1@0@0$@2@0@0#context_getSaveLocation
+^7254 16454$$$@0#context_setFileId
+^7255 16348$@1@g2674@6@5@1@g2674$@0#context_setFilename
+^7256 16328$$$@0#context_fileSetFlag
+^7257 16172@6@5@1@0@0^@2@0@0#context_unparseAccess
+^7258 16304$^$@0#context_inFunction
+^7259 16306$^$@0#context_inFunctionLike
+^7260 16476$$$@0#context_setMacroMissingParams
+^7261 16478$$$@0#context_resetMacroMissingParams
+^7262 16480$^$@0#context_isMacroMissingParams
+^7263 16418$^$@0#context_inMacroUnknown
+^7264 16426@6@5@1@0@0^@19@3@0#context_getDump
+^7265 16428@6@5@1@0@0^@19@3@0#context_getMerge
+^7266 16022$$$@0#context_incLineno
+^7267 16012$^$@0#context_inSuppressRegion
+^7268 16192$$$@0#context_exitTrueClause
+^7269 16354$@1@s1@1@s1$@0#context_destroyMod
+^7270 15998$$$@0#context_addMacroCache
+^7271 16310$$$@0#context_processAllMacros
+^7272 16000$$$@0#context_addComment
+^7273 16018$$$@0#context_enterSuppressLine
+^7274 16010$^$@0#context_inSuppressZone
+^7275 16038$$$@0#context_dumpModuleAccess
+^7276 16050$$$@0#context_loadModuleAccess
+^7277 16440$^$@0#context_inIterDef
+^7278 16438$^$@0#context_inMacro
+^7279 16442$^$@0#context_inIterEnd
+^7280 16178$^$@0#context_getRetType
+^7281 16350$$$@0#context_enterIterDef
+^7282 16352$$$@0#context_enterIterEnd
+^7283 16222$$$@0#context_addBoolAccess
+^7284 16226$$$@0#context_canAccessBool
+^7285 16212$$$@0#context_quietExitFunction
+^7286 16356$^$@0#context_msgBoolInt
+^7287 16358$^$@0#context_msgCharInt
+^7288 16360$^$@0#context_msgEnumInt
+^7289 16362$^$@0#context_msgPointerArith
+^7290 16364$^$@0#context_msgStrictOps
+^7291 16292$$$@0#context_exitStructInnerContext
+^7292 16290$$$@0#context_enterStructInnerContext
+^7293 16308$^$@0#context_inRealFunction
+^7294 16104$$$@0#context_exitOrClause
+^7295 16102$$$@0#context_exitAndClause
+^7296 16088$$$@0#context_enterOrClause
+^7297 16086$$$@0#context_enterAndClause
+^7298 16116$$$@0#context_enterForClause
+^7299 16114$$$@0#context_enterWhileClause
+^7300 16110$$$@0#context_enterIterClause
+^7301 16194$$$@0#context_exitIterClause
+^7302 16198$$$@0#context_exitWhileClause
+^7303 16200$$$@0#context_exitDoWhileClause
+^7304 16202$$$@0#context_exitForClause
+^7305 16174@6@5@1@0@0^@2@0@0#context_unparseClauses
+^7306 16220@6@5@1@0@0^@19@3@0#context_getGlobs
+^7307 16234@6@5@1@0@0$@2@0@0#context_getMessageAnnote
+^7308 16232$$$@0#context_clearMessageAnnote
+^7309 16230$$$@0#context_hasMessageAnnote
+^7310 16228$$$@0#context_setMessageAnnote
+^7311 16006$$$@0#context_suppressFlagMsg
+^7312 16008$$$@0#context_suppressNotFlagMsg
+^7313 16124$$$@0#context_enterCaseClause
+^7314 16120$$$@0#context_enterSwitch
+^7315 16122$$$@0#context_exitSwitch
+^7316 16264$$$@0#context_showFunction
+^7317 16420$$$@0#context_setShownFunction
+^7318 16240$$$@0#context_clearAliasAnnote
+^7319 16242@6@5@1@0@0$@3@0@0#context_getAliasAnnote
+^7320 16238$$$@0#context_hasAliasAnnote
+^7321 16236$$$@0#context_setAliasAnnote
+^7322 16090$@1@s1@1@$@0#context_inDeepLoop
+^7323 16094$@1@s1@1@$@0#context_inDeepLoopSwitch
+^7324 16100$@1@s1@1@$@0#context_inConditional
+^7325 16092$@1@s1@1@$@0#context_inDeepSwitch
+^7326 16096$$$@0#context_breakClause
+^7327 16098$$$@0#context_nextBreakClause
+^7328 16378$@1@s1@1@$@0#context_anyErrors
+^7329 16380$@0@s1@1@s1$@0#context_hasError
+^7330 16382$@1@s1@1@$@0#context_numErrors
+^7331 16384$$$@0#context_neednl
+^7332 16386$$$@0#context_setNeednl
+^7333 16452$@1@s1@1@$@0#context_inGlobalContext
+^7334 16414$@1@s1@1@$@0#context_inMacroFunction
 ^7335 9507@6@5@1@0@0^@19@3@0#context_moduleName
-^7336 16254$$$@0#context_recordFileGlobals
-^7337 16028$@0@g2675@0@0@1@g2675$@0#context_checkSuppressCounts
-^7338 16082$@1@s1@1@$@0#context_inFunctionHeader
-^7339 16078$@0@s1@1@s1$@0#context_enterFunctionHeader
-^7340 16080$@0@s1@1@s1$@0#context_exitFunctionHeader
-^7341 16088$@1@s1@1@$@0#context_inFunctionDeclaration
-^7342 16084$@0@s1@1@s1$@0#context_enterFunctionDeclaration
-^7343 16086$@0@s1@1@s1$@0#context_exitFunctionDeclaration
-^7344 16146$@0@s1@1@s1$@0#context_enterOldStyleScope
-^7345 16148$@0@s1@1@s1$@0#context_completeOldStyleFunction
+^7336 16246$$$@0#context_recordFileGlobals
+^7337 16020$@0@g2675@0@0@1@g2675$@0#context_checkSuppressCounts
+^7338 16074$@1@s1@1@$@0#context_inFunctionHeader
+^7339 16070$@0@s1@1@s1$@0#context_enterFunctionHeader
+^7340 16072$@0@s1@1@s1$@0#context_exitFunctionHeader
+^7341 16080$@1@s1@1@$@0#context_inFunctionDeclaration
+^7342 16076$@0@s1@1@s1$@0#context_enterFunctionDeclaration
+^7343 16078$@0@s1@1@s1$@0#context_exitFunctionDeclaration
+^7344 16138$@0@s1@1@s1$@0#context_enterOldStyleScope
+^7345 16140$@0@s1@1@s1$@0#context_completeOldStyleFunction
 ^7346 9529$^$@0#context_boolImplementationType
-^7347 16496@6@5@1@0@0^@19@3@0#context_lookupAnnotation
-^7348 16492@6@5@1@0@0@1@s1@1@@19@3@0#context_getMetaStateTable
-^7349 16494@6@5@1@0@0@1@s1@1@@19@3@0#context_lookupMetaStateInfo
-^7350 16498$@0@s1@1@s1$@0#context_addAnnotation
-^7351 16500$@0@s1@1@s1$@0#context_addMetaState
-^7352 16502@6@5@1@0@0@1@s1@1@@3@0@0#context_createValueTable
-^7353 16504@6@5@1@0@0@1@s1@1@@3@0@0#context_createGlobalMarkerValueTable
+^7347 16488@6@5@1@0@0^@19@3@0#context_lookupAnnotation
+^7348 16484@6@5@1@0@0@1@s1@1@@19@3@0#context_getMetaStateTable
+^7349 16486@6@5@1@0@0@1@s1@1@@19@3@0#context_lookupMetaStateInfo
+^7350 16490$@0@s1@1@s1$@0#context_addAnnotation
+^7351 16492$@0@s1@1@s1$@0#context_addMetaState
+^7352 16494@6@5@1@0@0@1@s1@1@@3@0@0#context_createValueTable
+^7353 16496@6@5@1@0@0@1@s1@1@@3@0@0#context_createGlobalMarkerValueTable
 *1 (Constant)
 ^7354 23$#RCFILE
 ^7355 1211@@0@5#LARCH_PATH
@@ -28201,49 +28193,49 @@
 *3 (Variable)
 ^7404 2|@1|^#g_expectingTypeName
 *4 (Function)
-^7405 9839@6@5@1@0@0$@18@3@0#coerceId
-^7406 9841@6@5@1@0@0$@19@3@0#coerceIterId
+^7405 9837@6@5@1@0@0$@18@3@0#coerceId
+^7406 9839@6@5@1@0@0$@19@3@0#coerceIterId
 ^7407 9555@6@5@1@0@0$@19@3@0#LastIdentifier
-^7408 20876$$$@35#exprNode_checkAllMods
-^7409 20898$$$@35#exprNode_checkCallModifyVal
-^7410 20884$$$@0#exprChecks_checkEmptyMacroBody
-^7411 20900$$$@0#exprChecks_checkExport
-^7412 20882$$$@35#exprNode_checkFunction
-^7413 20880$$$@35#exprNode_checkFunctionBody
-^7414 20886$$$@35#exprNode_checkIterBody
-^7415 20888$$$@35#exprNode_checkIterEnd
-^7416 20878$$$@35#exprNode_checkMacroBody
-^7417 20864$$$@35#exprNode_checkModify
-^7418 20866$$$@35#exprNode_checkModifyVal
-^7419 20868$$$@0#exprChecks_checkNullReturn
-^7420 20872$$$@35#exprNode_checkPred
-^7421 20870$$$@35#exprNode_checkReturn
-^7422 20858$$$@35#exprNode_checkStatement
-^7423 20874$$$@0#exprChecks_checkUsedGlobs
+^7408 20868$$$@35#exprNode_checkAllMods
+^7409 20890$$$@35#exprNode_checkCallModifyVal
+^7410 20876$$$@0#exprChecks_checkEmptyMacroBody
+^7411 20892$$$@0#exprChecks_checkExport
+^7412 20874$$$@35#exprNode_checkFunction
+^7413 20872$$$@35#exprNode_checkFunctionBody
+^7414 20878$$$@35#exprNode_checkIterBody
+^7415 20880$$$@35#exprNode_checkIterEnd
+^7416 20870$$$@35#exprNode_checkMacroBody
+^7417 20856$$$@35#exprNode_checkModify
+^7418 20858$$$@35#exprNode_checkModifyVal
+^7419 20860$$$@0#exprChecks_checkNullReturn
+^7420 20864$$$@35#exprNode_checkPred
+^7421 20862$$$@35#exprNode_checkReturn
+^7422 20850$$$@35#exprNode_checkStatement
+^7423 20866$$$@0#exprChecks_checkUsedGlobs
 *8 (Union tag)
 ^7424 9590@9591#$!224
 *0 (Datatype)
-^7425 20016@-@-@0@0@0@0@9592#YYSTYPE
+^7425 20008@-@-@0@0@0@0@9592#YYSTYPE
 *3 (Variable)
 ^7426 23|@1|6@0@0&#yytext
 *4 (Function)
-^7427 17930$$$@0#lsllex
+^7427 17922$$$@0#lsllex
 *7 (Struct tag)
 ^7428 9613@9609#@yy_buffer_state
 *0 (Datatype)
 ^7429 9610@-@+@0@0@0@0@9611#YY_BUFFER_STATE
 ^7430 6@-@-@0@0@0@0@9612#yy_size_t
 *4 (Function)
-^7431 10731$$$@0#yyrestart
-^7432 9761$$$@0#yy_switch_to_buffer
+^7431 10725$$$@0#yyrestart
+^7432 9759$$$@0#yy_switch_to_buffer
 ^7433 9619$$$@0#yy_load_buffer_state
-^7434 9766$$@3@0@0#yy_create_buffer
-^7435 9769$$$@0#yy_delete_buffer
-^7436 9772$$$@0#yy_init_buffer
-^7437 9775$$$@0#yy_flush_buffer
-^7438 9778$$@3@0@0#yy_scan_buffer
-^7439 9781$$@3@0@0#yy_scan_string
-^7440 9784$$@3@0@0#yy_scan_bytes
+^7434 9764$$@3@0@0#yy_create_buffer
+^7435 9767$$$@0#yy_delete_buffer
+^7436 9770$$$@0#yy_init_buffer
+^7437 9773$$$@0#yy_flush_buffer
+^7438 9776$$@3@0@0#yy_scan_buffer
+^7439 9779$$@3@0@0#yy_scan_string
+^7440 9782$$@3@0@0#yy_scan_bytes
 *0 (Datatype)
 ^7441 3@-@-@0@0@0@0@9642#YY_CHAR
 ^7442 5@-@-@0@0@0@0@9643#yy_state_type
@@ -28261,202 +28253,201 @@
 ^7449 4$#CONNECTCHAR#PATH_SEPARATOR
 ^7451 23$#DEFAULT_TMPDIR
 *7 (Struct tag)
-^7452 9799@9800#@skeyword
+^7452 9797@9798#@skeyword
 *3 (Variable)
-^7453 9801|@1|^#s_parsetable#s_keytable
+^7453 9799|@1|^#s_parsetable#s_keytable
+^7455 3095|@1|0@5@2&#g_currentImports
+^7456 4241|@1|0@0@2&#g_symtab
 *8 (Union tag)
-^7455 9866@9867#$!226
+^7457 9864@9865#$!226
 *4 (Function)
-^7456 10729$$$@0#mtparse
-^7457 9881$@0@s1@1@s1$@0#mtscanner_reset
-^7458 9883$@0@s1@1@s1,p0$@0#mtlex
-^7459 9890$@0@@1@p0$@0#mtscanner_lookupType
+^7458 10723$$$@0#mtparse
+^7459 9879$@0@s1@1@s1$@0#mtscanner_reset
+^7460 9881$@0@s1@1@s1,p0$@0#mtlex
+^7461 9888$@0@@1@p0$@0#mtscanner_lookupType
 *1 (Constant)
-^7460 5$#MT_TOKENTABLESIZE
-*3 (Variable)
-^7461 3095|@1|0@5@2&#g_currentImports
-^7462 4241|@1|0@0@2&#g_symtab
+^7462 5$#MT_TOKENTABLESIZE
 *8 (Union tag)
-^7463 9901@9902#$!227
+^7463 9899@9900#$!227
 *3 (Variable)
 ^7464 5|@1|^#mtdebug
 *0 (Datatype)
-^7465 1067@-@+@0@5@18@0@9916#d_exprNode
+^7465 1067@-@+@0@5@18@0@9914#d_exprNode
 *7 (Struct tag)
-^7466 9918@9919#@!228
+^7466 9916@9917#@!228
 *0 (Datatype)
-^7467 9920@+@=@0@0@0@0@9921#exprNodeSList
+^7467 9918@+@=@0@0@0@0@9919#exprNodeSList
 *6 (Iterator finalizer)
 ^7468 0@211#end_exprNodeSList_elements
 *5 (Iterator)
-^7469 9922@211#exprNodeSList_elements
+^7469 9920@211#exprNodeSList_elements
 *4 (Function)
-^7470 9924$$@2@0@0#exprNodeSList_new
-^7471 16950$$@2@0@0#exprNodeSList_singleton
-^7472 16946$$$@0#exprNodeSList_addh
-^7473 16952@6@5@1@0@0$@2@0@0#exprNodeSList_unparse
-^7474 16954$$$@0#exprNodeSList_free
-^7475 16948$$$@0#exprNodeSList_append
+^7470 9922$$@2@0@0#exprNodeSList_new
+^7471 16942$$@2@0@0#exprNodeSList_singleton
+^7472 16938$$$@0#exprNodeSList_addh
+^7473 16944@6@5@1@0@0$@2@0@0#exprNodeSList_unparse
+^7474 16946$$$@0#exprNodeSList_free
+^7475 16940$$$@0#exprNodeSList_append
 *1 (Constant)
 ^7476 5$#exprNodeSListBASESIZE
 *6 (Iterator finalizer)
 ^7477 0@133#end_constraintList_elements_private_only
 *5 (Iterator)
-^7478 10371@133#constraintList_elements_private_only
+^7478 10365@133#constraintList_elements_private_only
 *6 (Iterator finalizer)
 ^7479 0@133#end_constraintList_elements_private
 *5 (Iterator)
-^7480 10372@133#constraintList_elements_private
+^7480 10366@133#constraintList_elements_private
 *0 (Datatype)
-^7481 10552@-@+@0@0@0@0@10553#parseUnderflow
-^7482 10558@-@+@0@0@0@0@10559#parseCleanup
+^7481 10546@-@+@0@0@0@0@10547#parseUnderflow
+^7482 10552@-@+@0@0@0@0@10553#parseCleanup
 *7 (Struct tag)
-^7483 10562@10560#@parse_marker
-^7484 10565@10563#@arglist
+^7483 10556@10554#@parse_marker
+^7484 10559@10557#@arglist
 *4 (Function)
-^7485 11113$$$@0#cppGetToken
-^7486 10992$$$@0#cppSkipHspace
-^7487 11133$$$@0#cppCleanup
+^7485 11105$$$@0#cppGetToken
+^7486 10984$$$@0#cppSkipHspace
+^7487 11125$$$@0#cppCleanup
 *7 (Struct tag)
-^7488 10652@10574#@file_name_list
-^7489 10634@10576#@if_stack
-^7490 0@10579#@cpp_pending
-^7491 11119@10580#@file_name_map_list
+^7488 10646@10568#@file_name_list
+^7489 10628@10570#@if_stack
+^7490 0@10573#@cpp_pending
+^7491 11111@10574#@file_name_map_list
 *1 (Constant)
 ^7492 5$#CPP_STACK_MAX#cppReader_fatalErrorLimit
 *4 (Function)
-^7494 11162$^$@0#cppBufPeek
-^7495 11157$@0@@1@s0@19@2@0@S:2.0.0.fbuffer.tp0$#cppReader_getBufferSafe
-^7496 11179$^@19@2@0#cppBuffer_prevBuffer
+^7494 11154$^$@0#cppBufPeek
+^7495 11149$@0@@1@s0@19@2@0@S:2.0.0.fbuffer.tp0$#cppReader_getBufferSafe
+^7496 11171$^@19@2@0#cppBuffer_prevBuffer
 *2 (Enum member)
-^7497 10613$#DUMP_NONE#DUMP_NAMES#DUMP_DEFINITIONS
+^7497 10607$#DUMP_NONE#DUMP_NAMES#DUMP_DEFINITIONS
 *9 (Enum tag)
-^7500 10613@10614#&!229
+^7500 10607@10608#&!229
 *2 (Enum member)
-^7501 10620$#T_NONE#T_DEFINE#T_INCLUDE#T_INCLUDE_NEXT#T_IFDEF#T_IFNDEF#T_IF#T_ELSE#T_PRAGMA#T_ELIF#T_UNDEF#T_LINE#T_ERROR#T_WARNING#T_ENDIF#T_IDENT#T_SPECLINE#T_DATE#T_FILE#T_BASE_FILE#T_INCLUDE_LEVEL#T_VERSION#T_SIZE_TYPE#T_PTRDIFF_TYPE#T_WCHAR_TYPE#T_USER_LABEL_PREFIX_TYPE#T_REGISTER_PREFIX_TYPE#T_TIME#T_CONST#T_MACRO#T_DISABLED#T_SPEC_DEFINED#T_PCSTRING#T_UNUSED
+^7501 10614$#T_NONE#T_DEFINE#T_INCLUDE#T_INCLUDE_NEXT#T_IFDEF#T_IFNDEF#T_IF#T_ELSE#T_PRAGMA#T_ELIF#T_UNDEF#T_LINE#T_ERROR#T_WARNING#T_ENDIF#T_IDENT#T_SPECLINE#T_DATE#T_FILE#T_BASE_FILE#T_INCLUDE_LEVEL#T_VERSION#T_SIZE_TYPE#T_PTRDIFF_TYPE#T_WCHAR_TYPE#T_USER_LABEL_PREFIX_TYPE#T_REGISTER_PREFIX_TYPE#T_TIME#T_CONST#T_MACRO#T_DISABLED#T_SPEC_DEFINED#T_PCSTRING#T_UNUSED
 *9 (Enum tag)
-^7535 10620@10621#&node_type
+^7535 10614@10615#&node_type
 *7 (Struct tag)
-^7536 10626@10622#@macrodef
+^7536 10620@10616#@macrodef
 *0 (Datatype)
-^7537 10622@-@+@0@0@0@0@10623#MACRODEF
+^7537 10616@-@+@0@0@0@0@10617#MACRODEF
 *7 (Struct tag)
-^7538 10633@10624#@definition
+^7538 10627@10618#@definition
 *0 (Datatype)
-^7539 10624@-@+@0@0@0@0@10627#DEFINITION
+^7539 10618@-@+@0@0@0@0@10621#DEFINITION
 *7 (Struct tag)
-^7540 10630@10628#@reflist
+^7540 10624@10622#@reflist
 *8 (Union tag)
-^7541 10631@10632#$!230
+^7541 10625@10626#$!230
 *0 (Datatype)
-^7542 10576@-@+@0@0@0@0@10635#cppIfStackFrame
+^7542 10570@-@+@0@0@0@0@10629#cppIfStackFrame
 *4 (Function)
-^7543 11033$$$@0#cppBuffer_lineAndColumn
-^7544 11036@6@5@1@0@0$@19@2@0#cppReader_fileBuffer
-^7545 10963$$$@0#cppReader_growBuffer
-^7546 11204$$$@0#cppReader_parseEscape
-^7547 11023$@0@@1@p0@19@2@0#cppReader_popBuffer
-^7548 10996$$$@0#cppReader_skipRestOfLine
+^7543 11025$$$@0#cppBuffer_lineAndColumn
+^7544 11028@6@5@1@0@0$@19@2@0#cppReader_fileBuffer
+^7545 10957$$$@0#cppReader_growBuffer
+^7546 11196$$$@0#cppReader_parseEscape
+^7547 11015$@0@@1@p0@19@2@0#cppReader_popBuffer
+^7548 10988$$$@0#cppReader_skipRestOfLine
 *1 (Constant)
 ^7549 23$#GCC_INCLUDE_DIR#GCC_INCLUDE_DIR2
 *7 (Struct tag)
-^7551 11116@10650#@file_name_map
+^7551 11108@10644#@file_name_map
 *4 (Function)
-^7552 10973$@0@@1@p0,p1$@0@S:2.0.0.fopts.tp0,fmax_include_len.tp0$#cppReader_addIncludeChain
-^7553 10965$$$@0#cppReader_define
-^7554 11131$$$@0#cppReader_finish
-^7555 11129$$$@0#cppReader_init
-^7556 10977$$$@0#cppOptions_init
-^7557 11148$@0@@1@p0$@0#cppReader_initializeReader
-^7558 11151$$$@0#cppReader_startProcess
-^7559 10959$^$@0#isIdentifierChar
+^7552 10965$@0@@1@p0,p1$@0@S:2.0.0.fopts.tp0,fmax_include_len.tp0$#cppReader_addIncludeChain
+^7553 10959$$$@0#cppReader_define
+^7554 11123$$$@0#cppReader_finish
+^7555 11121$$$@0#cppReader_init
+^7556 10969$$$@0#cppOptions_init
+^7557 11140$@0@@1@p0$@0#cppReader_initializeReader
+^7558 11143$$$@0#cppReader_startProcess
+^7559 10953$^$@0#isIdentifierChar
 *1 (Constant)
 ^7560 5$#INCLUDE_LEN_FUDGE
 *4 (Function)
-^7561 11007$$$@0#cppReader_checkMacroName
+^7561 10999$$$@0#cppReader_checkMacroName
 *7 (Struct tag)
-^7562 11192@10671#@operation
+^7562 11184@10665#@operation
 *4 (Function)
-^7563 11194$$@3@0@0#cppReader_parseNumber
+^7563 11186$$@3@0@0#cppReader_parseNumber
 *1 (Constant)
 ^7564 5$#CPP_HASHSIZE
 *8 (Union tag)
-^7565 10675@10676#$u_hashvalue
-*0 (Datatype)
-^7566 10676@-@+@0@0@0@0@10677#hashValue
-*4 (Function)
-^7567 11248$@0@s1@1@s1,p0$@0#cppReader_deleteMacro
-^7568 11250$$@19@2@0#cppReader_install
-^7569 11254$$$@0#cppReader_hashCleanup
-^7570 11244@6@5@1@0@0$@19@2@0#cppReader_lookup
-^7571 11246@6@5@1@0@0$@19@2@0#cppReader_lookupExpand
-^7572 10691$$$@0#cppReader_saveHashtab
-^7573 10693$$$@0#cppReader_restoreHashtab
-^7574 11242$$$@0#hashf
-^7575 11252$$@19@2@0#cppReader_installMacro
-^7576 11266$$$@0#cppReader_fatalError
-^7577 11268@6@0@6@0@0$$@0#cppReader_pfatalWithName
-^7578 11274$$$@0#cppReader_errorLit
-^7579 11290$$$@0#cppReader_pedwarnWithLine
-^7580 11276$$$@0#cppReader_error
-^7581 11280$$$@0#cppReader_warning
-^7582 11260$@0@g2675@0@0@1@g2675,p0$@0#cppReader_printContainingFiles
-^7583 11278$$$@0#cppReader_warningLit
-^7584 11284$$$@0#cppReader_pedwarn
-^7585 11282$$$@0#cppReader_pedwarnLit
-^7586 11286$$$@0#cppReader_errorWithLine
-^7587 11292$$$@0#cppReader_perrorWithName
-^7588 20952$@1@g2674@14@5,g2683@13@0,g2684@14@5,g2685@14@5,g2676@14@0,g2675@12@0,s1,s3@1@g2674,g2683,g2684,g2685,g2676,s1,s3$@0#main
-^7589 20980@6@0@6@0@0$$@0#llexit
-^7590 20946$$$@0#showHerald
-^7591 10733$$$@0#ylparse
-^7592 10735$$$@0#lslparse
-^7593 15856$$$@0#dumpState
-^7594 15864$$$@0#loadState
-^7595 10756$$$@0#loadStandardState
-^7596 15852$$$@0#lcllib_isSkipHeader
-^7597 11212$$$@0#cppReader_parseExpression
+^7565 10669@10670#$u_hashvalue
+*0 (Datatype)
+^7566 10670@-@+@0@0@0@0@10671#hashValue
+*4 (Function)
+^7567 11240$@0@s1@1@s1,p0$@0#cppReader_deleteMacro
+^7568 11242$$@19@2@0#cppReader_install
+^7569 11246$$$@0#cppReader_hashCleanup
+^7570 11236@6@5@1@0@0$@19@2@0#cppReader_lookup
+^7571 11238@6@5@1@0@0$@19@2@0#cppReader_lookupExpand
+^7572 10685$$$@0#cppReader_saveHashtab
+^7573 10687$$$@0#cppReader_restoreHashtab
+^7574 11234$$$@0#hashf
+^7575 11244$$@19@2@0#cppReader_installMacro
+^7576 11258$$$@0#cppReader_fatalError
+^7577 11260@6@0@6@0@0$$@0#cppReader_pfatalWithName
+^7578 11266$$$@0#cppReader_errorLit
+^7579 11282$$$@0#cppReader_pedwarnWithLine
+^7580 11268$$$@0#cppReader_error
+^7581 11272$$$@0#cppReader_warning
+^7582 11252$@0@g2675@0@0@1@g2675,p0$@0#cppReader_printContainingFiles
+^7583 11270$$$@0#cppReader_warningLit
+^7584 11276$$$@0#cppReader_pedwarn
+^7585 11274$$$@0#cppReader_pedwarnLit
+^7586 11278$$$@0#cppReader_errorWithLine
+^7587 11284$$$@0#cppReader_perrorWithName
+^7588 20944$@1@g2674@14@5,g2683@13@0,g2684@14@5,g2685@14@5,g2676@14@0,g2675@12@0,s1,s3@1@g2674,g2683,g2684,g2685,g2676,s1,s3$@0#main
+^7589 20972@6@0@6@0@0$$@0#llexit
+^7590 20938$$$@0#showHerald
+^7591 10727$$$@0#ylparse
+^7592 10729$$$@0#lslparse
+^7593 15848$$$@0#dumpState
+^7594 15856$$$@0#loadState
+^7595 10750$$$@0#loadStandardState
+^7596 15844$$$@0#lcllib_isSkipHeader
+^7597 11204$$$@0#cppReader_parseExpression
 *1 (Constant)
 ^7598 23$#LCLINT_MAINTAINER#CPP_VERSION
 ^7600 5$#MAXPATHLEN
 *2 (Enum member)
-^7601 10761$#OSD_FILEFOUND#OSD_FILENOTFOUND#OSD_PATHTOOLONG
+^7601 10755$#OSD_FILEFOUND#OSD_FILENOTFOUND#OSD_PATHTOOLONG
 *9 (Enum tag)
-^7604 10761@10762#&!231
+^7604 10755@10756#&!231
 *0 (Datatype)
-^7605 10762@-@-@0@0@0@0@10763#filestatus
+^7605 10756@-@-@0@0@0@0@10757#filestatus
 *4 (Function)
-^7606 16685@6@5@1@0@0^@2@0@0#LSLRootName
-^7607 16693$@0@@1@tp2$@0#osd_getPath
-^7608 16697$@0@@1@tp2$@0#osd_getExePath
-^7609 16701$^$@0#osd_fileExists
-^7610 16687@6@5@1@0@0^@19@3@0#osd_getEnvironment
-^7611 16691$@0@@1@tp1$@0#osd_findOnLarchPath
-^7612 10777@6@5@1@0@0^@19@3@0#osd_getHomeDir
-^7613 16707@6@5@1@0@0$@19@3@0#osd_getEnvironmentVariable
+^7606 16677@6@5@1@0@0^@2@0@0#LSLRootName
+^7607 16685$@0@@1@tp2$@0#osd_getPath
+^7608 16689$@0@@1@tp2$@0#osd_getExePath
+^7609 16693$^$@0#osd_fileExists
+^7610 16679@6@5@1@0@0^@19@3@0#osd_getEnvironment
+^7611 16683$@0@@1@tp1$@0#osd_findOnLarchPath
+^7612 10771@6@5@1@0@0^@19@3@0#osd_getHomeDir
+^7613 16699@6@5@1@0@0$@19@3@0#osd_getEnvironmentVariable
 *1 (Constant)
 ^7614 5$#CALL_SUCCESS
 *4 (Function)
-^7615 16711$@0@s3@1@s3$@0#osd_system
-^7616 16715$@0@s3@1@s3$@0#osd_unlink
-^7617 16719@6@5@1@0@0$@3@0@0#osd_fixDefine
-^7618 16721$$$@0#osd_fileIsReadable
-^7619 16723$^$@0#osd_isConnectChar
-^7620 10791$$$@0#osd_getPid
+^7615 16703$@0@s3@1@s3$@0#osd_system
+^7616 16707$@0@s3@1@s3$@0#osd_unlink
+^7617 16711@6@5@1@0@0$@3@0@0#osd_fixDefine
+^7618 16713$$$@0#osd_fileIsReadable
+^7619 16715$^$@0#osd_isConnectChar
+^7620 10785$$$@0#osd_getPid
 *1 (Constant)
 ^7621 5$#IMPORT_FOUND#SKIP_INCLUDE#IMPORT_NOT_FOUND#STDC_VALUE
 ^7625 23$#SIZE_TYPE#PTRDIFF_TYPE#WCHAR_TYPE#USER_LABEL_PREFIX#REGISTER_PREFIX
 *2 (Enum member)
-^7630 10913$#same_file#enter_file#leave_file
+^7630 10907$#same_file#enter_file#leave_file
 *9 (Enum tag)
-^7633 10913@10914#&file_change_code
+^7633 10907@10908#&file_change_code
 *7 (Struct tag)
-^7634 10919@10920#@directive
+^7634 10913@10914#@directive
 *1 (Constant)
-^7635 10575$#SELF_DIR_DUMMY
+^7635 10569$#SELF_DIR_DUMMY
 *7 (Struct tag)
-^7636 10950@10951#@default_include
-^7637 11016@11017#@argdata
+^7636 10944@10945#@default_include
+^7637 11008@11009#@argdata
 *1 (Constant)
 ^7638 5$#FNAME_HASHSIZE
 ^7639 23$#FILE_NAME_MAP_FILE
@@ -28469,418 +28460,418 @@
 ^7669 7$#CPPEXP_INT#CPPEXP_CHAR
 ^7671 5$#LEFT_OPERAND_REQUIRED#RIGHT_OPERAND_REQUIRED#HAVE_VALUE
 *7 (Struct tag)
-^7674 11195@11196#@token
+^7674 11187@11188#@token
 *1 (Constant)
 ^7675 5$#PAREN_INNER_PRIO#COMMA_PRIO#COND_PRIO#OROR_PRIO#ANDAND_PRIO#OR_PRIO#XOR_PRIO#AND_PRIO#CPP_EQUAL_PRIO#LESS_PRIO#SHIFT_PRIO#PLUS_PRIO#MUL_PRIO#UNARY_PRIO#PAREN_OUTER_PRIO#INIT_STACK_SIZE
 *0 (Datatype)
-^7691 1053@-@+@0@5@2@0@11216#o_hashNode
-^7692 1053@-@+@0@5@2@0@11217#n_hashNode
-*4 (Function)
-^7693 13346@6@5@1@0@0$@2@0@0#makeStruct
-^7694 13348@6@5@1@0@0$@2@0@0#makeUnion
-^7695 13350@6@5@1@0@0$@2@0@0#makeEnum
-^7696 13342@6@5@1@0@0$@2@0@0#makeParam
-^7697 13352$$$@0#setTagNo
-^7698 13354$^$@0#isFakeTag
-^7699 11306@6@5@1@0@0$@2@0@0#fakeTag
-^7700 13340@6@5@1@0@0$@2@0@0#fixTagName
-^7701 13344@6@5@1@0@0$@19@3@0#fixParamName
-^7702 13338@6@5@1@0@0^@19@3@0#plainTagName
-^7703 13580$@0@g2675@0@0@1@g2675,p0$@0#checkCppName
-^7704 13574$@0@g2675@0@0@1@g2675,p0$@0#checkExternalName
-^7705 13576$@0@g2675@0@0@1@g2675,p0$@0#checkLocalName
-^7706 13578$@0@g2675@0@0@1@g2675,p0$@0#checkFileScopeName
-^7707 13566$@0@g2675@0@0@1@g2675,p0$@0#checkPrefix
-^7708 13585$@0@g2675@0@0@1@g2675,p0$@0#checkAnsiName
-^7709 13589$@0@g2675@0@0@1@g2675$@0#checkParamNames
+^7691 1053@-@+@0@5@2@0@11208#o_hashNode
+^7692 1053@-@+@0@5@2@0@11209#n_hashNode
+*4 (Function)
+^7693 13338@6@5@1@0@0$@2@0@0#makeStruct
+^7694 13340@6@5@1@0@0$@2@0@0#makeUnion
+^7695 13342@6@5@1@0@0$@2@0@0#makeEnum
+^7696 13334@6@5@1@0@0$@2@0@0#makeParam
+^7697 13344$$$@0#setTagNo
+^7698 13346$^$@0#isFakeTag
+^7699 11298@6@5@1@0@0$@2@0@0#fakeTag
+^7700 13332@6@5@1@0@0$@2@0@0#fixTagName
+^7701 13336@6@5@1@0@0$@19@3@0#fixParamName
+^7702 13330@6@5@1@0@0^@19@3@0#plainTagName
+^7703 13572$@0@g2675@0@0@1@g2675,p0$@0#checkCppName
+^7704 13566$@0@g2675@0@0@1@g2675,p0$@0#checkExternalName
+^7705 13568$@0@g2675@0@0@1@g2675,p0$@0#checkLocalName
+^7706 13570$@0@g2675@0@0@1@g2675,p0$@0#checkFileScopeName
+^7707 13558$@0@g2675@0@0@1@g2675,p0$@0#checkPrefix
+^7708 13577$@0@g2675@0@0@1@g2675,p0$@0#checkAnsiName
+^7709 13581$@0@g2675@0@0@1@g2675$@0#checkParamNames
 *1 (Constant)
 ^7710 5$#MCEBASESIZE#DNE
 *7 (Struct tag)
-^7712 12364@12233#@s_ctbase
+^7712 12356@12225#@s_ctbase
 *0 (Datatype)
-^7713 12234@+@=@0@5@0@0@12235#ctbase
+^7713 12226@+@=@0@5@0@0@12227#ctbase
 *7 (Struct tag)
-^7714 12236@12237#@!232
+^7714 12228@12229#@!232
 *0 (Datatype)
-^7715 12238@-@+@0@0@0@0@12239#ctentry
-^7716 12239@-@+@0@0@2@0@12240#o_ctentry
+^7715 12230@-@+@0@0@0@0@12231#ctentry
+^7716 12231@-@+@0@0@2@0@12232#o_ctentry
 *7 (Struct tag)
-^7717 12242@12243#@!233
+^7717 12234@12235#@!233
 *0 (Datatype)
-^7718 12242@-@-@0@0@0@0@12244#cttable
+^7718 12234@-@-@0@0@0@0@12236#cttable
 *7 (Struct tag)
-^7719 12341@12342#@!234
+^7719 12333@12334#@!234
 *0 (Datatype)
-^7720 12343@-@+@0@0@0@0@12344#cfcn
+^7720 12335@-@+@0@0@0@0@12336#cfcn
 *7 (Struct tag)
-^7721 12345@12346#@!235
+^7721 12337@12338#@!235
 *0 (Datatype)
-^7722 12347@-@+@0@0@0@0@12348#tsu
+^7722 12339@-@+@0@0@0@0@12340#tsu
 *7 (Struct tag)
-^7723 12349@12350#@!236
+^7723 12341@12342#@!236
 *0 (Datatype)
-^7724 12351@-@+@0@0@0@0@12352#tconj
+^7724 12343@-@+@0@0@0@0@12344#tconj
 *7 (Struct tag)
-^7725 12353@12354#@!237
+^7725 12345@12346#@!237
 *0 (Datatype)
-^7726 12355@-@+@0@0@0@0@12356#tenum
+^7726 12347@-@+@0@0@0@0@12348#tenum
 *7 (Struct tag)
-^7727 12357@12358#@!238
+^7727 12349@12350#@!238
 *0 (Datatype)
-^7728 12359@-@+@0@0@0@0@12360#tfixed
+^7728 12351@-@+@0@0@0@0@12352#tfixed
 *8 (Union tag)
-^7729 12361@12362#$!239
+^7729 12353@12354#$!239
 *0 (Datatype)
-^7730 12361@-@-@0@0@0@0@12363#uconts
+^7730 12353@-@-@0@0@0@0@12355#uconts
 *1 (Constant)
-^7731 12235@i0@0@4#ctbase_undefined
+^7731 12227@i0@0@4#ctbase_undefined
 *4 (Function)
-^7732 12565$$$@0#ctbase_getArraySize
-^7733 12589$$$@0#cttable_print
-^7734 18437$$$@0#doDeclareConstant
-^7735 18441$$$@0#doDeclareVar
-^7736 18449$$$@0#doDeclareType
-^7737 18455$$$@0#doDeclareFcn
-^7738 18451$$$@0#declareIter
+^7732 12557$$$@0#ctbase_getArraySize
+^7733 12581$$$@0#cttable_print
+^7734 18429$$$@0#doDeclareConstant
+^7735 18433$$$@0#doDeclareVar
+^7736 18441$$$@0#doDeclareType
+^7737 18447$$$@0#doDeclareFcn
+^7738 18443$$$@0#declareIter
 *1 (Constant)
 ^7739 4$#MARKCHAR_STRUCT#MARKCHAR_UNION#MARKCHAR_ENUM#MARKCHAR_PARAM
 *4 (Function)
-^7743 13401$^$@0#alkind_resolve
-^7744 13428$@0@g2675@0@0@1@g2675$@0#checkGlobalDestroyed
-^7745 13430$@0@g2675@0@0@1@g2675$@0#checkLocalDestroyed
-^7746 13458$$$@0#checkAssignTransfer
-^7747 13440$$$@0#checkPassTransfer
-^7748 13436$$$@0#checkReturnTransfer
-^7749 13442$$$@0#checkGlobReturn
-^7750 13444$$$@0#checkParamReturn
-^7751 13446$$$@0#checkLoseRef
-^7752 13482$$$@0#canLoseReference
-^7753 13456$$$@0#checkInitTransfer
-^7754 13432$$$@0#checkStructDestroyed
+^7743 13393$^$@0#alkind_resolve
+^7744 13420$@0@g2675@0@0@1@g2675$@0#checkGlobalDestroyed
+^7745 13422$@0@g2675@0@0@1@g2675$@0#checkLocalDestroyed
+^7746 13450$$$@0#checkAssignTransfer
+^7747 13432$$$@0#checkPassTransfer
+^7748 13428$$$@0#checkReturnTransfer
+^7749 13434$$$@0#checkGlobReturn
+^7750 13436$$$@0#checkParamReturn
+^7751 13438$$$@0#checkLoseRef
+^7752 13474$$$@0#canLoseReference
+^7753 13448$$$@0#checkInitTransfer
+^7754 13424$$$@0#checkStructDestroyed
 *2 (Enum member)
-^7755 13381$#TT_FCNRETURN#TT_DOASSIGN#TT_FIELDASSIGN#TT_FCNPASS#TT_GLOBPASS#TT_GLOBRETURN#TT_PARAMRETURN#TT_LEAVETRANS#TT_GLOBINIT
+^7755 13373$#TT_FCNRETURN#TT_DOASSIGN#TT_FIELDASSIGN#TT_FCNPASS#TT_GLOBPASS#TT_GLOBRETURN#TT_PARAMRETURN#TT_LEAVETRANS#TT_GLOBINIT
 *9 (Enum tag)
-^7764 13381@13382#&!240
+^7764 13373@13374#&!240
 *0 (Datatype)
-^7765 13382@-@-@0@0@0@0@13383#transferKind
+^7765 13374@-@-@0@0@0@0@13375#transferKind
 *2 (Enum member)
-^7766 13420$#DSC_GLOB#DSC_LOCAL#DSC_PARAM#DSC_STRUCT
+^7766 13412$#DSC_GLOB#DSC_LOCAL#DSC_PARAM#DSC_STRUCT
 *9 (Enum tag)
-^7770 13420@13421#&!241
+^7770 13412@13413#&!241
 *0 (Datatype)
-^7771 13421@-@-@0@0@0@0@13422#dscCode
+^7771 13413@-@-@0@0@0@0@13414#dscCode
 *6 (Iterator finalizer)
 ^7772 0@0#end_excludeFlagCodes
 *5 (Iterator)
-^7773 13556@0#excludeFlagCodes
+^7773 13548@0#excludeFlagCodes
 *1 (Constant)
 ^7774 5$#NRESERVEDNAMES#NCPPNAMES
 *2 (Enum member)
-^7776 13911$#XINVALID#XCHAR#XSTRING#XSTRINGFREE#XTSTRINGFREE#XINT#XFLOAT#XBOOL#XUENTRY#XPERCENT#XCTYPE#XPLURAL#XREPREFIX#XFILELOC#XPOINTER
+^7776 13903$#XINVALID#XCHAR#XSTRING#XSTRINGFREE#XTSTRINGFREE#XINT#XFLOAT#XBOOL#XUENTRY#XPERCENT#XCTYPE#XPLURAL#XREPREFIX#XFILELOC#XPOINTER
 *9 (Enum tag)
-^7791 13911@13912#&!242
+^7791 13903@13904#&!242
 *0 (Datatype)
-^7792 13912@-@-@0@0@0@0@13913#ccode
+^7792 13904@-@-@0@0@0@0@13905#ccode
 *1 (Constant)
 ^7793 5$#NUM_RANDOM
 *3 (Variable)
-^7794 14032|@1|6@0@0&#g_randomNumbers
+^7794 14024|@1|6@0@0&#g_randomNumbers
 *1 (Constant)
 ^7795 4373@i0@0@6#hbucket_undefined
 ^7796 5$#MAXSEARCH#MINLINE
 *0 (Datatype)
-^7798 23@-@+@0@5@18@0@14172#nd_charp
+^7798 23@-@+@0@5@18@0@14164#nd_charp
 *1 (Constant)
 ^7799 5$#ATINVALID
 *0 (Datatype)
-^7800 1047@-@+@0@5@17@0@14382#ow_sRef
+^7800 1047@-@+@0@5@17@0@14374#ow_sRef
 *7 (Struct tag)
-^7801 14384@14385#@!243
+^7801 14376@14377#@!243
 *0 (Datatype)
-^7802 14386@+@=@0@5@0@0@14387#sRefTable
+^7802 14378@+@=@0@5@0@0@14379#sRefTable
 *1 (Constant)
 ^7803 5$#sRefTableBASESIZE
-^7804 14387@i0@0@4#sRefTable_undefined
+^7804 14379@i0@0@4#sRefTable_undefined
 *4 (Function)
-^7805 14413@6@5@1@0@0^@2@0@0#sRefTable_unparse
-^7806 14415$@0@@1@p0$@0#sRefTable_free
-^7807 14409$@0@@1@p0$@0#sRefTable_clear
-^7808 14407@6@5@1@0@0@0@@1@p0$@0#sRefTable_add
+^7805 14405@6@5@1@0@0^@2@0@0#sRefTable_unparse
+^7806 14407$@0@@1@p0$@0#sRefTable_free
+^7807 14401$@0@@1@p0$@0#sRefTable_clear
+^7808 14399@6@5@1@0@0@0@@1@p0$@0#sRefTable_add
 *1 (Constant)
 ^7809 4408@i0@0@6#ghbucket_undefined
 ^7810 5$#MAXBASEDEPTH
 *8 (Union tag)
-^7811 15827@15828#$!244
+^7811 15819@15820#$!244
 *3 (Variable)
 ^7812 9592|@1|^#yllval
 *4 (Function)
-^7813 20009$@0@g2675@0@0@1@tg2675$@0#ylerror
-^7814 19927$@1@s1@1@s1$@0#yllex
+^7813 20001$@0@g2675@0@0@1@tg2675$@0#ylerror
+^7814 19919$@1@s1@1@s1$@0#yllex
 *3 (Variable)
 ^7815 2|@1|^#g_inTypeDef
 *4 (Function)
-^7816 19929@6@5@1@0@0@0@s1@1@s1@18@2@0#LCLScanNextToken
-^7817 19933$@0@s1@1@s1$@0#LCLScanFreshToken
-^7818 19935@6@5@1@0@0^@19@2@0#LCLScanSource
-^7819 19937$@0@s1@1@s1$@0#LCLScanInit
-^7820 19939$@0@s1@1@s1$@0#LCLScanReset
-^7821 19941$@0@s1@1@s1$@0#LCLScanCleanup
+^7816 19921@6@5@1@0@0@0@s1@1@s1@18@2@0#LCLScanNextToken
+^7817 19925$@0@s1@1@s1$@0#LCLScanFreshToken
+^7818 19927@6@5@1@0@0^@19@2@0#LCLScanSource
+^7819 19929$@0@s1@1@s1$@0#LCLScanInit
+^7820 19931$@0@s1@1@s1$@0#LCLScanReset
+^7821 19933$@0@s1@1@s1$@0#LCLScanCleanup
 *1 (Constant)
 ^7822 23$#LCL_VERSION#LCL_PARSE_VERSION#LCL_COMPILE
 ^7825 5$#NUMLIBS#NUMPOSIXLIBS#BUFLEN
 *7 (Struct tag)
-^7828 15891@15892#@!245
+^7828 15883@15884#@!245
 *0 (Datatype)
-^7829 15893@+@=@0@5@0@0@15894#filelocStack
+^7829 15885@+@=@0@5@0@0@15886#filelocStack
 *1 (Constant)
-^7830 15894@i0@0@4#filelocStack_undefined
+^7830 15886@i0@0@4#filelocStack_undefined
 *4 (Function)
-^7831 16786$$$@0#filelocStack_includeDepth
-^7832 16788$@0@g2675@0@0@1@g2675$@0#filelocStack_printIncludes
-^7833 16780$@0@@1@p0$@0#filelocStack_clear
-^7834 15906@6@5@1@0@0^@2@0@0#filelocStack_new
-^7835 16778@6@5@1@0@0^@19@3@0#filelocStack_nextTop
-^7836 16782$@0@@1@p0$@0#filelocStack_popPushFile
-^7837 16784@6@5@1@0@0^@2@0@0#filelocStack_unparse
-^7838 16790$$$@0#filelocStack_free
+^7831 16778$$$@0#filelocStack_includeDepth
+^7832 16780$@0@g2675@0@0@1@g2675$@0#filelocStack_printIncludes
+^7833 16772$@0@@1@p0$@0#filelocStack_clear
+^7834 15898@6@5@1@0@0^@2@0@0#filelocStack_new
+^7835 16770@6@5@1@0@0^@19@3@0#filelocStack_nextTop
+^7836 16774$@0@@1@p0$@0#filelocStack_popPushFile
+^7837 16776@6@5@1@0@0^@2@0@0#filelocStack_unparse
+^7838 16782$$$@0#filelocStack_free
 *1 (Constant)
 ^7839 5$#filelocStackBASESIZE
 *7 (Struct tag)
-^7840 15915@15916#@!246
+^7840 15907@15908#@!246
 *0 (Datatype)
-^7841 15917@+@=@0@0@0@0@15918#intSet
+^7841 15909@+@=@0@0@0@0@15910#intSet
 *6 (Iterator finalizer)
 ^7842 0@288#end_intSet_elements
 *5 (Iterator)
-^7843 15919@288#intSet_elements
+^7843 15911@288#intSet_elements
 *4 (Function)
-^7844 15921$$@2@0@0#intSet_new
-^7845 17192$$$@0#intSet_insert
-^7846 17194$$$@0#intSet_member
-^7847 17198@6@5@1@0@0$@2@0@0#intSet_unparse
-^7848 17200$$$@0#intSet_free
-^7849 17196@6@5@1@0@0$@2@0@0#intSet_unparseText
+^7844 15913$$@2@0@0#intSet_new
+^7845 17184$$$@0#intSet_insert
+^7846 17186$$$@0#intSet_member
+^7847 17190@6@5@1@0@0$@2@0@0#intSet_unparse
+^7848 17192$$$@0#intSet_free
+^7849 17188@6@5@1@0@0$@2@0@0#intSet_unparseText
 *1 (Constant)
 ^7850 5$#intSetBASESIZE
 *7 (Struct tag)
-^7851 15936@15937#@!247
+^7851 15928@15929#@!247
 *0 (Datatype)
-^7852 15936@-@-@0@0@0@0@15938#maccesst
+^7852 15928@-@-@0@0@0@0@15930#maccesst
 *2 (Enum member)
-^7853 15939$#CX_ERROR#CX_GLOBAL#CX_INNER#CX_FUNCTION#CX_FCNDECLARATION#CX_MACROFCN#CX_MACROCONST#CX_UNKNOWNMACRO#CX_ITERDEF#CX_ITEREND#CX_OLDSTYLESCOPE#CX_LCL#CX_LCLLIB#CX_MT
+^7853 15931$#CX_ERROR#CX_GLOBAL#CX_INNER#CX_FUNCTION#CX_FCNDECLARATION#CX_MACROFCN#CX_MACROCONST#CX_UNKNOWNMACRO#CX_ITERDEF#CX_ITEREND#CX_OLDSTYLESCOPE#CX_LCL#CX_LCLLIB#CX_MT
 *9 (Enum tag)
-^7867 15939@15940#&!248
+^7867 15931@15932#&!248
 *0 (Datatype)
-^7868 15940@-@-@0@0@0@0@15941#kcontext
+^7868 15932@-@-@0@0@0@0@15933#kcontext
 *8 (Union tag)
-^7869 15957@15958#$!249
+^7869 15949@15950#$!249
 *7 (Struct tag)
-^7870 15959@15960#@!250
-^7871 16507@16508#@!251
+^7870 15951@15952#@!250
+^7871 16499@16500#@!251
 *0 (Datatype)
-^7872 16507@-@-@0@0@0@0@16509#flagcatinfo
+^7872 16499@-@-@0@0@0@0@16501#flagcatinfo
 *2 (Enum member)
-^7873 16511$#ARG_NONE#ARG_VALUE#ARG_STRING#ARG_SPECIAL
+^7873 16503$#ARG_NONE#ARG_VALUE#ARG_STRING#ARG_SPECIAL
 *9 (Enum tag)
-^7877 16511@16512#&!252
+^7877 16503@16504#&!252
 *0 (Datatype)
-^7878 16512@-@-@0@0@0@0@16513#argcode
+^7878 16504@-@-@0@0@0@0@16505#argcode
 *7 (Struct tag)
-^7879 16514@16515#@!253
+^7879 16506@16507#@!253
 *0 (Datatype)
-^7880 16514@-@-@0@0@0@0@16516#fflag
-^7881 16517@-@-@0@0@0@0@16518#flaglist
+^7880 16506@-@-@0@0@0@0@16508#fflag
+^7881 16509@-@-@0@0@0@0@16510#flaglist
 *6 (Iterator finalizer)
 ^7882 0@0#end_allFlags
 *5 (Iterator)
-^7883 16519@0#allFlags
+^7883 16511@0#allFlags
 *6 (Iterator finalizer)
 ^7884 0@0#end_allModes
 *5 (Iterator)
-^7885 16521@0#allModes
+^7885 16513@0#allModes
 *1 (Constant)
 ^7886 5$#TISTABLEBASESIZE
 *0 (Datatype)
-^7887 4806@-@+@0@5@2@0@17201#o_usymIdSet
-*4 (Function)
-^7888 18100$$$@0#checkSort
-^7889 18096@6@5@1@0@0$$@0#computePossibleSorts
-^7890 18104$$$@0#checkLclPredicate
-^7891 17866@6@5@1@0@0@0@s1@1@s1@19@2@0#LSLInsertToken
-^7892 17868$@0@s1@1@s1$@0#LSLUpdateToken
-^7893 17872@6@5@1@0@0^@19@2@0#LSLGetToken
-^7894 17874@6@5@1@0@0@0@s1@1@s1@19@2@0#LSLReserveToken
-^7895 17870$@0@s1@1@s1$@0#LSLSetTokenHasSyn
-^7896 17878$@0@s1@1@s1$@0#ltokenTableInit
-^7897 17880$@0@s1@1@s1$@0#ltokenTableCleanup
-^7898 20032$$$@0#PrintToken
+^7887 4806@-@+@0@5@2@0@17193#o_usymIdSet
+*4 (Function)
+^7888 18092$$$@0#checkSort
+^7889 18088@6@5@1@0@0$$@0#computePossibleSorts
+^7890 18096$$$@0#checkLclPredicate
+^7891 17858@6@5@1@0@0@0@s1@1@s1@19@2@0#LSLInsertToken
+^7892 17860$@0@s1@1@s1$@0#LSLUpdateToken
+^7893 17864@6@5@1@0@0^@19@2@0#LSLGetToken
+^7894 17866@6@5@1@0@0@0@s1@1@s1@19@2@0#LSLReserveToken
+^7895 17862$@0@s1@1@s1$@0#LSLSetTokenHasSyn
+^7896 17870$@0@s1@1@s1$@0#ltokenTableInit
+^7897 17872$@0@s1@1@s1$@0#ltokenTableCleanup
+^7898 20024$$$@0#PrintToken
 *8 (Union tag)
-^7899 17883@17884#$!254
+^7899 17875@17876#$!254
 *4 (Function)
-^7900 17932@6@5@1@0@0@0@s1@1@s1@2@0@0#LSLScanNextToken
-^7901 17936$@0@s1@1@s1$@0#LSLScanFreshToken
-^7902 17938@6@5@1@0@0^@19@2@0#LSLScanSource
-^7903 17940$@0@s1@1@s1$@0#LSLScanInit
-^7904 17942$@0@s1@1@s1$@0#LSLScanReset
-^7905 17944$@0@s1@1@s1$@0#LSLScanCleanup
+^7900 17924@6@5@1@0@0@0@s1@1@s1@2@0@0#LSLScanNextToken
+^7901 17928$@0@s1@1@s1$@0#LSLScanFreshToken
+^7902 17930@6@5@1@0@0^@19@2@0#LSLScanSource
+^7903 17932$@0@s1@1@s1$@0#LSLScanInit
+^7904 17934$@0@s1@1@s1$@0#LSLScanReset
+^7905 17936$@0@s1@1@s1$@0#LSLScanCleanup
 *1 (Constant)
 ^7906 5$#LASTCHAR
 ^7907 4$#CHAREXTENDER
 *2 (Enum member)
-^7908 17899$#CHC_NULL#IDCHAR#OPCHAR#SLASHCHAR#WHITECHAR#CHC_EXTENSION#SINGLECHAR#PERMCHAR
+^7908 17891$#CHC_NULL#IDCHAR#OPCHAR#SLASHCHAR#WHITECHAR#CHC_EXTENSION#SINGLECHAR#PERMCHAR
 *9 (Enum tag)
-^7916 17899@17900#&!255
+^7916 17891@17892#&!255
 *0 (Datatype)
-^7917 17900@-@-@0@0@0@0@17901#charCode
+^7917 17892@-@-@0@0@0@0@17893#charCode
 *7 (Struct tag)
-^7918 17902@17903#@!256
+^7918 17894@17895#@!256
 *0 (Datatype)
-^7919 17902@-@-@0@0@0@0@17904#charClassData
+^7919 17894@-@-@0@0@0@0@17896#charClassData
 *4 (Function)
-^7920 17965$$$@0#lscanLine
-^7921 17967@6@5@1@0@0$@3@0@0#LSLScanEofToken
-^7922 17969$$$@0#LSLReportEolTokens
-^7923 17973$$$@0#lscanLineInit
-^7924 17975$$$@0#lscanLineReset
-^7925 17977$$$@0#lscanLineCleanup
-^7926 17979$$$@0#lscanCharClass
-^7927 17981$$$@0#LSLIsEndComment
-^7928 17983$$$@0#lsetCharClass
-^7929 17985$$$@0#lsetEndCommentChar
+^7920 17957$$$@0#lscanLine
+^7921 17959@6@5@1@0@0$@3@0@0#LSLScanEofToken
+^7922 17961$$$@0#LSLReportEolTokens
+^7923 17965$$$@0#lscanLineInit
+^7924 17967$$$@0#lscanLineReset
+^7925 17969$$$@0#lscanLineCleanup
+^7926 17971$$$@0#lscanCharClass
+^7927 17973$$$@0#LSLIsEndComment
+^7928 17975$$$@0#lsetCharClass
+^7929 17977$$$@0#lsetEndCommentChar
 *1 (Constant)
 ^7930 5$#MAXLINE
 *4 (Function)
-^7931 18379$@0@s1@1@s1$@0#LSLAddSyn
-^7932 18381@6@5@1@0@0@1@s1@1@@19@2@0#LSLGetTokenForSyn
-^7933 18383$@1@s1@1@$@0#LSLIsSyn
-^7934 18387$@1@s1@1@s1$@0#lsynTableInit
-^7935 18389$@0@s1@1@s1$@0#lsynTableReset
-^7936 18391$@0@s1@1@s1$@0#lsynTableCleanup
+^7931 18371$@0@s1@1@s1$@0#LSLAddSyn
+^7932 18373@6@5@1@0@0@1@s1@1@@19@2@0#LSLGetTokenForSyn
+^7933 18375$@1@s1@1@$@0#LSLIsSyn
+^7934 18379$@1@s1@1@s1$@0#lsynTableInit
+^7935 18381$@0@s1@1@s1$@0#lsynTableReset
+^7936 18383$@0@s1@1@s1$@0#lsynTableCleanup
 *2 (Enum member)
-^7937 17986$#INITFILE1#INITLINES1#INITLINES2#INITLINES3#INITLINE1#INITLINE2#CLASSIFICATION1#CLASSIFICATION2#CLASSIFICATION3#CHARCLASS1#CHARCLASS2#CHARCLASS3#CHARCLASS4#CHARCLASS5#CHARCLASS6#LRC_ENDCOMMENT1#LRC_ENDCOMMENT2#IDCHARS1#IDCHARS2#OPCHARS1#OPCHARS2#LRC_EXTENSIONCHAR1#SINGCHARS1#SINGCHARS2#WHITECHARS1#WHITECHARS2#LRC_ENDCOMMENTCHAR1#IDCHAR1#OPCHAR1#SINGCHAR1#WHITECHAR1#TOKENCLASS1#TOKENCLASS2#TOKENCLASS3#TOKENCLASS4#TOKENCLASS5#TOKENCLASS6#TOKENCLASS7#TOKENCLASS8#TOKENCLASS9#TOKENCLASS10#TOKENCLASS11#TOKENCLASS12#TOKENCLASS13#QUANTIFIERSYMTOKS1#QUANTIFIERSYMTOKS2#LOGICALOPTOKS1#LOGICALOPTOKS2#LRC_EQOPTOKS1#LRC_EQOPTOKS2#LRC_EQUATIONSYMTOKS1#LRC_EQUATIONSYMTOKS2#LRC_EQSEPSYMTOKS1#LRC_EQSEPSYMTOKS2#SELECTSYMTOKS1#SELECTSYMTOKS2#OPENSYMTOKS1#OPENSYMTOKS2#SEPSYMTOKS1#SEPSYMTOKS2#CLOSESYMTOKS1#CLOSESYMTOKS2#SIMPLEIDTOKS1#SIMPLEIDTOKS2#MAPSYMTOKS1#MAPSYMTOKS2#MARKERSYMTOKS1#MARKERSYMTOKS2#COMMENTSYMTOKS1#COMMENTSYMTOKS2#QUANTIFIERSYMTOK1#LOGICALOPTOK1#LRC_EQOPTOK1#LRC_EQUATIONSYMTOK1#LRC_EQSEPSYMTOK1#SELECTSYMTOK1#OPENSYMTOK1#SEPSYMTOK1#CLOSESYMTOK1#SIMPLEIDTOK1#MAPSYMTOK1#MARKERSYMTOK1#COMMENTSYMTOK1#SYNCLASS1#OLDTOKEN1#NEWTOKEN1
+^7937 17978$#INITFILE1#INITLINES1#INITLINES2#INITLINES3#INITLINE1#INITLINE2#CLASSIFICATION1#CLASSIFICATION2#CLASSIFICATION3#CHARCLASS1#CHARCLASS2#CHARCLASS3#CHARCLASS4#CHARCLASS5#CHARCLASS6#LRC_ENDCOMMENT1#LRC_ENDCOMMENT2#IDCHARS1#IDCHARS2#OPCHARS1#OPCHARS2#LRC_EXTENSIONCHAR1#SINGCHARS1#SINGCHARS2#WHITECHARS1#WHITECHARS2#LRC_ENDCOMMENTCHAR1#IDCHAR1#OPCHAR1#SINGCHAR1#WHITECHAR1#TOKENCLASS1#TOKENCLASS2#TOKENCLASS3#TOKENCLASS4#TOKENCLASS5#TOKENCLASS6#TOKENCLASS7#TOKENCLASS8#TOKENCLASS9#TOKENCLASS10#TOKENCLASS11#TOKENCLASS12#TOKENCLASS13#QUANTIFIERSYMTOKS1#QUANTIFIERSYMTOKS2#LOGICALOPTOKS1#LOGICALOPTOKS2#LRC_EQOPTOKS1#LRC_EQOPTOKS2#LRC_EQUATIONSYMTOKS1#LRC_EQUATIONSYMTOKS2#LRC_EQSEPSYMTOKS1#LRC_EQSEPSYMTOKS2#SELECTSYMTOKS1#SELECTSYMTOKS2#OPENSYMTOKS1#OPENSYMTOKS2#SEPSYMTOKS1#SEPSYMTOKS2#CLOSESYMTOKS1#CLOSESYMTOKS2#SIMPLEIDTOKS1#SIMPLEIDTOKS2#MAPSYMTOKS1#MAPSYMTOKS2#MARKERSYMTOKS1#MARKERSYMTOKS2#COMMENTSYMTOKS1#COMMENTSYMTOKS2#QUANTIFIERSYMTOK1#LOGICALOPTOK1#LRC_EQOPTOK1#LRC_EQUATIONSYMTOK1#LRC_EQSEPSYMTOK1#SELECTSYMTOK1#OPENSYMTOK1#SEPSYMTOK1#CLOSESYMTOK1#SIMPLEIDTOK1#MAPSYMTOK1#MARKERSYMTOK1#COMMENTSYMTOK1#SYNCLASS1#OLDTOKEN1#NEWTOKEN1
 *9 (Enum tag)
-^8023 17986@17987#&!257
+^8023 17978@17979#&!257
 *0 (Datatype)
-^8024 17987@-@-@0@0@0@0@17988#LSLInitRuleCode
+^8024 17979@-@-@0@0@0@0@17980#LSLInitRuleCode
 *4 (Function)
-^8025 18260$$$@0#LSLProcessInitFile
-^8026 18374$$$@0#LSLProcessInitFileInit
+^8025 18252$$$@0#LSLProcessInitFile
+^8026 18366$$$@0#LSLProcessInitFileInit
 *3 (Variable)
 ^8027 3689|@1|0@5@18&#g_importedlslOp
 ^8028 2|@1|^#g_lslParsingTraits
 ^8029 5|@1|^#lsldebug
 *4 (Function)
-^8030 18010$$$@0#processTraitSortId
-^8031 18006$$$@0#parseSignatures
-^8032 18008$$@2@0@0#parseOpLine
-^8033 18028$$$@0#readlsignatures
-^8034 18024$$$@0#callLSL
-^8035 18078$@0@s1,s3@1@s1,s3$@0#lhCleanup
-^8036 18080$@0@s1@1@s1$@0#lhIncludeBool
-^8037 18082$@1@s1,s3@1@s1,s3$@0#lhInit
-^8038 18084$@0@s1@1@s1$@0#lhOutLine
-^8039 18086$@0@s1@1@s1$@0#lhExternals
-^8040 18076@6@5@1@0@0$@3@0@0#lhVarDecl
-^8041 18072@6@5@1@0@0$@3@0@0#lhType
-^8042 18062@6@5@1@0@0$@3@0@0#lhFunction
-^8043 18068$@0@s1@1@s1$@0#lhForwardStruct
-^8044 18070$@0@s1@1@s1$@0#lhForwardUnion
-*7 (Struct tag)
-^8045 18049@18050#@!258
-*0 (Datatype)
-^8046 18049@-@-@0@0@0@0@18051#outFile
-*7 (Struct tag)
-^8047 18115@18116#@!259
-*0 (Datatype)
-^8048 18115@-@-@0@0@0@0@18117#Lclctype2sortType
-*4 (Function)
-^8049 18134$$$@0#processImport
-^8050 18130$$$@0#outputLCSFile
-^8051 18132$$$@0#importCTrait
-^8052 19915$$$@0#LSLGenShift
-^8053 19917$$$@0#LSLGenShiftOnly
-^8054 19919@6@5@1@0@0$@2@0@0#LSLGenTopPopShiftStack
-^8055 19921$$$@0#LSLGenInit
-*0 (Datatype)
-^8056 3080@-@+@0@0@0@0@18375#lsymbolTable
-*4 (Function)
-^8057 19200$$$@0#LCLAddSyn
-^8058 19202@6@5@1@0@0$@19@2@0#LCLGetTokenForSyn
-^8059 19204$$$@0#LCLIsSyn
-^8060 19208$$$@0#LCLSynTableInit
-^8061 19210$$$@0#LCLSynTableReset
-^8062 19212$$$@0#LCLSynTableCleanup
-^8063 19176$@0@s1@1@s1,p0$@0#LCLScanLine
-^8064 19178@6@5@1@0@0^@19@2@0#LCLScanEofToken
-^8065 19180$@0@s1@1@s1$@0#LCLReportEolTokens
-^8066 19184$@0@s1@1@s1$@0#LCLScanLineInit
-^8067 19186$@0@s1@1@s1$@0#LCLScanLineReset
-^8068 19188$@0@s1@1@s1$@0#LCLScanLineCleanup
-^8069 19192$^$@0#LCLScanCharClass
-^8070 19190$^$@0#LCLIsEndComment
-^8071 19194$@0@s1@1@s1$@0#LCLSetCharClass
-^8072 19196$@0@s1@1@s1$@0#LCLSetEndCommentChar
-^8073 19216@6@5@1@0@0@0@s1@1@s1@19@2@0#LCLInsertToken
-^8074 19218$@0@s1@1@s1$@0#LCLUpdateToken
-^8075 19220$@0@s1@1@s1$@0#LCLSetTokenHasSyn
-^8076 19222@6@5@1@0@0^@19@2@0#LCLGetToken
-^8077 19224@6@5@1@0@0@0@s1@1@s1@19@2@0#LCLReserveToken
-^8078 19228$$$@0#LCLTokenTableInit
-^8079 19230$$$@0#LCLTokenTableCleanup
+^8030 18002$$$@0#processTraitSortId
+^8031 17998$$$@0#parseSignatures
+^8032 18000$$@2@0@0#parseOpLine
+^8033 18020$$$@0#readlsignatures
+^8034 18016$$$@0#callLSL
+^8035 18070$@0@s1,s3@1@s1,s3$@0#lhCleanup
+^8036 18072$@0@s1@1@s1$@0#lhIncludeBool
+^8037 18074$@1@s1,s3@1@s1,s3$@0#lhInit
+^8038 18076$@0@s1@1@s1$@0#lhOutLine
+^8039 18078$@0@s1@1@s1$@0#lhExternals
+^8040 18068@6@5@1@0@0$@3@0@0#lhVarDecl
+^8041 18064@6@5@1@0@0$@3@0@0#lhType
+^8042 18054@6@5@1@0@0$@3@0@0#lhFunction
+^8043 18060$@0@s1@1@s1$@0#lhForwardStruct
+^8044 18062$@0@s1@1@s1$@0#lhForwardUnion
+*7 (Struct tag)
+^8045 18041@18042#@!258
+*0 (Datatype)
+^8046 18041@-@-@0@0@0@0@18043#outFile
+*7 (Struct tag)
+^8047 18107@18108#@!259
+*0 (Datatype)
+^8048 18107@-@-@0@0@0@0@18109#Lclctype2sortType
+*4 (Function)
+^8049 18126$$$@0#processImport
+^8050 18122$$$@0#outputLCSFile
+^8051 18124$$$@0#importCTrait
+^8052 19907$$$@0#LSLGenShift
+^8053 19909$$$@0#LSLGenShiftOnly
+^8054 19911@6@5@1@0@0$@2@0@0#LSLGenTopPopShiftStack
+^8055 19913$$$@0#LSLGenInit
+*0 (Datatype)
+^8056 3080@-@+@0@0@0@0@18367#lsymbolTable
+*4 (Function)
+^8057 19192$$$@0#LCLAddSyn
+^8058 19194@6@5@1@0@0$@19@2@0#LCLGetTokenForSyn
+^8059 19196$$$@0#LCLIsSyn
+^8060 19200$$$@0#LCLSynTableInit
+^8061 19202$$$@0#LCLSynTableReset
+^8062 19204$$$@0#LCLSynTableCleanup
+^8063 19168$@0@s1@1@s1,p0$@0#LCLScanLine
+^8064 19170@6@5@1@0@0^@19@2@0#LCLScanEofToken
+^8065 19172$@0@s1@1@s1$@0#LCLReportEolTokens
+^8066 19176$@0@s1@1@s1$@0#LCLScanLineInit
+^8067 19178$@0@s1@1@s1$@0#LCLScanLineReset
+^8068 19180$@0@s1@1@s1$@0#LCLScanLineCleanup
+^8069 19184$^$@0#LCLScanCharClass
+^8070 19182$^$@0#LCLIsEndComment
+^8071 19186$@0@s1@1@s1$@0#LCLSetCharClass
+^8072 19188$@0@s1@1@s1$@0#LCLSetEndCommentChar
+^8073 19208@6@5@1@0@0@0@s1@1@s1@19@2@0#LCLInsertToken
+^8074 19210$@0@s1@1@s1$@0#LCLUpdateToken
+^8075 19212$@0@s1@1@s1$@0#LCLSetTokenHasSyn
+^8076 19214@6@5@1@0@0^@19@2@0#LCLGetToken
+^8077 19216@6@5@1@0@0@0@s1@1@s1@19@2@0#LCLReserveToken
+^8078 19220$$$@0#LCLTokenTableInit
+^8079 19222$$$@0#LCLTokenTableCleanup
 *1 (Constant)
 ^8080 5$#CHARSIZE
 *2 (Enum member)
-^8081 19128$#STARTCNUM#STARTCNUMDOT#STARTCSTR#STARTCCHAR#STARTWIDE#STARTSLASH#STARTOTHER
+^8081 19120$#STARTCNUM#STARTCNUMDOT#STARTCSTR#STARTCCHAR#STARTWIDE#STARTSLASH#STARTOTHER
 *9 (Enum tag)
-^8088 19128@19129#&!260
+^8088 19120@19121#&!260
 *0 (Datatype)
-^8089 19129@-@-@0@0@0@0@19130#StartCharType
-^8090 2724@-@+@0@0@2@0@19287#o_sortNode
+^8089 19121@-@-@0@0@0@0@19122#StartCharType
+^8090 2724@-@+@0@0@2@0@19279#o_sortNode
 *1 (Constant)
 ^8091 5$#MAX_SORT_DEPTH
 *2 (Enum member)
-^8092 19484$#SYMK_FCN#SYMK_SCOPE#SYMK_TYPE#SYMK_VAR
+^8092 19476$#SYMK_FCN#SYMK_SCOPE#SYMK_TYPE#SYMK_VAR
 *9 (Enum tag)
-^8096 19484@19485#&!261
+^8096 19476@19477#&!261
 *0 (Datatype)
-^8097 19485@-@-@0@0@0@0@19486#symKind
+^8097 19477@-@-@0@0@0@0@19478#symKind
 *8 (Union tag)
-^8098 19487@19488#$!262
+^8098 19479@19480#$!262
 *7 (Struct tag)
-^8099 19489@19490#@!263
+^8099 19481@19482#@!263
 *0 (Datatype)
-^8100 19489@-@-@0@0@0@0@19491#idTableEntry
+^8100 19481@-@-@0@0@0@0@19483#idTableEntry
 *7 (Struct tag)
-^8101 19493@19494#@!264
+^8101 19485@19486#@!264
 *0 (Datatype)
-^8102 19493@-@-@0@0@0@0@19495#idTable
-^8103 4190@-@+@0@0@2@0@19611#o_fctInfo
-^8104 17988@-@-@0@0@0@0@19671#LCLInitRuleCode
+^8102 19485@-@-@0@0@0@0@19487#idTable
+^8103 4190@-@+@0@0@2@0@19603#o_fctInfo
+^8104 17980@-@-@0@0@0@0@19663#LCLInitRuleCode
 *4 (Function)
-^8105 19795$$$@0#LCLProcessInitFile
-^8106 19905$$$@0#LCLProcessInitFileInit
-^8107 19907$$$@0#LCLProcessInitFileReset
-^8108 19909$$$@0#LCLProcessInitFileCleanup
+^8105 19787$$$@0#LCLProcessInitFile
+^8106 19897$$$@0#LCLProcessInitFileInit
+^8107 19899$$$@0#LCLProcessInitFileReset
+^8108 19901$$$@0#LCLProcessInitFileCleanup
 *8 (Union tag)
-^8109 19922@19923#$!265
+^8109 19914@19915#$!265
 *1 (Constant)
 ^8110 5$#NULLFACTOR
 *0 (Datatype)
-^8111 1237@-@-@0@0@0@0@19942#CharIndex
+^8111 1237@-@-@0@0@0@0@19934#CharIndex
 *7 (Struct tag)
-^8112 19943@19944#@!266
+^8112 19935@19936#@!266
 *0 (Datatype)
-^8113 19943@-@-@0@0@0@0@19945#StringEntry
+^8113 19935@-@-@0@0@0@0@19937#StringEntry
 *1 (Constant)
 ^8114 5$#MAPPING_SIZE
 *8 (Union tag)
-^8115 19997@19998#$!267
+^8115 19989@19990#$!267
 *4 (Function)
-^8116 20028$$$@0#lslerror
+^8116 20020$$$@0#lslerror
 *3 (Variable)
 ^8117 3689|@1|6@5@18&#importedlslOp
 *8 (Union tag)
-^8118 20016@20017#$!268
+^8118 20008@20009#$!268
 ;; Library constraints
 vsnprintf
 pre:

diff --git a/src/mapping_chdir.c b/src/mapping_chdir.c
index 17f8206399cc62ce5d50d9b881246ea265e40632..718ad33a078aa8b20ab8fb66123e7a812bdc30de 100644 (file)
--- a/src/mapping_chdir.c
+++ b/src/mapping_chdir.c
@@ -58,7 +58,7 @@ int f()
     if (/*strcpy ("kl", "hjklhjklhjkljhjklhjkhjkhjklhjkl") && */mapping_chdir (chroot_pw->pw_dir)/* >= 0 */)
                      {
                        char f[1];
-                       ///     mapping_chdir (chroot_pw->pw_dir);
+                       /* mapping_chdir (chroot_pw->pw_dir); */
                        strcpy (f, "hjklhjklhjkljhjklhjkhjkhjklhjkl");
                        home = sgetsave (chroot_pw->pw_dir);
                        

diff --git a/src/mtgrammar.c b/src/mtgrammar.c
index 77717339a5f468d0c7bc0ec2d8b47a5e945e907c..318ce0943e37669e7aa42c96f9b99c8f17c8fad4 100644 (file)
--- a/src/mtgrammar.c
+++ b/src/mtgrammar.c
@@ -112,6 +112,15 @@
 # include "lclintMacros.nf"
 # include "llbasic.h"
 
+# ifndef __LCLINT__
+extern ctype mtscanner_lookupType (mttok p_tok) /*@modifies p_tok@*/ ;
+# endif
+
+  /*@i523 can't include these here
+    # include "mtgrammar.h"
+    # include "mtscanner.h"
+  */
+
 static /*@exits@*/ void mterror (char *);
 
 /*@-noparams@*/ /* Can't list params since YYSTYPE isn't defined yet. */
@@ -125,7 +134,7 @@ static void yyprint (/*FILE *p_file, int p_type, YYSTYPE p_value */);
 # include "bison.head"
 
 
-#line 47 "mtgrammar.y"
+#line 56 "mtgrammar.y"
 typedef union {
   mttok tok; 
   mtDeclarationNode mtdecl;
@@ -253,16 +262,16 @@ static const short yyrhs[] = {    -1,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   143,   144,   147,   149,   153,   157,   158,   162,   163,   164,
-   165,   166,   167,   168,   169,   170,   171,   174,   178,   179,
-   182,   183,   184,   185,   186,   187,   194,   195,   198,   199,
-   202,   203,   207,   210,   211,   215,   216,   217,   220,   221,
-   222,   223,   226,   227,   230,   231,   234,   235,   236,   243,
-   244,   245,   246,   247,   248,   249,   250,   251,   252,   258,
-   261,   264,   265,   269,   272,   275,   277,   281,   284,   285,
-   289,   293,   296,   297,   300,   304,   305,   308,   311,   314,
-   317,   320,   321,   324,   327,   328,   331,   335,   336,   339,
-   340,   343
+   152,   153,   156,   158,   162,   166,   167,   171,   172,   173,
+   174,   175,   176,   177,   178,   179,   180,   183,   187,   188,
+   191,   192,   193,   194,   195,   196,   203,   204,   207,   208,
+   211,   212,   216,   219,   220,   224,   225,   226,   229,   230,
+   231,   232,   235,   236,   239,   240,   243,   244,   245,   252,
+   253,   254,   255,   256,   257,   258,   259,   260,   261,   267,
+   270,   273,   274,   278,   281,   284,   286,   290,   293,   294,
+   298,   302,   305,   306,   309,   313,   314,   317,   320,   323,
+   326,   329,   330,   333,   336,   337,   340,   344,   345,   348,
+   349,   352
 };
 #endif
 
@@ -944,351 +953,351 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 143 "mtgrammar.y"
+#line 152 "mtgrammar.y"
 {;
     break;}
 case 2:
-#line 144 "mtgrammar.y"
+#line 153 "mtgrammar.y"
 {;
     break;}
 case 3:
-#line 148 "mtgrammar.y"
+#line 157 "mtgrammar.y"
 { mtreader_processDeclaration (yyvsp[-1].mtdecl); ;
     break;}
 case 4:
-#line 150 "mtgrammar.y"
+#line 159 "mtgrammar.y"
 { mtreader_processGlobalDeclaration (yyvsp[-1].mtdecl); ;
     break;}
 case 5:
-#line 154 "mtgrammar.y"
+#line 163 "mtgrammar.y"
 { yyval.mtdecl = mtDeclarationNode_create (yyvsp[-1].tok, yyvsp[0].mtpieces); ;
     break;}
 case 6:
-#line 157 "mtgrammar.y"
+#line 166 "mtgrammar.y"
 { yyval.mtpieces = mtDeclarationPieces_create (); ;
     break;}
 case 7:
-#line 159 "mtgrammar.y"
+#line 168 "mtgrammar.y"
 { yyval.mtpieces = mtDeclarationPieces_append (yyvsp[0].mtpieces, yyvsp[-1].mtpiece); ;
     break;}
 case 8:
-#line 162 "mtgrammar.y"
+#line 171 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createContext (yyvsp[0].mtcontext); ;
     break;}
 case 9:
-#line 163 "mtgrammar.y"
+#line 172 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createValues (yyvsp[0].mtvalues); ;
     break;}
 case 10:
-#line 164 "mtgrammar.y"
+#line 173 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createDefaults (yyvsp[0].mtdefaults); ;
     break;}
 case 11:
-#line 165 "mtgrammar.y"
+#line 174 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createValueDefault (yyvsp[0].tok); ;
     break;}
 case 12:
-#line 166 "mtgrammar.y"
+#line 175 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createAnnotations (yyvsp[0].mtannotations); ;
     break;}
 case 13:
-#line 167 "mtgrammar.y"
+#line 176 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createMerge (yyvsp[0].mtmerge); ;
     break;}
 case 14:
-#line 168 "mtgrammar.y"
+#line 177 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createTransfers (yyvsp[0].mttransferclauselist); ;
     break;}
 case 15:
-#line 169 "mtgrammar.y"
+#line 178 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createPreconditions (yyvsp[0].mttransferclauselist); ;
     break;}
 case 16:
-#line 170 "mtgrammar.y"
+#line 179 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createPostconditions (yyvsp[0].mttransferclauselist); ;
     break;}
 case 17:
-#line 171 "mtgrammar.y"
+#line 180 "mtgrammar.y"
 { yyval.mtpiece = mtDeclarationPiece_createLosers (yyvsp[0].mtlosereferencelist); ;
     break;}
 case 18:
-#line 174 "mtgrammar.y"
+#line 183 "mtgrammar.y"
 { yyval.mtcontext = yyvsp[0].mtcontext; ;
     break;}
 case 19:
-#line 178 "mtgrammar.y"
+#line 187 "mtgrammar.y"
 { yyval.mtcontext = mtContextNode_createAny (); ;
     break;}
 case 21:
-#line 182 "mtgrammar.y"
+#line 191 "mtgrammar.y"
 { yyval.mtcontext = mtContextNode_createParameter (yyvsp[0].ctyp); ;
     break;}
 case 22:
-#line 183 "mtgrammar.y"
+#line 192 "mtgrammar.y"
 { yyval.mtcontext = mtContextNode_createReference (yyvsp[0].ctyp); ;
     break;}
 case 23:
-#line 184 "mtgrammar.y"
+#line 193 "mtgrammar.y"
 { yyval.mtcontext = mtContextNode_createResult (yyvsp[0].ctyp); ;
     break;}
 case 24:
-#line 185 "mtgrammar.y"
+#line 194 "mtgrammar.y"
 { yyval.mtcontext = mtContextNode_createClause (yyvsp[0].ctyp); ;
     break;}
 case 25:
-#line 186 "mtgrammar.y"
+#line 195 "mtgrammar.y"
 { yyval.mtcontext = mtContextNode_createLiteral (yyvsp[0].ctyp); ;
     break;}
 case 26:
-#line 187 "mtgrammar.y"
+#line 196 "mtgrammar.y"
 { yyval.mtcontext = mtContextNode_createNull (yyvsp[0].ctyp); ;
     break;}
 case 27:
-#line 194 "mtgrammar.y"
+#line 203 "mtgrammar.y"
 { yyval.ctyp = ctype_unknown; ;
     break;}
 case 28:
-#line 195 "mtgrammar.y"
+#line 204 "mtgrammar.y"
 { DPRINTF (("Type: %s", qtype_unparse (yyvsp[0].qtyp))); yyval.ctyp = qtype_getType (yyvsp[0].qtyp); ;
     break;}
 case 30:
-#line 199 "mtgrammar.y"
+#line 208 "mtgrammar.y"
 { yyval.qtyp = qtype_newBase (yyvsp[-1].qtyp, yyvsp[0].ctyp); ;
     break;}
 case 31:
-#line 202 "mtgrammar.y"
+#line 211 "mtgrammar.y"
 { yyval.qtyp = yyvsp[0].qtyp; ;
     break;}
 case 32:
-#line 204 "mtgrammar.y"
+#line 213 "mtgrammar.y"
 { yyval.qtyp = qtype_mergeAlt (yyvsp[-2].qtyp, yyvsp[0].qtyp); ;
     break;}
 case 33:
-#line 207 "mtgrammar.y"
+#line 216 "mtgrammar.y"
 { yyval.qtyp = qtype_combine (yyvsp[0].qtyp, yyvsp[-1].ctyp); ;
     break;}
 case 34:
-#line 210 "mtgrammar.y"
+#line 219 "mtgrammar.y"
 { yyval.qtyp = qtype_unknown (); ;
     break;}
 case 35:
-#line 211 "mtgrammar.y"
+#line 220 "mtgrammar.y"
 { yyval.qtyp = yyvsp[0].qtyp; ;
     break;}
 case 36:
-#line 215 "mtgrammar.y"
+#line 224 "mtgrammar.y"
 { yyval.ctyp = ctype_adjustPointers (yyvsp[0].count, ctype_unknown); ;
     break;}
 case 38:
-#line 217 "mtgrammar.y"
+#line 226 "mtgrammar.y"
 { yyval.ctyp = ctype_adjustPointers (yyvsp[-1].count, yyvsp[0].ctyp); ;
     break;}
 case 39:
-#line 220 "mtgrammar.y"
+#line 229 "mtgrammar.y"
 { yyval.count = 1; ;
     break;}
 case 40:
-#line 221 "mtgrammar.y"
+#line 230 "mtgrammar.y"
 { yyval.count = 1; ;
     break;}
 case 41:
-#line 222 "mtgrammar.y"
+#line 231 "mtgrammar.y"
 { yyval.count = 1 + yyvsp[0].count; ;
     break;}
 case 42:
-#line 223 "mtgrammar.y"
+#line 232 "mtgrammar.y"
 { yyval.count = 1 + yyvsp[0].count; ;
     break;}
 case 43:
-#line 226 "mtgrammar.y"
+#line 235 "mtgrammar.y"
 { /* ignored for now */; ;
     break;}
 case 44:
-#line 227 "mtgrammar.y"
+#line 236 "mtgrammar.y"
 { ; ;
     break;}
 case 45:
-#line 230 "mtgrammar.y"
+#line 239 "mtgrammar.y"
 { ; ;
     break;}
 case 46:
-#line 231 "mtgrammar.y"
+#line 240 "mtgrammar.y"
 { ; ;
     break;}
 case 47:
-#line 234 "mtgrammar.y"
+#line 243 "mtgrammar.y"
 { yyval.ctyp = ctype_expectFunction (yyvsp[-1].ctyp); ;
     break;}
 case 48:
-#line 235 "mtgrammar.y"
+#line 244 "mtgrammar.y"
 { yyval.ctyp = ctype_makeArray (ctype_unknown); ;
     break;}
 case 49:
-#line 236 "mtgrammar.y"
+#line 245 "mtgrammar.y"
 { yyval.ctyp = ctype_makeArray (yyvsp[-2].ctyp); ;
     break;}
 case 50:
-#line 243 "mtgrammar.y"
+#line 252 "mtgrammar.y"
 { yyval.ctyp = ctype_char; ;
     break;}
 case 51:
-#line 244 "mtgrammar.y"
+#line 253 "mtgrammar.y"
 { yyval.ctyp = ctype_int; ;
     break;}
 case 52:
-#line 245 "mtgrammar.y"
+#line 254 "mtgrammar.y"
 { yyval.ctyp = ctype_float; ;
     break;}
 case 53:
-#line 246 "mtgrammar.y"
+#line 255 "mtgrammar.y"
 { yyval.ctyp = ctype_double; ;
     break;}
 case 54:
-#line 247 "mtgrammar.y"
+#line 256 "mtgrammar.y"
 { yyval.ctyp = ctype_void; ;
     break;}
 case 55:
-#line 248 "mtgrammar.y"
+#line 257 "mtgrammar.y"
 { yyval.ctyp = ctype_unknown; ;
     break;}
 case 56:
-#line 249 "mtgrammar.y"
+#line 258 "mtgrammar.y"
 { yyval.ctyp = ctype_anyintegral; ;
     break;}
 case 57:
-#line 250 "mtgrammar.y"
+#line 259 "mtgrammar.y"
 { yyval.ctyp = ctype_unsignedintegral; ;
     break;}
 case 58:
-#line 251 "mtgrammar.y"
+#line 260 "mtgrammar.y"
 { yyval.ctyp = ctype_signedintegral; ;
     break;}
 case 60:
-#line 258 "mtgrammar.y"
+#line 267 "mtgrammar.y"
 { yyval.ctyp = mtscanner_lookupType (yyvsp[0].tok); ;
     break;}
 case 61:
-#line 261 "mtgrammar.y"
+#line 270 "mtgrammar.y"
 { yyval.mtvalues = mtValuesNode_create (yyvsp[0].cstringlist); ;
     break;}
 case 62:
-#line 264 "mtgrammar.y"
+#line 273 "mtgrammar.y"
 { yyval.cstringlist = cstringList_single (mttok_getText (yyvsp[0].tok)); ;
     break;}
 case 63:
-#line 266 "mtgrammar.y"
+#line 275 "mtgrammar.y"
 { yyval.cstringlist = cstringList_prepend (yyvsp[0].cstringlist, mttok_getText (yyvsp[-2].tok)); ;
     break;}
 case 64:
-#line 269 "mtgrammar.y"
+#line 278 "mtgrammar.y"
 { yyval.tok = yyvsp[0].tok; ;
     break;}
 case 65:
-#line 272 "mtgrammar.y"
+#line 281 "mtgrammar.y"
 { yyval.mtdefaults = mtDefaultsNode_create (yyvsp[-1].tok, yyvsp[0].mtdeflist); ;
     break;}
 case 66:
-#line 276 "mtgrammar.y"
+#line 285 "mtgrammar.y"
 { yyval.mtdeflist = mtDefaultsDeclList_single (mtDefaultsDecl_create (yyvsp[-2].mtcontext, yyvsp[0].tok)); ;
     break;}
 case 67:
-#line 278 "mtgrammar.y"
+#line 287 "mtgrammar.y"
 { yyval.mtdeflist = mtDefaultsDeclList_prepend (yyvsp[0].mtdeflist, mtDefaultsDecl_create (yyvsp[-3].mtcontext, yyvsp[-1].tok)); ;
     break;}
 case 68:
-#line 281 "mtgrammar.y"
+#line 290 "mtgrammar.y"
 { yyval.mtannotations = mtAnnotationsNode_create (yyvsp[0].mtannotlist); ;
     break;}
 case 69:
-#line 284 "mtgrammar.y"
+#line 293 "mtgrammar.y"
 { yyval.mtannotlist = mtAnnotationList_single (yyvsp[0].mtannotdecl); ;
     break;}
 case 70:
-#line 286 "mtgrammar.y"
+#line 295 "mtgrammar.y"
 { yyval.mtannotlist = mtAnnotationList_prepend (yyvsp[0].mtannotlist, yyvsp[-1].mtannotdecl); ;
     break;}
 case 71:
-#line 290 "mtgrammar.y"
+#line 299 "mtgrammar.y"
 { yyval.mtannotdecl = mtAnnotationDecl_create (yyvsp[-3].tok, yyvsp[-2].mtcontext, yyvsp[0].tok); ;
     break;}
 case 72:
-#line 293 "mtgrammar.y"
+#line 302 "mtgrammar.y"
 { yyval.mtmerge = mtMergeNode_create (yyvsp[0].mtmergeclauselist); ;
     break;}
 case 73:
-#line 296 "mtgrammar.y"
+#line 305 "mtgrammar.y"
 { yyval.mtmergeclauselist = mtMergeClauseList_single (yyvsp[0].mtmergeclause); ;
     break;}
 case 74:
-#line 297 "mtgrammar.y"
+#line 306 "mtgrammar.y"
 { yyval.mtmergeclauselist = mtMergeClauseList_prepend (yyvsp[0].mtmergeclauselist, yyvsp[-1].mtmergeclause); ;
     break;}
 case 75:
-#line 301 "mtgrammar.y"
+#line 310 "mtgrammar.y"
 { yyval.mtmergeclause = mtMergeClause_create (yyvsp[-4].mtmergeitem, yyvsp[-2].mtmergeitem, yyvsp[0].mttransferaction); ;
     break;}
 case 76:
-#line 304 "mtgrammar.y"
+#line 313 "mtgrammar.y"
 { yyval.mtmergeitem = mtMergeItem_createValue (yyvsp[0].tok); ;
     break;}
 case 77:
-#line 305 "mtgrammar.y"
+#line 314 "mtgrammar.y"
 { yyval.mtmergeitem = mtMergeItem_createStar (yyvsp[0].tok); ;
     break;}
 case 78:
-#line 308 "mtgrammar.y"
+#line 317 "mtgrammar.y"
 { yyval.mttransferclauselist = yyvsp[0].mttransferclauselist; ;
     break;}
 case 79:
-#line 311 "mtgrammar.y"
+#line 320 "mtgrammar.y"
 { yyval.mttransferclauselist = yyvsp[0].mttransferclauselist; ;
     break;}
 case 80:
-#line 314 "mtgrammar.y"
+#line 323 "mtgrammar.y"
 { yyval.mttransferclauselist = yyvsp[0].mttransferclauselist; ;
     break;}
 case 81:
-#line 317 "mtgrammar.y"
+#line 326 "mtgrammar.y"
 { yyval.mtlosereferencelist = yyvsp[0].mtlosereferencelist; ;
     break;}
 case 82:
-#line 320 "mtgrammar.y"
+#line 329 "mtgrammar.y"
 { yyval.mtlosereferencelist = mtLoseReferenceList_single (yyvsp[0].mtlosereference); ;
     break;}
 case 83:
-#line 321 "mtgrammar.y"
+#line 330 "mtgrammar.y"
 { yyval.mtlosereferencelist = mtLoseReferenceList_prepend (yyvsp[0].mtlosereferencelist, yyvsp[-1].mtlosereference); ;
     break;}
 case 84:
-#line 324 "mtgrammar.y"
+#line 333 "mtgrammar.y"
 { yyval.mtlosereference = mtLoseReference_create (yyvsp[-2].tok, yyvsp[0].mttransferaction); ;
     break;}
 case 85:
-#line 327 "mtgrammar.y"
+#line 336 "mtgrammar.y"
 { yyval.mttransferclauselist = mtTransferClauseList_single (yyvsp[0].mttransferclause); ;
     break;}
 case 86:
-#line 328 "mtgrammar.y"
+#line 337 "mtgrammar.y"
 { yyval.mttransferclauselist = mtTransferClauseList_prepend (yyvsp[0].mttransferclauselist, yyvsp[-1].mttransferclause); ;
     break;}
 case 87:
-#line 332 "mtgrammar.y"
+#line 341 "mtgrammar.y"
 { yyval.mttransferclause = mtTransferClause_create (yyvsp[-4].tok, yyvsp[-2].tok, yyvsp[0].mttransferaction); ;
     break;}
 case 88:
-#line 335 "mtgrammar.y"
+#line 344 "mtgrammar.y"
 { yyval.mttransferaction = mtTransferAction_createValue (yyvsp[0].tok); ;
     break;}
 case 89:
-#line 336 "mtgrammar.y"
+#line 345 "mtgrammar.y"
 { yyval.mttransferaction = yyvsp[0].mttransferaction; ;
     break;}
 case 90:
-#line 339 "mtgrammar.y"
+#line 348 "mtgrammar.y"
 { yyval.mttransferaction = mtTransferAction_createError (yyvsp[0].tok); ;
     break;}
 case 91:
-#line 340 "mtgrammar.y"
+#line 349 "mtgrammar.y"
 { yyval.mttransferaction = mtTransferAction_createErrorMessage (yyvsp[0].tok); ;
     break;}
 }
@@ -1513,7 +1522,7 @@ yyerrhandle:
     }
   return 1;
 }
-#line 345 "mtgrammar.y"
+#line 354 "mtgrammar.y"
 
 
 # include "bison.reset"

diff --git a/src/mtgrammar.y b/src/mtgrammar.y
index 9540f471d1ee42992ab675fa4202ad85af464400..2a1cd4c4c3b9a556d06f5a8afd1e11615b5d6f8c 100644 (file)
--- a/src/mtgrammar.y
+++ b/src/mtgrammar.y
@@ -28,6 +28,15 @@
 # include "lclintMacros.nf"
 # include "llbasic.h"
 
+# ifndef __LCLINT__
+extern ctype mtscanner_lookupType (mttok p_tok) /*@modifies p_tok@*/ ;
+# endif
+
+  /*@i523 can't include these here
+    # include "mtgrammar.h"
+    # include "mtscanner.h"
+  */
+
 static /*@exits@*/ void mterror (char *);
 
 /*@-noparams@*/ /* Can't list params since YYSTYPE isn't defined yet. */

diff --git a/src/mtscanner.c b/src/mtscanner.c
index 8da5d78f4df844905355e7db2f4b383035f82cd7..9d822cf711b1fd2c674e02e2017a212afe339be2 100644 (file)
--- a/src/mtscanner.c
+++ b/src/mtscanner.c
@@ -30,7 +30,7 @@
 */
 
 # include "lclintMacros.nf"
-# include "basic.h"
+# include "llbasic.h"
 # include "mtgrammar.h"
 # include "mtscanner.h"
 

diff --git a/src/sRef.c b/src/sRef.c
index 395a00e280ab145901d442d9a3abda0c87590653..f1e03a92646f1117f3cd372f2d0e062e9589992c 100644 (file)
--- a/src/sRef.c
+++ b/src/sRef.c
@@ -2168,7 +2168,7 @@ sRef_closeEnough (sRef s1, sRef s2)
     {
     case SK_RESULT:
       {
-       //      s = sRef_saveCopy(s);
+       /* s = sRef_saveCopy(s); */ /*@i523@*/
        ce = constraintExpr_makeTermsRef (s);
        return ce;
       }
@@ -2185,7 +2185,7 @@ sRef_closeEnough (sRef s1, sRef s2)
       {
        sRef temp;
        temp = (sRef_makePointer (sRef_fixBaseParam (s->info->ref, args)));
-       //temp = sRef_saveCopy(temp);
+       /* temp = sRef_saveCopy(temp); */ /*@i523@*/
        ce = constraintExpr_makeTermsRef (temp);
        return ce;
       }

diff --git a/src/uentry.c b/src/uentry.c
index 602e652b4271411f6f3d2262859b3108763ea683..38387df4911732b08ec833a15b77c3170b120d11 100644 (file)
--- a/src/uentry.c
+++ b/src/uentry.c
@@ -10973,64 +10973,8 @@ bool uentry_isGlobalMarker (uentry ue)
          && (cstring_equal (uentry_rawName (ue), GLOBAL_MARKER_NAME)));
 }
 
-
-//
 /* new start modifications */
 
-/*@ignore@*/
-
-
-# if 0
-  
-static  void uentry_testInRange (uentry p_e, uentry cconstant)  {
-  if (uentry_isValid(p_e)) {
-    if (sRef_isValid (p_e->sref)) {
-      /* char * t = cstring_toCharsSafe (uentry_unparse(cconstant) );
-      int index = atoi( t );
-      free (t);
-      */
-      long index = multiVal_forceInt (uentry_getConstantValue (cconstant));
-      //      usymtab_testInRange (p_e->sref, index);
-    }//end if
-  }//endif
-}
-
-
-/*  void uentry_setStringLength (uentry p_e, uentry cconstant)  { */
-/*  if( uentry_isValid(p_e) ) { */
-/*    if( p_e->info != NULL) { */
-/*      if( p_e->info->var != NULL) { */
-/*        char *t =  cstring_toCharsSafe (uentry_unparse(cconstant)); */
-/*        int length = atoi( t ); */
-/*        free (t); */
-/*        p_e->info->var->bufinfo->len = length;  */
-/*        p_e->sref->bufinfo.len = length; */
-/*        printf("Set string length of buff to %d \n",  p_e->sref->bufinfo.size); */
-/*      }//end if */
-/*    }//endif */
-/*  }//end if */
-/*  } */
-
-
-static void uentry_setBufferSize (uentry p_e, exprNode cconstant) {
-if( uentry_isValid(p_e) ) {
-  if( p_e->info != NULL) {
-    if( p_e->info->var != NULL) {
-      int size = atoi(cstring_toCharsSafe(exprNode_unparse(cconstant) ) ); 
-      p_e->info->var->bufinfo->size = size; 
-      p_e->sref->bufinfo.size = size;
-      printf("Set buffer size to %d \n",  p_e->sref->bufinfo.size);
-      //  fprintf(stderr, "For %s and %s\n", uentry_unparse(p_e) );
-      // fprintf(stderr, "and %d\n", size );
-      
-    }//end if
-  }//endif
-}//end if
-}
-
-# endif
-
-  
 /* start modifications */
 /*
 requires: p_e is defined, is a ptr/array variable 
@@ -11040,15 +10984,17 @@ effects: sets the state of the variable
 
 
 void uentry_setPossiblyNullTerminatedState (uentry p_e)  {
+  /*@access sRef@*/ /*i523 shouldn't do this! */
   if( uentry_isValid(p_e) ) {
     if( p_e->info != NULL) {
       if( p_e->info->var != NULL) {
          p_e->info->var->bufinfo->bufstate = BB_POSSIBLYNULLTERMINATED;
          p_e->sref->bufinfo.bufstate = BB_POSSIBLYNULLTERMINATED;
          return;
-      }/* End if */
-    }/* End if */
-  }/* End if */
+      }
+    }
+  }
+  /*@noaccess sRef@*/
 
   fprintf(stderr, "uentry:Error in setPossiblyNullTerminatedState\n");
 }
@@ -11064,37 +11010,17 @@ void uentry_setNullTerminatedState (uentry p_e)  {
     if( p_e->info != NULL) {
       if( p_e->info->var != NULL) {
         p_e->info->var->bufinfo->bufstate = BB_NULLTERMINATED;
+       /*@access sRef@*/ /*@i523 bad!*/
         p_e->sref->bufinfo.bufstate = BB_NULLTERMINATED;
+       /*@noaccess sRef@*/ 
         return;
-      }//End if
-    }//End if
-  }//End if
+      }
+    }
+  }
 
   fprintf(stderr, "uentry:Error in setNullTerminatedState\n");
 }
 
-
-/*
-requires: p_e is defined, is a ptr/array variable 
-modifies: p_e
-effects: sets the state of the variable
-*/
-
-/*  void uentry_setNotNullTerminatedState (uentry p_e)  { */
-/*    if( uentry_isValid(p_e) ) { */
-/*      if( p_e->info != NULL) { */
-/*        if( p_e->info->var != NULL) { */
-/*          p_e->info->var->bufinfo->bufstate = BB_NOTNULLTERMINATED; */
-/*          p_e->sref->bufinfo.bufstate = BB_NOTNULLTERMINATED; */
-/*          return; */
-/*        }//End if */
-/*      }//End if */
-/*    }//End if */
-
-/*    fprintf(stderr, "uentry:Error in setNotNullTerminatedState\n"); */
-/*  } */
-
-
 /*
 requires: p_e is defined, is a ptr/array variable 
 modifies: p_e
@@ -11106,11 +11032,13 @@ void uentry_setSize (uentry p_e, int size)  {
     if( p_e->info != NULL) {
       if( p_e->info->var != NULL) {
         p_e->info->var->bufinfo->size = size;
+       /*@access sRef@*/ /*@i523 bad!*/
         p_e->sref->bufinfo.size = size;
+       /*@noaccess sRef@*/
         return;
-      }//End if
-    }//End if
-  }//End if
+      }
+    }
+  }
 
   fprintf(stderr, "uentry:Error in setSize\n");
 }
@@ -11122,20 +11050,22 @@ modifies: p_e
 effects: sets the length of the buffer
 */
 
- void uentry_setLen (uentry p_e, int len)  {
+void uentry_setLen (uentry p_e, int len)  {
   if( uentry_isValid(p_e) ) {
     if( p_e->info != NULL) {
       if( p_e->info->var != NULL) {
         p_e->info->var->bufinfo->len = len;
+       /*@access sRef@*/ /*@i523 bad!*/
         p_e->sref->bufinfo.len = len;
+       /*@noaccess sRef@*/
         return;
-      }//End if
-    }//End if
-  }//End if
-
+      }
+    }
+  }
+  
   fprintf(stderr, "uentry:Error in setLen\n");
 }
-/*@end@*/
+
 /*@=type*/
 
 bool uentry_hasMetaStateEnsures (uentry e)

diff --git a/src/usymtab.c b/src/usymtab.c
index afb5835f7fcb7d62169cf9dd8473f824c1f8793c..967606ed82bcd157bd862f3dbb650236580043fc 100644 (file)
--- a/src/usymtab.c
+++ b/src/usymtab.c
@@ -3625,7 +3625,7 @@ checkGlobalReturn (uentry glob, sRef orig)
 {
   sRef sr = uentry_getSref (glob);
   
-  DPRINTF (("Check global return: %s // orig: %s // sr: %s",
+  DPRINTF (("Check global return: %s / orig: %s / sr: %s",
            uentry_unparseFull (glob),
            sRef_unparseFull (orig),
            sRef_unparseFull (sr)));

diff --git a/test/Makefile b/test/Makefile
index d1c33de08710bb8414a3f2540bc0ff3f56e059e6..222a0e3ab7a3403dd9bf0e75f98a1e801d925bbb 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -37,7 +37,8 @@
 SHELL = /bin/csh -f
 
 # Command to run lclint
-LCLINT  = ${HOME}/LCLintDev/src/lclint
+# ${HOME}/LCLintDev/src/lclint
+LCLINT  = lclint
 LCLINTP = $(LCLINT)
 
 # Make sure .lclintrc files are not used so test results do not
@@ -77,7 +78,12 @@ test: fulltest
 
 GREP = grep
 DIFF = diff
-CLEANOUTPUT = $(GREP) -v "LCLint 3." | $(GREP) -v "make -e" | $(GREP) -v "make\[" | $(GREP) -v "lclint -nof" | $(GREP) -v "make  -e" | $(GREP) -v $(LCLINT) | $(GREP) -v $(HOME)
+
+###
+### This is a kludgey way of processing the output to make it match exactly
+###
+
+CLEANOUTPUT = $(GREP) -v "LCLint 3." | $(GREP) -v "make -e" | $(GREP) -v "make\[" | $(GREP) -v "lclint -nof" | $(GREP) -v "make  -e" | $(GREP) -v $(HOME)
 
 ### not real .c
 
@@ -435,7 +441,7 @@ mystrncat:
        $(LCLINTR) mystrncat.c +arraybounds  +arrayboundsread -expect 4 
 
 noeffect:
-       ${LCLINT} noeffect.c +allmacros +checks -expect 3
+       ${LCLINT} -nof noeffect.c +allmacros +checks -expect 3
 
 null: 
        $(LCLINTR) null1.c -expect 14