diff options
Diffstat (limited to 'externals/grill/flext/source')
| -rw-r--r-- | externals/grill/flext/source/flattr_ed.cpp | 4 | ||||
| -rw-r--r-- | externals/grill/flext/source/flmap.h | 4 | ||||
| -rw-r--r-- | externals/grill/flext/source/flsupport.cpp | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/externals/grill/flext/source/flattr_ed.cpp b/externals/grill/flext/source/flattr_ed.cpp index dc2cc9d1..e499b9d7 100644 --- a/externals/grill/flext/source/flattr_ed.cpp +++ b/externals/grill/flext/source/flattr_ed.cpp @@ -88,7 +88,11 @@ static void tclscript() "proc flext_escatoms {lst} {\n" "set tmp {}\n" "foreach a $lst {\n" +// "set a [regsub {\\\\} $a \\\\\\\\]\n" // replace \ with \\ ... must be first "set a [regsub {\\$} $a \\\\$]\n" // replace $ with \$ +// "set a [regsub {\\{} $a \\\\\\{]\n" // replace { with \{ +// "set a [regsub {\\}} $a \\\\\\}]\n" // replace } with \} +// "set a [regsub {\\ } $a \\\\\\ ]\n" // replace space with \space "set a [regsub {,} $a \\\\,]\n" // replace , with \, "set a [regsub {;} $a \\\\\\;]\n" // replace ; with \; "lappend tmp $a\n" diff --git a/externals/grill/flext/source/flmap.h b/externals/grill/flext/source/flmap.h index 52f6e030..8d249776 100644 --- a/externals/grill/flext/source/flmap.h +++ b/externals/grill/flext/source/flmap.h @@ -84,7 +84,7 @@ public: public: iterator(): map(0) {} iterator(const TableAnyMap &m): map(&m),ix(0) { leftmost(); } - iterator(iterator &it): map(it.map),ix(it.ix) {} + iterator(const iterator &it): map(it.map),ix(it.ix) {} iterator &operator =(const iterator &it) { map = it.map,ix = it.ix; return *this; } @@ -219,7 +219,7 @@ public: public: iterator() {} iterator(const TablePtrMap &m): TableAnyMap::iterator(m) {} - iterator(iterator &it): TableAnyMap::iterator(it) {} + iterator(const iterator &it): TableAnyMap::iterator(it) {} // this ugly syntax (cast to parent class) is needed for MSVC6 diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp index 7a1c3045..d2a30e07 100644 --- a/externals/grill/flext/source/flsupport.cpp +++ b/externals/grill/flext/source/flsupport.cpp @@ -326,3 +326,4 @@ void flext_root::error(const char *fmt,...) va_end(ap); } + |