Fixed a ton of stuff with function templates. Works well now. Next up: multiple template types and fixing object definition ordering (both where templates should go and objects with other pointers)
This commit is contained in:
@@ -40,9 +40,14 @@ Importer::~Importer() {
|
||||
}
|
||||
|
||||
NodeTree<ASTData>* Importer::import(std::string fileName) {
|
||||
|
||||
std::cout << "\n\nImporting " << fileName << " ";
|
||||
//Check to see if we've already done it
|
||||
if (imported.find(fileName) != imported.end())
|
||||
if (imported.find(fileName) != imported.end()) {
|
||||
std::cout << "Already Imported!" << std::endl;
|
||||
return imported[fileName];
|
||||
}
|
||||
std::cout << "Not yet imported" << std::endl;
|
||||
|
||||
std::ifstream programInFile;
|
||||
std::ofstream outFile, outFileTransformed, outFileAST;
|
||||
@@ -126,6 +131,8 @@ NodeTree<ASTData>* Importer::import(std::string fileName) {
|
||||
|
||||
imported[fileName] = AST;
|
||||
|
||||
std::cout << "Done importing " << fileName << "\n\n" << std::endl;
|
||||
|
||||
return AST;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user