Fixed ICE-4868: processors is now either 'threads' or 'sockets', as appropriate

1 files changed, 211 insertions, 522 deletions

diff --git a/cpp/src/IceGrid/Grammar.cpp b/cpp/src/IceGrid/Grammar.cpp
index 59fb3c06f7a..58770391dcd 100644
--- a/cpp/src/IceGrid/Grammar.cpp
+++ b/cpp/src/IceGrid/Grammar.cpp
@@ -1,22 +1,24 @@
-/* A Bison parser, made by GNU Bison 2.4.3.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      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
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -27,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -45,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -53,20 +55,105 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 
 
-/* Copy the first part of user declarations.  */
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ICE_GRID_HELP = 258,
+     ICE_GRID_EXIT = 259,
+     ICE_GRID_APPLICATION = 260,
+     ICE_GRID_NODE = 261,
+     ICE_GRID_REGISTRY = 262,
+     ICE_GRID_SERVER = 263,
+     ICE_GRID_ADAPTER = 264,
+     ICE_GRID_PING = 265,
+     ICE_GRID_LOAD = 266,
+     ICE_GRID_SOCKETS = 267,
+     ICE_GRID_ADD = 268,
+     ICE_GRID_REMOVE = 269,
+     ICE_GRID_LIST = 270,
+     ICE_GRID_SHUTDOWN = 271,
+     ICE_GRID_STRING = 272,
+     ICE_GRID_START = 273,
+     ICE_GRID_STOP = 274,
+     ICE_GRID_PATCH = 275,
+     ICE_GRID_SIGNAL = 276,
+     ICE_GRID_STDOUT = 277,
+     ICE_GRID_STDERR = 278,
+     ICE_GRID_DESCRIBE = 279,
+     ICE_GRID_PROPERTIES = 280,
+     ICE_GRID_PROPERTY = 281,
+     ICE_GRID_STATE = 282,
+     ICE_GRID_PID = 283,
+     ICE_GRID_ENDPOINTS = 284,
+     ICE_GRID_ACTIVATION = 285,
+     ICE_GRID_OBJECT = 286,
+     ICE_GRID_FIND = 287,
+     ICE_GRID_SHOW = 288,
+     ICE_GRID_COPYING = 289,
+     ICE_GRID_WARRANTY = 290,
+     ICE_GRID_DIFF = 291,
+     ICE_GRID_UPDATE = 292,
+     ICE_GRID_INSTANTIATE = 293,
+     ICE_GRID_TEMPLATE = 294,
+     ICE_GRID_SERVICE = 295,
+     ICE_GRID_ENABLE = 296,
+     ICE_GRID_DISABLE = 297
+   };
+#endif
+/* Tokens.  */
+#define ICE_GRID_HELP 258
+#define ICE_GRID_EXIT 259
+#define ICE_GRID_APPLICATION 260
+#define ICE_GRID_NODE 261
+#define ICE_GRID_REGISTRY 262
+#define ICE_GRID_SERVER 263
+#define ICE_GRID_ADAPTER 264
+#define ICE_GRID_PING 265
+#define ICE_GRID_LOAD 266
+#define ICE_GRID_SOCKETS 267
+#define ICE_GRID_ADD 268
+#define ICE_GRID_REMOVE 269
+#define ICE_GRID_LIST 270
+#define ICE_GRID_SHUTDOWN 271
+#define ICE_GRID_STRING 272
+#define ICE_GRID_START 273
+#define ICE_GRID_STOP 274
+#define ICE_GRID_PATCH 275
+#define ICE_GRID_SIGNAL 276
+#define ICE_GRID_STDOUT 277
+#define ICE_GRID_STDERR 278
+#define ICE_GRID_DESCRIBE 279
+#define ICE_GRID_PROPERTIES 280
+#define ICE_GRID_PROPERTY 281
+#define ICE_GRID_STATE 282
+#define ICE_GRID_PID 283
+#define ICE_GRID_ENDPOINTS 284
+#define ICE_GRID_ACTIVATION 285
+#define ICE_GRID_OBJECT 286
+#define ICE_GRID_FIND 287
+#define ICE_GRID_SHOW 288
+#define ICE_GRID_COPYING 289
+#define ICE_GRID_WARRANTY 290
+#define ICE_GRID_DIFF 291
+#define ICE_GRID_UPDATE 292
+#define ICE_GRID_INSTANTIATE 293
+#define ICE_GRID_TEMPLATE 294
+#define ICE_GRID_SERVICE 295
+#define ICE_GRID_ENABLE 296
+#define ICE_GRID_DISABLE 297
+
+
 
-/* Line 189 of yacc.c  */
+
+/* Copy the first part of user declarations.  */
 #line 1 "Grammar.y"
 
 
@@ -102,9 +189,6 @@ yyerror(const char* s)
 
 
 
-/* Line 189 of yacc.c  */
-#line 107 "Grammar.tab.c"
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 1
@@ -123,71 +207,20 @@ yyerror(const char* s)
 # define YYTOKEN_TABLE 0
 #endif
 
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ICE_GRID_HELP = 258,
-     ICE_GRID_EXIT = 259,
-     ICE_GRID_APPLICATION = 260,
-     ICE_GRID_NODE = 261,
-     ICE_GRID_REGISTRY = 262,
-     ICE_GRID_SERVER = 263,
-     ICE_GRID_ADAPTER = 264,
-     ICE_GRID_PING = 265,
-     ICE_GRID_LOAD = 266,
-     ICE_GRID_PROCESSORS = 267,
-     ICE_GRID_ADD = 268,
-     ICE_GRID_REMOVE = 269,
-     ICE_GRID_LIST = 270,
-     ICE_GRID_SHUTDOWN = 271,
-     ICE_GRID_STRING = 272,
-     ICE_GRID_START = 273,
-     ICE_GRID_STOP = 274,
-     ICE_GRID_PATCH = 275,
-     ICE_GRID_SIGNAL = 276,
-     ICE_GRID_STDOUT = 277,
-     ICE_GRID_STDERR = 278,
-     ICE_GRID_DESCRIBE = 279,
-     ICE_GRID_PROPERTIES = 280,
-     ICE_GRID_PROPERTY = 281,
-     ICE_GRID_STATE = 282,
-     ICE_GRID_PID = 283,
-     ICE_GRID_ENDPOINTS = 284,
-     ICE_GRID_ACTIVATION = 285,
-     ICE_GRID_OBJECT = 286,
-     ICE_GRID_FIND = 287,
-     ICE_GRID_SHOW = 288,
-     ICE_GRID_COPYING = 289,
-     ICE_GRID_WARRANTY = 290,
-     ICE_GRID_DIFF = 291,
-     ICE_GRID_UPDATE = 292,
-     ICE_GRID_INSTANTIATE = 293,
-     ICE_GRID_TEMPLATE = 294,
-     ICE_GRID_SERVICE = 295,
-     ICE_GRID_ENABLE = 296,
-     ICE_GRID_DISABLE = 297
-   };
-#endif
-
-
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 191 "Grammar.tab.c"
+/* Line 216 of yacc.c.  */
+#line 224 "Grammar.tab.c"
 
 #ifdef short
 # undef short
@@ -262,14 +295,14 @@ typedef short int yytype_int16;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID (int i)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID (i)
+    int i;
 #endif
 {
-  return yyi;
+  return i;
 }
 #endif
 
@@ -350,9 +383,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -386,12 +419,12 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -589,13 +622,13 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "ICE_GRID_HELP", "ICE_GRID_EXIT",
   "ICE_GRID_APPLICATION", "ICE_GRID_NODE", "ICE_GRID_REGISTRY",
   "ICE_GRID_SERVER", "ICE_GRID_ADAPTER", "ICE_GRID_PING", "ICE_GRID_LOAD",
-  "ICE_GRID_PROCESSORS", "ICE_GRID_ADD", "ICE_GRID_REMOVE",
-  "ICE_GRID_LIST", "ICE_GRID_SHUTDOWN", "ICE_GRID_STRING",
-  "ICE_GRID_START", "ICE_GRID_STOP", "ICE_GRID_PATCH", "ICE_GRID_SIGNAL",
-  "ICE_GRID_STDOUT", "ICE_GRID_STDERR", "ICE_GRID_DESCRIBE",
-  "ICE_GRID_PROPERTIES", "ICE_GRID_PROPERTY", "ICE_GRID_STATE",
-  "ICE_GRID_PID", "ICE_GRID_ENDPOINTS", "ICE_GRID_ACTIVATION",
-  "ICE_GRID_OBJECT", "ICE_GRID_FIND", "ICE_GRID_SHOW", "ICE_GRID_COPYING",
+  "ICE_GRID_SOCKETS", "ICE_GRID_ADD", "ICE_GRID_REMOVE", "ICE_GRID_LIST",
+  "ICE_GRID_SHUTDOWN", "ICE_GRID_STRING", "ICE_GRID_START",
+  "ICE_GRID_STOP", "ICE_GRID_PATCH", "ICE_GRID_SIGNAL", "ICE_GRID_STDOUT",
+  "ICE_GRID_STDERR", "ICE_GRID_DESCRIBE", "ICE_GRID_PROPERTIES",
+  "ICE_GRID_PROPERTY", "ICE_GRID_STATE", "ICE_GRID_PID",
+  "ICE_GRID_ENDPOINTS", "ICE_GRID_ACTIVATION", "ICE_GRID_OBJECT",
+  "ICE_GRID_FIND", "ICE_GRID_SHOW", "ICE_GRID_COPYING",
   "ICE_GRID_WARRANTY", "ICE_GRID_DIFF", "ICE_GRID_UPDATE",
   "ICE_GRID_INSTANTIATE", "ICE_GRID_TEMPLATE", "ICE_GRID_SERVICE",
   "ICE_GRID_ENABLE", "ICE_GRID_DISABLE", "';'", "$accept", "start",
@@ -1354,18 +1387,9 @@ 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.  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.  */
+   Once GCC version 2 has supplanted version 1, this can go.  */
 
 #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)
 
@@ -1533,20 +1557,17 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -1580,11 +1601,11 @@ yy_reduce_print (yyvsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -1864,8 +1885,10 @@ yydestruct (yymsg, yytype, yyvaluep)
 	break;
     }
 }
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -1884,9 +1907,10 @@ int yyparse ();
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1910,46 +1934,22 @@ yyparse ()
 #endif
 #endif
 {
-/* The lookahead symbol.  */
+  /* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
-    /* Number of syntax errors so far.  */
-    int yynerrs;
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
+/* Number of syntax errors so far.  */
+int yynerrs;
 
+  int yystate;
   int yyn;
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1957,28 +1957,51 @@ YYSTYPE yylval;
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -2008,6 +2031,7 @@ YYSTYPE yylval;
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -2015,6 +2039,7 @@ YYSTYPE yylval;
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -2037,8 +2062,9 @@ YYSTYPE yylval;
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -2049,6 +2075,7 @@ YYSTYPE yylval;
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -2058,9 +2085,6 @@ YYSTYPE yylval;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -2069,16 +2093,16 @@ YYSTYPE yylval;
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+     look-ahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -2110,16 +2134,20 @@ yybackup:
       goto yyreduce;
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -2159,40 +2187,30 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-
-/* Line 1464 of yacc.c  */
 #line 89 "Grammar.y"
     {
 ;}
     break;
 
   case 3:
-
-/* Line 1464 of yacc.c  */
 #line 92 "Grammar.y"
     {
 ;}
     break;
 
   case 4:
-
-/* Line 1464 of yacc.c  */
 #line 100 "Grammar.y"
     {
 ;}
     break;
 
   case 5:
-
-/* Line 1464 of yacc.c  */
 #line 103 "Grammar.y"
     {
 ;}
     break;
 
   case 6:
-
-/* Line 1464 of yacc.c  */
 #line 109 "Grammar.y"
     {
     parser->checkInterrupted();
@@ -2200,8 +2218,6 @@ yyreduce:
     break;
 
   case 7:
-
-/* Line 1464 of yacc.c  */
 #line 118 "Grammar.y"
     {
     parser->usage();
@@ -2209,8 +2225,6 @@ yyreduce:
     break;
 
   case 8:
-
-/* Line 1464 of yacc.c  */
 #line 122 "Grammar.y"
     {
     return 0;
@@ -2218,8 +2232,6 @@ yyreduce:
     break;
 
   case 9:
-
-/* Line 1464 of yacc.c  */
 #line 126 "Grammar.y"
     {
     parser->addApplication((yyvsp[(3) - (4)]));
@@ -2227,8 +2239,6 @@ yyreduce:
     break;
 
   case 10:
-
-/* Line 1464 of yacc.c  */
 #line 130 "Grammar.y"
     {
     parser->usage("application", "add");
@@ -2236,8 +2246,6 @@ yyreduce:
     break;
 
   case 11:
-
-/* Line 1464 of yacc.c  */
 #line 134 "Grammar.y"
     {
     parser->removeApplication((yyvsp[(3) - (4)]));
@@ -2245,8 +2253,6 @@ yyreduce:
     break;
 
   case 12:
-
-/* Line 1464 of yacc.c  */
 #line 138 "Grammar.y"
     {
     parser->usage("application", "remove");
@@ -2254,8 +2260,6 @@ yyreduce:
     break;
 
   case 13:
-
-/* Line 1464 of yacc.c  */
 #line 142 "Grammar.y"
     {
     parser->diffApplication((yyvsp[(3) - (4)]));
@@ -2263,8 +2267,6 @@ yyreduce:
     break;
 
   case 14:
-
-/* Line 1464 of yacc.c  */
 #line 146 "Grammar.y"
     {
     parser->usage("application", "diff");
@@ -2272,8 +2274,6 @@ yyreduce:
     break;
 
   case 15:
-
-/* Line 1464 of yacc.c  */
 #line 150 "Grammar.y"
     {
     parser->updateApplication((yyvsp[(3) - (4)]));
@@ -2281,8 +2281,6 @@ yyreduce:
     break;
 
   case 16:
-
-/* Line 1464 of yacc.c  */
 #line 154 "Grammar.y"
     {
     parser->usage("application", "update");
@@ -2290,8 +2288,6 @@ yyreduce:
     break;
 
   case 17:
-
-/* Line 1464 of yacc.c  */
 #line 158 "Grammar.y"
     {
     parser->describeApplication((yyvsp[(3) - (4)]));
@@ -2299,8 +2295,6 @@ yyreduce:
     break;
 
   case 18:
-
-/* Line 1464 of yacc.c  */
 #line 162 "Grammar.y"
     {
     parser->usage("application", "describe");
@@ -2308,8 +2302,6 @@ yyreduce:
     break;
 
   case 19:
-
-/* Line 1464 of yacc.c  */
 #line 166 "Grammar.y"
     {
     parser->patchApplication((yyvsp[(3) - (4)]));
@@ -2317,8 +2309,6 @@ yyreduce:
     break;
 
   case 20:
-
-/* Line 1464 of yacc.c  */
 #line 170 "Grammar.y"
     {
     parser->usage("application", "patch");
@@ -2326,8 +2316,6 @@ yyreduce:
     break;
 
   case 21:
-
-/* Line 1464 of yacc.c  */
 #line 174 "Grammar.y"
     {
     parser->listAllApplications((yyvsp[(3) - (4)]));
@@ -2335,8 +2323,6 @@ yyreduce:
     break;
 
   case 22:
-
-/* Line 1464 of yacc.c  */
 #line 178 "Grammar.y"
     {
     parser->usage("application", "list");
@@ -2344,8 +2330,6 @@ yyreduce:
     break;
 
   case 23:
-
-/* Line 1464 of yacc.c  */
 #line 182 "Grammar.y"
     {
     parser->describeServerTemplate((yyvsp[(4) - (5)]));
@@ -2353,8 +2337,6 @@ yyreduce:
     break;
 
   case 24:
-
-/* Line 1464 of yacc.c  */
 #line 186 "Grammar.y"
     {
     parser->usage("server template", "describe");
@@ -2362,8 +2344,6 @@ yyreduce:
     break;
 
   case 25:
-
-/* Line 1464 of yacc.c  */
 #line 190 "Grammar.y"
     {
     parser->instantiateServerTemplate((yyvsp[(4) - (5)]));
@@ -2371,8 +2351,6 @@ yyreduce:
     break;
 
   case 26:
-
-/* Line 1464 of yacc.c  */
 #line 194 "Grammar.y"
     {
     parser->usage("server template", "instantiate");
@@ -2380,8 +2358,6 @@ yyreduce:
     break;
 
   case 27:
-
-/* Line 1464 of yacc.c  */
 #line 198 "Grammar.y"
     {
     parser->usage("server template");
@@ -2389,8 +2365,6 @@ yyreduce:
     break;
 
   case 28:
-
-/* Line 1464 of yacc.c  */
 #line 202 "Grammar.y"
     {
     parser->describeServiceTemplate((yyvsp[(4) - (5)]));
@@ -2398,8 +2372,6 @@ yyreduce:
     break;
 
   case 29:
-
-/* Line 1464 of yacc.c  */
 #line 206 "Grammar.y"
     {
     parser->usage("service template", "describe");
@@ -2407,8 +2379,6 @@ yyreduce:
     break;
 
   case 30:
-
-/* Line 1464 of yacc.c  */
 #line 210 "Grammar.y"
     {
     parser->usage("service template");
@@ -2416,8 +2386,6 @@ yyreduce:
     break;
 
   case 31:
-
-/* Line 1464 of yacc.c  */
 #line 214 "Grammar.y"
     {
     parser->describeNode((yyvsp[(3) - (4)]));
@@ -2425,8 +2393,6 @@ yyreduce:
     break;
 
   case 32:
-
-/* Line 1464 of yacc.c  */
 #line 218 "Grammar.y"
     {
     parser->usage("node", "describe");
@@ -2434,8 +2400,6 @@ yyreduce:
     break;
 
   case 33:
-
-/* Line 1464 of yacc.c  */
 #line 222 "Grammar.y"
     {
     parser->pingNode((yyvsp[(3) - (4)]));
@@ -2443,8 +2407,6 @@ yyreduce:
     break;
 
   case 34:
-
-/* Line 1464 of yacc.c  */
 #line 226 "Grammar.y"
     {
     parser->usage("node", "ping");
@@ -2452,8 +2414,6 @@ yyreduce:
     break;
 
   case 35:
-
-/* Line 1464 of yacc.c  */
 #line 230 "Grammar.y"
     {
     parser->printLoadNode((yyvsp[(3) - (4)]));
@@ -2461,8 +2421,6 @@ yyreduce:
     break;
 
   case 36:
-
-/* Line 1464 of yacc.c  */
 #line 234 "Grammar.y"
     {
     parser->usage("node", "load");
@@ -2470,26 +2428,20 @@ yyreduce:
     break;
 
   case 37:
-
-/* Line 1464 of yacc.c  */
 #line 238 "Grammar.y"
     {
-    parser->printNodeProcessors((yyvsp[(3) - (4)]));
+    parser->printNodeProcessorSockets((yyvsp[(3) - (4)]));
 ;}
     break;
 
   case 38:
-
-/* Line 1464 of yacc.c  */
 #line 242 "Grammar.y"
     {
-    parser->usage("node", "processors");
+    parser->usage("node", "sockets");
 ;}
     break;
 
   case 39:
-
-/* Line 1464 of yacc.c  */
 #line 246 "Grammar.y"
     {
     parser->shutdownNode((yyvsp[(3) - (4)]));
@@ -2497,8 +2449,6 @@ yyreduce:
     break;
 
   case 40:
-
-/* Line 1464 of yacc.c  */
 #line 250 "Grammar.y"
     {
     parser->usage("node", "shutdown");
@@ -2506,8 +2456,6 @@ yyreduce:
     break;
 
   case 41:
-
-/* Line 1464 of yacc.c  */
 #line 254 "Grammar.y"
     {
     parser->listAllNodes((yyvsp[(3) - (4)]));
@@ -2515,8 +2463,6 @@ yyreduce:
     break;
 
   case 42:
-
-/* Line 1464 of yacc.c  */
 #line 258 "Grammar.y"
     {
     parser->usage("node", "list");
@@ -2524,8 +2470,6 @@ yyreduce:
     break;
 
   case 43:
-
-/* Line 1464 of yacc.c  */
 #line 262 "Grammar.y"
     {
     parser->showFile("node", (yyvsp[(3) - (4)]));
@@ -2533,8 +2477,6 @@ yyreduce:
     break;
 
   case 44:
-
-/* Line 1464 of yacc.c  */
 #line 266 "Grammar.y"
     {
     parser->usage("node", "show");
@@ -2542,8 +2484,6 @@ yyreduce:
     break;
 
   case 45:
-
-/* Line 1464 of yacc.c  */
 #line 270 "Grammar.y"
     {
     parser->describeRegistry((yyvsp[(3) - (4)]));
@@ -2551,8 +2491,6 @@ yyreduce:
     break;
 
   case 46:
-
-/* Line 1464 of yacc.c  */
 #line 274 "Grammar.y"
     {
     parser->usage("registry", "describe");
@@ -2560,8 +2498,6 @@ yyreduce:
     break;
 
   case 47:
-
-/* Line 1464 of yacc.c  */
 #line 278 "Grammar.y"
     {
     parser->pingRegistry((yyvsp[(3) - (4)]));
@@ -2569,8 +2505,6 @@ yyreduce:
     break;
 
   case 48:
-
-/* Line 1464 of yacc.c  */
 #line 282 "Grammar.y"
     {
     parser->usage("registry", "ping");
@@ -2578,8 +2512,6 @@ yyreduce:
     break;
 
   case 49:
-
-/* Line 1464 of yacc.c  */
 #line 286 "Grammar.y"
     {
     parser->shutdownRegistry((yyvsp[(3) - (4)]));
@@ -2587,8 +2519,6 @@ yyreduce:
     break;
 
   case 50:
-
-/* Line 1464 of yacc.c  */
 #line 290 "Grammar.y"
     {
     parser->usage("registry", "shutdown");
@@ -2596,8 +2526,6 @@ yyreduce:
     break;
 
   case 51:
-
-/* Line 1464 of yacc.c  */
 #line 294 "Grammar.y"
     {
     parser->listAllRegistries((yyvsp[(3) - (4)]));
@@ -2605,8 +2533,6 @@ yyreduce:
     break;
 
   case 52:
-
-/* Line 1464 of yacc.c  */
 #line 298 "Grammar.y"
     {
     parser->usage("registry", "list");
@@ -2614,8 +2540,6 @@ yyreduce:
     break;
 
   case 53:
-
-/* Line 1464 of yacc.c  */
 #line 302 "Grammar.y"
     {
     parser->showFile("registry", (yyvsp[(3) - (4)]));
@@ -2623,8 +2547,6 @@ yyreduce:
     break;
 
   case 54:
-
-/* Line 1464 of yacc.c  */
 #line 306 "Grammar.y"
     {
     parser->usage("registry", "show");
@@ -2632,8 +2554,6 @@ yyreduce:
     break;
 
   case 55:
-
-/* Line 1464 of yacc.c  */
 #line 310 "Grammar.y"
     {
     parser->removeServer((yyvsp[(3) - (4)]));
@@ -2641,8 +2561,6 @@ yyreduce:
     break;
 
   case 56:
-
-/* Line 1464 of yacc.c  */
 #line 314 "Grammar.y"
     {
     parser->usage("server", "remove");
@@ -2650,8 +2568,6 @@ yyreduce:
     break;
 
   case 57:
-
-/* Line 1464 of yacc.c  */
 #line 318 "Grammar.y"
     {
     parser->describeServer((yyvsp[(3) - (4)]));
@@ -2659,8 +2575,6 @@ yyreduce:
     break;
 
   case 58:
-
-/* Line 1464 of yacc.c  */
 #line 322 "Grammar.y"
     {
     parser->usage("server", "describe");
@@ -2668,8 +2582,6 @@ yyreduce:
     break;
 
   case 59:
-
-/* Line 1464 of yacc.c  */
 #line 326 "Grammar.y"
     {
     parser->startServer((yyvsp[(3) - (4)]));
@@ -2677,8 +2589,6 @@ yyreduce:
     break;
 
   case 60:
-
-/* Line 1464 of yacc.c  */
 #line 330 "Grammar.y"
     {
     parser->usage("server", "start");
@@ -2686,8 +2596,6 @@ yyreduce:
     break;
 
   case 61:
-
-/* Line 1464 of yacc.c  */
 #line 334 "Grammar.y"
     {
     parser->stopServer((yyvsp[(3) - (4)]));
@@ -2695,8 +2603,6 @@ yyreduce:
     break;
 
   case 62:
-
-/* Line 1464 of yacc.c  */
 #line 338 "Grammar.y"
     {
     parser->usage("server", "stop");
@@ -2704,8 +2610,6 @@ yyreduce:
     break;
 
   case 63:
-
-/* Line 1464 of yacc.c  */
 #line 342 "Grammar.y"
     {
     parser->patchServer((yyvsp[(3) - (4)]));
@@ -2713,8 +2617,6 @@ yyreduce:
     break;
 
   case 64:
-
-/* Line 1464 of yacc.c  */
 #line 346 "Grammar.y"
     {
     parser->usage("server", "patch");
@@ -2722,8 +2624,6 @@ yyreduce:
     break;
 
   case 65:
-
-/* Line 1464 of yacc.c  */
 #line 350 "Grammar.y"
     {
     parser->signalServer((yyvsp[(3) - (4)]));
@@ -2731,8 +2631,6 @@ yyreduce:
     break;
 
   case 66:
-
-/* Line 1464 of yacc.c  */
 #line 354 "Grammar.y"
     {
     parser->usage("server", "signal");
@@ -2740,8 +2638,6 @@ yyreduce:
     break;
 
   case 67:
-
-/* Line 1464 of yacc.c  */
 #line 358 "Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 1);
@@ -2749,8 +2645,6 @@ yyreduce:
     break;
 
   case 68:
-
-/* Line 1464 of yacc.c  */
 #line 362 "Grammar.y"
     {
     parser->usage("server", "stdout");
@@ -2758,8 +2652,6 @@ yyreduce:
     break;
 
   case 69:
-
-/* Line 1464 of yacc.c  */
 #line 366 "Grammar.y"
     {
     parser->writeMessage((yyvsp[(3) - (4)]), 2);
@@ -2767,8 +2659,6 @@ yyreduce:
     break;
 
   case 70:
-
-/* Line 1464 of yacc.c  */
 #line 370 "Grammar.y"
     {
     parser->usage("server", "stderr");
@@ -2776,8 +2666,6 @@ yyreduce:
     break;
 
   case 71:
-
-/* Line 1464 of yacc.c  */
 #line 374 "Grammar.y"
     {
     parser->stateServer((yyvsp[(3) - (4)]));
@@ -2785,8 +2673,6 @@ yyreduce:
     break;
 
   case 72:
-
-/* Line 1464 of yacc.c  */
 #line 378 "Grammar.y"
     {
     parser->usage("server", "start");
@@ -2794,8 +2680,6 @@ yyreduce:
     break;
 
   case 73:
-
-/* Line 1464 of yacc.c  */
 #line 382 "Grammar.y"
     {
     parser->pidServer((yyvsp[(3) - (4)]));
@@ -2803,8 +2687,6 @@ yyreduce:
     break;
 
   case 74:
-
-/* Line 1464 of yacc.c  */
 #line 386 "Grammar.y"
     {
     parser->usage("server", "pid");
@@ -2812,8 +2694,6 @@ yyreduce:
     break;
 
   case 75:
-
-/* Line 1464 of yacc.c  */
 #line 390 "Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), false);
@@ -2821,8 +2701,6 @@ yyreduce:
     break;
 
   case 76:
-
-/* Line 1464 of yacc.c  */
 #line 394 "Grammar.y"
     {
     parser->usage("server", "properties");
@@ -2830,8 +2708,6 @@ yyreduce:
     break;
 
   case 77:
-
-/* Line 1464 of yacc.c  */
 #line 398 "Grammar.y"
     {
     parser->propertiesServer((yyvsp[(3) - (4)]), true);
@@ -2839,8 +2715,6 @@ yyreduce:
     break;
 
   case 78:
-
-/* Line 1464 of yacc.c  */
 #line 402 "Grammar.y"
     {
     parser->usage("server", "property");
@@ -2848,8 +2722,6 @@ yyreduce:
     break;
 
   case 79:
-
-/* Line 1464 of yacc.c  */
 #line 406 "Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), true);
@@ -2857,8 +2729,6 @@ yyreduce:
     break;
 
   case 80:
-
-/* Line 1464 of yacc.c  */
 #line 410 "Grammar.y"
     {
     parser->usage("server", "enable");
@@ -2866,8 +2736,6 @@ yyreduce:
     break;
 
   case 81:
-
-/* Line 1464 of yacc.c  */
 #line 414 "Grammar.y"
     {
     parser->enableServer((yyvsp[(3) - (4)]), false);
@@ -2875,8 +2743,6 @@ yyreduce:
     break;
 
   case 82:
-
-/* Line 1464 of yacc.c  */
 #line 418 "Grammar.y"
     {
     parser->usage("server", "disable");
@@ -2884,8 +2750,6 @@ yyreduce:
     break;
 
   case 83:
-
-/* Line 1464 of yacc.c  */
 #line 422 "Grammar.y"
     {
     parser->listAllServers((yyvsp[(3) - (4)]));
@@ -2893,8 +2757,6 @@ yyreduce:
     break;
 
   case 84:
-
-/* Line 1464 of yacc.c  */
 #line 426 "Grammar.y"
     {
     parser->usage("server", "list");
@@ -2902,8 +2764,6 @@ yyreduce:
     break;
 
   case 85:
-
-/* Line 1464 of yacc.c  */
 #line 430 "Grammar.y"
     {
     parser->showFile("server", (yyvsp[(3) - (4)]));
@@ -2911,8 +2771,6 @@ yyreduce:
     break;
 
   case 86:
-
-/* Line 1464 of yacc.c  */
 #line 434 "Grammar.y"
     {
     parser->usage("server", "show");
@@ -2920,8 +2778,6 @@ yyreduce:
     break;
 
   case 87:
-
-/* Line 1464 of yacc.c  */
 #line 438 "Grammar.y"
     {
     parser->startService((yyvsp[(3) - (4)]));
@@ -2929,8 +2785,6 @@ yyreduce:
     break;
 
   case 88:
-
-/* Line 1464 of yacc.c  */
 #line 442 "Grammar.y"
     {
     parser->usage("service", "start");
@@ -2938,8 +2792,6 @@ yyreduce:
     break;
 
   case 89:
-
-/* Line 1464 of yacc.c  */
 #line 446 "Grammar.y"
     {
     parser->stopService((yyvsp[(3) - (4)]));
@@ -2947,8 +2799,6 @@ yyreduce:
     break;
 
   case 90:
-
-/* Line 1464 of yacc.c  */
 #line 450 "Grammar.y"
     {
     parser->usage("service", "stop");
@@ -2956,8 +2806,6 @@ yyreduce:
     break;
 
   case 91:
-
-/* Line 1464 of yacc.c  */
 #line 454 "Grammar.y"
     {
     parser->describeService((yyvsp[(3) - (4)]));
@@ -2965,8 +2813,6 @@ yyreduce:
     break;
 
   case 92:
-
-/* Line 1464 of yacc.c  */
 #line 458 "Grammar.y"
     {
     parser->usage("service", "describe");
@@ -2974,8 +2820,6 @@ yyreduce:
     break;
 
   case 93:
-
-/* Line 1464 of yacc.c  */
 #line 462 "Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), false);
@@ -2983,8 +2827,6 @@ yyreduce:
     break;
 
   case 94:
-
-/* Line 1464 of yacc.c  */
 #line 466 "Grammar.y"
     {
     parser->usage("service", "properties");
@@ -2992,8 +2834,6 @@ yyreduce:
     break;
 
   case 95:
-
-/* Line 1464 of yacc.c  */
 #line 470 "Grammar.y"
     {
     parser->propertiesService((yyvsp[(3) - (4)]), true);
@@ -3001,8 +2841,6 @@ yyreduce:
     break;
 
   case 96:
-
-/* Line 1464 of yacc.c  */
 #line 474 "Grammar.y"
     {
     parser->usage("service", "property");
@@ -3010,8 +2848,6 @@ yyreduce:
     break;
 
   case 97:
-
-/* Line 1464 of yacc.c  */
 #line 478 "Grammar.y"
     {
     parser->listServices((yyvsp[(3) - (4)]));
@@ -3019,8 +2855,6 @@ yyreduce:
     break;
 
   case 98:
-
-/* Line 1464 of yacc.c  */
 #line 482 "Grammar.y"
     {
     parser->usage("service", "list");
@@ -3028,8 +2862,6 @@ yyreduce:
     break;
 
   case 99:
-
-/* Line 1464 of yacc.c  */
 #line 486 "Grammar.y"
     {
     parser->endpointsAdapter((yyvsp[(3) - (4)]));
@@ -3037,8 +2869,6 @@ yyreduce:
     break;
 
   case 100:
-
-/* Line 1464 of yacc.c  */
 #line 490 "Grammar.y"
     {
     parser->usage("adapter", "endpoints");
@@ -3046,8 +2876,6 @@ yyreduce:
     break;
 
   case 101:
-
-/* Line 1464 of yacc.c  */
 #line 494 "Grammar.y"
     {
     parser->removeAdapter((yyvsp[(3) - (4)]));
@@ -3055,8 +2883,6 @@ yyreduce:
     break;
 
   case 102:
-
-/* Line 1464 of yacc.c  */
 #line 498 "Grammar.y"
     {
     parser->usage("adapter", "remove");
@@ -3064,8 +2890,6 @@ yyreduce:
     break;
 
   case 103:
-
-/* Line 1464 of yacc.c  */
 #line 502 "Grammar.y"
     {
     parser->listAllAdapters((yyvsp[(3) - (4)]));
@@ -3073,8 +2897,6 @@ yyreduce:
     break;
 
   case 104:
-
-/* Line 1464 of yacc.c  */
 #line 506 "Grammar.y"
     {
     parser->usage("adapter", "list");
@@ -3082,8 +2904,6 @@ yyreduce:
     break;
 
   case 105:
-
-/* Line 1464 of yacc.c  */
 #line 510 "Grammar.y"
     {
     parser->addObject((yyvsp[(3) - (4)]));
@@ -3091,8 +2911,6 @@ yyreduce:
     break;
 
   case 106:
-
-/* Line 1464 of yacc.c  */
 #line 514 "Grammar.y"
     {
     parser->usage("object", "add");
@@ -3100,8 +2918,6 @@ yyreduce:
     break;
 
   case 107:
-
-/* Line 1464 of yacc.c  */
 #line 518 "Grammar.y"
     {
     parser->removeObject((yyvsp[(3) - (4)]));
@@ -3109,8 +2925,6 @@ yyreduce:
     break;
 
   case 108:
-
-/* Line 1464 of yacc.c  */
 #line 522 "Grammar.y"
     {
     parser->usage("object", "remove");
@@ -3118,8 +2932,6 @@ yyreduce:
     break;
 
   case 109:
-
-/* Line 1464 of yacc.c  */
 #line 526 "Grammar.y"
     {
     parser->findObject((yyvsp[(3) - (4)]));
@@ -3127,8 +2939,6 @@ yyreduce:
     break;
 
   case 110:
-
-/* Line 1464 of yacc.c  */
 #line 530 "Grammar.y"
     {
     parser->usage("object", "find");
@@ -3136,8 +2946,6 @@ yyreduce:
     break;
 
   case 111:
-
-/* Line 1464 of yacc.c  */
 #line 534 "Grammar.y"
     {
     parser->listObject((yyvsp[(3) - (4)]));
@@ -3145,8 +2953,6 @@ yyreduce:
     break;
 
   case 112:
-
-/* Line 1464 of yacc.c  */
 #line 538 "Grammar.y"
     {
     parser->usage("object", "list");
@@ -3154,8 +2960,6 @@ yyreduce:
     break;
 
   case 113:
-
-/* Line 1464 of yacc.c  */
 #line 542 "Grammar.y"
     {
     parser->describeObject((yyvsp[(3) - (4)]));
@@ -3163,8 +2967,6 @@ yyreduce:
     break;
 
   case 114:
-
-/* Line 1464 of yacc.c  */
 #line 546 "Grammar.y"
     {
     parser->usage("object", "describe");
@@ -3172,8 +2974,6 @@ yyreduce:
     break;
 
   case 115:
-
-/* Line 1464 of yacc.c  */
 #line 550 "Grammar.y"
     {
     parser->showCopying();
@@ -3181,8 +2981,6 @@ yyreduce:
     break;
 
   case 116:
-
-/* Line 1464 of yacc.c  */
 #line 554 "Grammar.y"
     {
     parser->showWarranty();
@@ -3190,8 +2988,6 @@ yyreduce:
     break;
 
   case 117:
-
-/* Line 1464 of yacc.c  */
 #line 558 "Grammar.y"
     {
     parser->usage((yyvsp[(2) - (3)]).front());
@@ -3199,8 +2995,6 @@ yyreduce:
     break;
 
   case 118:
-
-/* 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")
@@ -3215,8 +3009,6 @@ yyreduce:
     break;
 
   case 119:
-
-/* Line 1464 of yacc.c  */
 #line 573 "Grammar.y"
     {
     parser->usage((yyvsp[(2) - (5)]).front(), (yyvsp[(3) - (5)]).front());
@@ -3224,8 +3016,6 @@ yyreduce:
     break;
 
   case 120:
-
-/* 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")
@@ -3240,8 +3030,6 @@ yyreduce:
     break;
 
   case 121:
-
-/* 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")
@@ -3256,8 +3044,6 @@ yyreduce:
     break;
 
   case 122:
-
-/* Line 1464 of yacc.c  */
 #line 599 "Grammar.y"
     {
     parser->usage((yyvsp[(2) - (4)]).front());
@@ -3265,8 +3051,6 @@ yyreduce:
     break;
 
   case 123:
-
-/* Line 1464 of yacc.c  */
 #line 603 "Grammar.y"
     {
     parser->usage();
@@ -3274,8 +3058,6 @@ yyreduce:
     break;
 
   case 124:
-
-/* Line 1464 of yacc.c  */
 #line 607 "Grammar.y"
     {
     parser->usage((yyvsp[(1) - (3)]).front());
@@ -3283,8 +3065,6 @@ yyreduce:
     break;
 
   case 125:
-
-/* Line 1464 of yacc.c  */
 #line 611 "Grammar.y"
     {
     (yyvsp[(1) - (4)]).push_back((yyvsp[(2) - (4)]).front());
@@ -3294,8 +3074,6 @@ yyreduce:
     break;
 
   case 126:
-
-/* Line 1464 of yacc.c  */
 #line 617 "Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
@@ -3304,8 +3082,6 @@ yyreduce:
     break;
 
   case 127:
-
-/* Line 1464 of yacc.c  */
 #line 622 "Grammar.y"
     {
     parser->invalidCommand((yyvsp[(1) - (3)]));
@@ -3314,8 +3090,6 @@ yyreduce:
     break;
 
   case 128:
-
-/* Line 1464 of yacc.c  */
 #line 627 "Grammar.y"
     {
     yyerrok;
@@ -3323,16 +3097,12 @@ yyreduce:
     break;
 
   case 129:
-
-/* Line 1464 of yacc.c  */
 #line 631 "Grammar.y"
     {
 ;}
     break;
 
   case 130:
-
-/* Line 1464 of yacc.c  */
 #line 640 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
@@ -3341,8 +3111,6 @@ yyreduce:
     break;
 
   case 131:
-
-/* Line 1464 of yacc.c  */
 #line 645 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (2)]);
@@ -3351,8 +3119,6 @@ yyreduce:
     break;
 
   case 132:
-
-/* Line 1464 of yacc.c  */
 #line 650 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
@@ -3362,8 +3128,6 @@ yyreduce:
     break;
 
   case 133:
-
-/* Line 1464 of yacc.c  */
 #line 656 "Grammar.y"
     {
     (yyval) = (yyvsp[(2) - (3)]);
@@ -3373,8 +3137,6 @@ yyreduce:
     break;
 
   case 134:
-
-/* Line 1464 of yacc.c  */
 #line 662 "Grammar.y"
     {
     (yyval) = YYSTYPE();
@@ -3382,313 +3144,236 @@ yyreduce:
     break;
 
   case 135:
-
-/* Line 1464 of yacc.c  */
 #line 671 "Grammar.y"
     {
 ;}
     break;
 
   case 136:
-
-/* Line 1464 of yacc.c  */
 #line 674 "Grammar.y"
     {
 ;}
     break;
 
   case 137:
-
-/* Line 1464 of yacc.c  */
 #line 677 "Grammar.y"
     {
 ;}
     break;
 
   case 138:
-
-/* Line 1464 of yacc.c  */
 #line 680 "Grammar.y"
     {
 ;}
     break;
 
   case 139:
-
-/* Line 1464 of yacc.c  */
 #line 683 "Grammar.y"
     {
 ;}
     break;
 
   case 140:
-
-/* Line 1464 of yacc.c  */
 #line 686 "Grammar.y"
     {
 ;}
     break;
 
   case 141:
-
-/* Line 1464 of yacc.c  */
 #line 689 "Grammar.y"
     {
 ;}
     break;
 
   case 142:
-
-/* Line 1464 of yacc.c  */
 #line 692 "Grammar.y"
     {
 ;}
     break;
 
   case 143:
-
-/* Line 1464 of yacc.c  */
 #line 695 "Grammar.y"
     {
 ;}
     break;
 
   case 144:
-
-/* Line 1464 of yacc.c  */
 #line 698 "Grammar.y"
     {
 ;}
     break;
 
   case 145:
-
-/* Line 1464 of yacc.c  */
 #line 701 "Grammar.y"
     {
 ;}
     break;
 
   case 146:
-
-/* Line 1464 of yacc.c  */
 #line 704 "Grammar.y"
     {
 ;}
     break;
 
   case 147:
-
-/* Line 1464 of yacc.c  */
 #line 707 "Grammar.y"
     {
 ;}
     break;
 
   case 148:
-
-/* Line 1464 of yacc.c  */
 #line 710 "Grammar.y"
     {
 ;}
     break;
 
   case 149:
-
-/* Line 1464 of yacc.c  */
 #line 713 "Grammar.y"
     {
 ;}
     break;
 
   case 150:
-
-/* Line 1464 of yacc.c  */
 #line 716 "Grammar.y"
     {
 ;}
     break;
 
   case 151:
-
-/* Line 1464 of yacc.c  */
 #line 719 "Grammar.y"
     {
 ;}
     break;
 
   case 152:
-
-/* Line 1464 of yacc.c  */
 #line 722 "Grammar.y"
     {
 ;}
     break;
 
   case 153:
-
-/* Line 1464 of yacc.c  */
 #line 725 "Grammar.y"
     {
 ;}
     break;
 
   case 154:
-
-/* Line 1464 of yacc.c  */
 #line 728 "Grammar.y"
     {
 ;}
     break;
 
   case 155:
-
-/* Line 1464 of yacc.c  */
 #line 731 "Grammar.y"
     {
 ;}
     break;
 
   case 156:
-
-/* Line 1464 of yacc.c  */
 #line 734 "Grammar.y"
     {
 ;}
     break;
 
   case 157:
-
-/* Line 1464 of yacc.c  */
 #line 737 "Grammar.y"
     {
 ;}
     break;
 
   case 158:
-
-/* Line 1464 of yacc.c  */
 #line 740 "Grammar.y"
     {
 ;}
     break;
 
   case 159:
-
-/* Line 1464 of yacc.c  */
 #line 743 "Grammar.y"
     {
 ;}
     break;
 
   case 160:
-
-/* Line 1464 of yacc.c  */
 #line 746 "Grammar.y"
     {
 ;}
     break;
 
   case 161:
-
-/* Line 1464 of yacc.c  */
 #line 749 "Grammar.y"
     {
 ;}
     break;
 
   case 162:
-
-/* Line 1464 of yacc.c  */
 #line 752 "Grammar.y"
     {
 ;}
     break;
 
   case 163:
-
-/* Line 1464 of yacc.c  */
 #line 755 "Grammar.y"
     {
 ;}
     break;
 
   case 164:
-
-/* Line 1464 of yacc.c  */
 #line 758 "Grammar.y"
     {
 ;}
     break;
 
   case 165:
-
-/* Line 1464 of yacc.c  */
 #line 761 "Grammar.y"
     {
 ;}
     break;
 
   case 166:
-
-/* Line 1464 of yacc.c  */
 #line 764 "Grammar.y"
     {
 ;}
     break;
 
   case 167:
-
-/* Line 1464 of yacc.c  */
 #line 767 "Grammar.y"
     {
 ;}
     break;
 
   case 168:
-
-/* Line 1464 of yacc.c  */
 #line 770 "Grammar.y"
     {
 ;}
     break;
 
   case 169:
-
-/* Line 1464 of yacc.c  */
 #line 773 "Grammar.y"
     {
 ;}
     break;
 
   case 170:
-
-/* Line 1464 of yacc.c  */
 #line 776 "Grammar.y"
     {
 ;}
     break;
 
   case 171:
-
-/* Line 1464 of yacc.c  */
 #line 779 "Grammar.y"
     {
 ;}
     break;
 
   case 172:
-
-/* Line 1464 of yacc.c  */
 #line 782 "Grammar.y"
     {
 ;}
     break;
 
 
-
-/* Line 1464 of yacc.c  */
-#line 3692 "Grammar.tab.c"
+/* Line 1267 of yacc.c.  */
+#line 3377 "Grammar.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3699,6 +3384,7 @@ yyreduce:
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -3763,7 +3449,7 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -3780,7 +3466,7 @@ yyerrlab:
 	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -3837,6 +3523,9 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   *++yyvsp = yylval;
 
 
@@ -3861,7 +3550,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -3872,7 +3561,7 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
+  if (yychar != YYEOF && yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered