diff options
| author | George Wangensteen <george.wangensteen@mongodb.com> | 2020-10-08 16:20:42 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-10-09 01:04:18 +0000 |
| commit | f5683949f9df47c9a513f5480ced03b30abca6fb (patch) | |
| tree | 7deb46ae442fa1e1b65113af2f7b41a00ccea4fa /src/mongo/db/cst | |
| parent | 7c7f722ff4580dd682bc1fa2451ddf600929cc71 (diff) | |
| download | mongo-f5683949f9df47c9a513f5480ced03b30abca6fb.tar.gz | |
SERVER-48863 Incorporate windows compile fix into grammar.
Diffstat (limited to 'src/mongo/db/cst')
| -rw-r--r-- | src/mongo/db/cst/grammar.yy | 6 | ||||
| -rw-r--r-- | src/mongo/db/cst/parser_gen.cpp | 6 | ||||
| -rw-r--r-- | src/mongo/db/cst/parser_gen.hpp | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/db/cst/grammar.yy b/src/mongo/db/cst/grammar.yy index a35f03f5a64..d568e66fb59 100644 --- a/src/mongo/db/cst/grammar.yy +++ b/src/mongo/db/cst/grammar.yy @@ -209,7 +209,7 @@ GTE HOUR ID - IN + IN_ INDEX_KEY "indexKey" INDEX_OF_ARRAY INDEX_OF_BYTES @@ -1378,7 +1378,7 @@ aggExprAsUserFieldname: | FIRST { $$ = UserFieldname{"$first"}; } - | IN { + | IN_ { $$ = UserFieldname{"$in"}; } | INDEX_OF_ARRAY { @@ -2030,7 +2030,7 @@ first: ; in: - START_OBJECT IN exprFixedTwoArg END_OBJECT { + START_OBJECT IN_ exprFixedTwoArg END_OBJECT { $$ = CNode{CNode::ObjectChildren{{KeyFieldname::in, $exprFixedTwoArg}}}; } diff --git a/src/mongo/db/cst/parser_gen.cpp b/src/mongo/db/cst/parser_gen.cpp index 828e6626e62..c30f46178f8 100644 --- a/src/mongo/db/cst/parser_gen.cpp +++ b/src/mongo/db/cst/parser_gen.cpp @@ -4588,7 +4588,7 @@ int ParserGen::parse() { #line 4449 "parser_gen.cpp" break; - case 275: // aggExprAsUserFieldname: IN + case 275: // aggExprAsUserFieldname: IN_ #line 1381 "grammar.yy" { yylhs.value.as<CNode::Fieldname>() = UserFieldname{"$in"}; @@ -6351,7 +6351,7 @@ int ParserGen::parse() { #line 5920 "parser_gen.cpp" break; - case 477: // in: "object" IN exprFixedTwoArg "end of object" + case 477: // in: "object" IN_ exprFixedTwoArg "end of object" #line 2033 "grammar.yy" { yylhs.value.as<CNode>() = CNode{CNode::ObjectChildren{ @@ -10261,7 +10261,7 @@ const char* const ParserGen::yytname_[] = {"\"EOF\"", "GTE", "HOUR", "ID", - "IN", + "IN_", "\"indexKey\"", "INDEX_OF_ARRAY", "INDEX_OF_BYTES", diff --git a/src/mongo/db/cst/parser_gen.hpp b/src/mongo/db/cst/parser_gen.hpp index edab3a2746a..0bbcfb616cb 100644 --- a/src/mongo/db/cst/parser_gen.hpp +++ b/src/mongo/db/cst/parser_gen.hpp @@ -820,7 +820,7 @@ public: GTE = 90, // GTE HOUR = 91, // HOUR ID = 92, // ID - IN_ = 93, // IN + IN_ = 93, // IN_ INDEX_KEY = 94, // "indexKey" INDEX_OF_ARRAY = 95, // INDEX_OF_ARRAY INDEX_OF_BYTES = 96, // INDEX_OF_BYTES @@ -1049,7 +1049,7 @@ public: S_GTE = 90, // GTE S_HOUR = 91, // HOUR S_ID = 92, // ID - S_IN = 93, // IN + S_IN_ = 93, // IN_ S_INDEX_KEY = 94, // "indexKey" S_INDEX_OF_ARRAY = 95, // INDEX_OF_ARRAY S_INDEX_OF_BYTES = 96, // INDEX_OF_BYTES @@ -3697,11 +3697,11 @@ public: } #endif #if 201103L <= YY_CPLUSPLUS - static symbol_type make_IN(location_type l) { + static symbol_type make_IN_(location_type l) { return symbol_type(token::IN_, std::move(l)); } #else - static symbol_type make_IN(const location_type& l) { + static symbol_type make_IN_(const location_type& l) { return symbol_type(token::IN_, l); } #endif |