From 1926014f0024c84350a34c7427616a6edae94544 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Sat, 1 Jun 2013 01:50:24 +0200 Subject: [PATCH] Make it so! --- CMakeLists.txt | 5 +++-- grammar/grammar.y | 40 +++++++++++++++++++++------------------- inc/AST/ASTVisitor.h | 6 ++++-- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d41fd4..2414da0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,8 +60,9 @@ SET(SCULLY_SOURCE src/AST/ASTElement.cpp src/AST/ASTVisitor.cpp - src/AST/AssignmentExpression.cpp - src/AST/ConstantExpression.cpp + src/AST/AssignmentExpression.cpp + src/AST/BinOp.cpp + src/AST/ConstantExpression.cpp src/AST/Expression.cpp src/AST/ParameterList.cpp src/AST/Statement.cpp diff --git a/grammar/grammar.y b/grammar/grammar.y index 72f9c3c..a3b4088 100644 --- a/grammar/grammar.y +++ b/grammar/grammar.y @@ -8,6 +8,8 @@ #include "Token.h" #include "AST/ASTElement.h" +#include "AST/AssignmentExpression.h" +#include "AST/BinOp.h" #include "AST/ConstantExpression.h" #include "AST/Expression.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; } %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_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). - { A = INIT + 1 + STEP + S; /* P */ } -statement(A) ::= T_RETURN expr(E) T_SEMICOLON. { A = E; } + { A = 1 + 1 + 1 + S; /* INIT P STEP */ } +statement(A) ::= T_RETURN expr(E) T_SEMICOLON. { A = 1; /* E */ } statement(A) ::= T_BEGIN statements(S) T_END. { A = S; } 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} statements(A) ::= . { A = 0; } statements(A) ::= statements(B) statement(C). { A = B + C; } -%type expr {int} -expr(A) ::= T_IDENTIFIER(ID) T_ASSIGN expr(E). { A = 1 + E; /* ID */ } -expr(A) ::= expr(B) T_EQUALS expr(C). { A = B + C; } -expr(A) ::= expr(B) T_LESS expr(C). { A = B + C; } -expr(A) ::= expr(B) T_PLUS expr(C). { A = B + C; } -expr(A) ::= expr(B) T_MINUS expr(C). { A = B + C; } -expr(A) ::= expr(B) T_TIMES expr(C). { A = B + C; } -expr(A) ::= expr(B) T_DIV expr(C). { A = B + C; } -expr(A) ::= T_CINT. { A = 1; } -expr(A) ::= T_TRUE. { A = 1; } -expr(A) ::= T_FALSE. { A = 1; } -expr(A) ::= T_IDENTIFIER(ID) T_LPAREN values(V) T_RPAREN. { A = 1 + V; /* ID */ } +%type expr {Expression*} +expr(A) ::= T_IDENTIFIER(ID) T_ASSIGN expr(E). { A = new AssignmentExpression(ID->getText(), E); } +expr(A) ::= expr(B) T_EQUALS expr(C). { A = new BinOp(B, "==", C); } +expr(A) ::= expr(B) T_LESS expr(C). { A = new BinOp(B, "<", C); } +expr(A) ::= expr(B) T_PLUS expr(C). { A = new BinOp(B, "+", C); } +expr(A) ::= expr(B) T_MINUS expr(C). { A = new BinOp(B, "-", C); } +expr(A) ::= expr(B) T_TIMES expr(C). { A = new BinOp(B, "*", C); } +expr(A) ::= expr(B) T_DIV expr(C). { A = new BinOp(B, "/", C); } +expr(A) ::= T_CINT(I). { A = new ConstantExpression(I->getText()); } +expr(A) ::= T_TRUE. { A = new ConstantExpression("true"); } +expr(A) ::= T_FALSE. { A = new ConstantExpression("false"); } +expr(A) ::= T_IDENTIFIER(ID) T_LPAREN values(V) T_RPAREN. { A = 0; /* ID V */ } %type vardef {VariableDefinition*} vardef(A) ::= type(T) T_IDENTIFIER(ID). { A = new VariableDefinition(T, ID->getText()); } %type values {int} values(A) ::= . { A = 0; } -values(A) ::= expr(E). { A = E; } -values(A) ::= values(B) T_COMMA expr(E). { A = B + E; } +values(A) ::= expr(E). { A = 1; /* E */ } +values(A) ::= values(B) T_COMMA expr(E). { A = B + 1; /* E */ } diff --git a/inc/AST/ASTVisitor.h b/inc/AST/ASTVisitor.h index efacfd0..a90d8e4 100644 --- a/inc/AST/ASTVisitor.h +++ b/inc/AST/ASTVisitor.h @@ -2,6 +2,7 @@ #define ASTVISITOR_H #include "AssignmentExpression.h" +#include "BinOp.h" #include "ConstantExpression.h" #include "VariableDefinition.h" #include "ParameterList.h" @@ -11,8 +12,9 @@ public: ASTVisitor(); virtual ~ASTVisitor(); - virtual void visit(AssignmentExpression* e) = 0; - virtual void visit(ConstantExpression* e) = 0; + virtual void visit(AssignmentExpression* e) = 0; + virtual void visit(BinOp* e) = 0; + virtual void visit(ConstantExpression* e) = 0; virtual void visit(ParameterList* e) = 0; virtual void visit(VariableDefinition* e) = 0; };