draw statement back (02b011d6) · Commits · github_fork / Clip

src/query/parser.cc

+8 −10

Original line number	Diff line number	Diff line
		@@ -198,8 +198,8 @@ ASTNode* Parser::statement() {
		return selectStatement();
		case Token::T_CREATE:
		return createStatement();
		//case Token::T_BEGIN:
		// return beginStatement();
		case Token::T_BEGIN:
		return beginStatement();
		}

		addError(
		@@ -296,8 +296,8 @@ ASTNode* Parser::createStatement() {
		return nullptr;
		}

		/*
		ASTNode* Parser::drawStatement() {

		ASTNode* Parser::beginStatement() {
		auto draw = new ASTNode(ASTNode::T_DRAW);
		consumeToken();

		@@ -317,17 +317,15 @@ ASTNode* Parser::drawStatement() {
		return nullptr;
		}

		// FIXPAUL parse params

		if (*cur_token_ == Token::T_SEMICOLON) {
		consumeToken();
		if (consumeIf(Token::T_WITH)) {
		draw->appendChild(selectStatement());
		} else {
		consumeIf(Token::T_SEMICOLON);
		}

		return draw;
		}

		*/

		ASTNode* Parser::selectSublist() {
		/* table_name.* */
		if (lookahead(0, Token::T_IDENTIFIER) &&

+1 −0

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ Query::Query(const char* query_string, query::TableRepository* repo) {
		switch (stmt->getType()) {
		case query::ASTNode::T_SELECT:
		case query::ASTNode::T_SERIES:
		case query::ASTNode::T_DRAW:
		addStatement(stmt, repo);
		break;
		default:

+2 −0

Original line number	Diff line number	Diff line
		@@ -852,6 +852,8 @@ public:
		std::unique_ptr<TableRef>(new TestTable2Ref()));

		auto query = Query(
		" BEGIN BAR CHART;"
		""
		" CREATE SERIES WITH"
		" SELECT"
		" one, two"

+0 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,6 @@ Executable* QueryPlan::buildSeriesStatement(
		TableRepository* repo) {
		auto select_ast = ast->getChildren()[0];
		assert(*select_ast == ASTNode::T_SELECT);
		printf("exec\n");

		/* build nested select statement */
		auto select = buildQueryPlan(select_ast, repo);