mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cql3: Move parser out of cql3 namespace

Browse Source 
This moves parser from cql3 to cql3_parser namespace to avoid name
conflicts between parser rules and classes defined in the cql3
namespace. In particular the "term" rule would conflict with the
"term" class, leading to compilation errors. I figured it will be
easier to change namespace than to rename all rule occurances.
This commit is contained in:
Tomasz Grabiec
2015-02-09 20:14:48 +01:00
parent 2f9476d712
commit cecf06f44d
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
cql3/Cql.g
View File

@@ -23,7 +23,7 @@ options {
language = Cpp;
}
@parser::namespace{cql3}
@parser::namespace{cql3_parser}
@parser::includes {
#include "cql3/statements/select_statement.hh"
@@ -39,9 +39,10 @@ options {
}
@parser::traits {
using namespace cql3;
using namespace cql3::statements;
using namespace cql3::selection;
using cql3::cql3_type;
using cql3::native_cql3_type;
}
@header {
@@ -191,7 +192,7 @@ using namespace cql3::selection;
#endif
}
@lexer::namespace{cql3}
@lexer::namespace{cql3_parser}
@lexer::traits {
class CqlLexer;
@@ -346,7 +347,7 @@ selectClause returns [std::vector<shared_ptr<raw_selector>> expr]
;
selector returns [shared_ptr<raw_selector> s]
@init{ shared_ptr<column_identifier> alias; }
@init{ shared_ptr<cql3::column_identifier> alias; }
: us=unaliasedSelector (K_AS c=ident { alias = c; })? { $s = make_shared<raw_selector>(us, alias); }
;
@@ -981,22 +982,22 @@ userOption[UserOptions opts]
// Column Identifiers. These need to be treated differently from other
// identifiers because the underlying comparator is not necessarily text. See
// CASSANDRA-8178 for details.
cident returns [shared_ptr<column_identifier::raw> id]
: t=IDENT { $id = make_shared<column_identifier::raw>(sstring{$t.text}, false); }
| t=QUOTED_NAME { $id = make_shared<column_identifier::raw>(sstring{$t.text}, true); }
| k=unreserved_keyword { $id = make_shared<column_identifier::raw>(k, false); }
cident returns [shared_ptr<cql3::column_identifier::raw> id]
: t=IDENT { $id = make_shared<cql3::column_identifier::raw>(sstring{$t.text}, false); }
| t=QUOTED_NAME { $id = make_shared<cql3::column_identifier::raw>(sstring{$t.text}, true); }
| k=unreserved_keyword { $id = make_shared<cql3::column_identifier::raw>(k, false); }
;
// Identifiers that do not refer to columns or where the comparator is known to be text
ident returns [shared_ptr<column_identifier> id]
: t=IDENT { $id = make_shared<column_identifier>(sstring{$t.text}, false); }
| t=QUOTED_NAME { $id = make_shared<column_identifier>(sstring{$t.text}, true); }
| k=unreserved_keyword { $id = make_shared<column_identifier>(k, false); }
ident returns [shared_ptr<cql3::column_identifier> id]
: t=IDENT { $id = make_shared<cql3::column_identifier>(sstring{$t.text}, false); }
| t=QUOTED_NAME { $id = make_shared<cql3::column_identifier>(sstring{$t.text}, true); }
| k=unreserved_keyword { $id = make_shared<cql3::column_identifier>(k, false); }
;
// Keyspace & Column family names
keyspaceName returns [sstring id]
@init { auto name = make_shared<cf_name>(); }
@init { auto name = make_shared<cql3::cf_name>(); }
: cfOrKsName[name, true] { $id = name->get_keyspace(); }
;
@@ -1013,8 +1014,8 @@ idxOrKsName[IndexName name, boolean isKs]
;
#endif
columnFamilyName returns [shared_ptr<cf_name> name]
@init { $name = make_shared<cf_name>(); }
columnFamilyName returns [shared_ptr<cql3::cf_name> name]
@init { $name = make_shared<cql3::cf_name>(); }
: (cfOrKsName[name, true] '.')? cfOrKsName[name, false]
;
@@ -1024,7 +1025,7 @@ userTypeName returns [UTName name]
;
#endif
cfOrKsName[shared_ptr<cf_name> name, bool isKs]
cfOrKsName[shared_ptr<cql3::cf_name> name, bool isKs]
: t=IDENT { if (isKs) $name->set_keyspace($t.text, false); else $name->set_column_family($t.text, false); }
| t=QUOTED_NAME { if (isKs) $name->set_keyspace($t.text, true); else $name->set_column_family($t.text, true); }
| k=unreserved_keyword { if (isKs) $name->set_keyspace(k, false); else $name->set_column_family(k, false); }
@@ -1033,15 +1034,15 @@ cfOrKsName[shared_ptr<cf_name> name, bool isKs]
#endif
;
constant returns [shared_ptr<constants::literal> constant]
constant returns [shared_ptr<cql3::constants::literal> constant]
@init{std::string sign;}
: t=STRING_LITERAL { $constant = constants::literal::string(sstring{$t.text}); }
| t=INTEGER { $constant = constants::literal::integer(sstring{$t.text}); }
| t=FLOAT { $constant = constants::literal::floating_point(sstring{$t.text}); }
| t=BOOLEAN { $constant = constants::literal::bool_(sstring{$t.text}); }
| t=UUID { $constant = constants::literal::uuid(sstring{$t.text}); }
| t=HEXNUMBER { $constant = constants::literal::hex(sstring{$t.text}); }
| { sign=""; } ('-' {sign = "-"; } )? t=(K_NAN | K_INFINITY) { $constant = constants::literal::floating_point(sstring{sign + $t.text}); }
: t=STRING_LITERAL { $constant = cql3::constants::literal::string(sstring{$t.text}); }
| t=INTEGER { $constant = cql3::constants::literal::integer(sstring{$t.text}); }
| t=FLOAT { $constant = cql3::constants::literal::floating_point(sstring{$t.text}); }
| t=BOOLEAN { $constant = cql3::constants::literal::bool_(sstring{$t.text}); }
| t=UUID { $constant = cql3::constants::literal::uuid(sstring{$t.text}); }
| t=HEXNUMBER { $constant = cql3::constants::literal::hex(sstring{$t.text}); }
| { sign=""; } ('-' {sign = "-"; } )? t=(K_NAN | K_INFINITY) { $constant = cql3::constants::literal::floating_point(sstring{sign + $t.text}); }
;
#if 0
@@ -1094,9 +1095,9 @@ value returns [Term.Raw value]
;
#endif
intValue returns [::shared_ptr<term::raw> value]
intValue returns [::shared_ptr<cql3::term::raw> value]
:
| t=INTEGER { $value = constants::literal::integer(sstring{$t.text}); }
| t=INTEGER { $value = cql3::constants::literal::integer(sstring{$t.text}); }
#if 0
| ':' id=ident { $value = newBindVariables(id); }
| QMARK { $value = newBindVariables(null); }

8
transport/server.cc
View File

@@ -362,10 +362,10 @@ future<> cql_server::connection::process_query(uint16_t stream, temporary_buffer
auto flags = read_byte(buf);
#endif
print("processing query: '%s' ...\n", query);
cql3::CqlLexer::InputStreamType input{reinterpret_cast<const ANTLR_UINT8*>(query.begin()), ANTLR_ENC_UTF8, static_cast<ANTLR_UINT32>(query.size()), nullptr};
cql3::CqlLexer lexer{&input};
cql3::CqlParser::TokenStreamType tstream(ANTLR_SIZE_HINT, lexer.get_tokSource());
cql3::CqlParser parser{&tstream};
cql3_parser::CqlLexer::InputStreamType input{reinterpret_cast<const ANTLR_UINT8*>(query.begin()), ANTLR_ENC_UTF8, static_cast<ANTLR_UINT32>(query.size()), nullptr};
cql3_parser::CqlLexer lexer{&input};
cql3_parser::CqlParser::TokenStreamType tstream(ANTLR_SIZE_HINT, lexer.get_tokSource());
cql3_parser::CqlParser parser{&tstream};
auto stmt = parser.query();
assert(stmt != nullptr);
return make_ready_future<>();