Release 2.0.3

diff --git a/ChangeLog b/ChangeLog
index ad0fe5fa6787e5755b6f51d647fdf0ff70c699e7..b865a5a97e40efe5b9228c32d96c403ef5dbc77c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2002-11-01  Jody Goldberg <jody@gnome.org>
+
+       * src/parse.y (ensure_property) : patch obvious borkage in using item3
+         in a production with 2 items.
+
+Fri Nov 01 14:41:52 2002  George Lebl <jirka@5z.com>
+
+       * src/lexer.l, src/util.c: when in cpp mode don't eat ::
+
+Mon Oct 14 16:16:38 2002  George Lebl <jirka@5z.com>
+
+       * src/parse.y: Fix segfault reported by Gerhard Dieringer
+         <Gerhard.Dieringer@nexgo.de>
+
+       * src/main.c, src/util.c: Fix g_value_set/get for the unichar
+         case (glib doesn't have this, so use uint, this is so braindead).
+         Also add support for UNICHAR in places and add support for
+         UINT64 and INT64
+
+Wed Sep 11 11:20:38 2002  George Lebl <jirka@5z.com>
+
+       * src/main.c: remove G_GNUC_CONST from the get_type, that seems to be
+         wrong and causes gcc3.2 to whack out and all that.
+
 Tue Aug 20 11:01:52 2002  George Lebl <jirka@5z.com>
 
        * Release 2.0.2

diff --git a/NEWS b/NEWS
index 772a1489a00701490ed7cedad8f3d24b29e22ca6..a71a4ac621fefd1a9b6c656c3faf827bded8be39 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,20 @@
-2.0.2
+2.0.3:
+       * In C++ mode don't eat "::" from type strings as C++ might be
+         using it, and we aren't ever using such a thing
+       * Fix a segfaults in the parser (Jody Goldberg, Gerhard Dieringer, me)
+       * Fix unichar stuff for values (properties, signal arguments, etc...)
+       * Add support for UNICHAR and UINT64 and INT64 everywhere
+       * Don't make the get_type function a G_GNUC_CONST as gcc3.2 whacks
+         out about that
+
+2.0.2:
        * Properly link BOXED type
        * unref/unrefwith works now since shtdown changed into dispose
        * Update documentation
        * man page escapes all ' chars (fix debian bug 155577)
        * Further tests in test.gob
 
-2.0.1
+2.0.1:
        * Fixed property types for all the types that require an extra
          GObject type
        * Fix object and boxed linking

diff --git a/configure b/configure
index 8a82f076142da13c03f3c5a94da40527a54796b8..d9ac9bdbf614f3b4c337cedf028c99cac0cf33d4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1120,7 +1120,7 @@ fi
 
 PACKAGE=gob2
 
-VERSION=2.0.2
+VERSION=2.0.3
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { { echo "$as_me:1126: error: source directory already configured; run \"make distclean\" there first" >&5

diff --git a/configure.in b/configure.in
index 9a9008ce8f7298f63fc368ec753e2c9de95ca612..54cec6f77b4ea3d6592413ea4bfafd9058e305d7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.2)
 AC_INIT(src/treefuncs.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gob2,2.0.2)
+AM_INIT_AUTOMAKE(gob2,2.0.3)
 AM_MAINTAINER_MODE
 
 GLIB_REQUIRED=1.3.12

diff --git a/gob2.spec b/gob2.spec
index 6e227f185ebb62c4eb1b4444bd37f991a3efd580..a9fd2634002d9aadc975d368877d9e1b4631aa64 100644 (file)
--- a/gob2.spec
+++ b/gob2.spec
@@ -1,4 +1,4 @@
-%define  ver     2.0.2
+%define  ver     2.0.3
 %define  rel     1
 %define  prefix  /usr
 

diff --git a/src/lexer.c b/src/lexer.c
index 73f65b7fa6ec7dd0b691df5e9998157f1763fcee..1e90358d69a83aa6eca38b867f4e4645f49f7c89 100644 (file)
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -284,80 +284,81 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
        *yy_cp = '\0'; \
        yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 112
-#define YY_END_OF_BUFFER 113
-static yyconst short int yy_acclist[610] =
+#define YY_NUM_RULES 113
+#define YY_END_OF_BUFFER 114
+static yyconst short int yy_acclist[615] =
     {   0,
-      113,  110,  112,  109,  110,  112,    1,  111,  112,  110,
-      111,  112,  110,  112,  110,  112,  110,  112,  100,  110,
-      112,  100,  110,  112,  110,  112,  103,  110,  112,  103,
-      110,  112,  103,  110,  112,  103,  110,  112,  109,  110,
-      112,  110,  112,  110,  112,  103,  110,  112,   29,  110,
-      112,    1,   30,  111,  112,   29,  110,  111,  112,   29,
-      110,  112,   29,  110,  112,   29,  110,  112,   53,  110,
-      112,    1,   54,  111,  112,   53,  110,  111,  112,   45,
-       53,  110,  112,   53,  110,  112,   53,  110,  112,   53,
-      110,  112,   51,   53,  110,  112,   52,   53,  110,  112,
-
-       53,  110,  112,   53,  110,  112,   49,  110,  112,    1,
-       50,  111,  112,   49,  110,  111,  112,   48,   49,  110,
-      112,   49,  110,  112,   49,  110,  112,  110,  112,  103,
-      110,  112,  103,  110,  112,  103,  110,  112,  106,  110,
-      112,  110,  112,  110,  112,  110,  112,  103,  110,  112,
-      103,  110,  112,  103,  110,  112,  103,  110,  112,  103,
-      110,  112,  103,  110,  112,  103,  110,  112,  103,  110,
-      112,  103,  110,  112,  103,  110,  112,  103,  110,  112,
-      103,  110,  112,  107,  110,  112,  108,  110,  112,   97,
-      110,  112,   46,  110,  112,   98,  110,  112,   99,  110,
-
-      112,  110,  112,  103,  110,  112,  103,  110,  112,  103,
-      110,  112,  103,  110,  112,  103,  110,  112,  103,  110,
-      112,  103,  110,  112,  103,  110,  112,  103,  110,  112,
-      103,  110,  112,  103,  110,  112,  103,  110,  112,   10,
-      110,  112,   10,  110,  111,  112,   10,  110,  112,   10,
-      110,  112,   10,  110,  112,   10,  110,  112,   15,  110,
-      112,   15,  110,  111,  112,   15,  110,  112,   15,  110,
-      112,   15,  110,  112,   15,  110,  112,   18,  110,  112,
-       18,  110,  111,  112,   18,  110,  112,   18,  110,  112,
-      100,   23,  100,  100,  102,  103,  101,  103,  103,  103,
-
-      103,   36,  103,   28,   24,   44,   37,   47,   25,  103,
-      103,  103,   26,  105,  103,  103,  103,  103,  103,  103,
-      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-      103,  103,   27,  103,  103,  103,  103,  103,  103,  103,
-      103,  103,  103,  103,  103,    9,    7,   14,   11,   13,
-       12,   14,   17,   16,  104,  104,  100,    3,  100,  100,
-      102,  102,  101,  103,  103,  103,  103,   31,   35,  103,
-       42,   38,   40,   19,   20,  103,  103,  103,   75,   21,
-      103,  103,  103,  103,  103,  103,  103,   70,  103,  103,
-      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-
-      103,   22,  103,  103,  103,  103,  103,  103,  103,  103,
-      103,  103,  103,  103,   12,  102,  103,   57,  103,  103,
-      103,   32,   33,   34,  103,   43,   39,   41,  103,   61,
-      103,   60,  103,    6,  103,   73,  103,  103,  103,  103,
-       65,  103,  103,   68,  103,  103,  103,  103,  103,  103,
-      103,  103,  103,  103,  103,  103,   62,  103,  103,  103,
-      103,   65,  103,  103,  103,  103,   85,  103,  103,  103,
-      103,   91,  103,    8,   55,  103,   56,  103,   58,  103,
-      103,  103,   60,  103,   74,  103,  103,   71,  103,  103,
-      103,  103,  103,  103,   69,  103,  103,  103,  103,   64,
-
-      103,  103,  103,   86,  103,  103,  103,  103,   90,  103,
-      103,  103,  103,  103,  103,  103,  103,   72,  103,  103,
-      103,  103,  103,   76,  103,   82,  103,   66,  103,   63,
-      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-      103,    4,  103,  103,  103,  103,   77,  103,  103,  103,
-      103,   81,  103,  103,  103,  103,  103,   87,  103,   88,
-      103,  103,  103,  103,   80,  103,  103,   83,  103,   84,
-      103,  103,   67,  103,  103,  103,  103,  103,  103,  103,
-       79,  103,   78,  103,  103,  103,   93,  103,  103,  103,
-      103,    4,    2,   95,  103,  103,   92,  103,  103,   94,
-
-      103,    5,  103,   96,  103,  103,   89,  103,   59
+      114,  111,  113,  110,  111,  113,    1,  112,  113,  111,
+      112,  113,  111,  113,  111,  113,  111,  113,  100,  111,
+      113,  100,  111,  113,  111,  113,  104,  111,  113,  104,
+      111,  113,  104,  111,  113,  104,  111,  113,  110,  111,
+      113,  111,  113,  111,  113,  104,  111,  113,   29,  111,
+      113,    1,   30,  112,  113,   29,  111,  112,  113,   29,
+      111,  113,   29,  111,  113,   29,  111,  113,   53,  111,
+      113,    1,   54,  112,  113,   53,  111,  112,  113,   45,
+       53,  111,  113,   53,  111,  113,   53,  111,  113,   53,
+      111,  113,   51,   53,  111,  113,   52,   53,  111,  113,
+
+       53,  111,  113,   53,  111,  113,   49,  111,  113,    1,
+       50,  112,  113,   49,  111,  112,  113,   48,   49,  111,
+      113,   49,  111,  113,   49,  111,  113,  111,  113,  104,
+      111,  113,  104,  111,  113,  104,  111,  113,  107,  111,
+      113,  111,  113,  111,  113,  111,  113,  104,  111,  113,
+      104,  111,  113,  104,  111,  113,  104,  111,  113,  104,
+      111,  113,  104,  111,  113,  104,  111,  113,  104,  111,
+      113,  104,  111,  113,  104,  111,  113,  104,  111,  113,
+      104,  111,  113,  108,  111,  113,  109,  111,  113,   97,
+      111,  113,   46,  111,  113,   98,  111,  113,   99,  111,
+
+      113,  111,  113,  104,  111,  113,  104,  111,  113,  104,
+      111,  113,  104,  111,  113,  104,  111,  113,  104,  111,
+      113,  104,  111,  113,  104,  111,  113,  104,  111,  113,
+      104,  111,  113,  104,  111,  113,  104,  111,  113,   10,
+      111,  113,   10,  111,  112,  113,   10,  111,  113,   10,
+      111,  113,   10,  111,  113,   10,  111,  113,   15,  111,
+      113,   15,  111,  112,  113,   15,  111,  113,   15,  111,
+      113,   15,  111,  113,   15,  111,  113,   18,  111,  113,
+       18,  111,  112,  113,   18,  111,  113,   18,  111,  113,
+      100,   23,  100,  100,  103,  104,  102,  104,  104,  104,
+
+      104,   36,  104,   28,   24,   44,   37,   47,   25,  104,
+      104,  104,   26,  106,  104,  104,  104,  104,  104,  104,
+      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+      104,  104,   27,  104,  104,  104,  104,  104,  104,  104,
+      104,  104,  104,  104,  104,    9,    7,   14,   11,   13,
+       12,   14,   17,   16,  105,  105,  100,    3,  100,  100,
+      103,  103,  102,  101,  102,  104,  104,  104,  104,   31,
+       35,  104,   42,   38,   40,   19,   20,  104,  104,  104,
+       75,   21,  104,  104,  104,  104,  104,  104,  104,   70,
+      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+
+      104,  104,  104,   22,  104,  104,  104,  104,  104,  104,
+      104,  104,  104,  104,  104,  104,   12,  103,  102,  101,
+      102,  104,   57,  104,  104,  104,   32,   33,   34,  104,
+       43,   39,   41,  104,   61,  104,   60,  104,    6,  104,
+       73,  104,  104,  104,  104,   65,  104,  104,   68,  104,
+      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+      104,   62,  104,  104,  104,  104,   65,  104,  104,  104,
+      104,   85,  104,  104,  104,  104,   91,  104,    8,   55,
+      104,   56,  104,   58,  104,  104,  104,   60,  104,   74,
+      104,  104,   71,  104,  104,  104,  104,  104,  104,   69,
+
+      104,  104,  104,  104,   64,  104,  104,  104,   86,  104,
+      104,  104,  104,   90,  104,  104,  104,  104,  104,  104,
+      104,  104,   72,  104,  104,  104,  104,  104,   76,  104,
+       82,  104,   66,  104,   63,  104,  104,  104,  104,  104,
+      104,  104,  104,  104,  104,  104,    4,  104,  104,  104,
+      104,   77,  104,  104,  104,  104,   81,  104,  104,  104,
+      104,  104,   87,  104,   88,  104,  104,  104,  104,   80,
+      104,  104,   83,  104,   84,  104,  104,   67,  104,  104,
+      104,  104,  104,  104,  104,   79,  104,   78,  104,  104,
+      104,   93,  104,  104,  104,  104,    4,    2,   95,  104,
+
+      104,   92,  104,  104,   94,  104,    5,  104,   96,  104,
+      104,   89,  104,   59
     } ;
 
-static yyconst short int yy_accept[514] =
+static yyconst short int yy_accept[517] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -383,39 +384,39 @@ static yyconst short int yy_accept[514] =
 
       345,  346,  347,  347,  347,  347,  348,  348,  349,  349,
       349,  349,  350,  351,  351,  353,  354,  355,  356,  356,
-      357,  358,  358,  359,  360,  361,  362,  363,  364,  365,
-      366,  367,  368,  368,  368,  368,  368,  369,  369,  369,
-      370,  370,  370,  371,  371,  372,  372,  372,  372,  373,
-      374,  374,  375,  375,  375,  376,  377,  378,  379,  380,
-      380,  380,  381,  381,  381,  382,  383,  384,  385,  386,
-      387,  388,  390,  391,  392,  393,  394,  395,  396,  397,
-      398,  399,  400,  401,  402,  402,  403,  404,  405,  406,
-      407,  408,  409,  410,  411,  412,  413,  414,  415,  415,
-
-      416,  417,  418,  420,  421,  422,  422,  422,  422,  423,
-      423,  424,  425,  425,  426,  426,  427,  428,  429,  429,
-      430,  432,  434,  434,  435,  436,  438,  439,  440,  441,
-      443,  444,  446,  447,  448,  449,  450,  451,  452,  453,
-      454,  455,  456,  457,  459,  460,  461,  462,  464,  465,
-      466,  467,  469,  470,  471,  472,  474,  474,  475,  475,
-      475,  477,  479,  481,  481,  481,  481,  481,  481,  482,
-      482,  482,  483,  485,  487,  488,  490,  491,  492,  493,
-      494,  495,  497,  498,  499,  500,  502,  503,  504,  506,
-      507,  508,  509,  511,  512,  513,  514,  515,  515,  515,
-
-      515,  515,  515,  516,  516,  516,  517,  518,  520,  521,
-      522,  523,  524,  526,  528,  530,  532,  533,  534,  535,
-      536,  537,  538,  539,  540,  541,  542,  542,  543,  543,
-      543,  544,  544,  544,  545,  546,  547,  549,  550,  551,
-      552,  554,  555,  556,  557,  558,  560,  562,  563,  564,
-      564,  564,  564,  564,  565,  565,  565,  567,  568,  570,
-      572,  573,  575,  576,  577,  578,  579,  580,  581,  581,
-      581,  581,  581,  581,  581,  581,  581,  583,  585,  586,
-      587,  589,  590,  591,  592,  592,  593,  593,  593,  593,
-      594,  594,  596,  597,  599,  600,  602,  602,  602,  602,
-
-      603,  604,  606,  606,  606,  607,  607,  607,  609,  609,
-      609,  610,  610
+      357,  358,  358,  359,  360,  361,  362,  363,  364,  366,
+      367,  368,  369,  370,  370,  370,  370,  370,  371,  371,
+      371,  372,  372,  372,  373,  373,  374,  374,  374,  374,
+      375,  376,  376,  377,  377,  377,  378,  379,  380,  381,
+      382,  382,  382,  383,  383,  383,  384,  385,  386,  387,
+      388,  389,  390,  392,  393,  394,  395,  396,  397,  398,
+      399,  400,  401,  402,  403,  404,  404,  405,  406,  407,
+      408,  409,  410,  411,  412,  413,  414,  415,  416,  417,
+
+      417,  418,  419,  420,  422,  423,  425,  426,  427,  427,
+      427,  427,  428,  428,  429,  430,  430,  431,  431,  432,
+      433,  434,  434,  435,  437,  439,  439,  440,  441,  443,
+      444,  445,  446,  448,  449,  451,  452,  453,  454,  455,
+      456,  457,  458,  459,  460,  461,  462,  464,  465,  466,
+      467,  469,  470,  471,  472,  474,  475,  476,  477,  479,
+      479,  480,  480,  480,  482,  484,  486,  486,  486,  486,
+      486,  486,  487,  487,  487,  488,  490,  492,  493,  495,
+      496,  497,  498,  499,  500,  502,  503,  504,  505,  507,
+      508,  509,  511,  512,  513,  514,  516,  517,  518,  519,
+
+      520,  520,  520,  520,  520,  520,  521,  521,  521,  522,
+      523,  525,  526,  527,  528,  529,  531,  533,  535,  537,
+      538,  539,  540,  541,  542,  543,  544,  545,  546,  547,
+      547,  548,  548,  548,  549,  549,  549,  550,  551,  552,
+      554,  555,  556,  557,  559,  560,  561,  562,  563,  565,
+      567,  568,  569,  569,  569,  569,  569,  570,  570,  570,
+      572,  573,  575,  577,  578,  580,  581,  582,  583,  584,
+      585,  586,  586,  586,  586,  586,  586,  586,  586,  586,
+      588,  590,  591,  592,  594,  595,  596,  597,  597,  598,
+      598,  598,  598,  599,  599,  601,  602,  604,  605,  607,
+
+      607,  607,  607,  608,  609,  611,  611,  611,  612,  612,
+      612,  614,  614,  614,  615,  615
     } ;
 
 static yyconst int yy_ec[256] =
@@ -460,135 +461,135 @@ static yyconst int yy_meta[60] =
         8,    8,    8,    8,    8,    8,    8,    1,    1
     } ;
 
-static yyconst short int yy_base[542] =
+static yyconst short int yy_base[546] =
     {   0,
         0,   58,   58,   65,   69,  126,   80,   85,   60,   86,
-      172, 1217,  102,  111,  225, 1216,  101,  149,  140,  158,
-      162,  165, 1223, 1226, 1226, 1226, 1226, 1192,  163,   67,
-      177,  225,    0, 1201,   42,   57,   45,  196,  103,  164,
-      105, 1226, 1226, 1226, 1205,  114, 1191, 1226, 1226, 1226,
-     1226,  169,   87,    0, 1226, 1226,  209, 1159, 1226, 1226,
-     1226, 1226,    0,  212,  117,  130,   61,  149, 1226,  266,
+      172, 1224,  102,  111,  225, 1223,  101,  149,  140,  158,
+      162,  165, 1230, 1233, 1233, 1233, 1233, 1199,  163,   67,
+      177,  225,    0, 1208,   42,   57,   45,  196,  103,  164,
+      105, 1233, 1233, 1233, 1212,  114, 1198, 1233, 1233, 1233,
+     1233,  169,   87,    0, 1233, 1233,  209, 1166, 1233, 1233,
+     1233, 1233,    0,  212,  117,  130,   61,  149, 1233,  266,
       175,  270,  197,  255,   49,  157,  139,  209,  201,  152,
-      214,  270,  245,  272, 1226, 1226, 1226, 1226, 1226, 1226,
+      214,  270,  245,  272, 1233, 1233, 1233, 1233, 1233, 1233,
       236,  261,  274,  278,  254,  273,  283,  277,  218,  225,
 
-      286,  276,  284, 1226, 1226, 1202,  326,  328,  334, 1226,
-     1226, 1201,  339,  340,  341, 1212, 1211,  320,  355, 1203,
-     1202,  346, 1226, 1208,  350,  357,  363,    0,  369, 1190,
-     1189, 1188,  287,  215,  309,  358,  387, 1170,  388, 1165,
-      348,  358,  310, 1226,  376, 1226,    0, 1195,  344, 1194,
-     1193, 1226, 1199, 1226,  395, 1155, 1226, 1226, 1226, 1197,
-      378,  384,  385, 1185, 1185, 1194,  396, 1165, 1166,  389,
+      286,  276,  284, 1233, 1233, 1209,  326,  328,  334, 1233,
+     1233, 1208,  339,  340,  341, 1219, 1218,  320,  355, 1210,
+     1209,  346, 1233, 1215,  350,  357,  363,    0,  369, 1197,
+     1196, 1195,  287,  215,  309,  358,  387, 1177,  388, 1172,
+      348,  358,  310, 1233,  376, 1233,    0, 1202,  344, 1201,
+     1200, 1233, 1206, 1233,  395, 1162, 1233, 1233, 1233, 1204,
+      378,  384,  385, 1192, 1192, 1201,  396, 1172, 1173,  389,
       387,  388,  397,  398,  399,  402,  403,  404,  333,  413,
-      410,  409,  414,  415,  418,  420,  421, 1226, 1191,  422,
+      410,  409,  414,  415,  418,  420,  421, 1233, 1198,  422,
       292,  425,  426,  438,  427,  428,  437,  444,  441,  448,
 
-      446, 1226,  471,  486,  493, 1226,  495, 1226,  498,  500,
-      506, 1226,  514, 1178, 1226, 1226, 1226, 1226, 1182, 1181,
-      505, 1187, 1226,  509,    0, 1169, 1168, 1167,  456,  460,
-      490,  494, 1137, 1139, 1140, 1125, 1226, 1149, 1123, 1226,
-     1122, 1138,  498, 1151, 1226, 1167, 1166, 1165, 1226, 1226,
-     1171, 1226, 1138, 1169, 1226,  499,  509,  510, 1226,  529,
-     1168, 1226, 1139,  522,  514,  516,  522,  523,  447,  524,
-      525, 1149,  526,  527,  528,  532,  535,  536,  529,  537,
-      540,  542,  539,  552, 1165, 1226,  543,  544,  556,  550,
-      558,  551,  565,  574,  576,  578,  579,  581,  601, 1226,
-
-     1147,  580, 1146,  582,  585, 1112, 1127,  556, 1226, 1127,
-     1226, 1226, 1108,  589, 1135, 1226, 1226, 1226, 1116,  590,
-     1139, 1138,  613, 1226,  592, 1137,  600,  602,  603, 1136,
-      604, 1135,  607,  606,  608,  609,  614,  613,  615,  458,
-      618,  620,  622, 1134,  624,  630,  623,  629,  633,  640,
-      642, 1133,  643,  647,  649, 1132,  668, 1226,  677,  687,
-     1131, 1130, 1129, 1107,  666, 1100, 1109, 1112,  653,    0,
-     1091,  657,  661, 1123,  662, 1122,  668,  671,  675,  676,
-      678, 1121,  680,  681,  682, 1120,  684,  685, 1113,  687,
-      688,  686,  690,  692,  694,  700,  695, 1075,  737, 1076,
-
-     1065, 1056,  709, 1075, 1062,  711,  701, 1077,  708,  713,
-      706,  715, 1062, 1027, 1015,  998,  728,  716,  717,  720,
-      721,  729,  731,  739,  741,  742,  975,  769,  712,  967,
-      746,  984,  943,  743,  754,  759,  899,  748,  762,  757,
-      898,  760,  769,  763,  771,  897,  896,  772,  778,  864,
-      907,  866,  872,  798,  789,  807,  889,  782,  888,  880,
-      790,  879,  783,  792,  795,  794,  796,  800,  819,  884,
-      842,  850,  821,  833,  842,  815,  824,  821,  810,  823,
-      814,  825,  809,  835,  826, 1226,  535,  849,  857, 1226,
-      857,  470,  850,  462,  851,  335,  273,  864,  870, 1226,
-
-      858,  237,  217,  879,  864,  150,  886,  172,  904,  883,
-     1226, 1226,  923,  932,  941,  950,  959,  968,  977,  980,
-      984,  992, 1001, 1006, 1015, 1024, 1029, 1032, 1036, 1044,
-     1053, 1062, 1071, 1076, 1085, 1093, 1097, 1104, 1112, 1121,
-     1130
+      446, 1233,  471,  486,  493, 1233,  495, 1233,  498,  500,
+      506, 1233,  514, 1185, 1233, 1233, 1233, 1233, 1189, 1188,
+      505, 1194, 1233,  509,    0, 1176, 1175, 1174, 1173,  456,
+      460,  490,  494, 1143, 1145, 1146, 1131, 1233, 1155, 1129,
+     1233, 1128, 1144,  498, 1157, 1233, 1173, 1172, 1171, 1233,
+     1233, 1177, 1233, 1144, 1175, 1233,  499,  509,  510, 1233,
+      529, 1174, 1233, 1145,  522,  514,  516,  522,  523,  447,
+      524,  525, 1155,  526,  527,  528,  532,  535,  536,  529,
+      537,  540,  542,  539,  552, 1171, 1233,  543,  544,  556,
+      550,  558,  551,  565,  574,  576,  578,  579,  581,  601,
+
+     1233, 1153, 1152, 1151,  580, 1150,  582,  585, 1116, 1131,
+      556, 1233, 1131, 1233, 1233, 1112,  589, 1139, 1233, 1233,
+     1233, 1120,  590, 1143, 1142,  613, 1233,  592, 1141,  600,
+      602,  603, 1140,  604, 1139,  607,  606,  608,  609,  614,
+      613,  615,  458,  618,  620,  622, 1138,  624,  630,  623,
+      629,  633,  640,  642, 1137,  643,  647,  649, 1136,  668,
+     1233,  677,  687, 1135, 1134, 1133, 1111,  666, 1104, 1113,
+     1116,  653,    0, 1095,  657,  661, 1127,  662, 1126,  668,
+      671,  675,  676,  678, 1125,  680,  681,  682, 1124,  684,
+      685, 1117,  687,  688,  686,  690,  692,  694,  700,  695,
+
+     1079,  737, 1080, 1069, 1060,  709, 1075, 1062,  711,  701,
+     1077,  708,  713,  706,  715, 1062, 1027, 1015,  998,  728,
+      716,  717,  720,  721,  729,  731,  739,  741,  742,  975,
+      769,  712,  967,  746,  984,  943,  743,  754,  759,  899,
+      748,  762,  757,  898,  760,  769,  763,  771,  897,  896,
+      772,  778,  864,  907,  866,  872,  798,  789,  807,  889,
+      782,  888,  880,  790,  879,  783,  792,  795,  794,  796,
+      800,  819,  884,  842,  850,  821,  833,  842,  815,  824,
+      821,  810,  823,  814,  825,  809,  835,  826, 1233,  535,
+      849,  857, 1233,  857,  470,  850,  462,  851,  335,  273,
+
+      864,  870, 1233,  858,  237,  217,  879,  864,  150,  886,
+      172,  904,  883, 1233, 1233,  923,  932,  941,  950,  959,
+      968,  977,  980,  984,  992, 1001, 1006, 1015, 1024, 1029,
+     1032, 1036, 1044, 1053, 1062, 1071, 1076, 1085, 1093, 1097,
+     1101, 1108, 1116, 1125, 1134
     } ;
 
-static yyconst short int yy_def[542] =
+static yyconst short int yy_def[546] =
     {   0,
-      512,    1,  513,  513,  514,  514,  515,  515,    1,    1,
-        1,   11,    1,    1,    1,   15,  516,  516,  517,  517,
-      518,  518,  512,  512,  512,  512,  512,  519,  512,  512,
-      512,  512,  520,  521,  521,  521,  521,  512,  512,  512,
-      521,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  522,  512,  512,  512,  512,  512,  512,
-      512,  512,  523,  512,  512,  521,  521,  521,  512,  512,
-      512,  524,  521,  521,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  512,  512,  512,  512,  512,  512,
-      512,  521,  521,  521,  521,  521,  521,  521,  521,  521,
-
-      521,  521,  521,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      525,  512,  512,  526,  512,  512,  512,  527,  512,  528,
-      521,  529,  521,  521,  521,  521,  512,  512,  512,  512,
-      512,  512,  512,  512,  521,  512,  530,  512,  512,  512,
-      512,  512,  531,  512,  512,  512,  512,  512,  512,  532,
-      521,  521,  521,  512,  512,  533,  512,  534,  512,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  512,  535,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  521,  521,
-
-      521,  512,  512,  512,  512,  512,  536,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  526,  512,  512,  527,  528,  537,  529,  521,  521,
-      521,  521,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  521,  512,  512,  512,  512,  512,  512,  512,
-      531,  512,  512,  532,  512,  521,  521,  521,  512,  512,
-      533,  512,  534,  524,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  535,  512,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  538,  512,
-
-      537,  521,  521,  521,  521,  512,  512,  512,  512,  512,
-      512,  512,  512,  521,  512,  512,  512,  512,  512,  521,
-      521,  521,  512,  512,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  512,  512,  538,  512,
-      521,  521,  521,  512,  512,  512,  512,  512,  521,  539,
-      512,  521,  521,  521,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  512,  512,  512,
-
-      512,  512,  521,  512,  512,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  512,  512,  512,  512,
-      521,  512,  512,  521,  521,  521,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  521,  512,
-      512,  512,  512,  521,  512,  512,  521,  521,  521,  521,
-      521,  521,  521,  521,  521,  521,  521,  521,  512,  540,
-      512,  512,  512,  512,  512,  512,  521,  521,  521,  521,
-      521,  521,  521,  521,  540,  512,  512,  512,  512,  512,
-      541,  521,  521,  521,  521,  521,  512,  512,  541,  512,
-
-      521,  521,  512,  512,  521,  512,  512,  521,  512,  512,
-      512,    0,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512
+      515,    1,  516,  516,  517,  517,  518,  518,    1,    1,
+        1,   11,    1,    1,    1,   15,  519,  519,  520,  520,
+      521,  521,  515,  515,  515,  515,  515,  522,  515,  515,
+      515,  515,  523,  524,  524,  524,  524,  515,  515,  515,
+      524,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  525,  515,  515,  515,  515,  515,  515,
+      515,  515,  526,  515,  515,  524,  524,  524,  515,  515,
+      515,  527,  524,  524,  524,  524,  524,  524,  524,  524,
+      524,  524,  524,  524,  515,  515,  515,  515,  515,  515,
+      515,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+
+      524,  524,  524,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      528,  515,  515,  529,  515,  515,  515,  530,  515,  531,
+      524,  532,  524,  524,  524,  524,  515,  515,  515,  515,
+      515,  515,  515,  515,  524,  515,  533,  515,  515,  515,
+      515,  515,  534,  515,  515,  515,  515,  515,  515,  535,
+      524,  524,  524,  515,  515,  536,  515,  537,  515,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  515,  538,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+
+      524,  515,  515,  515,  515,  515,  539,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  529,  515,  515,  530,  531,  540,  532,  541,  524,
+      524,  524,  524,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  524,  515,  515,  515,  515,  515,  515,
+      515,  534,  515,  515,  535,  515,  524,  524,  524,  515,
+      515,  536,  515,  537,  527,  524,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  538,  515,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  542,
+
+      515,  540,  532,  541,  524,  524,  524,  524,  515,  515,
+      515,  515,  515,  515,  515,  515,  524,  515,  515,  515,
+      515,  515,  524,  524,  524,  515,  515,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  515,
+      515,  542,  515,  524,  524,  524,  515,  515,  515,  515,
+      515,  524,  543,  515,  524,  524,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+
+      515,  515,  515,  515,  515,  524,  515,  515,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  515,
+      515,  515,  515,  524,  515,  515,  524,  524,  524,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+      524,  524,  515,  515,  515,  515,  524,  515,  515,  524,
+      524,  524,  524,  524,  524,  524,  524,  524,  524,  524,
+      524,  515,  544,  515,  515,  515,  515,  515,  515,  524,
+      524,  524,  524,  524,  524,  524,  524,  544,  515,  515,
+      515,  515,  515,  545,  524,  524,  524,  524,  524,  515,
+
+      515,  545,  515,  524,  524,  515,  515,  524,  515,  515,
+      524,  515,  515,  515,    0,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515
     } ;
 
-static yyconst short int yy_nxt[1286] =
+static yyconst short int yy_nxt[1293] =
     {   0,
        24,   25,   26,   25,   27,   25,   24,   24,   24,   28,
        24,   24,   24,   29,   30,   31,   32,   32,   32,   33,
@@ -610,130 +611,132 @@ static yyconst short int yy_nxt[1286] =
        26,  109,  111,  113,   26,  114,  117,   26,  132,  117,
       115,  132,  119,  161,  118,  148,  132,  118,  122,  122,
       122,  122,  176,   55,   56,   70,   71,  165,  163,  166,
-      125,  132,  126,  126,  126,  127,  141,  137,  149,  241,
+      125,  132,  126,  126,  126,  127,  141,  137,  149,  242,
 
        72,  137,  175,  142,   73,  179,   74,   75,   76,   77,
       155,  143,   78,  139,  155,   79,  132,  139,   80,   81,
       132,  144,   82,   68,   83,   84,  150,  151,  132,   85,
        86,   88,  128,  132,  132,   89,   90,  132,  125,   91,
       129,  129,  129,  129,  132,  138,  170,  178,  188,  156,
-      189,  198,  140,  506,  177,  140,  132,  199,   92,   93,
-       94,   95,   96,  180,  132,   78,  181,  230,   79,   97,
+      189,  198,  140,  509,  177,  140,  132,  199,   92,   93,
+       94,   95,   96,  180,  132,   78,  181,  231,   79,   97,
        98,   99,  100,  132,  132,  101,  102,   83,  103,  164,
       132,  122,  122,  122,  122,  167,  167,  167,  167,  132,
       185,  132,  132,  132,  171,  132,  132,  132,  172,  193,
 
-      169,  173,  132,  132,  190,  132,  132,  191,  503,  182,
-      183,  132,  186,  171,  192,  195,  194,  197,  187,  229,
+      169,  173,  132,  132,  190,  132,  132,  191,  506,  182,
+      183,  132,  186,  171,  192,  195,  194,  197,  187,  230,
       173,  184,  216,  196,  174,  182,  200,  203,  132,  139,
       187,  203,  201,  139,  217,  205,  206,  184,  204,  207,
-      209,  139,  211,  212,  209,  139,  213,  288,  202,  241,
-      246,  210,  132,  214,  132,  215,  139,  216,  231,  242,
-      139,  221,  221,  221,  221,  224,  224,  224,  224,  274,
+      209,  139,  211,  212,  209,  139,  213,  289,  202,  242,
+      247,  210,  132,  214,  132,  215,  139,  216,  232,  243,
+      139,  221,  221,  221,  221,  224,  224,  224,  224,  275,
       125,  140,  126,  126,  126,  127,  125,  132,  127,  127,
       127,  127,  125,  140,  129,  129,  129,  129,  137,  139,
-      232,  235,  137,  139,  238,  132,  155,  132,  140,  236,
-
-      155,  247,  248,  132,  132,  237,  132,  132,  132,  239,
-      256,  167,  167,  167,  167,  240,  132,  132,  132,  266,
-      267,  132,  132,  132,  243,  258,  169,  265,  132,  132,
-      257,  140,  132,  132,  132,  156,  138,  132,  140,  132,
-      132,  132,  268,  277,  132,  132,  132,  132,  271,  273,
-      269,  270,  279,  275,  272,  278,  132,  132,  281,  276,
-      132,  284,  289,  132,  280,  132,  132,  132,  282,  283,
-      291,  294,  203,  293,  287,  132,  203,  132,  290,  132,
-      329,  132,  292,  204,  271,  295,  297,  205,  206,  132,
-      296,  207,  385,  298,  205,  206,  205,  206,  205,  209,
-
-      205,  211,  212,  209,  303,  213,  302,  211,  212,  132,
-      210,  211,  214,  132,  300,  211,  212,  132,  132,  211,
+      233,  236,  137,  139,  239,  132,  155,  132,  140,  237,
+
+      155,  248,  249,  132,  132,  238,  132,  132,  132,  240,
+      257,  167,  167,  167,  167,  241,  132,  132,  132,  267,
+      268,  132,  132,  132,  244,  259,  169,  266,  132,  132,
+      258,  140,  132,  132,  132,  156,  138,  132,  140,  132,
+      132,  132,  269,  278,  132,  132,  132,  132,  272,  274,
+      270,  271,  280,  276,  273,  279,  132,  132,  282,  277,
+      132,  285,  290,  132,  281,  132,  132,  132,  283,  284,
+      292,  295,  203,  294,  288,  132,  203,  132,  291,  132,
+      332,  132,  293,  204,  272,  296,  298,  205,  206,  132,
+      297,  207,  388,  299,  205,  206,  205,  206,  205,  209,
+
+      205,  211,  212,  209,  306,  213,  305,  211,  212,  132,
+      210,  211,  214,  132,  301,  211,  212,  132,  132,  211,
       221,  221,  221,  221,  224,  224,  224,  224,  132,  132,
-      323,  324,  305,  132,  323,  132,  304,  167,  167,  167,
-      167,  132,  132,  132,  132,  132,  132,  132,  132,  320,
-      314,  132,  169,  321,  132,  132,  132,  331,  132,  132,
-      322,  132,  132,  132,  332,  326,  325,  497,  330,  132,
-      132,  132,  327,  328,  339,  132,  333,  132,  337,  335,
-      346,  334,  342,  336,  132,  338,  341,  344,  347,  340,
-      343,  350,  345,  132,  348,  132,  349,  132,  132,  132,
-
-      132,  132,  357,  358,  132,  351,  357,  366,  132,  132,
-      354,  132,  353,  237,  323,  324,  352,  356,  323,  132,
-      360,  132,  132,  132,  355,  132,  132,  132,  132,  369,
-      361,  362,  132,  132,  132,  363,  372,  132,  378,  132,
-      322,  132,  132,  132,  379,  380,  375,  383,  132,  132,
-      373,  384,  132,  374,  381,  376,  377,  389,  387,  132,
-      392,  132,  132,  386,  382,  390,  132,  399,  132,  357,
-      358,  399,  132,  357,  388,  391,  132,  396,  357,  358,
-      132,  132,  357,  393,  394,  384,  395,  132,  357,  358,
-      132,  397,  357,  406,  132,  132,  360,  132,  408,  132,
-
-      132,  132,  403,  132,  132,  132,  132,  132,  409,  132,
-      412,  132,  413,  132,  132,  407,  415,  418,  419,  132,
-      132,  422,  410,  414,  411,  132,  426,  132,  132,  417,
-      132,  420,  132,  416,  132,  132,  132,  421,  399,  132,
-      132,  435,  399,  436,  423,  431,  424,  132,  132,  437,
-      132,  425,  428,  428,  428,  428,  434,  438,  132,  441,
-      132,  132,  132,  452,  440,  132,  439,  132,  442,  240,
-      451,  443,  448,  132,  451,  446,  132,  444,  132,  132,
-      445,  132,  132,  447,  428,  428,  428,  428,  132,  458,
-      132,  132,  462,  449,  457,  459,  454,  132,  461,  473,
-
-      464,  132,  132,  473,  460,  474,  475,  475,  476,  132,
-      465,  132,  476,  132,  132,  132,  463,  132,  477,  132,
-      473,  491,  473,  467,  473,  478,  473,  466,  132,  132,
-      479,  481,  486,  132,  468,  491,  488,  488,  488,  488,
-      132,  482,  132,  132,  132,  480,  492,  484,  489,  489,
-      489,  489,  483,  490,  132,  493,  495,  489,  489,  489,
-      489,  494,  498,  500,  488,  488,  488,  488,  490,  132,
-      132,  496,  489,  489,  489,  489,  500,  132,  500,  504,
-      504,  504,  504,  132,  510,  511,  487,  502,  510,  239,
-      486,  500,  507,  501,  504,  504,  504,  504,  132,  132,
-
-      508,  509,  509,  509,  509,  510,  511,  132,  132,  510,
-      505,  472,  471,  470,  469,  132,  132,  132,  132,  509,
-      509,  509,  509,   42,   42,   42,   42,   42,   42,   42,
+      326,  327,  308,  132,  326,  132,  307,  167,  167,  167,
+      167,  132,  132,  132,  132,  132,  132,  132,  132,  323,
+      317,  132,  169,  324,  132,  132,  132,  334,  132,  132,
+      325,  132,  132,  132,  335,  329,  328,  500,  333,  132,
+      132,  132,  330,  331,  342,  132,  336,  132,  340,  338,
+      349,  337,  345,  339,  132,  341,  344,  347,  350,  343,
+      346,  353,  348,  132,  351,  132,  352,  132,  132,  132,
+
+      132,  132,  360,  361,  132,  354,  360,  369,  132,  132,
+      357,  132,  356,  238,  326,  327,  355,  359,  326,  132,
+      363,  132,  132,  132,  358,  132,  132,  132,  132,  372,
+      364,  365,  132,  132,  132,  366,  375,  132,  381,  132,
+      325,  132,  132,  132,  382,  383,  378,  386,  132,  132,
+      376,  387,  132,  377,  384,  379,  380,  392,  390,  132,
+      395,  132,  132,  389,  385,  393,  132,  402,  132,  360,
+      361,  402,  132,  360,  391,  394,  132,  399,  360,  361,
+      132,  132,  360,  396,  397,  387,  398,  132,  360,  361,
+      132,  400,  360,  409,  132,  132,  363,  132,  411,  132,
+
+      132,  132,  406,  132,  132,  132,  132,  132,  412,  132,
+      415,  132,  416,  132,  132,  410,  418,  421,  422,  132,
+      132,  425,  413,  417,  414,  132,  429,  132,  132,  420,
+      132,  423,  132,  419,  132,  132,  132,  424,  402,  132,
+      132,  438,  402,  439,  426,  434,  427,  132,  132,  440,
+      132,  428,  431,  431,  431,  431,  437,  441,  132,  444,
+      132,  132,  132,  455,  443,  132,  442,  132,  445,  241,
+      454,  446,  451,  132,  454,  449,  132,  447,  132,  132,
+      448,  132,  132,  450,  431,  431,  431,  431,  132,  461,
+      132,  132,  465,  452,  460,  462,  457,  132,  464,  476,
+
+      467,  132,  132,  476,  463,  477,  478,  478,  479,  132,
+      468,  132,  479,  132,  132,  132,  466,  132,  480,  132,
+      476,  494,  476,  470,  476,  481,  476,  469,  132,  132,
+      482,  484,  489,  132,  471,  494,  491,  491,  491,  491,
+      132,  485,  132,  132,  132,  483,  495,  487,  492,  492,
+      492,  492,  486,  493,  132,  496,  498,  492,  492,  492,
+      492,  497,  501,  503,  491,  491,  491,  491,  493,  132,
+      132,  499,  492,  492,  492,  492,  503,  132,  503,  507,
+      507,  507,  507,  132,  513,  514,  490,  505,  513,  240,
+      489,  503,  510,  504,  507,  507,  507,  507,  132,  132,
+
+      511,  512,  512,  512,  512,  513,  514,  132,  132,  513,
+      508,  475,  474,  473,  472,  132,  132,  132,  132,  512,
+      512,  512,  512,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   48,   48,   48,   48,   48,   48,   48,   48,
        48,   59,   59,   59,   59,   59,   59,   59,   59,   59,
       104,  104,  104,  104,  104,  104,  104,  104,  104,  110,
       110,  110,  110,  110,  110,  110,  110,  110,  116,  116,
-      116,  116,  116,  116,  116,  116,  116,  120,  120,  456,
+      116,  116,  116,  116,  116,  116,  116,  120,  120,  459,
       120,  120,  120,  120,  120,  120,  130,  130,  131,  131,
-      131,  131,  154,  154,  455,  154,  154,  154,  154,  154,
+      131,  131,  154,  154,  458,  154,  154,  154,  154,  154,
 
-      154,  158,  158,  453,  158,  158,  158,  158,  158,  158,
-      168,  450,  168,  168,  168,  219,  219,  132,  219,  219,
+      154,  158,  158,  456,  158,  158,  158,  158,  158,  158,
+      168,  453,  168,  168,  168,  219,  219,  132,  219,  219,
       219,  219,  219,  219,  222,  222,  222,  222,  222,  222,
       222,  222,  222,  225,  132,  225,  226,  226,  226,  226,
-      228,  228,  228,  228,  244,  244,  132,  244,  244,  244,
-      244,  244,  244,  251,  251,  251,  251,  251,  251,  251,
-      251,  251,  254,  254,  254,  254,  254,  254,  254,  254,
-      254,  261,  261,  261,  261,  261,  261,  261,  261,  261,
-      263,  132,  263,  263,  263,  285,  285,  285,  285,  285,
-      285,  285,  285,  285,  299,  299,  132,  433,  432,  299,
-
-      299,  301,  301,  301,  301,  359,  359,  430,  359,  359,
-      359,  359,  404,  404,  429,  404,  404,  404,  404,  404,
-      404,  485,  485,  236,  427,  485,  485,  485,  485,  485,
-      499,  499,  132,  499,  499,  499,  499,  499,  499,  132,
-      132,  132,  132,  405,  402,  401,  400,  398,  132,  132,
-      132,  132,  132,  132,  132,  132,  132,  132,  132,  371,
-      370,  368,  367,  365,  364,  132,  227,  286,  132,  169,
-      262,  255,  319,  252,  318,  317,  316,  315,  313,  312,
-      311,  310,  309,  308,  307,  306,  132,  227,  227,  223,
-      218,  218,  300,  286,  264,  169,  262,  260,  259,  255,
-
-      253,  252,  250,  249,  245,  234,  233,  132,  132,  227,
-      223,  220,  218,  216,  216,  208,  202,  157,  147,  146,
-      132,  121,  512,   39,   39,   23,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512
+      228,  228,  228,  228,  245,  245,  132,  245,  245,  245,
+      245,  245,  245,  252,  252,  252,  252,  252,  252,  252,
+      252,  252,  255,  255,  255,  255,  255,  255,  255,  255,
+      255,  262,  262,  262,  262,  262,  262,  262,  262,  262,
+      264,  132,  264,  264,  264,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  300,  300,  132,  436,  435,  300,
+
+      300,  302,  302,  302,  302,  304,  304,  304,  304,  362,
+      362,  433,  362,  362,  362,  362,  407,  407,  432,  407,
+      407,  407,  407,  407,  407,  488,  488,  237,  430,  488,
+      488,  488,  488,  488,  502,  502,  132,  502,  502,  502,
+      502,  502,  502,  132,  132,  132,  132,  408,  405,  404,
+      403,  401,  132,  132,  132,  132,  132,  132,  132,  132,
+      132,  132,  132,  374,  373,  371,  370,  368,  367,  132,
+      132,  303,  227,  287,  132,  169,  263,  256,  322,  253,
+      321,  320,  319,  318,  316,  315,  314,  313,  312,  311,
+      310,  309,  132,  303,  227,  227,  223,  218,  218,  301,
+
+      287,  265,  169,  263,  261,  260,  256,  254,  253,  251,
+      250,  246,  235,  234,  229,  132,  227,  223,  220,  218,
+      216,  216,  208,  202,  157,  147,  146,  132,  121,  515,
+       39,   39,   23,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515
+
     } ;
 
-static yyconst short int yy_chk[1286] =
+static yyconst short int yy_chk[1293] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -755,25 +758,25 @@ static yyconst short int yy_chk[1286] =
        20,   18,   20,   20,   21,   20,   21,   22,   68,   22,
        20,   80,   22,   66,   21,   52,   76,   22,   29,   29,
        29,   29,   77,    6,    6,   11,   11,   71,   68,   71,
-       31,  508,   31,   31,   31,   31,   40,   38,   52,  506,
+       31,  511,   31,   31,   31,   31,   40,   38,   52,  509,
 
        11,   38,   76,   40,   11,   80,   11,   11,   11,   11,
        57,   40,   11,   64,   57,   11,   73,   64,   11,   11,
        79,   40,   11,   11,   11,   11,   52,   52,   78,   11,
        11,   15,   31,   81,  134,   15,   15,   99,   32,   15,
        32,   32,   32,   32,  100,   38,   73,   79,   91,   57,
-       91,   99,   57,  503,   78,   64,  502,  100,   15,   15,
+       91,   99,   57,  506,   78,   64,  505,  100,   15,   15,
        15,   15,   15,   81,   83,   15,   81,  134,   15,   15,
        15,   15,   15,   95,   74,   15,   15,   15,   15,   70,
        92,   70,   70,   70,   70,   72,   72,   72,   72,   82,
        83,   84,   96,   93,   74,  102,   98,   94,   74,   95,
 
-       72,   74,   97,  103,   92,  101,  133,   92,  497,   82,
+       72,   74,   97,  103,   92,  101,  133,   92,  500,   82,
        82,  191,   84,   93,   94,   97,   96,   98,   84,  133,
        93,   82,  118,   97,   94,  101,  101,  107,  135,  108,
       103,  107,  102,  108,  118,  109,  109,  101,  107,  109,
       113,  114,  115,  115,  113,  114,  115,  191,  109,  143,
-      149,  113,  179,  115,  496,  115,  119,  119,  135,  143,
+      149,  113,  179,  115,  499,  115,  119,  119,  135,  143,
       119,  122,  122,  122,  122,  125,  125,  125,  125,  179,
       126,  108,  126,  126,  126,  126,  127,  136,  127,  127,
       127,  127,  129,  114,  129,  129,  129,  129,  137,  139,
@@ -785,97 +788,99 @@ static yyconst short int yy_chk[1286] =
       162,  139,  180,  183,  184,  155,  137,  185,  155,  186,
       187,  190,  173,  181,  192,  193,  195,  196,  176,  178,
       174,  175,  183,  180,  177,  182,  197,  194,  185,  180,
-      199,  187,  192,  198,  184,  201,  269,  200,  185,  186,
-      194,  197,  203,  196,  190,  229,  203,  340,  193,  230,
-      269,  494,  195,  203,  194,  198,  200,  204,  204,  492,
-      199,  204,  340,  201,  205,  205,  207,  207,  205,  209,
-
-      207,  210,  210,  209,  230,  210,  229,  211,  211,  231,
-      209,  211,  210,  232,  210,  213,  213,  243,  256,  213,
-      221,  221,  221,  221,  224,  224,  224,  224,  257,  258,
-      260,  260,  232,  265,  260,  266,  231,  264,  264,  264,
-      264,  267,  268,  270,  271,  273,  274,  275,  279,  256,
-      243,  276,  264,  257,  277,  278,  280,  271,  283,  281,
-      258,  282,  287,  288,  273,  266,  265,  487,  270,  290,
-      292,  284,  267,  268,  279,  289,  274,  291,  277,  276,
-      288,  275,  282,  276,  293,  278,  281,  284,  289,  280,
-      283,  292,  287,  294,  290,  295,  291,  296,  297,  302,
-
-      298,  304,  299,  299,  305,  293,  299,  308,  314,  320,
-      296,  325,  295,  308,  323,  323,  294,  298,  323,  327,
-      299,  328,  329,  331,  297,  334,  333,  335,  336,  314,
-      302,  304,  338,  337,  339,  305,  325,  341,  334,  342,
-      320,  343,  347,  345,  335,  336,  329,  339,  348,  346,
-      327,  339,  349,  328,  337,  331,  333,  345,  342,  350,
-      348,  351,  353,  341,  338,  346,  354,  365,  355,  357,
-      357,  365,  369,  357,  343,  347,  372,  353,  359,  359,
-      373,  375,  359,  349,  350,  355,  351,  377,  360,  360,
-      378,  354,  360,  372,  379,  380,  359,  381,  375,  383,
-
-      384,  385,  369,  387,  388,  392,  390,  391,  377,  393,
-      380,  394,  381,  395,  397,  373,  384,  388,  390,  396,
-      407,  393,  378,  383,  379,  411,  397,  409,  403,  387,
-      406,  391,  410,  385,  412,  418,  419,  392,  399,  420,
-      421,  407,  399,  409,  394,  403,  395,  417,  422,  410,
-      423,  396,  399,  399,  399,  399,  406,  411,  424,  418,
-      425,  426,  434,  429,  417,  431,  412,  438,  419,  429,
-      428,  420,  425,  435,  428,  423,  440,  421,  436,  442,
-      422,  439,  444,  424,  428,  428,  428,  428,  443,  435,
-      445,  448,  440,  426,  434,  436,  431,  449,  439,  454,
-
-      443,  458,  463,  454,  438,  455,  455,  455,  456,  461,
-      444,  464,  456,  466,  465,  467,  442,  454,  458,  468,
-      469,  476,  473,  448,  469,  461,  473,  445,  483,  479,
-      463,  465,  485,  481,  449,  476,  473,  473,  473,  473,
-      478,  466,  480,  477,  482,  464,  479,  468,  474,  474,
-      474,  474,  467,  475,  484,  480,  483,  475,  475,  475,
-      475,  482,  488,  491,  488,  488,  488,  488,  489,  493,
-      495,  484,  489,  489,  489,  489,  499,  501,  491,  498,
-      498,  498,  498,  505,  510,  510,  472,  495,  510,  471,
-      470,  499,  504,  493,  504,  504,  504,  504,  462,  460,
-
-      505,  507,  507,  507,  507,  509,  509,  459,  457,  509,
-      501,  453,  452,  451,  450,  447,  446,  441,  437,  509,
-      509,  509,  509,  513,  513,  513,  513,  513,  513,  513,
-      513,  513,  514,  514,  514,  514,  514,  514,  514,  514,
-      514,  515,  515,  515,  515,  515,  515,  515,  515,  515,
-      516,  516,  516,  516,  516,  516,  516,  516,  516,  517,
-      517,  517,  517,  517,  517,  517,  517,  517,  518,  518,
-      518,  518,  518,  518,  518,  518,  518,  519,  519,  433,
-      519,  519,  519,  519,  519,  519,  520,  520,  521,  521,
-      521,  521,  522,  522,  432,  522,  522,  522,  522,  522,
-
-      522,  523,  523,  430,  523,  523,  523,  523,  523,  523,
-      524,  427,  524,  524,  524,  525,  525,  416,  525,  525,
-      525,  525,  525,  525,  526,  526,  526,  526,  526,  526,
-      526,  526,  526,  527,  415,  527,  528,  528,  528,  528,
-      529,  529,  529,  529,  530,  530,  414,  530,  530,  530,
-      530,  530,  530,  531,  531,  531,  531,  531,  531,  531,
-      531,  531,  532,  532,  532,  532,  532,  532,  532,  532,
-      532,  533,  533,  533,  533,  533,  533,  533,  533,  533,
-      534,  413,  534,  534,  534,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  536,  536,  408,  405,  404,  536,
-
-      536,  537,  537,  537,  537,  538,  538,  402,  538,  538,
-      538,  538,  539,  539,  401,  539,  539,  539,  539,  539,
-      539,  540,  540,  400,  398,  540,  540,  540,  540,  540,
-      541,  541,  389,  541,  541,  541,  541,  541,  541,  386,
-      382,  376,  374,  371,  368,  367,  366,  364,  363,  362,
-      361,  356,  352,  344,  332,  330,  326,  322,  321,  319,
-      315,  313,  310,  307,  306,  303,  301,  285,  272,  263,
-      261,  254,  253,  251,  248,  247,  246,  244,  242,  241,
-      239,  238,  236,  235,  234,  233,  228,  227,  226,  222,
-      220,  219,  214,  189,  169,  168,  166,  165,  164,  160,
-
-      156,  153,  151,  150,  148,  140,  138,  132,  131,  130,
-      124,  121,  120,  117,  116,  112,  106,   58,   47,   45,
-       34,   28,   23,   16,   12,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
-      512,  512,  512,  512,  512
+      199,  187,  192,  198,  184,  201,  270,  200,  185,  186,
+      194,  197,  203,  196,  190,  230,  203,  343,  193,  231,
+      270,  497,  195,  203,  194,  198,  200,  204,  204,  495,
+      199,  204,  343,  201,  205,  205,  207,  207,  205,  209,
+
+      207,  210,  210,  209,  231,  210,  230,  211,  211,  232,
+      209,  211,  210,  233,  210,  213,  213,  244,  257,  213,
+      221,  221,  221,  221,  224,  224,  224,  224,  258,  259,
+      261,  261,  233,  266,  261,  267,  232,  265,  265,  265,
+      265,  268,  269,  271,  272,  274,  275,  276,  280,  257,
+      244,  277,  265,  258,  278,  279,  281,  272,  284,  282,
+      259,  283,  288,  289,  274,  267,  266,  490,  271,  291,
+      293,  285,  268,  269,  280,  290,  275,  292,  278,  277,
+      289,  276,  283,  277,  294,  279,  282,  285,  290,  281,
+      284,  293,  288,  295,  291,  296,  292,  297,  298,  305,
+
+      299,  307,  300,  300,  308,  294,  300,  311,  317,  323,
+      297,  328,  296,  311,  326,  326,  295,  299,  326,  330,
+      300,  331,  332,  334,  298,  337,  336,  338,  339,  317,
+      305,  307,  341,  340,  342,  308,  328,  344,  337,  345,
+      323,  346,  350,  348,  338,  339,  332,  342,  351,  349,
+      330,  342,  352,  331,  340,  334,  336,  348,  345,  353,
+      351,  354,  356,  344,  341,  349,  357,  368,  358,  360,
+      360,  368,  372,  360,  346,  350,  375,  356,  362,  362,
+      376,  378,  362,  352,  353,  358,  354,  380,  363,  363,
+      381,  357,  363,  375,  382,  383,  362,  384,  378,  386,
+
+      387,  388,  372,  390,  391,  395,  393,  394,  380,  396,
+      383,  397,  384,  398,  400,  376,  387,  391,  393,  399,
+      410,  396,  381,  386,  382,  414,  400,  412,  406,  390,
+      409,  394,  413,  388,  415,  421,  422,  395,  402,  423,
+      424,  410,  402,  412,  397,  406,  398,  420,  425,  413,
+      426,  399,  402,  402,  402,  402,  409,  414,  427,  421,
+      428,  429,  437,  432,  420,  434,  415,  441,  422,  432,
+      431,  423,  428,  438,  431,  426,  443,  424,  439,  445,
+      425,  442,  447,  427,  431,  431,  431,  431,  446,  438,
+      448,  451,  443,  429,  437,  439,  434,  452,  442,  457,
+
+      446,  461,  466,  457,  441,  458,  458,  458,  459,  464,
+      447,  467,  459,  469,  468,  470,  445,  457,  461,  471,
+      472,  479,  476,  451,  472,  464,  476,  448,  486,  482,
+      466,  468,  488,  484,  452,  479,  476,  476,  476,  476,
+      481,  469,  483,  480,  485,  467,  482,  471,  477,  477,
+      477,  477,  470,  478,  487,  483,  486,  478,  478,  478,
+      478,  485,  491,  494,  491,  491,  491,  491,  492,  496,
+      498,  487,  492,  492,  492,  492,  502,  504,  494,  501,
+      501,  501,  501,  508,  513,  513,  475,  498,  513,  474,
+      473,  502,  507,  496,  507,  507,  507,  507,  465,  463,
+
+      508,  510,  510,  510,  510,  512,  512,  462,  460,  512,
+      504,  456,  455,  454,  453,  450,  449,  444,  440,  512,
+      512,  512,  512,  516,  516,  516,  516,  516,  516,  516,
+      516,  516,  517,  517,  517,  517,  517,  517,  517,  517,
+      517,  518,  518,  518,  518,  518,  518,  518,  518,  518,
+      519,  519,  519,  519,  519,  519,  519,  519,  519,  520,
+      520,  520,  520,  520,  520,  520,  520,  520,  521,  521,
+      521,  521,  521,  521,  521,  521,  521,  522,  522,  436,
+      522,  522,  522,  522,  522,  522,  523,  523,  524,  524,
+      524,  524,  525,  525,  435,  525,  525,  525,  525,  525,
+
+      525,  526,  526,  433,  526,  526,  526,  526,  526,  526,
+      527,  430,  527,  527,  527,  528,  528,  419,  528,  528,
+      528,  528,  528,  528,  529,  529,  529,  529,  529,  529,
+      529,  529,  529,  530,  418,  530,  531,  531,  531,  531,
+      532,  532,  532,  532,  533,  533,  417,  533,  533,  533,
+      533,  533,  533,  534,  534,  534,  534,  534,  534,  534,
+      534,  534,  535,  535,  535,  535,  535,  535,  535,  535,
+      535,  536,  536,  536,  536,  536,  536,  536,  536,  536,
+      537,  416,  537,  537,  537,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  539,  539,  411,  408,  407,  539,
+
+      539,  540,  540,  540,  540,  541,  541,  541,  541,  542,
+      542,  405,  542,  542,  542,  542,  543,  543,  404,  543,
+      543,  543,  543,  543,  543,  544,  544,  403,  401,  544,
+      544,  544,  544,  544,  545,  545,  392,  545,  545,  545,
+      545,  545,  545,  389,  385,  379,  377,  374,  371,  370,
+      369,  367,  366,  365,  364,  359,  355,  347,  335,  333,
+      329,  325,  324,  322,  318,  316,  313,  310,  309,  306,
+      304,  303,  302,  286,  273,  264,  262,  255,  254,  252,
+      249,  248,  247,  245,  243,  242,  240,  239,  237,  236,
+      235,  234,  229,  228,  227,  226,  222,  220,  219,  214,
+
+      189,  169,  168,  166,  165,  164,  160,  156,  153,  151,
+      150,  148,  140,  138,  132,  131,  130,  124,  121,  120,
+      117,  116,  112,  106,   58,   47,   45,   34,   28,   23,
+       16,   12,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515,  515,  515,  515,  515,  515,  515,  515,  515,
+      515,  515
+
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -1007,7 +1012,7 @@ int yylex(void);
 
 #define GTK_DOC_LINE 10
 
-#line 1011 "lex.yy.c"
+#line 1016 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1172,7 +1177,7 @@ yy_current_state = 0;
 
 
 
-#line 1176 "lex.yy.c"
+#line 1181 "lex.yy.c"
 
        if ( yy_init )
                {
@@ -1221,14 +1226,14 @@ yy_match:
                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                                {
                                yy_current_state = (int) yy_def[yy_current_state];
-                               if ( yy_current_state >= 513 )
+                               if ( yy_current_state >= 516 )
                                        yy_c = yy_meta[(unsigned int) yy_c];
                                }
                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
                        *yy_state_ptr++ = yy_current_state;
                        ++yy_cp;
                        }
-               while ( yy_base[yy_current_state] != 1226 );
+               while ( yy_base[yy_current_state] != 1233 );
 
 yy_find_action:
                yy_current_state = *--yy_state_ptr;
@@ -2089,56 +2094,69 @@ YY_RULE_SETUP
 case 101:
 YY_RULE_SETUP
 #line 535 "lexer.l"
+{
+                       /* This is cpp kind of token thingie */
+                       if (for_cpp) {
+                               yylval.id = g_strdup(yytext);
+                               return TOKEN;
+                       } else {
+                               REJECT;
+                       }
+               }
+       YY_BREAK
+case 102:
+YY_RULE_SETUP
+#line 544 "lexer.l"
 {
                        /* this one is for a classname with a namespace */
                        yylval.id = g_strdup(yytext);
                        return TYPETOKEN;
                }
        YY_BREAK
-case 102:
+case 103:
 YY_RULE_SETUP
-#line 540 "lexer.l"
+#line 549 "lexer.l"
 {
                        /* this is for a classname with an empty namespace */
                        yylval.id = g_strdup(yytext);
                        return TYPETOKEN;
                }
        YY_BREAK
-case 103:
+case 104:
 YY_RULE_SETUP
-#line 545 "lexer.l"
+#line 554 "lexer.l"
 {
                        yylval.id = g_strdup(yytext);
                        return TOKEN;
                }
        YY_BREAK
-case 104:
+case 105:
 YY_RULE_SETUP
-#line 549 "lexer.l"
+#line 558 "lexer.l"
 {
                        yylval.id = g_strdup(yytext);
                        return SINGLE_CHAR;
                }
        YY_BREAK
-case 105:
+case 106:
 YY_RULE_SETUP
-#line 554 "lexer.l"
+#line 563 "lexer.l"
 {
                        yylval.id = g_strdup(yytext);
                        return ARRAY_DIM;
                }
        YY_BREAK
-case 106:
+case 107:
 YY_RULE_SETUP
-#line 559 "lexer.l"
+#line 568 "lexer.l"
 {
                        BEGIN(CLASS_CODE_I);
                        return '{';
                }
        YY_BREAK
-case 107:
+case 108:
 YY_RULE_SETUP
-#line 563 "lexer.l"
+#line 572 "lexer.l"
 {
                        BEGIN(C_CODE);
                        parenth_depth=1;
@@ -2149,38 +2167,38 @@ YY_RULE_SETUP
                        return '{';
                }
        YY_BREAK
-case 108:
+case 109:
 YY_RULE_SETUP
-#line 572 "lexer.l"
+#line 581 "lexer.l"
 {
                                BEGIN(INITIAL);
                                return '}';
                        }
        YY_BREAK
-case 109:
+case 110:
 YY_RULE_SETUP
-#line 577 "lexer.l"
+#line 586 "lexer.l"
 ;  /*ignore*/
        YY_BREAK
-case 110:
+case 111:
 YY_RULE_SETUP
-#line 579 "lexer.l"
+#line 588 "lexer.l"
 {
                        yylval.line = line_no;
                        return yytext[0];
                }
        YY_BREAK
-case 111:
+case 112:
 YY_RULE_SETUP
-#line 584 "lexer.l"
+#line 593 "lexer.l"
 ;  /*ignore*/
        YY_BREAK
-case 112:
+case 113:
 YY_RULE_SETUP
-#line 586 "lexer.l"
+#line 595 "lexer.l"
 ECHO;
        YY_BREAK
-#line 2184 "lex.yy.c"
+#line 2202 "lex.yy.c"
                        case YY_STATE_EOF(INITIAL):
                        case YY_STATE_EOF(COMMENT):
                        case YY_STATE_EOF(C_CODE):
@@ -2480,7 +2498,7 @@ static yy_state_type yy_get_previous_state()
                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                        {
                        yy_current_state = (int) yy_def[yy_current_state];
-                       if ( yy_current_state >= 513 )
+                       if ( yy_current_state >= 516 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2510,11 +2528,11 @@ yy_state_type yy_current_state;
        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
                {
                yy_current_state = (int) yy_def[yy_current_state];
-               if ( yy_current_state >= 513 )
+               if ( yy_current_state >= 516 )
                        yy_c = yy_meta[(unsigned int) yy_c];
                }
        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-       yy_is_jam = (yy_current_state == 512);
+       yy_is_jam = (yy_current_state == 515);
        if ( ! yy_is_jam )
                *yy_state_ptr++ = yy_current_state;
 
@@ -3067,7 +3085,7 @@ int main()
        return 0;
        }
 #endif
-#line 586 "lexer.l"
+#line 595 "lexer.l"
 
 
 /* Ugly warning avoiding */

diff --git a/src/lexer.l b/src/lexer.l
index aa9b6d28d3bde86b015f1f593699ba70cc68716e..b25574b2a578aff976ebed08860bbd7a268ed432 100644 (file)
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -532,6 +532,15 @@ flags              { return FLAGS; }
                        yylval.id = g_strdup(yytext);
                        return NUMBER;
                }
+<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>[A-Za-z_][A-Za-z0-9_]*(::[A-Za-z0-9_]*)+        {
+                       /* This is cpp kind of token thingie */
+                       if (for_cpp) {
+                               yylval.id = g_strdup(yytext);
+                               return TOKEN;
+                       } else {
+                               REJECT;
+                       }
+               }
 <CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>[A-Za-z_][A-Za-z0-9_]*(:[A-Za-z0-9_]*)+ {
                        /* this one is for a classname with a namespace */
                        yylval.id = g_strdup(yytext);

diff --git a/src/main.c b/src/main.c
index 7ece9fb6481228e7757add93c2ed5cced65667d0..d22a7da7a9a6262d6201d590fefc1e60832d54cc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -310,7 +310,7 @@ make_method_nongnu_aliases(Class *c)
 }
 
 static void
-add_bad_hack_to_avoid_unused_warnings(Class *c)
+add_bad_hack_to_avoid_unused_warnings(const Class *c)
 {
        GList *li;
 
@@ -356,7 +356,7 @@ add_bad_hack_to_avoid_unused_warnings(Class *c)
 }
 
 static void
-put_variable(Variable *v, FILE *fp)
+put_variable(const Variable *v, FILE *fp)
 {
        out_printf(fp, "\t");
        print_type(fp, v->vtype, FALSE);
@@ -526,7 +526,7 @@ put_prot_method(const Method *m)
 }
 
 static void
-put_priv_method_prot(Method *m)
+put_priv_method_prot(const Method *m)
 {
        if(m->method == SIGNAL_LAST_METHOD ||
           m->method == SIGNAL_FIRST_METHOD ||
@@ -636,7 +636,7 @@ make_inits(Class *cl)
 }
 
 static void
-find_dispose(Class *cl)
+find_dispose(const Class *cl)
 {
        GList *li;
 
@@ -667,7 +667,7 @@ find_dispose(Class *cl)
 }
 
 static void
-find_finalize(Class *cl)
+find_finalize(const Class *cl)
 {
        GList *li;
 
@@ -708,7 +708,7 @@ static GList *eq_signal_methods = NULL;
 
 /* compare a list of strings */
 static gboolean
-is_list_equal(GList *a, GList *b)
+is_list_equal(const GList *a, const GList *b)
 {
        for(;a && b; a=a->next, b=b->next) {
                if(strcmp(a->data, b->data)!=0) {
@@ -722,7 +722,7 @@ is_list_equal(GList *a, GList *b)
 }
 
 static Method *
-find_same_type_signal(Method *m)
+find_same_type_signal(const Method *m)
 {
        GList *li;
        for(li=eq_signal_methods;li;li=li->next) {
@@ -734,7 +734,7 @@ find_same_type_signal(Method *m)
 }
 
 static void
-print_signal_marsal_args (Method *m)
+print_signal_marsal_args (const Method *m)
 {
        if (strcmp (m->gtktypes->next->data, "NONE") != 0) {
                GList *li;
@@ -742,8 +742,15 @@ print_signal_marsal_args (Method *m)
                for (i = 0, li = m->gtktypes->next;
                     li != NULL;
                     i++, li = li->next) {
-                       char *get_func = g_strdup_printf
-                               ("g_value_get_%s", (char *)li->data);
+                       char *get_func;
+
+                       if (strcmp (li->data, "UNICHAR") == 0)
+                               /* hack because glib is braindamaged */
+                               get_func = g_strdup ("g_value_get_uint");
+                       else
+                               get_func = g_strdup_printf
+                                       ("g_value_get_%s", (char *)li->data);
+
                        g_strdown (get_func);
                        out_printf (out, ",\n\t\t(%s) "
                                    "%s (param_values + %d)",
@@ -857,9 +864,16 @@ add_signal_prots(Method *m)
                gboolean take_ownership = 
                        (strcmp ((char *)m->gtktypes->data, "STRING") == 0 ||
                         strcmp ((char *)m->gtktypes->data, "BOXED") == 0);
-               char *set_func = g_strdup_printf ("g_value_set_%s%s",
-                                                 (char *)m->gtktypes->data,
-                                                 take_ownership ?
+               char *set_func;
+
+
+               if (strcmp (m->gtktypes->data, "UNICHAR") == 0)
+                       /* hack because glib is braindamaged */
+                       set_func = g_strdup ("g_value_set_uint");
+               else
+                       set_func = g_strdup_printf ("g_value_set_%s%s",
+                                                   (char *)m->gtktypes->data,
+                                                   take_ownership ?
                                                    "_take_ownership" : ""); 
                g_strdown (set_func);
 
@@ -1299,7 +1313,7 @@ add_signals(Class *c)
                if(strcmp(m->gtktypes->data, "NONE") != 0 ||
                   ! is_none) {
                        GList *gl, *al;
-                       char *sep = "";
+                       const char *sep = "";
                        out_printf(out, "\tif(");
                        if(strcmp(m->gtktypes->data, "NONE") != 0) {
                                out_printf(out, "%s sizeof(", sep);
@@ -1954,7 +1968,7 @@ print_initializer(Method *m, Variable *v)
 static void
 print_destructor (Variable *v)
 {
-       char *root;
+       const char *root;
 
        if(v->destructor == NULL)
                return;
@@ -2295,6 +2309,12 @@ add_argument (Argument *a, gboolean is_set)
        the_type_lower = g_strdup (a->gtktype);
        g_strdown (the_type_lower);
 
+       /* HACK because there is no g_value_set/get for unichar */
+       if (strcmp (the_type_lower, "unichar") == 0) {
+               g_free (the_type_lower);
+               the_type_lower = g_strdup ("uint");
+       }
+
        if (is_set) {
                char *cast;
 
@@ -2570,9 +2590,13 @@ put_signal_args (Method *m)
                            "\tg_value_init (&___param_values[%d], G_TYPE_%s);\n",
                            i, i, (char *)ali->data);
 
-               set_func = g_strdup_printf ("g_value_set%s_%s",
-                                           do_static ? "_static" : "",
-                                           (char *)ali->data);
+               if (strcmp (ali->data, "UNICHAR") == 0)
+                       /* hack because glib is braindamaged */
+                       set_func = g_strdup ("g_value_set_uint");
+               else
+                       set_func = g_strdup_printf ("g_value_set%s_%s",
+                                                   do_static ? "_static" : "",
+                                                   (char *)ali->data);
                g_strdown (set_func);
 
                out_printf (out, "\t%s (&___param_values[%d], (%s) %s);\n\n",
@@ -2584,20 +2608,18 @@ put_signal_args (Method *m)
 }
 
 static char *
-get_arg_names_for_macro(Method *m)
+get_arg_names_for_macro (Method *m)
 {
-       char *p;
+       const char *sep;
        GList *li;
        GString *gs = g_string_new(NULL);
-       p = "";
+       sep = "";
        for(li=m->args;li;li=g_list_next(li)) {
                FuncArg *arg = li->data;
-               g_string_sprintfa(gs, "%s___%s", p, arg->name);
-               p = ",";
+               g_string_sprintfa (gs, "%s___%s", sep, arg->name);
+               sep = ",";
        }
-       p = gs->str;
-       g_string_free(gs, FALSE);
-       return p;
+       return g_string_free (gs, FALSE);
 }
 
 static void
@@ -2679,9 +2701,13 @@ put_method(Method *m)
                                if (cast == NULL)
                                        cast = get_type (m->mtype, TRUE);
 
-                               set_func = g_strdup_printf ("g_value_set%s_%s",
-                                                           do_static ? "_static" : "",
-                                                           (char *)m->gtktypes->data);
+                               if (strcmp (m->gtktypes->data, "UNICHAR") == 0)
+                                       /* hack because glib is braindamaged */
+                                       set_func = g_strdup ("g_value_set_uint");
+                               else
+                                       set_func = g_strdup_printf ("g_value_set%s_%s",
+                                                                   do_static ? "_static" : "",
+                                                                   (char *)m->gtktypes->data);
                                g_strdown (set_func);
 
                                out_printf (out, "\t%s (&___return_val, (%s) (%s));\n",
@@ -2705,8 +2731,14 @@ put_method(Method *m)
 
                if (strcmp (m->gtktypes->data, "NONE") != 0) {
                        char *cast = g_strdup (get_cast (m->gtktypes->data, FALSE));
-                       char *getfunc = g_strdup_printf ("g_value_get_%s",
-                                                        (char *)m->gtktypes->data);
+                       char *getfunc;
+
+                       if (strcmp (m->gtktypes->data, "UNICHAR") == 0)
+                               /* hack because glib is braindamaged */
+                               getfunc = g_strdup ("g_value_get_uint");
+                       else
+                               getfunc = g_strdup_printf ("g_value_get_%s",
+                                                          (char *)m->gtktypes->data);
                        g_strdown (getfunc);
 
                        if (cast == NULL)
@@ -3249,12 +3281,7 @@ print_class_block(Class *c)
                    " */\n");
 
        if ( ! overrode_get_type) {
-               out_printf (outh, "GType\t%s_get_type\t(void)", funcbase);
-               if ( ! no_gnu) {
-                       out_printf (outh, " G_GNUC_CONST;\n");
-               } else {
-                       out_printf (outh, ";\n");
-               }
+               out_printf (outh, "GType\t%s_get_type\t(void);", funcbase);
        }
 
        for(li = c->nodes; li != NULL; li = li->next) {

diff --git a/src/parse.c b/src/parse.c
index 85d2b225954d59af96a2b3de1a098a0c20ce3eb6..c0ac2d080428e63b8a95be885da229ba575c71c4 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -537,7 +537,7 @@ property_link_and_export (Node *node)
                        if (prop->extra_gtktype != NULL) {
                                cast = remove_sep (prop->extra_gtktype);
                        } else {
-                               cast = "void";
+                               cast = g_strdup ("void");
                        }
                        set = g_strdup_printf("{ GObject *___old = (GObject *)%s->%s; "
                                              "%s->%s = (%s *)g_value_dup_object (VAL); "
@@ -817,20 +817,20 @@ static const short yyrline[] =
      714,   721,   735,   736,   748,   757,   771,   772,   775,   776,
      785,   797,   798,   799,   800,   803,   804,   805,   806,   809,
      829,   853,   857,   865,   866,   867,   868,   869,   875,   878,
-     883,   951,  1005,  1093,  1101,  1106,  1154,  1190,  1206,  1207,
-    1210,  1211,  1214,  1215,  1227,  1228,  1231,  1237,  1243,  1249,
-    1255,  1261,  1267,  1274,  1280,  1286,  1292,  1298,  1304,  1310,
-    1316,  1322,  1328,  1334,  1354,  1363,  1369,  1370,  1373,  1376,
-    1382,  1389,  1398,  1401,  1404,  1408,  1412,  1416,  1421,  1429,
-    1433,  1438,  1442,  1445,  1449,  1452,  1457,  1458,  1459,  1460,
-    1461,  1462,  1463,  1464,  1465,  1468,  1469,  1470,  1473,  1474,
-    1475,  1479,  1486,  1498,  1504,  1516,  1528,  1531,  1537,  1542,
-    1545,  1550,  1551,  1555,  1571,  1587,  1603,  1619,  1630,  1636,
-    1646,  1669,  1680,  1699,  1705,  1706,  1712,  1713,  1724,  1735,
-    1746,  1756,  1766,  1776,  1779,  1780,  1783,  1784,  1787,  1790,
-    1793,  1801,  1811,  1812,  1815,  1832,  1839,  1846,  1853,  1860,
-    1867,  1876,  1885,  1896,  1897,  1900,  1920,  1930,  1939,  1950,
-    1953,  1958,  1967,  1978,  1981,  1987,  1988,  1992,  1993
+     883,   951,  1005,  1094,  1102,  1107,  1155,  1191,  1207,  1208,
+    1211,  1212,  1215,  1216,  1228,  1229,  1232,  1238,  1244,  1250,
+    1256,  1262,  1268,  1275,  1281,  1287,  1293,  1299,  1305,  1311,
+    1317,  1323,  1329,  1335,  1355,  1364,  1370,  1371,  1374,  1377,
+    1383,  1390,  1399,  1402,  1405,  1409,  1413,  1417,  1422,  1430,
+    1434,  1439,  1443,  1446,  1450,  1453,  1458,  1459,  1460,  1461,
+    1462,  1463,  1464,  1465,  1466,  1469,  1470,  1471,  1474,  1475,
+    1476,  1480,  1487,  1499,  1505,  1517,  1529,  1532,  1538,  1543,
+    1546,  1551,  1552,  1556,  1572,  1588,  1604,  1620,  1631,  1637,
+    1647,  1670,  1681,  1700,  1706,  1707,  1713,  1714,  1725,  1736,
+    1747,  1757,  1767,  1777,  1780,  1781,  1784,  1785,  1788,  1791,
+    1794,  1802,  1812,  1813,  1816,  1833,  1840,  1847,  1854,  1861,
+    1868,  1877,  1886,  1897,  1898,  1901,  1921,  1931,  1940,  1951,
+    1954,  1959,  1968,  1979,  1982,  1988,  1989,  1993,  1994
 };
 #endif
 
@@ -2358,7 +2358,7 @@ case 52:
                        char *get, *set = NULL;
                        Variable *var;
                        Type *type;
-                       char *root;
+                       const char *root;
                        
                        if(strcmp(yyvsp[0].id, "link")!=0 &&
                           strcmp(yyvsp[0].id, "stringlink")!=0 && 
@@ -2375,15 +2375,16 @@ case 52:
                        type = pop_type();
 
                        var = find_var_or_die(yyvsp[-2].id, yyvsp[-5].line);
-                       if(var->scope == PRIVATE_SCOPE)
+                       if(var->scope == PRIVATE_SCOPE) {
                                root = "self->_priv";
-                       else if(var->scope == CLASS_SCOPE) {
+                       } else if(var->scope == CLASS_SCOPE) {
                                root = "SELF_GET_CLASS(self)";
                                if(no_self_alias)
                                        error_print(GOB_ERROR, yyvsp[-5].line,
                                                    _("Self aliases needed when autolinking to a classwide member"));
-                       } else
+                       } else {
                                root = "self";
+                       }
 
                        if(strcmp(yyvsp[0].id, "link")==0) {
                                set = g_strdup_printf("%s->%s = ARG;",
@@ -2441,7 +2442,7 @@ case 52:
                                                }
     break;
 case 53:
-#line 1093 "parse.y"
+#line 1094 "parse.y"
 {
                        if (strcmp (yyvsp[-1].id, "export")!=0) {
                                g_free (yyvsp[-1].id); 
@@ -2452,13 +2453,13 @@ case 53:
                                                }
     break;
 case 54:
-#line 1101 "parse.y"
+#line 1102 "parse.y"
 {
                        yyval.id = NULL;
                                                }
     break;
 case 55:
-#line 1106 "parse.y"
+#line 1107 "parse.y"
 {
                        ensure_property ();
                        node_set ((Node *)property,
@@ -2509,7 +2510,7 @@ case 55:
                }
     break;
 case 56:
-#line 1154 "parse.y"
+#line 1155 "parse.y"
 {
                        ensure_property ();
                        node_set ((Node *)property,
@@ -2548,7 +2549,7 @@ case 56:
                }
     break;
 case 57:
-#line 1190 "parse.y"
+#line 1191 "parse.y"
 {
                        ensure_property ();
                        node_set ((Node *)property,
@@ -2565,27 +2566,27 @@ case 57:
                }
     break;
 case 58:
-#line 1206 "parse.y"
+#line 1207 "parse.y"
 { ; }
     break;
 case 59:
-#line 1207 "parse.y"
+#line 1208 "parse.y"
 { ; }
     break;
 case 60:
-#line 1210 "parse.y"
+#line 1211 "parse.y"
 { ; }
     break;
 case 61:
-#line 1211 "parse.y"
+#line 1212 "parse.y"
 { ; }
     break;
 case 62:
-#line 1214 "parse.y"
+#line 1215 "parse.y"
 { yyval.id = yyvsp[0].id; }
     break;
 case 63:
-#line 1215 "parse.y"
+#line 1216 "parse.y"
 {
                        if (strcmp (yyvsp[-3].id, "_") != 0) {
                                g_free (yyvsp[-3].id);
@@ -2598,15 +2599,15 @@ case 63:
                }
     break;
 case 64:
-#line 1227 "parse.y"
+#line 1228 "parse.y"
 { yyval.id = yyvsp[0].id; }
     break;
 case 65:
-#line 1228 "parse.y"
+#line 1229 "parse.y"
 { yyval.id = yyvsp[0].id; }
     break;
 case 66:
-#line 1231 "parse.y"
+#line 1232 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2615,7 +2616,7 @@ case 66:
                  }
     break;
 case 67:
-#line 1237 "parse.y"
+#line 1238 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2624,7 +2625,7 @@ case 67:
                  }
     break;
 case 68:
-#line 1243 "parse.y"
+#line 1244 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2633,7 +2634,7 @@ case 68:
                  }
     break;
 case 69:
-#line 1249 "parse.y"
+#line 1250 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2642,7 +2643,7 @@ case 69:
                  }
     break;
 case 70:
-#line 1255 "parse.y"
+#line 1256 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2651,7 +2652,7 @@ case 70:
                  }
     break;
 case 71:
-#line 1261 "parse.y"
+#line 1262 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2660,7 +2661,7 @@ case 71:
                  }
     break;
 case 72:
-#line 1267 "parse.y"
+#line 1268 "parse.y"
 {
                Type *type = pop_type ();
                ensure_property ();
@@ -2670,7 +2671,7 @@ case 72:
                  }
     break;
 case 73:
-#line 1274 "parse.y"
+#line 1275 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2679,7 +2680,7 @@ case 73:
                  }
     break;
 case 74:
-#line 1280 "parse.y"
+#line 1281 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2688,7 +2689,7 @@ case 74:
                  }
     break;
 case 75:
-#line 1286 "parse.y"
+#line 1287 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2697,7 +2698,7 @@ case 75:
                  }
     break;
 case 76:
-#line 1292 "parse.y"
+#line 1293 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2706,7 +2707,7 @@ case 76:
                  }
     break;
 case 77:
-#line 1298 "parse.y"
+#line 1299 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2715,7 +2716,7 @@ case 77:
                  }
     break;
 case 78:
-#line 1304 "parse.y"
+#line 1305 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2724,7 +2725,7 @@ case 78:
                  }
     break;
 case 79:
-#line 1310 "parse.y"
+#line 1311 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2733,7 +2734,7 @@ case 79:
                  }
     break;
 case 80:
-#line 1316 "parse.y"
+#line 1317 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2742,7 +2743,7 @@ case 80:
                  }
     break;
 case 81:
-#line 1322 "parse.y"
+#line 1323 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2751,7 +2752,7 @@ case 81:
                  }
     break;
 case 82:
-#line 1328 "parse.y"
+#line 1329 "parse.y"
 {
                ensure_property ();
                node_set ((Node *)property,
@@ -2760,7 +2761,7 @@ case 82:
                  }
     break;
 case 83:
-#line 1334 "parse.y"
+#line 1335 "parse.y"
 {
                ensure_property ();
                if (strcmp (yyvsp[0].id, "link") == 0) {
@@ -2781,7 +2782,7 @@ case 83:
                  }
     break;
 case 84:
-#line 1354 "parse.y"
+#line 1355 "parse.y"
 {
                        if(strcmp(yyvsp[-2].id,"type")!=0) {
                                g_free(yyvsp[-4].id);
@@ -2793,34 +2794,34 @@ case 84:
                                                }
     break;
 case 85:
-#line 1363 "parse.y"
+#line 1364 "parse.y"
 {
                        yyval.id = debool (yyvsp[0].id);
                        typestack = g_list_prepend(typestack,NULL);
                                                }
     break;
 case 86:
-#line 1369 "parse.y"
+#line 1370 "parse.y"
 { yyval.list = yyvsp[-1].list; }
     break;
 case 87:
-#line 1370 "parse.y"
+#line 1371 "parse.y"
 { yyval.list = NULL; }
     break;
 case 88:
-#line 1373 "parse.y"
+#line 1374 "parse.y"
 {
                        yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
                                                }
     break;
 case 89:
-#line 1376 "parse.y"
+#line 1377 "parse.y"
 {
                        yyval.list = g_list_append(NULL,yyvsp[0].id);
                                                }
     break;
 case 90:
-#line 1382 "parse.y"
+#line 1383 "parse.y"
 {
                        Node *node = node_new (TYPE_NODE, 
                                               "name:steal", yyvsp[-1].id,
@@ -2830,7 +2831,7 @@ case 90:
                                                        }
     break;
 case 91:
-#line 1389 "parse.y"
+#line 1390 "parse.y"
 {
                        Node *node = node_new (TYPE_NODE, 
                                               "name:steal", yyvsp[0].id,
@@ -2839,40 +2840,40 @@ case 91:
                                                        }
     break;
 case 92:
-#line 1398 "parse.y"
+#line 1399 "parse.y"
 {
                        yyval.id = yyvsp[0].id;
                                                        }
     break;
 case 93:
-#line 1401 "parse.y"
+#line 1402 "parse.y"
 {
                        yyval.id = yyvsp[0].id;
                                                        }
     break;
 case 94:
-#line 1404 "parse.y"
+#line 1405 "parse.y"
 {
                        yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
                        g_free(yyvsp[0].id);
                                                        }
     break;
 case 95:
-#line 1408 "parse.y"
+#line 1409 "parse.y"
 {
                        yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
                        g_free(yyvsp[-1].id);
                                                        }
     break;
 case 96:
-#line 1412 "parse.y"
+#line 1413 "parse.y"
 {
                        yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
                        g_free(yyvsp[0].id);
                                                        }
     break;
 case 97:
-#line 1416 "parse.y"
+#line 1417 "parse.y"
 {
                        yyval.id = g_strconcat("const ", yyvsp[-1].id, " ",
                                             yyvsp[0].id, NULL);
@@ -2880,7 +2881,7 @@ case 97:
                                                        }
     break;
 case 98:
-#line 1421 "parse.y"
+#line 1422 "parse.y"
 {
                        yyval.id = g_strconcat(yyvsp[-2].id, " ",
                                             yyvsp[-1].id, " const", NULL);
@@ -2888,14 +2889,14 @@ case 98:
                                                        }
     break;
 case 99:
-#line 1429 "parse.y"
+#line 1430 "parse.y"
 {
                        yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
                        g_free(yyvsp[0].id);
                                                        }
     break;
 case 100:
-#line 1433 "parse.y"
+#line 1434 "parse.y"
 {
                        yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
                        g_free(yyvsp[-1].id);
@@ -2903,109 +2904,109 @@ case 100:
                                                        }
     break;
 case 101:
-#line 1438 "parse.y"
+#line 1439 "parse.y"
 {
                        yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
                        g_free(yyvsp[0].id);
                                                        }
     break;
 case 102:
-#line 1442 "parse.y"
+#line 1443 "parse.y"
 {
                        yyval.id = yyvsp[0].id;
                                                        }
     break;
 case 103:
-#line 1445 "parse.y"
+#line 1446 "parse.y"
 {
                        yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
                        g_free(yyvsp[-1].id);
                                                        }
     break;
 case 104:
-#line 1449 "parse.y"
+#line 1450 "parse.y"
 {
                        yyval.id = g_strdup(yyvsp[0].id);
                                                        }
     break;
 case 105:
-#line 1452 "parse.y"
+#line 1453 "parse.y"
 {
                        yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
                                                        }
     break;
 case 106:
-#line 1457 "parse.y"
+#line 1458 "parse.y"
 { yyval.id = "void"; }
     break;
 case 107:
-#line 1458 "parse.y"
+#line 1459 "parse.y"
 { yyval.id = "char"; }
     break;
 case 108:
-#line 1459 "parse.y"
+#line 1460 "parse.y"
 { yyval.id = "short"; }
     break;
 case 109:
-#line 1460 "parse.y"
+#line 1461 "parse.y"
 { yyval.id = "int"; }
     break;
 case 110:
-#line 1461 "parse.y"
+#line 1462 "parse.y"
 { yyval.id = "long"; }
     break;
 case 111:
-#line 1462 "parse.y"
+#line 1463 "parse.y"
 { yyval.id = "float"; }
     break;
 case 112:
-#line 1463 "parse.y"
+#line 1464 "parse.y"
 { yyval.id = "double"; }
     break;
 case 113:
-#line 1464 "parse.y"
+#line 1465 "parse.y"
 { yyval.id = "signed"; }
     break;
 case 114:
-#line 1465 "parse.y"
+#line 1466 "parse.y"
 { yyval.id = "unsigned"; }
     break;
 case 115:
-#line 1468 "parse.y"
+#line 1469 "parse.y"
 { yyval.id = "struct"; }
     break;
 case 116:
-#line 1469 "parse.y"
+#line 1470 "parse.y"
 { yyval.id = "union"; }
     break;
 case 117:
-#line 1470 "parse.y"
+#line 1471 "parse.y"
 { yyval.id = "enum"; }
     break;
 case 118:
-#line 1473 "parse.y"
+#line 1474 "parse.y"
 { yyval.id = g_strdup("*"); }
     break;
 case 119:
-#line 1474 "parse.y"
+#line 1475 "parse.y"
 { yyval.id = g_strdup("* const"); }
     break;
 case 120:
-#line 1475 "parse.y"
+#line 1476 "parse.y"
 {
                                yyval.id = g_strconcat("*", yyvsp[0].id, NULL);
                                g_free(yyvsp[0].id);
                                        }
     break;
 case 121:
-#line 1479 "parse.y"
+#line 1480 "parse.y"
 {
                                yyval.id = g_strconcat("* const", yyvsp[0].id, NULL);
                                g_free(yyvsp[0].id);
                                        }
     break;
 case 122:
-#line 1486 "parse.y"
+#line 1487 "parse.y"
 {
                        if(strcmp(yyvsp[-1].id, "first")==0)
                                yyval.sigtype = SIGNAL_FIRST_METHOD;
@@ -3020,13 +3021,13 @@ case 122:
                                        }
     break;
 case 123:
-#line 1498 "parse.y"
+#line 1499 "parse.y"
 {
                        yyval.sigtype = SIGNAL_LAST_METHOD;
                                        }
     break;
 case 124:
-#line 1504 "parse.y"
+#line 1505 "parse.y"
 {
                        if(strcmp(yyvsp[-1].id,"first")==0)
                                yyval.sigtype = SIGNAL_FIRST_METHOD;
@@ -3041,7 +3042,7 @@ case 124:
                                        }
     break;
 case 125:
-#line 1516 "parse.y"
+#line 1517 "parse.y"
 {
                        if(strcmp(yyvsp[-2].id,"first")==0)
                                yyval.sigtype = SIGNAL_FIRST_METHOD;
@@ -3056,46 +3057,46 @@ case 125:
                                        }
     break;
 case 126:
-#line 1528 "parse.y"
+#line 1529 "parse.y"
 {
                        yyval.sigtype = SIGNAL_LAST_METHOD;
                                        }
     break;
 case 127:
-#line 1531 "parse.y"
+#line 1532 "parse.y"
 {
                        /* the_scope was default thus public */
                        the_scope = PUBLIC_SCOPE;
                                        }
     break;
 case 128:
-#line 1537 "parse.y"
+#line 1538 "parse.y"
 {
                        gtktypes = g_list_prepend(gtktypes, debool (yyvsp[-3].id));
                                                }
     break;
 case 129:
-#line 1542 "parse.y"
+#line 1543 "parse.y"
 {
                        gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id));
                                                }
     break;
 case 130:
-#line 1545 "parse.y"
+#line 1546 "parse.y"
 { 
                        gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id));
                                                        }
     break;
 case 131:
-#line 1550 "parse.y"
+#line 1551 "parse.y"
 { yyval.cbuf = yyvsp[0].cbuf; }
     break;
 case 132:
-#line 1551 "parse.y"
+#line 1552 "parse.y"
 { yyval.cbuf = NULL; }
     break;
 case 133:
-#line 1555 "parse.y"
+#line 1556 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "
@@ -3114,7 +3115,7 @@ case 133:
                                                                        }
     break;
 case 134:
-#line 1571 "parse.y"
+#line 1572 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "
@@ -3133,7 +3134,7 @@ case 134:
                                                                        }
     break;
 case 135:
-#line 1587 "parse.y"
+#line 1588 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
@@ -3152,7 +3153,7 @@ case 135:
                                                                        }
     break;
 case 136:
-#line 1603 "parse.y"
+#line 1604 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
@@ -3171,7 +3172,7 @@ case 136:
                                                                        }
     break;
 case 137:
-#line 1619 "parse.y"
+#line 1620 "parse.y"
 {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
@@ -3185,7 +3186,7 @@ case 137:
                                                                        }
     break;
 case 138:
-#line 1630 "parse.y"
+#line 1631 "parse.y"
 {
                        push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
                                      yyvsp[-5].id, yyvsp[0].cbuf,
@@ -3194,7 +3195,7 @@ case 138:
                                                                        }
     break;
 case 139:
-#line 1636 "parse.y"
+#line 1637 "parse.y"
 {
                        if(the_scope == CLASS_SCOPE) {
                                yyerror(_("a method cannot be of class scope"));
@@ -3207,7 +3208,7 @@ case 139:
                                                                }
     break;
 case 140:
-#line 1646 "parse.y"
+#line 1647 "parse.y"
 {
                        if(strcmp(yyvsp[-4].id, "init")==0) {
                                push_init_arg(yyvsp[-2].id,FALSE);
@@ -3231,7 +3232,7 @@ case 140:
                                                }
     break;
 case 141:
-#line 1669 "parse.y"
+#line 1670 "parse.y"
 {
                        g_free(onerror); onerror = NULL;
                        g_free(defreturn); defreturn = NULL;
@@ -3245,7 +3246,7 @@ case 141:
                                        }
     break;
 case 142:
-#line 1680 "parse.y"
+#line 1681 "parse.y"
 {
                        g_free(onerror); onerror = NULL;
                        g_free(defreturn); defreturn = NULL;
@@ -3267,29 +3268,29 @@ case 142:
                                                }
     break;
 case 143:
-#line 1699 "parse.y"
+#line 1700 "parse.y"
 {
                        g_free(onerror); onerror = NULL;
                        g_free(defreturn); defreturn = NULL;
                                        }
     break;
 case 144:
-#line 1705 "parse.y"
+#line 1706 "parse.y"
 { yyval.id = yyvsp[0].id; }
     break;
 case 145:
-#line 1706 "parse.y"
+#line 1707 "parse.y"
 {
-                       yyval.id = (yyvsp[1].cbuf)->str;
-                       g_string_free(yyvsp[1].cbuf, FALSE);
+                       yyval.id = (yyvsp[0].cbuf)->str;
+                       g_string_free(yyvsp[0].cbuf, FALSE);
                                        }
     break;
 case 146:
-#line 1712 "parse.y"
+#line 1713 "parse.y"
 { vararg = FALSE; has_self = FALSE; }
     break;
 case 147:
-#line 1713 "parse.y"
+#line 1714 "parse.y"
 {
                        vararg = FALSE;
                        has_self = TRUE;
@@ -3303,7 +3304,7 @@ case 147:
                                                }
     break;
 case 148:
-#line 1724 "parse.y"
+#line 1725 "parse.y"
 {
                        vararg = FALSE;
                        has_self = TRUE;
@@ -3317,7 +3318,7 @@ case 148:
                                                }
     break;
 case 149:
-#line 1735 "parse.y"
+#line 1736 "parse.y"
 {
                        vararg = FALSE;
                        has_self = TRUE;
@@ -3331,7 +3332,7 @@ case 149:
                                                }
     break;
 case 150:
-#line 1746 "parse.y"
+#line 1747 "parse.y"
 {
                        has_self = TRUE;
                        if(strcmp(yyvsp[-2].id,"self")==0)
@@ -3344,7 +3345,7 @@ case 150:
                                        }
     break;
 case 151:
-#line 1756 "parse.y"
+#line 1757 "parse.y"
 {
                        has_self = TRUE;
                        if(strcmp(yyvsp[-3].id,"self")==0)
@@ -3357,7 +3358,7 @@ case 151:
                                        }
     break;
 case 152:
-#line 1766 "parse.y"
+#line 1767 "parse.y"
 {
                        has_self = TRUE;
                        if(strcmp(yyvsp[-2].id,"self")==0)
@@ -3370,39 +3371,39 @@ case 152:
                                        }
     break;
 case 153:
-#line 1776 "parse.y"
+#line 1777 "parse.y"
 { has_self = FALSE; }
     break;
 case 154:
-#line 1779 "parse.y"
+#line 1780 "parse.y"
 { vararg = TRUE; }
     break;
 case 155:
-#line 1780 "parse.y"
+#line 1781 "parse.y"
 { vararg = FALSE; }
     break;
 case 156:
-#line 1783 "parse.y"
+#line 1784 "parse.y"
 { ; }
     break;
 case 157:
-#line 1784 "parse.y"
+#line 1785 "parse.y"
 { ; }
     break;
 case 158:
-#line 1787 "parse.y"
+#line 1788 "parse.y"
 {
                        push_funcarg(yyvsp[0].id,NULL);
                                                                }
     break;
 case 159:
-#line 1790 "parse.y"
+#line 1791 "parse.y"
 {
                        push_funcarg(yyvsp[-1].id,yyvsp[0].id);
                                                                }
     break;
 case 160:
-#line 1793 "parse.y"
+#line 1794 "parse.y"
 {
                        if(strcmp(yyvsp[-2].id,"check")!=0) {
                                yyerror(_("parse error"));
@@ -3413,7 +3414,7 @@ case 160:
                                                                }
     break;
 case 161:
-#line 1801 "parse.y"
+#line 1802 "parse.y"
 {
                        if(strcmp(yyvsp[-2].id,"check")!=0) {
                                yyerror(_("parse error"));
@@ -3424,15 +3425,15 @@ case 161:
                                                                }
     break;
 case 162:
-#line 1811 "parse.y"
+#line 1812 "parse.y"
 { ; }
     break;
 case 163:
-#line 1812 "parse.y"
+#line 1813 "parse.y"
 { ; }
     break;
 case 164:
-#line 1815 "parse.y"
+#line 1816 "parse.y"
 {
                        if(strcmp(yyvsp[0].id,"type")==0) {
                                Node *node = node_new (CHECK_NODE,
@@ -3452,7 +3453,7 @@ case 164:
                                        }
     break;
 case 165:
-#line 1832 "parse.y"
+#line 1833 "parse.y"
 {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", GT_CHECK,
@@ -3462,7 +3463,7 @@ case 165:
                                        }
     break;
 case 166:
-#line 1839 "parse.y"
+#line 1840 "parse.y"
 {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", LT_CHECK,
@@ -3472,7 +3473,7 @@ case 166:
                                        }
     break;
 case 167:
-#line 1846 "parse.y"
+#line 1847 "parse.y"
 {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", GE_CHECK,
@@ -3482,7 +3483,7 @@ case 167:
                                        }
     break;
 case 168:
-#line 1853 "parse.y"
+#line 1854 "parse.y"
 {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", LE_CHECK,
@@ -3492,7 +3493,7 @@ case 168:
                                        }
     break;
 case 169:
-#line 1860 "parse.y"
+#line 1861 "parse.y"
 {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", EQ_CHECK,
@@ -3502,7 +3503,7 @@ case 169:
                                        }
     break;
 case 170:
-#line 1867 "parse.y"
+#line 1868 "parse.y"
 {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", NE_CHECK,
@@ -3512,7 +3513,7 @@ case 170:
                                        }
     break;
 case 171:
-#line 1876 "parse.y"
+#line 1877 "parse.y"
 {
                        Node *node = node_new (ENUMDEF_NODE,
                                               "etype:steal", yyvsp[-1].id,
@@ -3524,7 +3525,7 @@ case 171:
                        }
     break;
 case 172:
-#line 1885 "parse.y"
+#line 1886 "parse.y"
 {
                        Node *node = node_new (ENUMDEF_NODE,
                                               "etype:steal", yyvsp[-1].id,
@@ -3536,15 +3537,15 @@ case 172:
                        }
     break;
 case 173:
-#line 1896 "parse.y"
+#line 1897 "parse.y"
 {;}
     break;
 case 174:
-#line 1897 "parse.y"
+#line 1898 "parse.y"
 {;}
     break;
 case 175:
-#line 1900 "parse.y"
+#line 1901 "parse.y"
 {
                        Node *node;
                        char *num = yyvsp[0].id;
@@ -3567,7 +3568,7 @@ case 175:
                        }
     break;
 case 176:
-#line 1920 "parse.y"
+#line 1921 "parse.y"
 {
                        Node *node;
 
@@ -3578,7 +3579,7 @@ case 176:
        }
     break;
 case 177:
-#line 1930 "parse.y"
+#line 1931 "parse.y"
 {
                        Node *node = node_new (FLAGS_NODE,
                                               "ftype:steal", yyvsp[-1].id,
@@ -3590,7 +3591,7 @@ case 177:
                        }
     break;
 case 178:
-#line 1939 "parse.y"
+#line 1940 "parse.y"
 {
                        Node *node = node_new (FLAGS_NODE,
                                               "ftype:steal", yyvsp[-1].id,
@@ -3602,19 +3603,19 @@ case 178:
                        }
     break;
 case 179:
-#line 1950 "parse.y"
+#line 1951 "parse.y"
 {
                        flag_vals = g_list_append (flag_vals, yyvsp[0].id);
                }
     break;
 case 180:
-#line 1953 "parse.y"
+#line 1954 "parse.y"
 {
                        flag_vals = g_list_append (flag_vals, yyvsp[0].id);
                }
     break;
 case 181:
-#line 1958 "parse.y"
+#line 1959 "parse.y"
 {
                        Node *node = node_new (ERROR_NODE,
                                               "etype:steal", yyvsp[-1].id,
@@ -3626,7 +3627,7 @@ case 181:
                        }
     break;
 case 182:
-#line 1967 "parse.y"
+#line 1968 "parse.y"
 {
                        Node *node = node_new (ERROR_NODE,
                                               "etype:steal", yyvsp[-1].id,
@@ -3638,34 +3639,34 @@ case 182:
                        }
     break;
 case 183:
-#line 1978 "parse.y"
+#line 1979 "parse.y"
 {
                        error_vals = g_list_append (error_vals, yyvsp[0].id);
                }
     break;
 case 184:
-#line 1981 "parse.y"
+#line 1982 "parse.y"
 {
                        error_vals = g_list_append (error_vals, yyvsp[0].id);
                }
     break;
 case 185:
-#line 1987 "parse.y"
+#line 1988 "parse.y"
 { yyval.id = yyvsp[0].id; }
     break;
 case 186:
-#line 1988 "parse.y"
+#line 1989 "parse.y"
 {
                        yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
                        g_free(yyvsp[0].id);
                                        }
     break;
 case 187:
-#line 1992 "parse.y"
+#line 1993 "parse.y"
 { yyval.id = yyvsp[0].id; }
     break;
 case 188:
-#line 1993 "parse.y"
+#line 1994 "parse.y"
 { yyval.id = yyvsp[0].id; }
     break;
 }
@@ -3901,5 +3902,5 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 1996 "parse.y"
+#line 1997 "parse.y"
 

diff --git a/src/parse.y b/src/parse.y
index e6600bf5538b48e749206a78bbd69a340507b752..7588b9d252131bfe1eb4b0f8bc464de469cc4f6a 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -501,7 +501,7 @@ property_link_and_export (Node *node)
                        if (prop->extra_gtktype != NULL) {
                                cast = remove_sep (prop->extra_gtktype);
                        } else {
-                               cast = "void";
+                               cast = g_strdup ("void");
                        }
                        set = g_strdup_printf("{ GObject *___old = (GObject *)%s->%s; "
                                              "%s->%s = (%s *)g_value_dup_object (VAL); "
@@ -1007,7 +1007,7 @@ argument: ARGUMENT flags argtype TOKEN export TOKEN '{' CCODE TOKEN '{' CCODE ';
                        char *get, *set = NULL;
                        Variable *var;
                        Type *type;
-                       char *root;
+                       const char *root;
                        
                        if(strcmp($<id>6, "link")!=0 &&
                           strcmp($<id>6, "stringlink")!=0 && 
@@ -1024,15 +1024,16 @@ argument:       ARGUMENT flags argtype TOKEN export TOKEN '{' CCODE TOKEN '{' CCODE ';
                        type = pop_type();
 
                        var = find_var_or_die($<id>4, $<line>1);
-                       if(var->scope == PRIVATE_SCOPE)
+                       if(var->scope == PRIVATE_SCOPE) {
                                root = "self->_priv";
-                       else if(var->scope == CLASS_SCOPE) {
+                       } else if(var->scope == CLASS_SCOPE) {
                                root = "SELF_GET_CLASS(self)";
                                if(no_self_alias)
                                        error_print(GOB_ERROR, $<line>1,
                                                    _("Self aliases needed when autolinking to a classwide member"));
-                       } else
+                       } else {
                                root = "self";
+                       }
 
                        if(strcmp($<id>6, "link")==0) {
                                set = g_strdup_printf("%s->%s = ARG;",
@@ -1704,8 +1705,8 @@ returnvals:       TOKEN retcode           {
 
 retcode:       numtok                  { $<id>$ = $<id>1; }
        |       '{' CCODE               {
-                       $<id>$ = ($<cbuf>3)->str;
-                       g_string_free($<cbuf>3, FALSE);
+                       $<id>$ = ($<cbuf>2)->str;
+                       g_string_free($<cbuf>2, FALSE);
                                        }
        ;
        

diff --git a/src/util.c b/src/util.c
index 78eaaaa6c02b32b857677568bf81545d95895345..5d891a20e5200377d82efd6bf68666c86365f39d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -34,7 +34,7 @@
 void
 error_print(int type, int line, const char *error)
 {
-       char *w = NULL;
+       const char *w = NULL;
 
        switch(type) {
        case GOB_WARN:
@@ -77,6 +77,11 @@ remove_sep(const char *base)
 {
        char *p;
        char *s = g_strdup(base);
+
+       /* don't eat C++ :: thingies */
+       if (for_cpp && strstr (s, "::") != NULL)
+               return s;
+
        while((p = strchr(s, ':')))
                strcpy(p, p+1);
        return s;
@@ -87,6 +92,11 @@ replace_sep(const char *base, char r)
 {
        char *p;
        char *s = g_strdup(base);
+
+       /* don't eat C++ :: thingies */
+       if (for_cpp && strstr (s, "::") != NULL)
+               return s;
+
        while((p=strchr(s,':')))
                *p = r;
        if(*s == r) {
@@ -104,7 +114,15 @@ separns_replace_sep(const char *base, char **ns, char **name, char r)
 {
        char *p;
        char *s = g_strdup(base);
+
        *ns = NULL;
+       
+       /* don't eat C++ :: thingies */
+       if (for_cpp && strstr (s, "::") != NULL) {
+               *name = s;
+               return;
+       }
+
        if((p=strchr(s,':')) && p!=s) {
                *p = '\0';
                *ns = g_strdup(s);
@@ -173,11 +191,14 @@ const OurGtkType our_gtk_type_table[] = {
        { TRUE, "NONE",         "void ",        "void",         NULL,   -1 },
        { TRUE, "CHAR",         "gchar ",       "gchar",        NULL,   -1 },
        { TRUE, "UCHAR",        "guchar ",      "guchar",       NULL,   -1 },
+       { TRUE, "UNICHAR",      "gunichar ",    "gunichar",     NULL,   -1 },
        { TRUE, "BOOLEAN",      "gboolean ",    "gboolean",     NULL,   -1 },
        { TRUE, "INT",          "gint ",        "gint",         NULL,   -1 },
        { TRUE, "UINT",         "guint ",       "guint",        NULL,   -1 },
        { TRUE, "LONG",         "glong ",       "glong",        NULL,   -1 },
        { TRUE, "ULONG",        "gulong ",      "gulong",       NULL,   -1 },
+       { TRUE, "INT64",        "gint64 ",      "gint64",       NULL,   -1 },
+       { TRUE, "UINT64",       "guint64 ",     "guint64",      NULL,   -1 },
        { TRUE, "ENUM",         /*"enum"*/"gint ", "gint",      NULL,   -1 },
        { TRUE, "FLAGS",        /*"flags"*/"guint ", "guint",   NULL,   -1 },
        { TRUE, "FLOAT",        "gfloat ",      "gfloat",       NULL,   -1 },
@@ -188,7 +209,7 @@ const OurGtkType our_gtk_type_table[] = {
        { TRUE, "OBJECT",       "GObject *",    "GObject",      "*",    -1 },
        { TRUE, "PARAM",        "GParamSpec *", "GParamSpec",   "*",    -1 },
 
-       /* FIXME: VALUE_ARRAY, CLOSURE, UNICHAR */
+       /* FIXME: VALUE_ARRAY, CLOSURE */
        /* Note that those have some issues with g_value_ calls etc... so
         * we can't just add them */
 
@@ -267,7 +288,7 @@ get_tree_type (const char *type, gboolean simple_only)
 }
 
 static void
-mask_special_array(char *type, gboolean *special_array, gboolean *any_special)
+mask_special_array (const char *type, gboolean *special_array, gboolean *any_special)
 {
        OurGtkType *gtype;