fix typo that put too many include paths for most people

[lyx.git] / src / mathed / math_data.C

diff --git a/src/mathed/math_data.C b/src/mathed/math_data.C
index 170ae414918e62b55457839de8a41e21b7d720d5..7ef98e0589ddb92a862920e69aea94428a522d62 100644 (file)
--- a/src/mathed/math_data.C
+++ b/src/mathed/math_data.C
@@ -1,7 +1,10 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
+#include "math_data.h"
 #include "math_inset.h"
 #include "math_deliminset.h"
 #include "math_charinset.h"
@@ -10,7 +13,7 @@
 #include "math_matrixinset.h"
 #include "math_mathmlstream.h"
 #include "math_support.h"
-#include "math_data.h"
+#include "math_replace.h"
 #include "debug.h"
 #include "support/LAssert.h"
 
@@ -24,6 +27,11 @@ MathArray::MathArray(MathArray const & ar, size_type from, size_type to)
 {}
 
 
+MathArray::MathArray(iterator from, iterator to)
+       : bf_(from, to)
+{}
+
+
 void MathArray::substitute(MathMacro const & m)
 {
        for (iterator it = begin(); it != end(); ++it)
@@ -58,7 +66,7 @@ void MathArray::insert(size_type pos, MathArray const & ar)
 
 
 void MathArray::push_back(MathAtom const & t)
-{      
+{
        bf_.push_back(t);
 }
 
@@ -77,7 +85,7 @@ void MathArray::clear()
 
 void MathArray::swap(MathArray & ar)
 {
-       if (this != &ar) 
+       if (this != &ar)
                bf_.swap(ar.bf_);
 }
 
@@ -96,7 +104,7 @@ MathArray::size_type MathArray::size() const
 
 void MathArray::erase()
 {
-       erase(0, size());
+       bf_.erase(begin(), end());
 }
 
 
@@ -107,6 +115,18 @@ void MathArray::erase(size_type pos)
 }
 
 
+void MathArray::erase(iterator pos1, iterator pos2)
+{
+       bf_.erase(pos1, pos2);
+}
+
+
+void MathArray::erase(iterator pos)
+{
+       bf_.erase(pos);
+}
+
+
 void MathArray::erase(size_type pos1, size_type pos2)
 {
        bf_.erase(begin() + pos1, begin() + pos2);
@@ -119,6 +139,18 @@ MathAtom & MathArray::back()
 }
 
 
+MathAtom & MathArray::front()
+{
+       return bf_.front();
+}
+
+
+MathAtom const & MathArray::front() const
+{
+       return bf_.front();
+}
+
+
 void MathArray::dump2() const
 {
        NormalStream ns(lyxerr);
@@ -144,7 +176,7 @@ void MathArray::validate(LaTeXFeatures & features) const
 
 
 void MathArray::pop_back()
-{      
+{
        if (!size()) {
                lyxerr << "pop_back from empty array!\n";
                return;
@@ -175,3 +207,64 @@ MathArray::iterator MathArray::end()
 {
        return bf_.end();
 }
+
+
+bool MathArray::match(MathArray const & ar) const
+{
+       return size() == ar.size() && matchpart(ar, 0);
+}
+
+
+bool MathArray::matchpart(MathArray const & ar, pos_type pos) const
+{
+       if (size() < ar.size() + pos)
+               return false;
+       const_iterator it = begin() + pos;
+       for (const_iterator jt = ar.begin(); jt != ar.end(); ++jt, ++it)
+               if (!jt->nucleus()->match(it->nucleus()))
+                       return false;
+       return true;
+}
+
+
+void MathArray::replace(ReplaceData & rep)
+{
+       for (size_type i = 0; i < size(); ++i) {
+               iterator it = begin() + i;
+               const_iterator rt = rep.from.begin();
+               const_iterator et = rep.from.end();
+               for (const_iterator jt = it; jt != end() && rt != et; ++jt, ++rt)
+                       if (!jt->nucleus()->match(rt->nucleus()))
+                               break;
+               if (rt == et) {
+                       // match found
+                       lyxerr << "match found!\n";
+                       erase(it, it + rep.from.size());
+                       insert(i, rep.to);
+               }
+       }
+
+       for (const_iterator it = begin(); it != end(); ++it)
+               it->nucleus()->replace(rep);
+}
+
+
+bool MathArray::contains(MathArray const & ar) const
+{
+       for (size_type i = 0; i + ar.size() <= size(); ++i) {
+               const_iterator it = begin() + i;
+               const_iterator rt = ar.begin();
+               const_iterator et = ar.end();
+               for (const_iterator jt = it; rt != et; ++jt, ++rt)
+                       if (!jt->nucleus()->match(rt->nucleus()))
+                               break;
+               if (rt == et)
+                       return true;
+       }
+
+       for (const_iterator it = begin(); it != end(); ++it)
+               if (it->nucleus()->contains(ar))
+                       return true;
+
+       return false;
+}