x64dbg
/
btparser
mirror of https://github.com/x64dbg/btparser
1
0
Fork 0
Code Releases Activity

formatting

This commit is contained in:
mrexodia 2017-03-16 03:25:07 +01:00
parent 90eed9913a
commit d5034cf6d6
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
btparser/helpers.h
View File

@ -51,7 +51,7 @@ namespace StringUtils
case '\"':
return "\\\"";
default:
if(!isprint(ch)) //unknown unprintable character
if(!isprint(ch)) //unknown unprintable character
sprintf_s(buf, "\\x%02X", ch);
else
*buf = ch;

36
btparser/lexer.cpp
View File

@ -126,11 +126,11 @@ Lexer::Token Lexer::getToken()
while(true)
{
nextChar();
if(mLastChar == EOF) //end of file
if(mLastChar == EOF) //end of file
return reportError("unexpected end of file in character literal (1)");
if(mLastChar == '\r' || mLastChar == '\n')
return reportError("unexpected newline in character literal (1)");
if(mLastChar == '\'') //end of character literal
if(mLastChar == '\'') //end of character literal
{
if(charLit.length() != 1)
return reportError(StringUtils::sprintf("invalid character literal '%s'", charLit.c_str()));
@ -138,7 +138,7 @@ Lexer::Token Lexer::getToken()
nextChar();
return tok_charlit;
}
if(mLastChar == '\\') //escape sequence
if(mLastChar == '\\') //escape sequence
{
nextChar();
if(mLastChar == EOF)
@ -163,7 +163,7 @@ Lexer::Token Lexer::getToken()
mLastChar = '\v';
else if(mLastChar == '0')
mLastChar = '\0';
else if(mLastChar == 'x') //\xHH
else if(mLastChar == 'x') //\xHH
{
auto ch1 = nextChar();
auto ch2 = nextChar();
@ -195,16 +195,16 @@ Lexer::Token Lexer::getToken()
while(true)
{
nextChar();
if(mLastChar == EOF) //end of file
if(mLastChar == EOF) //end of file
return reportError("unexpected end of file in string literal (1)");
if(mLastChar == '\r' || mLastChar == '\n')
return reportError("unexpected newline in string literal (1)");
if(mLastChar == '\"') //end of string literal
if(mLastChar == '\"') //end of string literal
{
nextChar();
return tok_stringlit;
}
if(mLastChar == '\\') //escape sequence
if(mLastChar == '\\') //escape sequence
{
nextChar();
if(mLastChar == EOF)
@ -229,7 +229,7 @@ Lexer::Token Lexer::getToken()
mLastChar = '\v';
else if(mLastChar == '0')
mLastChar = '\0';
else if(mLastChar == 'x') //\xHH
else if(mLastChar == 'x') //\xHH
{
auto ch1 = nextChar();
auto ch2 = nextChar();
@ -255,11 +255,11 @@ Lexer::Token Lexer::getToken()
}
//identifier/keyword
if(isalpha(mLastChar) || mLastChar == '_') //[a-zA-Z_]
if(isalpha(mLastChar) || mLastChar == '_') //[a-zA-Z_]
{
mState.IdentifierStr = mLastChar;
nextChar();
while(isalnum(mLastChar) || mLastChar == '_') //[0-9a-zA-Z_]
while(isalnum(mLastChar) || mLastChar == '_') //[0-9a-zA-Z_]
{
appendCh(mState.IdentifierStr, mLastChar);
nextChar();
@ -274,15 +274,15 @@ Lexer::Token Lexer::getToken()
}
//hex numbers
if(mLastChar == '0' && peekChar() == 'x') //0x
if(mLastChar == '0' && peekChar() == 'x') //0x
{
nextChar(); //consume the 'x'
mNumStr.clear();
while(isxdigit(nextChar())) //[0-9a-fA-F]*
while(isxdigit(nextChar())) //[0-9a-fA-F]*
appendCh(mNumStr, mLastChar);
if(!mNumStr.length()) //check for error condition
if(!mNumStr.length()) //check for error condition
return reportError("no hex digits after \"0x\" prefix");
auto error = convertNumber(mNumStr.c_str(), mState.NumberVal, 16);
@ -291,11 +291,11 @@ Lexer::Token Lexer::getToken()
mIsHexNumberVal = true;
return tok_number;
}
if(isdigit(mLastChar)) //[0-9]
if(isdigit(mLastChar)) //[0-9]
{
mNumStr = mLastChar;
while(isdigit(nextChar())) //[0-9]*
while(isdigit(nextChar())) //[0-9]*
mNumStr += mLastChar;
auto error = convertNumber(mNumStr.c_str(), mState.NumberVal, 10);
@ -306,7 +306,7 @@ Lexer::Token Lexer::getToken()
}
//comments
if(mLastChar == '/' && peekChar() == '/') //line comment
if(mLastChar == '/' && peekChar() == '/') //line comment
{
do
{
@ -318,7 +318,7 @@ Lexer::Token Lexer::getToken()
return getToken(); //interpret the next line
}
if(mLastChar == '/' && peekChar() == '*') //block comment
if(mLastChar == '/' && peekChar() == '*') //block comment
{
do
{
@ -328,7 +328,7 @@ Lexer::Token Lexer::getToken()
}
while(!(mLastChar == EOF || mLastChar == '*' && peekChar() == '/'));
if(mLastChar == EOF) //unexpected end of file
if(mLastChar == EOF) //unexpected end of file
{
mState.LineIndex++;
return reportError("unexpected end of file in block comment");

6
btparser/parser.cpp
View File

@ -88,13 +88,13 @@ uptr<Stat> Parser::ParseStat()
uptr<Block> Parser::ParseBlock()
{
if(CurToken.Token != Lexer::tok_bropen) //'{'
if(CurToken.Token != Lexer::tok_bropen) //'{'
return nullptr;
NextToken();
vector<uptr<StatDecl>> statDecls;
if(CurToken.Token == Lexer::tok_brclose) //'}'
if(CurToken.Token == Lexer::tok_brclose) //'}'
{
NextToken();
return make_uptr<Block>(move(statDecls));
@ -138,7 +138,7 @@ uptr<Decl> Parser::ParseDecl()
uptr<BuiltinVar> Parser::ParseBuiltinVar()
{
if(CurToken.Token == Lexer::tok_uint) //TODO: properly handle types
if(CurToken.Token == Lexer::tok_uint) //TODO: properly handle types
{
auto type = CurToken.Token;
NextToken();