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

Conflicts:
	CMakeLists.txt
	inc/AST/ASTVisitor.h

src/AST/AssignmentExpression.cpp

@@ -1,22 +1,22 @@
 #include "AST/AssignmentExpression.h"
 #include "AST/ASTVisitor.h"
 
-AssignmentExpression::AssignmentExpression(std::string id, Expression *expr)
-{
-    //
+AssignmentExpression::AssignmentExpression(std::string id, Expression *expr) : id_(id), expr_(expr) {
+	//
 }
 
 AssignmentExpression::~AssignmentExpression() {
+	//
 }
 
 void AssignmentExpression::accept(ASTVisitor *visitor) {
-    visitor->visit(this);
+	visitor->visit(this);
 }
 
 std::string AssignmentExpression::getId() {
-    return id_;
+	return id_;
 }
 
 Expression* AssignmentExpression::getExpr() {
-    return expr_;
+	return expr_;
 }

src/AST/IfStatement.cpp

@@ -0,0 +1,23 @@
+#include "AST/IfStatement.h"
+#include "AST/ASTVisitor.h"
+
+IfStatement::IfStatement(Expression *cond, Statement *stmt) : cond_(cond),stmt_(stmt)
+{
+    //
+}
+
+IfStatement::~IfStatement(){
+    //
+}
+
+void IfStatement::accept(ASTVisitor *visitor) {
+    visitor->visit(this);
+}
+
+Expression* IfStatement::getCond() {
+    return cond_;
+}
+
+Statement* IfStatement::getStmt() {
+    return stmt_;
+}

src/AST/ValueList.cpp

@@ -0,0 +1,22 @@
+#include "AST/ValueList.h"
+#include "AST/ASTVisitor.h"
+
+ValueList::ValueList() {
+	//
+}
+
+ValueList::~ValueList() {
+	//
+}
+
+void ValueList::accept(ASTVisitor* visitor) {
+	visitor->visit(this);
+}
+
+void ValueList::addValue(Expression* expr) {
+	values_.push_back(expr);
+}
+
+std::vector<Expression*> ValueList::getValues() {
+	return values_;
+}