| Index: third_party/WebKit/Source/core/xml/XPathGrammar.y
|
| diff --git a/third_party/WebKit/Source/core/xml/XPathGrammar.y b/third_party/WebKit/Source/core/xml/XPathGrammar.y
|
| index 83836325e68cb485ab376ca4e295f72b74c725a7..ebb2d5481578096e46be847955dce5467a2d2158 100644
|
| --- a/third_party/WebKit/Source/core/xml/XPathGrammar.y
|
| +++ b/third_party/WebKit/Source/core/xml/XPathGrammar.y
|
| @@ -121,7 +121,7 @@ static void xpathyyerror(void*, const char*) { }
|
| Expr:
|
| OrExpr
|
| {
|
| - parser->m_topExpr = $1;
|
| + parser->top_expr_ = $1;
|
| }
|
| ;
|
|
|
| @@ -178,9 +178,9 @@ 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
|
| @@ -188,14 +188,14 @@ Step:
|
| 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);
|
| }
|
| |
|
| @@ -212,14 +212,14 @@ Step:
|
| 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);
|
| }
|
| |
|
| @@ -231,7 +231,7 @@ AxisSpecifier:
|
| |
|
| '@'
|
| {
|
| - $$ = Step::AttributeAxis;
|
| + $$ = Step::kAttributeAxis;
|
| }
|
| ;
|
|
|
| @@ -239,24 +239,24 @@ 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);
|
| }
|
| @@ -294,19 +294,19 @@ Predicate:
|
| 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));
|
| }
|
| ;
|
|
|
| @@ -419,7 +419,7 @@ OrExpr:
|
| |
|
| OrExpr OR AndExpr
|
| {
|
| - $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
|
| + $$ = new LogicalOp(LogicalOp::kOP_Or, $1, $3);
|
| }
|
| ;
|
|
|
| @@ -428,7 +428,7 @@ AndExpr:
|
| |
|
| AndExpr AND EqualityExpr
|
| {
|
| - $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
|
| + $$ = new LogicalOp(LogicalOp::kOP_And, $1, $3);
|
| }
|
| ;
|
|
|
| @@ -455,12 +455,12 @@ AdditiveExpr:
|
| |
|
| 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);
|
| }
|
| ;
|
|
|
|
|