maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[PECOFF] Add a helper function to read an integer from .def file. 

llvm-svn: 199019
This commit is contained in:
Rui Ueyama 2014-01-11 21:37:25 +00:00
parent 6cc96bf2d2
commit 66a4445658
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lld/include/lld/Driver/WinLinkModuleDef.h
View File

@ -115,6 +115,7 @@ public:
private:
void consumeToken();
bool consumeTokenAsInt(uint64_t &result);
void ungetToken();
void error(const Token &tok, Twine msg);

29
lld/lib/Driver/WinLinkModuleDef.cpp
View File

@ -68,6 +68,20 @@ void Parser::consumeToken() {
_tokBuf.pop_back();
}
bool Parser::consumeTokenAsInt(uint64_t &result) {
consumeToken();
if (_tok._kind != Kind::identifier) {
ungetToken();
error(_tok, "Integer expected");
return false;
}
if (_tok._range.getAsInteger(10, result)) {
error(_tok, "Integer expected");
return false;
}
return true;
}
void Parser::ungetToken() { _tokBuf.push_back(_tok); }
void Parser::error(const Token &tok, Twine msg) {
@ -128,12 +142,7 @@ bool Parser::parseExport(PECOFFLinkingContext::ExportDesc &result) {
}
bool Parser::parseHeapsize(uint64_t &reserve, uint64_t &commit) {
consumeToken();
if (_tok._kind != Kind::identifier) {
ungetToken();
return false;
}
if (_tok._range.getAsInteger(0, reserve))
if (!consumeTokenAsInt(reserve))
return false;
consumeToken();
@ -142,12 +151,8 @@ bool Parser::parseHeapsize(uint64_t &reserve, uint64_t &commit) {
commit = 0;
return true;
}
consumeToken();
if (_tok._kind != Kind::identifier) {
ungetToken();
return false;
}
if (_tok._range.getAsInteger(0, commit))
if (!consumeTokenAsInt(commit))
return false;
return true;
}