anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some other things

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@317 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 1999-11-15 14:45:17 +00:00
parent e8022b10a1
commit 35df50f78c
6 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,5 +1,14 @@
1999-11-15 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/support/LSubstring.[Ch]: made the second arg of most of the
constructors be a const reference.
* src/mathed/math_parser.C (LexInitCodes): small bug introduced by
me fixed.
* src/support/lyxstring.[Ch] (swap): added missing member function
and specialization of swap(str, str);
* src/menus.C (ShowBufferMenu): to use the new BufferStorage
* src/bufferlist.[Ch]: use the new BufferStorage class and remove all

2
src/mathed/math_parser.C
View File

@ -119,7 +119,7 @@ static void LexInitCodes()
lexcode['%'] = LexComment;
lexcode['#'] = LexArgument;
lexcode['+'] = lexcode['-'] = lexcode['*'] = lexcode['/'] =
lexcode['<'] = lexcode['>'] = lexcode['= '] = LexBOP;
lexcode['<'] = lexcode['>'] = lexcode['='] = LexBOP;
lexcode['!'] = lexcode[','] = lexcode[':'] = lexcode[';'] = LexMathSpace;
lexcode['('] = lexcode[')'] = lexcode['|'] = lexcode['.'] = lexcode['?'] = LexOther;

16
src/support/LSubstring.C
View File

@ -21,14 +21,14 @@ LSubstring::LSubstring(string & s, size_type i, size_type l)
}
LSubstring::LSubstring(string & s, string & s2)
LSubstring::LSubstring(string & s, string const & s2)
: ps(&s), n(s2.length())
{
pos = s.find(s2);
}
LSubstring::LSubstring(string & s, char * p)
LSubstring::LSubstring(string & s, string::value_type const * p)
: ps(&s)
{
n = strlen(p);
@ -36,7 +36,7 @@ LSubstring::LSubstring(string & s, char * p)
}
LSubstring::LSubstring(string & s, LRegex & r)
LSubstring::LSubstring(string & s, LRegex const & r)
: ps(&s)
{
LRegex::MatchPair res = r.first_match(s);
@ -82,13 +82,3 @@ LSubstring::operator string() const
{
return string(*ps, pos, n); // copy from *ps
}
#if 0
LSubstring::operator char const * () const
{
static string tr;
tr.assign(*ps, pos, n);
return tr.c_str();
}
#endif

10
src/support/LSubstring.h
View File

@ -31,11 +31,11 @@ public:
///
LSubstring(string & s, size_type i, size_type n);
///
LSubstring(string & s, string & s2);
LSubstring(string & s, string const & s2);
///
LSubstring(string & s, string::value_type * p);
LSubstring(string & s, string::value_type const * p);
///
LSubstring(string & s, LRegex & r);
LSubstring(string & s, LRegex const & r);
///
LSubstring & operator=(string const &);
///
@ -46,10 +46,6 @@ public:
LSubstring & operator=(string::value_type);
///
operator string() const;
#if 0
///
operator char const * () const;
#endif
private:
///
string * ps;

16
src/support/lyxstring.C
View File

@ -1345,6 +1345,15 @@ lyxstring & lyxstring::replace(iterator i, iterator i2,
}
void lyxstring::swap(lyxstring & str)
{
if (rep == str.rep) return;
Srep * tmp = str.rep;
str.rep = rep;
rep = tmp;
}
lyxstring & lyxstring::erase(size_type i, size_type n)
{
Assert(i <= rep->sz); // STD!
@ -1667,6 +1676,13 @@ lyxstring operator+(lyxstring const & a, lyxstring::value_type b)
return tmp;
}
void swap(lyxstring & str1, lyxstring & str2)
{
str1.swap(str2);
}
#include <iostream>
istream & operator>>(istream & is, lyxstring & s)

5
src/support/lyxstring.h
View File

@ -449,6 +449,9 @@ public:
///
lyxstring & replace(iterator i, iterator i2, iterator j, iterator j2);
///
void swap(lyxstring & str);
/// Erase n chars from position i.
lyxstring & erase(size_type i = 0, size_type n = npos);
@ -599,6 +602,8 @@ lyxstring operator+(lyxstring::value_type a, lyxstring const & b);
lyxstring operator+(lyxstring const & a, lyxstring::value_type const * b);
lyxstring operator+(lyxstring const & a, lyxstring::value_type b);
void swap(lyxstring & s1, lyxstring & s2);
istream & operator>>(istream &, lyxstring &);
ostream & operator<<(ostream &, lyxstring const &);
istream & getline(istream &, lyxstring &, lyxstring::value_type delim = '\n');