A bunch of fixes to the solver, and moving it in to clang.

Also some contribution writing stuff.

Basically: lots of work.

1 files changed, 3 insertions, 8 deletions

diff --git a/clang/include/clang/Analysis/Analyses/IntervalSolver/Operator.hpp b/clang/include/clang/Analysis/Analyses/IntervalSolver/Operator.hpp
index 08c66ff..64ef096 100644
--- a/clang/include/clang/Analysis/Analyses/IntervalSolver/Operator.hpp
+++ b/clang/include/clang/Analysis/Analyses/IntervalSolver/Operator.hpp
@@ -1,6 +1,7 @@
 #ifndef OPERATOR_HPP
 #define OPERATOR_HPP
 
+#include <cassert>
 #include <vector>
 
 template<typename Domain>
@@ -28,11 +29,6 @@ struct Maximum : public Operator<Domain> {
   }
 };
 
-
-template<class T>
-T minimum(const T& l, const T& r) {
-  return (l < r ? l : r);
-}
 template<typename Domain>
 struct Minimum : public Operator<Domain> {
   virtual Domain eval(const std::vector<Domain>& arguments) const {
@@ -40,7 +36,7 @@ struct Minimum : public Operator<Domain> {
     for (typename std::vector<Domain>::const_iterator it = arguments.begin();
          it != arguments.end();
          ++it) {
-      result = minimum(*it, result); //*it < result ? *it : result);
+      result = (*it < result ? *it : result);
     }
     return result;
   }
@@ -52,8 +48,7 @@ struct Minimum : public Operator<Domain> {
 template<typename Domain>
 struct Negation : public Operator<Domain> {
   virtual Domain eval(const std::vector<Domain>& arguments) const {
-    if (arguments.size() > 1)
-      throw "Too many arguments to a negation.";
+    assert(arguments.size() == 1);
     return -arguments[0];
   }
   void print(std::ostream& cout) const {