Merge branch 'master' of gitlab.fit.cvut.cz:travnja3/automata-library

adiff.automaton/src/AutomatonDiff.cpp

@@ -126,6 +126,11 @@ void AutomatonDiff::printDiff(const automaton::UnknownAutomaton& a, const automa
 	}
 }
-void AutomatonDiff::diff(const automaton::UnknownAutomaton& a, const automaton::UnknownAutomaton& b) {
-	if(!AutomatonDiff::testDiff(a, b)) AutomatonDiff::printDiff(a, b);
+int AutomatonDiff::diff(const automaton::UnknownAutomaton& a, const automaton::UnknownAutomaton& b) {
+	if(!AutomatonDiff::testDiff(a, b)) {
+	  AutomatonDiff::printDiff(a, b);
+	  return 1;
+	} else {
+	  return 0;
+	}
 }

adiff.automaton/src/AutomatonDiff.h

@@ -21,7 +21,7 @@ class AutomatonDiff {
 	template <class T> static void setDiff(const std::set<T> a, const std::set<T> b);
 	template <class T> static void listDiff(const std::list<T> a, const std::list<T> b);
 public:
-	static void diff(const automaton::UnknownAutomaton& a, const automaton::UnknownAutomaton& b);
+	static int diff(const automaton::UnknownAutomaton& a, const automaton::UnknownAutomaton& b);
 };
 #endif /* AUTOMATON_DIFF_H_ */

adiff.automaton/src/adiff.automaton.cpp

@@ -35,7 +35,7 @@ int main(int argc, char** argv) {
 			automaton2 = AutomatonFactory::fromFile(argv[2]);
 		}
-		AutomatonDiff::diff(automaton1, automaton2);
+		return AutomatonDiff::diff(automaton1, automaton2);
 	} catch (AlibException& e) {
 		cout << e.getCause() << endl;
 		return 0;

adiff.grammar/src/GrammarDiff.cpp

@@ -89,6 +89,11 @@ void GrammarDiff::printDiff(const grammar::UnknownGrammar& a, const grammar::Unk
 }
-void GrammarDiff::diff(const grammar::UnknownGrammar& a, const grammar::UnknownGrammar& b) {
-	if(!GrammarDiff::testDiff(a, b)) GrammarDiff::printDiff(a, b);
+int GrammarDiff::diff(const grammar::UnknownGrammar& a, const grammar::UnknownGrammar& b) {
+	if(!GrammarDiff::testDiff(a, b)) {
+	  GrammarDiff::printDiff(a, b);
+	  return 1;
+	} else {
+	  return 0;
+	}
 }

adiff.grammar/src/GrammarDiff.h

@@ -21,7 +21,7 @@ class GrammarDiff {
 	template <class T> static void setDiff(const std::set<T> a, const std::set<T> b);
 	template <class T> static void listDiff(const std::list<T> a, const std::list<T> b);
 public:
-	static void diff(const grammar::UnknownGrammar& a, const grammar::UnknownGrammar& b);
+	static int diff(const grammar::UnknownGrammar& a, const grammar::UnknownGrammar& b);
 };
 #endif /* GRAMMAR_DIFF_H_ */

adiff.grammar/src/adiff.grammar.cpp

@@ -35,7 +35,7 @@ int main(int argc, char** argv) {
 			grammar2 = GrammarFactory::fromFile(argv[2]);
 		}
-		GrammarDiff::diff(grammar1, grammar2);
+		return GrammarDiff::diff(grammar1, grammar2);
 	} catch (AlibException& e) {
 		cout << e.getCause() << endl;
 		return 0;