CL-Softwares
/
QRedis
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed lexer bug and removed warning signal, replacing it with a call to qWarning().

This commit is contained in:
Nathan Osman 2013-08-01 12:38:58 -07:00
parent 3458be07d8
commit 5345c07c9f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lexer.cpp
View File

@ -22,8 +22,8 @@ void Lexer::readData()
switch(state) switch(state)
{ {
case ReadingLength: case ReadingLength:
case ReadingUnsafeString: if(!readUnsafeString()) return; break; case ReadingUnsafeString: if(!readUnsafeString()) return;
case ReadingSafeString: if(!readSafeString()) return; break; case ReadingSafeString: if(!readSafeString()) return;
} }
if(state != ReadingSafeString) if(state != ReadingSafeString)
@ -86,5 +86,7 @@ bool Lexer::readSafeString()
buffer.remove(0, length + 2); buffer.remove(0, length + 2);
emit safeString(d); emit safeString(d);
state = DoingNothing;
return true; return true;
} }

2
src/parser.cpp
View File

@ -22,7 +22,7 @@ void Parser::readCharacter(char c)
case '$': stack.append(Task(Task::ReadBulk)); break; case '$': stack.append(Task(Task::ReadBulk)); break;
case '*': stack.append(Task(Task::ReadMultiBulk)); break; case '*': stack.append(Task(Task::ReadMultiBulk)); break;
default: default:
emit warning(tr("Skipping unexpected character '%1'").arg(static_cast<int>(c), 0, 16)); qWarning("Skipping unexpected character '%x'", static_cast<int>(c));
break; break;
} }
} }

2
src/parser.h
View File

@ -25,8 +25,6 @@ class Parser : public QObject
void bulk(const QByteArray &); void bulk(const QByteArray &);
void multiBulk(const QVariantList &); void multiBulk(const QVariantList &);
void warning(const QString &);
private Q_SLOTS: private Q_SLOTS:
void readCharacter(char); void readCharacter(char);