Merge branch 'master' of git.tuxzone.org:woc2013

Conflicts: inc/AST/ASTVisitor.h
2013-06-01 02:48:23 +02:00
parent ad252f096d a82c028fce
commit 5c011f3ac4
4 changed files with 39 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,6 +73,7 @@ SET(SCULLY_SOURCE
 	src/AST/StatementList.cpp
 	src/AST/ValueList.cpp
 	src/AST/IfStatement.cpp
+	src/AST/ReturnStatement.cpp

 	${CMAKE_CURRENT_BINARY_DIR}/grammar.cpp
 )