WIP and gate test

3 files changed, 31 insertions, 10 deletions

diff --git a/Circuit.cpp b/Circuit.cpp
index 22ea98c..8137939 100644
--- a/Circuit.cpp
+++ b/Circuit.cpp
@@ -1,4 +1,5 @@
 #include "Circuit.h"
+#include "Exception.h"
 #include "NodeFactory.h"
 
 void Circuit::create(string label, vector<string> nodes) {
@@ -9,29 +10,33 @@ void Circuit::create(string label, vector<string> nodes) {
 }
 
 void Circuit::new_node(string label, string type) {
-	if (nodes.find(label) != nodes.end()) return; // TODO: exception!
+	if (nodes.find(label) != nodes.end())
+		throw CircuitException("node with label \"%s\" already exists!", label.c_str());
 
 	Node * node = NodeFactory::create(type);
-	if (node == nullptr) return; // TODO: exception?
+	if (node == nullptr)
+		throw CircuitException("unknown type \"%s\"", type.c_str());
 
 	nodes[label] = node;
 
-	// printf("[%s] (%s)\n", label.c_str(), type.c_str());
+	printf("[%s] (%s)\n", label.c_str(), type.c_str());
 }
 
 void Circuit::new_net(string src, vector<string> dests) {
 	Net * net = new Net();
 	nets.push_back(net);
 
+	Node * node = find_node(src);
+	if (node == nullptr)
+		throw CircuitException("unknown source node \"%s\"", src.c_str());
+	node->setOutput(net);
+
 	for (auto dest : dests) {
 		Node * node = find_node(dest);
-		if (node == nullptr) continue; // TODO: exception!
+		if (node == nullptr)
+			throw CircuitException("unknown destination node \"%s\"", dest.c_str());
 		node->addInput(net);
 	}
-
-	Node * node = find_node(src);
-	if (node == nullptr) return; // TODO: exception!
-	node->setOutput(net);
 }
 
 void Circuit::sim() {
diff --git a/circuits/and-test.txt b/circuits/and-test.txt
new file mode 100644
index 0000000..7ab3d78
--- /dev/null
+++ b/circuits/and-test.txt
@@ -0,0 +1,13 @@
+# full adder circuit
+# vim:ft=cfg
+A: INPUT_LOW;
+OUT: PROBE;
+# OUT: A;
+A: OUT;
+# B: INPUT_LOW;
+# OUT: PROBE;
+# TEST: AND;
+# A: TEST;
+# B: TEST;
+# OUT: TEST;
+
diff --git a/main.cpp b/main.cpp
index 728155f..aab566c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,7 +14,7 @@ int main(int argc, char** argv) {
 
 	main_parser.set_circuit(circuit);
 
-	ifstream file("circuits/full-adder.txt");
+	ifstream file("circuits/and-test.txt");
 
 	try {
 		file >> main_parser;
@@ -22,11 +22,14 @@ 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 {
 	  circuit.sim();
-	} catch (CircuitException& e) {
+	} catch (CircuitException & e) {
 	  cout << "Circuit error: " << e.what() << endl;
 	  return EXIT_FAILURE;
 	}