Skip to content

Commit

Permalink
finishing up parser
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgsmith
dgsmith committed Apr 19, 2012
1 parent 002de4a commit ca63e44
Show file tree
Hide file tree
Showing 2 changed files with 120 additions and 15 deletions.
134 changes: 119 additions & 15 deletions parser.cpp
View file
Expand Up @@ -15,7 +15,7 @@ Design *parseThatShit(string ifilename)
while(ifile.good())
{
lineNum++;
string currentline;
getline(ifile, currentline);
stringstream ss(currentline);
Expand Down Expand Up @@ -116,7 +116,12 @@ Design *parseThatShit(string ifilename)
try {
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
} catch(range_error &ex) {
ERROR(ex.what());
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
for(it=currentGatePuts.begin()+1;it < currentGatePuts.end(); it++)
{
Expand All @@ -125,58 +130,153 @@ Design *parseThatShit(string ifilename)
try {
gatefound->addInput(theDesign->find_net(*it));
} catch(range_error &ex) {
ERROR(ex.what());
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
}
}
else if(firsttoken == "or") {
Gate *gatefound = theDesign->add_find_gate(OR,gate.at(1), atoi(gate.at(2).c_str()));
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
try {
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
for(it=currentGatePuts.begin()+1;it < currentGatePuts.end(); it++)
{
LOG("inputs:");
LOG(*it);
gatefound->addInput(theDesign->find_net(*it));
try {
gatefound->addInput(theDesign->find_net(*it));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
}
}
else if(firsttoken == "nand") {
Gate *gatefound = theDesign->add_find_gate(NAND,gate.at(1), atoi(gate.at(2).c_str()));
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
try {
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
for(it=currentGatePuts.begin()+1;it < currentGatePuts.end(); it++)
{
LOG("inputs:");
LOG(*it);
gatefound->addInput(theDesign->find_net(*it));
try {
gatefound->addInput(theDesign->find_net(*it));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
}
}
else if(firsttoken == "nor") {
Gate *gatefound = theDesign->add_find_gate(NOR,gate.at(1), atoi(gate.at(2).c_str()));
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
try {
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
for(it=currentGatePuts.begin()+1;it < currentGatePuts.end(); it++)
{
LOG("inputs:");
LOG(*it);
gatefound->addInput(theDesign->find_net(*it));
try {
gatefound->addInput(theDesign->find_net(*it));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
}
}
else if(firsttoken == "xor") {
Gate *gatefound = theDesign->add_find_gate(XOR,gate.at(1), atoi(gate.at(2).c_str()));
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
try {
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
for(it=currentGatePuts.begin()+1;it < currentGatePuts.end(); it++)
{
LOG("inputs:");
LOG(*it);
gatefound->addInput(theDesign->find_net(*it));
try {
gatefound->addInput(theDesign->find_net(*it));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
}
}
else if(firsttoken == "not") {
Gate *gatefound = theDesign->add_find_gate(NOT,gate.at(1), atoi(gate.at(2).c_str()));
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
try {
gatefound->addOutput(theDesign->find_net(currentGatePuts.front()));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
for(it=currentGatePuts.begin()+1;it < currentGatePuts.end(); it++)
{
LOG("inputs:");
LOG(*it);
gatefound->addInput(theDesign->find_net(*it));
try {
gatefound->addInput(theDesign->find_net(*it));
} catch(range_error &ex) {
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("On line " << out << " " << ex.what());
throw runtime_error("Net not found :(");
}
}
}
else {
Expand All @@ -193,7 +293,11 @@ Design *parseThatShit(string ifilename)
case ERROR :
{
// error...
ERROR("Error...");
string out;
stringstream ss;
ss << lineNum;
out = ss.str();
ERROR("Line read error on line " << out);
break;
}
}
Expand Down Expand Up @@ -232,7 +336,7 @@ int lineType(string identifier) // going line by line, so decide what kind of li
{
return END;
}
else if(identifier == " ")
else if((identifier == " ") | (identifier == "\n") | (identifier == "\t") | (identifier == ""))
{
return BLANK;
}
Expand Down
1 change: 1 addition & 0 deletions parser.h
View file
Expand Up @@ -9,6 +9,7 @@
#include <string>
#include <regex.h>
#include <algorithm>
#include <stdexcept>
#include "design.h"
#include "gate.h"
#include "net.h"
Expand Down

0 comments on commit ca63e44

Please sign in to comment.