Fix grammar error for Google decorate_string & hlsl_functionality1
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index 4403250..8c95bf6 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -3436,9 +3436,7 @@
"opcode" : 5632,
"operands" : [
{ "kind" : "IdRef", "name" : "'Target'" },
- { "kind" : "Decoration" },
- { "kind" : "LiteralString" },
- { "kind" : "LiteralString", "quantifier" : "*" }
+ { "kind" : "Decoration" }
],
"extensions" : [ "SPV_GOOGLE_decorate_string" ],
"version" : "None"
@@ -3449,9 +3447,7 @@
"operands" : [
{ "kind" : "IdRef", "name" : "'Struct Type'" },
{ "kind" : "LiteralInteger", "name" : "'Member'" },
- { "kind" : "Decoration" },
- { "kind" : "LiteralString" },
- { "kind" : "LiteralString", "quantifier" : "*" }
+ { "kind" : "Decoration" }
],
"extensions" : [ "SPV_GOOGLE_decorate_string" ],
"version" : "None"
diff --git a/tools/buildHeaders/jsonToSpirv.cpp b/tools/buildHeaders/jsonToSpirv.cpp
index a460edc..bb32566 100755
--- a/tools/buildHeaders/jsonToSpirv.cpp
+++ b/tools/buildHeaders/jsonToSpirv.cpp
@@ -119,7 +119,8 @@
else if (quantifier == "?")
return {OperandLiteralString, true};
else {
- return {OperandVariableLiteralStrings, false};
+ assert(0 && "this case should not exist");
+ return {OperandNone, false};
}
} else if (operandKind == "PairLiteralIntegerIdRef") {
// Used by OpSwitch in the grammar
diff --git a/tools/buildHeaders/jsonToSpirv.h b/tools/buildHeaders/jsonToSpirv.h
index 273b639..b25b89e 100755
--- a/tools/buildHeaders/jsonToSpirv.h
+++ b/tools/buildHeaders/jsonToSpirv.h
@@ -47,7 +47,6 @@
OperandOptionalLiteral,
OperandOptionalLiteralString,
OperandVariableLiterals,
- OperandVariableLiteralStrings,
OperandVariableIdLiteral,
OperandVariableLiteralId,
OperandLiteralNumber,
