minor renaming

src/.gitignore

@@ -1,5 +1,5 @@
-lex_lexer.c
-lex_lexer.h
-lex_parser.c
-lex_parser.h
+flex_lexer.c
+flex_lexer.h
+bison_parser.c
+bison_parser.h
 *.o

src/Makefile

@@ -1,6 +1,6 @@
 # Makefile
 
-LIB_FILES = lex_lexer.c lex_parser.c lib/Statement.cpp lib/Expr.cpp lib/SQLParser.cpp
+LIB_FILES = flex_lexer.c bison_parser.c lib/Statement.cpp lib/Expr.cpp lib/SQLParser.cpp
 
 
 TESTS_MAIN = sql_tests.cpp
@@ -21,13 +21,13 @@ execution: $(LIB_FILES) $(EXECUTION_MAIN)
 	$(CC) $(CFLAGS) $(LIB_FILES) $(EXECUTION_MAIN) -o $(EXECUTION_BIN)
 
 
-lex_lexer.c: lex_lexer.l 
-	flex lex_lexer.l
+flex_lexer.c: flex_lexer.l 
+	flex flex_lexer.l
 
 
-lex_parser.c: lex_parser.y lex_lexer.c
-	bison lex_parser.y
+bison_parser.c: bison_parser.y flex_lexer.c
+	bison bison_parser.y
 
 
 clean:
-	rm -f *.o *~ lex_lexer.c lex_lexer.h lex_parser.c lex_parser.h $(EXECUTION_BIN) $(TESTS_BIN)
+	rm -f *.o *~ flex_lexer.c flex_lexer.h bison_parser.c bison_parser.h $(EXECUTION_BIN) $(TESTS_BIN)

src/bison_parser.y

@@ -7,8 +7,8 @@
 
 #include "Statement.h"
 #include "List.h"
-#include "lex_parser.h"
-#include "lex_lexer.h"
+#include "bison_parser.h"
+#include "flex_lexer.h"
 
 #include <iostream>
 
@@ -27,8 +27,8 @@ typedef void* yyscan_t;
 
 }
 
-%output  "lex_parser.c"
-%defines "lex_parser.h"
+%output  "bison_parser.c"
+%defines "bison_parser.h"
 
 %define api.pure
 %lex-param   { yyscan_t scanner }

src/flex_lexer.l

@@ -7,7 +7,7 @@
 
 #include "Statement.h"
 #include "List.h"
-#include "lex_parser.h"
+#include "bison_parser.h"
 
 #include <stdio.h>
 #include <iostream>
@@ -18,7 +18,7 @@ using namespace std;
 %}
 
 
-%option outfile="lex_lexer.c" header-file="lex_lexer.h"
+%option outfile="flex_lexer.c" header-file="flex_lexer.h"
 %option warn nodefault
 %option reentrant noyywrap never-interactive nounistd
 %option bison-bridge

src/lib/SQLParser.cpp

@@ -1,6 +1,6 @@
 #include "SQLParser.h"
-#include "lex_parser.h"
-#include "lex_lexer.h"
+#include "bison_parser.h"
+#include "flex_lexer.h"
 #include <stdio.h>
 
 int yyparse(Statement **expression, yyscan_t scanner);