miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More AST stuff. Now supports boolean stuff

Browse Source
This commit is contained in:
Nathan Braswell
2013-11-07 22:19:33 -05:00
parent 1117fdf0cb
commit d38fd32323
4 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ASTTransformation.cpp
View File

@@ -34,6 +34,33 @@ NodeTree<ASTData>* ASTTransformation::transform(NodeTree<Symbol>* from) {
newNode = transform(children[1]); //Transform to get the identifier
newNode->getDataRef()->valueType = ASTData::strToType(concatSymbolTree(children[0])); //Get the type (left child) and set our new identifer to be that type
return newNode;
} else if (name == "boolean_expression") {
//If this is an actual part of an expression, not just a premoted term
if (children.size() > 1) {
std::string functionCallName = concatSymbolTree(children[1]);
newNode = new NodeTree<ASTData>(functionCallName, ASTData(function_call, Symbol(functionCallName, true)));
skipChildren.insert(1);
} else {
return transform(children[0]); //Just a promoted term, so do child
}
} else if (name == "and_boolean_expression") {
//If this is an actual part of an expression, not just a premoted bool_exp
if (children.size() > 1) {
std::string functionCallName = concatSymbolTree(children[1]);
newNode = new NodeTree<ASTData>(functionCallName, ASTData(function_call, Symbol(functionCallName, true)));
skipChildren.insert(1);
} else {
return transform(children[0]); //Just a promoted bool_exp, so do child
}
} else if (name == "bool_exp") {
//If this is an actual part of an expression, not just a premoted bool_exp.
if (children.size() > 1) {
std::string functionCallName = concatSymbolTree(children[1]);
newNode = new NodeTree<ASTData>(functionCallName, ASTData(function_call, Symbol(functionCallName, true)));
skipChildren.insert(1);
} else {
return transform(children[0]); //Just a promoted bool_exp, so do child
}
} else if (name == "expression") {
//If this is an actual part of an expression, not just a premoted term
if (children.size() > 1) {
@@ -54,8 +81,6 @@ NodeTree<ASTData>* ASTTransformation::transform(NodeTree<Symbol>* from) {
}
} else if (name == "factor") {
return transform(children[0]); //Just a premoted number or function call or something, so use it instead
} else if (name == "boolean_expression") {
newNode = new NodeTree<ASTData>(name, ASTData(boolean_expression));
} else if (name == "statement") {
newNode = new NodeTree<ASTData>(name, ASTData(statement));
} else if (name == "if_statement") {

8
src/CGenerator.cpp
View File

@@ -26,7 +26,7 @@ std::string CGenerator::generate(NodeTree<ASTData>* from) {
//Do nothing
break;
case import:
return "#include \"" + data.symbol.getName() + "\"\n";
return "#include <" + data.symbol.getName() + ">\n";
break;
case identifier:
return data.symbol.getName();
@@ -42,7 +42,7 @@ std::string CGenerator::generate(NodeTree<ASTData>* from) {
return output;
break;
case code_block:
output += tabs() + "{\n";
output += "{\n";
tabLevel++;
for (int i = 0; i < children.size(); i++)
output += generate(children[i]);
@@ -60,7 +60,7 @@ std::string CGenerator::generate(NodeTree<ASTData>* from) {
return tabs() + generate(children[0]) + ";\n";
break;
case if_statement:
output += "if (" + generate(children[0]) + ") \n" + generate(children[1]);
output += "if (" + generate(children[0]) + ")\n\t" + generate(children[1]);
if (children.size() > 2)
output += " else " + generate(children[2]);
return output;
@@ -76,7 +76,7 @@ std::string CGenerator::generate(NodeTree<ASTData>* from) {
//Handle operators specially for now. Will later replace with
//Inlined functions in the standard library
std::string name = data.symbol.getName();
if (name == "+" || name == "-" || name == "*" || name == "/") {
if (name == "+" || name == "-" || name == "*" || name == "/" || name == "==" || name == ">=" || name == "<=" || name == "!=") {
return "((" + generate(children[0]) + ")" + name + "(" + generate(children[1]) + "))";
}
output += data.symbol.getName() + "(";