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

Some more AST work. Functions no longer retain an identifer for their name.

Browse Source
This commit is contained in:
Nathan Braswell
2013-10-26 11:47:34 -04:00
parent 02fd878c92
commit e818236e90
5 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ASTData.cpp
View File

@@ -1,6 +1,7 @@
#include "ASTData.h"
ASTData::ASTData() {
this->type = undef;
}
ASTData::ASTData(ASTType type, ValueType valueType) {

44
src/ASTTransformation.cpp
View File

@@ -13,21 +13,63 @@ NodeTree<ASTData>* ASTTransformation::transform(NodeTree<Symbol>* from) {
std::string name = current.getName();
NodeTree<ASTData>* newNode;
std::vector<NodeTree<Symbol>*> children = from->getChildren();
std::set<int> skipChildren;
if (name == "translation_unit") {
newNode = new NodeTree<ASTData>(name, ASTData(translation_unit));
} else if (name == "interpreter_directive") {
newNode = new NodeTree<ASTData>(name, ASTData(interpreter_directive));
} else if (name == "import" && !current.isTerminal()) {
newNode = new NodeTree<ASTData>(name, ASTData(import, Symbol(concatSymbolTree(children[0]), true)));
return newNode; // Don't need children of import
} else if (name == "identifier") {
newNode = new NodeTree<ASTData>(name, ASTData(identifier));
} else if (name == "function") {
newNode = new NodeTree<ASTData>(name, ASTData(function, Symbol(concatSymbolTree(children[1]), true), ASTData::strToType(concatSymbolTree(children[0]))));
skipChildren.insert(0);
skipChildren.insert(1);
} else if (name == "code_block") {
newNode = new NodeTree<ASTData>(name, ASTData(code_block));
} else if (name == "typed_parameter") {
newNode = new NodeTree<ASTData>(name, ASTData(typed_parameter));
} else if (name == "expression") {
newNode = new NodeTree<ASTData>(name, ASTData(expression));
}else if (name == "term") {
//If this is an actual part of an expression, not just a premoted factor
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 {
newNode = new NodeTree<ASTData>();
}
} 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") {
newNode = new NodeTree<ASTData>(name, ASTData(if_statement));
} else if (name == "return_statement") {
newNode = new NodeTree<ASTData>(name, ASTData(return_statement));
} else if (name == "assignment_statement") {
newNode = new NodeTree<ASTData>(name, ASTData(assignment_statement));
} else if (name == "function_call") {
newNode = new NodeTree<ASTData>(name, ASTData(function_call));
} else if (name == "value") {
newNode = new NodeTree<ASTData>(name, ASTData(value));
} else {
return new NodeTree<ASTData>();
}
// In general, iterate through children and do them. Might not do this for all children.
for (int i = 0; i < children.size(); i++) {
newNode->addChild(transform(children[i]));
if (skipChildren.find(i) == skipChildren.end()) {
NodeTree<ASTData>* transChild = transform(children[i]);
if (transChild->getData().type)
newNode->addChild(transChild);
else
delete transChild;
}
}
return newNode;