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

Conflicts: CMakeLists.txt inc/AST/ASTVisitor.h
2013-06-01 02:18:58 +02:00
parent deab2d7dbc ecc038f96b
commit bc7dace106
9 changed files with 151 additions and 51 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,8 @@ SET(SCULLY_SOURCE
    src/AST/Type.cpp
    src/AST/VariableDefinition.cpp
    src/AST/StatementList.cpp
+    src/AST/ValueList.cpp
+    src/AST/IfStatement.cpp

    ${CMAKE_CURRENT_BINARY_DIR}/grammar.cpp
 )