AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-10-18 11:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine parsing of ID and RESULT_ID operand types

Browse Source
This commit is contained in:
David Neto 2015-08-27 13:50:05 -04:00
parent 98290a243e
commit e3f70b9a85
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/text.cpp
View File

@ -353,7 +353,8 @@ spv_result_t spvTextEncodeOperand(
}
switch (type) {
case SPV_OPERAND_TYPE_ID: {
case SPV_OPERAND_TYPE_ID:
case SPV_OPERAND_TYPE_RESULT_ID: {
if ('%' == textValue[0]) {
textValue++;
}
@ -363,25 +364,9 @@ spv_result_t spvTextEncodeOperand(
id = spvNamedIdAssignOrGet(namedIdTable, textValue, pBound);
} else {
spvCheck(spvTextToUInt32(textValue, &id),
DIAGNOSTIC << "Invalid ID '" << textValue << "'.";
return SPV_ERROR_INVALID_TEXT);
}
pInst->words[pInst->wordCount++] = id;
if (*pBound <= id) {
*pBound = id + 1;
}
} break;
case SPV_OPERAND_TYPE_RESULT_ID: {
if ('%' == textValue[0]) {
textValue++;
}
// TODO: Force all Result ID's to be prefixed with '%'.
uint32_t id = 0;
if (spvTextIsNamedId(textValue)) {
id = spvNamedIdAssignOrGet(namedIdTable, textValue, pBound);
} else {
spvCheck(spvTextToUInt32(textValue, &id),
DIAGNOSTIC << "Invalid result ID '" << textValue << "'.";
DIAGNOSTIC << "Invalid "
<< ((type == SPV_OPERAND_TYPE_RESULT_ID) ? "result " : "")
<< "ID '" << textValue << "'.";
return SPV_ERROR_INVALID_TEXT);
}
pInst->words[pInst->wordCount++] = id;