anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 22:41:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix #10863 compiler warnings."

Browse Source 
This reverts commit b684ec39ea.
This commit is contained in:
Richard Heck 2017-12-16 09:22:41 -05:00
parent 1f23d65f8f
commit 0a87aa0247
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mathed/MathParser.cpp
View File

@ -744,6 +744,7 @@ docstring Parser::parse_verbatim_option()
skipSpaces(); skipSpaces();
docstring res; docstring res;
if (nextToken().character() == '[') { if (nextToken().character() == '[') {
Token t = getToken();
for (Token t = getToken(); t.character() != ']' && good(); t = getToken()) { for (Token t = getToken(); t.character() != ']' && good(); t = getToken()) {
if (t.cat() == catBegin) { if (t.cat() == catBegin) {
putback(); putback();
@ -761,6 +762,7 @@ docstring Parser::parse_verbatim_item()
skipSpaces(); skipSpaces();
docstring res; docstring res;
if (nextToken().cat() == catBegin) { if (nextToken().cat() == catBegin) {
Token t = getToken();
for (Token t = getToken(); t.cat() != catEnd && good(); t = getToken()) { for (Token t = getToken(); t.cat() != catEnd && good(); t = getToken()) {
if (t.cat() == catBegin) { if (t.cat() == catBegin) {
putback(); putback();
@ -1035,10 +1037,10 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
else if (t.cat() == catComment) { else if (t.cat() == catComment) {
docstring s; docstring s;
while (good()) { while (good()) {
Token const & tt = getToken(); Token const & t = getToken();
if (tt.cat() == catNewline) if (t.cat() == catNewline)
break; break;
s += tt.asInput(); s += t.asInput();
} }
cell->push_back(MathAtom(new InsetMathComment(buf, s))); cell->push_back(MathAtom(new InsetMathComment(buf, s)));
skipSpaces(); skipSpaces();
@ -1772,7 +1774,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
docstring s; docstring s;
int num_tokens = 0; int num_tokens = 0;
while (true) { while (true) {
Token const & tt = getToken(); Token const & t = getToken();
++num_tokens; ++num_tokens;
if (!good()) { if (!good()) {
s.clear(); s.clear();
@ -1780,7 +1782,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
putback(); putback();
break; break;
} }
s += tt.character(); s += t.character();
if (isValidLength(to_utf8(s))) if (isValidLength(to_utf8(s)))
break; break;
} }