Merge branch 'classed'

Conflicts:
	PrintStatement.cpp

AssingmentStatement.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "AssingmentStatement.h"
+#include "Variable.h"
 
 namespace ParseTree {
 
@@ -14,6 +15,10 @@ AssingmentStatement::AssingmentStatement(Identifier *id, Value *value) {
 	this->value=value;
 }
 
+void AssingmentStatement::Execute(){
+	setScalar(this->id->getName(),this->value->getValue());
+}
+
 AssingmentStatement::~AssingmentStatement() {
 	// TODO Auto-generated destructor stub
 }

AssingmentStatement.h

@@ -19,6 +19,7 @@ class AssingmentStatement: public ParseTree::Statement {
 	Value *value;
 public:
 	AssingmentStatement(Identifier *id, Value *value);
+	void Execute();
 	virtual ~AssingmentStatement();
 };
 

Identifier.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "Identifier.h"
+#include "Variable.h"
 
 namespace ParseTree {
 
@@ -19,6 +20,10 @@ string Identifier::getName(){
 	return this->Name;
 }
 
+string Identifier::getValue(){
+	return getScalar(this->Name);
+}
+
 Identifier::~Identifier() {
 	// TODO Auto-generated destructor stub
 }

Identifier.h

@@ -18,7 +18,7 @@ class Identifier: public ParseTree::Value {
 public:
 	Identifier(std::string name);
 	std::string getName();
-	void setValue(std::string value);
+	std::string getValue();
 	virtual ~Identifier();
 };
 

PrintStatement.cpp

@@ -5,6 +5,8 @@
  *      Author: jimtahu
  */
 
+#include <iostream>
+
 #include "PrintStatement.h"
 #include <iostream>
 
@@ -17,7 +19,7 @@ PrintStatement::PrintStatement(Value *output) {
 }
 
 void PrintStatement::Execute(){
-	cout << this->value->getValue() << endl;
+	cout<<this->value->getValue()<<endl;
 }
 
 PrintStatement::~PrintStatement() {

Program.cpp

@@ -14,7 +14,7 @@ Program::Program() {
 }
 
 void Program::add(Statement *stmt){
-	this->code.push_back(stmt);
+	code.insert(code.begin(),stmt);
 }
 
 void Program::run(){

Variable.cpp

@@ -5,7 +5,38 @@
  *      Author: jimtahu
  */
 
+#include <map>
+
 #include "Variable.h"
+#include "ScalarVariable.h"
+
+using namespace std;
+
+map<string, ScalarVariable*> varTable;
+
+/**
+* Places a varable into the table.
+* @param name The lable for the varable.
+* @param value The value the varable now holds.
+* @return value, for convienace.
+*/
+string setScalar(string name, string value){
+	if(varTable.count(name)==0)varTable[name]=new ScalarVariable(name);
+	varTable[name]->SetValue(value);
+	return value;
+}//end setValue
+
+/**
+* Fetches the value for a varable.
+* @param name The lable of the varable to fetch.
+* @return the value.
+* Fetching a variable which has not been stored is undefined.
+*/
+string getScalar(string name){
+	if(varTable.count(name))
+		return varTable[name]->GetValue();
+	else return "EMPTY";
+}//end getValue
 
 Variable::Variable(string name){
 	this->Name=name;

Variable.h

@@ -12,6 +12,9 @@
 
 using namespace std;
 
+string setScalar(string name, string value);
+string getScalar(string name);
+
 class Variable {
 private:
 	string Name;