Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/frouioui/NanoTekSpice
Browse files Browse the repository at this point in the history
  • Loading branch information
Cécile committed Feb 18, 2019
2 parents 5e1555a + 341d1af commit d1b7fd6
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 162 deletions.
21 changes: 3 additions & 18 deletions Src/Components/C4001.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,7 @@ void C4001::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input1.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -129,12 +124,7 @@ void C4001::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input2.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -145,12 +135,7 @@ void C4001::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.output.destinationPin = otherPin;
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
21 changes: 3 additions & 18 deletions Src/Components/C4008.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,7 @@ void C4008::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input1.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -197,12 +192,7 @@ void C4008::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input2.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -213,12 +203,7 @@ void C4008::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.output.destinationPin = otherPin;
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
21 changes: 3 additions & 18 deletions Src/Components/C4011.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,7 @@ void C4011::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input1.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -129,12 +124,7 @@ void C4011::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input2.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -145,12 +135,7 @@ void C4011::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.output.destinationPin = otherPin;
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
21 changes: 3 additions & 18 deletions Src/Components/C4030.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,7 @@ void C4030::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input1.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -131,12 +126,7 @@ void C4030::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input2.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -147,12 +137,7 @@ void C4030::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.output.destinationPin = otherPin;
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
14 changes: 2 additions & 12 deletions Src/Components/C4069.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,7 @@ void C4069::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input1.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -123,12 +118,7 @@ void C4069::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.output.destinationPin = otherPin;
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
21 changes: 3 additions & 18 deletions Src/Components/C4071.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,7 @@ void C4071::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input1.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -129,12 +124,7 @@ void C4071::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input2.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -145,12 +135,7 @@ void C4071::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.output.destinationPin = otherPin;
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
21 changes: 3 additions & 18 deletions Src/Components/C4081.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,7 @@ void C4081::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input1.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -129,12 +124,7 @@ void C4081::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.input2.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -145,12 +135,7 @@ void C4081::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.output.destinationPin = otherPin;
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
14 changes: 2 additions & 12 deletions Src/Components/C4514.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,7 @@ void C4514::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand All @@ -142,12 +137,7 @@ void C4514::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
it->second.destinationPin = otherPin;
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
7 changes: 1 addition & 6 deletions Src/Components/Clock.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,7 @@ void Clock::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
_output[pin] = {pin, nts::UNDEFINED, &other, static_cast<int>(otherPin)};
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
7 changes: 1 addition & 6 deletions Src/Components/False.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,7 @@ void False::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
_output[pin] = {pin, nts::FALSE, &other, static_cast<int>(otherPin)};
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
7 changes: 1 addition & 6 deletions Src/Components/Input.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,7 @@ void Input::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherP
_output[pin] = {pin, nts::UNDEFINED, &other, static_cast<int>(otherPin)};
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
7 changes: 1 addition & 6 deletions Src/Components/Output.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,7 @@ void Output::setLink(std::size_t pin , nts::IComponent &other, std::size_t other
_input[pin] = {pin, nts::UNDEFINED, &other, static_cast<int>(otherPin)};
try {
other.setOutput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down
7 changes: 1 addition & 6 deletions Src/Components/True.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,7 @@ void True::setLink(std::size_t pin , nts::IComponent &other, std::size_t otherPi
_output[pin] = {pin, nts::TRUE, &other, static_cast<int>(otherPin)};
try {
other.setInput(otherPin, *this, pin);
}
catch (Error::Parser::FileError e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
catch (Error::Component::LinkError e) {
} catch (Error::Error e) {
std::cerr << e.what() << " " << e.where() << std::endl;
throw;
}
Expand Down

0 comments on commit d1b7fd6

Please sign in to comment.