Make it so!

This commit is contained in:
Markus Hauschild
2013-06-01 01:50:24 +02:00
parent bab01bf00a
commit 1926014f00
3 changed files with 28 additions and 23 deletions

View File

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

View File

@@ -8,6 +8,8 @@
#include "Token.h" #include "Token.h"
#include "AST/ASTElement.h" #include "AST/ASTElement.h"
#include "AST/AssignmentExpression.h"
#include "AST/BinOp.h"
#include "AST/ConstantExpression.h" #include "AST/ConstantExpression.h"
#include "AST/Expression.h" #include "AST/Expression.h"
#include "AST/ParameterList.h" #include "AST/ParameterList.h"
@@ -61,39 +63,39 @@ params(A) ::= type(T) T_IDENTIFIER(ID). { A = new ParameterList(); A->addPa
params(A) ::= params(B) T_COMMA type(T) T_IDENTIFIER(ID). { B->addParameter(T, ID->getText()); A = B; } params(A) ::= params(B) T_COMMA type(T) T_IDENTIFIER(ID). { B->addParameter(T, ID->getText()); A = B; }
%type statement {int} %type statement {int}
statement(A) ::= T_IF T_LPAREN expr(E) T_RPAREN statement(S). { A = E + S; } statement(A) ::= T_IF T_LPAREN expr(E) T_RPAREN statement(S). { A = 1 + S; /* E */ }
statement(A) ::= T_RIF T_LPAREN T_CINT(P) T_RPAREN statement(S). { A = 1 + S; /* P */ } statement(A) ::= T_RIF T_LPAREN T_CINT(P) T_RPAREN statement(S). { A = 1 + S; /* P */ }
statement(A) ::= T_FOR T_LPAREN expr(INIT) T_SEMICOLON expr(COND) T_SEMICOLON expr(STEP) T_RPAREN statement(S). statement(A) ::= T_FOR T_LPAREN expr(INIT) T_SEMICOLON expr(COND) T_SEMICOLON expr(STEP) T_RPAREN statement(S).
{ A = INIT + COND + STEP + S; } { A = 1 + 1 + 1 + S; /* INIT COND STEP */ }
statement(A) ::= T_RFOR T_LPAREN expr(INIT) T_SEMICOLON T_CINT(P) T_SEMICOLON expr(STEP) T_RPAREN statement(S). statement(A) ::= T_RFOR T_LPAREN expr(INIT) T_SEMICOLON T_CINT(P) T_SEMICOLON expr(STEP) T_RPAREN statement(S).
{ A = INIT + 1 + STEP + S; /* P */ } { A = 1 + 1 + 1 + S; /* INIT P STEP */ }
statement(A) ::= T_RETURN expr(E) T_SEMICOLON. { A = E; } statement(A) ::= T_RETURN expr(E) T_SEMICOLON. { A = 1; /* E */ }
statement(A) ::= T_BEGIN statements(S) T_END. { A = S; } statement(A) ::= T_BEGIN statements(S) T_END. { A = S; }
statement(A) ::= vardef(V) T_SEMICOLON. { A = 1; /* V */ } statement(A) ::= vardef(V) T_SEMICOLON. { A = 1; /* V */ }
statement(A) ::= expr(E) T_SEMICOLON. { A = E; } statement(A) ::= expr(E) T_SEMICOLON. { A = 1; /* E */ }
%type statements {int} %type statements {int}
statements(A) ::= . { A = 0; } statements(A) ::= . { A = 0; }
statements(A) ::= statements(B) statement(C). { A = B + C; } statements(A) ::= statements(B) statement(C). { A = B + C; }
%type expr {int} %type expr {Expression*}
expr(A) ::= T_IDENTIFIER(ID) T_ASSIGN expr(E). { A = 1 + E; /* ID */ } expr(A) ::= T_IDENTIFIER(ID) T_ASSIGN expr(E). { A = new AssignmentExpression(ID->getText(), E); }
expr(A) ::= expr(B) T_EQUALS expr(C). { A = B + C; } expr(A) ::= expr(B) T_EQUALS expr(C). { A = new BinOp(B, "==", C); }
expr(A) ::= expr(B) T_LESS expr(C). { A = B + C; } expr(A) ::= expr(B) T_LESS expr(C). { A = new BinOp(B, "<", C); }
expr(A) ::= expr(B) T_PLUS expr(C). { A = B + C; } expr(A) ::= expr(B) T_PLUS expr(C). { A = new BinOp(B, "+", C); }
expr(A) ::= expr(B) T_MINUS expr(C). { A = B + C; } expr(A) ::= expr(B) T_MINUS expr(C). { A = new BinOp(B, "-", C); }
expr(A) ::= expr(B) T_TIMES expr(C). { A = B + C; } expr(A) ::= expr(B) T_TIMES expr(C). { A = new BinOp(B, "*", C); }
expr(A) ::= expr(B) T_DIV expr(C). { A = B + C; } expr(A) ::= expr(B) T_DIV expr(C). { A = new BinOp(B, "/", C); }
expr(A) ::= T_CINT. { A = 1; } expr(A) ::= T_CINT(I). { A = new ConstantExpression(I->getText()); }
expr(A) ::= T_TRUE. { A = 1; } expr(A) ::= T_TRUE. { A = new ConstantExpression("true"); }
expr(A) ::= T_FALSE. { A = 1; } expr(A) ::= T_FALSE. { A = new ConstantExpression("false"); }
expr(A) ::= T_IDENTIFIER(ID) T_LPAREN values(V) T_RPAREN. { A = 1 + V; /* ID */ } expr(A) ::= T_IDENTIFIER(ID) T_LPAREN values(V) T_RPAREN. { A = 0; /* ID V */ }
%type vardef {VariableDefinition*} %type vardef {VariableDefinition*}
vardef(A) ::= type(T) T_IDENTIFIER(ID). { A = new VariableDefinition(T, ID->getText()); } vardef(A) ::= type(T) T_IDENTIFIER(ID). { A = new VariableDefinition(T, ID->getText()); }
%type values {int} %type values {int}
values(A) ::= . { A = 0; } values(A) ::= . { A = 0; }
values(A) ::= expr(E). { A = E; } values(A) ::= expr(E). { A = 1; /* E */ }
values(A) ::= values(B) T_COMMA expr(E). { A = B + E; } values(A) ::= values(B) T_COMMA expr(E). { A = B + 1; /* E */ }

View File

@@ -2,6 +2,7 @@
#define ASTVISITOR_H #define ASTVISITOR_H
#include "AssignmentExpression.h" #include "AssignmentExpression.h"
#include "BinOp.h"
#include "ConstantExpression.h" #include "ConstantExpression.h"
#include "VariableDefinition.h" #include "VariableDefinition.h"
#include "ParameterList.h" #include "ParameterList.h"
@@ -11,8 +12,9 @@ public:
ASTVisitor(); ASTVisitor();
virtual ~ASTVisitor(); virtual ~ASTVisitor();
virtual void visit(AssignmentExpression* e) = 0; virtual void visit(AssignmentExpression* e) = 0;
virtual void visit(ConstantExpression* e) = 0; virtual void visit(BinOp* e) = 0;
virtual void visit(ConstantExpression* e) = 0;
virtual void visit(ParameterList* e) = 0; virtual void visit(ParameterList* e) = 0;
virtual void visit(VariableDefinition* e) = 0; virtual void visit(VariableDefinition* e) = 0;
}; };