Merge pull request #582 from SCMcLaughlin/master

Additional LS config parser fixes:
This commit is contained in:
Michael Cook (mackal) 2016-12-16 02:14:23 -05:00 committed by GitHub
commit 427fb08561

View File

@ -144,7 +144,7 @@ void Config::Parse(const char *file_name)
*/
void Config::Tokenize(FILE *input, std::list<std::string> &tokens)
{
int c = fgetc(input);
auto c = fgetc(input);
std::string lexeme;
while(c != EOF)
@ -162,7 +162,7 @@ void Config::Tokenize(FILE *input, std::list<std::string> &tokens)
if(isalnum(c))
{
lexeme.append((const char *)&c, 1);
lexeme += c;
c = fgetc(input);
continue;
}
@ -193,14 +193,14 @@ void Config::Tokenize(FILE *input, std::list<std::string> &tokens)
lexeme.clear();
}
lexeme.append((const char *)&c, 1);
lexeme += c;
tokens.push_back(lexeme);
lexeme.clear();
break;
}
default:
{
lexeme.append((const char *)&c, 1);
lexeme += c;
}
}