[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    [QKW PATCH] dcopidl/win32
From:       Jarosław Staniek <js () iidea ! pl>
Date:       2003-04-28 16:40:01
[Download RAW message or body]

- Class declarations with __declspec(import) and __declspec(export) flags
are now handled properly. It's used on win32 by defining e.g.
KDECORE_EXPORT macro, similarly to Q_EXPORT macro inside qt3/win32. 

- LINK_SCOPE tag is added to .kidl format.

- New .kidl file format remains backward compatible.

This is first de-facto patch for kdelibs/win32 (QKW project:
http://www.iidea.pl/~js/qkw/).

-- 
regards / pozdrawiam,
  Jarosław Staniek

["dcopidl-2003-04-28.diff" (text/x-diff)]

Index: kdelibs/dcop/dcopidl/scanner.cc
===================================================================
RCS file: /home/kde/kdelibs/dcop/dcopidl/scanner.cc,v
retrieving revision 1.57
diff -u -3 -p -u -r1.57 scanner.cc
--- kdelibs/dcop/dcopidl/scanner.cc	2 Apr 2003 21:21:31 -0000	1.57
+++ kdelibs/dcop/dcopidl/scanner.cc	28 Apr 2003 15:50:15 -0000
@@ -2,7 +2,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/kde/kdelibs/dcop/dcopidl/scanner.cc,v 1.57 2003/04/02 21:21:31 \
faure Exp $ + * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 \
                16:58:48 vern Exp $
  */
 
 #define FLEX_SCANNER
@@ -1077,7 +1077,7 @@ YY_MALLOC_DECL
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
-	register char *yy_cp = NULL, *yy_bp = NULL;
+	register char *yy_cp, *yy_bp;
 	register int yy_act;
 
 #line 148 "scanner.ll"
@@ -2178,7 +2178,7 @@ YY_BUFFER_STATE b;
 
 #ifndef YY_ALWAYS_INTERACTIVE
 #ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
+#include<unistd.h>
 #endif
 #endif
 
Index: kdelibs/dcop/dcopidl/yacc.cc
===================================================================
RCS file: /home/kde/kdelibs/dcop/dcopidl/yacc.cc,v
retrieving revision 1.57
diff -u -3 -p -u -r1.57 yacc.cc
--- kdelibs/dcop/dcopidl/yacc.cc	2 Apr 2003 21:21:31 -0000	1.57
+++ kdelibs/dcop/dcopidl/yacc.cc	28 Apr 2003 15:50:16 -0000
@@ -154,7 +154,7 @@ typedef union
 
 
 
-#define	YYFINAL		360
+#define	YYFINAL		366
 #define	YYFLAG		-32768
 #define	YYNTBASE	66
 
@@ -197,113 +197,114 @@ static const char yytranslate[] = {     
 
 #if YYDEBUG != 0
 static const short yyprhs[] = {     0,
-     0,     4,     5,     8,    13,    14,    16,    17,    24,    28,
-    32,    38,    39,    47,    52,    58,    61,    66,    74,    83,
-    86,    88,    90,    92,    95,    96,    98,   100,   102,   104,
-   106,   108,   110,   111,   115,   118,   121,   124,   126,   130,
-   132,   137,   141,   143,   146,   150,   153,   155,   156,   158,
-   160,   163,   166,   169,   172,   175,   178,   181,   187,   192,
-   197,   202,   209,   214,   221,   228,   236,   243,   250,   256,
-   260,   262,   266,   268,   270,   272,   275,   277,   279,   281,
-   285,   289,   297,   307,   308,   310,   312,   315,   317,   320,
-   323,   327,   330,   334,   337,   341,   344,   348,   350,   352,
-   355,   357,   360,   362,   365,   368,   371,   373,   374,   376,
-   380,   382,   384,   387,   390,   395,   402,   406,   408,   411,
-   413,   417,   421,   424,   427,   429,   432,   436,   438,   442,
-   445,   447,   448,   451,   457,   459,   461,   463,   465,   470,
-   471,   473,   475,   477,   479,   481,   483,   490,   498,   500,
-   504,   505,   510,   512,   516,   519,   525,   529,   535,   543,
-   550,   554,   556,   558,   562,   567,   570,   571,   573,   576,
-   577,   579,   583,   586,   589,   593,   599,   605,   611
+     0,     4,     5,     8,    13,    14,    16,    17,    24,    32,
+    36,    40,    46,    47,    55,    60,    66,    69,    74,    82,
+    91,    94,    96,    98,   100,   103,   104,   106,   108,   110,
+   112,   114,   116,   118,   119,   123,   126,   129,   132,   134,
+   138,   140,   145,   149,   151,   154,   158,   161,   163,   164,
+   166,   168,   171,   174,   177,   180,   183,   186,   189,   195,
+   200,   205,   210,   217,   222,   229,   236,   244,   251,   258,
+   264,   268,   270,   274,   276,   278,   280,   283,   285,   287,
+   289,   293,   297,   305,   315,   316,   318,   320,   323,   325,
+   328,   331,   335,   338,   342,   345,   349,   352,   356,   358,
+   360,   363,   365,   368,   370,   373,   376,   379,   381,   382,
+   384,   388,   390,   392,   395,   398,   403,   410,   414,   416,
+   419,   421,   425,   429,   432,   435,   437,   440,   444,   446,
+   450,   453,   455,   456,   459,   465,   467,   469,   471,   473,
+   478,   479,   481,   483,   485,   487,   489,   491,   498,   506,
+   508,   512,   513,   518,   520,   524,   527,   533,   537,   543,
+   551,   558,   562,   564,   566,   570,   575,   578,   579,   581,
+   584,   585,   587,   591,   594,   597,   601,   607,   613,   619
 };
 
 static const short yyrhs[] = {    67,
     69,    66,     0,     0,     8,    67,     0,    38,    11,    66,
     13,     0,     0,    56,     0,     0,     9,    78,    82,    68,
-    84,    16,     0,     9,    78,    16,     0,    10,    78,    16,
-     0,    10,    78,    82,    84,    16,     0,     0,    41,     5,
-    11,    70,    66,    13,    83,     0,    42,    41,     5,    16,
-     0,    42,     5,    50,     5,    16,     0,    37,    16,     0,
-    28,    98,    78,    16,     0,    28,    10,    11,    71,    13,
-    78,    16,     0,    28,    10,    78,    11,    71,    13,    78,
-    16,     0,    23,   109,     0,   109,     0,   117,     0,    85,
-     0,   117,    71,     0,     0,    45,     0,    46,     0,    20,
-     0,    18,     0,    17,     0,    26,     0,    27,     0,     0,
-    73,    74,    15,     0,    74,    15,     0,    57,    15,     0,
-    58,    15,     0,     5,     0,     5,    50,    78,     0,    78,
-     0,    78,    34,    99,    35,     0,   103,    17,    79,     0,
-    79,     0,    80,    11,     0,    80,    31,    81,     0,    15,
-    81,     0,    11,     0,     0,    16,     0,    13,     0,    90,
-    84,     0,   109,    84,     0,    77,    84,     0,    85,    84,
-     0,    76,    84,     0,    75,    84,     0,   117,    84,     0,
-    24,     9,    78,    16,    84,     0,    24,    78,    16,    84,
-     0,    24,   105,    16,    84,     0,     9,    78,    16,    84,
-     0,     9,    78,    82,    84,    16,    84,     0,    10,    78,
-    16,    84,     0,    10,    78,    82,    84,    16,    84,     0,
-    42,     5,    50,     5,    16,    84,     0,    40,     5,    11,
-    86,    13,     5,    16,     0,    40,     5,    11,    86,    13,
-    16,     0,    40,    11,    86,    13,     5,    16,     0,    40,
-    11,    86,    13,    16,     0,    87,    31,    86,     0,    87,
-     0,     5,    49,    89,     0,     5,     0,     3,     0,     6,
-     0,    30,     6,     0,    51,     0,    78,     0,    88,     0,
-    88,    29,    88,     0,    88,    65,    88,     0,    28,    78,
-    34,    99,    35,    78,    16,     0,    28,    78,    34,    99,
-    35,    50,     5,    78,    16,     0,     0,    22,     0,    59,
-     0,    59,    52,     0,    60,     0,    60,    52,     0,    59,
-    62,     0,    59,    62,    52,     0,    59,    61,     0,    59,
-    61,    52,     0,    60,    62,     0,    60,    62,    52,     0,
-    60,    61,     0,    60,    61,    52,     0,    52,     0,    61,
-     0,    61,    52,     0,    62,     0,    62,    52,     0,    55,
-     0,    59,    55,     0,    60,    55,     0,    32,    93,     0,
-    32,     0,     0,   100,     0,    94,    31,   100,     0,    92,
-     0,    78,     0,    10,    78,     0,     9,    78,     0,    78,
-    34,    96,    35,     0,    78,    34,    96,    35,    50,    78,
-     0,    97,    31,    96,     0,    97,     0,    95,    93,     0,
-    95,     0,    22,    95,    93,     0,    22,    95,    36,     0,
-    22,    95,     0,    95,    36,     0,    95,     0,    95,    93,
-     0,    98,    31,    99,     0,    98,     0,    98,    78,   101,
-     0,    98,   101,     0,    44,     0,     0,    49,   102,     0,
-    49,    12,    98,    14,   102,     0,     7,     0,    89,     0,
-     4,     0,    72,     0,    78,    12,    94,    14,     0,     0,
-    21,     0,    64,     0,    65,     0,    35,     0,    34,     0,
-    49,     0,    98,    78,    12,    94,    14,    91,     0,    98,
-    63,   104,    12,    94,    14,    91,     0,   102,     0,   102,
-    31,   106,     0,     0,     5,    12,   106,    14,     0,   107,
-     0,   107,    31,   108,     0,   105,   111,     0,    21,   105,
-    49,    51,   111,     0,    21,   105,   111,     0,    78,    12,
-    94,    14,   111,     0,    78,    12,    94,    14,    15,   108,
-   111,     0,   103,    33,    78,    12,    14,   111,     0,    47,
-   105,   111,     0,    11,     0,    16,     0,   110,   112,    13,
-     0,   110,   112,    13,    16,     0,   113,   112,     0,     0,
-    16,     0,    31,   116,     0,     0,     5,     0,     5,    49,
-   102,     0,    93,     5,     0,   115,   114,     0,    98,   116,
-    16,     0,    98,    78,    15,     6,    16,     0,    47,    98,
-     5,   101,    16,     0,    48,    98,     5,   101,    16,     0,
-    98,     5,    53,    89,    54,    16,     0
+    84,    16,     0,     9,     5,    78,    82,    68,    84,    16,
+     0,     9,    78,    16,     0,    10,    78,    16,     0,    10,
+    78,    82,    84,    16,     0,     0,    41,     5,    11,    70,
+    66,    13,    83,     0,    42,    41,     5,    16,     0,    42,
+     5,    50,     5,    16,     0,    37,    16,     0,    28,    98,
+    78,    16,     0,    28,    10,    11,    71,    13,    78,    16,
+     0,    28,    10,    78,    11,    71,    13,    78,    16,     0,
+    23,   109,     0,   109,     0,   117,     0,    85,     0,   117,
+    71,     0,     0,    45,     0,    46,     0,    20,     0,    18,
+     0,    17,     0,    26,     0,    27,     0,     0,    73,    74,
+    15,     0,    74,    15,     0,    57,    15,     0,    58,    15,
+     0,     5,     0,     5,    50,    78,     0,    78,     0,    78,
+    34,    99,    35,     0,   103,    17,    79,     0,    79,     0,
+    80,    11,     0,    80,    31,    81,     0,    15,    81,     0,
+    11,     0,     0,    16,     0,    13,     0,    90,    84,     0,
+   109,    84,     0,    77,    84,     0,    85,    84,     0,    76,
+    84,     0,    75,    84,     0,   117,    84,     0,    24,     9,
+    78,    16,    84,     0,    24,    78,    16,    84,     0,    24,
+   105,    16,    84,     0,     9,    78,    16,    84,     0,     9,
+    78,    82,    84,    16,    84,     0,    10,    78,    16,    84,
+     0,    10,    78,    82,    84,    16,    84,     0,    42,     5,
+    50,     5,    16,    84,     0,    40,     5,    11,    86,    13,
+     5,    16,     0,    40,     5,    11,    86,    13,    16,     0,
+    40,    11,    86,    13,     5,    16,     0,    40,    11,    86,
+    13,    16,     0,    87,    31,    86,     0,    87,     0,     5,
+    49,    89,     0,     5,     0,     3,     0,     6,     0,    30,
+     6,     0,    51,     0,    78,     0,    88,     0,    88,    29,
+    88,     0,    88,    65,    88,     0,    28,    78,    34,    99,
+    35,    78,    16,     0,    28,    78,    34,    99,    35,    50,
+     5,    78,    16,     0,     0,    22,     0,    59,     0,    59,
+    52,     0,    60,     0,    60,    52,     0,    59,    62,     0,
+    59,    62,    52,     0,    59,    61,     0,    59,    61,    52,
+     0,    60,    62,     0,    60,    62,    52,     0,    60,    61,
+     0,    60,    61,    52,     0,    52,     0,    61,     0,    61,
+    52,     0,    62,     0,    62,    52,     0,    55,     0,    59,
+    55,     0,    60,    55,     0,    32,    93,     0,    32,     0,
+     0,   100,     0,    94,    31,   100,     0,    92,     0,    78,
+     0,    10,    78,     0,     9,    78,     0,    78,    34,    96,
+    35,     0,    78,    34,    96,    35,    50,    78,     0,    97,
+    31,    96,     0,    97,     0,    95,    93,     0,    95,     0,
+    22,    95,    93,     0,    22,    95,    36,     0,    22,    95,
+     0,    95,    36,     0,    95,     0,    95,    93,     0,    98,
+    31,    99,     0,    98,     0,    98,    78,   101,     0,    98,
+   101,     0,    44,     0,     0,    49,   102,     0,    49,    12,
+    98,    14,   102,     0,     7,     0,    89,     0,     4,     0,
+    72,     0,    78,    12,    94,    14,     0,     0,    21,     0,
+    64,     0,    65,     0,    35,     0,    34,     0,    49,     0,
+    98,    78,    12,    94,    14,    91,     0,    98,    63,   104,
+    12,    94,    14,    91,     0,   102,     0,   102,    31,   106,
+     0,     0,     5,    12,   106,    14,     0,   107,     0,   107,
+    31,   108,     0,   105,   111,     0,    21,   105,    49,    51,
+   111,     0,    21,   105,   111,     0,    78,    12,    94,    14,
+   111,     0,    78,    12,    94,    14,    15,   108,   111,     0,
+   103,    33,    78,    12,    14,   111,     0,    47,   105,   111,
+     0,    11,     0,    16,     0,   110,   112,    13,     0,   110,
+   112,    13,    16,     0,   113,   112,     0,     0,    16,     0,
+    31,   116,     0,     0,     5,     0,     5,    49,   102,     0,
+    93,     5,     0,   115,   114,     0,    98,   116,    16,     0,
+    98,    78,    15,     6,    16,     0,    47,    98,     5,   101,
+    16,     0,    48,    98,     5,   101,    16,     0,    98,     5,
+    53,    89,    54,    16,     0
 };
 
 #endif
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   163,   166,   170,   174,   177,   183,   184,   188,   197,   200,
-   203,   206,   210,   218,   221,   224,   227,   230,   233,   236,
-   239,   242,   245,   251,   252,   255,   255,   257,   257,   257,
-   259,   259,   259,   262,   267,   275,   283,   295,   298,   306,
-   312,   321,   325,   332,   336,   344,   348,   355,   358,   362,
-   366,   370,   374,   378,   382,   386,   390,   394,   398,   402,
-   406,   410,   414,   418,   422,   429,   430,   431,   432,   436,
-   437,   441,   442,   446,   447,   448,   449,   450,   454,   455,
-   456,   460,   470,   478,   482,   489,   490,   491,   492,   493,
-   494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-   504,   505,   506,   507,   508,   512,   513,   517,   521,   522,
-   530,   531,   532,   533,   534,   540,   551,   555,   563,   568,
-   577,   582,   589,   594,   599,   604,   612,   616,   623,   632,
-   640,   649,   652,   655,   662,   665,   668,   671,   674,   680,
-   681,   685,   685,   685,   685,   685,   689,   711,   722,   723,
-   724,   729,   734,   735,   739,   743,   747,   751,   757,   763,
-   769,   782,   789,   790,   791,   795,   796,   800,   804,   805,
-   808,   809,   810,   813,   817,   818,   819,   820,   821
+   163,   166,   170,   174,   177,   183,   184,   188,   197,   206,
+   209,   212,   215,   219,   227,   230,   233,   236,   239,   242,
+   245,   248,   251,   254,   260,   261,   264,   264,   266,   266,
+   266,   268,   268,   268,   271,   276,   284,   292,   304,   307,
+   315,   321,   330,   334,   341,   345,   353,   357,   364,   367,
+   371,   375,   379,   383,   387,   391,   395,   399,   403,   407,
+   411,   415,   419,   423,   427,   431,   438,   439,   440,   441,
+   445,   446,   450,   451,   455,   456,   457,   458,   459,   463,
+   464,   465,   469,   479,   487,   491,   498,   499,   500,   501,
+   502,   503,   504,   505,   506,   507,   508,   509,   510,   511,
+   512,   513,   514,   515,   516,   517,   521,   522,   526,   530,
+   531,   539,   540,   541,   542,   543,   549,   560,   564,   572,
+   577,   586,   591,   598,   603,   608,   613,   621,   625,   632,
+   641,   649,   658,   661,   664,   671,   674,   677,   680,   683,
+   689,   690,   694,   694,   694,   694,   694,   698,   720,   731,
+   732,   733,   738,   743,   744,   748,   752,   756,   760,   766,
+   772,   778,   791,   798,   799,   800,   804,   805,   809,   813,
+   814,   817,   818,   819,   822,   826,   827,   828,   829,   830
 };
 #endif
 
@@ -335,253 +336,263 @@ static const char * const yytname[] = { 
 
 static const short yyr1[] = {     0,
     66,    66,    67,    67,    67,    68,    68,    69,    69,    69,
-    69,    70,    69,    69,    69,    69,    69,    69,    69,    69,
-    69,    69,    69,    71,    71,    72,    72,    73,    73,    73,
-    74,    74,    74,    75,    75,    76,    77,    78,    78,    79,
-    79,    80,    80,    81,    81,    82,    82,    83,    83,    84,
+    69,    69,    70,    69,    69,    69,    69,    69,    69,    69,
+    69,    69,    69,    69,    71,    71,    72,    72,    73,    73,
+    73,    74,    74,    74,    75,    75,    76,    77,    78,    78,
+    79,    79,    80,    80,    81,    81,    82,    82,    83,    83,
     84,    84,    84,    84,    84,    84,    84,    84,    84,    84,
-    84,    84,    84,    84,    84,    85,    85,    85,    85,    86,
-    86,    87,    87,    88,    88,    88,    88,    88,    89,    89,
-    89,    90,    90,    91,    91,    92,    92,    92,    92,    92,
+    84,    84,    84,    84,    84,    84,    85,    85,    85,    85,
+    86,    86,    87,    87,    88,    88,    88,    88,    88,    89,
+    89,    89,    90,    90,    91,    91,    92,    92,    92,    92,
     92,    92,    92,    92,    92,    92,    92,    92,    92,    92,
-    92,    92,    92,    92,    92,    93,    93,    94,    94,    94,
-    95,    95,    95,    95,    95,    95,    96,    96,    97,    97,
-    98,    98,    98,    98,    98,    98,    99,    99,   100,   100,
-   100,   101,   101,   101,   102,   102,   102,   102,   102,   103,
-   103,   104,   104,   104,   104,   104,   105,   105,   106,   106,
-   106,   107,   108,   108,   109,   109,   109,   109,   109,   109,
-   109,   110,   111,   111,   111,   112,   112,   113,   114,   114,
-   115,   115,   115,   116,   117,   117,   117,   117,   117
+    92,    92,    92,    92,    92,    92,    93,    93,    94,    94,
+    94,    95,    95,    95,    95,    95,    95,    96,    96,    97,
+    97,    98,    98,    98,    98,    98,    98,    99,    99,   100,
+   100,   100,   101,   101,   101,   102,   102,   102,   102,   102,
+   103,   103,   104,   104,   104,   104,   104,   105,   105,   106,
+   106,   106,   107,   108,   108,   109,   109,   109,   109,   109,
+   109,   109,   110,   111,   111,   111,   112,   112,   113,   114,
+   114,   115,   115,   115,   116,   117,   117,   117,   117,   117
 };
 
 static const short yyr2[] = {     0,
-     3,     0,     2,     4,     0,     1,     0,     6,     3,     3,
-     5,     0,     7,     4,     5,     2,     4,     7,     8,     2,
-     1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
-     1,     1,     0,     3,     2,     2,     2,     1,     3,     1,
-     4,     3,     1,     2,     3,     2,     1,     0,     1,     1,
-     2,     2,     2,     2,     2,     2,     2,     5,     4,     4,
-     4,     6,     4,     6,     6,     7,     6,     6,     5,     3,
-     1,     3,     1,     1,     1,     2,     1,     1,     1,     3,
-     3,     7,     9,     0,     1,     1,     2,     1,     2,     2,
-     3,     2,     3,     2,     3,     2,     3,     1,     1,     2,
-     1,     2,     1,     2,     2,     2,     1,     0,     1,     3,
-     1,     1,     2,     2,     4,     6,     3,     1,     2,     1,
-     3,     3,     2,     2,     1,     2,     3,     1,     3,     2,
-     1,     0,     2,     5,     1,     1,     1,     1,     4,     0,
-     1,     1,     1,     1,     1,     1,     6,     7,     1,     3,
-     0,     4,     1,     3,     2,     5,     3,     5,     7,     6,
-     3,     1,     1,     3,     4,     2,     0,     1,     2,     0,
-     1,     3,     2,     2,     3,     5,     5,     5,     6
+     3,     0,     2,     4,     0,     1,     0,     6,     7,     3,
+     3,     5,     0,     7,     4,     5,     2,     4,     7,     8,
+     2,     1,     1,     1,     2,     0,     1,     1,     1,     1,
+     1,     1,     1,     0,     3,     2,     2,     2,     1,     3,
+     1,     4,     3,     1,     2,     3,     2,     1,     0,     1,
+     1,     2,     2,     2,     2,     2,     2,     2,     5,     4,
+     4,     4,     6,     4,     6,     6,     7,     6,     6,     5,
+     3,     1,     3,     1,     1,     1,     2,     1,     1,     1,
+     3,     3,     7,     9,     0,     1,     1,     2,     1,     2,
+     2,     3,     2,     3,     2,     3,     2,     3,     1,     1,
+     2,     1,     2,     1,     2,     2,     2,     1,     0,     1,
+     3,     1,     1,     2,     2,     4,     6,     3,     1,     2,
+     1,     3,     3,     2,     2,     1,     2,     3,     1,     3,
+     2,     1,     0,     2,     5,     1,     1,     1,     1,     4,
+     0,     1,     1,     1,     1,     1,     1,     6,     7,     1,
+     3,     0,     4,     1,     3,     2,     5,     3,     5,     7,
+     6,     3,     1,     1,     3,     4,     2,     0,     1,     2,
+     0,     1,     3,     2,     2,     3,     5,     5,     5,     6
 };
 
 static const short yydefact[] = {     5,
-     5,     0,   140,     3,     5,    38,     0,     0,   141,     0,
-   140,     0,     0,     0,     0,     0,     0,     0,    98,   103,
-    86,    88,    99,   101,     5,   112,    23,   111,   125,     0,
-     0,     0,    21,    22,     0,     0,   114,   113,     0,     0,
-   112,     0,     0,   123,     0,    20,     0,     0,    16,     0,
-     0,     0,     0,     0,     0,     0,     0,    87,   104,    92,
-    90,    89,   105,    96,    94,   100,   102,     1,   108,     0,
-   107,   124,   126,    38,     0,     0,     0,   170,     0,     0,
-   162,   163,   167,   155,     4,    39,    47,   140,     9,     7,
-    10,    33,   114,   113,     0,     0,   157,   122,   121,    25,
-   113,     0,     0,    73,     0,    71,    12,     0,     0,    38,
-   161,   132,    93,    91,    97,    95,   131,     0,   132,   109,
-   120,     0,   118,   106,     0,     0,   145,   144,   146,   142,
-   143,     0,   108,     0,   173,     0,   174,   175,     0,   168,
-     0,   167,   141,    40,    43,     0,    46,     0,     6,    33,
-     0,     0,    50,    30,    29,    28,     0,    31,    32,     0,
-     0,     0,     0,    33,     0,    33,    33,    33,     0,    33,
-    33,    33,    33,     0,     0,     0,     0,    25,    25,    17,
-     0,     0,     0,     0,     5,     0,    14,     0,     0,     0,
-     0,     0,   132,   130,   119,   115,     0,    74,   137,    75,
-   135,     0,    26,    27,    77,   138,    78,    79,   136,   172,
-    78,     0,   108,     0,     0,   171,   169,     0,   164,   166,
-     0,    44,   140,     0,     0,   114,   113,     0,   112,     0,
-     0,     0,    36,    37,     0,    35,    56,    55,    53,    11,
-    54,    51,    52,    57,   156,     0,     0,     0,    24,     0,
-     0,    72,     0,    69,    70,     0,    15,     0,   133,   177,
-   178,     0,   158,   110,   129,     0,   117,    76,   108,     0,
-     0,     0,     0,    84,   176,     0,   165,   128,     0,    45,
-    42,     8,    33,    33,    33,    33,   114,    33,    33,     0,
-     0,    34,   132,     0,     0,     0,    67,    68,    48,     0,
-     0,   153,     0,   116,     0,    80,    81,   179,    84,    85,
-   147,   160,     0,    41,    61,     0,    63,     0,    33,    59,
-    60,     0,     0,    18,     0,    66,    49,    13,     0,   151,
-     0,   159,   139,   148,   127,    33,    33,    58,     0,    33,
-    19,   134,   149,     0,   154,    62,    64,     0,     0,    65,
-   151,   152,     0,    82,   150,     0,    83,     0,     0,     0
+     5,     0,   141,     3,     5,    39,     0,     0,   142,     0,
+   141,     0,     0,     0,     0,     0,     0,     0,    99,   104,
+    87,    89,   100,   102,     5,   113,    24,   112,   126,     0,
+     0,     0,    22,    23,     0,     0,    39,   115,   114,     0,
+     0,   113,     0,     0,   124,     0,    21,     0,     0,    17,
+     0,     0,     0,     0,     0,     0,     0,     0,    88,   105,
+    93,    91,    90,   106,    97,    95,   101,   103,     1,   109,
+     0,   108,   125,   127,    39,     0,     0,     0,   171,     0,
+     0,   163,   164,   168,   156,     4,    40,     0,    48,   141,
+    10,     7,    11,    34,   115,   114,     0,     0,   158,   123,
+   122,    26,   114,     0,     0,    74,     0,    72,    13,     0,
+     0,    39,   162,   133,    94,    92,    98,    96,   132,     0,
+   133,   110,   121,     0,   119,   107,     0,     0,   146,   145,
+   147,   143,   144,     0,   109,     0,   174,     0,   175,   176,
+     0,   169,     0,   168,     7,   142,    41,    44,     0,    47,
+     0,     6,    34,     0,     0,    51,    31,    30,    29,     0,
+    32,    33,     0,     0,     0,     0,    34,     0,    34,    34,
+    34,     0,    34,    34,    34,    34,     0,     0,     0,     0,
+    26,    26,    18,     0,     0,     0,     0,     5,     0,    15,
+     0,     0,     0,     0,     0,   133,   131,   120,   116,     0,
+    75,   138,    76,   136,     0,    27,    28,    78,   139,    79,
+    80,   137,   173,    79,     0,   109,     0,     0,   172,   170,
+     0,   165,   167,    34,     0,    45,   141,     0,     0,   115,
+   114,     0,   113,     0,     0,     0,    37,    38,     0,    36,
+    57,    56,    54,    12,    55,    52,    53,    58,   157,     0,
+     0,     0,    25,     0,     0,    73,     0,    70,    71,     0,
+    16,     0,   134,   178,   179,     0,   159,   111,   130,     0,
+   118,    77,   109,     0,     0,     0,     0,    85,   177,     0,
+   166,     0,   129,     0,    46,    43,     8,    34,    34,    34,
+    34,   115,    34,    34,     0,     0,    35,   133,     0,     0,
+     0,    68,    69,    49,     0,     0,   154,     0,   117,     0,
+    81,    82,   180,    85,    86,   148,   161,     9,     0,    42,
+    62,     0,    64,     0,    34,    60,    61,     0,     0,    19,
+     0,    67,    50,    14,     0,   152,     0,   160,   140,   149,
+   128,    34,    34,    59,     0,    34,    20,   135,   150,     0,
+   155,    63,    65,     0,     0,    66,   152,   153,     0,    83,
+   151,     0,    84,     0,     0,     0
 };
 
 static const short yydefgoto[] = {    35,
-     3,   150,    25,   185,   176,   206,   164,   165,   166,   167,
-   168,    26,   145,   146,   147,    90,   328,   169,   170,   105,
-   106,   208,   209,   171,   311,    28,    77,   118,    29,   122,
-   123,    30,   279,   120,   189,   343,    31,   132,    32,   344,
-   302,   303,   172,    83,    84,   141,   142,   137,    78,    79,
-   173
+     3,   153,    25,   188,   179,   209,   167,   168,   169,   170,
+   171,    26,   148,   149,   150,    92,   334,   172,   173,   107,
+   108,   211,   212,   174,   316,    28,    78,   120,    29,   124,
+   125,    30,   284,   122,   192,   349,    31,   134,    32,   350,
+   307,   308,   175,    84,    85,   143,   144,   139,    79,    80,
+   176
 };
 
-static const short yypact[] = {    53,
-    52,    46,   376,-32768,    18,    88,   171,   171,   239,    97,
-    49,   309,   173,   213,   192,    23,   239,   239,-32768,-32768,
-   235,   265,    16,   168,   127,    43,-32768,-32768,   100,    15,
-   199,   222,-32768,-32768,   221,   171,   230,   254,   171,   171,
-   209,    17,   117,   107,   239,-32768,   226,   171,-32768,   243,
-   245,   249,   224,   271,    22,   222,   284,-32768,-32768,   241,
-   250,-32768,-32768,   257,   258,-32768,-32768,-32768,   397,    97,
-   263,-32768,-32768,   255,   158,    27,   308,   285,   299,   171,
--32768,-32768,   305,-32768,-32768,-32768,-32768,   108,-32768,   272,
--32768,   332,-32768,-32768,   321,   283,-32768,-32768,-32768,   220,
-   324,   320,   245,   289,   326,   312,-32768,   335,   339,   130,
--32768,   302,-32768,-32768,-32768,-32768,-32768,   184,    20,-32768,
-   263,   313,   331,-32768,   440,   111,-32768,-32768,-32768,-32768,
--32768,   345,   397,   357,-32768,   150,-32768,-32768,   354,-32768,
-   360,   305,-32768,   333,-32768,    63,-32768,   358,-32768,   332,
-   171,   171,-32768,-32768,-32768,-32768,   417,-32768,-32768,   171,
-   371,   362,   363,   147,   367,   332,   332,   332,   372,   332,
-   332,   332,   332,   222,   239,   370,   155,   220,   220,-32768,
-   382,   111,   115,   245,    18,   380,-32768,   118,   384,   385,
-   262,   397,   302,-32768,-32768,   353,    97,-32768,-32768,-32768,
--32768,   399,-32768,-32768,-32768,-32768,   396,     7,-32768,-32768,
--32768,   355,   397,   196,   394,   365,-32768,   398,   395,-32768,
-   239,-32768,   108,   171,   404,   296,   314,   171,    81,   405,
-   381,   375,-32768,-32768,   414,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   425,   171,   418,-32768,   419,
-   172,-32768,   424,-32768,-32768,   421,-32768,   239,-32768,-32768,
--32768,   437,-32768,-32768,-32768,   171,-32768,-32768,   397,   111,
-   111,   432,   197,   428,-32768,   222,-32768,   420,   426,-32768,
--32768,-32768,   332,   332,   332,   332,   438,   332,   332,   239,
-   448,-32768,   302,   439,   171,   444,-32768,-32768,   446,   449,
-   452,   434,   222,-32768,   205,-32768,-32768,-32768,   428,-32768,
--32768,-32768,   239,-32768,-32768,   450,-32768,   451,   332,-32768,
--32768,   433,   455,-32768,   457,-32768,-32768,-32768,   440,   440,
-   437,-32768,-32768,-32768,-32768,   332,   332,-32768,    25,   332,
--32768,-32768,   443,   461,-32768,-32768,-32768,   475,   465,-32768,
-   440,-32768,   171,-32768,-32768,   466,-32768,   483,   484,-32768
+static const short yypact[] = {    97,
+   108,    27,   237,-32768,   114,    67,   131,   146,   388,   167,
+   103,   402,   144,   121,   175,    47,   388,   388,-32768,-32768,
+   239,   252,   130,   135,    91,    89,-32768,-32768,    25,    23,
+    86,   224,-32768,-32768,   188,   146,    40,   221,   223,   146,
+   146,   180,    22,    49,   218,   388,-32768,   212,   146,-32768,
+   205,   236,   232,   201,   259,    30,   224,   264,-32768,-32768,
+   220,   228,-32768,-32768,   231,   238,-32768,-32768,-32768,   373,
+   167,   263,-32768,-32768,    84,   105,   241,   300,   284,   303,
+   146,-32768,-32768,   304,-32768,-32768,-32768,   291,-32768,   136,
+-32768,   265,-32768,   313,-32768,-32768,   312,   274,-32768,-32768,
+-32768,   354,   321,   320,   236,   293,   330,   314,-32768,   339,
+   331,    57,-32768,   299,-32768,-32768,-32768,-32768,-32768,   152,
+    35,-32768,   263,   316,   318,-32768,   487,    41,-32768,-32768,
+-32768,-32768,-32768,   342,   373,   350,-32768,   106,-32768,-32768,
+   345,-32768,   349,   304,   265,-32768,   324,-32768,    39,-32768,
+   352,-32768,   313,   146,   146,-32768,-32768,-32768,-32768,   417,
+-32768,-32768,   146,   361,   362,   364,   282,   365,   313,   313,
+   313,   351,   313,   313,   313,   313,   224,   388,   368,   113,
+   354,   354,-32768,   371,    41,    51,   236,   114,   369,-32768,
+   477,   370,   372,   246,   373,   299,-32768,-32768,   337,   167,
+-32768,-32768,-32768,-32768,   383,-32768,-32768,-32768,-32768,   378,
+    37,-32768,-32768,-32768,   338,   373,   171,   375,   347,-32768,
+   380,   384,-32768,   313,   388,-32768,   136,   146,   387,   260,
+   271,   146,   145,   389,   374,   379,-32768,-32768,   403,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   394,
+   146,   404,-32768,   391,   176,-32768,   405,-32768,-32768,   407,
+-32768,   388,-32768,-32768,-32768,   418,-32768,-32768,-32768,   146,
+-32768,-32768,   373,    41,    41,   414,   177,   409,-32768,   224,
+-32768,   420,   406,   410,-32768,-32768,-32768,   313,   313,   313,
+   313,   422,   313,   313,   388,   436,-32768,   299,   426,   146,
+   428,-32768,-32768,   430,   437,   440,   424,   224,-32768,   199,
+-32768,-32768,-32768,   409,-32768,-32768,-32768,-32768,   388,-32768,
+-32768,   442,-32768,   443,   313,-32768,-32768,   421,   444,-32768,
+   449,-32768,-32768,-32768,   487,   487,   418,-32768,-32768,-32768,
+-32768,   313,   313,-32768,    46,   313,-32768,-32768,   435,   439,
+-32768,-32768,-32768,   462,   452,-32768,   487,-32768,   146,-32768,
+-32768,   454,-32768,   471,   473,-32768
 };
 
-static const short yypgoto[] = {     9,
-   486,-32768,-32768,-32768,    79,-32768,-32768,   325,-32768,-32768,
--32768,    -7,   264,-32768,   267,   -31,-32768,   -84,   489,   -85,
--32768,    14,   -82,-32768,   185,-32768,    21,  -118,     6,   298,
--32768,    34,  -276,   301,   -95,  -121,   -76,-32768,     4,   145,
--32768,   166,   175,-32768,   -37,   356,-32768,-32768,-32768,   364,
-     5
+static const short yypgoto[] = {    18,
+   474,   329,-32768,-32768,   129,-32768,-32768,   319,-32768,-32768,
+-32768,    -7,   257,-32768,   261,   -26,-32768,   -94,   484,   -84,
+-32768,    42,   -91,-32768,   181,-32768,   -14,  -129,    -2,   296,
+-32768,     8,  -247,   302,  -107,  -123,   -78,-32768,     7,   141,
+-32768,   162,   204,-32768,   -35,   356,-32768,-32768,-32768,   363,
+    29
 };
 
 
-#define	YYLAST		500
+#define	YYLAST		538
 
 
-static const short yytable[] = {    37,
-    38,    41,    41,   210,    41,    97,    92,    34,   358,    41,
-    41,   148,    43,   322,   214,    44,   190,   181,   111,    74,
-    56,     6,    76,   194,     6,     1,   110,    53,    86,     6,
-    -2,    93,    94,    68,    95,   270,   335,    41,   133,   101,
-   102,   134,    42,   212,    42,    48,    71,    95,    56,    73,
-    55,    57,    -2,     6,    69,     2,     5,    39,    40,     1,
-     1,    41,    41,    54,    99,   225,   259,    66,   188,     9,
-    10,   271,   139,   222,   348,   121,    70,    75,    42,    75,
-   144,   237,   238,   239,    75,   241,   242,   243,   244,     2,
-     2,   124,    41,   223,   273,    45,   288,   265,   255,   252,
-    19,     6,   119,    20,   178,    39,    40,    21,    22,    23,
-    24,   193,     6,   198,    70,     6,   200,   207,   211,   253,
-   198,   199,     6,   200,   201,    41,    -2,    81,   143,   258,
-   254,    71,    82,   177,     1,    72,   245,    36,    71,    -2,
-   202,   195,    98,   226,   227,  -132,   148,   202,    19,   229,
-   305,    20,   231,   263,   216,    21,    22,    23,    24,    74,
-   230,   205,   203,   204,     2,    96,   119,    41,   205,   248,
-    41,    41,   158,   159,   211,     6,   296,    33,   188,    36,
-   207,    71,   178,   178,    41,    46,    71,   297,    49,    41,
-    42,   127,   128,   256,   284,   286,    52,   191,   315,   316,
-   317,   318,   121,   320,   321,    41,   129,   342,   246,   274,
-   309,   177,   177,    41,   192,   144,   144,    50,   333,    67,
-   287,   130,   131,    51,     6,   119,   192,   192,    39,    40,
-     6,    80,    81,    85,   338,   192,   100,    82,   312,   294,
-    87,    10,    70,     6,    88,    89,   119,    39,    40,   104,
-    41,   346,   347,   103,   278,   350,   249,   250,   304,   107,
-    10,    41,   211,   211,    87,   332,   175,    18,    88,    91,
-  -171,    19,    81,   108,    20,   109,   262,    82,    21,    22,
-    23,    24,    41,   306,   307,  -171,    58,   325,   112,    59,
-    19,   300,   113,    20,    71,    60,    61,    21,    22,    23,
-    24,   114,   119,   125,    36,    41,    87,   126,   115,   116,
-    88,   283,   135,     6,   138,   136,    62,    39,    47,    63,
-   140,   207,   207,   278,    87,    64,    65,   149,    88,   285,
-    10,   349,   133,   174,   179,   180,     6,   182,   183,   186,
-   151,   152,   184,   207,   153,   356,   278,   196,   154,   155,
-   188,   156,     9,    10,   187,   157,   213,   158,   159,   160,
-    19,   197,   215,    20,  -140,   218,   221,    21,    22,    23,
-    24,    14,   219,   161,   224,   232,   233,   234,    17,    18,
-     6,   236,   247,    19,     7,     8,    20,   240,   162,   163,
-    21,    22,    23,    24,   251,   257,     9,    10,    11,   260,
-   261,     6,   266,    12,   268,    39,    40,   269,   272,   275,
-   277,   276,    13,   125,   290,    14,    15,    16,    10,   282,
-   289,     6,    17,    18,   291,   228,    40,    19,   292,   293,
-    20,   295,   134,   299,    21,    22,    23,    24,    10,   298,
-   117,   301,   198,   199,     6,   200,   201,   308,    19,   310,
-   313,    20,   323,   319,   324,    21,    22,    23,    24,   326,
-   314,   327,   329,   330,   331,   336,   337,   339,    19,   202,
-   340,    20,   341,   351,   352,    21,    22,    23,    24,   353,
-   354,   357,   359,   360,   203,   204,     4,   281,   235,   280,
-   205,    27,   264,   334,   267,   355,   345,   220,     0,   217
+static const short yytable[] = {    38,
+    39,    42,    42,   213,    42,   217,   193,    45,    99,    42,
+    42,   151,    94,   197,    74,    44,    43,   364,    43,    49,
+   184,   113,    77,    57,    56,    58,     6,    75,    87,    88,
+   101,    34,    95,    96,   112,    97,   215,     5,    42,     6,
+   103,   104,    69,   201,     6,     6,   203,   328,    97,   226,
+     6,    54,    57,    43,    72,   257,    72,   126,   229,    82,
+    73,   145,    42,    42,    83,   274,   258,   263,   123,   227,
+   205,   341,  -133,   141,   241,   242,   243,   121,   245,   246,
+   247,   248,   147,   191,    76,    76,   277,    55,   269,    36,
+    -2,   208,    76,   256,    42,   354,    -2,    98,     1,  -172,
+    70,   275,   259,    -2,     1,   191,    36,     6,   198,   180,
+   219,    40,    41,   196,  -172,     1,    36,    75,    81,   210,
+   214,     1,    71,     9,    10,    51,    -2,    42,     2,   282,
+   181,    52,   127,    36,     2,    37,   128,    72,   129,   130,
+     6,   249,   121,   310,    72,     2,   230,   231,   151,    46,
+     6,     2,   233,   131,    19,   235,   146,    20,   267,    50,
+   293,    21,    22,    23,    24,   194,   234,    43,   132,   133,
+    42,     6,   252,    42,    42,    40,    41,   214,    71,    53,
+   301,    67,   195,   210,   278,   250,    68,    42,   180,   180,
+   314,   302,    42,   321,   322,   323,   324,   123,   326,   327,
+    86,   195,   121,   289,   291,   260,    33,   195,    42,   181,
+   181,   348,   339,    71,    47,   105,     6,    42,    19,   147,
+   147,    20,   102,   121,   292,    21,    22,    23,    24,   195,
+   344,    89,   283,    89,    82,    90,    91,    90,    93,    83,
+   106,     6,   109,   299,   317,     7,     8,   352,   353,    72,
+   110,   356,   135,   100,    42,   136,    82,     9,    10,    11,
+   266,    83,   309,   111,    12,    42,   214,   214,   114,   305,
+    89,   115,   338,    13,    90,   288,    14,    15,    16,   116,
+   121,    89,   117,    17,    18,    90,   290,    42,    19,   118,
+    59,    20,   331,    60,    72,    21,    22,    23,    24,    61,
+    62,    89,   283,    63,   137,    90,    64,   161,   162,   253,
+   254,    42,    65,    66,   138,   311,   312,     6,   140,   142,
+   152,   154,   155,   135,   177,   156,   283,   210,   210,   157,
+   158,   182,   159,     9,    10,   183,   160,   355,   161,   162,
+   163,   185,   186,   189,   187,  -141,   190,   191,   200,   210,
+   199,   362,    14,   216,   164,   218,   221,   225,     6,    17,
+    18,   222,    40,    41,    19,   236,   244,    20,   228,   165,
+   166,    21,    22,    23,    24,    10,   237,     6,   238,   240,
+   251,    40,    41,   255,   261,   264,   270,   265,   272,   273,
+   279,   276,     6,   280,    10,   127,    40,    41,   298,   281,
+   178,    18,   287,   300,   294,    19,     6,   295,    20,    10,
+    40,    48,    21,    22,    23,    24,   119,   297,   136,   304,
+   303,     6,   306,    10,    19,   232,    41,    20,   296,   313,
+   315,    21,    22,    23,    24,   318,   319,   325,    10,    19,
+   329,   330,    20,   332,   320,   333,    21,    22,    23,    24,
+   335,   336,   358,    19,   337,   345,    20,   342,   343,   346,
+    21,    22,    23,    24,   347,   357,   359,   360,    19,   363,
+   365,    20,   366,   224,     4,    21,    22,    23,    24,   201,
+   202,     6,   203,   204,   286,   239,    27,   285,   262,   201,
+   202,     6,   203,   204,   340,   271,   268,   361,   351,   223,
+   220,     0,     0,     0,     0,     0,   205,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   205,     0,     0,     0,
+     0,   206,   207,     0,     0,     0,     0,   208,     0,     0,
+     0,   206,   207,     0,     0,     0,     0,   208
 };
 
 static const short yycheck[] = {     7,
-     8,     9,    10,   125,    12,    43,    38,     3,     0,    17,
-    18,    88,     9,   290,   133,    10,   112,   103,    56,     5,
-    17,     5,    30,   119,     5,     8,     5,     5,    36,     5,
-    13,    39,    40,    25,    42,    29,   313,    45,    12,    47,
-    48,    15,     9,   126,    11,    12,    32,    55,    45,    29,
-    17,    18,     0,     5,    12,    38,    11,     9,    10,     8,
-     8,    69,    70,    41,    44,   150,   188,    52,    49,    21,
-    22,    65,    80,    11,    50,    70,    34,    63,    45,    63,
-    88,   166,   167,   168,    63,   170,   171,   172,   173,    38,
-    38,    71,   100,    31,   213,    47,    16,   193,   184,   182,
-    52,     5,    69,    55,   100,     9,    10,    59,    60,    61,
-    62,   119,     5,     3,    34,     5,     6,   125,   126,     5,
-     3,     4,     5,     6,     7,   133,     0,    11,    21,    12,
-    16,    32,    16,   100,     8,    36,   174,    50,    32,    13,
-    30,   121,    36,   151,   152,    16,   223,    30,    52,   157,
-   269,    55,   160,   191,     5,    59,    60,    61,    62,     5,
-   157,    51,    45,    46,    38,    49,   133,   175,    51,   177,
-   178,   179,    26,    27,   182,     5,     5,     3,    49,    50,
-   188,    32,   178,   179,   192,    11,    32,    16,    16,   197,
-   157,    34,    35,   185,   226,   227,     5,    14,   283,   284,
-   285,   286,   197,   288,   289,   213,    49,   329,   175,    14,
-    14,   178,   179,   221,    31,   223,   224,     5,    14,    52,
-   228,    64,    65,    11,     5,   192,    31,    31,     9,    10,
-     5,    33,    11,    13,   319,    31,    11,    16,   276,   247,
-    11,    22,    34,     5,    15,    16,   213,     9,    10,     5,
-   258,   336,   337,    11,   221,   340,   178,   179,   266,    11,
-    22,   269,   270,   271,    11,   303,    47,    48,    15,    16,
-    16,    52,    11,    50,    55,     5,    15,    16,    59,    60,
-    61,    62,   290,   270,   271,    31,    52,   295,     5,    55,
-    52,   258,    52,    55,    32,    61,    62,    59,    60,    61,
-    62,    52,   269,    49,    50,   313,    11,    53,    52,    52,
-    15,    16,     5,     5,    16,    31,    52,     9,    10,    55,
-    16,   329,   330,   290,    11,    61,    62,    56,    15,    16,
-    22,   339,    12,    51,    11,    16,     5,    49,    13,     5,
-     9,    10,    31,   351,    13,   353,   313,    35,    17,    18,
-    49,    20,    21,    22,    16,    24,    12,    26,    27,    28,
-    52,    31,     6,    55,    33,    12,    34,    59,    60,    61,
-    62,    40,    13,    42,    17,     5,    15,    15,    47,    48,
-     5,    15,    13,    52,     9,    10,    55,    16,    57,    58,
-    59,    60,    61,    62,    13,    16,    21,    22,    23,    16,
-    16,     5,    50,    28,     6,     9,    10,    12,    54,    16,
-    16,    14,    37,    49,    34,    40,    41,    42,    22,    16,
-    16,     5,    47,    48,    50,     9,    10,    52,    15,     5,
-    55,    13,    15,    13,    59,    60,    61,    62,    22,    16,
-    44,     5,     3,     4,     5,     6,     7,    16,    52,    22,
-    31,    55,     5,    16,    16,    59,    60,    61,    62,    16,
-    35,    16,    14,    12,    31,    16,    16,    35,    52,    30,
-    16,    55,    16,    31,    14,    59,    60,    61,    62,     5,
-    16,    16,     0,     0,    45,    46,     1,   224,   164,   223,
-    51,     3,   192,   309,   197,   351,   331,   142,    -1,   136
+     8,     9,    10,   127,    12,   135,   114,    10,    44,    17,
+    18,    90,    39,   121,    29,     9,     9,     0,    11,    12,
+   105,    57,    30,    17,    17,    18,     5,     5,    36,    37,
+    45,     3,    40,    41,     5,    43,   128,    11,    46,     5,
+    48,    49,    25,     3,     5,     5,     6,   295,    56,    11,
+     5,     5,    46,    46,    32,     5,    32,    72,   153,    11,
+    36,    88,    70,    71,    16,    29,    16,   191,    71,    31,
+    30,   319,    16,    81,   169,   170,   171,    70,   173,   174,
+   175,   176,    90,    49,    63,    63,   216,    41,   196,    50,
+     0,    51,    63,   185,   102,    50,     0,    49,     8,    16,
+    12,    65,   187,    13,     8,    49,    50,     5,   123,   102,
+     5,     9,    10,   121,    31,     8,    50,     5,    33,   127,
+   128,     8,    34,    21,    22,     5,    13,   135,    38,   224,
+   102,    11,    49,    50,    38,     5,    53,    32,    34,    35,
+     5,   177,   135,   273,    32,    38,   154,   155,   227,    47,
+     5,    38,   160,    49,    52,   163,    21,    55,   194,    16,
+    16,    59,    60,    61,    62,    14,   160,   160,    64,    65,
+   178,     5,   180,   181,   182,     9,    10,   185,    34,     5,
+     5,    52,    31,   191,    14,   178,    52,   195,   181,   182,
+    14,    16,   200,   288,   289,   290,   291,   200,   293,   294,
+    13,    31,   195,   230,   231,   188,     3,    31,   216,   181,
+   182,   335,    14,    34,    11,    11,     5,   225,    52,   227,
+   228,    55,    11,   216,   232,    59,    60,    61,    62,    31,
+   325,    11,   225,    11,    11,    15,    16,    15,    16,    16,
+     5,     5,    11,   251,   280,     9,    10,   342,   343,    32,
+    50,   346,    12,    36,   262,    15,    11,    21,    22,    23,
+    15,    16,   270,     5,    28,   273,   274,   275,     5,   262,
+    11,    52,   308,    37,    15,    16,    40,    41,    42,    52,
+   273,    11,    52,    47,    48,    15,    16,   295,    52,    52,
+    52,    55,   300,    55,    32,    59,    60,    61,    62,    61,
+    62,    11,   295,    52,     5,    15,    55,    26,    27,   181,
+   182,   319,    61,    62,    31,   274,   275,     5,    16,    16,
+    56,     9,    10,    12,    51,    13,   319,   335,   336,    17,
+    18,    11,    20,    21,    22,    16,    24,   345,    26,    27,
+    28,    49,    13,     5,    31,    33,    16,    49,    31,   357,
+    35,   359,    40,    12,    42,     6,    12,    34,     5,    47,
+    48,    13,     9,    10,    52,     5,    16,    55,    17,    57,
+    58,    59,    60,    61,    62,    22,    15,     5,    15,    15,
+    13,     9,    10,    13,    16,    16,    50,    16,     6,    12,
+    16,    54,     5,    14,    22,    49,     9,    10,     5,    16,
+    47,    48,    16,    13,    16,    52,     5,    34,    55,    22,
+     9,    10,    59,    60,    61,    62,    44,    15,    15,    13,
+    16,     5,     5,    22,    52,     9,    10,    55,    50,    16,
+    22,    59,    60,    61,    62,    16,    31,    16,    22,    52,
+     5,    16,    55,    16,    35,    16,    59,    60,    61,    62,
+    14,    12,    14,    52,    31,    35,    55,    16,    16,    16,
+    59,    60,    61,    62,    16,    31,     5,    16,    52,    16,
+     0,    55,     0,   145,     1,    59,    60,    61,    62,     3,
+     4,     5,     6,     7,   228,   167,     3,   227,    12,     3,
+     4,     5,     6,     7,   314,   200,   195,   357,   337,   144,
+   138,    -1,    -1,    -1,    -1,    -1,    30,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,    -1,    -1,
+    -1,    45,    46,    -1,    -1,    -1,    -1,    51,    -1,    -1,
+    -1,    45,    46,    -1,    -1,    -1,    -1,    51
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/lib/bison.simple"
+#line 3 "/usr/share/bison.simple"
 /* This file comes from bison-1.28.  */
 
 /* Skeleton output parser for bison,
@@ -612,6 +623,11 @@ static const short yycheck[] = {     7,
   It was written by Richard Stallman by simplifying the hairy parser
   used when %semantic_parser is specified.  */
 
+#ifndef YYPARSE_RETURN_TYPE
+#define YYPARSE_RETURN_TYPE int
+#endif
+
+
 #ifndef YYSTACK_USE_ALLOCA
 #ifdef alloca
 #define YYSTACK_USE_ALLOCA
@@ -795,7 +811,7 @@ __yy_memcpy (char *to, char *from, unsig
 #endif
 #endif
 
-#line 217 "/usr/lib/bison.simple"
+#line 222 "/usr/share/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -819,13 +835,15 @@ __yy_memcpy (char *to, char *from, unsig
 /* Prevent warning if -Wstrict-prototypes.  */
 #ifdef __GNUC__
 #ifdef YYPARSE_PARAM
-int yyparse (void *);
+YYPARSE_RETURN_TYPE
+yyparse (void *);
 #else
-int yyparse (void);
+YYPARSE_RETURN_TYPE
+yyparse (void);
 #endif
 #endif
 
-int
+YYPARSE_RETURN_TYPE
 yyparse(YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
@@ -853,7 +871,9 @@ yyparse(YYPARSE_PARAM_ARG)
 #endif
 
   int yystacksize = YYINITDEPTH;
+#ifndef YYSTACK_USE_ALLOCA
   int yyfree_stacks = 0;
+#endif
 
 #ifdef YYPURE
   int yychar;
@@ -938,6 +958,7 @@ yynewstate:
       if (yystacksize >= YYMAXDEPTH)
 	{
 	  yyerror("parser stack overflow");
+#ifndef YYSTACK_USE_ALLOCA
 	  if (yyfree_stacks)
 	    {
 	      free (yyss);
@@ -946,6 +967,7 @@ yynewstate:
 	      free (yyls);
 #endif
 	    }
+#endif	    
 	  return 2;
 	}
       yystacksize *= 2;
@@ -1166,26 +1188,37 @@ case 8:
 case 9:
 #line 198 "yacc.yy"
 {
+	 	if (yyvsp[-2]._int)
+			  printf("<CLASS>\n    <NAME>%s</NAME>\n    \
<LINK_SCOPE>%s</LINK_SCOPE>\n%s%s</CLASS>\n", ( in_namespace + *yyvsp[-4]._str \
).latin1(),yyvsp[-5]._str->latin1(),  yyvsp[-3]._str->latin1(), \
yyvsp[-1]._str->latin1() ); +		// default C++ visibility specifier is 'private'
+		dcop_area = 0;
+		dcop_signal_area = 0;
+
 	  ;
     break;}
 case 10:
-#line 201 "yacc.yy"
+#line 207 "yacc.yy"
 {
 	  ;
     break;}
 case 11:
-#line 204 "yacc.yy"
+#line 210 "yacc.yy"
 {
 	  ;
     break;}
 case 12:
-#line 207 "yacc.yy"
+#line 213 "yacc.yy"
+{
+	  ;
+    break;}
+case 13:
+#line 216 "yacc.yy"
 {
                       in_namespace += *yyvsp[-1]._str; in_namespace += "::";
                   ;
     break;}
-case 13:
-#line 211 "yacc.yy"
+case 14:
+#line 220 "yacc.yy"
 {
                       int pos = in_namespace.findRev( "::", -3 );
                       if( pos >= 0 )
@@ -1194,79 +1227,79 @@ case 13:
                           in_namespace = "";
                   ;
     break;}
-case 14:
-#line 219 "yacc.yy"
-{
-          ;
-    break;}
 case 15:
-#line 222 "yacc.yy"
+#line 228 "yacc.yy"
 {
           ;
     break;}
 case 16:
-#line 225 "yacc.yy"
+#line 231 "yacc.yy"
 {
-	  ;
+          ;
     break;}
 case 17:
-#line 228 "yacc.yy"
+#line 234 "yacc.yy"
 {
 	  ;
     break;}
 case 18:
-#line 231 "yacc.yy"
+#line 237 "yacc.yy"
 {
 	  ;
     break;}
 case 19:
-#line 234 "yacc.yy"
+#line 240 "yacc.yy"
 {
 	  ;
     break;}
 case 20:
-#line 237 "yacc.yy"
+#line 243 "yacc.yy"
 {
 	  ;
     break;}
 case 21:
-#line 240 "yacc.yy"
+#line 246 "yacc.yy"
 {
 	  ;
     break;}
 case 22:
-#line 243 "yacc.yy"
+#line 249 "yacc.yy"
 {
 	  ;
     break;}
 case 23:
-#line 246 "yacc.yy"
+#line 252 "yacc.yy"
 {
 	  ;
     break;}
-case 34:
-#line 263 "yacc.yy"
+case 24:
+#line 255 "yacc.yy"
+{
+	  ;
+    break;}
+case 35:
+#line 272 "yacc.yy"
 {
 	  dcop_area = 0;
 	  dcop_signal_area = 0;
 	;
     break;}
-case 35:
-#line 268 "yacc.yy"
+case 36:
+#line 277 "yacc.yy"
 {
 	  dcop_area = 0;
 	  dcop_signal_area = 0;
 	;
     break;}
-case 36:
-#line 276 "yacc.yy"
+case 37:
+#line 285 "yacc.yy"
 {
 	  dcop_area = 1;
 	  dcop_signal_area = 0;
 	;
     break;}
-case 37:
-#line 284 "yacc.yy"
+case 38:
+#line 293 "yacc.yy"
 {
 	  /*
 	  A dcop signals area needs all dcop area capabilities,
@@ -1276,216 +1309,216 @@ case 37:
 	  dcop_signal_area = 1;
 	;
     break;}
-case 38:
-#line 295 "yacc.yy"
+case 39:
+#line 304 "yacc.yy"
 {
 	  yyval._str = yyvsp[0]._str;
 	;
     break;}
-case 39:
-#line 298 "yacc.yy"
+case 40:
+#line 307 "yacc.yy"
 {
 	   QString* tmp = new QString( "%1::%2" );
            *tmp = tmp->arg(*(yyvsp[-2]._str)).arg(*(yyvsp[0]._str));
            yyval._str = tmp;
 	;
     break;}
-case 40:
-#line 307 "yacc.yy"
+case 41:
+#line 316 "yacc.yy"
 {
 		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *(yyvsp[0]._str) );
 		yyval._str = tmp;
 	  ;
     break;}
-case 41:
-#line 313 "yacc.yy"
+case 42:
+#line 322 "yacc.yy"
 {
 		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *(yyvsp[-3]._str) + "&lt" + *(yyvsp[-1]._str) + "&gt;" );
 		yyval._str = tmp;
 	  ;
     break;}
-case 42:
-#line 322 "yacc.yy"
+case 43:
+#line 331 "yacc.yy"
 {
 		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
-case 43:
-#line 326 "yacc.yy"
+case 44:
+#line 335 "yacc.yy"
 {
 		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
-case 44:
-#line 333 "yacc.yy"
+case 45:
+#line 342 "yacc.yy"
 {
 		yyval._str = yyvsp[-1]._str;
 	  ;
     break;}
-case 45:
-#line 337 "yacc.yy"
+case 46:
+#line 346 "yacc.yy"
 {
 		/* $$ = $1; */
 		yyval._str = new QString( *(yyvsp[-2]._str) + *(yyvsp[0]._str) );
 	  ;
     break;}
-case 46:
-#line 345 "yacc.yy"
+case 47:
+#line 354 "yacc.yy"
 {
 		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
-case 47:
-#line 349 "yacc.yy"
+case 48:
+#line 358 "yacc.yy"
 {
 		yyval._str = new QString( "" );
 	  ;
     break;}
-case 48:
-#line 356 "yacc.yy"
+case 49:
+#line 365 "yacc.yy"
 {
           ;
     break;}
-case 50:
-#line 363 "yacc.yy"
-{
-		yyval._str = new QString( "" );
-	  ;
-    break;}
 case 51:
-#line 367 "yacc.yy"
+#line 372 "yacc.yy"
 {
-		yyval._str = new QString( *(yyvsp[-1]._str) + *(yyvsp[0]._str) );
+		yyval._str = new QString( "" );
 	  ;
     break;}
 case 52:
-#line 371 "yacc.yy"
+#line 376 "yacc.yy"
 {
 		yyval._str = new QString( *(yyvsp[-1]._str) + *(yyvsp[0]._str) );
 	  ;
     break;}
 case 53:
-#line 375 "yacc.yy"
+#line 380 "yacc.yy"
 {
-		yyval._str = yyvsp[0]._str;
+		yyval._str = new QString( *(yyvsp[-1]._str) + *(yyvsp[0]._str) );
 	  ;
     break;}
 case 54:
-#line 379 "yacc.yy"
+#line 384 "yacc.yy"
 {
 		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
 case 55:
-#line 383 "yacc.yy"
+#line 388 "yacc.yy"
 {
 		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
 case 56:
-#line 387 "yacc.yy"
-{	
-	        yyval._str = yyvsp[0]._str;
+#line 392 "yacc.yy"
+{
+		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
 case 57:
-#line 391 "yacc.yy"
-{
- 	        yyval._str = yyvsp[0]._str;
+#line 396 "yacc.yy"
+{	
+	        yyval._str = yyvsp[0]._str;
 	  ;
     break;}
 case 58:
-#line 395 "yacc.yy"
+#line 400 "yacc.yy"
 {
-		yyval._str = yyvsp[0]._str;
+ 	        yyval._str = yyvsp[0]._str;
 	  ;
     break;}
 case 59:
-#line 399 "yacc.yy"
+#line 404 "yacc.yy"
 {
 		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
 case 60:
-#line 403 "yacc.yy"
+#line 408 "yacc.yy"
 {
 		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
 case 61:
-#line 407 "yacc.yy"
+#line 412 "yacc.yy"
 {
 		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
 case 62:
-#line 411 "yacc.yy"
+#line 416 "yacc.yy"
+{
+		yyval._str = yyvsp[0]._str;
+	  ;
+    break;}
+case 63:
+#line 420 "yacc.yy"
 {
                 yyval._str = yyvsp[0]._str;
           ;
     break;}
-case 63:
-#line 415 "yacc.yy"
+case 64:
+#line 424 "yacc.yy"
 {
 		yyval._str = yyvsp[0]._str;
 	  ;
     break;}
-case 64:
-#line 419 "yacc.yy"
+case 65:
+#line 428 "yacc.yy"
 {
                 yyval._str = yyvsp[0]._str;
           ;
     break;}
-case 65:
-#line 423 "yacc.yy"
+case 66:
+#line 432 "yacc.yy"
 {
                 yyval._str = yyvsp[0]._str;
           ;
     break;}
-case 72:
-#line 441 "yacc.yy"
-{;
-    break;}
 case 73:
-#line 442 "yacc.yy"
+#line 450 "yacc.yy"
 {;
     break;}
 case 74:
-#line 446 "yacc.yy"
+#line 451 "yacc.yy"
 {;
     break;}
 case 75:
-#line 447 "yacc.yy"
+#line 455 "yacc.yy"
 {;
     break;}
 case 76:
-#line 448 "yacc.yy"
+#line 456 "yacc.yy"
 {;
     break;}
 case 77:
-#line 449 "yacc.yy"
+#line 457 "yacc.yy"
 {;
     break;}
 case 78:
-#line 450 "yacc.yy"
+#line 458 "yacc.yy"
 {;
     break;}
 case 79:
-#line 454 "yacc.yy"
+#line 459 "yacc.yy"
 {;
     break;}
 case 80:
-#line 455 "yacc.yy"
+#line 463 "yacc.yy"
 {;
     break;}
 case 81:
-#line 456 "yacc.yy"
+#line 464 "yacc.yy"
 {;
     break;}
 case 82:
-#line 461 "yacc.yy"
+#line 465 "yacc.yy"
+{;
+    break;}
+case 83:
+#line 470 "yacc.yy"
 {
 		if (dcop_area) {
  		  QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM \
%3</TYPEDEF>\n"); @@ -1496,131 +1529,131 @@ case 82:
 		}
 	  ;
     break;}
-case 83:
-#line 471 "yacc.yy"
+case 84:
+#line 480 "yacc.yy"
 {
 		if (dcop_area)
 		  yyerror("scoped template typedefs are not supported in dcop areas!");
 	  ;
     break;}
-case 84:
-#line 479 "yacc.yy"
+case 85:
+#line 488 "yacc.yy"
 {
 		yyval._int = 0;
 	  ;
     break;}
-case 85:
-#line 483 "yacc.yy"
+case 86:
+#line 492 "yacc.yy"
 {
 		yyval._int = 1;
 	  ;
     break;}
-case 86:
-#line 489 "yacc.yy"
-{ yyval._str = new QString("signed int"); ;
-    break;}
 case 87:
-#line 490 "yacc.yy"
+#line 498 "yacc.yy"
 { yyval._str = new QString("signed int"); ;
     break;}
 case 88:
-#line 491 "yacc.yy"
-{ yyval._str = new QString("unsigned int"); ;
+#line 499 "yacc.yy"
+{ yyval._str = new QString("signed int"); ;
     break;}
 case 89:
-#line 492 "yacc.yy"
+#line 500 "yacc.yy"
 { yyval._str = new QString("unsigned int"); ;
     break;}
 case 90:
-#line 493 "yacc.yy"
-{ yyval._str = new QString("signed short int"); ;
+#line 501 "yacc.yy"
+{ yyval._str = new QString("unsigned int"); ;
     break;}
 case 91:
-#line 494 "yacc.yy"
+#line 502 "yacc.yy"
 { yyval._str = new QString("signed short int"); ;
     break;}
 case 92:
-#line 495 "yacc.yy"
-{ yyval._str = new QString("signed long int"); ;
+#line 503 "yacc.yy"
+{ yyval._str = new QString("signed short int"); ;
     break;}
 case 93:
-#line 496 "yacc.yy"
+#line 504 "yacc.yy"
 { yyval._str = new QString("signed long int"); ;
     break;}
 case 94:
-#line 497 "yacc.yy"
-{ yyval._str = new QString("unsigned short int"); ;
+#line 505 "yacc.yy"
+{ yyval._str = new QString("signed long int"); ;
     break;}
 case 95:
-#line 498 "yacc.yy"
+#line 506 "yacc.yy"
 { yyval._str = new QString("unsigned short int"); ;
     break;}
 case 96:
-#line 499 "yacc.yy"
-{ yyval._str = new QString("unsigned long int"); ;
+#line 507 "yacc.yy"
+{ yyval._str = new QString("unsigned short int"); ;
     break;}
 case 97:
-#line 500 "yacc.yy"
+#line 508 "yacc.yy"
 { yyval._str = new QString("unsigned long int"); ;
     break;}
 case 98:
-#line 501 "yacc.yy"
-{ yyval._str = new QString("int"); ;
+#line 509 "yacc.yy"
+{ yyval._str = new QString("unsigned long int"); ;
     break;}
 case 99:
-#line 502 "yacc.yy"
-{ yyval._str = new QString("long int"); ;
+#line 510 "yacc.yy"
+{ yyval._str = new QString("int"); ;
     break;}
 case 100:
-#line 503 "yacc.yy"
+#line 511 "yacc.yy"
 { yyval._str = new QString("long int"); ;
     break;}
 case 101:
-#line 504 "yacc.yy"
-{ yyval._str = new QString("short int"); ;
+#line 512 "yacc.yy"
+{ yyval._str = new QString("long int"); ;
     break;}
 case 102:
-#line 505 "yacc.yy"
+#line 513 "yacc.yy"
 { yyval._str = new QString("short int"); ;
     break;}
 case 103:
-#line 506 "yacc.yy"
-{ yyval._str = new QString("char"); ;
+#line 514 "yacc.yy"
+{ yyval._str = new QString("short int"); ;
     break;}
 case 104:
-#line 507 "yacc.yy"
-{ yyval._str = new QString("signed char"); ;
+#line 515 "yacc.yy"
+{ yyval._str = new QString("char"); ;
     break;}
 case 105:
-#line 508 "yacc.yy"
+#line 516 "yacc.yy"
+{ yyval._str = new QString("signed char"); ;
+    break;}
+case 106:
+#line 517 "yacc.yy"
 { yyval._str = new QString("unsigned char"); ;
     break;}
-case 108:
-#line 518 "yacc.yy"
+case 109:
+#line 527 "yacc.yy"
 {
 		yyval._str = new QString( "" );
 	  ;
     break;}
-case 110:
-#line 523 "yacc.yy"
+case 111:
+#line 532 "yacc.yy"
 {
 		yyval._str = new QString( *(yyvsp[-2]._str) + *(yyvsp[0]._str) );
 	  ;
     break;}
-case 112:
-#line 531 "yacc.yy"
-{ yyval._str = yyvsp[0]._str; ;
-    break;}
 case 113:
-#line 532 "yacc.yy"
+#line 540 "yacc.yy"
 { yyval._str = yyvsp[0]._str; ;
     break;}
 case 114:
-#line 533 "yacc.yy"
+#line 541 "yacc.yy"
 { yyval._str = yyvsp[0]._str; ;
     break;}
 case 115:
-#line 534 "yacc.yy"
+#line 542 "yacc.yy"
+{ yyval._str = yyvsp[0]._str; ;
+    break;}
+case 116:
+#line 543 "yacc.yy"
 {
 		QString *tmp = new QString("%1&lt;%2&gt;");
 		*tmp = tmp->arg(*(yyvsp[-3]._str));
@@ -1628,8 +1661,8 @@ case 115:
 		yyval._str = tmp;
 	 ;
     break;}
-case 116:
-#line 540 "yacc.yy"
+case 117:
+#line 549 "yacc.yy"
 {
 		QString *tmp = new QString("%1&lt;%2&gt;::%3");
 		*tmp = tmp->arg(*(yyvsp[-5]._str));
@@ -1638,40 +1671,40 @@ case 116:
 		yyval._str = tmp;
 	 ;
     break;}
-case 117:
-#line 552 "yacc.yy"
+case 118:
+#line 561 "yacc.yy"
 {
 	    yyval._str = new QString(*(yyvsp[-2]._str) + "," + *(yyvsp[0]._str));
 	  ;
     break;}
-case 118:
-#line 556 "yacc.yy"
+case 119:
+#line 565 "yacc.yy"
 {
  	    yyval._str = yyvsp[0]._str;
 	  ;
     break;}
-case 119:
-#line 564 "yacc.yy"
+case 120:
+#line 573 "yacc.yy"
 {
 	    if (dcop_area)
 	      yyerror("in dcop areas are no pointers allowed");
 	  ;
     break;}
-case 120:
-#line 569 "yacc.yy"
+case 121:
+#line 578 "yacc.yy"
 {
  	    yyval._str = yyvsp[0]._str;
 	  ;
     break;}
-case 121:
-#line 578 "yacc.yy"
+case 122:
+#line 587 "yacc.yy"
 {
 	    if (dcop_area)
 	      yyerror("in dcop areas are no pointers allowed");
 	  ;
     break;}
-case 122:
-#line 582 "yacc.yy"
+case 123:
+#line 591 "yacc.yy"
 {
 	     if (dcop_area) {
 	  	QString* tmp = new QString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY \
"\">%1</TYPE>"); @@ -1680,50 +1713,50 @@ case 122:
 	     }
 	  ;
     break;}
-case 123:
-#line 589 "yacc.yy"
+case 124:
+#line 598 "yacc.yy"
 {
 		QString* tmp = new QString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *(yyvsp[0]._str) );
 		yyval._str = tmp;
 	;
     break;}
-case 124:
-#line 594 "yacc.yy"
+case 125:
+#line 603 "yacc.yy"
 {
 	     if (dcop_area)
 		yyerror("in dcop areas are only const references allowed!");
 	  ;
     break;}
-case 125:
-#line 599 "yacc.yy"
+case 126:
+#line 608 "yacc.yy"
 {
 		QString* tmp = new QString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *(yyvsp[0]._str) );
 		yyval._str = tmp;
 	;
     break;}
-case 126:
-#line 605 "yacc.yy"
+case 127:
+#line 614 "yacc.yy"
 {
 	    if (dcop_area)
 	      yyerror("in dcop areas are no pointers allowed");
 	  ;
     break;}
-case 127:
-#line 613 "yacc.yy"
+case 128:
+#line 622 "yacc.yy"
 {
 	    yyval._str = new QString(*(yyvsp[-2]._str) + "," + *(yyvsp[0]._str));
 	  ;
     break;}
-case 128:
-#line 617 "yacc.yy"
+case 129:
+#line 626 "yacc.yy"
 {
  	    yyval._str = yyvsp[0]._str;
 	  ;
     break;}
-case 129:
-#line 624 "yacc.yy"
+case 130:
+#line 633 "yacc.yy"
 {
 		if (dcop_area) {
 		   QString* tmp = new QString("\n        <ARG>%1<NAME>%2</NAME></ARG>");
@@ -1733,8 +1766,8 @@ case 129:
 		} else yyval._str = new QString();
 	  ;
     break;}
-case 130:
-#line 633 "yacc.yy"
+case 131:
+#line 642 "yacc.yy"
 {
 		if (dcop_area) {
 		   QString* tmp = new QString("\n        <ARG>%1</ARG>");
@@ -1743,64 +1776,64 @@ case 130:
 		} else yyval._str = new QString();
 	  ;
     break;}
-case 131:
-#line 641 "yacc.yy"
+case 132:
+#line 650 "yacc.yy"
 {
 		if (dcop_area)
 			yyerror("variable arguments not supported in dcop area.");
 		yyval._str = new QString("");
 	  ;
     break;}
-case 132:
-#line 650 "yacc.yy"
-{
-	  ;
-    break;}
 case 133:
-#line 653 "yacc.yy"
+#line 659 "yacc.yy"
 {
 	  ;
     break;}
 case 134:
-#line 656 "yacc.yy"
+#line 662 "yacc.yy"
 {
 	  ;
     break;}
 case 135:
-#line 663 "yacc.yy"
+#line 665 "yacc.yy"
 {
-          ;
+	  ;
     break;}
 case 136:
-#line 666 "yacc.yy"
+#line 672 "yacc.yy"
 {
           ;
     break;}
 case 137:
-#line 669 "yacc.yy"
+#line 675 "yacc.yy"
 {
           ;
     break;}
 case 138:
-#line 672 "yacc.yy"
+#line 678 "yacc.yy"
 {
           ;
     break;}
 case 139:
-#line 675 "yacc.yy"
+#line 681 "yacc.yy"
 {
           ;
     break;}
 case 140:
-#line 680 "yacc.yy"
-{ yyval._int = 0; ;
+#line 684 "yacc.yy"
+{
+          ;
     break;}
 case 141:
-#line 681 "yacc.yy"
-{ yyval._int = 1; ;
+#line 689 "yacc.yy"
+{ yyval._int = 0; ;
     break;}
-case 147:
+case 142:
 #line 690 "yacc.yy"
+{ yyval._int = 1; ;
+    break;}
+case 148:
+#line 699 "yacc.yy"
 {
 	     if (dcop_area || dcop_signal_area) {
 		QString* tmp = 0;
@@ -1823,82 +1856,82 @@ case 147:
 	        yyval._str = new QString("");
 	  ;
     break;}
-case 148:
-#line 712 "yacc.yy"
+case 149:
+#line 721 "yacc.yy"
 {
 	     if (dcop_area)
 		yyerror("operators aren't allowed in dcop areas!");
 	     yyval._str = new QString("");
 	  ;
     break;}
-case 149:
-#line 722 "yacc.yy"
-{;
-    break;}
 case 150:
-#line 723 "yacc.yy"
+#line 731 "yacc.yy"
 {;
     break;}
 case 151:
-#line 724 "yacc.yy"
+#line 732 "yacc.yy"
 {;
     break;}
 case 152:
-#line 729 "yacc.yy"
+#line 733 "yacc.yy"
 {;
     break;}
 case 153:
-#line 734 "yacc.yy"
+#line 738 "yacc.yy"
 {;
     break;}
 case 154:
-#line 735 "yacc.yy"
+#line 743 "yacc.yy"
 {;
     break;}
 case 155:
-#line 740 "yacc.yy"
+#line 744 "yacc.yy"
+{;
+    break;}
+case 156:
+#line 749 "yacc.yy"
 {
 	        yyval._str = yyvsp[-1]._str;
 	  ;
     break;}
-case 156:
-#line 744 "yacc.yy"
+case 157:
+#line 753 "yacc.yy"
 {
 		yyval._str = yyvsp[-3]._str;
 	  ;
     break;}
-case 157:
-#line 748 "yacc.yy"
+case 158:
+#line 757 "yacc.yy"
 {
 		yyval._str = yyvsp[-1]._str;
 	  ;
     break;}
-case 158:
-#line 752 "yacc.yy"
+case 159:
+#line 761 "yacc.yy"
 {
 	      /* The constructor */
 	      assert(!dcop_area);
               yyval._str = new QString("");
 	  ;
     break;}
-case 159:
-#line 758 "yacc.yy"
+case 160:
+#line 767 "yacc.yy"
 {
 	      /* The constructor */
 	      assert(!dcop_area);
               yyval._str = new QString("");
 	  ;
     break;}
-case 160:
-#line 764 "yacc.yy"
+case 161:
+#line 773 "yacc.yy"
 {
 	      /* The destructor */
   	      assert(!dcop_area);
               yyval._str = new QString("");
 	  ;
     break;}
-case 161:
-#line 770 "yacc.yy"
+case 162:
+#line 779 "yacc.yy"
 {
               if (dcop_area) {
                  if (dcop_signal_area)
@@ -1910,59 +1943,59 @@ case 161:
               }  
 	  ;
     break;}
-case 162:
-#line 783 "yacc.yy"
+case 163:
+#line 792 "yacc.yy"
 {
 		function_mode = 1;
 	;
     break;}
-case 166:
-#line 795 "yacc.yy"
-{;
-    break;}
 case 167:
-#line 796 "yacc.yy"
+#line 804 "yacc.yy"
 {;
     break;}
-case 171:
-#line 808 "yacc.yy"
+case 168:
+#line 805 "yacc.yy"
 {;
     break;}
 case 172:
-#line 809 "yacc.yy"
+#line 817 "yacc.yy"
 {;
     break;}
 case 173:
-#line 810 "yacc.yy"
+#line 818 "yacc.yy"
 {;
     break;}
 case 174:
-#line 813 "yacc.yy"
+#line 819 "yacc.yy"
 {;
     break;}
 case 175:
-#line 817 "yacc.yy"
+#line 822 "yacc.yy"
 {;
     break;}
 case 176:
-#line 818 "yacc.yy"
+#line 826 "yacc.yy"
 {;
     break;}
 case 177:
-#line 819 "yacc.yy"
+#line 827 "yacc.yy"
 {;
     break;}
 case 178:
-#line 820 "yacc.yy"
+#line 828 "yacc.yy"
 {;
     break;}
 case 179:
-#line 821 "yacc.yy"
+#line 829 "yacc.yy"
+{;
+    break;}
+case 180:
+#line 830 "yacc.yy"
 {;
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/lib/bison.simple"
+#line 554 "/usr/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -2160,6 +2193,7 @@ yyerrhandle:
 
  yyacceptlab:
   /* YYACCEPT comes here.  */
+#ifndef YYSTACK_USE_ALLOCA
   if (yyfree_stacks)
     {
       free (yyss);
@@ -2168,10 +2202,12 @@ yyerrhandle:
       free (yyls);
 #endif
     }
+#endif
   return 0;
 
  yyabortlab:
   /* YYABORT comes here.  */
+#ifndef YYSTACK_USE_ALLOCA
   if (yyfree_stacks)
     {
       free (yyss);
@@ -2180,9 +2216,10 @@ yyerrhandle:
       free (yyls);
 #endif
     }
+#endif    
   return 1;
 }
-#line 824 "yacc.yy"
+#line 833 "yacc.yy"
 
 
 void dcopidlParse( const char *_code )
Index: kdelibs/dcop/dcopidl/yacc.yy
===================================================================
RCS file: /home/kde/kdelibs/dcop/dcopidl/yacc.yy,v
retrieving revision 1.54
diff -u -3 -p -u -r1.54 yacc.yy
--- kdelibs/dcop/dcopidl/yacc.yy	31 Mar 2003 20:22:47 -0000	1.54
+++ kdelibs/dcop/dcopidl/yacc.yy	28 Apr 2003 15:50:17 -0000
@@ -194,6 +194,15 @@ declaration
 		dcop_signal_area = 0;
 
 	  }
+	| T_CLASS T_IDENTIFIER Identifier class_header dcoptag body T_SEMICOLON
+	  {
+	 	if ($5)
+			  printf("<CLASS>\n    <NAME>%s</NAME>\n    \
<LINK_SCOPE>%s</LINK_SCOPE>\n%s%s</CLASS>\n", ( in_namespace + *$3 \
).latin1(),$2->latin1(),  $4->latin1(), $6->latin1() ); +		// default C++ visibility \
specifier is 'private' +		dcop_area = 0;
+		dcop_signal_area = 0;
+
+	  }
 	| T_CLASS Identifier T_SEMICOLON
 	  {
 	  }



[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic