Merge pull request #10 from fer-rum/quantor

It's alive!
fer-rum · Mar 6, 2015 · 320d8e0 · 320d8e0
2 parents eecc5e7 + 676e42b
commit 320d8e0
Show file tree

Hide file tree

Showing 5 changed files with 355 additions and 318 deletions.
diff --git a/interfaces/Quantor.h b/interfaces/Quantor.h
@@ -36,8 +36,6 @@ class QuantorInterface :
 
     QMap<QString, QIContext> m_contexts;
 
-    // the solver will return a zero-terminated array of int
-    Result (*m_solverMain)(QICircuit const &, std::vector<int> &) = nullptr;
     QList<int> m_solution;
 
     // helper functions

diff --git a/interfaces/quantor/ParseException.h b/interfaces/quantor/ParseException.h
@@ -5,7 +5,6 @@
 
 namespace q2d {
 namespace quantor {
-class QIContext;
 /**
  * This class captures information about and the location of
  * a parsing problem encountered by the Quantorizer and may
@@ -15,19 +14,22 @@ class QIContext;
  */
 class ParseException {
     std::string const  m_msg;
-    QIContext   const &m_ctx;
+    unsigned           m_pos;
 
 public:
-    ParseException(std::string  msg, QIContext const &ctx)
-        : m_msg(msg), m_ctx(ctx) {}
+    ParseException(std::string  msg, unsigned  pos)
+        : m_msg(msg), m_pos(pos) {}
     ~ParseException() {}
 
 public:
     std::string const &message() const {
         return  m_msg;
     }
-    QIContext   const &context() const {
-        return  m_ctx;
+    unsigned position() const {
+        return  m_pos;
+    }
+    void position(unsigned  pos) {
+	m_pos = pos;
     }
 };
 }