ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

third_party/WebKit/Source/core/xml/XPathGrammar.y

 /*
  * Copyright 2005 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 103 matching lines @@
 %type <expr> RelationalExpr
 %type <expr> AdditiveExpr
 %type <expr> MultiplicativeExpr
 %type <expr> UnaryExpr
 
 %%
 
 Expr:
     OrExpr
     {
-        parser->m_topExpr = $1;
+        parser->top_expr_ = $1;
     }
     ;
 
 LocationPath:
     RelativeLocationPath
     {
         $$->setAbsolute(false);
     }
     |
     AbsoluteLocationPath
@@ skipping 36 matching lines @@
     {
         $$->appendStep($2);
         $$->appendStep($3);
     }
     ;
 
 Step:
     NodeTest OptionalPredicateList
     {
         if ($2)
-            $$ = new Step(Step::ChildAxis, *$1, *$2);
+            $$ = new Step(Step::kChildAxis, *$1, *$2);
         else
-            $$ = new Step(Step::ChildAxis, *$1);
+            $$ = new Step(Step::kChildAxis, *$1);
     }
     |
     NAMETEST OptionalPredicateList
     {
         AtomicString localName;
         AtomicString namespaceURI;
         if (!parser->expandQName(*$1, localName, namespaceURI)) {
-            parser->m_gotNamespaceError = true;
+            parser->got_namespace_error_ = true;
             YYABORT;
         }
 
         if ($2)
-            $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
+            $$ = new Step(Step::kChildAxis, Step::NodeTest(Step::NodeTest::kNameTest, localName, namespaceURI), *$2);
         else
-            $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
+            $$ = new Step(Step::kChildAxis, Step::NodeTest(Step::NodeTest::kNameTest, localName, namespaceURI));
         parser->deleteString($1);
     }
     |
     AxisSpecifier NodeTest OptionalPredicateList
     {
         if ($3)
             $$ = new Step($1, *$2, *$3);
         else
             $$ = new Step($1, *$2);
     }
     |
     AxisSpecifier NAMETEST OptionalPredicateList
     {
         AtomicString localName;
         AtomicString namespaceURI;
         if (!parser->expandQName(*$2, localName, namespaceURI)) {
-            parser->m_gotNamespaceError = true;
+            parser->got_namespace_error_ = true;
             YYABORT;
         }
 
         if ($3)
-            $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
+            $$ = new Step($1, Step::NodeTest(Step::NodeTest::kNameTest, localName, namespaceURI), *$3);
         else
-            $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
+            $$ = new Step($1, Step::NodeTest(Step::NodeTest::kNameTest, localName, namespaceURI));
         parser->deleteString($2);
     }
     |
     AbbreviatedStep
     ;
 
 AxisSpecifier:
     AXISNAME
     |
     '@'
     {
-        $$ = Step::AttributeAxis;
+        $$ = Step::kAttributeAxis;
     }
     ;
 
 NodeTest:
     NODETYPE '(' ')'
     {
         if (*$1 == "node")
-            $$ = new Step::NodeTest(Step::NodeTest::AnyNodeTest);
+            $$ = new Step::NodeTest(Step::NodeTest::kAnyNodeTest);
         else if (*$1 == "text")
-            $$ = new Step::NodeTest(Step::NodeTest::TextNodeTest);
+            $$ = new Step::NodeTest(Step::NodeTest::kTextNodeTest);
         else if (*$1 == "comment")
-            $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
+            $$ = new Step::NodeTest(Step::NodeTest::kCommentNodeTest);
 
         parser->deleteString($1);
     }
     |
     PI '(' ')'
     {
-        $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
+        $$ = new Step::NodeTest(Step::NodeTest::kProcessingInstructionNodeTest);
         parser->deleteString($1);
     }
     |
     PI '(' LITERAL ')'
     {
-        $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
+        $$ = new Step::NodeTest(Step::NodeTest::kProcessingInstructionNodeTest, $3->stripWhiteSpace());
         parser->deleteString($1);
         parser->deleteString($3);
     }
     ;
 
 OptionalPredicateList:
     /* empty */
     {
         $$ = 0;
     }
@@ skipping 17 matching lines @@
 Predicate:
     '[' Expr ']'
     {
         $$ = $2;
     }
     ;
 
 DescendantOrSelf:
     SLASHSLASH
     {
-        $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+        $$ = new Step(Step::kDescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::kAnyNodeTest));
     }
     ;
 
 AbbreviatedStep:
     '.'
     {
-        $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+        $$ = new Step(Step::kSelfAxis, Step::NodeTest(Step::NodeTest::kAnyNodeTest));
     }
     |
     DOTDOT
     {
-        $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
+        $$ = new Step(Step::kParentAxis, Step::NodeTest(Step::NodeTest::kAnyNodeTest));
     }
     ;
 
 PrimaryExpr:
     VARIABLEREFERENCE
     {
         $$ = new VariableReference(*$1);
         parser->deleteString($1);
     }
     |
@@ skipping 92 matching lines @@
     {
         $$ = new blink::XPath::Filter($1, *$2);
     }
     ;
 
 OrExpr:
     AndExpr
     |
     OrExpr OR AndExpr
     {
-        $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
+        $$ = new LogicalOp(LogicalOp::kOP_Or, $1, $3);
     }
     ;
 
 AndExpr:
     EqualityExpr
     |
     AndExpr AND EqualityExpr
     {
-        $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
+        $$ = new LogicalOp(LogicalOp::kOP_And, $1, $3);
     }
     ;
 
 EqualityExpr:
     RelationalExpr
     |
     EqualityExpr EQOP RelationalExpr
     {
         $$ = new EqTestOp($2, $1, $3);
     }
     ;
 
 RelationalExpr:
     AdditiveExpr
     |
     RelationalExpr RELOP AdditiveExpr
     {
         $$ = new EqTestOp($2, $1, $3);
     }
     ;
 
 AdditiveExpr:
     MultiplicativeExpr
     |
     AdditiveExpr PLUS MultiplicativeExpr
     {
-        $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
+        $$ = new NumericOp(NumericOp::kOP_Add, $1, $3);
     }
     |
     AdditiveExpr MINUS MultiplicativeExpr
     {
-        $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
+        $$ = new NumericOp(NumericOp::kOP_Sub, $1, $3);
     }
     ;
 
 MultiplicativeExpr:
     UnaryExpr
     |
     MultiplicativeExpr MULOP UnaryExpr
     {
         $$ = new NumericOp($2, $1, $3);
     }
     ;
 
 UnaryExpr:
     UnionExpr
     |
     MINUS UnaryExpr
     {
         $$ = new Negative;
         $$->addSubExpression($2);
     }
     ;
 
 %%