renamed SQLStatementList to SQLParserResult and moved into separate file

src/SQLParser.cpp

@@ -8,38 +8,38 @@
 
 namespace hsql {
 
-SQLParser::SQLParser() {
+	SQLParser::SQLParser() {
-	fprintf(stderr, "SQLParser only has static methods atm! Do not initialize!\n");
+		fprintf(stderr, "SQLParser only has static methods atm! Do not initialize!\n");
-}
+	}
 
 
-SQLStatementList* SQLParser::parseSQLString(const char *text) {
+	SQLParserResult* SQLParser::parseSQLString(const char *text) {
-    SQLStatementList* result;
+		SQLParserResult* result = NULL;
-    yyscan_t scanner;
+		yyscan_t scanner;
-    YY_BUFFER_STATE state;
+		YY_BUFFER_STATE state;
 
-    if (hsql_lex_init(&scanner)) {
+		if (hsql_lex_init(&scanner)) {
-        // couldn't initialize
+			// couldn't initialize
-        fprintf(stderr, "[Error] SQLParser: Error when initializing lexer!\n");
+			fprintf(stderr, "[Error] SQLParser: Error when initializing lexer!\n");
-        return NULL;
+			return NULL;
-    }
+		}
 
-    state = hsql__scan_string(text, scanner);
+		state = hsql__scan_string(text, scanner);
 
-    if (hsql_parse(&result, scanner)) {
+		if (hsql_parse(&result, scanner)) {
-        // Returns an error stmt object
+			// Returns an error stmt object
-        return result;
+			return result;
-    }
+		}
 
-    hsql__delete_buffer(state, scanner);
+		hsql__delete_buffer(state, scanner);
 
-    hsql_lex_destroy(scanner);
+		hsql_lex_destroy(scanner);
-    return result;
+		return result;
-}
+	}
 
-SQLStatementList* SQLParser::parseSQLString(const std::string& text) {
+	SQLParserResult* SQLParser::parseSQLString(const std::string& text) {
-    return parseSQLString(text.c_str());
+		return parseSQLString(text.c_str());
-}
+	}
 
-    
+	
 } // namespace hsql

src/SQLParser.h

@@ -2,24 +2,21 @@
 #define __SQLPARSER_H_
 
 #include "sqltypes.h"
+#include "SQLParserResult.h"
+#include "sql/statements.h"
 
 namespace hsql {
+	/**
+	 * Main class for parsing SQL strings
+	 */
+	class SQLParser {
+	public:
+		static SQLParserResult* parseSQLString(const char* sql);
+		static SQLParserResult* parseSQLString(const std::string& sql);
 
-/*!
+	private:
- * \mainpage SQLParser (C++)
+		SQLParser();
- */
+	};
-
-/*!
- * @brief Main class for parsing SQL strings
- */
-class SQLParser {
-public:
-	static SQLStatementList* parseSQLString(const char* sql);
-	static SQLStatementList* parseSQLString(const std::string& sql);
-
-private:
-	SQLParser();
-};
 
 	
 } // namespace hsql

src/SQLParserResult.cpp

@@ -0,0 +1,2 @@
+
+#include "SQLParserResult.h"

src/SQLParserResult.h

@@ -0,0 +1,43 @@
+#ifndef __SQLPARSERRESULT__
+#define __SQLPARSERRESULT__
+
+#include "sql/SQLStatement.h"
+
+namespace hsql {
+	/** 
+	 * Represents the result of the SQLParser.
+	 * If parsing was successful it contains a list of SQLStatement.
+	 */
+	struct SQLParserResult {
+	public:
+		SQLParserResult() :
+			isValid(true),
+			parser_msg(NULL) {};
+
+		SQLParserResult(SQLStatement* stmt) :
+			isValid(true),
+			parser_msg(NULL) {
+			addStatement(stmt); 
+		};
+			
+		virtual ~SQLParserResult() {
+			for (std::vector<SQLStatement*>::iterator it = statements.begin(); it != statements.end(); ++it) {
+				delete *it;
+			}
+			delete parser_msg;
+		}
+
+		void addStatement(SQLStatement* stmt) { statements.push_back(stmt); }
+		SQLStatement* getStatement(int id) { return statements[id]; }
+		size_t numStatements() { return statements.size(); }
+		
+		std::vector<SQLStatement*> statements;
+		bool isValid;
+		const char* parser_msg;
+		int error_line;
+		int error_col;
+	};
+
+}
+
+#endif // __SQLPARSERRESULT__

src/parser/bison_parser.h

@@ -48,9 +48,12 @@
 extern int hsql_debug;
 #endif
 /* "%code requires" blocks.  */
-#line 43 "bison_parser.y" /* yacc.c:1909  */
+#line 42 "bison_parser.y" /* yacc.c:1909  */
 
 // %code requires block	
+
+#include "../sql/statements.h"
+#include "../SQLParserResult.h"
 #include "parser_typedef.h"
 
 // Auto update column and line number
@@ -68,7 +71,7 @@ extern int hsql_debug;
         } \
     }
 
-#line 72 "bison_parser.h" /* yacc.c:1909  */
+#line 75 "bison_parser.h" /* yacc.c:1909  */
 
 /* Token type.  */
 #ifndef HSQL_TOKENTYPE
@@ -206,7 +209,7 @@ extern int hsql_debug;
 typedef union HSQL_STYPE HSQL_STYPE;
 union HSQL_STYPE
 {
-#line 99 "bison_parser.y" /* yacc.c:1909  */
+#line 101 "bison_parser.y" /* yacc.c:1909  */
 
 	double fval;
 	int64_t ival;
@@ -234,7 +237,7 @@ union HSQL_STYPE
 	hsql::GroupByDescription* group_t;
 	hsql::UpdateClause* update_t;
 
-	hsql::SQLStatementList* stmt_list;
+	hsql::SQLParserResult* stmt_list;
 
 	std::vector<char*>* str_vec;
 	std::vector<hsql::TableRef*>* table_vec;
@@ -242,7 +245,7 @@ union HSQL_STYPE
 	std::vector<hsql::UpdateClause*>* update_vec;
 	std::vector<hsql::Expr*>* expr_vec;
 
-#line 246 "bison_parser.h" /* yacc.c:1909  */
+#line 249 "bison_parser.h" /* yacc.c:1909  */
 };
 # define HSQL_STYPE_IS_TRIVIAL 1
 # define HSQL_STYPE_IS_DECLARED 1
@@ -264,6 +267,6 @@ struct HSQL_LTYPE
 
 
 
-int hsql_parse (hsql::SQLStatementList** result, yyscan_t scanner);
+int hsql_parse (hsql::SQLParserResult** result, yyscan_t scanner);
 
 #endif /* !YY_HSQL_BISON_PARSER_H_INCLUDED  */

src/parser/bison_parser.y

@@ -11,7 +11,6 @@
  ** Section 1: C Declarations
  *********************************/
 
-#include "../sqltypes.h"
 #include "bison_parser.h"
 #include "flex_lexer.h"
 
@@ -19,9 +18,9 @@
 
 using namespace hsql;
 
-int yyerror(YYLTYPE* llocp, SQLStatementList** result, yyscan_t scanner, const char *msg) {
+int yyerror(YYLTYPE* llocp, SQLParserResult** result, yyscan_t scanner, const char *msg) {
 
-	SQLStatementList* list = new SQLStatementList();
+	SQLParserResult* list = new SQLParserResult();
 	list->isValid = false;
 	list->parser_msg = strdup(msg);
 	list->error_line = llocp->first_line;
@@ -42,6 +41,9 @@ int yyerror(YYLTYPE* llocp, SQLStatementList** result, yyscan_t scanner, const c
 // Specify code that is included in the generated .h and .c files
 %code requires {
 // %code requires block	
+
+#include "../sql/statements.h"
+#include "../SQLParserResult.h"
 #include "parser_typedef.h"
 
 // Auto update column and line number
@@ -89,7 +91,7 @@ int yyerror(YYLTYPE* llocp, SQLStatementList** result, yyscan_t scanner, const c
 %lex-param   { yyscan_t scanner }
 
 // Define additional parameters for yyparse
-%parse-param { hsql::SQLStatementList** result }
+%parse-param { hsql::SQLParserResult** result }
 %parse-param { yyscan_t scanner }
 
 
@@ -123,7 +125,7 @@ int yyerror(YYLTYPE* llocp, SQLStatementList** result, yyscan_t scanner, const c
 	hsql::GroupByDescription* group_t;
 	hsql::UpdateClause* update_t;
 
-	hsql::SQLStatementList* stmt_list;
+	hsql::SQLParserResult* stmt_list;
 
 	std::vector<char*>* str_vec;
 	std::vector<hsql::TableRef*>* table_vec;
@@ -231,7 +233,7 @@ input:
 
 
 statement_list:
-		statement { $$ = new SQLStatementList($1); }
+		statement { $$ = new SQLParserResult($1); }
 	|	statement_list ';' statement { $1->addStatement($3); $$ = $1; }
 	;
 
@@ -265,7 +267,7 @@ prepare_statement:
 		PREPARE IDENTIFIER ':' preparable_statement {
 			$$ = new PrepareStatement();
 			$$->name = $2;
-			$$->query = new SQLStatementList($4);
+			$$->query = new SQLParserResult($4);
 		}
 	|	PREPARE IDENTIFIER '{' statement_list opt_semicolon '}' {
 			$$ = new PrepareStatement();

src/parser/flex_lexer.cpp

@@ -1545,7 +1545,7 @@ static yyconst flex_int16_t yy_chk[3639] =
  ***************************/
 #line 12 "flex_lexer.l"
 
-#include "../sqltypes.h"
+#include "../sql/Expr.h"
 #include "bison_parser.h"
 #include <stdio.h>
 

src/parser/flex_lexer.l

@@ -10,7 +10,7 @@
  ***************************/
 %{
 
-#include "../sqltypes.h"
+#include "../sql/Expr.h"
 #include "bison_parser.h"
 #include <stdio.h>
 

src/sql/PrepareStatement.h

@@ -1,6 +1,7 @@
 #ifndef __PREPARE_STATEMENT_H__
 #define __PREPARE_STATEMENT_H__
 
+#include "../SQLParserResult.h"
 #include "SQLStatement.h"
 #include "SelectStatement.h"
 #include <algorithm>
@@ -42,7 +43,7 @@ struct PrepareStatement : SQLStatement {
 	}
 
 	const char* name;
-	SQLStatementList* query;
+	SQLParserResult* query;
 	std::vector<Expr*> placeholders;
 };
 

src/sql/SQLStatement.h

@@ -1,86 +1,43 @@
-/*
+#ifndef __SQLSTATEMENT_H__
- * SQLStatement.h
+#define __SQLSTATEMENT_H__
- * Definition of the structure used to build the syntax tree.
- */
-#ifndef __STATEMENT_H__
-#define __STATEMENT_H__
 
 #include "Expr.h"
 #include <vector>
 
 namespace hsql {
 
-
+	typedef enum {
-typedef enum {
+		kStmtError, // unused
-	kStmtError, // Unused
+		kStmtSelect,
-	kStmtSelect,
+		kStmtImport,
-	kStmtImport,
+		kStmtInsert,
-	kStmtInsert,
+		kStmtUpdate,
-	kStmtUpdate,
+		kStmtDelete,
-	kStmtDelete,
+		kStmtCreate,
-	kStmtCreate,
+		kStmtDrop,
-	kStmtDrop,
+		kStmtPrepare,
-	kStmtPrepare,
+		kStmtExecute,
-	kStmtExecute,
+		kStmtExport,
-	kStmtExport,
+		kStmtRename,
-	kStmtRename,
+		kStmtAlter
-	kStmtAlter
+	} StatementType;
-} StatementType;
 
 
-/**
+	/**
- * @struct SQLStatement
+	 * Base struct for every SQL statement
- * @brief Base class for every SQLStatement
+	 */
- */
+	struct SQLStatement {
-struct SQLStatement {
+		SQLStatement(StatementType type) :
-	SQLStatement(StatementType type) :
+			_type(type) {};
-		_type(type) {};
 
-	virtual ~SQLStatement() {}
+		virtual ~SQLStatement() {}
 
-	virtual StatementType type() { return _type; }
+		virtual StatementType type() { return _type; }
 
-private:
+	private:
-	StatementType _type;
+		StatementType _type;
-};
-
-
-/**
- * @struct SQLStatementList
- * @brief Represents the result of the SQLParser. If parsing was successful it is a list of SQLStatement.
- */
-struct SQLStatementList {
-public:
-	SQLStatementList() :
-		isValid(true),
-		parser_msg(NULL) {};
-
-	SQLStatementList(SQLStatement* stmt) :
-		isValid(true),
-		parser_msg(NULL) {
-		addStatement(stmt);	
 	};
-		
-	virtual ~SQLStatementList() {
-		for (std::vector<SQLStatement*>::iterator it = statements.begin(); it != statements.end(); ++it) {
-			delete *it;
-		}
-		delete parser_msg;
-	}
-
-	void addStatement(SQLStatement* stmt) { statements.push_back(stmt); }
-	SQLStatement* getStatement(int id) { return statements[id]; }
-	size_t numStatements() { return statements.size(); }
-	
-	std::vector<SQLStatement*> statements;
-	bool isValid;
-	const char* parser_msg;
-	int error_line;
-	int error_col;
-};
-
-
 
 } // namespace hsql
 
-#endif // __STATEMENT_H__
+#endif // __SQLSTATEMENT_H__

src/sql/statements.h

@@ -0,0 +1,14 @@
+#ifndef __STATEMENTS_H__
+#define __STATEMENTS_H__ 
+
+#include "SelectStatement.h"
+#include "ImportStatement.h"
+#include "CreateStatement.h"
+#include "InsertStatement.h"
+#include "UpdateStatement.h"
+#include "DeleteStatement.h"
+#include "DropStatement.h"
+#include "PrepareStatement.h"
+#include "ExecuteStatement.h"
+
+#endif // __STATEMENTS_H__ 

src/sqlhelper.h

@@ -4,6 +4,7 @@
 
 
 #include "sqltypes.h"
+#include "sql/statements.h"
 
 namespace hsql {
 

src/sqltypes.h

@@ -3,14 +3,4 @@
 
 typedef unsigned int uint;
 
-#include "sql/SelectStatement.h"
-#include "sql/ImportStatement.h"
-#include "sql/CreateStatement.h"
-#include "sql/InsertStatement.h"
-#include "sql/UpdateStatement.h"
-#include "sql/DeleteStatement.h"
-#include "sql/DropStatement.h"
-#include "sql/PrepareStatement.h"
-#include "sql/ExecuteStatement.h"
-
 #endif

test/lib/helper.h

@@ -3,7 +3,7 @@
 
 
 #define TEST_PARSE_SQL_QUERY(query, output_var, num_statements) \
-	SQLStatementList* output_var = SQLParser::parseSQLString(query); \
+	SQLParserResult* output_var = SQLParser::parseSQLString(query); \
 	ASSERT(output_var->isValid); \
 	ASSERT_EQ(output_var->numStatements(), num_statements);
 

test/sql_grammar_test.cpp

@@ -67,7 +67,7 @@ int main(int argc, char *argv[]) {
         start = std::chrono::system_clock::now();
 
         // Parsing
-        SQLStatementList* stmt_list = SQLParser::parseSQLString(sql.c_str());
+        SQLParserResult* stmt_list = SQLParser::parseSQLString(sql.c_str());
 
         end = std::chrono::system_clock::now();
         std::chrono::duration<double> elapsed_seconds = end-start;

test/sql_tests.cpp

@@ -11,7 +11,7 @@ using namespace hsql;
 
 
 TEST(DeleteStatementTest) {
-	SQLStatementList* stmt_list = SQLParser::parseSQLString("DELETE FROM students WHERE grade > 2.0;");
+	SQLParserResult* stmt_list = SQLParser::parseSQLString("DELETE FROM students WHERE grade > 2.0;");
 	ASSERT(stmt_list->isValid);
 	ASSERT_EQ(stmt_list->numStatements(), 1);
 	ASSERT(stmt_list->getStatement(0)->type() == kStmtDelete);
@@ -25,7 +25,7 @@ TEST(DeleteStatementTest) {
 }
 
 TEST(CreateStatementTest) {
-	SQLStatementList* stmt_list = SQLParser::parseSQLString("CREATE TABLE students (name TEXT, student_number INT, city INTEGER, grade DOUBLE)");
+	SQLParserResult* stmt_list = SQLParser::parseSQLString("CREATE TABLE students (name TEXT, student_number INT, city INTEGER, grade DOUBLE)");
 	ASSERT(stmt_list->isValid);
 	ASSERT_EQ(stmt_list->numStatements(), 1);
 	ASSERT_EQ(stmt_list->getStatement(0)->type(), kStmtCreate);
@@ -47,7 +47,7 @@ TEST(CreateStatementTest) {
 
 
 TEST(UpdateStatementTest) {
-	SQLStatementList* stmt_list = SQLParser::parseSQLString("UPDATE students SET grade = 5.0, name = 'test' WHERE name = 'Max Mustermann';");
+	SQLParserResult* stmt_list = SQLParser::parseSQLString("UPDATE students SET grade = 5.0, name = 'test' WHERE name = 'Max Mustermann';");
 	ASSERT(stmt_list->isValid);
 	ASSERT_EQ(stmt_list->numStatements(), 1);
 	ASSERT_EQ(stmt_list->getStatement(0)->type(), kStmtUpdate);