Added parser.

CMakeLists.txt

@@ -50,4 +50,3 @@ find_package(Boost 1.41 REQUIRED COMPONENTS program_options filesystem regex)
 
 add_subdirectory(libwccl)
 add_subdirectory(tests)
-

libwccl/CMakeLists.txt

@@ -15,12 +15,13 @@ set(LIBS ${LIBS} ${Boost_LIBRARIES})
 
 SET(libwccl_STAT_SRC
 	exception.cpp
-	main.cpp
 	ops/and.cpp
 	ops/or.cpp
 	ops/logicalpredicate.cpp
-    ops/nor.cpp
+  ops/nor.cpp
 	ops/predicate.cpp
+	parser/Parser.cpp
+	parser/ParserException.cpp
 	sentencecontext.cpp
 	values/bool.cpp
 	values/position.cpp
@@ -31,10 +32,21 @@ SET(libwccl_STAT_SRC
 	variables.cpp
 )
 
+SET(libwccl_STAT_SRC ${libwccl_STAT_SRC}
+	parser/ANTLRLexer.cpp
+	parser/ANTLRParser.cpp
+)
+
+ADD_CUSTOM_COMMAND(
+	OUTPUT parser/ANTLRLexer.cpp parser/ANTLRLexer.hpp parser/ANTLRParser.cpp parser/ANTLRParser.hpp parser/ANTLRExprTokenTypes.hpp parser/ANTLRExprTokenTypes.txt 
+	COMMAND runantlr -o parser parser/grammar.g
+	DEPENDS parser/grammar.g
+	COMMENT "-- Generating parser/ANTLRLexer.cpp parser/ANTLRLexer.hpp parser/ANTLRExprTokenTypes.hpp parser/ANTLRExprTokenTypes.txt parser/ANTLRParser.cpp parser/ANTLRParser.hpp")
+
 file(GLOB_RECURSE INCS "*.h")
 
 add_library(wccl SHARED ${libwccl_STAT_SRC} ${INCS})
-target_link_libraries ( wccl ${LIBS} )
+target_link_libraries ( wccl ${LIBS})
 
 set_target_properties(wccl PROPERTIES
 	VERSION "${ver_major}.${ver_minor}"

libwccl/main.cpp

-
-namespace Wccl {
-
-} /* end ns Wccl */

tests/CMakeLists.txt

@@ -14,7 +14,7 @@ add_executable(tests
 	variables.cpp
 )
 
-target_link_libraries ( tests wccl ${Boost_LIBRARIES})
+target_link_libraries ( tests wccl ${Boost_LIBRARIES} antlr)
 
 include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIRS})