WIP broken exception handler

2 files changed, 6 insertions, 4 deletions

diff --git a/Parser.cpp b/Parser.cpp
index c8a90b4..50833d8 100644
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -60,7 +60,12 @@ void Parser::parse(istream & input) {
 		}
 		
 		if (circuit == nullptr) throw ParserException("circuit is not initialized!");
-		circuit->create(label, nodes);
+	
+		try {
+			circuit->create(label, nodes);
+		} catch(CircuitException & c) {
+			throw ParserException("Circuit error on line %u: %s", linenum, c.what());
+		}
 	}
 }
 
diff --git a/main.cpp b/main.cpp
index aab566c..e2721b1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -22,9 +22,6 @@ int main(int argc, char** argv) {
 	} catch (ParserException & e) {
 		cout << "Parser error: " << e.what() << endl;
 		return EXIT_FAILURE;
-	} catch (CircuitException & e) {
-	  cout << "Circuit error: " << e.what() << endl;
-	  return EXIT_FAILURE;
 	}
 
 	try {