Changeset 284420 in webkit

Timestamp:

Oct 18, 2021 5:49:27 PM (3 years ago)

Author:

achristensen@apple.com

Message:

Remove "using namespace XPath;" from XPathGrammar.cpp
​https://bugs.webkit.org/show_bug.cgi?id=231318

Reviewed by Chris Dumez.

I did this by editing XPathGrammar.y and re-running bison.
We have the output of bison checked in to our repo to not have bison as a build dependency of WebKit.

• xml/XPathGrammar.cpp:

(xpathyylex):
(xpathyyerror):
(yysyntax_error):

• xml/XPathGrammar.y:
• xml/XPathResult.cpp:

(WebCore::XPathResult::XPathResult):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• xml/XPathGrammar.cpp (modified) (64 diffs, 1 prop)
• xml/XPathGrammar.y (modified) (37 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-18  Alex Christensen  <achristensen@webkit.org>
+
+        Remove "using namespace XPath;" from XPathGrammar.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=231318
+
+        Reviewed by Chris Dumez.
+
+        I did this by editing XPathGrammar.y and re-running bison.
+        We have the output of bison checked in to our repo to not have bison as a build dependency of WebKit.
+
+        * xml/XPathGrammar.cpp:
+        (xpathyylex):
+        (xpathyyerror):
+        (yysyntax_error):
+        * xml/XPathGrammar.y:
+        * xml/XPathResult.cpp:
+        (WebCore::XPathResult::XPathResult):
+
 2021-10-18  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/xml/XPathGrammar.cpp

@@ -1 +1 @@
 /* This file is generated using the following command:
-   bison -d -p xpathyy XPathGrammar.y -o XPathGrammar.cpp 
+   bison -d -p xpathyy XPathGrammar.y -o XPathGrammar.cpp
  */
 
@@ -127 +127 @@
 
 
+
 /* Copy the first part of user declarations.  */
-#line 28 "WebCore/xml/XPathGrammar.y"
+#line 28 "XPathGrammar.y"
 
 
@@ -139 +140 @@
 #include "XPathVariableReference.h"
 
-
 #if COMPILER(MSVC)
 // See https://msdn.microsoft.com/en-us/library/1wea5zwe.aspx
@@ -153 +153 @@
 #define YYMAXDEPTH 10000
 
-using namespace WebCore;
-using namespace XPath;
 
 
@@ -177 +175 @@
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 60 "WebCore/xml/XPathGrammar.y"
+#line 57 "XPathGrammar.y"
 { 
     WebCore::XPath::NumericOp::Opcode numericOpcode;
@@ -190 +188 @@
 }
 /* Line 193 of yacc.c.  */
-#line 190 "./XPathGrammar.cpp"
-    YYSTYPE;
+#line 187 "XPathGrammar.cpp"
+        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -200 +198 @@
 
 /* Copy the second part of user declarations.  */
-#line 104 "WebCore/xml/XPathGrammar.y"
-
-
-static int xpathyylex(YYSTYPE* yylval, Parser& parser) { return parser.lex(*yylval); }
-static void xpathyyerror(Parser&, const char*) { }
+#line 101 "XPathGrammar.y"
+
+
+static int xpathyylex(YYSTYPE* yylval, WebCore::XPath::Parser& parser) { return parser.lex(*yylval); }
+static void xpathyyerror(WebCore::XPath::Parser&, const char*) { }
 
 
 
 /* Line 216 of yacc.c.  */
-#line 209 "./XPathGrammar.cpp"
+#line 206 "XPathGrammar.cpp"
 
 #ifdef short
@@ -341 +339 @@
 #  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
-         && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef _STDLIB_H
@@ -367 +365 @@
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-     || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
@@ -392 +390 @@
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
-#   define YYCOPY(To, From, Count)        \
-      do                    \
-    {                    \
-      YYSIZE_T yyi;                \
-      for (yyi = 0; yyi < (Count); yyi++)    \
-        (To)[yyi] = (From)[yyi];        \
-    }                    \
+#   define YYCOPY(To, From, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (To)[yyi] = (From)[yyi];            \
+        }                                       \
       while (YYID (0))
 #  endif
@@ -408 +406 @@
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)                    \
-    do                                    \
-      {                                    \
-    YYSIZE_T yynewbytes;                        \
-    YYCOPY (&yyptr->Stack, Stack, yysize);                \
-    Stack = &yyptr->Stack;                        \
-    yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-    yyptr += yynewbytes / sizeof (*yyptr);                \
-      }                                    \
+# define YYSTACK_RELOCATE(Stack)                                        \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack, Stack, yysize);                          \
+        Stack = &yyptr->Stack;                                          \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
     while (YYID (0))
 
@@ -439 +437 @@
 #define YYMAXUTOK   278
 
-#define YYTRANSLATE(YYX)                        \
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
@@ -516 +514 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   114,   114,   121,   125,   131,   135,   140,   145,   153,
-     159,   165,   174,   184,   202,   213,   231,   235,   237,   244,
-     249,   254,   259,   264,   273,   277,   281,   287,   295,   302,
-     309,   314,   321,   327,   332,   338,   344,   348,   356,   367,
-     373,   381,   385,   387,   394,   399,   401,   407,   416,   418,
-     426,   428,   435,   437,   444,   446,   453,   455,   462,   464,
-     469,   476,   478,   485,   487
+       0,   111,   111,   118,   122,   128,   132,   137,   142,   150,
+     156,   162,   171,   181,   199,   210,   228,   232,   234,   241,
+     246,   251,   256,   261,   270,   274,   278,   284,   292,   299,
+     306,   311,   318,   324,   329,   335,   341,   345,   353,   364,
+     370,   378,   382,   384,   391,   396,   398,   404,   413,   415,
+     423,   425,   432,   434,   441,   443,   450,   452,   459,   461,
+     466,   473,   475,   482,   484
 };
 #endif
@@ -534 +532 @@
   "PLUS", "AND", "OR", "FUNCTIONNAME", "LITERAL", "NAMETEST", "NUMBER",
   "NODETYPE", "VARIABLEREFERENCE", "AXISNAME", "COMMENT", "DOTDOT", "PI",
-  "NODE", "SLASHSLASH", "TEXT", "XPATH_ERROR", "'/'", "'@'", "'('", "')'",
+  "NODE", "SLASHSLASH", "TEXT_", "XPATH_ERROR", "'/'", "'@'", "'('", "')'",
   "'['", "']'", "'.'", "','", "'|'", "$accept", "Top", "Expr",
   "LocationPath", "AbsoluteLocationPath", "RelativeLocationPath", "Step",
@@ -691 +689 @@
 };
 
-#define yyerrok        (yyerrstatus = 0)
-#define yyclearin    (yychar = YYEMPTY)
-#define YYEMPTY        (-2)
-#define YYEOF        0
-
-#define YYACCEPT    goto yyacceptlab
-#define YYABORT        goto yyabortlab
-#define YYERROR        goto yyerrorlab
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
 
 
@@ -705 +703 @@
    Once GCC version 2 has supplanted version 1, this can go.  */
 
-#define YYFAIL        goto yyerrlab
+#define YYFAIL          goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                    \
-do                                \
-  if (yychar == YYEMPTY && yylen == 1)                \
-    {                                \
-      yychar = (Token);                        \
-      yylval = (Value);                        \
-      yytoken = YYTRANSLATE (yychar);                \
-      YYPOPSTACK (1);                        \
-      goto yybackup;                        \
-    }                                \
-  else                                \
-    {                                \
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY && yylen == 1)                          \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      yytoken = YYTRANSLATE (yychar);                           \
+      YYPOPSTACK (1);                                           \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
       yyerror (parser, YY_("syntax error: cannot back up")); \
-      YYERROR;                            \
-    }                                \
+      YYERROR;                                                  \
+    }                                                           \
 while (YYID (0))
 
 
-#define YYTERROR    1
-#define YYERRCODE    256
+#define YYTERROR        1
+#define YYERRCODE       256
 
 
@@ -737 +735 @@
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                \
-    do                                    \
+# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
+    do                                                                  \
       if (YYID (N))                                                    \
-    {                                \
-      (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;    \
-      (Current).first_column = YYRHSLOC (Rhs, 1).first_column;    \
-      (Current).last_line    = YYRHSLOC (Rhs, N).last_line;        \
-      (Current).last_column  = YYRHSLOC (Rhs, N).last_column;    \
-    }                                \
-      else                                \
-    {                                \
-      (Current).first_line   = (Current).last_line   =        \
-        YYRHSLOC (Rhs, 0).last_line;                \
-      (Current).first_column = (Current).last_column =        \
-        YYRHSLOC (Rhs, 0).last_column;                \
-    }                                \
+        {                                                               \
+          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).first_line   = (Current).last_line   =              \
+            YYRHSLOC (Rhs, 0).last_line;                                \
+          (Current).first_column = (Current).last_column =              \
+            YYRHSLOC (Rhs, 0).last_column;                              \
+        }                                                               \
     while (YYID (0))
 #endif
@@ -763 +761 @@
 #ifndef YY_LOCATION_PRINT
 # 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,    \
-          (Loc).last_line,  (Loc).last_column)
+#  define YY_LOCATION_PRINT(File, Loc)                  \
+     fprintf (File, "%d.%d-%d.%d",                      \
+              (Loc).first_line, (Loc).first_column,     \
+              (Loc).last_line,  (Loc).last_column)
 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
@@ -789 +787 @@
 # endif
 
-# define YYDPRINTF(Args)            \
-do {                        \
-  if (yydebug)                    \
-    YYFPRINTF Args;                \
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
 } while (YYID (0))
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)              \
-do {                                      \
-  if (yydebug)                                  \
-    {                                      \
-      YYFPRINTF (stderr, "%s ", Title);                      \
-      yy_symbol_print (stderr,                          \
-          Type, Value, parser); \
-      YYFPRINTF (stderr, "\n");                          \
-    }                                      \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, parser); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
 } while (YYID (0))
 
@@ -815 +813 @@
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, Parser& parser)
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, WebCore::XPath::Parser& parser)
 #else
 static void
@@ -822 +820 @@
     int yytype;
     YYSTYPE const * const yyvaluep;
-    Parser& parser;
+    WebCore::XPath::Parser& parser;
 #endif
 {
@@ -837 +835 @@
     {
       default:
-    break;
+        break;
     }
 }
@@ -849 +847 @@
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, Parser& parser)
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, WebCore::XPath::Parser& parser)
 #else
 static void
@@ -856 +854 @@
     int yytype;
     YYSTYPE const * const yyvaluep;
-    Parser& parser;
+    WebCore::XPath::Parser& parser;
 #endif
 {
@@ -890 +888 @@
 }
 
-# define YY_STACK_PRINT(Bottom, Top)                \
-do {                                \
-  if (yydebug)                            \
-    yy_stack_print ((Bottom), (Top));                \
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
 } while (YYID (0))
 
@@ -904 +902 @@
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule, Parser& parser)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule, WebCore::XPath::Parser& parser)
 #else
 static void
@@ -910 +908 @@
     YYSTYPE *yyvsp;
     int yyrule;
-    Parser& parser;
+    WebCore::XPath::Parser& parser;
 #endif
 {
@@ -917 +915 @@
   unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-         yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
@@ -923 +921 @@
       fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-               &(yyvsp[(yyi + 1) - (yynrhs)])
-                              , parser);
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                       , parser);
       fprintf (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)        \
-do {                    \
-  if (yydebug)                \
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
     yy_reduce_print (yyvsp, Rule, parser); \
 } while (YYID (0))
@@ -947 +945 @@
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef    YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
@@ -1035 +1033 @@
 
       for (;;)
-    switch (*++yyp)
-      {
-      case '\'':
-      case ',':
-        goto do_not_strip_quotes;
-
-      case '\\':
-        if (*++yyp != '\\')
-          goto do_not_strip_quotes;
-        /* Fall through.  */
-      default:
-        if (yyres)
-          yyres[yyn] = *yyp;
-        yyn++;
-        break;
-
-      case '"':
-        if (yyres)
-          yyres[yyn] = '\0';
-        return yyn;
-      }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
@@ -1093 +1091 @@
 # if 0
       /* This is so xgettext sees the translatable formats that are
-     constructed on the fly.  */
+         constructed on the fly.  */
       YY_("syntax error, unexpected %s");
       YY_("syntax error, unexpected %s, expecting %s");
@@ -1106 +1104 @@
       static char const yyor[] = " or %s";
       char yyformat[sizeof yyunexpected
-            + sizeof yyexpecting - 1
-            + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-               * (sizeof yyor - 1))];
+                    + sizeof yyexpecting - 1
+                    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+                       * (sizeof yyor - 1))];
       char const *yyprefix = yyexpecting;
 
       /* Start YYX at -YYN if negative to avoid negative indexes in
-     YYCHECK.  */
+         YYCHECK.  */
       int yyxbegin = yyn < 0 ? -yyn : 0;
 
@@ -1124 +1122 @@
 
       for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-      {
-        if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-          {
-        yycount = 1;
-        yysize = yysize0;
-        yyformat[sizeof yyunexpected - 1] = '\0';
-        break;
-          }
-        yyarg[yycount++] = yytname[yyx];
-        yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-        yysize_overflow |= (yysize1 < yysize);
-        yysize = yysize1;
-        yyfmt = yystpcpy (yyfmt, yyprefix);
-        yyprefix = yyor;
-      }
+        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+          {
+            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+              {
+                yycount = 1;
+                yysize = yysize0;
+                yyformat[sizeof yyunexpected - 1] = '\0';
+                break;
+              }
+            yyarg[yycount++] = yytname[yyx];
+            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+            yysize_overflow |= (yysize1 < yysize);
+            yysize = yysize1;
+            yyfmt = yystpcpy (yyfmt, yyprefix);
+            yyprefix = yyor;
+          }
 
       yyf = YY_(yyformat);
@@ -1147 +1145 @@
 
       if (yysize_overflow)
-    return YYSIZE_MAXIMUM;
+        return YYSIZE_MAXIMUM;
 
       if (yyresult)
-    {
-      /* Avoid sprintf, as that infringes on the user's name space.
-         Don't have undefined behavior even if the translation
-         produced a string with the wrong number of "%s"s.  */
-      char *yyp = yyresult;
-      int yyi = 0;
-      while ((*yyp = *yyf) != '\0')
-        {
-          if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyf += 2;
-        }
-          else
-        {
-          yyp++;
-          yyf++;
-        }
-        }
-    }
+        {
+          /* Avoid sprintf, as that infringes on the user's name space.
+             Don't have undefined behavior even if the translation
+             produced a string with the wrong number of "%s"s.  */
+          char *yyp = yyresult;
+          int yyi = 0;
+          while ((*yyp = *yyf) != '\0')
+            {
+              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+                {
+                  yyp += yytnamerr (yyp, yyarg[yyi++]);
+                  yyf += 2;
+                }
+              else
+                {
+                  yyp++;
+                  yyf++;
+                }
+            }
+        }
       return yysize;
     }
@@ -1185 +1183 @@
      || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, Parser& parser)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, WebCore::XPath::Parser& parser)
 #else
 static void
@@ -1192 +1190 @@
     int yytype;
     YYSTYPE *yyvaluep;
-    Parser& parser;
+    WebCore::XPath::Parser& parser;
 #endif
 {
@@ -1205 +1203 @@
     {
       case 10: /* "FUNCTIONNAME" */
-#line 80 "WebCore/xml/XPathGrammar.y"
-    { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
-#line 1205 "./XPathGrammar.cpp"
-    break;
+#line 77 "XPathGrammar.y"
+        { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
+#line 1202 "XPathGrammar.cpp"
+        break;
       case 11: /* "LITERAL" */
-#line 80 "WebCore/xml/XPathGrammar.y"
-    { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
-#line 1210 "./XPathGrammar.cpp"
-    break;
+#line 77 "XPathGrammar.y"
+        { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
+#line 1207 "XPathGrammar.cpp"
+        break;
       case 12: /* "NAMETEST" */
-#line 80 "WebCore/xml/XPathGrammar.y"
-    { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
-#line 1215 "./XPathGrammar.cpp"
-    break;
+#line 77 "XPathGrammar.y"
+        { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
+#line 1212 "XPathGrammar.cpp"
+        break;
       case 13: /* "NUMBER" */
-#line 80 "WebCore/xml/XPathGrammar.y"
-    { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
-#line 1220 "./XPathGrammar.cpp"
-    break;
+#line 77 "XPathGrammar.y"
+        { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
+#line 1217 "XPathGrammar.cpp"
+        break;
       case 14: /* "NODETYPE" */
-#line 80 "WebCore/xml/XPathGrammar.y"
-    { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
-#line 1225 "./XPathGrammar.cpp"
-    break;
+#line 77 "XPathGrammar.y"
+        { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
+#line 1222 "XPathGrammar.cpp"
+        break;
       case 15: /* "VARIABLEREFERENCE" */
-#line 80 "WebCore/xml/XPathGrammar.y"
-    { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
-#line 1230 "./XPathGrammar.cpp"
-    break;
+#line 77 "XPathGrammar.y"
+        { if ((yyvaluep->string)) (yyvaluep->string)->deref(); };
+#line 1227 "XPathGrammar.cpp"
+        break;
       case 35: /* "Expr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1235 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1232 "XPathGrammar.cpp"
+        break;
       case 36: /* "LocationPath" */
-#line 88 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->locationPath); };
-#line 1240 "./XPathGrammar.cpp"
-    break;
+#line 85 "XPathGrammar.y"
+        { delete (yyvaluep->locationPath); };
+#line 1237 "XPathGrammar.cpp"
+        break;
       case 37: /* "AbsoluteLocationPath" */
-#line 88 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->locationPath); };
-#line 1245 "./XPathGrammar.cpp"
-    break;
+#line 85 "XPathGrammar.y"
+        { delete (yyvaluep->locationPath); };
+#line 1242 "XPathGrammar.cpp"
+        break;
       case 38: /* "RelativeLocationPath" */
-#line 88 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->locationPath); };
-#line 1250 "./XPathGrammar.cpp"
-    break;
+#line 85 "XPathGrammar.y"
+        { delete (yyvaluep->locationPath); };
+#line 1247 "XPathGrammar.cpp"
+        break;
       case 39: /* "Step" */
-#line 97 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->step); };
-#line 1255 "./XPathGrammar.cpp"
-    break;
+#line 94 "XPathGrammar.y"
+        { delete (yyvaluep->step); };
+#line 1252 "XPathGrammar.cpp"
+        break;
       case 41: /* "NodeTest" */
-#line 91 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->nodeTest); };
-#line 1260 "./XPathGrammar.cpp"
-    break;
+#line 88 "XPathGrammar.y"
+        { delete (yyvaluep->nodeTest); };
+#line 1257 "XPathGrammar.cpp"
+        break;
       case 42: /* "OptionalPredicateList" */
-#line 94 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expressionVector); };
-#line 1265 "./XPathGrammar.cpp"
-    break;
+#line 91 "XPathGrammar.y"
+        { delete (yyvaluep->expressionVector); };
+#line 1262 "XPathGrammar.cpp"
+        break;
       case 43: /* "PredicateList" */
-#line 94 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expressionVector); };
-#line 1270 "./XPathGrammar.cpp"
-    break;
+#line 91 "XPathGrammar.y"
+        { delete (yyvaluep->expressionVector); };
+#line 1267 "XPathGrammar.cpp"
+        break;
       case 44: /* "Predicate" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1275 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1272 "XPathGrammar.cpp"
+        break;
       case 45: /* "DescendantOrSelf" */
-#line 97 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->step); };
-#line 1280 "./XPathGrammar.cpp"
-    break;
+#line 94 "XPathGrammar.y"
+        { delete (yyvaluep->step); };
+#line 1277 "XPathGrammar.cpp"
+        break;
       case 46: /* "AbbreviatedStep" */
-#line 97 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->step); };
-#line 1285 "./XPathGrammar.cpp"
-    break;
+#line 94 "XPathGrammar.y"
+        { delete (yyvaluep->step); };
+#line 1282 "XPathGrammar.cpp"
+        break;
       case 47: /* "PrimaryExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1290 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1287 "XPathGrammar.cpp"
+        break;
       case 48: /* "FunctionCall" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1295 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1292 "XPathGrammar.cpp"
+        break;
       case 49: /* "ArgumentList" */
-#line 94 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expressionVector); };
-#line 1300 "./XPathGrammar.cpp"
-    break;
+#line 91 "XPathGrammar.y"
+        { delete (yyvaluep->expressionVector); };
+#line 1297 "XPathGrammar.cpp"
+        break;
       case 50: /* "Argument" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1305 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1302 "XPathGrammar.cpp"
+        break;
       case 51: /* "UnionExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1310 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1307 "XPathGrammar.cpp"
+        break;
       case 52: /* "PathExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1315 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1312 "XPathGrammar.cpp"
+        break;
       case 53: /* "FilterExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1320 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1317 "XPathGrammar.cpp"
+        break;
       case 54: /* "OrExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1325 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1322 "XPathGrammar.cpp"
+        break;
       case 55: /* "AndExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1330 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1327 "XPathGrammar.cpp"
+        break;
       case 56: /* "EqualityExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1335 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1332 "XPathGrammar.cpp"
+        break;
       case 57: /* "RelationalExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1340 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1337 "XPathGrammar.cpp"
+        break;
       case 58: /* "AdditiveExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1345 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1342 "XPathGrammar.cpp"
+        break;
       case 59: /* "MultiplicativeExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1350 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1347 "XPathGrammar.cpp"
+        break;
       case 60: /* "UnaryExpr" */
-#line 100 "WebCore/xml/XPathGrammar.y"
-    { delete (yyvaluep->expression); };
-#line 1355 "./XPathGrammar.cpp"
-    break;
+#line 97 "XPathGrammar.y"
+        { delete (yyvaluep->expression); };
+#line 1352 "XPathGrammar.cpp"
+        break;
 
       default:
-    break;
+        break;
     }
 }
@@ -1377 +1375 @@
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int yyparse (Parser& parser);
+int yyparse (WebCore::XPath::Parser& parser);
 #else
 int yyparse ();
@@ -1406 +1404 @@
      || defined __cplusplus || defined _MSC_VER)
 int
-yyparse (Parser& parser)
+yyparse (WebCore::XPath::Parser& parser)
 #else
 int
 yyparse (parser)
-    Parser& parser;
+    WebCore::XPath::Parser& parser;
 #endif
 #endif
@@ -1475 +1473 @@
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;        /* Cause a token to be read.  */
+  yychar = YYEMPTY;             /* Cause a token to be read.  */
 
   /* Initialize stack pointers.
@@ -1505 +1503 @@
 #ifdef yyoverflow
       {
-    /* Give user a chance to reallocate the stack.  Use copies of
-       these so that the &'s don't force the real ones into
-       memory.  */
-    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
-       be undefined if yyoverflow is a macro.  */
-    yyoverflow (YY_("memory exhausted"),
-            &yyss1, yysize * sizeof (*yyssp),
-            &yyvs1, yysize * sizeof (*yyvsp),
-
-            &yystacksize);
-
-    yyss = yyss1;
-    yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        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
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
@@ -1531 +1529 @@
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-    goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-    yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-    yytype_int16 *yyss1 = yyss;
-    union yyalloc *yyptr =
-      (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-    if (! yyptr)
-      goto yyexhaustedlab;
-    YYSTACK_RELOCATE (yyss);
-    YYSTACK_RELOCATE (yyvs);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss);
+        YYSTACK_RELOCATE (yyvs);
 
 #  undef YYSTACK_RELOCATE
-    if (yyss1 != yyssa)
-      YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
@@ -1557 +1555 @@
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-          (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-    YYABORT;
+        YYABORT;
     }
 
@@ -1609 +1607 @@
     {
       if (yyn == 0 || yyn == YYTABLE_NINF)
-    goto yyerrlab;
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
@@ -1667 +1665 @@
     {
         case 2:
-#line 115 "WebCore/xml/XPathGrammar.y"
-    {
-        parser.setParseResult(std::unique_ptr<Expression>((yyvsp[(1) - (1)].expression)));
+#line 112 "XPathGrammar.y"
+    {
+        parser.setParseResult(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (1)].expression)));
     ;}
     break;
 
   case 4:
-#line 126 "WebCore/xml/XPathGrammar.y"
+#line 123 "XPathGrammar.y"
     {
         (yyval.locationPath) = (yyvsp[(1) - (1)].locationPath);
@@ -1682 +1680 @@
 
   case 6:
-#line 136 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.locationPath) = new LocationPath;
+#line 133 "XPathGrammar.y"
+    {
+        (yyval.locationPath) = new WebCore::XPath::LocationPath;
     ;}
     break;
 
   case 7:
-#line 141 "WebCore/xml/XPathGrammar.y"
+#line 138 "XPathGrammar.y"
     {
         (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath);
@@ -1696 +1694 @@
 
   case 8:
-#line 146 "WebCore/xml/XPathGrammar.y"
+#line 143 "XPathGrammar.y"
     {
         (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath);
-        (yyval.locationPath)->prependStep(std::unique_ptr<Step>((yyvsp[(1) - (2)].step)));
+        (yyval.locationPath)->prependStep(std::unique_ptr<WebCore::XPath::Step>((yyvsp[(1) - (2)].step)));
     ;}
     break;
 
   case 9:
-#line 154 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.locationPath) = new LocationPath;
-        (yyval.locationPath)->appendStep(std::unique_ptr<Step>((yyvsp[(1) - (1)].step)));
+#line 151 "XPathGrammar.y"
+    {
+        (yyval.locationPath) = new WebCore::XPath::LocationPath;
+        (yyval.locationPath)->appendStep(std::unique_ptr<WebCore::XPath::Step>((yyvsp[(1) - (1)].step)));
     ;}
     break;
 
   case 10:
-#line 160 "WebCore/xml/XPathGrammar.y"
+#line 157 "XPathGrammar.y"
     {
         (yyval.locationPath) = (yyvsp[(1) - (3)].locationPath);
-        (yyval.locationPath)->appendStep(std::unique_ptr<Step>((yyvsp[(3) - (3)].step)));
+        (yyval.locationPath)->appendStep(std::unique_ptr<WebCore::XPath::Step>((yyvsp[(3) - (3)].step)));
     ;}
     break;
 
   case 11:
-#line 166 "WebCore/xml/XPathGrammar.y"
+#line 163 "XPathGrammar.y"
     {
         (yyval.locationPath) = (yyvsp[(1) - (3)].locationPath);
-        (yyval.locationPath)->appendStep(std::unique_ptr<Step>((yyvsp[(2) - (3)].step)));
-        (yyval.locationPath)->appendStep(std::unique_ptr<Step>((yyvsp[(3) - (3)].step)));
+        (yyval.locationPath)->appendStep(std::unique_ptr<WebCore::XPath::Step>((yyvsp[(2) - (3)].step)));
+        (yyval.locationPath)->appendStep(std::unique_ptr<WebCore::XPath::Step>((yyvsp[(3) - (3)].step)));
     ;}
     break;
 
   case 12:
-#line 175 "WebCore/xml/XPathGrammar.y"
-    {
-        std::unique_ptr<Step::NodeTest> nodeTest((yyvsp[(1) - (2)].nodeTest));
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList((yyvsp[(2) - (2)].expressionVector));
+#line 172 "XPathGrammar.y"
+    {
+        std::unique_ptr<WebCore::XPath::Step::NodeTest> nodeTest((yyvsp[(1) - (2)].nodeTest));
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList((yyvsp[(2) - (2)].expressionVector));
         if (predicateList)
-            (yyval.step) = new Step(Step::ChildAxis, WTFMove(*nodeTest), WTFMove(*predicateList));
+            (yyval.step) = new WebCore::XPath::Step(WebCore::XPath::Step::ChildAxis, WTFMove(*nodeTest), WTFMove(*predicateList));
         else
-            (yyval.step) = new Step(Step::ChildAxis, WTFMove(*nodeTest));
+            (yyval.step) = new WebCore::XPath::Step(WebCore::XPath::Step::ChildAxis, WTFMove(*nodeTest));
     ;}
     break;
 
   case 13:
-#line 185 "WebCore/xml/XPathGrammar.y"
+#line 182 "XPathGrammar.y"
     {
         String nametest = adoptRef((yyvsp[(1) - (2)].string));
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList((yyvsp[(2) - (2)].expressionVector));
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList((yyvsp[(2) - (2)].expressionVector));
 
         String localName;
@@ -1754 +1752 @@
 
         if (predicateList)
-            (yyval.step) = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), WTFMove(*predicateList));
+            (yyval.step) = new WebCore::XPath::Step(WebCore::XPath::Step::ChildAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::NameTest, localName, namespaceURI), WTFMove(*predicateList));
         else
-            (yyval.step) = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
+            (yyval.step) = new WebCore::XPath::Step(WebCore::XPath::Step::ChildAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::NameTest, localName, namespaceURI));
     ;}
     break;
 
   case 14:
-#line 203 "WebCore/xml/XPathGrammar.y"
-    {
-        std::unique_ptr<Step::NodeTest> nodeTest((yyvsp[(2) - (3)].nodeTest));
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList((yyvsp[(3) - (3)].expressionVector));
+#line 200 "XPathGrammar.y"
+    {
+        std::unique_ptr<WebCore::XPath::Step::NodeTest> nodeTest((yyvsp[(2) - (3)].nodeTest));
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList((yyvsp[(3) - (3)].expressionVector));
 
         if (predicateList)
-            (yyval.step) = new Step((yyvsp[(1) - (3)].axis), WTFMove(*nodeTest), WTFMove(*predicateList));
+            (yyval.step) = new WebCore::XPath::Step((yyvsp[(1) - (3)].axis), WTFMove(*nodeTest), WTFMove(*predicateList));
         else
-            (yyval.step) = new Step((yyvsp[(1) - (3)].axis), WTFMove(*nodeTest));
+            (yyval.step) = new WebCore::XPath::Step((yyvsp[(1) - (3)].axis), WTFMove(*nodeTest));
     ;}
     break;
 
   case 15:
-#line 214 "WebCore/xml/XPathGrammar.y"
+#line 211 "XPathGrammar.y"
     {
         String nametest = adoptRef((yyvsp[(2) - (3)].string));
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList((yyvsp[(3) - (3)].expressionVector));
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList((yyvsp[(3) - (3)].expressionVector));
 
         String localName;
@@ -1787 +1785 @@
 
         if (predicateList)
-            (yyval.step) = new Step((yyvsp[(1) - (3)].axis), Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), WTFMove(*predicateList));
+            (yyval.step) = new WebCore::XPath::Step((yyvsp[(1) - (3)].axis), WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::NameTest, localName, namespaceURI), WTFMove(*predicateList));
         else
-            (yyval.step) = new Step((yyvsp[(1) - (3)].axis), Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
+            (yyval.step) = new WebCore::XPath::Step((yyvsp[(1) - (3)].axis), WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::NameTest, localName, namespaceURI));
     ;}
     break;
 
   case 18:
-#line 238 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.axis) = Step::AttributeAxis;
+#line 235 "XPathGrammar.y"
+    {
+        (yyval.axis) = WebCore::XPath::Step::AttributeAxis;
     ;}
     break;
 
   case 19:
-#line 245 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::AnyNodeTest);
+#line 242 "XPathGrammar.y"
+    {
+        (yyval.nodeTest) = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::AnyNodeTest);
     ;}
     break;
 
   case 20:
-#line 250 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::TextNodeTest);
+#line 247 "XPathGrammar.y"
+    {
+        (yyval.nodeTest) = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::TextNodeTest);
     ;}
     break;
 
   case 21:
-#line 255 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
+#line 252 "XPathGrammar.y"
+    {
+        (yyval.nodeTest) = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::CommentNodeTest);
     ;}
     break;
 
   case 22:
-#line 260 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
+#line 257 "XPathGrammar.y"
+    {
+        (yyval.nodeTest) = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::ProcessingInstructionNodeTest);
     ;}
     break;
 
   case 23:
-#line 265 "WebCore/xml/XPathGrammar.y"
+#line 262 "XPathGrammar.y"
     {
         String literal = adoptRef((yyvsp[(3) - (4)].string));
-        (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, literal.stripWhiteSpace());
+        (yyval.nodeTest) = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::ProcessingInstructionNodeTest, literal.stripWhiteSpace());
     ;}
     break;
 
   case 24:
-#line 273 "WebCore/xml/XPathGrammar.y"
+#line 270 "XPathGrammar.y"
     {
         (yyval.expressionVector) = nullptr;
@@ -1844 +1842 @@
 
   case 26:
-#line 282 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expressionVector) = new Vector<std::unique_ptr<Expression>>;
-        (yyval.expressionVector)->append(std::unique_ptr<Expression>((yyvsp[(1) - (1)].expression)));
+#line 279 "XPathGrammar.y"
+    {
+        (yyval.expressionVector) = new Vector<std::unique_ptr<WebCore::XPath::Expression>>;
+        (yyval.expressionVector)->append(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (1)].expression)));
     ;}
     break;
 
   case 27:
-#line 288 "WebCore/xml/XPathGrammar.y"
+#line 285 "XPathGrammar.y"
     {
         (yyval.expressionVector) = (yyvsp[(1) - (2)].expressionVector);
-        (yyval.expressionVector)->append(std::unique_ptr<Expression>((yyvsp[(2) - (2)].expression)));
+        (yyval.expressionVector)->append(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(2) - (2)].expression)));
     ;}
     break;
 
   case 28:
-#line 296 "WebCore/xml/XPathGrammar.y"
+#line 293 "XPathGrammar.y"
     {
         (yyval.expression) = (yyvsp[(2) - (3)].expression);
@@ -1867 +1865 @@
 
   case 29:
-#line 303 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.step) = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+#line 300 "XPathGrammar.y"
+    {
+        (yyval.step) = new WebCore::XPath::Step(WebCore::XPath::Step::DescendantOrSelfAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::AnyNodeTest));
     ;}
     break;
 
   case 30:
-#line 310 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.step) = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+#line 307 "XPathGrammar.y"
+    {
+        (yyval.step) = new WebCore::XPath::Step(WebCore::XPath::Step::SelfAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::AnyNodeTest));
     ;}
     break;
 
   case 31:
-#line 315 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.step) = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+#line 312 "XPathGrammar.y"
+    {
+        (yyval.step) = new WebCore::XPath::Step(WebCore::XPath::Step::ParentAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::AnyNodeTest));
     ;}
     break;
 
   case 32:
-#line 322 "WebCore/xml/XPathGrammar.y"
+#line 319 "XPathGrammar.y"
     {
         String name = adoptRef((yyvsp[(1) - (1)].string));
-        (yyval.expression) = new VariableReference(name);
+        (yyval.expression) = new WebCore::XPath::VariableReference(name);
     ;}
     break;
 
   case 33:
-#line 328 "WebCore/xml/XPathGrammar.y"
+#line 325 "XPathGrammar.y"
     {
         (yyval.expression) = (yyvsp[(2) - (3)].expression);
@@ -1903 +1901 @@
 
   case 34:
-#line 333 "WebCore/xml/XPathGrammar.y"
+#line 330 "XPathGrammar.y"
     {
         String literal = adoptRef((yyvsp[(1) - (1)].string));
-        (yyval.expression) = new StringExpression(WTFMove(literal));
+        (yyval.expression) = new WebCore::XPath::StringExpression(WTFMove(literal));
     ;}
     break;
 
   case 35:
-#line 339 "WebCore/xml/XPathGrammar.y"
+#line 336 "XPathGrammar.y"
     {
         String numeral = adoptRef((yyvsp[(1) - (1)].string));
-        (yyval.expression) = new Number(numeral.toDouble());
+        (yyval.expression) = new WebCore::XPath::Number(numeral.toDouble());
     ;}
     break;
 
   case 37:
-#line 349 "WebCore/xml/XPathGrammar.y"
+#line 346 "XPathGrammar.y"
     {
         String name = adoptRef((yyvsp[(1) - (3)].string));
-        (yyval.expression) = XPath::Function::create(name).release();
+        (yyval.expression) = WebCore::XPath::Function::create(name).release();
         if (!(yyval.expression))
             YYABORT;
@@ -1929 +1927 @@
 
   case 38:
-#line 357 "WebCore/xml/XPathGrammar.y"
+#line 354 "XPathGrammar.y"
     {
         String name = adoptRef((yyvsp[(1) - (4)].string));
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> argumentList((yyvsp[(3) - (4)].expressionVector));
-        (yyval.expression) = XPath::Function::create(name, WTFMove(*argumentList)).release();
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> argumentList((yyvsp[(3) - (4)].expressionVector));
+        (yyval.expression) = WebCore::XPath::Function::create(name, WTFMove(*argumentList)).release();
         if (!(yyval.expression))
             YYABORT;
@@ -1940 +1938 @@
 
   case 39:
-#line 368 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expressionVector) = new Vector<std::unique_ptr<Expression>>;
-        (yyval.expressionVector)->append(std::unique_ptr<Expression>((yyvsp[(1) - (1)].expression)));
+#line 365 "XPathGrammar.y"
+    {
+        (yyval.expressionVector) = new Vector<std::unique_ptr<WebCore::XPath::Expression>>;
+        (yyval.expressionVector)->append(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (1)].expression)));
     ;}
     break;
 
   case 40:
-#line 374 "WebCore/xml/XPathGrammar.y"
+#line 371 "XPathGrammar.y"
     {
         (yyval.expressionVector) = (yyvsp[(1) - (3)].expressionVector);
-        (yyval.expressionVector)->append(std::unique_ptr<Expression>((yyvsp[(3) - (3)].expression)));
+        (yyval.expressionVector)->append(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(3) - (3)].expression)));
     ;}
     break;
 
   case 43:
-#line 388 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expression) = new Union(std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<Expression>((yyvsp[(3) - (3)].expression)));
+#line 385 "XPathGrammar.y"
+    {
+        (yyval.expression) = new WebCore::XPath::Union(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(3) - (3)].expression)));
     ;}
     break;
 
   case 44:
-#line 395 "WebCore/xml/XPathGrammar.y"
+#line 392 "XPathGrammar.y"
     {
         (yyval.expression) = (yyvsp[(1) - (1)].locationPath);
@@ -1970 +1968 @@
 
   case 46:
-#line 402 "WebCore/xml/XPathGrammar.y"
+#line 399 "XPathGrammar.y"
     {
         (yyvsp[(3) - (3)].locationPath)->setAbsolute();
-        (yyval.expression) = new XPath::Path(std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<LocationPath>((yyvsp[(3) - (3)].locationPath)));
+        (yyval.expression) = new WebCore::XPath::Path(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::LocationPath>((yyvsp[(3) - (3)].locationPath)));
     ;}
     break;
 
   case 47:
-#line 408 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyvsp[(3) - (3)].locationPath)->prependStep(std::unique_ptr<Step>((yyvsp[(2) - (3)].step)));
+#line 405 "XPathGrammar.y"
+    {
+        (yyvsp[(3) - (3)].locationPath)->prependStep(std::unique_ptr<WebCore::XPath::Step>((yyvsp[(2) - (3)].step)));
         (yyvsp[(3) - (3)].locationPath)->setAbsolute();
-        (yyval.expression) = new XPath::Path(std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<LocationPath>((yyvsp[(3) - (3)].locationPath)));
+        (yyval.expression) = new WebCore::XPath::Path(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::LocationPath>((yyvsp[(3) - (3)].locationPath)));
     ;}
     break;
 
   case 49:
-#line 419 "WebCore/xml/XPathGrammar.y"
-    {
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList((yyvsp[(2) - (2)].expressionVector));
-        (yyval.expression) = new Filter(std::unique_ptr<Expression>((yyvsp[(1) - (2)].expression)), WTFMove(*predicateList));
+#line 416 "XPathGrammar.y"
+    {
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList((yyvsp[(2) - (2)].expressionVector));
+        (yyval.expression) = new WebCore::XPath::Filter(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (2)].expression)), WTFMove(*predicateList));
     ;}
     break;
 
   case 51:
-#line 429 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expression) = new LogicalOp(LogicalOp::OP_Or, std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<Expression>((yyvsp[(3) - (3)].expression)));
+#line 426 "XPathGrammar.y"
+    {
+        (yyval.expression) = new WebCore::XPath::LogicalOp(WebCore::XPath::LogicalOp::OP_Or, std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(3) - (3)].expression)));
     ;}
     break;
 
   case 53:
-#line 438 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expression) = new LogicalOp(LogicalOp::OP_And, std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<Expression>((yyvsp[(3) - (3)].expression)));
+#line 435 "XPathGrammar.y"
+    {
+        (yyval.expression) = new WebCore::XPath::LogicalOp(WebCore::XPath::LogicalOp::OP_And, std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(3) - (3)].expression)));
     ;}
     break;
 
   case 55:
-#line 447 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expression) = new EqTestOp((yyvsp[(2) - (3)].equalityTestOpcode), std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<Expression>((yyvsp[(3) - (3)].expression)));
+#line 444 "XPathGrammar.y"
+    {
+        (yyval.expression) = new WebCore::XPath::EqTestOp((yyvsp[(2) - (3)].equalityTestOpcode), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(3) - (3)].expression)));
     ;}
     break;
 
   case 57:
-#line 456 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expression) = new EqTestOp((yyvsp[(2) - (3)].equalityTestOpcode), std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<Expression>((yyvsp[(3) - (3)].expression)));
+#line 453 "XPathGrammar.y"
+    {
+        (yyval.expression) = new WebCore::XPath::EqTestOp((yyvsp[(2) - (3)].equalityTestOpcode), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(3) - (3)].expression)));
     ;}
     break;
 
   case 59:
-#line 465 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expression) = new NumericOp(NumericOp::OP_Add, std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<Expression>((yyvsp[(3) - (3)].expression)));
+#line 462 "XPathGrammar.y"
+    {
+        (yyval.expression) = new WebCore::XPath::NumericOp(WebCore::XPath::NumericOp::OP_Add, std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(3) - (3)].expression)));
     ;}
     break;
 
   case 60:
-#line 470 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expression) = new NumericOp(NumericOp::OP_Sub, std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<Expression>((yyvsp[(3) - (3)].expression)));
+#line 467 "XPathGrammar.y"
+    {
+        (yyval.expression) = new WebCore::XPath::NumericOp(WebCore::XPath::NumericOp::OP_Sub, std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(3) - (3)].expression)));
     ;}
     break;
 
   case 62:
-#line 479 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expression) = new NumericOp((yyvsp[(2) - (3)].numericOpcode), std::unique_ptr<Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<Expression>((yyvsp[(3) - (3)].expression)));
+#line 476 "XPathGrammar.y"
+    {
+        (yyval.expression) = new WebCore::XPath::NumericOp((yyvsp[(2) - (3)].numericOpcode), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(1) - (3)].expression)), std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(3) - (3)].expression)));
     ;}
     break;
 
   case 64:
-#line 488 "WebCore/xml/XPathGrammar.y"
-    {
-        (yyval.expression) = new Negative(std::unique_ptr<Expression>((yyvsp[(2) - (2)].expression)));
+#line 485 "XPathGrammar.y"
+    {
+        (yyval.expression) = new WebCore::XPath::Negative(std::unique_ptr<WebCore::XPath::Expression>((yyvsp[(2) - (2)].expression)));
     ;}
     break;
@@ -2052 +2050 @@
 
 /* Line 1267 of yacc.c.  */
-#line 2049 "./XPathGrammar.cpp"
+#line 2046 "XPathGrammar.cpp"
       default: break;
     }
@@ -2091 +2089 @@
 #else
       {
-    YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-    if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-      {
-        YYSIZE_T yyalloc = 2 * yysize;
-        if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-          yyalloc = YYSTACK_ALLOC_MAXIMUM;
-        if (yymsg != yymsgbuf)
-          YYSTACK_FREE (yymsg);
-        yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-        if (yymsg)
-          yymsg_alloc = yyalloc;
-        else
-          {
-        yymsg = yymsgbuf;
-        yymsg_alloc = sizeof yymsgbuf;
-          }
+        YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+        if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+          {
+            YYSIZE_T yyalloc = 2 * yysize;
+            if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+              yyalloc = YYSTACK_ALLOC_MAXIMUM;
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+            if (yymsg)
+              yymsg_alloc = yyalloc;
+            else
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+              }
+          }
+
+        if (0 < yysize && yysize <= yymsg_alloc)
+          {
+            (void) yysyntax_error (yymsg, yystate, yychar);
+            yyerror (parser, yymsg);
+          }
+        else
+          {
+            yyerror (parser, YY_("syntax error"));
+            if (yysize != 0)
+              goto yyexhaustedlab;
+          }
       }
-
-    if (0 < yysize && yysize <= yymsg_alloc)
-      {
-        (void) yysyntax_error (yymsg, yystate, yychar);
-        yyerror (parser, yymsg);
-      }
-    else
-      {
-        yyerror (parser, YY_("syntax error"));
-        if (yysize != 0)
-          goto yyexhaustedlab;
-      }
-      }
 #endif
     }
@@ -2129 +2127 @@
     {
       /* If just tried and failed to reuse look-ahead token after an
-     error, discard it.  */
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-    {
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
-        YYABORT;
-    }
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-    {
-      yydestruct ("Error: discarding",
-              yytoken, &yylval, parser);
-      yychar = YYEMPTY;
-    }
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, parser);
+          yychar = YYEMPTY;
+        }
     }
 
@@ -2176 +2174 @@
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;    /* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
@@ -2182 +2180 @@
       yyn = yypact[yystate];
       if (yyn != YYPACT_NINF)
-    {
-      yyn += YYTERROR;
-      if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-        {
-          yyn = yytable[yyn];
-          if (0 < yyn)
-        break;
-        }
-    }
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-    YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-          yystos[yystate], yyvsp, parser);
+                  yystos[yystate], yyvsp, parser);
       YYPOPSTACK (1);
       yystate = *yyssp;
@@ -2244 +2242 @@
   if (yychar != YYEOF && yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
-         yytoken, &yylval, parser);
+                 yytoken, &yylval, parser);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
@@ -2252 +2250 @@
     {
       yydestruct ("Cleanup: popping",
-          yystos[*yyssp], yyvsp, parser);
+                  yystos[*yyssp], yyvsp, parser);
       YYPOPSTACK (1);
     }
@@ -2268 +2266 @@
 
 
-#line 493 "WebCore/xml/XPathGrammar.y"
-
-
+#line 490 "XPathGrammar.y"
+
+

trunk/Source/WebCore/xml/XPathGrammar.y

@@ -53 +53 @@
 %pure-parser
 %lex-param { parser }
-%parse-param { Parser& parser }
+%parse-param { WebCore::XPath::Parser& parser }
 
 %union { 
@@ -101 +101 @@
 %{
 
-static int xpathyylex(YYSTYPE* yylval, Parser& parser) { return parser.lex(*yylval); }
-static void xpathyyerror(Parser&, const char*) { }
+static int xpathyylex(YYSTYPE* yylval, WebCore::XPath::Parser& parser) { return parser.lex(*yylval); }
+static void xpathyyerror(WebCore::XPath::Parser&, const char*) { }
 
 %}
@@ -111 +111 @@
     Expr
     {
-        parser.setParseResult(std::unique_ptr<Expression>($1));
+        parser.setParseResult(std::unique_ptr<WebCore::XPath::Expression>($1));
     }
     ;
@@ -132 +132 @@
     '/'
     {
-        $$ = new LocationPath;
+        $$ = new WebCore::XPath::LocationPath;
     }
     |
@@ -143 +143 @@
     {
         $$ = $2;
-        $$->prependStep(std::unique_ptr<Step>($1));
+        $$->prependStep(std::unique_ptr<WebCore::XPath::Step>($1));
     }
     ;
@@ -150 +150 @@
     Step
     {
-        $$ = new LocationPath;
-        $$->appendStep(std::unique_ptr<Step>($1));
+        $$ = new WebCore::XPath::LocationPath;
+        $$->appendStep(std::unique_ptr<WebCore::XPath::Step>($1));
     }
     |
@@ -157 +157 @@
     {
         $$ = $1;
-        $$->appendStep(std::unique_ptr<Step>($3));
+        $$->appendStep(std::unique_ptr<WebCore::XPath::Step>($3));
     }
     |
@@ -163 +163 @@
     {
         $$ = $1;
-        $$->appendStep(std::unique_ptr<Step>($2));
-        $$->appendStep(std::unique_ptr<Step>($3));
+        $$->appendStep(std::unique_ptr<WebCore::XPath::Step>($2));
+        $$->appendStep(std::unique_ptr<WebCore::XPath::Step>($3));
     }
     ;
@@ -171 +171 @@
     NodeTest OptionalPredicateList
     {
-        std::unique_ptr<Step::NodeTest> nodeTest($1);
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList($2);
+        std::unique_ptr<WebCore::XPath::Step::NodeTest> nodeTest($1);
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList($2);
         if (predicateList)
-            $$ = new Step(Step::ChildAxis, WTFMove(*nodeTest), WTFMove(*predicateList));
+            $$ = new WebCore::XPath::Step(WebCore::XPath::Step::ChildAxis, WTFMove(*nodeTest), WTFMove(*predicateList));
         else
-            $$ = new Step(Step::ChildAxis, WTFMove(*nodeTest));
+            $$ = new WebCore::XPath::Step(WebCore::XPath::Step::ChildAxis, WTFMove(*nodeTest));
     }
     |
@@ -182 +182 @@
     {
         String nametest = adoptRef($1);
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList($2);
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList($2);
 
         String localName;
@@ -192 +192 @@
 
         if (predicateList)
-            $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), WTFMove(*predicateList));
+            $$ = new WebCore::XPath::Step(WebCore::XPath::Step::ChildAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::NameTest, localName, namespaceURI), WTFMove(*predicateList));
         else
-            $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
+            $$ = new WebCore::XPath::Step(WebCore::XPath::Step::ChildAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::NameTest, localName, namespaceURI));
     }
     |
     AxisSpecifier NodeTest OptionalPredicateList
     {
-        std::unique_ptr<Step::NodeTest> nodeTest($2);
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList($3);
+        std::unique_ptr<WebCore::XPath::Step::NodeTest> nodeTest($2);
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList($3);
 
         if (predicateList)
-            $$ = new Step($1, WTFMove(*nodeTest), WTFMove(*predicateList));
+            $$ = new WebCore::XPath::Step($1, WTFMove(*nodeTest), WTFMove(*predicateList));
         else
-            $$ = new Step($1, WTFMove(*nodeTest));
+            $$ = new WebCore::XPath::Step($1, WTFMove(*nodeTest));
     }
     |
@@ -211 +211 @@
     {
         String nametest = adoptRef($2);
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList($3);
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList($3);
 
         String localName;
@@ -221 +221 @@
 
         if (predicateList)
-            $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), WTFMove(*predicateList));
+            $$ = new WebCore::XPath::Step($1, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::NameTest, localName, namespaceURI), WTFMove(*predicateList));
         else
-            $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
+            $$ = new WebCore::XPath::Step($1, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::NameTest, localName, namespaceURI));
     }
     |
@@ -234 +234 @@
     '@'
     {
-        $$ = Step::AttributeAxis;
+        $$ = WebCore::XPath::Step::AttributeAxis;
     }
     ;
@@ -241 +241 @@
     NODE '(' ')'
     {
-        $$ = new Step::NodeTest(Step::NodeTest::AnyNodeTest);
+        $$ = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::AnyNodeTest);
     }
     |
     TEXT_ '(' ')'
     {
-        $$ = new Step::NodeTest(Step::NodeTest::TextNodeTest);
+        $$ = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::TextNodeTest);
     }
     |
     COMMENT '(' ')'
     {
-        $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
+        $$ = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::CommentNodeTest);
     }
     |
     PI '(' ')'
     {
-        $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
+        $$ = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::ProcessingInstructionNodeTest);
     }
     |
@@ -262 +262 @@
     {
         String literal = adoptRef($3);
-        $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, literal.stripWhiteSpace());
+        $$ = new WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::ProcessingInstructionNodeTest, literal.stripWhiteSpace());
     }
     ;
@@ -278 +278 @@
     Predicate
     {
-        $$ = new Vector<std::unique_ptr<Expression>>;
-        $$->append(std::unique_ptr<Expression>($1));
+        $$ = new Vector<std::unique_ptr<WebCore::XPath::Expression>>;
+        $$->append(std::unique_ptr<WebCore::XPath::Expression>($1));
     }
     |
@@ -285 +285 @@
     {
         $$ = $1;
-        $$->append(std::unique_ptr<Expression>($2));
+        $$->append(std::unique_ptr<WebCore::XPath::Expression>($2));
     }
     ;
@@ -299 +299 @@
     SLASHSLASH
     {
-        $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+        $$ = new WebCore::XPath::Step(WebCore::XPath::Step::DescendantOrSelfAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::AnyNodeTest));
     }
     ;
@@ -306 +306 @@
     '.'
     {
-        $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+        $$ = new WebCore::XPath::Step(WebCore::XPath::Step::SelfAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::AnyNodeTest));
     }
     |
     DOTDOT
     {
-        $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+        $$ = new WebCore::XPath::Step(WebCore::XPath::Step::ParentAxis, WebCore::XPath::Step::NodeTest(WebCore::XPath::Step::NodeTest::AnyNodeTest));
     }
     ;
@@ -319 +319 @@
     {
         String name = adoptRef($1);
-        $$ = new VariableReference(name);
+        $$ = new WebCore::XPath::VariableReference(name);
     }
     |
@@ -330 +330 @@
     {
         String literal = adoptRef($1);
-        $$ = new StringExpression(WTFMove(literal));
+        $$ = new WebCore::XPath::StringExpression(WTFMove(literal));
     }
     |
@@ -336 +336 @@
     {
         String numeral = adoptRef($1);
-        $$ = new Number(numeral.toDouble());
+        $$ = new WebCore::XPath::Number(numeral.toDouble());
     }
     |
@@ -346 +346 @@
     {
         String name = adoptRef($1);
-        $$ = XPath::Function::create(name).release();
+        $$ = WebCore::XPath::Function::create(name).release();
         if (!$$)
             YYABORT;
@@ -354 +354 @@
     {
         String name = adoptRef($1);
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> argumentList($3);
-        $$ = XPath::Function::create(name, WTFMove(*argumentList)).release();
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> argumentList($3);
+        $$ = WebCore::XPath::Function::create(name, WTFMove(*argumentList)).release();
         if (!$$)
             YYABORT;
@@ -364 +364 @@
     Argument
     {
-        $$ = new Vector<std::unique_ptr<Expression>>;
-        $$->append(std::unique_ptr<Expression>($1));
+        $$ = new Vector<std::unique_ptr<WebCore::XPath::Expression>>;
+        $$->append(std::unique_ptr<WebCore::XPath::Expression>($1));
     }
     |
@@ -371 +371 @@
     {
         $$ = $1;
-        $$->append(std::unique_ptr<Expression>($3));
+        $$->append(std::unique_ptr<WebCore::XPath::Expression>($3));
     }
     ;
@@ -384 +384 @@
     UnionExpr '|' PathExpr
     {
-        $$ = new Union(std::unique_ptr<Expression>($1), std::unique_ptr<Expression>($3));
+        $$ = new WebCore::XPath::Union(std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::Expression>($3));
     }
     ;
@@ -399 +399 @@
     {
         $3->setAbsolute();
-        $$ = new XPath::Path(std::unique_ptr<Expression>($1), std::unique_ptr<LocationPath>($3));
+        $$ = new WebCore::XPath::Path(std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::LocationPath>($3));
     }
     |
     FilterExpr DescendantOrSelf RelativeLocationPath
     {
-        $3->prependStep(std::unique_ptr<Step>($2));
+        $3->prependStep(std::unique_ptr<WebCore::XPath::Step>($2));
         $3->setAbsolute();
-        $$ = new XPath::Path(std::unique_ptr<Expression>($1), std::unique_ptr<LocationPath>($3));
+        $$ = new WebCore::XPath::Path(std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::LocationPath>($3));
     }
     ;
@@ -415 +415 @@
     PrimaryExpr PredicateList
     {
-        std::unique_ptr<Vector<std::unique_ptr<Expression>>> predicateList($2);
-        $$ = new Filter(std::unique_ptr<Expression>($1), WTFMove(*predicateList));
+        std::unique_ptr<Vector<std::unique_ptr<WebCore::XPath::Expression>>> predicateList($2);
+        $$ = new WebCore::XPath::Filter(std::unique_ptr<WebCore::XPath::Expression>($1), WTFMove(*predicateList));
     }
     ;
@@ -425 +425 @@
     OrExpr OR AndExpr
     {
-        $$ = new LogicalOp(LogicalOp::OP_Or, std::unique_ptr<Expression>($1), std::unique_ptr<Expression>($3));
+        $$ = new WebCore::XPath::LogicalOp(WebCore::XPath::LogicalOp::OP_Or, std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::Expression>($3));
     }
     ;
@@ -434 +434 @@
     AndExpr AND EqualityExpr
     {
-        $$ = new LogicalOp(LogicalOp::OP_And, std::unique_ptr<Expression>($1), std::unique_ptr<Expression>($3));
+        $$ = new WebCore::XPath::LogicalOp(WebCore::XPath::LogicalOp::OP_And, std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::Expression>($3));
     }
     ;
@@ -443 +443 @@
     EqualityExpr EQOP RelationalExpr
     {
-        $$ = new EqTestOp($2, std::unique_ptr<Expression>($1), std::unique_ptr<Expression>($3));
+        $$ = new WebCore::XPath::EqTestOp($2, std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::Expression>($3));
     }
     ;
@@ -452 +452 @@
     RelationalExpr RELOP AdditiveExpr
     {
-        $$ = new EqTestOp($2, std::unique_ptr<Expression>($1), std::unique_ptr<Expression>($3));
+        $$ = new WebCore::XPath::EqTestOp($2, std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::Expression>($3));
     }
     ;
@@ -461 +461 @@
     AdditiveExpr PLUS MultiplicativeExpr
     {
-        $$ = new NumericOp(NumericOp::OP_Add, std::unique_ptr<Expression>($1), std::unique_ptr<Expression>($3));
+        $$ = new WebCore::XPath::NumericOp(WebCore::XPath::NumericOp::OP_Add, std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::Expression>($3));
     }
     |
     AdditiveExpr MINUS MultiplicativeExpr
     {
-        $$ = new NumericOp(NumericOp::OP_Sub, std::unique_ptr<Expression>($1), std::unique_ptr<Expression>($3));
+        $$ = new WebCore::XPath::NumericOp(WebCore::XPath::NumericOp::OP_Sub, std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::Expression>($3));
     }
     ;
@@ -475 +475 @@
     MultiplicativeExpr MULOP UnaryExpr
     {
-        $$ = new NumericOp($2, std::unique_ptr<Expression>($1), std::unique_ptr<Expression>($3));
+        $$ = new WebCore::XPath::NumericOp($2, std::unique_ptr<WebCore::XPath::Expression>($1), std::unique_ptr<WebCore::XPath::Expression>($3));
     }
     ;
@@ -484 +484 @@
     MINUS UnaryExpr
     {
-        $$ = new Negative(std::unique_ptr<Expression>($2));
+        $$ = new WebCore::XPath::Negative(std::unique_ptr<WebCore::XPath::Expression>($2));
     }
     ;