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

Make --parse-only not highlight and redo format of parse errors so that kraken.vim syntax checking works, fix naming to allow multiple instantiations of object templates, fix so that template type replacements go through to bodies of methods of object templates in the fourth_pass

Browse Source
This commit is contained in:
Nathan Braswell
2016-02-15 16:31:01 -05:00
parent 3da140cc5e
commit 815c213270
11 changed files with 115 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Importer.cpp
View File

@@ -197,7 +197,7 @@ NodeTree<Symbol>* Importer::parseAndTrim(std::string fileName) {
programInFile.close();
//std::cout << programInputFileString << std::endl;
NodeTree<Symbol>* parseTree = parser->parseInput(programInputFileString, inputFileName);
NodeTree<Symbol>* parseTree = parser->parseInput(programInputFileString, inputFileName, !only_parse);
if (parseTree) {
//std::cout << parseTree->DOTGraphString() << std::endl;
@@ -208,6 +208,8 @@ NodeTree<Symbol>* Importer::parseAndTrim(std::string fileName) {
throw "unexceptablblllll";
return NULL;
}
if (only_parse)
return parseTree;
//outFile.close();
//Remove Transformations

45
src/RNGLRParser.cpp
View File

@@ -33,7 +33,7 @@ void RNGLRParser::printReconstructedFrontier(int frontier) {
}
}
NodeTree<Symbol>* RNGLRParser::parseInput(std::string inputString, std::string filename) {
NodeTree<Symbol>* RNGLRParser::parseInput(std::string inputString, std::string filename, bool highlight_errors) {
input.clear();
gss.clear();
while(!toReduce.empty()) toReduce.pop();
@@ -114,29 +114,36 @@ NodeTree<Symbol>* RNGLRParser::parseInput(std::string inputString, std::string f
for (int i = 0; i < input.size(); i++) {
// std::cout << "Checking if frontier " << i << " is empty" << std::endl;
if (gss.frontierIsEmpty(i)) {
//std::cout << "Frontier " << i << " is empty." << std::endl;
//std::cerr << "Parsing failed on " << input[i].toString() << std::endl;
//std::cerr << "Problem is on line: " << findLine(i) << std::endl;
// std::cerr << filename << ":" << findLine(i) << std::endl;
if (gss.frontierIsEmpty(i)) {
//std::cout << "Frontier " << i << " is empty." << std::endl;
//std::cerr << "Parsing failed on " << input[i].toString() << std::endl;
//std::cerr << "Problem is on line: " << findLine(i) << std::endl;
// std::cerr << filename << ":" << findLine(i) << std::endl;
errord = true;
std::cout << BOLDMAGENTA << "parse error" << std::endl;
std::cout << BOLDWHITE << "Error at: " << BOLDBLUE << filename << ":" << findLine(i) << std::endl;
std::ifstream infile(filename);
std::string line;
int linecount = 0;
while(std::getline(infile,line))
{
if(linecount == findLine(i) - 1)
std::cout << BOLDRED << line << std::endl;
linecount++;
if (highlight_errors)
std::cout << BOLDBLUE;
std::cout << filename << ":" << findLine(i) << std::endl;
if (highlight_errors)
std::cout << BOLDMAGENTA;
std::cout << ": parse error" << std::endl;
std::ifstream infile(filename);
std::string line;
int linecount = 0;
while(std::getline(infile,line))
{
if(linecount == findLine(i) - 1) {
if (highlight_errors)
std::cout << BOLDRED;
std::cout << line << std::endl;
}
linecount++;
}
if (highlight_errors)
std::cout << RESET << std::endl;
break;
}
}
//Clear the vector of SPPF nodes created every step
SPPFStepNodes.clear();