Scanner fixes for VS2008

1 files changed, 363 insertions, 355 deletions

diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index e97009b1f36..59fb3c06f7a 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.4.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,7 +45,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -68,7 +67,7 @@
 /* Copy the first part of user declarations.  */
 
 /* Line 189 of yacc.c  */
-#line 1 "../IceGrid/Grammar.y"
+#line 1 "Grammar.y"
 
 
 // **********************************************************************
@@ -104,7 +103,7 @@ yyerror(const char* s)
 
 
 /* Line 189 of yacc.c  */
-#line 108 "Grammar.tab.c"
+#line 107 "Grammar.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -188,7 +187,7 @@ typedef int YYSTYPE;
 
 
 /* Line 264 of yacc.c  */
-#line 192 "Grammar.tab.c"
+#line 191 "Grammar.tab.c"
 
 #ifdef short
 # undef short
@@ -238,7 +237,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -1355,9 +1354,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -1414,7 +1422,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -2152,40 +2160,40 @@ yyreduce:
     {
         case 2:
 
-/* Line 1455 of yacc.c  */
-#line 89 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 89 "Grammar.y"
     {
 ;}
     break;
 
   case 3:
 
-/* Line 1455 of yacc.c  */
-#line 92 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 92 "Grammar.y"
     {
 ;}
     break;
 
   case 4:
 
-/* Line 1455 of yacc.c  */
-#line 100 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 100 "Grammar.y"
     {
 ;}
     break;
 
   case 5:
 
-/* Line 1455 of yacc.c  */
-#line 103 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 103 "Grammar.y"
     {
 ;}
     break;
 
   case 6:
 
-/* Line 1455 of yacc.c  */
-#line 109 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 109 "Grammar.y"
     {
     parser->checkInterrupted();
 ;}
@@ -2193,8 +2201,8 @@ yyreduce:
 
   case 7:
 
-/* Line 1455 of yacc.c  */
-#line 118 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 118 "Grammar.y"
     {
     parser->usage();
 ;}
@@ -2202,8 +2210,8 @@ yyreduce:
 
   case 8:
 
-/* Line 1455 of yacc.c  */
-#line 122 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 122 "Grammar.y"
     {
     return 0;
 ;}
@@ -2211,8 +2219,8 @@ yyreduce:
 
   case 9:
 
-/* Line 1455 of yacc.c  */
-#line 126 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 126 "Grammar.y"
     {
     parser->addApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2220,8 +2228,8 @@ yyreduce:
 
   case 10:
 
-/* Line 1455 of yacc.c  */
-#line 130 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 130 "Grammar.y"
     {
     parser->usage("application", "add");
 ;}
@@ -2229,8 +2237,8 @@ yyreduce:
 
   case 11:
 
-/* Line 1455 of yacc.c  */
-#line 134 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 134 "Grammar.y"
     {
     parser->removeApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2238,8 +2246,8 @@ yyreduce:
 
   case 12:
 
-/* Line 1455 of yacc.c  */
-#line 138 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 138 "Grammar.y"
     {
     parser->usage("application", "remove");
 ;}
@@ -2247,8 +2255,8 @@ yyreduce:
 
   case 13:
 
-/* Line 1455 of yacc.c  */
-#line 142 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 142 "Grammar.y"
     {
     parser->diffApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2256,8 +2264,8 @@ yyreduce:
 
   case 14:
 
-/* Line 1455 of yacc.c  */
-#line 146 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 146 "Grammar.y"
     {
     parser->usage("application", "diff");
 ;}
@@ -2265,8 +2273,8 @@ yyreduce:
 
   case 15:
 
-/* Line 1455 of yacc.c  */
-#line 150 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 150 "Grammar.y"
     {
     parser->updateApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2274,8 +2282,8 @@ yyreduce:
 
   case 16:
 
-/* Line 1455 of yacc.c  */
-#line 154 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 154 "Grammar.y"
     {
     parser->usage("application", "update");
 ;}
@@ -2283,8 +2291,8 @@ yyreduce:
 
   case 17:
 
-/* Line 1455 of yacc.c  */
-#line 158 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 158 "Grammar.y"
     {
     parser->describeApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2292,8 +2300,8 @@ yyreduce:
 
   case 18:
 
-/* Line 1455 of yacc.c  */
-#line 162 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 162 "Grammar.y"
     {
     parser->usage("application", "describe");
 ;}
@@ -2301,8 +2309,8 @@ yyreduce:
 
   case 19:
 
-/* Line 1455 of yacc.c  */
-#line 166 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 166 "Grammar.y"
     {
     parser->patchApplication((yyvsp[(3) - (4)]));
 ;}
@@ -2310,8 +2318,8 @@ yyreduce:
 
   case 20:
 
-/* Line 1455 of yacc.c  */
-#line 170 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 170 "Grammar.y"
     {
     parser->usage("application", "patch");
 ;}
@@ -2319,8 +2327,8 @@ yyreduce:
 
   case 21:
 
-/* Line 1455 of yacc.c  */
-#line 174 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 174 "Grammar.y"
     {
     parser->listAllApplications((yyvsp[(3) - (4)]));
 ;}
@@ -2328,8 +2336,8 @@ yyreduce:
 
   case 22:
 
-/* Line 1455 of yacc.c  */
-#line 178 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 178 "Grammar.y"
     {
     parser->usage("application", "list");
 ;}
@@ -2337,8 +2345,8 @@ yyreduce:
 
   case 23:
 
-/* Line 1455 of yacc.c  */
-#line 182 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 182 "Grammar.y"
     {
     parser->describeServerTemplate((yyvsp[(4) - (5)]));
 ;}
@@ -2346,8 +2354,8 @@ yyreduce:
 
   case 24:
 
-/* Line 1455 of yacc.c  */
-#line 186 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 186 "Grammar.y"
     {
     parser->usage("server template", "describe");
 ;}
@@ -2355,8 +2363,8 @@ yyreduce:
 
   case 25:
 
-/* Line 1455 of yacc.c  */
-#line 190 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 190 "Grammar.y"
     {
     parser->instantiateServerTemplate((yyvsp[(4) - (5)]));
 ;}
@@ -2364,8 +2372,8 @@ yyreduce:
 
   case 26:
 
-/* Line 1455 of yacc.c  */
-#line 194 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 194 "Grammar.y"
     {
     parser->usage("server template", "instantiate");
 ;}
@@ -2373,8 +2381,8 @@ yyreduce:
 
   case 27:
 
-/* Line 1455 of yacc.c  */
-#line 198 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 198 "Grammar.y"
     {
     parser->usage("server template");
 ;}
@@ -2382,8 +2390,8 @@ yyreduce:
 
   case 28:
 
-/* Line 1455 of yacc.c  */
-#line 202 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 202 "Grammar.y"
     {
     parser->describeServiceTemplate((yyvsp[(4) - (5)]));
 ;}
@@ -2391,8 +2399,8 @@ yyreduce:
 
   case 29:
 
-/* Line 1455 of yacc.c  */
-#line 206 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 206 "Grammar.y"
     {
     parser->usage("service template", "describe");
 ;}
@@ -2400,8 +2408,8 @@ yyreduce:
 
   case 30:
 
-/* Line 1455 of yacc.c  */
-#line 210 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 210 "Grammar.y"
     {
     parser->usage("service template");
 ;}
@@ -2409,8 +2417,8 @@ yyreduce:
 
   case 31:
 
-/* Line 1455 of yacc.c  */
-#line 214 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 214 "Grammar.y"
     {
     parser->describeNode((yyvsp[(3) - (4)]));
 ;}
@@ -2418,8 +2426,8 @@ yyreduce:
 
   case 32:
 
-/* Line 1455 of yacc.c  */
-#line 218 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 218 "Grammar.y"
     {
     parser->usage("node", "describe");
 ;}
@@ -2427,8 +2435,8 @@ yyreduce:
 
   case 33:
 
-/* Line 1455 of yacc.c  */
-#line 222 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 222 "Grammar.y"
     {
     parser->pingNode((yyvsp[(3) - (4)]));
 ;}
@@ -2436,8 +2444,8 @@ yyreduce:
 
   case 34:
 
-/* Line 1455 of yacc.c  */
-#line 226 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 226 "Grammar.y"
     {
     parser->usage("node", "ping");
 ;}
@@ -2445,8 +2453,8 @@ yyreduce:
 
   case 35:
 
-/* Line 1455 of yacc.c  */
-#line 230 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 230 "Grammar.y"
     {
     parser->printLoadNode((yyvsp[(3) - (4)]));
 ;}
@@ -2454,8 +2462,8 @@ yyreduce:
 
   case 36:
 
-/* Line 1455 of yacc.c  */
-#line 234 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 234 "Grammar.y"
     {
     parser->usage("node", "load");
 ;}
@@ -2463,8 +2471,8 @@ yyreduce:
 
   case 37:
 
-/* Line 1455 of yacc.c  */
-#line 238 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 238 "Grammar.y"
     {
     parser->printNodeProcessors((yyvsp[(3) - (4)]));
 ;}
@@ -2472,8 +2480,8 @@ yyreduce:
 
   case 38:
 
-/* Line 1455 of yacc.c  */
-#line 242 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 242 "Grammar.y"
     {
     parser->usage("node", "processors");
 ;}
@@ -2481,8 +2489,8 @@ yyreduce:
 
   case 39:
 
-/* Line 1455 of yacc.c  */
-#line 246 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 246 "Grammar.y"
     {
     parser->shutdownNode((yyvsp[(3) - (4)]));
 ;}
@@ -2490,8 +2498,8 @@ yyreduce:
 
   case 40:
 
-/* Line 1455 of yacc.c  */
-#line 250 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 250 "Grammar.y"
     {
     parser->usage("node", "shutdown");
 ;}
@@ -2499,8 +2507,8 @@ yyreduce:
 
   case 41:
 
-/* Line 1455 of yacc.c  */
-#line 254 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 254 "Grammar.y"
     {
     parser->listAllNodes((yyvsp[(3) - (4)]));
 ;}
@@ -2508,8 +2516,8 @@ yyreduce:
 
   case 42:
 
-/* Line 1455 of yacc.c  */
-#line 258 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 258 "Grammar.y"
     {
     parser->usage("node", "list");
 ;}
@@ -2517,8 +2525,8 @@ yyreduce:
 
   case 43:
 
-/* Line 1455 of yacc.c  */
-#line 262 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 262 "Grammar.y"
     {
     parser->showFile("node", (yyvsp[(3) - (4)]));
 ;}
@@ -2526,8 +2534,8 @@ yyreduce:
 
   case 44:
 
-/* Line 1455 of yacc.c  */
-#line 266 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 266 "Grammar.y"
     {
     parser->usage("node", "show");
 ;}
@@ -2535,8 +2543,8 @@ yyreduce:
 
   case 45:
 
-/* Line 1455 of yacc.c  */
-#line 270 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 270 "Grammar.y"
     {
     parser->describeRegistry((yyvsp[(3) - (4)]));
 ;}
@@ -2544,8 +2552,8 @@ yyreduce:
 
   case 46:
 
-/* Line 1455 of yacc.c  */
-#line 274 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 274 "Grammar.y"
     {
     parser->usage("registry", "describe");
 ;}
@@ -2553,8 +2561,8 @@ yyreduce:
 
   case 47:
 
-/* Line 1455 of yacc.c  */
-#line 278 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 278 "Grammar.y"
     {
     parser->pingRegistry((yyvsp[(3) - (4)]));
 ;}
@@ -2562,8 +2570,8 @@ yyreduce:
 
   case 48:
 
-/* Line 1455 of yacc.c  */
-#line 282 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 282 "Grammar.y"
     {
     parser->usage("registry", "ping");
 ;}
@@ -2571,8 +2579,8 @@ yyreduce:
 
   case 49:
 
-/* Line 1455 of yacc.c  */
-#line 286 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 286 "Grammar.y"
     {
     parser->shutdownRegistry((yyvsp[(3) - (4)]));
 ;}
@@ -2580,8 +2588,8 @@ yyreduce:
 
   case 50:
 
-/* Line 1455 of yacc.c  */
-#line 290 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 290 "Grammar.y"
     {
     parser->usage("registry", "shutdown");
 ;}
@@ -2589,8 +2597,8 @@ yyreduce:
 
   case 51:
 
-/* Line 1455 of yacc.c  */
-#line 294 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 294 "Grammar.y"
     {
     parser->listAllRegistries((yyvsp[(3) - (4)]));
 ;}
@@ -2598,8 +2606,8 @@ yyreduce:
 
   case 52:
 
-/* Line 1455 of yacc.c  */
-#line 298 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 298 "Grammar.y"
     {
     parser->usage("registry", "list");
 ;}
@@ -2607,8 +2615,8 @@ yyreduce:
 
   case 53:
 
-/* Line 1455 of yacc.c  */
-#line 302 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 302 "Grammar.y"
     {
     parser->showFile("registry", (yyvsp[(3) - (4)]));
 ;}
@@ -2616,8 +2624,8 @@ yyreduce:
 
   case 54:
 
-/* Line 1455 of yacc.c  */
-#line 306 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 306 "Grammar.y"
     {
     parser->usage("registry", "show");
 ;}
@@ -2625,8 +2633,8 @@ yyreduce:
 
   case 55:
 
-/* Line 1455 of yacc.c  */
-#line 310 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 310 "Grammar.y"
     {
     parser->removeServer((yyvsp[(3) - (4)]));
 ;}
@@ -2634,8 +2642,8 @@ yyreduce:
 
   case 56:
 
-/* Line 1455 of yacc.c  */
-#line 314 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 314 "Grammar.y"
     {
     parser->usage("server", "remove");
 ;}
@@ -2643,8 +2651,8 @@ yyreduce:
 
   case 57:
 
-/* Line 1455 of yacc.c  */
-#line 318 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 318 "Grammar.y"
     {
     parser->describeServer((yyvsp[(3) - (4)]));
 ;}
@@ -2652,8 +2660,8 @@ yyreduce:
 
   case 58:
 
-/* Line 1455 of yacc.c  */
-#line 322 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 322 "Grammar.y"
     {
     parser->usage("server", "describe");
 ;}
@@ -2661,8 +2669,8 @@ yyreduce:
 
   case 59:
 
-/* Line 1455 of yacc.c  */
-#line 326 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 326 "Grammar.y"
     {
     parser->startServer((yyvsp[(3) - (4)]));
 ;}
@@ -2670,8 +2678,8 @@ yyreduce:
 
   case 60:
 
-/* Line 1455 of yacc.c  */
-#line 330 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 330 "Grammar.y"
     {
     parser->usage("server", "start");
 ;}
@@ -2679,8 +2687,8 @@ yyreduce:
 
   case 61:
 
-/* Line 1455 of yacc.c  */
-#line 334 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 334 "Grammar.y"
     {
     parser->stopServer((yyvsp[(3) - (4)]));
 ;}
@@ -2688,8 +2696,8 @@ yyreduce:
 
   case 62:
 
-/* Line 1455 of yacc.c  */
-#line 338 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 338 "Grammar.y"
     {
     parser->usage("server", "stop");
 ;}
@@ -2697,8 +2705,8 @@ yyreduce:
 
   case 63:
 
-/* Line 1455 of yacc.c  */
-#line 342 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 342 "Grammar.y"
     {
     parser->patchServer((yyvsp[(3) - (4)]));
 ;}
@@ -2706,8 +2714,8 @@ yyreduce:
 
   case 64:
 
-/* Line 1455 of yacc.c  */
-#line 346 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 346 "Grammar.y"
     {
     parser->usage("server", "patch");
 ;}
@@ -2715,8 +2723,8 @@ yyreduce:
 
   case 65:
 
-/* Line 1455 of yacc.c  */
-#line 350 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 350 "Grammar.y"
     {
     parser->signalServer((yyvsp[(3) - (4)]));
 ;}
@@ -2724,8 +2732,8 @@ yyreduce:
 
   case 66:
 
-/* Line 1455 of yacc.c  */
-#line 354 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 354 "Grammar.y"
     {
     parser->usage("server", "signal");
 ;}
@@ -2733,8 +2741,8 @@ yyreduce:
 
   case 67:
 
-/* Line 1455 of yacc.c  */
-#line 358 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 358 "Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 1);
 ;}
@@ -2742,8 +2750,8 @@ yyreduce:
 
   case 68:
 
-/* Line 1455 of yacc.c  */
-#line 362 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 362 "Grammar.y"
     {
     parser->usage("server", "stdout");
 ;}
@@ -2751,8 +2759,8 @@ yyreduce:
 
   case 69:
 
-/* Line 1455 of yacc.c  */
-#line 366 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 366 "Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 2);
 ;}
@@ -2760,8 +2768,8 @@ yyreduce:
 
   case 70:
 
-/* Line 1455 of yacc.c  */
-#line 370 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 370 "Grammar.y"
     {
     parser->usage("server", "stderr");
 ;}
@@ -2769,8 +2777,8 @@ yyreduce:
 
   case 71:
 
-/* Line 1455 of yacc.c  */
-#line 374 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 374 "Grammar.y"
     {
     parser->stateServer((yyvsp[(3) - (4)]));
 ;}
@@ -2778,8 +2786,8 @@ yyreduce:
 
   case 72:
 
-/* Line 1455 of yacc.c  */
-#line 378 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 378 "Grammar.y"
     {
     parser->usage("server", "start");
 ;}
@@ -2787,8 +2795,8 @@ yyreduce:
 
   case 73:
 
-/* Line 1455 of yacc.c  */
-#line 382 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 382 "Grammar.y"
     {
     parser->pidServer((yyvsp[(3) - (4)]));
 ;}
@@ -2796,8 +2804,8 @@ yyreduce:
 
   case 74:
 
-/* Line 1455 of yacc.c  */
-#line 386 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 386 "Grammar.y"
     {
     parser->usage("server", "pid");
 ;}
@@ -2805,8 +2813,8 @@ yyreduce:
 
   case 75:
 
-/* Line 1455 of yacc.c  */
-#line 390 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 390 "Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), false);
 ;}
@@ -2814,8 +2822,8 @@ yyreduce:
 
   case 76:
 
-/* Line 1455 of yacc.c  */
-#line 394 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 394 "Grammar.y"
     {
     parser->usage("server", "properties");
 ;}
@@ -2823,8 +2831,8 @@ yyreduce:
 
   case 77:
 
-/* Line 1455 of yacc.c  */
-#line 398 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 398 "Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), true);
 ;}
@@ -2832,8 +2840,8 @@ yyreduce:
 
   case 78:
 
-/* Line 1455 of yacc.c  */
-#line 402 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 402 "Grammar.y"
     {
     parser->usage("server", "property");
 ;}
@@ -2841,8 +2849,8 @@ yyreduce:
 
   case 79:
 
-/* Line 1455 of yacc.c  */
-#line 406 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 406 "Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), true);
 ;}
@@ -2850,8 +2858,8 @@ yyreduce:
 
   case 80:
 
-/* Line 1455 of yacc.c  */
-#line 410 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 410 "Grammar.y"
     {
     parser->usage("server", "enable");
 ;}
@@ -2859,8 +2867,8 @@ yyreduce:
 
   case 81:
 
-/* Line 1455 of yacc.c  */
-#line 414 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 414 "Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), false);
 ;}
@@ -2868,8 +2876,8 @@ yyreduce:
 
   case 82:
 
-/* Line 1455 of yacc.c  */
-#line 418 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 418 "Grammar.y"
     {
     parser->usage("server", "disable");
 ;}
@@ -2877,8 +2885,8 @@ yyreduce:
 
   case 83:
 
-/* Line 1455 of yacc.c  */
-#line 422 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 422 "Grammar.y"
     {
     parser->listAllServers((yyvsp[(3) - (4)]));
 ;}
@@ -2886,8 +2894,8 @@ yyreduce:
 
   case 84:
 
-/* Line 1455 of yacc.c  */
-#line 426 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 426 "Grammar.y"
     {
     parser->usage("server", "list");
 ;}
@@ -2895,8 +2903,8 @@ yyreduce:
 
   case 85:
 
-/* Line 1455 of yacc.c  */
-#line 430 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 430 "Grammar.y"
     {
     parser->showFile("server", (yyvsp[(3) - (4)]));
 ;}
@@ -2904,8 +2912,8 @@ yyreduce:
 
   case 86:
 
-/* Line 1455 of yacc.c  */
-#line 434 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 434 "Grammar.y"
     {
     parser->usage("server", "show");
 ;}
@@ -2913,8 +2921,8 @@ yyreduce:
 
   case 87:
 
-/* Line 1455 of yacc.c  */
-#line 438 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 438 "Grammar.y"
     {
     parser->startService((yyvsp[(3) - (4)]));
 ;}
@@ -2922,8 +2930,8 @@ yyreduce:
 
   case 88:
 
-/* Line 1455 of yacc.c  */
-#line 442 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 442 "Grammar.y"
     {
     parser->usage("service", "start");
 ;}
@@ -2931,8 +2939,8 @@ yyreduce:
 
   case 89:
 
-/* Line 1455 of yacc.c  */
-#line 446 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 446 "Grammar.y"
     {
     parser->stopService((yyvsp[(3) - (4)]));
 ;}
@@ -2940,8 +2948,8 @@ yyreduce:
 
   case 90:
 
-/* Line 1455 of yacc.c  */
-#line 450 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 450 "Grammar.y"
     {
     parser->usage("service", "stop");
 ;}
@@ -2949,8 +2957,8 @@ yyreduce:
 
   case 91:
 
-/* Line 1455 of yacc.c  */
-#line 454 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 454 "Grammar.y"
     {
     parser->describeService((yyvsp[(3) - (4)]));
 ;}
@@ -2958,8 +2966,8 @@ yyreduce:
 
   case 92:
 
-/* Line 1455 of yacc.c  */
-#line 458 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 458 "Grammar.y"
     {
     parser->usage("service", "describe");
 ;}
@@ -2967,8 +2975,8 @@ yyreduce:
 
   case 93:
 
-/* Line 1455 of yacc.c  */
-#line 462 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 462 "Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), false);
 ;}
@@ -2976,8 +2984,8 @@ yyreduce:
 
   case 94:
 
-/* Line 1455 of yacc.c  */
-#line 466 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 466 "Grammar.y"
     {
     parser->usage("service", "properties");
 ;}
@@ -2985,8 +2993,8 @@ yyreduce:
 
   case 95:
 
-/* Line 1455 of yacc.c  */
-#line 470 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 470 "Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), true);
 ;}
@@ -2994,8 +3002,8 @@ yyreduce:
 
   case 96:
 
-/* Line 1455 of yacc.c  */
-#line 474 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 474 "Grammar.y"
     {
     parser->usage("service", "property");
 ;}
@@ -3003,8 +3011,8 @@ yyreduce:
 
   case 97:
 
-/* Line 1455 of yacc.c  */
-#line 478 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 478 "Grammar.y"
     {
     parser->listServices((yyvsp[(3) - (4)]));
 ;}
@@ -3012,8 +3020,8 @@ yyreduce:
 
   case 98:
 
-/* Line 1455 of yacc.c  */
-#line 482 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 482 "Grammar.y"
     {
     parser->usage("service", "list");
 ;}
@@ -3021,8 +3029,8 @@ yyreduce:
 
   case 99:
 
-/* Line 1455 of yacc.c  */
-#line 486 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 486 "Grammar.y"
     {
     parser->endpointsAdapter((yyvsp[(3) - (4)]));
 ;}
@@ -3030,8 +3038,8 @@ yyreduce:
 
   case 100:
 
-/* Line 1455 of yacc.c  */
-#line 490 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 490 "Grammar.y"
     {
     parser->usage("adapter", "endpoints");
 ;}
@@ -3039,8 +3047,8 @@ yyreduce:
 
   case 101:
 
-/* Line 1455 of yacc.c  */
-#line 494 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 494 "Grammar.y"
     {
     parser->removeAdapter((yyvsp[(3) - (4)]));
 ;}
@@ -3048,8 +3056,8 @@ yyreduce:
 
   case 102:
 
-/* Line 1455 of yacc.c  */
-#line 498 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 498 "Grammar.y"
     {
     parser->usage("adapter", "remove");
 ;}
@@ -3057,8 +3065,8 @@ yyreduce:
 
   case 103:
 
-/* Line 1455 of yacc.c  */
-#line 502 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 502 "Grammar.y"
     {
     parser->listAllAdapters((yyvsp[(3) - (4)]));
 ;}
@@ -3066,8 +3074,8 @@ yyreduce:
 
   case 104:
 
-/* Line 1455 of yacc.c  */
-#line 506 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 506 "Grammar.y"
     {
     parser->usage("adapter", "list");
 ;}
@@ -3075,8 +3083,8 @@ yyreduce:
 
   case 105:
 
-/* Line 1455 of yacc.c  */
-#line 510 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 510 "Grammar.y"
     {
     parser->addObject((yyvsp[(3) - (4)]));
 ;}
@@ -3084,8 +3092,8 @@ yyreduce:
 
   case 106:
 
-/* Line 1455 of yacc.c  */
-#line 514 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 514 "Grammar.y"
     {
     parser->usage("object", "add");
 ;}
@@ -3093,8 +3101,8 @@ yyreduce:
 
   case 107:
 
-/* Line 1455 of yacc.c  */
-#line 518 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 518 "Grammar.y"
     {
     parser->removeObject((yyvsp[(3) - (4)]));
 ;}
@@ -3102,8 +3110,8 @@ yyreduce:
 
   case 108:
 
-/* Line 1455 of yacc.c  */
-#line 522 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 522 "Grammar.y"
     {
     parser->usage("object", "remove");
 ;}
@@ -3111,8 +3119,8 @@ yyreduce:
 
   case 109:
 
-/* Line 1455 of yacc.c  */
-#line 526 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 526 "Grammar.y"
     {
     parser->findObject((yyvsp[(3) - (4)]));
 ;}
@@ -3120,8 +3128,8 @@ yyreduce:
 
   case 110:
 
-/* Line 1455 of yacc.c  */
-#line 530 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 530 "Grammar.y"
     {
     parser->usage("object", "find");
 ;}
@@ -3129,8 +3137,8 @@ yyreduce:
 
   case 111:
 
-/* Line 1455 of yacc.c  */
-#line 534 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 534 "Grammar.y"
     {
     parser->listObject((yyvsp[(3) - (4)]));
 ;}
@@ -3138,8 +3146,8 @@ yyreduce:
 
   case 112:
 
-/* Line 1455 of yacc.c  */
-#line 538 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 538 "Grammar.y"
     {
     parser->usage("object", "list");
 ;}
@@ -3147,8 +3155,8 @@ yyreduce:
 
   case 113:
 
-/* Line 1455 of yacc.c  */
-#line 542 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 542 "Grammar.y"
     {
     parser->describeObject((yyvsp[(3) - (4)]));
 ;}
@@ -3156,8 +3164,8 @@ yyreduce:
 
   case 114:
 
-/* Line 1455 of yacc.c  */
-#line 546 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 546 "Grammar.y"
     {
     parser->usage("object", "describe");
 ;}
@@ -3165,8 +3173,8 @@ yyreduce:
 
   case 115:
 
-/* Line 1455 of yacc.c  */
-#line 550 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 550 "Grammar.y"
     {
     parser->showCopying();
 ;}
@@ -3174,8 +3182,8 @@ yyreduce:
 
   case 116:
 
-/* Line 1455 of yacc.c  */
-#line 554 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 554 "Grammar.y"
     {
     parser->showWarranty();
 ;}
@@ -3183,8 +3191,8 @@ yyreduce:
 
   case 117:
 
-/* Line 1455 of yacc.c  */
-#line 558 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 558 "Grammar.y"
     {
     parser->usage((yyvsp[(2) - (3)]).front());
 ;}
@@ -3192,8 +3200,8 @@ yyreduce:
 
   case 118:
 
-/* Line 1455 of yacc.c  */
-#line 562 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 562 "Grammar.y"
     {
     if(((yyvsp[(2) - (4)]).front() == "server" || (yyvsp[(2) - (4)]).front() == "service") && (yyvsp[(3) - (4)]).front() == "template")
     {
@@ -3208,8 +3216,8 @@ yyreduce:
 
   case 119:
 
-/* Line 1455 of yacc.c  */
-#line 573 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 573 "Grammar.y"
     {
     parser->usage((yyvsp[(2) - (5)]).front(), (yyvsp[(3) - (5)]).front());
 ;}
@@ -3217,8 +3225,8 @@ yyreduce:
 
   case 120:
 
-/* Line 1455 of yacc.c  */
-#line 577 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 577 "Grammar.y"
     {
     if(((yyvsp[(2) - (5)]).front() == "server" || (yyvsp[(2) - (5)]).front() == "service") && (yyvsp[(3) - (5)]).front() == "template")
     {
@@ -3233,8 +3241,8 @@ yyreduce:
 
   case 121:
 
-/* Line 1455 of yacc.c  */
-#line 588 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 588 "Grammar.y"
     {
     if(((yyvsp[(2) - (6)]).front() == "server" || (yyvsp[(2) - (6)]).front() == "service") && (yyvsp[(3) - (6)]).front() == "template")
     {
@@ -3249,8 +3257,8 @@ yyreduce:
 
   case 122:
 
-/* Line 1455 of yacc.c  */
-#line 599 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 599 "Grammar.y"
     {
     parser->usage((yyvsp[(2) - (4)]).front());
 ;}
@@ -3258,8 +3266,8 @@ yyreduce:
 
   case 123:
 
-/* Line 1455 of yacc.c  */
-#line 603 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 603 "Grammar.y"
     {
     parser->usage();
 ;}
@@ -3267,8 +3275,8 @@ yyreduce:
 
   case 124:
 
-/* Line 1455 of yacc.c  */
-#line 607 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 607 "Grammar.y"
     {
     parser->usage((yyvsp[(1) - (3)]).front());
 ;}
@@ -3276,8 +3284,8 @@ yyreduce:
 
   case 125:
 
-/* Line 1455 of yacc.c  */
-#line 611 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 611 "Grammar.y"
     {
     (yyvsp[(1) - (4)]).push_back((yyvsp[(2) - (4)]).front());
     parser->invalidCommand((yyvsp[(1) - (4)]));
@@ -3287,8 +3295,8 @@ yyreduce:
 
   case 126:
 
-/* Line 1455 of yacc.c  */
-#line 617 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 617 "Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
@@ -3297,8 +3305,8 @@ yyreduce:
 
   case 127:
 
-/* Line 1455 of yacc.c  */
-#line 622 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 622 "Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
     yyerrok;
@@ -3307,8 +3315,8 @@ yyreduce:
 
   case 128:
 
-/* Line 1455 of yacc.c  */
-#line 627 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 627 "Grammar.y"
     {
     yyerrok;
 ;}
@@ -3316,16 +3324,16 @@ yyreduce:
 
   case 129:
 
-/* Line 1455 of yacc.c  */
-#line 631 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 631 "Grammar.y"
     {
 ;}
     break;
 
   case 130:
 
-/* Line 1455 of yacc.c  */
-#line 640 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 640 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -3334,8 +3342,8 @@ yyreduce:
 
   case 131:
 
-/* Line 1455 of yacc.c  */
-#line 645 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 645 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
     (yyval).push_front((yyvsp[(1) - (2)]).front());
@@ -3344,8 +3352,8 @@ yyreduce:
 
   case 132:
 
-/* Line 1455 of yacc.c  */
-#line 650 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 650 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
@@ -3355,8 +3363,8 @@ yyreduce:
 
   case 133:
 
-/* Line 1455 of yacc.c  */
-#line 656 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 656 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
     (yyval).push_front("help");
@@ -3366,8 +3374,8 @@ yyreduce:
 
   case 134:
 
-/* Line 1455 of yacc.c  */
-#line 662 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 662 "Grammar.y"
     {
     (yyval) = YYSTYPE();
 ;}
@@ -3375,312 +3383,312 @@ yyreduce:
 
   case 135:
 
-/* Line 1455 of yacc.c  */
-#line 671 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 671 "Grammar.y"
     {
 ;}
     break;
 
   case 136:
 
-/* Line 1455 of yacc.c  */
-#line 674 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 674 "Grammar.y"
     {
 ;}
     break;
 
   case 137:
 
-/* Line 1455 of yacc.c  */
-#line 677 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 677 "Grammar.y"
     {
 ;}
     break;
 
   case 138:
 
-/* Line 1455 of yacc.c  */
-#line 680 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 680 "Grammar.y"
     {
 ;}
     break;
 
   case 139:
 
-/* Line 1455 of yacc.c  */
-#line 683 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 683 "Grammar.y"
     {
 ;}
     break;
 
   case 140:
 
-/* Line 1455 of yacc.c  */
-#line 686 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 686 "Grammar.y"
     {
 ;}
     break;
 
   case 141:
 
-/* Line 1455 of yacc.c  */
-#line 689 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 689 "Grammar.y"
     {
 ;}
     break;
 
   case 142:
 
-/* Line 1455 of yacc.c  */
-#line 692 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 692 "Grammar.y"
     {
 ;}
     break;
 
   case 143:
 
-/* Line 1455 of yacc.c  */
-#line 695 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 695 "Grammar.y"
     {
 ;}
     break;
 
   case 144:
 
-/* Line 1455 of yacc.c  */
-#line 698 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 698 "Grammar.y"
     {
 ;}
     break;
 
   case 145:
 
-/* Line 1455 of yacc.c  */
-#line 701 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 701 "Grammar.y"
     {
 ;}
     break;
 
   case 146:
 
-/* Line 1455 of yacc.c  */
-#line 704 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 704 "Grammar.y"
     {
 ;}
     break;
 
   case 147:
 
-/* Line 1455 of yacc.c  */
-#line 707 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 707 "Grammar.y"
     {
 ;}
     break;
 
   case 148:
 
-/* Line 1455 of yacc.c  */
-#line 710 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 710 "Grammar.y"
     {
 ;}
     break;
 
   case 149:
 
-/* Line 1455 of yacc.c  */
-#line 713 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 713 "Grammar.y"
     {
 ;}
     break;
 
   case 150:
 
-/* Line 1455 of yacc.c  */
-#line 716 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 716 "Grammar.y"
     {
 ;}
     break;
 
   case 151:
 
-/* Line 1455 of yacc.c  */
-#line 719 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 719 "Grammar.y"
     {
 ;}
     break;
 
   case 152:
 
-/* Line 1455 of yacc.c  */
-#line 722 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 722 "Grammar.y"
     {
 ;}
     break;
 
   case 153:
 
-/* Line 1455 of yacc.c  */
-#line 725 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 725 "Grammar.y"
     {
 ;}
     break;
 
   case 154:
 
-/* Line 1455 of yacc.c  */
-#line 728 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 728 "Grammar.y"
     {
 ;}
     break;
 
   case 155:
 
-/* Line 1455 of yacc.c  */
-#line 731 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 731 "Grammar.y"
     {
 ;}
     break;
 
   case 156:
 
-/* Line 1455 of yacc.c  */
-#line 734 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 734 "Grammar.y"
     {
 ;}
     break;
 
   case 157:
 
-/* Line 1455 of yacc.c  */
-#line 737 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 737 "Grammar.y"
     {
 ;}
     break;
 
   case 158:
 
-/* Line 1455 of yacc.c  */
-#line 740 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 740 "Grammar.y"
     {
 ;}
     break;
 
   case 159:
 
-/* Line 1455 of yacc.c  */
-#line 743 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 743 "Grammar.y"
     {
 ;}
     break;
 
   case 160:
 
-/* Line 1455 of yacc.c  */
-#line 746 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 746 "Grammar.y"
     {
 ;}
     break;
 
   case 161:
 
-/* Line 1455 of yacc.c  */
-#line 749 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 749 "Grammar.y"
     {
 ;}
     break;
 
   case 162:
 
-/* Line 1455 of yacc.c  */
-#line 752 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 752 "Grammar.y"
     {
 ;}
     break;
 
   case 163:
 
-/* Line 1455 of yacc.c  */
-#line 755 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 755 "Grammar.y"
     {
 ;}
     break;
 
   case 164:
 
-/* Line 1455 of yacc.c  */
-#line 758 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 758 "Grammar.y"
     {
 ;}
     break;
 
   case 165:
 
-/* Line 1455 of yacc.c  */
-#line 761 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 761 "Grammar.y"
     {
 ;}
     break;
 
   case 166:
 
-/* Line 1455 of yacc.c  */
-#line 764 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 764 "Grammar.y"
     {
 ;}
     break;
 
   case 167:
 
-/* Line 1455 of yacc.c  */
-#line 767 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 767 "Grammar.y"
     {
 ;}
     break;
 
   case 168:
 
-/* Line 1455 of yacc.c  */
-#line 770 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 770 "Grammar.y"
     {
 ;}
     break;
 
   case 169:
 
-/* Line 1455 of yacc.c  */
-#line 773 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 773 "Grammar.y"
     {
 ;}
     break;
 
   case 170:
 
-/* Line 1455 of yacc.c  */
-#line 776 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 776 "Grammar.y"
     {
 ;}
     break;
 
   case 171:
 
-/* Line 1455 of yacc.c  */
-#line 779 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 779 "Grammar.y"
     {
 ;}
     break;
 
   case 172:
 
-/* Line 1455 of yacc.c  */
-#line 782 "../IceGrid/Grammar.y"
+/* Line 1464 of yacc.c  */
+#line 782 "Grammar.y"
     {
 ;}
     break;
 
 
 
-/* Line 1455 of yacc.c  */
-#line 3684 "Grammar.tab.c"
+/* Line 1464 of yacc.c  */
+#line 3692 "Grammar.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);