Some work on Expressions

CMakeLists.txt

@@ -60,6 +60,8 @@ SET(SCULLY_SOURCE
 
     src/AST/ASTElement.cpp
     src/AST/ASTVisitor.cpp
+	src/AST/ConstantExpression.cpp
+	src/AST/Expression.cpp
 	src/AST/ParameterList.cpp
 	src/AST/Statement.cpp
 	src/AST/Type.cpp

grammar/grammar.y

@@ -8,6 +8,8 @@
 #include "Token.h"
 
 #include "AST/ASTElement.h"
+#include "AST/ConstantExpression.h"
+#include "AST/Expression.h"
 #include "AST/ParameterList.h"
 #include "AST/Statement.h"
 #include "AST/Type.h"

inc/AST/ASTVisitor.h

@@ -1,6 +1,7 @@
 #ifndef ASTVISITOR_H
 #define ASTVISITOR_H
 
+#include "ConstantExpression.h"
 #include "VariableDefinition.h"
 #include "ParameterList.h"
 
@@ -9,6 +10,7 @@ public:
 	ASTVisitor();
 	virtual ~ASTVisitor();
 
+	virtual void visit(ConstantExpression* e) = 0;
 	virtual void visit(ParameterList* e) = 0;
 	virtual void visit(VariableDefinition* e) = 0;
 };

inc/AST/ConstantExpression.h

@@ -0,0 +1,19 @@
+#ifndef CONSTANTEXPRESSION_H
+#define CONSTANTEXPRESSION_H
+
+#include "AST/Expression.h"
+#include <string>
+
+class ConstantExpression : public Expression {
+public:
+	ConstantExpression(std::string value);
+	virtual ~ConstantExpression();
+
+	virtual void accept(ASTVisitor* visitor);
+
+	std::string getValue();
+private:
+	std::string value_;
+};
+
+#endif // CONSTANTEXPRESSION_H

inc/AST/Expression.h

@@ -0,0 +1,14 @@
+#ifndef EXPRESSION_H
+#define EXPRESSION_H
+
+#include "AST/ASTElement.h"
+
+class Expression : public ASTElement {
+public:
+	Expression();
+	virtual ~Expression();
+
+	virtual void accept(ASTVisitor* visitor) = 0;
+};
+
+#endif // EXPRESSION_H

src/AST/ConstantExpression.cpp

@@ -0,0 +1,17 @@
+#include "AST/ConstantExpression.h"
+#include "AST/ASTVisitor.h"
+
+ConstantExpression::ConstantExpression(std::string value) : value_(value) {
+	//
+}
+
+ConstantExpression::~ConstantExpression() {
+}
+
+void ConstantExpression::accept(ASTVisitor* visitor) {
+	visitor->visit(this);
+}
+
+std::string ConstantExpression::getValue() {
+	return value_;
+}

src/AST/Expression.cpp

@@ -0,0 +1,9 @@
+#include "AST/Expression.h"
+
+Expression::Expression() {
+	//
+}
+
+Expression::~Expression() {
+	//
+}