added an error statement type

src/.gitignore

@@ -4,4 +4,5 @@ flex_lexer.h
 bison_parser.c*
 bison_parser.h
 *.o
+*.output
 copy*.sh

src/lib/Statement.h

@@ -12,6 +12,7 @@
 namespace hsql {
 
 typedef enum {
+	kStmtError,
 	kStmtSelect,
 	kStmtJoin,
 	kStmtDelete,
@@ -54,7 +55,9 @@ typedef enum {
 
 struct Statement {
 	Statement(StatementType type) : type(type) {};
+
 	StatementType type;
+	const char* parser_msg;
 };
 
 

src/parser/SQLParser.cpp

@@ -27,9 +27,8 @@ Statement* SQLParser::parseSQLString(const char *text) {
     state = hsql__scan_string(text, scanner);
 
     if (hsql_parse(&stmt, scanner)) {
-        // error parsing
-        // fprintf(stderr, "Error when parsing!\n");
-        return NULL;
+        // Returns an error stmt object
+        return stmt;
     }
 
     hsql__delete_buffer(state, scanner);

src/parser/bison_parser.y

@@ -19,8 +19,9 @@
 
 using namespace hsql;
 
-int yyerror(Statement **expression, yyscan_t scanner, const char *msg) {
-	// fprintf(stderr, "[Error] SQL Parser: %s\n", msg);
+int yyerror(Statement **stmt, yyscan_t scanner, const char *msg) {
+	*stmt = new Statement(kStmtError);
+	(*stmt)->parser_msg = msg;
 	return 0;
 }
 

src/sql_grammar_test.cpp

@@ -28,11 +28,16 @@ int main(int argc, char *argv[]) {
         end = std::chrono::system_clock::now();
         std::chrono::duration<double> elapsed_seconds = end-start;
 
-        if (expectFalse != (stmt == NULL)) {
+        if (expectFalse != (stmt->type == kStmtError)) {
         	fprintf(stderr, "-> Failed (%.3fms)! \"%s\"\n", elapsed_seconds.count()*1000, sql);
         	continue;
         } else {
-            printf("Success (%.3fms%s)! \"%s\"\n", elapsed_seconds.count()*1000, (expectFalse) ? ", expected error" : "", sql);
+            if (expectFalse) {
+                printf("Success (%.3fms)! %s: \"%s\"\n", elapsed_seconds.count()*1000, stmt->parser_msg, sql);
+
+            } else {
+                printf("Success (%.3fms)! \"%s\"\n", elapsed_seconds.count()*1000, sql);
+            }
         }
     }