diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 64bce356feb16712644e44dacf4834bc9f16d263..ec7dd17e6585a064d76476c6bfc6219aa834b353 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -129,8 +129,9 @@ protected:
spv::Decoration TranslateAuxiliaryStorageDecoration(const glslang::TQualifier& qualifier);
spv::BuiltIn TranslateBuiltInDecoration(glslang::TBuiltInVariable, bool memberDeclaration);
spv::ImageFormat TranslateImageFormat(const glslang::TType& type);
- spv::SelectionControlMask TranslateSelectionControl(glslang::TSelectionControl) const;
- spv::LoopControlMask TranslateLoopControl(glslang::TLoopControl) const;
+ spv::SelectionControlMask TranslateSelectionControl(const glslang::TIntermSelection&) const;
+ spv::SelectionControlMask TranslateSwitchControl(const glslang::TIntermSwitch&) const;
+ spv::LoopControlMask TranslateLoopControl(const glslang::TIntermLoop&, unsigned int& dependencyLength) const;
spv::StorageClass TranslateStorageClass(const glslang::TType&);
spv::Id createSpvVariable(const glslang::TIntermSymbol*);
spv::Id getSampledType(const glslang::TSampler&);
@@ -748,26 +749,42 @@ spv::ImageFormat TGlslangToSpvTraverser::TranslateImageFormat(const glslang::TTy
}
}
-spv::SelectionControlMask TGlslangToSpvTraverser::TranslateSelectionControl(glslang::TSelectionControl selectionControl) const
+spv::SelectionControlMask TGlslangToSpvTraverser::TranslateSelectionControl(const glslang::TIntermSelection& selectionNode) const
{
- switch (selectionControl) {
- case glslang::ESelectionControlNone: return spv::SelectionControlMaskNone;
- case glslang::ESelectionControlFlatten: return spv::SelectionControlFlattenMask;
- case glslang::ESelectionControlDontFlatten: return spv::SelectionControlDontFlattenMask;
- default: return spv::SelectionControlMaskNone;
- }
+ if (selectionNode.getFlatten())
+ return spv::SelectionControlFlattenMask;
+ if (selectionNode.getDontFlatten())
+ return spv::SelectionControlDontFlattenMask;
+ return spv::SelectionControlMaskNone;
+}
+
+spv::SelectionControlMask TGlslangToSpvTraverser::TranslateSwitchControl(const glslang::TIntermSwitch& switchNode) const
+{
+ if (switchNode.getFlatten())
+ return spv::SelectionControlFlattenMask;
+ if (switchNode.getDontFlatten())
+ return spv::SelectionControlDontFlattenMask;
+ return spv::SelectionControlMaskNone;
}
-spv::LoopControlMask TGlslangToSpvTraverser::TranslateLoopControl(glslang::TLoopControl loopControl) const
+// return a non-0 dependency if the dependency argument must be set
+spv::LoopControlMask TGlslangToSpvTraverser::TranslateLoopControl(const glslang::TIntermLoop& loopNode,
+ unsigned int& dependencyLength) const
{
- switch (loopControl) {
- case glslang::ELoopControlNone: return spv::LoopControlMaskNone;
- case glslang::ELoopControlUnroll: return spv::LoopControlUnrollMask;
- case glslang::ELoopControlDontUnroll: return spv::LoopControlDontUnrollMask;
- // TODO: DependencyInfinite
- // TODO: DependencyLength
- default: return spv::LoopControlMaskNone;
+ spv::LoopControlMask control = spv::LoopControlMaskNone;
+
+ if (loopNode.getDontUnroll())
+ control = control | spv::LoopControlDontUnrollMask;
+ if (loopNode.getUnroll())
+ control = control | spv::LoopControlUnrollMask;
+ if (loopNode.getLoopDependency() == glslang::TIntermLoop::dependencyInfinite)
+ control = control | spv::LoopControlDependencyInfiniteMask;
+ else if (loopNode.getLoopDependency() > 0) {
+ control = control | spv::LoopControlDependencyLengthMask;
+ dependencyLength = loopNode.getLoopDependency();
}
+
+ return control;
}
// Translate glslang type to SPIR-V storage class.
@@ -2026,7 +2043,7 @@ bool TGlslangToSpvTraverser::visitSelection(glslang::TVisit /* visit */, glslang
node->getCondition()->traverse(this);
// Selection control:
- const spv::SelectionControlMask control = TranslateSelectionControl(node->getSelectionControl());
+ const spv::SelectionControlMask control = TranslateSelectionControl(*node);
// make an "if" based on the value created by the condition
spv::Builder::If ifBuilder(accessChainLoad(node->getCondition()->getType()), control, builder);
@@ -2068,7 +2085,7 @@ bool TGlslangToSpvTraverser::visitSwitch(glslang::TVisit /* visit */, glslang::T
spv::Id selector = accessChainLoad(node->getCondition()->getAsTyped()->getType());
// Selection control:
- const spv::SelectionControlMask control = TranslateSelectionControl(node->getSelectionControl());
+ const spv::SelectionControlMask control = TranslateSwitchControl(*node);
// browse the children to sort out code segments
int defaultSegment = -1;
@@ -2128,9 +2145,8 @@ bool TGlslangToSpvTraverser::visitLoop(glslang::TVisit /* visit */, glslang::TIn
builder.createBranch(&blocks.head);
// Loop control:
- const spv::LoopControlMask control = TranslateLoopControl(node->getLoopControl());
-
- // TODO: dependency length
+ unsigned int dependencyLength = glslang::TIntermLoop::dependencyInfinite;
+ const spv::LoopControlMask control = TranslateLoopControl(*node, dependencyLength);
// Spec requires back edges to target header blocks, and every header block
// must dominate its merge block. Make a header block first to ensure these
@@ -2140,7 +2156,7 @@ bool TGlslangToSpvTraverser::visitLoop(glslang::TVisit /* visit */, glslang::TIn
// including merges of its own.
builder.setLine(node->getLoc().line);
builder.setBuildPoint(&blocks.head);
- builder.createLoopMerge(&blocks.merge, &blocks.continue_target, control);
+ builder.createLoopMerge(&blocks.merge, &blocks.continue_target, control, dependencyLength);
if (node->testFirst() && node->getTest()) {
spv::Block& test = builder.makeNewBlock();
builder.createBranch(&test);
diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp
index 408634e42447b763e517ef95b6715fb3cc56f651..f877a2ec8b08fc0cfddac5e8167202fa9ecdd9a1 100644
--- a/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
@@ -2573,12 +2573,15 @@ void Builder::createSelectionMerge(Block* mergeBlock, unsigned int control)
buildPoint->addInstruction(std::unique_ptr<Instruction>(merge));
}
-void Builder::createLoopMerge(Block* mergeBlock, Block* continueBlock, unsigned int control)
+void Builder::createLoopMerge(Block* mergeBlock, Block* continueBlock, unsigned int control,
+ unsigned int dependencyLength)
{
Instruction* merge = new Instruction(OpLoopMerge);
merge->addIdOperand(mergeBlock->getId());
merge->addIdOperand(continueBlock->getId());
merge->addImmediateOperand(control);
+ if ((control & LoopControlDependencyLengthMask) != 0)
+ merge->addImmediateOperand(dependencyLength);
buildPoint->addInstruction(std::unique_ptr<Instruction>(merge));
}
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
index 1d8fd8be61244bff3c2ab4840803a340558d53d6..9f15989a5065fbc65d47cd72b42db9ac4f6fadea 100755
--- a/SPIRV/SpvBuilder.h
+++ b/SPIRV/SpvBuilder.h
@@ -561,7 +561,7 @@ public:
void createBranch(Block* block);
void createConditionalBranch(Id condition, Block* thenBlock, Block* elseBlock);
- void createLoopMerge(Block* mergeBlock, Block* continueBlock, unsigned int control);
+ void createLoopMerge(Block* mergeBlock, Block* continueBlock, unsigned int control, unsigned int dependencyLength);
// Sets to generate opcode for specialization constants.
void setToSpecConstCodeGenMode() { generatingOpCodeForSpecConst = true; }
diff --git a/SPIRV/doc.cpp b/SPIRV/doc.cpp
index 7d817b49236bace2d8de54169ec9b228cbfc68c8..809af4c1ca29d7730c36cc8412ca58f3a4f67b64 100755
--- a/SPIRV/doc.cpp
+++ b/SPIRV/doc.cpp
@@ -2558,6 +2558,7 @@ void Parameterize()
InstructionDesc[OpLoopMerge].operands.push(OperandId, "'Merge Block'");
InstructionDesc[OpLoopMerge].operands.push(OperandId, "'Continue Target'");
InstructionDesc[OpLoopMerge].operands.push(OperandLoop, "");
+ InstructionDesc[OpLoopMerge].operands.push(OperandOptionalLiteral, "");
InstructionDesc[OpSelectionMerge].operands.push(OperandId, "'Merge Block'");
InstructionDesc[OpSelectionMerge].operands.push(OperandSelect, "");
diff --git a/Test/460.frag b/Test/460.frag
index 43a7c3b389476b1b0e804891c31873ce650f1e7b..23f8eea65207f37f295dea807975af935538da86 100644
--- a/Test/460.frag
+++ b/Test/460.frag
@@ -15,3 +15,18 @@ void main()
b1 = allInvocations(b1);
b1 = allInvocationsEqual(b1);
}
+
+void attExtBad()
+{
+ // ERRORs, not enabled
+ [[dependency_length(1+3)]] for (int i = 0; i < 8; ++i) { }
+ [[flatten]] if (true) { } else { }
+}
+
+#extension GL_EXT_control_flow_attributes : enable
+
+void attExt()
+{
+ [[dependency_length(-3)]] do { } while(true); // ERROR, not positive
+ [[dependency_length(0)]] do { } while(true); // ERROR, not positive
+}
diff --git a/Test/baseResults/460.frag.out b/Test/baseResults/460.frag.out
index 883d949b23c3bedd2cd833d2e95a9212fdffdb77..90c4837e2afdce42118de15265c66ab5f26ac9ef 100755
--- a/Test/baseResults/460.frag.out
+++ b/Test/baseResults/460.frag.out
@@ -1,6 +1,14 @@
460.frag
+ERROR: 0:22: 'attribute' : required extension not requested: GL_EXT_control_flow_attributes
+ERROR: 0:23: 'attribute' : required extension not requested: GL_EXT_control_flow_attributes
+ERROR: 0:30: 'dependency_length' : must be positive
+ERROR: 0:31: 'dependency_length' : must be positive
+ERROR: 4 compilation errors. No code generated.
+
+
Shader version: 460
-0:? Sequence
+Requested GL_EXT_control_flow_attributes
+ERROR: node is still EOpNull!
0:10 Function Definition: main( ( global void)
0:10 Function Parameters:
0:12 Sequence
@@ -21,6 +29,43 @@ Shader version: 460
0:16 'b1' ( temp bool)
0:16 allInvocationsEqual ( global bool)
0:16 'b1' ( temp bool)
+0:19 Function Definition: attExtBad( ( global void)
+0:19 Function Parameters:
+0:22 Sequence
+0:22 Sequence
+0:22 Sequence
+0:22 move second child to first child ( temp int)
+0:22 'i' ( temp int)
+0:22 Constant:
+0:22 0 (const int)
+0:22 Loop with condition tested first: Dependency 4
+0:22 Loop Condition
+0:22 Compare Less Than ( temp bool)
+0:22 'i' ( temp int)
+0:22 Constant:
+0:22 8 (const int)
+0:22 No loop body
+0:22 Loop Terminal Expression
+0:22 Pre-Increment ( temp int)
+0:22 'i' ( temp int)
+0:23 Test condition and select ( temp void): Flatten
+0:23 Condition
+0:23 Constant:
+0:23 true (const bool)
+0:23 true case is null
+0:28 Function Definition: attExt( ( global void)
+0:28 Function Parameters:
+0:30 Sequence
+0:30 Loop with condition not tested first: Dependency -3
+0:30 Loop Condition
+0:30 Constant:
+0:30 true (const bool)
+0:30 No loop body
+0:31 Loop with condition not tested first
+0:31 Loop Condition
+0:31 Constant:
+0:31 true (const bool)
+0:31 No loop body
0:? Linker Objects
0:? 's' ( smooth in structure{ global float f, global 4-component vector of float v})
@@ -29,7 +74,8 @@ Linked fragment stage:
Shader version: 460
-0:? Sequence
+Requested GL_EXT_control_flow_attributes
+ERROR: node is still EOpNull!
0:10 Function Definition: main( ( global void)
0:10 Function Parameters:
0:12 Sequence
diff --git a/Test/baseResults/hlsl.attribute.expression.comp.out b/Test/baseResults/hlsl.attribute.expression.comp.out
index 53a8dcb1c26c36f726444c511d7135bd29f0ab88..8084f900f59a389a506bbd2ff6f6b3969903fe35 100644
--- a/Test/baseResults/hlsl.attribute.expression.comp.out
+++ b/Test/baseResults/hlsl.attribute.expression.comp.out
@@ -10,7 +10,7 @@ local_size = (4, 6, 8)
0:11 'x' ( temp int)
0:11 Constant:
0:11 0 (const int)
-0:11 Loop with condition tested first
+0:11 Loop with condition tested first: Unroll
0:11 Loop Condition
0:11 Compare Less Than ( temp bool)
0:11 'x' ( temp int)
@@ -53,7 +53,7 @@ local_size = (4, 6, 8)
0:11 'x' ( temp int)
0:11 Constant:
0:11 0 (const int)
-0:11 Loop with condition tested first
+0:11 Loop with condition tested first: Unroll
0:11 Loop Condition
0:11 Compare Less Than ( temp bool)
0:11 'x' ( temp int)
diff --git a/Test/baseResults/hlsl.attribute.frag.out b/Test/baseResults/hlsl.attribute.frag.out
index ce5203b3ed4fc2a0c923d36ff92c8f40c9026381..619da20d1117a7670af5bf17d4232336884824f8 100755
--- a/Test/baseResults/hlsl.attribute.frag.out
+++ b/Test/baseResults/hlsl.attribute.frag.out
@@ -6,7 +6,7 @@ gl_FragCoord origin is upper left
0:2 Function Parameters:
0:2 'input' ( in 4-component vector of float)
0:? Sequence
-0:11 Test condition and select ( temp void)
+0:11 Test condition and select ( temp void): DontFlatten
0:11 Condition
0:11 Constant:
0:11 false (const bool)
@@ -33,7 +33,7 @@ gl_FragCoord origin is upper left
0:2 Function Parameters:
0:2 'input' ( in 4-component vector of float)
0:? Sequence
-0:11 Test condition and select ( temp void)
+0:11 Test condition and select ( temp void): DontFlatten
0:11 Condition
0:11 Constant:
0:11 false (const bool)
diff --git a/Test/baseResults/hlsl.doLoop.frag.out b/Test/baseResults/hlsl.doLoop.frag.out
index eb663ce5f73cb16aee74622abb361a7a34fd96c7..ce2ad42c95fa837c1c60cd7d0b50c59d64d9b9e7 100755
--- a/Test/baseResults/hlsl.doLoop.frag.out
+++ b/Test/baseResults/hlsl.doLoop.frag.out
@@ -6,12 +6,12 @@ gl_FragCoord origin is upper left
0:2 Function Parameters:
0:2 'input' ( in float)
0:? Sequence
-0:3 Loop with condition not tested first
+0:3 Loop with condition not tested first: Unroll
0:3 Loop Condition
0:3 Constant:
0:3 false (const bool)
0:3 No loop body
-0:4 Loop with condition not tested first
+0:4 Loop with condition not tested first: Unroll
0:4 Loop Condition
0:4 Constant:
0:4 false (const bool)
@@ -80,12 +80,12 @@ gl_FragCoord origin is upper left
0:2 Function Parameters:
0:2 'input' ( in float)
0:? Sequence
-0:3 Loop with condition not tested first
+0:3 Loop with condition not tested first: Unroll
0:3 Loop Condition
0:3 Constant:
0:3 false (const bool)
0:3 No loop body
-0:4 Loop with condition not tested first
+0:4 Loop with condition not tested first: Unroll
0:4 Loop Condition
0:4 Constant:
0:4 false (const bool)
diff --git a/Test/baseResults/hlsl.forLoop.frag.out b/Test/baseResults/hlsl.forLoop.frag.out
index 77e78fe0a1cabc164feded02d934f72a5e682a6e..f945f989f815e77d10692a3c996d92d0a8746b7a 100755
--- a/Test/baseResults/hlsl.forLoop.frag.out
+++ b/Test/baseResults/hlsl.forLoop.frag.out
@@ -17,7 +17,7 @@ gl_FragCoord origin is upper left
0:4 No loop condition
0:4 No loop body
0:? Sequence
-0:5 Loop with condition tested first
+0:5 Loop with condition tested first: Unroll
0:5 Loop Condition
0:5 any ( temp bool)
0:5 NotEqual ( temp 4-component vector of bool)
@@ -220,7 +220,7 @@ gl_FragCoord origin is upper left
0:4 No loop condition
0:4 No loop body
0:? Sequence
-0:5 Loop with condition tested first
+0:5 Loop with condition tested first: Unroll
0:5 Loop Condition
0:5 any ( temp bool)
0:5 NotEqual ( temp 4-component vector of bool)
diff --git a/Test/baseResults/hlsl.if.frag.out b/Test/baseResults/hlsl.if.frag.out
index 32dcb30b93fe8994ea151637219c84cfff24fe6d..750ae5e7754df1361409503abfc4b750f1d79cb1 100755
--- a/Test/baseResults/hlsl.if.frag.out
+++ b/Test/baseResults/hlsl.if.frag.out
@@ -42,7 +42,7 @@ gl_FragCoord origin is upper left
0:14 'input' ( in 4-component vector of float)
0:14 'input' ( in 4-component vector of float)
0:14 true case is null
-0:19 Test condition and select ( temp void)
+0:19 Test condition and select ( temp void): Flatten
0:19 Condition
0:19 all ( temp bool)
0:19 Equal ( temp 4-component vector of bool)
@@ -152,7 +152,7 @@ gl_FragCoord origin is upper left
0:14 'input' ( in 4-component vector of float)
0:14 'input' ( in 4-component vector of float)
0:14 true case is null
-0:19 Test condition and select ( temp void)
+0:19 Test condition and select ( temp void): Flatten
0:19 Condition
0:19 all ( temp bool)
0:19 Equal ( temp 4-component vector of bool)
diff --git a/Test/baseResults/hlsl.loopattr.frag.out b/Test/baseResults/hlsl.loopattr.frag.out
index f7f64514e1ea350b5b74deeee0300ea5dd628ab0..271199cf65e4abaa6793951fb8c7831f0a986b69 100644
--- a/Test/baseResults/hlsl.loopattr.frag.out
+++ b/Test/baseResults/hlsl.loopattr.frag.out
@@ -10,7 +10,7 @@ gl_FragCoord origin is upper left
0:5 'x' ( temp int)
0:5 Constant:
0:5 0 (const int)
-0:5 Loop with condition tested first
+0:5 Loop with condition tested first: Unroll
0:5 Loop Condition
0:5 Compare Less Than ( temp bool)
0:5 'x' ( temp int)
@@ -25,7 +25,7 @@ gl_FragCoord origin is upper left
0:8 'y' ( temp int)
0:8 Constant:
0:8 0 (const int)
-0:8 Loop with condition tested first
+0:8 Loop with condition tested first: DontUnroll
0:8 Loop Condition
0:8 Compare Less Than ( temp bool)
0:8 'y' ( temp int)
@@ -80,7 +80,7 @@ gl_FragCoord origin is upper left
0:5 'x' ( temp int)
0:5 Constant:
0:5 0 (const int)
-0:5 Loop with condition tested first
+0:5 Loop with condition tested first: Unroll
0:5 Loop Condition
0:5 Compare Less Than ( temp bool)
0:5 'x' ( temp int)
@@ -95,7 +95,7 @@ gl_FragCoord origin is upper left
0:8 'y' ( temp int)
0:8 Constant:
0:8 0 (const int)
-0:8 Loop with condition tested first
+0:8 Loop with condition tested first: DontUnroll
0:8 Loop Condition
0:8 Compare Less Than ( temp bool)
0:8 'y' ( temp int)
diff --git a/Test/baseResults/hlsl.numthreads.comp.out b/Test/baseResults/hlsl.numthreads.comp.out
index c6ec011d260fbf4ba10b8e3b559c0816f407fb0b..d92b8600ccd12030dacc695c8e00189785e99cc5 100644
--- a/Test/baseResults/hlsl.numthreads.comp.out
+++ b/Test/baseResults/hlsl.numthreads.comp.out
@@ -1,20 +1,20 @@
hlsl.numthreads.comp
Shader version: 500
-local_size = (4, 4, 2)
+local_size = (1, 4, 8)
0:? Sequence
0:4 Function Definition: main(vu3; ( temp void)
0:4 Function Parameters:
0:4 'tid' ( in 3-component vector of uint)
-0:9 Function Definition: @main_aux1(vu3; ( temp void)
+0:9 Function Definition: @main_aux2(vu3; ( temp void)
0:9 Function Parameters:
0:9 'tid' ( in 3-component vector of uint)
-0:9 Function Definition: main_aux1( ( temp void)
+0:9 Function Definition: main_aux2( ( temp void)
0:9 Function Parameters:
0:? Sequence
0:9 move second child to first child ( temp 3-component vector of uint)
0:? 'tid' ( temp 3-component vector of uint)
0:? 'tid' ( in 3-component vector of uint GlobalInvocationID)
-0:9 Function Call: @main_aux1(vu3; ( temp void)
+0:9 Function Call: @main_aux2(vu3; ( temp void)
0:? 'tid' ( temp 3-component vector of uint)
0:? Linker Objects
0:? 'tid' ( in 3-component vector of uint GlobalInvocationID)
@@ -24,21 +24,21 @@ Linked compute stage:
Shader version: 500
-local_size = (4, 4, 2)
+local_size = (1, 4, 8)
0:? Sequence
0:4 Function Definition: main(vu3; ( temp void)
0:4 Function Parameters:
0:4 'tid' ( in 3-component vector of uint)
-0:9 Function Definition: @main_aux1(vu3; ( temp void)
+0:9 Function Definition: @main_aux2(vu3; ( temp void)
0:9 Function Parameters:
0:9 'tid' ( in 3-component vector of uint)
-0:9 Function Definition: main_aux1( ( temp void)
+0:9 Function Definition: main_aux2( ( temp void)
0:9 Function Parameters:
0:? Sequence
0:9 move second child to first child ( temp 3-component vector of uint)
0:? 'tid' ( temp 3-component vector of uint)
0:? 'tid' ( in 3-component vector of uint GlobalInvocationID)
-0:9 Function Call: @main_aux1(vu3; ( temp void)
+0:9 Function Call: @main_aux2(vu3; ( temp void)
0:? 'tid' ( temp 3-component vector of uint)
0:? Linker Objects
0:? 'tid' ( in 3-component vector of uint GlobalInvocationID)
@@ -50,13 +50,13 @@ local_size = (4, 4, 2)
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint GLCompute 4 "main_aux1" 18
- ExecutionMode 4 LocalSize 4 4 2
+ EntryPoint GLCompute 4 "main_aux2" 18
+ ExecutionMode 4 LocalSize 1 4 8
Source HLSL 500
- Name 4 "main_aux1"
+ Name 4 "main_aux2"
Name 11 "main(vu3;"
Name 10 "tid"
- Name 14 "@main_aux1(vu3;"
+ Name 14 "@main_aux2(vu3;"
Name 13 "tid"
Name 16 "tid"
Name 18 "tid"
@@ -70,7 +70,7 @@ local_size = (4, 4, 2)
9: TypeFunction 2 8(ptr)
17: TypePointer Input 7(ivec3)
18(tid): 17(ptr) Variable Input
- 4(main_aux1): 2 Function None 3
+ 4(main_aux2): 2 Function None 3
5: Label
16(tid): 8(ptr) Variable Function
20(param): 8(ptr) Variable Function
@@ -78,7 +78,7 @@ local_size = (4, 4, 2)
Store 16(tid) 19
21: 7(ivec3) Load 16(tid)
Store 20(param) 21
- 22: 2 FunctionCall 14(@main_aux1(vu3;) 20(param)
+ 22: 2 FunctionCall 14(@main_aux2(vu3;) 20(param)
Return
FunctionEnd
11(main(vu3;): 2 Function None 9
@@ -86,7 +86,7 @@ local_size = (4, 4, 2)
12: Label
Return
FunctionEnd
-14(@main_aux1(vu3;): 2 Function None 9
+14(@main_aux2(vu3;): 2 Function None 9
13(tid): 8(ptr) FunctionParameter
15: Label
Return
diff --git a/Test/baseResults/hlsl.switch.frag.out b/Test/baseResults/hlsl.switch.frag.out
index b440d4ed198e7dedf9c6a2df5bd219bd5c84deea..364c0e06743bc12717f394fbe439c1fe630c0243 100755
--- a/Test/baseResults/hlsl.switch.frag.out
+++ b/Test/baseResults/hlsl.switch.frag.out
@@ -36,7 +36,7 @@ gl_FragCoord origin is upper left
0:17 Pre-Decrement ( temp 4-component vector of float)
0:17 'input' ( in 4-component vector of float)
0:18 Branch: Break
-0:21 switch
+0:21 switch: DontFlatten
0:21 condition
0:21 'c' ( in int)
0:21 body
@@ -186,7 +186,7 @@ gl_FragCoord origin is upper left
0:17 Pre-Decrement ( temp 4-component vector of float)
0:17 'input' ( in 4-component vector of float)
0:18 Branch: Break
-0:21 switch
+0:21 switch: DontFlatten
0:21 condition
0:21 'c' ( in int)
0:21 body
diff --git a/Test/baseResults/hlsl.whileLoop.frag.out b/Test/baseResults/hlsl.whileLoop.frag.out
index e4fc0d452e81b4cb361bbd1984c16568d5eb9b33..b8fe5e968538b796082b4e017072667d2c706ee9 100755
--- a/Test/baseResults/hlsl.whileLoop.frag.out
+++ b/Test/baseResults/hlsl.whileLoop.frag.out
@@ -21,7 +21,7 @@ gl_FragCoord origin is upper left
0:4 Constant:
0:4 false (const bool)
0:4 No loop body
-0:5 Loop with condition tested first
+0:5 Loop with condition tested first: Unroll
0:5 Loop Condition
0:5 Constant:
0:5 false (const bool)
@@ -71,7 +71,7 @@ gl_FragCoord origin is upper left
0:4 Constant:
0:4 false (const bool)
0:4 No loop body
-0:5 Loop with condition tested first
+0:5 Loop with condition tested first: Unroll
0:5 Loop Condition
0:5 Constant:
0:5 false (const bool)
diff --git a/Test/baseResults/spv.controlFlowAttributes.frag.out b/Test/baseResults/spv.controlFlowAttributes.frag.out
new file mode 100755
index 0000000000000000000000000000000000000000..6b2489d775ba383d7dbeb095bd39e37360d644ea
--- /dev/null
+++ b/Test/baseResults/spv.controlFlowAttributes.frag.out
@@ -0,0 +1,238 @@
+spv.controlFlowAttributes.frag
+WARNING: 0:20: '' : attribute with arguments not recognized, skipping
+WARNING: 0:21: '' : attribute with arguments not recognized, skipping
+WARNING: 0:22: '' : attribute with arguments not recognized, skipping
+WARNING: 0:23: 'dependency_length' : expected a single integer argument
+WARNING: 0:24: '' : attribute with arguments not recognized, skipping
+WARNING: 0:25: '' : attribute with arguments not recognized, skipping
+WARNING: 0:26: '' : attribute with arguments not recognized, skipping
+
+// Module Version 10000
+// Generated by (magic number): 80003
+// Id's are bound by 118
+
+ Capability Shader
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint Fragment 4 "main"
+ ExecutionMode 4 OriginUpperLeft
+ Source GLSL 450
+ SourceExtension "GL_EXT_control_flow_attributes"
+ Name 4 "main"
+ Name 8 "i"
+ Name 36 "i"
+ Name 47 "cond"
+ Name 60 "i"
+ Name 79 "i"
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 1
+ 7: TypePointer Function 6(int)
+ 9: 6(int) Constant 0
+ 16: 6(int) Constant 8
+ 17: TypeBool
+ 20: 6(int) Constant 1
+ 31: 17(bool) ConstantTrue
+ 46: TypePointer Private 17(bool)
+ 47(cond): 46(ptr) Variable Private
+ 54: 17(bool) ConstantFalse
+ 55: 6(int) Constant 3
+ 4(main): 2 Function None 3
+ 5: Label
+ 8(i): 7(ptr) Variable Function
+ 36(i): 7(ptr) Variable Function
+ 60(i): 7(ptr) Variable Function
+ 79(i): 7(ptr) Variable Function
+ Store 8(i) 9
+ Branch 10
+ 10: Label
+ LoopMerge 12 13 Unroll
+ Branch 14
+ 14: Label
+ 15: 6(int) Load 8(i)
+ 18: 17(bool) SLessThan 15 16
+ BranchConditional 18 11 12
+ 11: Label
+ Branch 13
+ 13: Label
+ 19: 6(int) Load 8(i)
+ 21: 6(int) IAdd 19 20
+ Store 8(i) 21
+ Branch 10
+ 12: Label
+ Branch 22
+ 22: Label
+ LoopMerge 24 25 DontUnroll
+ Branch 23
+ 23: Label
+ Branch 25
+ 25: Label
+ Branch 22
+ 24: Label
+ Branch 26
+ 26: Label
+ LoopMerge 28 29 DontUnroll
+ Branch 30
+ 30: Label
+ BranchConditional 31 27 28
+ 27: Label
+ Branch 29
+ 29: Label
+ Branch 26
+ 28: Label
+ Branch 32
+ 32: Label
+ LoopMerge 34 35 DependencyInfinite
+ Branch 33
+ 33: Label
+ Branch 35
+ 35: Label
+ BranchConditional 31 32 34
+ 34: Label
+ Store 36(i) 9
+ Branch 37
+ 37: Label
+ LoopMerge 39 40 DependencyLength 4
+ Branch 41
+ 41: Label
+ 42: 6(int) Load 36(i)
+ 43: 17(bool) SLessThan 42 16
+ BranchConditional 43 38 39
+ 38: Label
+ Branch 40
+ 40: Label
+ 44: 6(int) Load 36(i)
+ 45: 6(int) IAdd 44 20
+ Store 36(i) 45
+ Branch 37
+ 39: Label
+ 48: 17(bool) Load 47(cond)
+ SelectionMerge 50 Flatten
+ BranchConditional 48 49 50
+ 49: Label
+ Branch 50
+ 50: Label
+ 51: 17(bool) Load 47(cond)
+ SelectionMerge 53 DontFlatten
+ BranchConditional 51 52 53
+ 52: Label
+ Store 47(cond) 54
+ Branch 53
+ 53: Label
+ SelectionMerge 57 DontFlatten
+ Switch 55 57
+ case 3: 56
+ 56: Label
+ Branch 57
+ 57: Label
+ Store 60(i) 9
+ Branch 61
+ 61: Label
+ LoopMerge 63 64 None
+ Branch 65
+ 65: Label
+ 66: 6(int) Load 60(i)
+ 67: 17(bool) SLessThan 66 16
+ BranchConditional 67 62 63
+ 62: Label
+ Branch 64
+ 64: Label
+ 68: 6(int) Load 60(i)
+ 69: 6(int) IAdd 68 20
+ Store 60(i) 69
+ Branch 61
+ 63: Label
+ Branch 70
+ 70: Label
+ LoopMerge 72 73 None
+ Branch 74
+ 74: Label
+ BranchConditional 31 71 72
+ 71: Label
+ Branch 73
+ 73: Label
+ Branch 70
+ 72: Label
+ Branch 75
+ 75: Label
+ LoopMerge 77 78 None
+ Branch 76
+ 76: Label
+ Branch 78
+ 78: Label
+ BranchConditional 31 75 77
+ 77: Label
+ Store 79(i) 9
+ Branch 80
+ 80: Label
+ LoopMerge 82 83 None
+ Branch 84
+ 84: Label
+ 85: 6(int) Load 79(i)
+ 86: 17(bool) SLessThan 85 16
+ BranchConditional 86 81 82
+ 81: Label
+ Branch 83
+ 83: Label
+ 87: 6(int) Load 79(i)
+ 88: 6(int) IAdd 87 20
+ Store 79(i) 88
+ Branch 80
+ 82: Label
+ 89: 17(bool) Load 47(cond)
+ SelectionMerge 91 None
+ BranchConditional 89 90 91
+ 90: Label
+ Branch 91
+ 91: Label
+ 92: 17(bool) Load 47(cond)
+ SelectionMerge 94 None
+ BranchConditional 92 93 94
+ 93: Label
+ Store 47(cond) 54
+ Branch 94
+ 94: Label
+ SelectionMerge 96 None
+ Switch 55 96
+ case 3: 95
+ 95: Label
+ Branch 96
+ 96: Label
+ Branch 99
+ 99: Label
+ LoopMerge 101 102 Unroll DontUnroll DependencyLength 2
+ Branch 103
+ 103: Label
+ 104: 17(bool) Load 47(cond)
+ BranchConditional 104 100 101
+ 100: Label
+ Branch 102
+ 102: Label
+ Branch 99
+ 101: Label
+ SelectionMerge 106 DontFlatten
+ Switch 55 106
+ case 3: 105
+ 105: Label
+ Branch 106
+ 106: Label
+ 109: 17(bool) Load 47(cond)
+ SelectionMerge 111 Flatten
+ BranchConditional 109 110 111
+ 110: Label
+ Branch 111
+ 111: Label
+ Branch 112
+ 112: Label
+ LoopMerge 114 115 DependencyInfinite
+ Branch 116
+ 116: Label
+ 117: 17(bool) Load 47(cond)
+ BranchConditional 117 113 114
+ 113: Label
+ Branch 115
+ 115: Label
+ Branch 112
+ 114: Label
+ Return
+ FunctionEnd
diff --git a/Test/hlsl.numthreads.comp b/Test/hlsl.numthreads.comp
index fcc97f37985b671f15c745e6aa48a06d5d74198d..0871d3f74685d6ea12a3aa3bcb937cb5566ae067 100644
--- a/Test/hlsl.numthreads.comp
+++ b/Test/hlsl.numthreads.comp
@@ -4,11 +4,8 @@ void main(uint3 tid : SV_DispatchThreadID )
{
}
-[numTHreaDs(4,4,2)] // case insensitive
-void main_aux1(uint3 tid : SV_DispatchThreadID )
+[numthreads(1,4,8)]
+void main_aux2(uint3 tid : SV_DispatchThreadID )
{
}
-[numthreads(1,4,8)]
-void main_aux2(uint3 tid : SV_DispatchThreadID );
-
diff --git a/Test/spv.controlFlowAttributes.frag b/Test/spv.controlFlowAttributes.frag
new file mode 100644
index 0000000000000000000000000000000000000000..6d90c0db2c1ab280c0cb33d7ebf05d15c36c4fd0
--- /dev/null
+++ b/Test/spv.controlFlowAttributes.frag
@@ -0,0 +1,39 @@
+#version 450
+
+#extension GL_EXT_control_flow_attributes : enable
+
+bool cond;
+
+void main()
+{
+ [[unroll]] for (int i = 0; i < 8; ++i) { }
+ [[loop]] for (;;) { }
+ [[dont_unroll]] while(true) { }
+ [[dependency_infinite]] do { } while(true);
+ [[dependency_length(1+3)]] for (int i = 0; i < 8; ++i) { }
+ [[flatten]] if (cond) { } else { }
+ [[branch]] if (cond) cond = false;
+ [[dont_flatten]] switch(3) { } // dropped
+ [[dont_flatten]] switch(3) { case 3: break; }
+
+ // warnings on all these
+ [[unroll(2)]] for (int i = 0; i < 8; ++i) { }
+ [[dont_unroll(-2)]] while(true) { }
+ [[dependency_infinite(3)]] do { } while(true);
+ [[dependency_length]] for (int i = 0; i < 8; ++i) { }
+ [[flatten(3)]] if (cond) { } else { }
+ [[branch(5.2)]] if (cond) cond = false;
+ [[dont_flatten(3 + 7)]] switch(3) { case 3: break; }
+
+ // other valid uses
+ [[ unroll, dont_unroll, dependency_length(2) ]] while(cond) { }
+ [ [ dont_flatten , branch ] ] switch(3) { case 3: break; }
+ [
+ // attribute
+ [
+ // here
+ flatten
+ ]
+ ] if (cond) { } else { }
+ [[ dependency_length(2), dependency_infinite ]] while(cond) { }
+}
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index ac3973373aede35fca3a3efc32ef5ca9316c0de3..7a50ab67828340218a1ee3b626473459d142648e 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -9,6 +9,7 @@ endif(WIN32)
set(SOURCES
MachineIndependent/glslang.y
MachineIndependent/glslang_tab.cpp
+ MachineIndependent/attribute.cpp
MachineIndependent/Constant.cpp
MachineIndependent/iomapper.cpp
MachineIndependent/InfoSink.cpp
@@ -51,6 +52,7 @@ set(HEADERS
Include/revision.h
Include/ShHandle.h
Include/Types.h
+ MachineIndependent/attribute.h
MachineIndependent/glslang_tab.cpp.h
MachineIndependent/gl_types.h
MachineIndependent/Initialize.h
diff --git a/glslang/Include/Common.h b/glslang/Include/Common.h
index 06a94755bc904fe0db4078d99041d50cc90e7fa5..041701774e144f1eb33db555b7381f322dd2e569 100644
--- a/glslang/Include/Common.h
+++ b/glslang/Include/Common.h
@@ -155,7 +155,7 @@ inline TString* NewPoolTString(const char* s)
return new(memory) TString(s);
}
-template<class T> inline T* NewPoolObject(T)
+template<class T> inline T* NewPoolObject(T*)
{
return new(GetThreadPoolAllocator().allocate(sizeof(T))) T;
}
diff --git a/glslang/Include/ConstantUnion.h b/glslang/Include/ConstantUnion.h
index eb28f21c3e4909d478fa0fccbf009cf5ff6a23e1..58c6094eab95c37640c0c626ae9a0a9084a0ba8a 100644
--- a/glslang/Include/ConstantUnion.h
+++ b/glslang/Include/ConstantUnion.h
@@ -37,6 +37,9 @@
#ifndef _CONSTANT_UNION_INCLUDED_
#define _CONSTANT_UNION_INCLUDED_
+#include "../Include/Common.h"
+#include "../Include/BaseTypes.h"
+
namespace glslang {
class TConstUnion {
diff --git a/glslang/Include/intermediate.h b/glslang/Include/intermediate.h
index 58760195731dd152aff57c9e9255a900bdfbed81..51ac45c37e07606466270a684f15231c278fe0be 100644
--- a/glslang/Include/intermediate.h
+++ b/glslang/Include/intermediate.h
@@ -819,7 +819,7 @@ public:
virtual glslang::TIntermMethod* getAsMethodNode() { return 0; }
virtual glslang::TIntermSymbol* getAsSymbolNode() { return 0; }
virtual glslang::TIntermBranch* getAsBranchNode() { return 0; }
- virtual glslang::TIntermLoop* getAsLoopNode() { return 0; }
+ virtual glslang::TIntermLoop* getAsLoopNode() { return 0; }
virtual const glslang::TIntermTyped* getAsTyped() const { return 0; }
virtual const glslang::TIntermOperator* getAsOperator() const { return 0; }
@@ -832,7 +832,7 @@ public:
virtual const glslang::TIntermMethod* getAsMethodNode() const { return 0; }
virtual const glslang::TIntermSymbol* getAsSymbolNode() const { return 0; }
virtual const glslang::TIntermBranch* getAsBranchNode() const { return 0; }
- virtual const glslang::TIntermLoop* getAsLoopNode() const { return 0; }
+ virtual const glslang::TIntermLoop* getAsLoopNode() const { return 0; }
virtual ~TIntermNode() { }
protected:
@@ -885,24 +885,6 @@ protected:
TType type;
};
-//
-// Selection control hints
-//
-enum TSelectionControl {
- ESelectionControlNone,
- ESelectionControlFlatten,
- ESelectionControlDontFlatten,
-};
-
-//
-// Loop control hints
-//
-enum TLoopControl {
- ELoopControlNone,
- ELoopControlUnroll,
- ELoopControlDontUnroll,
-};
-
//
// Handle for, do-while, and while loops.
//
@@ -913,26 +895,36 @@ public:
test(aTest),
terminal(aTerminal),
first(testFirst),
- control(ELoopControlNone)
+ unroll(false),
+ dontUnroll(false),
+ dependency(0)
{ }
- virtual TIntermLoop* getAsLoopNode() { return this; }
- virtual const TIntermLoop* getAsLoopNode() const { return this; }
+ virtual TIntermLoop* getAsLoopNode() { return this; }
+ virtual const TIntermLoop* getAsLoopNode() const { return this; }
virtual void traverse(TIntermTraverser*);
TIntermNode* getBody() const { return body; }
TIntermTyped* getTest() const { return test; }
TIntermTyped* getTerminal() const { return terminal; }
bool testFirst() const { return first; }
- void setLoopControl(TLoopControl c) { control = c; }
- TLoopControl getLoopControl() const { return control; }
+ void setUnroll() { unroll = true; }
+ void setDontUnroll() { dontUnroll = true; }
+ bool getUnroll() const { return unroll; }
+ bool getDontUnroll() const { return dontUnroll; }
+
+ static const unsigned int dependencyInfinite = 0xFFFFFFFF;
+ void setLoopDependency(int d) { dependency = d; }
+ int getLoopDependency() const { return dependency; }
protected:
TIntermNode* body; // code to loop over
TIntermTyped* test; // exit condition associated with loop, could be 0 for 'for' loops
TIntermTyped* terminal; // exists for for-loops
bool first; // true for while and for, not for do-while
- TLoopControl control; // loop control hint
+ bool unroll; // true if unroll requested
+ bool dontUnroll; // true if request to not unroll
+ unsigned int dependency; // loop dependency hint; 0 means not set or unknown
};
//
@@ -1343,22 +1335,29 @@ protected:
class TIntermSelection : public TIntermTyped {
public:
TIntermSelection(TIntermTyped* cond, TIntermNode* trueB, TIntermNode* falseB) :
- TIntermTyped(EbtVoid), condition(cond), trueBlock(trueB), falseBlock(falseB), control(ESelectionControlNone) {}
+ TIntermTyped(EbtVoid), condition(cond), trueBlock(trueB), falseBlock(falseB),
+ flatten(false), dontFlatten(false) {}
TIntermSelection(TIntermTyped* cond, TIntermNode* trueB, TIntermNode* falseB, const TType& type) :
- TIntermTyped(type), condition(cond), trueBlock(trueB), falseBlock(falseB), control(ESelectionControlNone) {}
+ TIntermTyped(type), condition(cond), trueBlock(trueB), falseBlock(falseB),
+ flatten(false), dontFlatten(false) {}
virtual void traverse(TIntermTraverser*);
virtual TIntermTyped* getCondition() const { return condition; }
virtual TIntermNode* getTrueBlock() const { return trueBlock; }
virtual TIntermNode* getFalseBlock() const { return falseBlock; }
virtual TIntermSelection* getAsSelectionNode() { return this; }
virtual const TIntermSelection* getAsSelectionNode() const { return this; }
- void setSelectionControl(TSelectionControl c) { control = c; }
- TSelectionControl getSelectionControl() const { return control; }
+
+ void setFlatten() { flatten = true; }
+ void setDontFlatten() { dontFlatten = true; }
+ bool getFlatten() const { return flatten; }
+ bool getDontFlatten() const { return dontFlatten; }
+
protected:
TIntermTyped* condition;
TIntermNode* trueBlock;
TIntermNode* falseBlock;
- TSelectionControl control; // selection control hint
+ bool flatten; // true if flatten requested
+ bool dontFlatten; // true if requested to not flatten
};
//
@@ -1369,18 +1368,24 @@ protected:
//
class TIntermSwitch : public TIntermNode {
public:
- TIntermSwitch(TIntermTyped* cond, TIntermAggregate* b) : condition(cond), body(b), control(ESelectionControlNone) { }
+ TIntermSwitch(TIntermTyped* cond, TIntermAggregate* b) : condition(cond), body(b),
+ flatten(false), dontFlatten(false) {}
virtual void traverse(TIntermTraverser*);
virtual TIntermNode* getCondition() const { return condition; }
virtual TIntermAggregate* getBody() const { return body; }
virtual TIntermSwitch* getAsSwitchNode() { return this; }
virtual const TIntermSwitch* getAsSwitchNode() const { return this; }
- void setSelectionControl(TSelectionControl c) { control = c; }
- TSelectionControl getSelectionControl() const { return control; }
+
+ void setFlatten() { flatten = true; }
+ void setDontFlatten() { dontFlatten = true; }
+ bool getFlatten() const { return flatten; }
+ bool getDontFlatten() const { return dontFlatten; }
+
protected:
TIntermTyped* condition;
TIntermAggregate* body;
- TSelectionControl control; // selection control hint
+ bool flatten; // true if flatten requested
+ bool dontFlatten; // true if requested to not flatten
};
enum TVisit
diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp
index 21899abe95e1f2177d194468516dc22629d36bfe..6cec765b9678a26df27b79d7ac9d458ccb64f2ed 100644
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -1614,7 +1614,7 @@ TIntermAggregate* TIntermediate::makeAggregate(const TSourceLoc& loc)
//
// Returns the selection node created.
//
-TIntermTyped* TIntermediate::addSelection(TIntermTyped* cond, TIntermNodePair nodePair, const TSourceLoc& loc, TSelectionControl control)
+TIntermSelection* TIntermediate::addSelection(TIntermTyped* cond, TIntermNodePair nodePair, const TSourceLoc& loc)
{
//
// Don't prune the false path for compile-time constants; it's needed
@@ -1623,7 +1623,6 @@ TIntermTyped* TIntermediate::addSelection(TIntermTyped* cond, TIntermNodePair no
TIntermSelection* node = new TIntermSelection(cond, nodePair.node1, nodePair.node2);
node->setLoc(loc);
- node->setSelectionControl(control);
return node;
}
@@ -1666,12 +1665,13 @@ TIntermTyped* TIntermediate::addMethod(TIntermTyped* object, const TType& type,
//
// Returns the selection node created, or nullptr if one could not be.
//
-TIntermTyped* TIntermediate::addSelection(TIntermTyped* cond, TIntermTyped* trueBlock, TIntermTyped* falseBlock, const TSourceLoc& loc, TSelectionControl control)
+TIntermTyped* TIntermediate::addSelection(TIntermTyped* cond, TIntermTyped* trueBlock, TIntermTyped* falseBlock,
+ const TSourceLoc& loc)
{
// If it's void, go to the if-then-else selection()
if (trueBlock->getBasicType() == EbtVoid && falseBlock->getBasicType() == EbtVoid) {
TIntermNodePair pair = { trueBlock, falseBlock };
- return addSelection(cond, pair, loc, control);
+ return addSelection(cond, pair, loc);
}
//
@@ -1909,11 +1909,11 @@ const TIntermTyped* TIntermediate::findLValueBase(const TIntermTyped* node, bool
//
// Create while and do-while loop nodes.
//
-TIntermLoop* TIntermediate::addLoop(TIntermNode* body, TIntermTyped* test, TIntermTyped* terminal, bool testFirst, const TSourceLoc& loc, TLoopControl control)
+TIntermLoop* TIntermediate::addLoop(TIntermNode* body, TIntermTyped* test, TIntermTyped* terminal, bool testFirst,
+ const TSourceLoc& loc)
{
TIntermLoop* node = new TIntermLoop(body, test, terminal, testFirst);
node->setLoc(loc);
- node->setLoopControl(control);
return node;
}
@@ -1921,11 +1921,11 @@ TIntermLoop* TIntermediate::addLoop(TIntermNode* body, TIntermTyped* test, TInte
//
// Create a for-loop sequence.
//
-TIntermAggregate* TIntermediate::addForLoop(TIntermNode* body, TIntermNode* initializer, TIntermTyped* test, TIntermTyped* terminal, bool testFirst, const TSourceLoc& loc, TLoopControl control)
+TIntermAggregate* TIntermediate::addForLoop(TIntermNode* body, TIntermNode* initializer, TIntermTyped* test,
+ TIntermTyped* terminal, bool testFirst, const TSourceLoc& loc, TIntermLoop*& node)
{
- TIntermLoop* node = new TIntermLoop(body, test, terminal, testFirst);
+ node = new TIntermLoop(body, test, terminal, testFirst);
node->setLoc(loc);
- node->setLoopControl(control);
// make a sequence of the initializer and statement, but try to reuse the
// aggregate already created for whatever is in the initializer, if there is one
diff --git a/glslang/MachineIndependent/ParseHelper.h b/glslang/MachineIndependent/ParseHelper.h
index 0d929789345bdde2ac968a7ca6e19704d1052893..b8b083c1befc19603d73a43431691117d35bc019 100644
--- a/glslang/MachineIndependent/ParseHelper.h
+++ b/glslang/MachineIndependent/ParseHelper.h
@@ -44,13 +44,15 @@
#ifndef _PARSER_HELPER_INCLUDED_
#define _PARSER_HELPER_INCLUDED_
+#include <cstdarg>
+#include <functional>
+
#include "parseVersions.h"
#include "../Include/ShHandle.h"
#include "SymbolTable.h"
#include "localintermediate.h"
#include "Scan.h"
-#include <cstdarg>
-#include <functional>
+#include "attribute.h"
namespace glslang {
@@ -409,6 +411,17 @@ public:
TIntermNode* addSwitch(const TSourceLoc&, TIntermTyped* expression, TIntermAggregate* body);
void updateImplicitArraySize(const TSourceLoc&, TIntermNode*, int index);
+ TAttributeType attributeFromName(const TString& name) const;
+ TAttributes* makeAttributes(const TString& identifier) const;
+ TAttributes* makeAttributes(const TString& identifier, TIntermNode* node) const;
+ TAttributes* mergeAttributes(TAttributes*, TAttributes*) const;
+
+ // Determine selection control from attributes
+ void handleSelectionAttributes(const TAttributes& attributes, TIntermNode*);
+ void handleSwitchAttributes(const TAttributes& attributes, TIntermNode*);
+
+ // Determine loop control from attributes
+ void handleLoopAttributes(const TAttributes& attributes, TIntermNode*);
protected:
void nonInitConstCheck(const TSourceLoc&, TString& identifier, TType& type);
diff --git a/glslang/MachineIndependent/Scan.cpp b/glslang/MachineIndependent/Scan.cpp
index c171760bbad9be7da93f0bb68d60fc67bc7c5e0d..8e4bc8092236c7a125384e5d7263c5bcae0c5ffe 100644
--- a/glslang/MachineIndependent/Scan.cpp
+++ b/glslang/MachineIndependent/Scan.cpp
@@ -45,6 +45,7 @@
#include "../Include/Types.h"
#include "SymbolTable.h"
#include "ParseHelper.h"
+#include "attribute.h"
#include "glslang_tab.cpp.h"
#include "ScanContext.h"
#include "Scan.h"
diff --git a/glslang/MachineIndependent/Versions.cpp b/glslang/MachineIndependent/Versions.cpp
index 6db280a693b49649c2d70b67f9de1a855e65226c..99e763b1274803e75f7301680015ad721485e58d 100644
--- a/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@ -188,6 +188,7 @@ void TParseVersions::initializeExtensionBehavior()
extensionBehavior[E_GL_EXT_shader_non_constant_global_initializers] = EBhDisable;
extensionBehavior[E_GL_EXT_shader_image_load_formatted] = EBhDisable;
extensionBehavior[E_GL_EXT_post_depth_coverage] = EBhDisable;
+ extensionBehavior[E_GL_EXT_control_flow_attributes] = EBhDisable;
// #line and #include
extensionBehavior[E_GL_GOOGLE_cpp_style_line_directive] = EBhDisable;
@@ -328,6 +329,7 @@ void TParseVersions::getPreamble(std::string& preamble)
"#define GL_EXT_shader_non_constant_global_initializers 1\n"
"#define GL_EXT_shader_image_load_formatted 1\n"
"#define GL_EXT_post_depth_coverage 1\n"
+ "#define GL_EXT_control_flow_attributes 1\n"
#ifdef AMD_EXTENSIONS
"#define GL_AMD_shader_ballot 1\n"
diff --git a/glslang/MachineIndependent/Versions.h b/glslang/MachineIndependent/Versions.h
index 493c03b2879b798f6d59cdaadd07a16315f26214..c444270636bd5d3c48e234d3c5e143e0c89a6a74 100644
--- a/glslang/MachineIndependent/Versions.h
+++ b/glslang/MachineIndependent/Versions.h
@@ -146,6 +146,7 @@ const char* const E_GL_EXT_shader_image_load_formatted = "GL_EXT_shader_image_lo
const char* const E_GL_EXT_device_group = "GL_EXT_device_group";
const char* const E_GL_EXT_multiview = "GL_EXT_multiview";
const char* const E_GL_EXT_post_depth_coverage = "GL_EXT_post_depth_coverage";
+const char* const E_GL_EXT_control_flow_attributes = "GL_EXT_control_flow_attributes";
// Arrays of extensions for the above viewportEXTs duplications
diff --git a/glslang/MachineIndependent/attribute.cpp b/glslang/MachineIndependent/attribute.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..acc17e9f28d05b9a64196d8530ef888b7bcb69a0
--- /dev/null
+++ b/glslang/MachineIndependent/attribute.cpp
@@ -0,0 +1,257 @@
+//
+// Copyright (C) 2017 LunarG, Inc.
+// Copyright (C) 2018 Google, Inc.
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+//
+// Neither the name of Google, Inc., nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+
+#include "attribute.h"
+#include "../Include/intermediate.h"
+#include "ParseHelper.h"
+
+namespace glslang {
+
+// extract integers out of attribute arguments stored in attribute aggregate
+bool TAttributeArgs::getInt(int& value, int argNum) const
+{
+ const TConstUnion* intConst = getConstUnion(EbtInt, argNum);
+
+ if (intConst == nullptr)
+ return false;
+
+ value = intConst->getIConst();
+ return true;
+}
+
+// extract strings out of attribute arguments stored in attribute aggregate.
+// convert to lower case if converToLower is true (for case-insensitive compare convenience)
+bool TAttributeArgs::getString(TString& value, int argNum, bool convertToLower) const
+{
+ const TConstUnion* stringConst = getConstUnion(EbtString, argNum);
+
+ if (stringConst == nullptr)
+ return false;
+
+ value = *stringConst->getSConst();
+
+ // Convenience.
+ if (convertToLower)
+ std::transform(value.begin(), value.end(), value.begin(), ::tolower);
+
+ return true;
+}
+
+// How many arguments were supplied?
+int TAttributeArgs::size() const
+{
+ return args == nullptr ? 0 : (int)args->getSequence().size();
+}
+
+// Helper to get attribute const union. Returns nullptr on failure.
+const TConstUnion* TAttributeArgs::getConstUnion(TBasicType basicType, int argNum) const
+{
+ if (args == nullptr)
+ return nullptr;
+
+ if (argNum >= args->getSequence().size())
+ return nullptr;
+
+ const TConstUnion* constVal = &args->getSequence()[argNum]->getAsConstantUnion()->getConstArray()[0];
+ if (constVal == nullptr || constVal->getType() != basicType)
+ return nullptr;
+
+ return constVal;
+}
+
+// Implementation of TParseContext parts of attributes
+TAttributeType TParseContext::attributeFromName(const TString& name) const
+{
+ if (name == "branch" || name == "dont_flatten")
+ return EatBranch;
+ else if (name == "flatten")
+ return EatFlatten;
+ else if (name == "unroll")
+ return EatUnroll;
+ else if (name == "loop" || name == "dont_unroll")
+ return EatLoop;
+ else if (name == "dependency_infinite")
+ return EatDependencyInfinite;
+ else if (name == "dependency_length")
+ return EatDependencyLength;
+ else
+ return EatNone;
+}
+
+// Make an initial leaf for the grammar from a no-argument attribute
+TAttributes* TParseContext::makeAttributes(const TString& identifier) const
+{
+ TAttributes *attributes = nullptr;
+ attributes = NewPoolObject(attributes);
+ TAttributeArgs args = { attributeFromName(identifier), nullptr };
+ attributes->push_back(args);
+ return attributes;
+}
+
+// Make an initial leaf for the grammar from a one-argument attribute
+TAttributes* TParseContext::makeAttributes(const TString& identifier, TIntermNode* node) const
+{
+ TAttributes *attributes = nullptr;
+ attributes = NewPoolObject(attributes);
+
+ // for now, node is always a simple single expression, but other code expects
+ // a list, so make it so
+ TIntermAggregate* agg = intermediate.makeAggregate(node);
+ TAttributeArgs args = { attributeFromName(identifier), agg };
+ attributes->push_back(args);
+ return attributes;
+}
+
+// Merge two sets of attributes into a single set.
+// The second argument is destructively consumed.
+TAttributes* TParseContext::mergeAttributes(TAttributes* attr1, TAttributes* attr2) const
+{
+ attr1->splice(attr1->end(), *attr2);
+ return attr1;
+}
+
+//
+// Selection attributes
+//
+void TParseContext::handleSelectionAttributes(const TAttributes& attributes, TIntermNode* node)
+{
+ TIntermSelection* selection = node->getAsSelectionNode();
+ if (selection == nullptr)
+ return;
+
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ if (it->size() > 0) {
+ warn(node->getLoc(), "attribute with arguments not recognized, skipping", "", "");
+ continue;
+ }
+
+ switch (it->name) {
+ case EatFlatten:
+ selection->setFlatten();
+ break;
+ case EatBranch:
+ selection->setDontFlatten();
+ break;
+ default:
+ warn(node->getLoc(), "attribute does not apply to a selection", "", "");
+ break;
+ }
+ }
+}
+
+//
+// Switch attributes
+//
+void TParseContext::handleSwitchAttributes(const TAttributes& attributes, TIntermNode* node)
+{
+ TIntermSwitch* selection = node->getAsSwitchNode();
+ if (selection == nullptr)
+ return;
+
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ if (it->size() > 0) {
+ warn(node->getLoc(), "attribute with arguments not recognized, skipping", "", "");
+ continue;
+ }
+
+ switch (it->name) {
+ case EatFlatten:
+ selection->setFlatten();
+ break;
+ case EatBranch:
+ selection->setDontFlatten();
+ break;
+ default:
+ warn(node->getLoc(), "attribute does not apply to a switch", "", "");
+ break;
+ }
+ }
+}
+
+//
+// Loop attributes
+//
+void TParseContext::handleLoopAttributes(const TAttributes& attributes, TIntermNode* node)
+{
+ TIntermLoop* loop = node->getAsLoopNode();
+ if (loop == nullptr) {
+ // the actual loop might be part of a sequence
+ TIntermAggregate* agg = node->getAsAggregate();
+ if (agg == nullptr)
+ return;
+ for (auto it = agg->getSequence().begin(); it != agg->getSequence().end(); ++it) {
+ loop = (*it)->getAsLoopNode();
+ if (loop != nullptr)
+ break;
+ }
+ if (loop == nullptr)
+ return;
+ }
+
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ if (it->name != EatDependencyLength && it->size() > 0) {
+ warn(node->getLoc(), "attribute with arguments not recognized, skipping", "", "");
+ continue;
+ }
+
+ int value;
+ switch (it->name) {
+ case EatUnroll:
+ loop->setUnroll();
+ break;
+ case EatLoop:
+ loop->setDontUnroll();
+ break;
+ case EatDependencyInfinite:
+ loop->setLoopDependency(TIntermLoop::dependencyInfinite);
+ break;
+ case EatDependencyLength:
+ if (it->size() == 1 && it->getInt(value)) {
+ if (value <= 0)
+ error(node->getLoc(), "must be positive", "dependency_length", "");
+ loop->setLoopDependency(value);
+ } else
+ warn(node->getLoc(), "expected a single integer argument", "dependency_length", "");
+ break;
+ default:
+ warn(node->getLoc(), "attribute does not apply to a loop", "", "");
+ break;
+ }
+ }
+}
+
+
+} // end namespace glslang
diff --git a/glslang/MachineIndependent/attribute.h b/glslang/MachineIndependent/attribute.h
new file mode 100644
index 0000000000000000000000000000000000000000..8d0c5bcafbf3d69caaa6df8d4c3dd24d237e4d7f
--- /dev/null
+++ b/glslang/MachineIndependent/attribute.h
@@ -0,0 +1,102 @@
+//
+// Copyright (C) 2017 LunarG, Inc.
+// Copyright (C) 2018 Google, Inc.
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials provided
+// with the distribution.
+//
+// Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+
+#ifndef _ATTRIBUTE_INCLUDED_
+#define _ATTRIBUTE_INCLUDED_
+
+#include "../Include/Common.h"
+#include "../Include/ConstantUnion.h"
+
+namespace glslang {
+
+ enum TAttributeType {
+ EatNone,
+ EatAllow_uav_condition,
+ EatBranch,
+ EatCall,
+ EatDomain,
+ EatEarlyDepthStencil,
+ EatFastOpt,
+ EatFlatten,
+ EatForceCase,
+ EatInstance,
+ EatMaxTessFactor,
+ EatNumThreads,
+ EatMaxVertexCount,
+ EatOutputControlPoints,
+ EatOutputTopology,
+ EatPartitioning,
+ EatPatchConstantFunc,
+ EatPatchSize,
+ EatUnroll,
+ EatLoop,
+ EatBinding,
+ EatGlobalBinding,
+ EatLocation,
+ EatInputAttachment,
+ EatBuiltIn,
+ EatPushConstant,
+ EatConstantId,
+ EatDependencyInfinite,
+ EatDependencyLength
+ };
+
+ class TIntermAggregate;
+
+ struct TAttributeArgs {
+ TAttributeType name;
+ const TIntermAggregate* args;
+
+ // Obtain attribute as integer
+ // Return false if it cannot be obtained
+ bool getInt(int& value, int argNum = 0) const;
+
+ // Obtain attribute as string, with optional to-lower transform
+ // Return false if it cannot be obtained
+ bool getString(TString& value, int argNum = 0, bool convertToLower = true) const;
+
+ // How many arguments were provided to the attribute?
+ int size() const;
+
+ protected:
+ const TConstUnion* getConstUnion(TBasicType basicType, int argNum) const;
+ };
+
+ typedef TList<TAttributeArgs> TAttributes;
+
+} // end namespace glslang
+
+#endif // _ATTRIBUTE_INCLUDED_
diff --git a/glslang/MachineIndependent/glslang.y b/glslang/MachineIndependent/glslang.y
index 52358c7d2096f2f011f9cca8ebb6fbdfc8218d14..02969ba050d407bf00ccc51b6e7bdfaf7768cd6b 100644
--- a/glslang/MachineIndependent/glslang.y
+++ b/glslang/MachineIndependent/glslang.y
@@ -58,6 +58,7 @@ Jutta Degener, 1995
#include "SymbolTable.h"
#include "ParseHelper.h"
#include "../Public/ShaderLang.h"
+#include "attribute.h"
using namespace glslang;
@@ -86,6 +87,7 @@ using namespace glslang;
TIntermNode* intermNode;
glslang::TIntermNodePair nodePair;
glslang::TIntermTyped* intermTypedNode;
+ glslang::TAttributes* attributes;
};
union {
glslang::TPublicType type;
@@ -218,12 +220,12 @@ extern int yylex(YYSTYPE*, TParseContext&);
%type <interm.intermNode> translation_unit function_definition
%type <interm.intermNode> statement simple_statement
%type <interm.intermNode> statement_list switch_statement_list compound_statement
-%type <interm.intermNode> declaration_statement selection_statement expression_statement
-%type <interm.intermNode> switch_statement case_label
+%type <interm.intermNode> declaration_statement selection_statement selection_statement_nonattributed expression_statement
+%type <interm.intermNode> switch_statement switch_statement_nonattributed case_label
%type <interm.intermNode> declaration external_declaration
%type <interm.intermNode> for_init_statement compound_statement_no_new_scope
%type <interm.nodePair> selection_rest_statement for_rest_statement
-%type <interm.intermNode> iteration_statement jump_statement statement_no_new_scope statement_scoped
+%type <interm.intermNode> iteration_statement iteration_statement_nonattributed jump_statement statement_no_new_scope statement_scoped
%type <interm> single_declaration init_declarator_list
%type <interm> parameter_declaration parameter_declarator parameter_type_specifier
@@ -246,6 +248,8 @@ extern int yylex(YYSTYPE*, TParseContext&);
%type <interm.identifierList> identifier_list
+%type <interm.attributes> attribute attribute_list single_attribute
+
%start translation_unit
%%
@@ -2673,6 +2677,15 @@ expression_statement
;
selection_statement
+ : selection_statement_nonattributed {
+ $$ = $1;
+ }
+ | attribute selection_statement_nonattributed {
+ parseContext.handleSelectionAttributes(*$1, $2);
+ $$ = $2;
+ }
+
+selection_statement_nonattributed
: IF LEFT_PAREN expression RIGHT_PAREN selection_rest_statement {
parseContext.boolCheck($1.loc, $3);
$$ = parseContext.intermediate.addSelection($3, $5, $1.loc);
@@ -2709,6 +2722,15 @@ condition
;
switch_statement
+ : switch_statement_nonattributed {
+ $$ = $1;
+ }
+ | attribute switch_statement_nonattributed {
+ parseContext.handleSwitchAttributes(*$1, $2);
+ $$ = $2;
+ }
+
+switch_statement_nonattributed
: SWITCH LEFT_PAREN expression RIGHT_PAREN {
// start new switch sequence on the switch stack
++parseContext.controlFlowNestingLevel;
@@ -2762,6 +2784,15 @@ case_label
;
iteration_statement
+ : iteration_statement_nonattributed {
+ $$ = $1;
+ }
+ | attribute iteration_statement_nonattributed {
+ parseContext.handleLoopAttributes(*$1, $2);
+ $$ = $2;
+ }
+
+iteration_statement_nonattributed
: WHILE LEFT_PAREN {
if (! parseContext.limits.whileLoops)
parseContext.error($1.loc, "while loops not available", "limitation", "");
@@ -2920,4 +2951,26 @@ function_definition
}
;
+attribute
+ : LEFT_BRACKET LEFT_BRACKET attribute_list RIGHT_BRACKET RIGHT_BRACKET {
+ $$ = $3;
+ parseContext.requireExtensions($1.loc, 1, &E_GL_EXT_control_flow_attributes, "attribute");
+ }
+
+attribute_list
+ : single_attribute {
+ $$ = $1;
+ }
+ | attribute_list COMMA single_attribute {
+ $$ = parseContext.mergeAttributes($1, $3);
+ }
+
+single_attribute
+ : IDENTIFIER {
+ $$ = parseContext.makeAttributes(*$1.string);
+ }
+ | IDENTIFIER LEFT_PAREN constant_expression RIGHT_PAREN {
+ $$ = parseContext.makeAttributes(*$1.string, $3);
+ }
+
%%
diff --git a/glslang/MachineIndependent/glslang_tab.cpp b/glslang/MachineIndependent/glslang_tab.cpp
index 72415681bd258525aa9927b4ca571bd6a60cec7e..d7ab6491e371d8c544ccde5986646f6a0859a0f6 100644
--- a/glslang/MachineIndependent/glslang_tab.cpp
+++ b/glslang/MachineIndependent/glslang_tab.cpp
@@ -83,11 +83,12 @@ Jutta Degener, 1995
#include "SymbolTable.h"
#include "ParseHelper.h"
#include "../Public/ShaderLang.h"
+#include "attribute.h"
using namespace glslang;
-#line 91 "MachineIndependent/glslang_tab.cpp" /* yacc.c:339 */
+#line 92 "MachineIndependent/glslang_tab.cpp" /* yacc.c:339 */
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
@@ -425,7 +426,7 @@ extern int yydebug;
typedef union YYSTYPE YYSTYPE;
union YYSTYPE
{
-#line 68 "MachineIndependent/glslang.y" /* yacc.c:355 */
+#line 69 "MachineIndependent/glslang.y" /* yacc.c:355 */
struct {
glslang::TSourceLoc loc;
@@ -447,6 +448,7 @@ union YYSTYPE
TIntermNode* intermNode;
glslang::TIntermNodePair nodePair;
glslang::TIntermTyped* intermTypedNode;
+ glslang::TAttributes* attributes;
};
union {
glslang::TPublicType type;
@@ -459,7 +461,7 @@ union YYSTYPE
};
} interm;
-#line 463 "MachineIndependent/glslang_tab.cpp" /* yacc.c:355 */
+#line 465 "MachineIndependent/glslang_tab.cpp" /* yacc.c:355 */
};
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
@@ -472,7 +474,7 @@ int yyparse (glslang::TParseContext* pParseContext);
#endif /* !YY_YY_MACHINEINDEPENDENT_GLSLANG_TAB_CPP_H_INCLUDED */
/* Copy the second part of user declarations. */
-#line 102 "MachineIndependent/glslang.y" /* yacc.c:358 */
+#line 104 "MachineIndependent/glslang.y" /* yacc.c:358 */
/* windows only pragma */
@@ -488,7 +490,7 @@ int yyparse (glslang::TParseContext* pParseContext);
extern int yylex(YYSTYPE*, TParseContext&);
-#line 492 "MachineIndependent/glslang_tab.cpp" /* yacc.c:358 */
+#line 494 "MachineIndependent/glslang_tab.cpp" /* yacc.c:358 */
#ifdef short
# undef short
@@ -711,16 +713,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 274
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 6614
+#define YYLAST 6633
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 298
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 100
+#define YYNNTS 106
/* YYNRULES -- Number of rules. */
-#define YYNRULES 450
+#define YYNRULES 461
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 582
+#define YYNSTATES 601
/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
by yylex, with out-of-bounds checking. */
@@ -796,52 +798,53 @@ static const yytype_uint16 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 253, 253, 259, 262, 265, 269, 273, 277, 283,
- 289, 292, 296, 302, 305, 313, 316, 319, 322, 325,
- 330, 338, 345, 352, 358, 362, 369, 372, 378, 385,
- 395, 403, 408, 438, 444, 448, 452, 472, 473, 474,
- 475, 481, 482, 487, 492, 501, 502, 507, 515, 516,
- 522, 531, 532, 537, 542, 547, 555, 556, 564, 575,
- 576, 585, 586, 595, 596, 605, 606, 614, 615, 623,
- 624, 632, 633, 633, 651, 652, 667, 671, 675, 679,
- 684, 688, 692, 696, 700, 704, 708, 715, 718, 729,
- 736, 741, 746, 754, 758, 762, 766, 771, 776, 785,
- 785, 796, 800, 807, 814, 817, 824, 832, 852, 875,
- 890, 913, 924, 934, 944, 954, 963, 966, 970, 974,
- 979, 987, 992, 997, 1002, 1007, 1016, 1027, 1054, 1063,
- 1070, 1077, 1084, 1096, 1102, 1105, 1112, 1116, 1120, 1128,
- 1137, 1140, 1151, 1154, 1157, 1161, 1165, 1169, 1176, 1180,
- 1192, 1206, 1211, 1217, 1223, 1230, 1236, 1241, 1246, 1251,
- 1259, 1263, 1267, 1271, 1275, 1279, 1285, 1294, 1297, 1305,
- 1309, 1318, 1323, 1331, 1335, 1345, 1349, 1353, 1358, 1365,
- 1369, 1374, 1379, 1384, 1391, 1398, 1402, 1407, 1412, 1417,
- 1423, 1429, 1435, 1443, 1451, 1459, 1464, 1469, 1474, 1479,
- 1484, 1489, 1495, 1501, 1507, 1515, 1523, 1531, 1537, 1543,
- 1549, 1555, 1561, 1567, 1575, 1583, 1591, 1596, 1601, 1606,
- 1611, 1616, 1621, 1626, 1631, 1636, 1641, 1646, 1651, 1657,
- 1663, 1669, 1675, 1681, 1687, 1693, 1699, 1705, 1711, 1717,
- 1723, 1731, 1739, 1747, 1755, 1763, 1771, 1779, 1787, 1795,
- 1803, 1811, 1819, 1824, 1829, 1834, 1839, 1844, 1849, 1854,
- 1859, 1864, 1869, 1874, 1879, 1884, 1889, 1894, 1899, 1904,
- 1909, 1914, 1919, 1924, 1929, 1934, 1939, 1944, 1949, 1954,
- 1959, 1964, 1969, 1974, 1979, 1984, 1989, 1994, 1999, 2004,
- 2009, 2014, 2019, 2024, 2029, 2034, 2039, 2044, 2049, 2054,
- 2059, 2064, 2069, 2074, 2079, 2084, 2089, 2094, 2099, 2104,
- 2109, 2114, 2119, 2124, 2129, 2134, 2139, 2144, 2149, 2154,
- 2159, 2164, 2169, 2174, 2179, 2184, 2189, 2194, 2199, 2204,
- 2209, 2214, 2219, 2224, 2229, 2234, 2239, 2244, 2249, 2254,
- 2259, 2264, 2269, 2274, 2279, 2284, 2289, 2294, 2299, 2304,
- 2309, 2314, 2319, 2324, 2329, 2334, 2339, 2344, 2349, 2354,
- 2359, 2364, 2370, 2376, 2382, 2388, 2394, 2400, 2406, 2411,
- 2427, 2432, 2437, 2445, 2445, 2456, 2456, 2466, 2469, 2482,
- 2500, 2524, 2528, 2534, 2539, 2550, 2553, 2559, 2568, 2571,
- 2577, 2581, 2582, 2588, 2589, 2590, 2591, 2592, 2593, 2594,
- 2598, 2599, 2603, 2599, 2615, 2616, 2620, 2620, 2627, 2627,
- 2641, 2644, 2652, 2660, 2671, 2672, 2676, 2683, 2687, 2695,
- 2699, 2712, 2712, 2732, 2735, 2741, 2753, 2765, 2765, 2780,
- 2780, 2796, 2796, 2817, 2820, 2826, 2829, 2835, 2839, 2846,
- 2851, 2856, 2863, 2866, 2875, 2879, 2888, 2891, 2894, 2902,
- 2902
+ 0, 257, 257, 263, 266, 269, 273, 277, 281, 287,
+ 293, 296, 300, 306, 309, 317, 320, 323, 326, 329,
+ 334, 342, 349, 356, 362, 366, 373, 376, 382, 389,
+ 399, 407, 412, 442, 448, 452, 456, 476, 477, 478,
+ 479, 485, 486, 491, 496, 505, 506, 511, 519, 520,
+ 526, 535, 536, 541, 546, 551, 559, 560, 568, 579,
+ 580, 589, 590, 599, 600, 609, 610, 618, 619, 627,
+ 628, 636, 637, 637, 655, 656, 671, 675, 679, 683,
+ 688, 692, 696, 700, 704, 708, 712, 719, 722, 733,
+ 740, 745, 750, 758, 762, 766, 770, 775, 780, 789,
+ 789, 800, 804, 811, 818, 821, 828, 836, 856, 879,
+ 894, 917, 928, 938, 948, 958, 967, 970, 974, 978,
+ 983, 991, 996, 1001, 1006, 1011, 1020, 1031, 1058, 1067,
+ 1074, 1081, 1088, 1100, 1106, 1109, 1116, 1120, 1124, 1132,
+ 1141, 1144, 1155, 1158, 1161, 1165, 1169, 1173, 1180, 1184,
+ 1196, 1210, 1215, 1221, 1227, 1234, 1240, 1245, 1250, 1255,
+ 1263, 1267, 1271, 1275, 1279, 1283, 1289, 1298, 1301, 1309,
+ 1313, 1322, 1327, 1335, 1339, 1349, 1353, 1357, 1362, 1369,
+ 1373, 1378, 1383, 1388, 1395, 1402, 1406, 1411, 1416, 1421,
+ 1427, 1433, 1439, 1447, 1455, 1463, 1468, 1473, 1478, 1483,
+ 1488, 1493, 1499, 1505, 1511, 1519, 1527, 1535, 1541, 1547,
+ 1553, 1559, 1565, 1571, 1579, 1587, 1595, 1600, 1605, 1610,
+ 1615, 1620, 1625, 1630, 1635, 1640, 1645, 1650, 1655, 1661,
+ 1667, 1673, 1679, 1685, 1691, 1697, 1703, 1709, 1715, 1721,
+ 1727, 1735, 1743, 1751, 1759, 1767, 1775, 1783, 1791, 1799,
+ 1807, 1815, 1823, 1828, 1833, 1838, 1843, 1848, 1853, 1858,
+ 1863, 1868, 1873, 1878, 1883, 1888, 1893, 1898, 1903, 1908,
+ 1913, 1918, 1923, 1928, 1933, 1938, 1943, 1948, 1953, 1958,
+ 1963, 1968, 1973, 1978, 1983, 1988, 1993, 1998, 2003, 2008,
+ 2013, 2018, 2023, 2028, 2033, 2038, 2043, 2048, 2053, 2058,
+ 2063, 2068, 2073, 2078, 2083, 2088, 2093, 2098, 2103, 2108,
+ 2113, 2118, 2123, 2128, 2133, 2138, 2143, 2148, 2153, 2158,
+ 2163, 2168, 2173, 2178, 2183, 2188, 2193, 2198, 2203, 2208,
+ 2213, 2218, 2223, 2228, 2233, 2238, 2243, 2248, 2253, 2258,
+ 2263, 2268, 2273, 2278, 2283, 2288, 2293, 2298, 2303, 2308,
+ 2313, 2318, 2323, 2328, 2333, 2338, 2343, 2348, 2353, 2358,
+ 2363, 2368, 2374, 2380, 2386, 2392, 2398, 2404, 2410, 2415,
+ 2431, 2436, 2441, 2449, 2449, 2460, 2460, 2470, 2473, 2486,
+ 2504, 2528, 2532, 2538, 2543, 2554, 2557, 2563, 2572, 2575,
+ 2581, 2585, 2586, 2592, 2593, 2594, 2595, 2596, 2597, 2598,
+ 2602, 2603, 2607, 2603, 2619, 2620, 2624, 2624, 2631, 2631,
+ 2645, 2648, 2656, 2664, 2675, 2676, 2680, 2683, 2689, 2696,
+ 2700, 2708, 2712, 2725, 2728, 2734, 2734, 2754, 2757, 2763,
+ 2775, 2787, 2790, 2796, 2796, 2811, 2811, 2827, 2827, 2848,
+ 2851, 2857, 2860, 2866, 2870, 2877, 2882, 2887, 2894, 2897,
+ 2906, 2910, 2919, 2922, 2925, 2933, 2933, 2955, 2961, 2964,
+ 2969, 2972
};
#endif
@@ -937,11 +940,14 @@ static const char *const yytname[] =
"statement_no_new_scope", "statement_scoped", "$@7", "$@8",
"compound_statement_no_new_scope", "statement_list",
"expression_statement", "selection_statement",
- "selection_rest_statement", "condition", "switch_statement", "$@9",
- "switch_statement_list", "case_label", "iteration_statement", "$@10",
- "$@11", "$@12", "for_init_statement", "conditionopt",
- "for_rest_statement", "jump_statement", "translation_unit",
- "external_declaration", "function_definition", "$@13", YY_NULL
+ "selection_statement_nonattributed", "selection_rest_statement",
+ "condition", "switch_statement", "switch_statement_nonattributed", "$@9",
+ "switch_statement_list", "case_label", "iteration_statement",
+ "iteration_statement_nonattributed", "$@10", "$@11", "$@12",
+ "for_init_statement", "conditionopt", "for_rest_statement",
+ "jump_statement", "translation_unit", "external_declaration",
+ "function_definition", "$@13", "attribute", "attribute_list",
+ "single_attribute", YY_NULL
};
#endif
@@ -983,10 +989,10 @@ static const yytype_uint16 yytoknum[] =
};
# endif
-#define YYPACT_NINF -525
+#define YYPACT_NINF -542
#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-525)))
+ (!!((Yystate) == (-542)))
#define YYTABLE_NINF -407
@@ -997,65 +1003,67 @@ static const yytype_uint16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- 2619, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -243, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -228, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -215, -525, -525, -525,
- -525, -525, -525, -525, -525, -157, -525, -216, -218, -205,
- -141, 4260, -165, -525, -94, -525, -525, -525, -525, 3183,
- -525, -525, -525, -117, -525, -525, 575, -525, -525, -80,
- -48, -114, -525, 6381, -242, -525, -525, -113, -525, 4260,
- -525, -525, -525, 4260, -75, -74, -525, -235, -190, -525,
- -525, -525, 4765, -108, -525, -525, -525, -186, -525, -112,
- -178, -525, -525, 4260, -115, -525, -226, 867, -525, -525,
- -525, -525, -117, -229, -525, 5039, -224, -525, -71, -525,
- -158, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, 5861, 5861, 5861, -525, -525, -525, -525, -525,
- -525, -525, -223, -525, -525, -525, -102, -177, 6121, -100,
- -525, 5861, -204, -171, -132, -221, -199, -124, -120, -111,
- -84, -83, -233, -98, -525, 5313, -525, -60, 5861, -525,
- -48, 4260, 4260, -59, 3456, -525, -525, -525, -99, -97,
- -525, -90, -88, -96, 5587, -85, 5861, -92, -79, -81,
- -525, -525, -191, -525, -525, -153, -525, -218, -78, -525,
- -525, -525, -525, 1159, -525, -525, -525, -525, -525, -525,
- -108, 5039, -193, 5039, -525, -525, 5039, 4260, -525, -47,
- -525, -525, -525, -176, -525, -525, 5861, -42, -525, -525,
- 5861, -73, -525, -525, -525, 5861, 5861, 5861, 5861, 5861,
- 5861, 5861, 5861, 5861, 5861, 5861, 5861, 5861, 5861, 5861,
- 5861, 5861, 5861, 5861, -525, -525, -525, -76, -525, -525,
- -525, -525, 3724, -59, -117, -152, -525, -525, -525, -525,
- -525, 1451, -525, 5861, -525, -525, -143, 5861, -180, -525,
- -525, -525, 1451, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, 5861, 5861, -525, -525, -525, -525,
- 5039, -525, -133, -525, 3992, -525, -525, -72, -77, -525,
- -525, -525, -525, -525, -204, -204, -171, -171, -132, -132,
- -132, -132, -221, -221, -199, -124, -120, -111, -84, -83,
- 5861, -525, -525, -142, -108, -59, -525, -37, 2327, -175,
- -525, -163, -525, 2892, 1451, -525, -525, -525, -525, 4491,
- -525, -525, -129, -525, -525, -68, -525, -525, 2892, -70,
- -525, -77, -32, 4260, -63, -66, -525, -525, 5861, 5861,
- -525, -69, -61, 188, -58, 2035, -525, -56, -57, 1743,
- -525, -525, -161, 5861, 1743, -70, -525, -525, 1451, 5039,
- -525, -525, -525, -67, -77, -525, -525, 1451, -54, -525,
- -525, -525
+ 2638, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -204, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -186, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -214, -542, -542, -542,
+ -542, -542, -542, -542, -542, -149, -542, -216, -237, -177,
+ -174, 4279, -210, -542, -119, -542, -542, -542, -542, 3202,
+ -542, -542, -542, -141, -542, -542, 594, -542, -542, -93,
+ -45, -85, -542, 6400, -233, -542, -542, -79, -542, 4279,
+ -542, -542, -542, 4279, -54, -41, -542, -180, -176, -542,
+ -542, -542, 4784, -73, -542, -542, -542, -175, -542, -78,
+ -165, -542, -542, 4279, -80, -542, -224, 886, -542, -542,
+ -542, -542, -141, -221, -542, 5058, -184, -542, -34, -542,
+ -172, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, 5880, 5880, 5880, -542, -542, -542, -542, -542,
+ -542, -542, -207, -542, -542, -542, -67, -164, 6140, -65,
+ -542, 5880, -133, -102, -197, -227, -120, -86, -84, -82,
+ -48, -49, -236, -61, -542, 5332, -542, -24, 5880, -542,
+ -45, 4279, 4279, -23, 3475, -542, -542, -542, -64, -63,
+ -542, -55, -52, -60, 5606, -51, 5880, -57, -46, -44,
+ -43, -542, -542, -188, -542, -542, -155, -542, -237, -40,
+ -542, -542, -542, -542, 1178, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -11, -73, 5058, -179, 5058, -542,
+ -542, 5058, 4279, -542, -10, -542, -542, -542, -161, -542,
+ -542, 5880, -8, -542, -542, 5880, -38, -542, -542, -542,
+ 5880, 5880, 5880, 5880, 5880, 5880, 5880, 5880, 5880, 5880,
+ 5880, 5880, 5880, 5880, 5880, 5880, 5880, 5880, 5880, -542,
+ -542, -542, -47, -542, -542, -542, -542, 3743, -23, -141,
+ -148, -542, -542, -542, -542, -542, 1470, -542, 5880, -542,
+ -542, -135, 5880, -127, -542, -542, -6, -542, 1470, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ 5880, 5880, -542, -542, -542, -542, -542, -542, -542, 5058,
+ -542, -91, -542, 4011, -542, -542, -39, -42, -542, -542,
+ -542, -542, -542, -133, -133, -102, -102, -197, -197, -197,
+ -197, -227, -227, -120, -86, -84, -82, -48, -49, 5880,
+ -542, -542, -134, -73, -23, -542, 2, 2346, -156, -542,
+ -154, -542, 2911, -31, -245, -542, 1470, -542, -542, -542,
+ -542, 4510, -542, -542, -122, -542, -542, -30, -542, -542,
+ 2911, -33, -542, -42, 9, 4279, -28, 5880, -26, -6,
+ -27, -542, -542, 5880, 5880, -542, -35, -22, 226, -21,
+ 2054, -542, -18, -19, 1762, -9, -542, -542, -542, -542,
+ -151, 5880, 1762, -33, -542, -542, 1470, 5058, -542, -542,
+ -542, -542, -17, -42, -542, -542, 1470, -14, -542, -542,
+ -542
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1084,14 +1092,14 @@ static const yytype_uint16 yydefact[] =
365, 366, 367, 328, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
345, 346, 347, 348, 349, 350, 351, 352, 353, 354,
- 355, 356, 357, 358, 359, 360, 0, 175, 369, 448,
- 128, 139, 370, 371, 372, 0, 447, 0, 449, 0,
+ 355, 356, 357, 358, 359, 360, 0, 175, 369, 454,
+ 128, 139, 370, 371, 372, 0, 453, 0, 455, 0,
105, 104, 0, 116, 121, 146, 145, 143, 147, 0,
- 140, 142, 126, 169, 144, 368, 0, 444, 446, 0,
+ 140, 142, 126, 169, 144, 368, 0, 450, 452, 0,
0, 0, 375, 0, 0, 93, 90, 0, 103, 0,
112, 106, 114, 0, 115, 0, 91, 122, 0, 96,
- 141, 127, 0, 170, 1, 445, 167, 0, 138, 136,
- 0, 134, 373, 0, 0, 94, 0, 0, 450, 107,
+ 141, 127, 0, 170, 1, 451, 167, 0, 138, 136,
+ 0, 134, 373, 0, 0, 94, 0, 0, 456, 107,
111, 113, 109, 117, 108, 0, 123, 99, 0, 97,
0, 2, 10, 11, 4, 5, 6, 7, 8, 9,
13, 12, 0, 0, 0, 171, 39, 38, 40, 37,
@@ -1099,59 +1107,63 @@ static const yytype_uint16 yydefact[] =
41, 0, 45, 48, 51, 56, 59, 61, 63, 65,
67, 69, 71, 0, 31, 0, 166, 0, 0, 133,
0, 0, 0, 0, 0, 377, 92, 95, 0, 0,
- 429, 0, 0, 0, 0, 0, 0, 0, 0, 401,
- 410, 414, 41, 74, 87, 0, 390, 0, 126, 393,
- 412, 392, 391, 0, 394, 395, 396, 397, 398, 399,
- 110, 0, 118, 0, 385, 125, 0, 0, 101, 0,
- 98, 34, 35, 0, 19, 20, 0, 0, 25, 24,
- 0, 175, 28, 30, 36, 0, 0, 0, 0, 0,
+ 435, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 401, 410, 414, 41, 74, 87, 0, 390, 0, 126,
+ 393, 412, 392, 391, 0, 394, 395, 416, 396, 423,
+ 397, 398, 431, 399, 0, 110, 0, 118, 0, 385,
+ 125, 0, 0, 101, 0, 98, 34, 35, 0, 19,
+ 20, 0, 0, 25, 24, 0, 175, 28, 30, 36,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 72, 172, 173, 0, 168, 89,
- 137, 135, 0, 0, 383, 0, 381, 376, 378, 440,
- 439, 0, 431, 0, 443, 441, 0, 0, 0, 426,
- 427, 400, 0, 77, 78, 80, 79, 82, 83, 84,
- 85, 86, 81, 76, 0, 0, 415, 411, 413, 120,
- 0, 388, 0, 124, 0, 102, 14, 0, 21, 18,
- 29, 42, 43, 44, 47, 46, 49, 50, 54, 55,
- 52, 53, 57, 58, 60, 62, 64, 66, 68, 70,
- 0, 174, 374, 0, 384, 0, 379, 0, 0, 0,
- 442, 0, 425, 0, 402, 75, 88, 119, 386, 0,
- 100, 16, 0, 380, 382, 0, 434, 433, 436, 408,
- 421, 419, 0, 0, 0, 0, 387, 389, 0, 0,
- 435, 0, 0, 418, 0, 0, 416, 0, 0, 0,
- 403, 73, 0, 437, 0, 408, 407, 409, 423, 0,
- 405, 428, 404, 0, 438, 432, 417, 424, 0, 420,
- 430, 422
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 72,
+ 172, 173, 0, 168, 89, 137, 135, 0, 0, 383,
+ 0, 381, 376, 378, 446, 445, 0, 437, 0, 449,
+ 447, 0, 0, 0, 430, 433, 0, 400, 0, 77,
+ 78, 80, 79, 82, 83, 84, 85, 86, 81, 76,
+ 0, 0, 415, 411, 413, 417, 424, 432, 120, 0,
+ 388, 0, 124, 0, 102, 14, 0, 21, 18, 29,
+ 42, 43, 44, 47, 46, 49, 50, 54, 55, 52,
+ 53, 57, 58, 60, 62, 64, 66, 68, 70, 0,
+ 174, 374, 0, 384, 0, 379, 0, 0, 0, 448,
+ 0, 429, 0, 460, 0, 458, 402, 75, 88, 119,
+ 386, 0, 100, 16, 0, 380, 382, 0, 440, 439,
+ 442, 408, 425, 421, 0, 0, 0, 0, 0, 0,
+ 0, 387, 389, 0, 0, 441, 0, 0, 420, 0,
+ 0, 418, 0, 0, 0, 0, 457, 459, 403, 73,
+ 0, 443, 0, 408, 407, 409, 427, 0, 405, 434,
+ 404, 461, 0, 444, 438, 419, 428, 0, 422, 436,
+ 426
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -525, -525, -525, -525, -525, -525, -525, -525, -525, -525,
- -525, -525, -103, -525, -278, -274, -297, -273, -214, -211,
- -210, -212, -209, -208, -525, -261, -525, -292, -525, -308,
- -525, 4, -525, -525, -525, 5, -525, -525, -525, -41,
- -38, -39, -525, -525, -504, -525, -525, -525, -525, -123,
- -525, -230, -237, -525, -525, 0, -246, -525, 1, -525,
- -525, -525, -337, -342, -207, -286, -378, -525, -285, -376,
- -524, -322, -525, -525, -330, -327, -525, -525, -22, -452,
- -275, -525, -525, -298, -525, -525, -525, -525, -525, -525,
- -525, -525, -525, -525, -525, -525, -525, -2, -525, -525
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -268, -542, -241, -240, -294, -239, -173, -187,
+ -170, -169, -171, -168, -542, -267, -542, -292, -542, -282,
+ -296, 6, -542, -542, -542, 8, -542, -542, -542, -1,
+ 10, 11, -542, -542, -513, -542, -542, -542, -542, -77,
+ -542, -229, -238, -542, -542, 0, -243, -542, 47, -542,
+ -542, -542, -336, -319, -167, -249, -370, -542, -251, -364,
+ -541, -291, -542, -542, -305, -304, -542, -542, 23, -454,
+ -242, -542, -110, -542, -264, -542, -106, -542, -542, -542,
+ -542, -103, -542, -542, -542, -542, -542, -542, -542, -542,
+ 46, -542, -542, -542, -542, -266
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 320, 321, 322, 487, 323, 324, 325, 326, 327,
- 328, 329, 372, 331, 332, 333, 334, 335, 336, 337,
- 338, 339, 340, 341, 342, 373, 510, 374, 474, 375,
- 440, 376, 227, 397, 300, 377, 229, 230, 231, 260,
+ -1, 320, 321, 322, 496, 323, 324, 325, 326, 327,
+ 328, 329, 373, 331, 332, 333, 334, 335, 336, 337,
+ 338, 339, 340, 341, 342, 374, 519, 375, 480, 376,
+ 445, 377, 227, 402, 300, 378, 229, 230, 231, 260,
261, 262, 232, 233, 234, 235, 236, 237, 280, 281,
238, 239, 240, 241, 277, 344, 273, 243, 244, 245,
- 351, 283, 354, 355, 445, 446, 395, 482, 379, 380,
- 381, 382, 462, 545, 571, 553, 554, 555, 572, 383,
- 384, 385, 556, 544, 386, 557, 578, 387, 388, 523,
- 451, 518, 538, 551, 552, 389, 246, 247, 248, 257
+ 351, 283, 354, 355, 450, 451, 400, 491, 380, 381,
+ 382, 383, 468, 560, 589, 568, 569, 570, 590, 384,
+ 385, 386, 387, 571, 556, 388, 389, 572, 597, 390,
+ 391, 392, 532, 456, 527, 550, 566, 567, 393, 246,
+ 247, 248, 257, 394, 534, 535
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -1159,298 +1171,329 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 242, 263, 270, 394, 226, 228, 403, 478, 286, 278,
- 524, 343, 448, 479, 442, 481, 254, 251, 483, 542,
- 433, 296, 249, 404, 405, 272, 270, 422, 423, 263,
- 294, 567, 272, 285, 542, 570, 412, 250, 272, 295,
- 570, 345, -32, 345, 406, 391, 390, 392, 407, 357,
- 396, 426, 427, 352, 252, 434, 456, 256, 458, 255,
- 484, 258, 424, 425, 463, 464, 465, 466, 467, 468,
- 469, 470, 471, 472, 345, 517, 415, 416, 417, 297,
- 346, 480, 298, 473, 437, 299, 347, 439, 349, 409,
- 486, 539, 475, 522, 350, 410, 475, 475, 488, 394,
- 448, 394, 527, 540, 394, 573, 418, 265, 419, 475,
- 266, 475, 420, 421, 399, 270, 577, 400, 490, 475,
- 515, 352, 476, 516, 352, 498, 499, 500, 501, 475,
- 515, 259, 520, 533, 222, 223, 224, 528, 267, 529,
- 494, 495, 448, 475, 548, 519, 496, 497, 478, 521,
- 272, 547, 276, 502, 503, 282, 287, 292, 293, 345,
- 356, 398, 348, 428, 408, 413, 429, 352, 431, 330,
- 435, 432, 438, 444, 430, 452, 449, 453, 450, 454,
- 457, 459, 525, 526, 279, 485, 460, -31, 394, 461,
- 489, 579, 511, -26, 535, 475, 531, 549, 514, -406,
- 558, 478, 532, 559, 560, 564, 563, 565, 580, 401,
- 402, 369, 352, 568, 504, 541, 581, 569, 505, 507,
- 506, 289, 290, 508, 291, 509, 253, 441, 414, 534,
- 541, 264, 566, 536, 575, 288, 513, 394, 576, 271,
- 550, 562, 330, 537, 275, 330, 242, 0, 0, 0,
- 226, 228, 0, 284, 352, 574, 561, 0, 0, 264,
- 0, 0, 0, 264, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 394, 0, 0,
- 0, 0, 0, 353, 0, 0, 0, 378, 0, 0,
- 0, 0, 0, 543, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 270, 0, 543, 0,
- 0, 0, 491, 492, 493, 330, 330, 330, 330, 330,
+ 242, 270, 263, 399, 330, 343, 226, 360, 228, 361,
+ 362, 286, 278, 365, 536, 447, 254, 438, 251, 554,
+ 484, 427, 428, 558, 296, 270, 488, 559, 490, 585,
+ 263, 492, 408, 588, 272, 453, 417, 554, 256, 409,
+ 410, 588, 285, 345, 406, 407, 272, 425, 426, 395,
+ 397, 357, 439, 396, 352, 252, 429, 430, -32, 255,
+ 411, 249, 265, 419, 412, 266, 493, 469, 470, 471,
+ 472, 473, 474, 475, 476, 477, 478, 330, 442, 250,
+ 330, 444, 461, 345, 463, 294, 479, 272, 345, 258,
+ 401, 346, 526, 297, 295, 489, 298, 347, 259, 299,
+ 404, 349, 414, 405, 399, 495, 399, 350, 415, 399,
+ 551, 481, 552, 267, 270, 592, 481, 481, 481, 539,
+ 482, 481, 352, 499, 524, 352, 272, 525, 453, 497,
+ 431, 432, 596, 507, 508, 509, 510, 481, 524, 276,
+ 529, 545, 222, 223, 224, 481, 531, 420, 421, 422,
+ 481, 563, 500, 501, 502, 330, 330, 330, 330, 330,
330, 330, 330, 330, 330, 330, 330, 330, 330, 330,
- 330, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 330, 562, 484, 352, 453, 423, 528, 424, 292, 540,
+ 530, 541, 503, 504, 282, 505, 506, 279, 537, 538,
+ 287, 293, 511, 512, 345, 356, 348, 399, 403, 413,
+ 418, 433, 434, 435, 436, 437, 523, 440, 443, 449,
+ 457, 454, 455, 458, 462, 459, 464, 598, 352, 465,
+ 368, 520, 494, 466, 498, -31, 533, 467, -26, 543,
+ 481, 264, 484, 547, 557, 564, -406, 544, 574, 271,
+ 581, 573, 576, 578, 582, 583, 242, 514, 370, 399,
+ 553, 586, 226, 284, 228, 587, 600, 591, 599, 264,
+ 513, 575, 290, 264, 352, 515, 517, 516, 553, 289,
+ 518, 579, 253, 446, 291, 546, 548, 594, 584, 595,
+ 288, 522, 580, 353, 485, 549, 565, 379, 486, 330,
+ 444, 487, 275, 577, 0, 399, 0, 0, 0, 593,
+ 0, 0, 0, 555, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 270, 0, 0,
+ 0, 555, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 353, 448, 0, 353, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 379, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 353, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 353, 443, 0, 353, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 378, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 353, 0, 0,
+ 0, 0, 0, 0, 0, 0, 379, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 379, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 353, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 353, 0, 0, 0, 0, 0, 0, 0,
- 0, 378, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 378, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 379, 0, 0,
+ 0, 0, 379, 0, 0, 0, 379, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 353, 0, 0, 0, 0, 0,
+ 379, 0, 0, 0, 0, 271, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 379, 0, 0, 0, 379, 0, 0, 0, 0, 0,
+ 0, 0, 379, 0, 0, 0, 379, 0, 0, 0,
+ 0, 0, 0, 0, 274, 0, 379, 1, 2, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 378, 0,
- 0, 0, 0, 378, 378, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 378, 0,
- 0, 0, 0, 271, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 378, 0, 0, 0, 378,
- 0, 0, 0, 0, 378, 0, 0, 0, 378, 0,
- 0, 0, 0, 0, 0, 274, 0, 378, 1, 2,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
- 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
- 212, 213, 214, 215, 216, 217, 0, 0, 218, 0,
+ 0, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
+ 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
+ 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
+ 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+ 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+ 173, 174, 175, 176, 177, 178, 179, 180, 181, 182,
+ 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
+ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
+ 213, 214, 215, 216, 217, 0, 0, 218, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 219,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 219, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 220, 221, 222, 223, 224, 225,
- 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 358, 359, 360, 0, 361, 362, 363,
- 364, 365, 366, 367, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
- 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
- 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
- 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
- 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
- 210, 211, 212, 213, 214, 215, 216, 217, 368, 301,
- 218, 302, 303, 304, 305, 306, 307, 308, 309, 310,
- 311, 0, 0, 312, 313, 0, 0, 0, 0, 0,
+ 0, 0, 0, 220, 221, 222, 223, 224, 225, 1,
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 358, 359, 360, 0, 361, 362, 363, 364,
+ 365, 366, 367, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
+ 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
+ 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
+ 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
+ 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
+ 211, 212, 213, 214, 215, 216, 217, 368, 301, 218,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 0, 0, 312, 313, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 314, 0, 0, 0, 369, 370, 0, 0,
- 0, 0, 371, 316, 317, 318, 319, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 220, 221, 222, 223,
- 224, 225, 1, 2, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 358, 359, 360, 0, 361,
- 362, 363, 364, 365, 366, 367, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
- 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
- 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
- 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
- 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
- 368, 301, 218, 302, 303, 304, 305, 306, 307, 308,
- 309, 310, 311, 0, 0, 312, 313, 0, 0, 0,
+ 0, 314, 0, 369, 0, 370, 371, 0, 0, 0,
+ 0, 372, 316, 317, 318, 319, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 220, 221, 222, 223, 224,
+ 225, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 358, 359, 360, 0, 361, 362,
+ 363, 364, 365, 366, 367, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
+ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
+ 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
+ 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
+ 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+ 209, 210, 211, 212, 213, 214, 215, 216, 217, 368,
+ 301, 218, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 0, 0, 312, 313, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 314, 0, 0, 0, 369, 477,
- 0, 0, 0, 0, 371, 316, 317, 318, 319, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 220, 221,
- 222, 223, 224, 225, 1, 2, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 358, 359, 360,
- 0, 361, 362, 363, 364, 365, 366, 367, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
- 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
- 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
- 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
- 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
- 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 217, 368, 301, 218, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 0, 0, 312, 313, 0,
+ 0, 0, 0, 314, 0, 369, 0, 370, 483, 0,
+ 0, 0, 0, 372, 316, 317, 318, 319, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 220, 221, 222,
+ 223, 224, 225, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 358, 359, 360, 0,
+ 361, 362, 363, 364, 365, 366, 367, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+ 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+ 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
+ 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
+ 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+ 217, 368, 301, 218, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 0, 0, 312, 313, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 314, 0, 0, 0,
- 369, 0, 0, 0, 0, 0, 371, 316, 317, 318,
- 319, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 220, 221, 222, 223, 224, 225, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 358,
- 359, 360, 0, 361, 362, 363, 364, 365, 366, 367,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
- 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
- 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
- 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
- 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
- 214, 215, 216, 217, 368, 301, 218, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 0, 0, 312,
- 313, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 314, 0,
- 0, 0, 287, 0, 0, 0, 0, 0, 371, 316,
- 317, 318, 319, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 220, 221, 222, 223, 224, 225, 1, 2,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 358, 359, 360, 0, 361, 362, 363, 364, 365,
- 366, 367, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
- 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
- 212, 213, 214, 215, 216, 217, 368, 301, 218, 302,
- 303, 304, 305, 306, 307, 308, 309, 310, 311, 0,
- 0, 312, 313, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 314, 0, 369, 0, 370,
+ 0, 0, 0, 0, 0, 372, 316, 317, 318, 319,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 220,
+ 221, 222, 223, 224, 225, 1, 2, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 358, 359,
+ 360, 0, 361, 362, 363, 364, 365, 366, 367, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
+ 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+ 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
+ 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+ 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+ 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
+ 215, 216, 217, 368, 301, 218, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 0, 0, 312, 313,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 314, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 371, 316, 317, 318, 319, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 220, 221, 222, 223, 224, 225,
- 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
- 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
- 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
- 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
- 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
- 210, 211, 212, 213, 214, 215, 216, 217, 0, 301,
- 218, 302, 303, 304, 305, 306, 307, 308, 309, 310,
- 311, 0, 0, 312, 313, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 314, 0, 369,
+ 0, 287, 0, 0, 0, 0, 0, 372, 316, 317,
+ 318, 319, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 220, 221, 222, 223, 224, 225, 1, 2, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 358, 359, 360, 0, 361, 362, 363, 364, 365, 366,
+ 367, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
+ 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
+ 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
+ 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+ 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+ 173, 174, 175, 176, 177, 178, 179, 180, 181, 182,
+ 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
+ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
+ 213, 214, 215, 216, 217, 368, 301, 218, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 311, 0, 0,
+ 312, 313, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 314,
+ 0, 369, 0, 0, 0, 0, 0, 0, 0, 372,
+ 316, 317, 318, 319, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 220, 221, 222, 223, 224, 225, 1,
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
+ 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
+ 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
+ 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
+ 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
+ 211, 212, 213, 214, 215, 216, 217, 0, 301, 218,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 0, 0, 312, 313, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 314, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 372, 316, 317, 318, 319, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 220, 221, 222, 223, 224,
+ 225, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
+ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
+ 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
+ 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
+ 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+ 209, 210, 211, 212, 213, 214, 215, 216, 217, 0,
+ 0, 218, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 314, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 371, 316, 317, 318, 319, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 220, 221, 222, 223,
- 224, 225, 1, 2, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
- 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
- 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
- 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
- 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
- 0, 0, 218, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 219, 1, 2, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 220, 221, 222,
+ 223, 224, 225, 0, 0, 0, 0, 0, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
+ 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
+ 216, 217, 0, 301, 218, 302, 303, 304, 305, 306,
+ 307, 308, 309, 310, 311, 0, 0, 312, 313, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 219, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 220, 221,
- 222, 223, 224, 225, 0, 0, 0, 0, 0, 14,
+ 0, 0, 0, 0, 0, 0, 314, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 316, 317, 318,
+ 319, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 220, 221, 222, 223, 224, 1, 2, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
@@ -1471,15 +1514,40 @@ static const yytype_int16 yytable[] =
185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 0, 301, 218, 302, 303, 304, 305,
- 306, 307, 308, 309, 310, 311, 0, 0, 312, 313,
+ 215, 216, 217, 0, 268, 218, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 314, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 316, 317,
- 318, 319, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 220, 221, 222, 223, 224, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 269, 1, 2,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 220, 221, 222, 223, 224, 0, 0, 0, 0,
+ 0, 0, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 0, 0, 218, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 452, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 0,
+ 0, 0, 0, 0, 220, 221, 222, 223, 224, 0,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
@@ -1500,46 +1568,96 @@ static const yytype_int16 yytable[] =
184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
- 214, 215, 216, 217, 0, 268, 218, 0, 0, 0,
+ 214, 215, 216, 217, 0, 0, 218, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 269, 1,
- 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 220, 221, 222, 223, 224, 0, 0, 0,
- 0, 0, 0, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
- 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
- 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
- 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
- 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
- 211, 212, 213, 214, 215, 216, 217, 0, 0, 218,
+ 0, 0, 0, 521, 1, 2, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 0, 0, 0,
+ 0, 0, 220, 221, 222, 223, 224, 0, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
+ 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
+ 216, 217, 0, 0, 218, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 542, 1, 2, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 0, 0, 0, 0, 0,
+ 220, 221, 222, 223, 224, 0, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 0, 0, 218, 0, 0, 0, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 220, 221,
+ 222, 223, 224, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 0, 0, 0, 0, 0, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+ 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+ 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
+ 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
+ 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+ 217, 0, 301, 218, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 0, 0, 312, 313, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 447, 1, 2, 3,
+ 0, 0, 0, 0, 0, 314, 0, 0, 0, 398,
+ 561, 0, 0, 0, 0, 0, 316, 317, 318, 319,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 0, 0, 0, 0, 0, 220, 221, 222, 223, 224,
- 0, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 33, 34, 35, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 50, 51, 52,
53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 63, 64, 65, 66, 67, 0, 0, 0, 0, 0,
73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
@@ -1554,19 +1672,47 @@ static const yytype_int16 yytable[] =
183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 217, 0, 0, 218, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 213, 214, 215, 216, 217, 0, 301, 218, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 311, 0, 0,
+ 312, 313, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 314,
+ 0, 0, 315, 0, 0, 0, 0, 0, 0, 0,
+ 316, 317, 318, 319, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 0,
+ 0, 0, 0, 0, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
+ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
+ 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
+ 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
+ 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+ 209, 210, 211, 212, 213, 214, 215, 216, 217, 0,
+ 301, 218, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 0, 0, 312, 313, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 512, 1, 2, 3, 4, 5,
+ 0, 0, 0, 314, 0, 0, 0, 398, 0, 0,
+ 0, 0, 0, 0, 316, 317, 318, 319, 4, 5,
6, 7, 8, 9, 10, 11, 12, 13, 0, 0,
- 0, 0, 0, 220, 221, 222, 223, 224, 0, 14,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 35, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 65, 66, 67, 0, 0, 0, 0, 0, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
@@ -1581,19 +1727,47 @@ static const yytype_int16 yytable[] =
185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 0, 0, 218, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 215, 216, 217, 0, 301, 218, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 0, 0, 312, 313,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 314, 0, 0,
+ 441, 0, 0, 0, 0, 0, 0, 0, 316, 317,
+ 318, 319, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 0, 0, 0,
+ 0, 0, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
+ 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
+ 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
+ 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
+ 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
+ 211, 212, 213, 214, 215, 216, 217, 0, 301, 218,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 0, 0, 312, 313, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 530, 1, 2, 3, 4, 5, 6, 7,
+ 0, 314, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 460, 316, 317, 318, 319, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 0, 0, 0, 0,
- 0, 220, 221, 222, 223, 224, 0, 14, 15, 16,
+ 0, 0, 0, 0, 0, 0, 0, 0, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 50, 51, 52, 53, 54, 55, 56,
57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 67, 0, 0, 0, 0, 0, 73, 74, 75, 76,
77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
@@ -1608,15 +1782,130 @@ static const yytype_int16 yytable[] =
187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 0, 0, 218, 0, 0, 0, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 220,
- 221, 222, 223, 224, 50, 51, 52, 53, 54, 55,
+ 217, 0, 301, 218, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 0, 0, 312, 313, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 314, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 316, 317, 318, 319,
+ 0, 0, 0, 0, 0, 0, 0, 0, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 0, 0, 0, 0, 0, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+ 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+ 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
+ 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
+ 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+ 416, 0, 301, 218, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 0, 0, 312, 313, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 314, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 316, 317, 318, 319,
+ 0, 0, 0, 0, 0, 0, 0, 0, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 0, 0, 0, 0, 0, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+ 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+ 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
+ 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
+ 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+ 217, 0, 0, 218
+};
+
+static const yytype_int16 yycheck[] =
+{
+ 0, 239, 231, 295, 272, 272, 0, 18, 0, 20,
+ 21, 254, 57, 24, 468, 351, 232, 253, 232, 532,
+ 384, 248, 249, 268, 267, 263, 396, 272, 398, 570,
+ 259, 401, 314, 574, 267, 354, 328, 550, 275, 246,
+ 247, 582, 275, 267, 312, 313, 267, 244, 245, 292,
+ 293, 275, 288, 274, 283, 269, 283, 284, 265, 275,
+ 267, 265, 272, 331, 271, 275, 402, 255, 256, 257,
+ 258, 259, 260, 261, 262, 263, 264, 345, 345, 265,
+ 348, 348, 364, 267, 366, 265, 274, 267, 267, 266,
+ 274, 266, 456, 269, 274, 274, 272, 272, 272, 275,
+ 272, 266, 266, 275, 396, 266, 398, 272, 272, 401,
+ 266, 272, 266, 232, 352, 266, 272, 272, 272, 489,
+ 275, 272, 351, 415, 272, 354, 267, 275, 447, 411,
+ 250, 251, 586, 427, 428, 429, 430, 272, 272, 232,
+ 275, 275, 291, 292, 293, 272, 273, 280, 281, 282,
+ 272, 273, 420, 421, 422, 423, 424, 425, 426, 427,
+ 428, 429, 430, 431, 432, 433, 434, 435, 436, 437,
+ 438, 541, 536, 402, 493, 277, 458, 279, 232, 270,
+ 462, 272, 423, 424, 269, 425, 426, 232, 480, 481,
+ 269, 232, 431, 432, 267, 275, 274, 489, 232, 266,
+ 265, 287, 286, 285, 252, 254, 449, 268, 232, 232,
+ 265, 275, 275, 265, 265, 275, 273, 587, 447, 265,
+ 231, 268, 232, 267, 232, 265, 232, 270, 266, 268,
+ 272, 231, 596, 231, 265, 265, 269, 519, 266, 239,
+ 275, 232, 268, 270, 266, 19, 246, 434, 269, 541,
+ 532, 269, 246, 253, 246, 274, 270, 266, 275, 259,
+ 433, 557, 263, 263, 493, 435, 437, 436, 550, 259,
+ 438, 563, 225, 350, 263, 524, 527, 582, 569, 583,
+ 257, 448, 564, 283, 394, 527, 550, 287, 394, 557,
+ 557, 394, 246, 559, -1, 587, -1, -1, -1, 581,
+ -1, -1, -1, 532, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 555, -1, -1,
+ -1, 550, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 351, 352, -1, 354, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 384, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 402, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 447, -1, -1,
+ -1, -1, -1, -1, -1, -1, 456, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 468, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 493, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 527, -1, -1,
+ -1, -1, 532, -1, -1, -1, 536, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 550, -1, -1, -1, -1, 555, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 570, -1, -1, -1, 574, -1, -1, -1, -1, -1,
+ -1, -1, 582, -1, -1, -1, 586, -1, -1, -1,
+ -1, -1, -1, -1, 0, -1, 596, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 0, 0, 0, 0, 0, 73, 74, 75,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
@@ -1631,74 +1920,21 @@ static const yytype_int16 yytable[] =
186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 217, 0, 301, 218, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 0, 0, 312, 313, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 314, 0, 0, 0,
- 393, 546, 0, 0, 0, 0, 0, 316, 317, 318,
- 319, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 0, 0, 0, 0,
- 0, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
- 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
- 212, 213, 214, 215, 216, 217, 0, 301, 218, 302,
- 303, 304, 305, 306, 307, 308, 309, 310, 311, 0,
- 0, 312, 313, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 314, 0, 0, 315, 0, 0, 0, 0, 0, 0,
- 0, 316, 317, 318, 319, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 0, 0, 0, 0, 0, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
- 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
- 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
- 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
- 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
- 0, 301, 218, 302, 303, 304, 305, 306, 307, 308,
- 309, 310, 311, 0, 0, 312, 313, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 314, 0, 0, 0, 393, 0,
- 0, 0, 0, 0, 0, 316, 317, 318, 319, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 216, 217, 218, 219, 220, 221, 222, 223, 224, 225,
+ 226, 227, 228, 229, 230, -1, -1, 233, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 275,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 289, 290, 291, 292, 293, 294, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, -1, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 50, 51, 52, 53,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 0, 0, 0, 0, 0, 73,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
@@ -1713,20 +1949,51 @@ static const yytype_int16 yytable[] =
184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
- 214, 215, 216, 217, 0, 301, 218, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 0, 0, 312,
- 313, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 314, 0,
- 0, 436, 0, 0, 0, 0, 0, 0, 0, 316,
- 317, 318, 319, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 15, 16, 17, 18, 19,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
+ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+ -1, -1, 246, 247, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 265, -1, 267, -1, 269, 270, -1, -1, -1,
+ -1, 275, 276, 277, 278, 279, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 289, 290, 291, 292, 293,
+ 294, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, -1, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, -1, -1, 246, 247, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 265, -1, 267, -1, 269, 270, -1,
+ -1, -1, -1, 275, 276, 277, 278, 279, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 289, 290, 291,
+ 292, 293, 294, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, -1,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 0, 0,
- 0, 0, 0, 73, 74, 75, 76, 77, 78, 79,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
@@ -1740,72 +2007,51 @@ static const yytype_int16 yytable[] =
180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
- 210, 211, 212, 213, 214, 215, 216, 217, 0, 301,
- 218, 302, 303, 304, 305, 306, 307, 308, 309, 310,
- 311, 0, 0, 312, 313, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 314, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 455, 316, 317, 318, 319, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 0, 0, 0, 0, 0, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
- 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
- 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
- 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
- 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
- 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 217, 0, 301, 218, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 0, 0, 312, 313, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 314, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 316, 317, 318,
- 319, 0, 0, 0, 0, 0, 0, 0, 0, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 0, 0, 0, 0, 0, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
- 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
- 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
- 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
- 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
- 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
- 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 411, 0, 301, 218, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 0, 0, 312, 313, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 314, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 316, 317, 318,
- 319, 0, 0, 0, 0, 0, 0, 0, 0, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, -1, -1, 246, 247, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 265, -1, 267, -1, 269,
+ -1, -1, -1, -1, -1, 275, 276, 277, 278, 279,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 289,
+ 290, 291, 292, 293, 294, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, -1, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,
+ 238, 239, 240, 241, 242, 243, -1, -1, 246, 247,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 265, -1, 267,
+ -1, 269, -1, -1, -1, -1, -1, 275, 276, 277,
+ 278, 279, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 289, 290, 291, 292, 293, 294, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, -1, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 50, 51, 52, 53, 54, 55,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 0, 0, 0, 0, 0, 73, 74, 75,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
@@ -1820,159 +2066,73 @@ static const yytype_int16 yytable[] =
186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 217, 0, 0, 218
-};
-
-static const yytype_int16 yycheck[] =
-{
- 0, 231, 239, 295, 0, 0, 314, 383, 254, 57,
- 462, 272, 354, 391, 351, 393, 232, 232, 396, 523,
- 253, 267, 265, 246, 247, 267, 263, 248, 249, 259,
- 265, 555, 267, 275, 538, 559, 328, 265, 267, 274,
- 564, 267, 265, 267, 267, 274, 292, 293, 271, 275,
- 274, 250, 251, 283, 269, 288, 364, 275, 366, 275,
- 397, 266, 283, 284, 255, 256, 257, 258, 259, 260,
- 261, 262, 263, 264, 267, 451, 280, 281, 282, 269,
- 266, 274, 272, 274, 345, 275, 272, 348, 266, 266,
- 266, 266, 272, 273, 272, 272, 272, 272, 406, 391,
- 442, 393, 480, 266, 396, 266, 277, 272, 279, 272,
- 275, 272, 244, 245, 272, 352, 568, 275, 410, 272,
- 272, 351, 275, 275, 354, 422, 423, 424, 425, 272,
- 272, 272, 275, 275, 291, 292, 293, 270, 232, 272,
- 418, 419, 484, 272, 273, 453, 420, 421, 524, 457,
- 267, 529, 232, 426, 427, 269, 269, 232, 232, 267,
- 275, 232, 274, 287, 266, 265, 286, 397, 252, 272,
- 268, 254, 232, 232, 285, 265, 275, 265, 275, 275,
- 265, 273, 474, 475, 232, 232, 265, 265, 480, 270,
- 232, 569, 268, 266, 231, 272, 268, 265, 444, 269,
- 232, 577, 510, 266, 270, 266, 275, 19, 275, 312,
- 313, 269, 442, 269, 428, 523, 270, 274, 429, 431,
- 430, 259, 263, 432, 263, 433, 225, 350, 331, 515,
- 538, 231, 554, 518, 564, 257, 443, 529, 565, 239,
- 538, 549, 345, 518, 246, 348, 246, -1, -1, -1,
- 246, 246, -1, 253, 484, 563, 548, -1, -1, 259,
- -1, -1, -1, 263, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 569, -1, -1,
- -1, -1, -1, 283, -1, -1, -1, 287, -1, -1,
- -1, -1, -1, 523, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 543, -1, 538, -1,
- -1, -1, 415, 416, 417, 418, 419, 420, 421, 422,
- 423, 424, 425, 426, 427, 428, 429, 430, 431, 432,
- 433, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 351, 352, -1, 354, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 383, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 397, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 442, -1, -1, -1, -1, -1, -1, -1,
- -1, 451, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 462, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 484, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 518, -1,
- -1, -1, -1, 523, 524, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 538, -1,
- -1, -1, -1, 543, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 555, -1, -1, -1, 559,
- -1, -1, -1, -1, 564, -1, -1, -1, 568, -1,
- -1, -1, -1, -1, -1, 0, -1, 577, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, -1, -1, 233, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 216, 217, 218, 219, 220, 221, 222, 223, 224, 225,
+ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+ 236, 237, 238, 239, 240, 241, 242, 243, -1, -1,
+ 246, 247, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 265,
+ -1, 267, -1, -1, -1, -1, -1, -1, -1, 275,
+ 276, 277, 278, 279, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 289, 290, 291, 292, 293, 294, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, -1, 232, 233,
+ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+ -1, -1, 246, 247, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 275, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 289, 290, 291, 292, 293, 294,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, -1, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
- 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
- 173, 174, 175, 176, 177, 178, 179, 180, 181, 182,
- 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
- 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
- 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
- 223, 224, 225, 226, 227, 228, 229, 230, 231, 232,
- 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
- 243, -1, -1, 246, 247, -1, -1, -1, -1, -1,
+ -1, 265, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 275, 276, 277, 278, 279, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 289, 290, 291, 292, 293,
+ 294, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, -1,
+ -1, 233, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 265, -1, -1, -1, 269, 270, -1, -1,
- -1, -1, 275, 276, 277, 278, 279, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 289, 290, 291, 292,
- 293, 294, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 18, -1, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
- 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
- 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
- 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
- 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
- 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
- 221, 222, 223, 224, 225, 226, 227, 228, 229, 230,
- 231, 232, 233, 234, 235, 236, 237, 238, 239, 240,
- 241, 242, 243, -1, -1, 246, 247, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 265, -1, -1, -1, 269, 270,
- -1, -1, -1, -1, 275, 276, 277, 278, 279, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 289, 290,
- 291, 292, 293, 294, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
- -1, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 275, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 14, 15, 289, 290, 291,
+ 292, 293, 294, -1, -1, -1, -1, -1, 27, 28,
29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
@@ -1993,45 +2153,43 @@ static const yytype_int16 yycheck[] =
199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
- 229, 230, 231, 232, 233, 234, 235, 236, 237, 238,
+ 229, 230, -1, 232, 233, 234, 235, 236, 237, 238,
239, 240, 241, 242, 243, -1, -1, 246, 247, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 265, -1, -1, -1,
- 269, -1, -1, -1, -1, -1, 275, 276, 277, 278,
+ -1, -1, -1, -1, -1, -1, -1, 276, 277, 278,
279, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 289, 290, 291, 292, 293, 294, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, -1, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, -1, -1, 246,
- 247, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 265, -1,
- -1, -1, 269, -1, -1, -1, -1, -1, 275, 276,
- 277, 278, 279, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 289, 290, 291, 292, 293, 294, 3, 4,
+ 289, 290, 291, 292, 293, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 228, 229, 230, -1, 232, 233, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 275, 3, 4,
5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, -1, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 15, 289, 290, 291, 292, 293, -1, -1, -1, -1,
+ -1, -1, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
@@ -2051,101 +2209,13 @@ static const yytype_int16 yycheck[] =
195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, -1,
- -1, 246, 247, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 265, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 275, 276, 277, 278, 279, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 289, 290, 291, 292, 293, 294,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
- 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
- 173, 174, 175, 176, 177, 178, 179, 180, 181, 182,
- 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
- 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
- 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
- 223, 224, 225, 226, 227, 228, 229, 230, -1, 232,
- 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
- 243, -1, -1, 246, 247, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 265, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 275, 276, 277, 278, 279, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 289, 290, 291, 292,
- 293, 294, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
- 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
- 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
- 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
- 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
- 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
- 221, 222, 223, 224, 225, 226, 227, 228, 229, 230,
- -1, -1, 233, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 225, 226, 227, 228, 229, 230, -1, -1, 233, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 275, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 289, 290,
- 291, 292, 293, 294, -1, -1, -1, -1, -1, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
- 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
- 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
- 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
- 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
- 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
- 228, 229, 230, -1, 232, 233, 234, 235, 236, 237,
- 238, 239, 240, 241, 242, 243, -1, -1, 246, 247,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 265, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 276, 277,
- 278, 279, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 289, 290, 291, 292, 293, 3, 4, 5, 6,
+ -1, -1, -1, -1, -1, 270, 3, 4, 5, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 289, 290, 291, 292, 293, -1,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
@@ -2166,46 +2236,96 @@ static const yytype_int16 yycheck[] =
197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, -1, 232, 233, -1, -1, -1,
+ 227, 228, 229, 230, -1, -1, 233, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 275, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 289, 290, 291, 292, 293, -1, -1, -1,
- -1, -1, -1, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
- 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
- 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
- 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
- 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
- 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, -1, -1, 233,
+ -1, -1, -1, 270, 3, 4, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 14, 15, -1, -1, -1,
+ -1, -1, 289, 290, 291, 292, 293, -1, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
+ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
+ 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
+ 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
+ 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+ 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
+ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
+ 229, 230, -1, -1, 233, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 270, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, -1, -1, -1, -1, -1,
+ 289, 290, 291, 292, 293, -1, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
+ 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
+ 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
+ 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
+ 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
+ 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
+ 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
+ 221, 222, 223, 224, 225, 226, 227, 228, 229, 230,
+ -1, -1, 233, -1, -1, -1, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 289, 290,
+ 291, 292, 293, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, -1, -1, -1, -1, -1, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, -1, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, -1, -1, 246, 247, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 270, 3, 4, 5,
+ -1, -1, -1, -1, -1, 265, -1, -1, -1, 269,
+ 270, -1, -1, -1, -1, -1, 276, 277, 278, 279,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- -1, -1, -1, -1, -1, 289, 290, 291, 292, 293,
- -1, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 46, 47, 48, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 76, 77, 78, 79, 80, -1, -1, -1, -1, -1,
86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
@@ -2220,19 +2340,47 @@ static const yytype_int16 yycheck[] =
196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
216, 217, 218, 219, 220, 221, 222, 223, 224, 225,
- 226, 227, 228, 229, 230, -1, -1, 233, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 226, 227, 228, 229, 230, -1, 232, 233, 234, 235,
+ 236, 237, 238, 239, 240, 241, 242, 243, -1, -1,
+ 246, 247, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 265,
+ -1, -1, 268, -1, -1, -1, -1, -1, -1, -1,
+ 276, 277, 278, 279, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, -1,
+ -1, -1, -1, -1, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, -1,
+ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, -1, -1, 246, 247, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 270, 3, 4, 5, 6, 7,
+ -1, -1, -1, 265, -1, -1, -1, 269, -1, -1,
+ -1, -1, -1, -1, 276, 277, 278, 279, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, -1, -1,
- -1, -1, -1, 289, 290, 291, 292, 293, -1, 27,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 48, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 63, 64, 65, 66, 67,
68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 78, 79, 80, -1, -1, -1, -1, -1, 86, 87,
88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
@@ -2247,19 +2395,47 @@ static const yytype_int16 yycheck[] =
198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
- 228, 229, 230, -1, -1, 233, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 228, 229, 230, -1, 232, 233, 234, 235, 236, 237,
+ 238, 239, 240, 241, 242, 243, -1, -1, 246, 247,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 265, -1, -1,
+ 268, -1, -1, -1, -1, -1, -1, -1, 276, 277,
+ 278, 279, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, -1, -1, -1,
+ -1, -1, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, -1, 232, 233,
+ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+ -1, -1, 246, 247, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 270, 3, 4, 5, 6, 7, 8, 9,
+ -1, 265, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 275, 276, 277, 278, 279, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, -1, -1, -1, -1,
- -1, 289, 290, 291, 292, 293, -1, 27, 28, 29,
+ -1, -1, -1, -1, -1, -1, -1, -1, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 63, 64, 65, 66, 67, 68, 69,
70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 80, -1, -1, -1, -1, -1, 86, 87, 88, 89,
90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
@@ -2274,219 +2450,59 @@ static const yytype_int16 yycheck[] =
200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
- 230, -1, -1, 233, -1, -1, -1, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 289,
- 290, 291, 292, 293, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, -1, -1, -1, -1, -1, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
- 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
- 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
- 229, 230, -1, 232, 233, 234, 235, 236, 237, 238,
- 239, 240, 241, 242, 243, -1, -1, 246, 247, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 265, -1, -1, -1,
- 269, 270, -1, -1, -1, -1, -1, 276, 277, 278,
- 279, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, -1, -1, -1, -1,
- -1, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, -1, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, -1,
- -1, 246, 247, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 265, -1, -1, 268, -1, -1, -1, -1, -1, -1,
- -1, 276, 277, 278, 279, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- -1, -1, -1, -1, -1, 86, 87, 88, 89, 90,
- 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
- 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 174, 175, 176, 177, 178, 179, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 189, 190,
- 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
- 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
- 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
- 221, 222, 223, 224, 225, 226, 227, 228, 229, 230,
- -1, 232, 233, 234, 235, 236, 237, 238, 239, 240,
- 241, 242, 243, -1, -1, 246, 247, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 265, -1, -1, -1, 269, -1,
- -1, -1, -1, -1, -1, 276, 277, 278, 279, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, -1, -1, -1, -1, -1, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, -1, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, -1, -1, 246,
- 247, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 265, -1,
- -1, 268, -1, -1, -1, -1, -1, -1, -1, 276,
- 277, 278, 279, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, -1, -1,
- -1, -1, -1, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
- 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
- 173, 174, 175, 176, 177, 178, 179, 180, 181, 182,
- 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
- 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
- 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
- 223, 224, 225, 226, 227, 228, 229, 230, -1, 232,
- 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
- 243, -1, -1, 246, 247, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 265, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 275, 276, 277, 278, 279, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 230, -1, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, -1, -1, 246, 247, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, -1, -1, -1, -1, -1, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
- 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
- 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
- 229, 230, -1, 232, 233, 234, 235, 236, 237, 238,
- 239, 240, 241, 242, 243, -1, -1, 246, 247, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 265, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 276, 277, 278,
- 279, -1, -1, -1, -1, -1, -1, -1, -1, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ -1, -1, -1, -1, -1, 265, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 276, 277, 278, 279,
+ -1, -1, -1, -1, -1, -1, -1, -1, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, -1, -1, -1, -1, -1, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
- 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
- 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
- 229, 230, -1, 232, 233, 234, 235, 236, 237, 238,
- 239, 240, 241, 242, 243, -1, -1, 246, 247, -1,
+ -1, -1, -1, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, -1, -1, -1, -1, -1, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, -1, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, -1, -1, 246, 247, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 265, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 276, 277, 278,
- 279, -1, -1, -1, -1, -1, -1, -1, -1, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ -1, -1, -1, -1, -1, 265, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 276, 277, 278, 279,
+ -1, -1, -1, -1, -1, -1, -1, -1, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, -1, -1, -1, -1, -1, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
- 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
- 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
- 229, 230, -1, -1, 233
+ -1, -1, -1, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, -1, -1, -1, -1, -1, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, -1, -1, 233
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2517,10 +2533,10 @@ static const yytype_uint16 yystos[] =
223, 224, 225, 226, 227, 228, 229, 230, 233, 275,
289, 290, 291, 292, 293, 294, 329, 330, 333, 334,
335, 336, 340, 341, 342, 343, 344, 345, 348, 349,
- 350, 351, 353, 355, 356, 357, 394, 395, 396, 265,
- 265, 232, 269, 356, 232, 275, 275, 397, 266, 272,
+ 350, 351, 353, 355, 356, 357, 397, 398, 399, 265,
+ 265, 232, 269, 356, 232, 275, 275, 400, 266, 272,
337, 338, 339, 349, 353, 272, 275, 232, 232, 275,
- 350, 353, 267, 354, 0, 395, 232, 352, 57, 232,
+ 350, 353, 267, 354, 0, 398, 232, 352, 57, 232,
346, 347, 269, 359, 353, 275, 354, 269, 376, 338,
337, 339, 232, 232, 265, 274, 354, 269, 272, 275,
332, 232, 234, 235, 236, 237, 238, 239, 240, 241,
@@ -2529,29 +2545,31 @@ static const yytype_uint16 yystos[] =
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
320, 321, 322, 323, 353, 267, 266, 272, 274, 266,
272, 358, 349, 353, 360, 361, 275, 275, 16, 17,
- 18, 20, 21, 22, 23, 24, 25, 26, 231, 269,
- 270, 275, 310, 323, 325, 327, 329, 333, 353, 366,
- 367, 368, 369, 377, 378, 379, 382, 385, 386, 393,
- 354, 274, 354, 269, 325, 364, 274, 331, 232, 272,
- 275, 310, 310, 327, 246, 247, 267, 271, 266, 266,
- 272, 230, 325, 265, 310, 280, 281, 282, 277, 279,
- 244, 245, 248, 249, 283, 284, 250, 251, 287, 286,
- 285, 252, 254, 253, 288, 268, 268, 323, 232, 323,
- 328, 347, 360, 353, 232, 362, 363, 270, 361, 275,
- 275, 388, 265, 265, 275, 275, 327, 265, 327, 273,
- 265, 270, 370, 255, 256, 257, 258, 259, 260, 261,
- 262, 263, 264, 274, 326, 272, 275, 270, 367, 364,
- 274, 364, 365, 364, 360, 232, 266, 302, 327, 232,
- 325, 310, 310, 310, 312, 312, 313, 313, 314, 314,
- 314, 314, 315, 315, 316, 317, 318, 319, 320, 321,
- 324, 268, 270, 362, 354, 272, 275, 367, 389, 327,
- 275, 327, 273, 387, 377, 325, 325, 364, 270, 272,
- 270, 268, 327, 275, 363, 231, 366, 378, 390, 266,
- 266, 327, 342, 349, 381, 371, 270, 364, 273, 265,
- 381, 391, 392, 373, 374, 375, 380, 383, 232, 266,
- 270, 325, 327, 275, 266, 19, 369, 368, 269, 274,
- 368, 372, 376, 266, 327, 372, 373, 377, 384, 364,
- 275, 270
+ 18, 20, 21, 22, 23, 24, 25, 26, 231, 267,
+ 269, 270, 275, 310, 323, 325, 327, 329, 333, 353,
+ 366, 367, 368, 369, 377, 378, 379, 380, 383, 384,
+ 387, 388, 389, 396, 401, 354, 274, 354, 269, 325,
+ 364, 274, 331, 232, 272, 275, 310, 310, 327, 246,
+ 247, 267, 271, 266, 266, 272, 230, 325, 265, 310,
+ 280, 281, 282, 277, 279, 244, 245, 248, 249, 283,
+ 284, 250, 251, 287, 286, 285, 252, 254, 253, 288,
+ 268, 268, 323, 232, 323, 328, 347, 360, 353, 232,
+ 362, 363, 270, 361, 275, 275, 391, 265, 265, 275,
+ 275, 327, 265, 327, 273, 265, 267, 270, 370, 255,
+ 256, 257, 258, 259, 260, 261, 262, 263, 264, 274,
+ 326, 272, 275, 270, 367, 380, 384, 389, 364, 274,
+ 364, 365, 364, 360, 232, 266, 302, 327, 232, 325,
+ 310, 310, 310, 312, 312, 313, 313, 314, 314, 314,
+ 314, 315, 315, 316, 317, 318, 319, 320, 321, 324,
+ 268, 270, 362, 354, 272, 275, 367, 392, 327, 275,
+ 327, 273, 390, 232, 402, 403, 377, 325, 325, 364,
+ 270, 272, 270, 268, 327, 275, 363, 231, 366, 378,
+ 393, 266, 266, 327, 342, 349, 382, 265, 268, 272,
+ 371, 270, 364, 273, 265, 382, 394, 395, 373, 374,
+ 375, 381, 385, 232, 266, 328, 268, 403, 270, 325,
+ 327, 275, 266, 19, 369, 368, 269, 274, 368, 372,
+ 376, 266, 266, 327, 372, 373, 377, 386, 364, 275,
+ 270
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
@@ -2598,11 +2616,12 @@ static const yytype_uint16 yyr1[] =
361, 362, 362, 363, 363, 364, 364, 364, 365, 365,
366, 367, 367, 368, 368, 368, 368, 368, 368, 368,
369, 370, 371, 369, 372, 372, 374, 373, 375, 373,
- 376, 376, 377, 377, 378, 378, 379, 380, 380, 381,
- 381, 383, 382, 384, 384, 385, 385, 387, 386, 388,
- 386, 389, 386, 390, 390, 391, 391, 392, 392, 393,
- 393, 393, 393, 393, 394, 394, 395, 395, 395, 397,
- 396
+ 376, 376, 377, 377, 378, 378, 379, 379, 380, 381,
+ 381, 382, 382, 383, 383, 385, 384, 386, 386, 387,
+ 387, 388, 388, 390, 389, 391, 389, 392, 389, 393,
+ 393, 394, 394, 395, 395, 396, 396, 396, 396, 396,
+ 397, 397, 398, 398, 398, 400, 399, 401, 402, 402,
+ 403, 403
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -2649,11 +2668,12 @@ static const yytype_uint8 yyr2[] =
4, 1, 3, 1, 2, 1, 3, 4, 1, 3,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 0, 0, 5, 1, 1, 0, 2, 0, 2,
- 2, 3, 1, 2, 1, 2, 5, 3, 1, 1,
- 4, 0, 8, 0, 1, 3, 2, 0, 6, 0,
- 8, 0, 7, 1, 1, 1, 0, 2, 3, 2,
- 2, 2, 3, 2, 1, 2, 1, 1, 1, 0,
- 3
+ 2, 3, 1, 2, 1, 2, 1, 2, 5, 3,
+ 1, 1, 4, 1, 2, 0, 8, 0, 1, 3,
+ 2, 1, 2, 0, 6, 0, 8, 0, 7, 1,
+ 1, 1, 0, 2, 3, 2, 2, 2, 3, 2,
+ 1, 2, 1, 1, 1, 0, 3, 5, 1, 3,
+ 1, 4
};
@@ -3336,238 +3356,238 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 253 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 257 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleVariable((yyvsp[0].lex).loc, (yyvsp[0].lex).symbol, (yyvsp[0].lex).string);
}
-#line 3344 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3364 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 3:
-#line 259 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 263 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 3352 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3372 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 4:
-#line 262 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 266 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
}
-#line 3360 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3380 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 5:
-#line 265 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 269 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
}
-#line 3369 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3389 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 6:
-#line 269 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 273 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i64, (yyvsp[0].lex).loc, true);
}
-#line 3378 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3398 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 7:
-#line 273 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 277 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u64, (yyvsp[0].lex).loc, true);
}
-#line 3387 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3407 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 8:
-#line 277 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 281 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit integer literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((short)(yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
#endif
}
-#line 3398 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3418 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 9:
-#line 283 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 287 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit unsigned integer literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((unsigned short)(yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
#endif
}
-#line 3409 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3429 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 10:
-#line 289 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 293 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtFloat, (yyvsp[0].lex).loc, true);
}
-#line 3417 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3437 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 11:
-#line 292 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 296 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtDouble, (yyvsp[0].lex).loc, true);
}
-#line 3426 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3446 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 12:
-#line 296 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 300 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtFloat16, (yyvsp[0].lex).loc, true);
#endif
}
-#line 3437 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3457 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 13:
-#line 302 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 306 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).b, (yyvsp[0].lex).loc, true);
}
-#line 3445 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3465 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 14:
-#line 305 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 309 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = (yyvsp[-1].interm.intermTypedNode);
if ((yyval.interm.intermTypedNode)->getAsConstantUnion())
(yyval.interm.intermTypedNode)->getAsConstantUnion()->setExpression();
}
-#line 3455 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3475 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 15:
-#line 313 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 317 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 3463 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3483 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 16:
-#line 316 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 320 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBracketDereference((yyvsp[-2].lex).loc, (yyvsp[-3].interm.intermTypedNode), (yyvsp[-1].interm.intermTypedNode));
}
-#line 3471 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3491 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 17:
-#line 319 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 323 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 3479 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3499 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 18:
-#line 322 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 326 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleDotDereference((yyvsp[0].lex).loc, (yyvsp[-2].interm.intermTypedNode), *(yyvsp[0].lex).string);
}
-#line 3487 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3507 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 19:
-#line 325 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 329 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.variableCheck((yyvsp[-1].interm.intermTypedNode));
parseContext.lValueErrorCheck((yyvsp[0].lex).loc, "++", (yyvsp[-1].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[0].lex).loc, "++", EOpPostIncrement, (yyvsp[-1].interm.intermTypedNode));
}
-#line 3497 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3517 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 20:
-#line 330 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 334 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.variableCheck((yyvsp[-1].interm.intermTypedNode));
parseContext.lValueErrorCheck((yyvsp[0].lex).loc, "--", (yyvsp[-1].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[0].lex).loc, "--", EOpPostDecrement, (yyvsp[-1].interm.intermTypedNode));
}
-#line 3507 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3527 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 21:
-#line 338 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 342 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.integerCheck((yyvsp[0].interm.intermTypedNode), "[]");
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 3516 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3536 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 22:
-#line 345 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 349 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleFunctionCall((yyvsp[0].interm).loc, (yyvsp[0].interm).function, (yyvsp[0].interm).intermNode);
delete (yyvsp[0].interm).function;
}
-#line 3525 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3545 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 23:
-#line 352 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 356 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[0].interm);
}
-#line 3533 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3553 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 24:
-#line 358 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 362 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[-1].interm);
(yyval.interm).loc = (yyvsp[0].lex).loc;
}
-#line 3542 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3562 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 25:
-#line 362 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 366 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[-1].interm);
(yyval.interm).loc = (yyvsp[0].lex).loc;
}
-#line 3551 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3571 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 26:
-#line 369 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 373 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[-1].interm);
}
-#line 3559 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3579 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 27:
-#line 372 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 376 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[0].interm);
}
-#line 3567 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3587 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 28:
-#line 378 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 382 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
TParameter param = { 0, new TType };
param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType());
@@ -3575,11 +3595,11 @@ yyreduce:
(yyval.interm).function = (yyvsp[-1].interm).function;
(yyval.interm).intermNode = (yyvsp[0].interm.intermTypedNode);
}
-#line 3579 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3599 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 29:
-#line 385 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 389 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
TParameter param = { 0, new TType };
param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType());
@@ -3587,29 +3607,29 @@ yyreduce:
(yyval.interm).function = (yyvsp[-2].interm).function;
(yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-2].interm).intermNode, (yyvsp[0].interm.intermTypedNode), (yyvsp[-1].lex).loc);
}
-#line 3591 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3611 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 30:
-#line 395 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 399 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[-1].interm);
}
-#line 3599 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3619 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 31:
-#line 403 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 407 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
// Constructor
(yyval.interm).intermNode = 0;
(yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
}
-#line 3609 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3629 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 32:
-#line 408 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 412 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
//
// Should be a method or subroutine call, but we haven't recognized the arguments yet.
@@ -3637,40 +3657,40 @@ yyreduce:
(yyval.interm).function = new TFunction(&empty, TType(EbtVoid), EOpNull);
}
}
-#line 3641 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3661 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 33:
-#line 438 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 442 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.variableCheck((yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
if (TIntermMethod* method = (yyvsp[0].interm.intermTypedNode)->getAsMethodNode())
parseContext.error((yyvsp[0].interm.intermTypedNode)->getLoc(), "incomplete method syntax", method->getMethodName().c_str(), "");
}
-#line 3652 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3672 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 34:
-#line 444 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 448 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.lValueErrorCheck((yyvsp[-1].lex).loc, "++", (yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[-1].lex).loc, "++", EOpPreIncrement, (yyvsp[0].interm.intermTypedNode));
}
-#line 3661 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3681 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 35:
-#line 448 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 452 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.lValueErrorCheck((yyvsp[-1].lex).loc, "--", (yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[-1].lex).loc, "--", EOpPreDecrement, (yyvsp[0].interm.intermTypedNode));
}
-#line 3670 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3690 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 36:
-#line 452 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 456 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[-1].interm).op != EOpNull) {
char errorOp[2] = {0, 0};
@@ -3687,179 +3707,179 @@ yyreduce:
(yyval.interm.intermTypedNode)->getAsConstantUnion()->setExpression();
}
}
-#line 3691 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3711 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 37:
-#line 472 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 476 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpNull; }
-#line 3697 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3717 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 38:
-#line 473 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 477 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpNegative; }
-#line 3703 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3723 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 39:
-#line 474 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 478 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpLogicalNot; }
-#line 3709 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3729 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 40:
-#line 475 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 479 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpBitwiseNot;
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise not"); }
-#line 3716 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3736 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 41:
-#line 481 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 485 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3722 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3742 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 42:
-#line 482 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 486 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "*", EOpMul, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3732 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3752 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 43:
-#line 487 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 491 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "/", EOpDiv, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3742 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3762 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 44:
-#line 492 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 496 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "%");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "%", EOpMod, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3753 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3773 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 45:
-#line 501 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 505 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3759 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3779 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 46:
-#line 502 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 506 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "+", EOpAdd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3769 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3789 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 47:
-#line 507 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 511 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "-", EOpSub, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3779 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3799 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 48:
-#line 515 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 519 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3785 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3805 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 49:
-#line 516 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 520 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bit shift left");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<<", EOpLeftShift, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3796 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3816 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 50:
-#line 522 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 526 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bit shift right");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">>", EOpRightShift, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3807 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3827 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 51:
-#line 531 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 535 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3813 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3833 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 52:
-#line 532 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 536 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<", EOpLessThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 3823 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3843 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 53:
-#line 537 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 541 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">", EOpGreaterThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 3833 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3853 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 54:
-#line 542 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 546 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<=", EOpLessThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 3843 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3863 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 55:
-#line 547 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 551 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">=", EOpGreaterThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 3853 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3873 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 56:
-#line 555 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 559 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3859 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3879 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 57:
-#line 556 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 560 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.arrayObjectCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "array comparison");
parseContext.opaqueCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "==");
@@ -3868,11 +3888,11 @@ yyreduce:
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 3872 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3892 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 58:
-#line 564 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 568 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.arrayObjectCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "array comparison");
parseContext.opaqueCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "!=");
@@ -3881,124 +3901,124 @@ yyreduce:
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 3885 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3905 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 59:
-#line 575 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 579 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3891 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3911 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 60:
-#line 576 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 580 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise and");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "&", EOpAnd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3902 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3922 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 61:
-#line 585 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 589 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3908 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3928 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 62:
-#line 586 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 590 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise exclusive or");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "^", EOpExclusiveOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3919 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3939 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 63:
-#line 595 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 599 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3925 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3945 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 64:
-#line 596 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 600 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise inclusive or");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "|", EOpInclusiveOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 3936 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3956 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 65:
-#line 605 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 609 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3942 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3962 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 66:
-#line 606 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 610 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "&&", EOpLogicalAnd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 3952 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3972 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 67:
-#line 614 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 618 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3958 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3978 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 68:
-#line 615 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 619 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "^^", EOpLogicalXor, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 3968 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3988 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 69:
-#line 623 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 627 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3974 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 3994 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 70:
-#line 624 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 628 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "||", EOpLogicalOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 3984 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4004 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 71:
-#line 632 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 636 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 3990 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4010 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 72:
-#line 633 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 637 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
++parseContext.controlFlowNestingLevel;
}
-#line 3998 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4018 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 73:
-#line 636 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 640 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
--parseContext.controlFlowNestingLevel;
parseContext.boolCheck((yyvsp[-4].lex).loc, (yyvsp[-5].interm.intermTypedNode));
@@ -4011,17 +4031,17 @@ yyreduce:
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
}
-#line 4015 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4035 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 74:
-#line 651 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 655 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 4021 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4041 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 75:
-#line 652 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 656 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.arrayObjectCheck((yyvsp[-1].interm).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "array assignment");
parseContext.opaqueCheck((yyvsp[-1].interm).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "=");
@@ -4034,119 +4054,119 @@ yyreduce:
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
}
-#line 4038 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4058 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 76:
-#line 667 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 671 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpAssign;
}
-#line 4047 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4067 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 77:
-#line 671 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 675 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpMulAssign;
}
-#line 4056 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4076 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 78:
-#line 675 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 679 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpDivAssign;
}
-#line 4065 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4085 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 79:
-#line 679 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 683 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "%=");
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpModAssign;
}
-#line 4075 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4095 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 80:
-#line 684 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 688 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpAddAssign;
}
-#line 4084 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4104 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 81:
-#line 688 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 692 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpSubAssign;
}
-#line 4093 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4113 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 82:
-#line 692 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 696 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bit-shift left assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpLeftShiftAssign;
}
-#line 4102 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4122 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 83:
-#line 696 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 700 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bit-shift right assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpRightShiftAssign;
}
-#line 4111 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4131 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 84:
-#line 700 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 704 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise-and assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpAndAssign;
}
-#line 4120 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4140 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 85:
-#line 704 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 708 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise-xor assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpExclusiveOrAssign;
}
-#line 4129 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4149 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 86:
-#line 708 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 712 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise-or assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpInclusiveOrAssign;
}
-#line 4138 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4158 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 87:
-#line 715 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 719 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 4146 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4166 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 88:
-#line 718 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 722 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.samplerConstructorLocationCheck((yyvsp[-1].lex).loc, ",", (yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.intermediate.addComma((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode), (yyvsp[-1].lex).loc);
@@ -4155,40 +4175,40 @@ yyreduce:
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
}
-#line 4159 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4179 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 89:
-#line 729 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 733 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.constantValueCheck((yyvsp[0].interm.intermTypedNode), "");
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 4168 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4188 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 90:
-#line 736 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 740 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.handleFunctionDeclarator((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).function, true /* prototype */);
(yyval.interm.intermNode) = 0;
// TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature
}
-#line 4178 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4198 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 91:
-#line 741 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 745 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[-1].interm).intermNode && (yyvsp[-1].interm).intermNode->getAsAggregate())
(yyvsp[-1].interm).intermNode->getAsAggregate()->setOperator(EOpSequence);
(yyval.interm.intermNode) = (yyvsp[-1].interm).intermNode;
}
-#line 4188 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4208 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 92:
-#line 746 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 750 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.profileRequires((yyvsp[-3].lex).loc, ENoProfile, 130, 0, "precision statement");
@@ -4197,75 +4217,75 @@ yyreduce:
parseContext.setDefaultPrecision((yyvsp[-3].lex).loc, (yyvsp[-1].interm.type), (yyvsp[-2].interm.type).qualifier.precision);
(yyval.interm.intermNode) = 0;
}
-#line 4201 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4221 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 93:
-#line 754 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 758 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.declareBlock((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).typeList);
(yyval.interm.intermNode) = 0;
}
-#line 4210 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4230 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 94:
-#line 758 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 762 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.declareBlock((yyvsp[-2].interm).loc, *(yyvsp[-2].interm).typeList, (yyvsp[-1].lex).string);
(yyval.interm.intermNode) = 0;
}
-#line 4219 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4239 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 95:
-#line 762 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 766 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.declareBlock((yyvsp[-3].interm).loc, *(yyvsp[-3].interm).typeList, (yyvsp[-2].lex).string, (yyvsp[-1].interm).arraySizes);
(yyval.interm.intermNode) = 0;
}
-#line 4228 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4248 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 96:
-#line 766 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 770 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalQualifierFixCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier);
parseContext.updateStandaloneQualifierDefaults((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type));
(yyval.interm.intermNode) = 0;
}
-#line 4238 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4258 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 97:
-#line 771 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 775 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.checkNoShaderLayouts((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).shaderQualifiers);
parseContext.addQualifierToExisting((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).qualifier, *(yyvsp[-1].lex).string);
(yyval.interm.intermNode) = 0;
}
-#line 4248 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4268 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 98:
-#line 776 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 780 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.checkNoShaderLayouts((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).shaderQualifiers);
(yyvsp[-1].interm.identifierList)->push_back((yyvsp[-2].lex).string);
parseContext.addQualifierToExisting((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).qualifier, *(yyvsp[-1].interm.identifierList));
(yyval.interm.intermNode) = 0;
}
-#line 4259 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4279 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 99:
-#line 785 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 789 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ parseContext.nestedBlockCheck((yyvsp[-2].interm.type).loc); }
-#line 4265 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4285 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 100:
-#line 785 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 789 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
--parseContext.structNestingLevel;
parseContext.blockName = (yyvsp[-4].lex).string;
@@ -4275,54 +4295,54 @@ yyreduce:
(yyval.interm).loc = (yyvsp[-5].interm.type).loc;
(yyval.interm).typeList = (yyvsp[-1].interm.typeList);
}
-#line 4279 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4299 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 101:
-#line 796 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 800 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.identifierList) = new TIdentifierList;
(yyval.interm.identifierList)->push_back((yyvsp[0].lex).string);
}
-#line 4288 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4308 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 102:
-#line 800 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 804 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.identifierList) = (yyvsp[-2].interm.identifierList);
(yyval.interm.identifierList)->push_back((yyvsp[0].lex).string);
}
-#line 4297 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4317 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 103:
-#line 807 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 811 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).function = (yyvsp[-1].interm.function);
(yyval.interm).loc = (yyvsp[0].lex).loc;
}
-#line 4306 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4326 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 104:
-#line 814 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 818 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.function) = (yyvsp[0].interm.function);
}
-#line 4314 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4334 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 105:
-#line 817 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 821 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.function) = (yyvsp[0].interm.function);
}
-#line 4322 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4342 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 106:
-#line 824 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 828 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
// Add the parameter
(yyval.interm.function) = (yyvsp[-1].interm.function);
@@ -4331,11 +4351,11 @@ yyreduce:
else
delete (yyvsp[0].interm).param.type;
}
-#line 4335 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4355 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 107:
-#line 832 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 836 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
//
// Only first parameter of one-parameter functions can be void
@@ -4353,11 +4373,11 @@ yyreduce:
(yyvsp[-2].interm.function)->addParameter((yyvsp[0].interm).param);
}
}
-#line 4357 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4377 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 108:
-#line 852 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 856 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[-2].interm.type).qualifier.storage != EvqGlobal && (yyvsp[-2].interm.type).qualifier.storage != EvqTemporary) {
parseContext.error((yyvsp[-1].lex).loc, "no qualifiers allowed for function return",
@@ -4377,11 +4397,11 @@ yyreduce:
function = new TFunction((yyvsp[-1].lex).string, type);
(yyval.interm.function) = function;
}
-#line 4381 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4401 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 109:
-#line 875 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 879 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[-1].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-1].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -4397,11 +4417,11 @@ yyreduce:
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).param = param;
}
-#line 4401 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4421 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 110:
-#line 890 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 894 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[-2].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -4419,11 +4439,11 @@ yyreduce:
(yyval.interm).loc = (yyvsp[-1].lex).loc;
(yyval.interm).param = param;
}
-#line 4423 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4443 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 111:
-#line 913 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 917 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[0].interm);
if ((yyvsp[-1].interm.type).qualifier.precision != EpqNone)
@@ -4435,11 +4455,11 @@ yyreduce:
parseContext.paramCheckFix((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, *(yyval.interm).param.type);
}
-#line 4439 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4459 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 112:
-#line 924 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 928 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[0].interm);
@@ -4447,11 +4467,11 @@ yyreduce:
parseContext.paramCheckFix((yyvsp[0].interm).loc, EvqTemporary, *(yyval.interm).param.type);
parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier());
}
-#line 4451 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4471 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 113:
-#line 934 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 938 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[0].interm);
if ((yyvsp[-1].interm.type).qualifier.precision != EpqNone)
@@ -4462,11 +4482,11 @@ yyreduce:
parseContext.parameterTypeCheck((yyvsp[0].interm).loc, (yyvsp[-1].interm.type).qualifier.storage, *(yyval.interm).param.type);
parseContext.paramCheckFix((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, *(yyval.interm).param.type);
}
-#line 4466 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4486 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 114:
-#line 944 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 948 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[0].interm);
@@ -4474,118 +4494,118 @@ yyreduce:
parseContext.paramCheckFix((yyvsp[0].interm).loc, EvqTemporary, *(yyval.interm).param.type);
parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier());
}
-#line 4478 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4498 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 115:
-#line 954 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 958 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
TParameter param = { 0, new TType((yyvsp[0].interm.type)) };
(yyval.interm).param = param;
if ((yyvsp[0].interm.type).arraySizes)
parseContext.arraySizeRequiredCheck((yyvsp[0].interm.type).loc, *(yyvsp[0].interm.type).arraySizes);
}
-#line 4489 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4509 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 116:
-#line 963 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 967 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[0].interm);
}
-#line 4497 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4517 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 117:
-#line 966 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 970 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[-2].interm);
parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-2].interm).type);
}
-#line 4506 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4526 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 118:
-#line 970 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 974 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[-3].interm);
parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-3].interm).type, (yyvsp[0].interm).arraySizes);
}
-#line 4515 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4535 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 119:
-#line 974 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 978 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).type = (yyvsp[-5].interm).type;
TIntermNode* initNode = parseContext.declareVariable((yyvsp[-3].lex).loc, *(yyvsp[-3].lex).string, (yyvsp[-5].interm).type, (yyvsp[-2].interm).arraySizes, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-5].interm).intermNode, initNode, (yyvsp[-1].lex).loc);
}
-#line 4525 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4545 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 120:
-#line 979 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 983 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).type = (yyvsp[-4].interm).type;
TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-4].interm).type, 0, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-4].interm).intermNode, initNode, (yyvsp[-1].lex).loc);
}
-#line 4535 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4555 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 121:
-#line 987 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 991 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).type = (yyvsp[0].interm.type);
(yyval.interm).intermNode = 0;
parseContext.declareTypeDefaults((yyval.interm).loc, (yyval.interm).type);
}
-#line 4545 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4565 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 122:
-#line 992 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 996 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).type = (yyvsp[-1].interm.type);
(yyval.interm).intermNode = 0;
parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-1].interm.type));
}
-#line 4555 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4575 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 123:
-#line 997 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1001 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).type = (yyvsp[-2].interm.type);
(yyval.interm).intermNode = 0;
parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-2].interm.type), (yyvsp[0].interm).arraySizes);
}
-#line 4565 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4585 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 124:
-#line 1002 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1006 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).type = (yyvsp[-4].interm.type);
TIntermNode* initNode = parseContext.declareVariable((yyvsp[-3].lex).loc, *(yyvsp[-3].lex).string, (yyvsp[-4].interm.type), (yyvsp[-2].interm).arraySizes, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate(0, initNode, (yyvsp[-1].lex).loc);
}
-#line 4575 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4595 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 125:
-#line 1007 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1011 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).type = (yyvsp[-3].interm.type);
TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), 0, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate(0, initNode, (yyvsp[-1].lex).loc);
}
-#line 4585 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4605 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 126:
-#line 1016 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1020 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[0].interm.type);
@@ -4597,11 +4617,11 @@ yyreduce:
parseContext.precisionQualifierCheck((yyval.interm.type).loc, (yyval.interm.type).basicType, (yyval.interm.type).qualifier);
}
-#line 4601 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4621 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 127:
-#line 1027 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1031 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalQualifierFixCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier);
parseContext.globalQualifierTypeCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, (yyvsp[0].interm.type));
@@ -4626,22 +4646,22 @@ yyreduce:
(parseContext.language == EShLangFragment && (yyval.interm.type).qualifier.storage == EvqVaryingIn)))
(yyval.interm.type).qualifier.smooth = true;
}
-#line 4630 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4650 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 128:
-#line 1054 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1058 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "invariant");
parseContext.profileRequires((yyval.interm.type).loc, ENoProfile, 120, 0, "invariant");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.invariant = true;
}
-#line 4641 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4661 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 129:
-#line 1063 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1067 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "smooth");
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "smooth");
@@ -4649,11 +4669,11 @@ yyreduce:
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.smooth = true;
}
-#line 4653 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4673 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 130:
-#line 1070 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1074 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "flat");
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "flat");
@@ -4661,11 +4681,11 @@ yyreduce:
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.flat = true;
}
-#line 4665 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4685 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 131:
-#line 1077 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1081 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "noperspective");
parseContext.requireProfile((yyvsp[0].lex).loc, ~EEsProfile, "noperspective");
@@ -4673,11 +4693,11 @@ yyreduce:
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.nopersp = true;
}
-#line 4677 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4697 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 132:
-#line 1084 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1088 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.globalCheck((yyvsp[0].lex).loc, "__explicitInterpAMD");
@@ -4687,84 +4707,84 @@ yyreduce:
(yyval.interm.type).qualifier.explicitInterp = true;
#endif
}
-#line 4691 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4711 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 133:
-#line 1096 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1100 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[-1].interm.type);
}
-#line 4699 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4719 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 134:
-#line 1102 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1106 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 4707 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4727 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 135:
-#line 1105 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1109 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[-2].interm.type);
(yyval.interm.type).shaderQualifiers.merge((yyvsp[0].interm.type).shaderQualifiers);
parseContext.mergeObjectLayoutQualifiers((yyval.interm.type).qualifier, (yyvsp[0].interm.type).qualifier, false);
}
-#line 4717 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4737 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 136:
-#line 1112 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1116 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
parseContext.setLayoutQualifier((yyvsp[0].lex).loc, (yyval.interm.type), *(yyvsp[0].lex).string);
}
-#line 4726 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4746 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 137:
-#line 1116 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1120 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[-2].lex).loc);
parseContext.setLayoutQualifier((yyvsp[-2].lex).loc, (yyval.interm.type), *(yyvsp[-2].lex).string, (yyvsp[0].interm.intermTypedNode));
}
-#line 4735 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4755 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 138:
-#line 1120 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1124 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ // because "shared" is both an identifier and a keyword
(yyval.interm.type).init((yyvsp[0].lex).loc);
TString strShared("shared");
parseContext.setLayoutQualifier((yyvsp[0].lex).loc, (yyval.interm.type), strShared);
}
-#line 4745 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4765 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 139:
-#line 1128 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1132 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.profileRequires((yyval.interm.type).loc, ECoreProfile | ECompatibilityProfile, 400, E_GL_ARB_gpu_shader5, "precise");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5, "precise");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.noContraction = true;
}
-#line 4756 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4776 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 140:
-#line 1137 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1141 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 4764 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4784 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 141:
-#line 1140 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1144 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[-1].interm.type);
if ((yyval.interm.type).basicType == EbtVoid)
@@ -4773,72 +4793,72 @@ yyreduce:
(yyval.interm.type).shaderQualifiers.merge((yyvsp[0].interm.type).shaderQualifiers);
parseContext.mergeQualifiers((yyval.interm.type).loc, (yyval.interm.type).qualifier, (yyvsp[0].interm.type).qualifier, false);
}
-#line 4777 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4797 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 142:
-#line 1151 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1155 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 4785 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4805 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 143:
-#line 1154 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1158 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 4793 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4813 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 144:
-#line 1157 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1161 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.checkPrecisionQualifier((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type).qualifier.precision);
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 4802 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4822 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 145:
-#line 1161 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1165 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
// allow inheritance of storage qualifier from block declaration
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 4811 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4831 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 146:
-#line 1165 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1169 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
// allow inheritance of storage qualifier from block declaration
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 4820 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4840 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 147:
-#line 1169 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1173 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
// allow inheritance of storage qualifier from block declaration
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 4829 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4849 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 148:
-#line 1176 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1180 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqConst; // will later turn into EvqConstReadOnly, if the initializer is not constant
}
-#line 4838 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4858 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 149:
-#line 1180 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1184 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangVertex, "attribute");
parseContext.checkDeprecated((yyvsp[0].lex).loc, ECoreProfile, 130, "attribute");
@@ -4851,11 +4871,11 @@ yyreduce:
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqVaryingIn;
}
-#line 4855 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4875 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 150:
-#line 1192 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1196 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.checkDeprecated((yyvsp[0].lex).loc, ENoProfile, 130, "varying");
parseContext.checkDeprecated((yyvsp[0].lex).loc, ECoreProfile, 130, "varying");
@@ -4870,43 +4890,43 @@ yyreduce:
else
(yyval.interm.type).qualifier.storage = EvqVaryingIn;
}
-#line 4874 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4894 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 151:
-#line 1206 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1210 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "inout");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqInOut;
}
-#line 4884 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4904 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 152:
-#line 1211 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1215 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "in");
(yyval.interm.type).init((yyvsp[0].lex).loc);
// whether this is a parameter "in" or a pipeline "in" will get sorted out a bit later
(yyval.interm.type).qualifier.storage = EvqIn;
}
-#line 4895 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4915 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 153:
-#line 1217 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1221 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "out");
(yyval.interm.type).init((yyvsp[0].lex).loc);
// whether this is a parameter "out" or a pipeline "out" will get sorted out a bit later
(yyval.interm.type).qualifier.storage = EvqOut;
}
-#line 4906 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4926 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 154:
-#line 1223 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1227 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 120, 0, "centroid");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, 0, "centroid");
@@ -4914,52 +4934,52 @@ yyreduce:
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.centroid = true;
}
-#line 4918 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4938 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 155:
-#line 1230 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1234 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "patch");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangTessControlMask | EShLangTessEvaluationMask), "patch");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.patch = true;
}
-#line 4929 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4949 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 156:
-#line 1236 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1240 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "sample");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.sample = true;
}
-#line 4939 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4959 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 157:
-#line 1241 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1245 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "uniform");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqUniform;
}
-#line 4949 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4969 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 158:
-#line 1246 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1250 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "buffer");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqBuffer;
}
-#line 4959 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4979 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 159:
-#line 1251 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1255 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalCheck((yyvsp[0].lex).loc, "shared");
parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, 430, E_GL_ARB_compute_shader, "shared");
@@ -4968,126 +4988,126 @@ yyreduce:
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqShared;
}
-#line 4972 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 4992 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 160:
-#line 1259 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1263 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.coherent = true;
}
-#line 4981 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5001 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 161:
-#line 1263 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1267 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.volatil = true;
}
-#line 4990 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5010 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 162:
-#line 1267 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1271 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.restrict = true;
}
-#line 4999 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5019 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 163:
-#line 1271 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1275 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.readonly = true;
}
-#line 5008 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5028 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 164:
-#line 1275 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1279 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.writeonly = true;
}
-#line 5017 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5037 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 165:
-#line 1279 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1283 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.spvRemoved((yyvsp[0].lex).loc, "subroutine");
parseContext.globalCheck((yyvsp[0].lex).loc, "subroutine");
parseContext.unimplemented((yyvsp[0].lex).loc, "subroutine");
(yyval.interm.type).init((yyvsp[0].lex).loc);
}
-#line 5028 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5048 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 166:
-#line 1285 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1289 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.spvRemoved((yyvsp[-3].lex).loc, "subroutine");
parseContext.globalCheck((yyvsp[-3].lex).loc, "subroutine");
parseContext.unimplemented((yyvsp[-3].lex).loc, "subroutine");
(yyval.interm.type).init((yyvsp[-3].lex).loc);
}
-#line 5039 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5059 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 167:
-#line 1294 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1298 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
// TODO
}
-#line 5047 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5067 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 168:
-#line 1297 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1301 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
// TODO: 4.0 semantics: subroutines
// 1) make sure each identifier is a type declared earlier with SUBROUTINE
// 2) save all of the identifiers for future comparison with the declared function
}
-#line 5057 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5077 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 169:
-#line 1305 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1309 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[0].interm.type);
(yyval.interm.type).qualifier.precision = parseContext.getDefaultPrecision((yyval.interm.type));
}
-#line 5066 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5086 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 170:
-#line 1309 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1313 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.arrayDimCheck((yyvsp[0].interm).loc, (yyvsp[0].interm).arraySizes, 0);
(yyval.interm.type) = (yyvsp[-1].interm.type);
(yyval.interm.type).qualifier.precision = parseContext.getDefaultPrecision((yyval.interm.type));
(yyval.interm.type).arraySizes = (yyvsp[0].interm).arraySizes;
}
-#line 5077 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5097 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 171:
-#line 1318 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1322 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).loc = (yyvsp[-1].lex).loc;
(yyval.interm).arraySizes = new TArraySizes;
(yyval.interm).arraySizes->addInnerSize();
}
-#line 5087 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5107 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 172:
-#line 1323 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1327 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm).loc = (yyvsp[-2].lex).loc;
(yyval.interm).arraySizes = new TArraySizes;
@@ -5096,20 +5116,20 @@ yyreduce:
parseContext.arraySizeCheck((yyvsp[-1].interm.intermTypedNode)->getLoc(), (yyvsp[-1].interm.intermTypedNode), size);
(yyval.interm).arraySizes->addInnerSize(size);
}
-#line 5100 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5120 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 173:
-#line 1331 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1335 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[-2].interm);
(yyval.interm).arraySizes->addInnerSize();
}
-#line 5109 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5129 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 174:
-#line 1335 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1339 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm) = (yyvsp[-3].interm);
@@ -5117,39 +5137,39 @@ yyreduce:
parseContext.arraySizeCheck((yyvsp[-1].interm.intermTypedNode)->getLoc(), (yyvsp[-1].interm.intermTypedNode), size);
(yyval.interm).arraySizes->addInnerSize(size);
}
-#line 5121 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5141 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 175:
-#line 1345 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1349 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtVoid;
}
-#line 5130 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5150 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 176:
-#line 1349 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1353 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
}
-#line 5139 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5159 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 177:
-#line 1353 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1357 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
}
-#line 5149 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5169 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 178:
-#line 1358 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1362 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float", parseContext.symbolTable.atBuiltInLevel());
@@ -5157,50 +5177,50 @@ yyreduce:
(yyval.interm.type).basicType = EbtFloat16;
#endif
}
-#line 5161 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5181 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 179:
-#line 1365 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1369 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
}
-#line 5170 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5190 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 180:
-#line 1369 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1373 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
}
-#line 5180 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5200 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 181:
-#line 1374 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1378 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt64;
}
-#line 5190 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5210 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 182:
-#line 1379 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1383 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint64;
}
-#line 5200 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5220 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 183:
-#line 1384 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1388 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit integer", parseContext.symbolTable.atBuiltInLevel());
@@ -5208,11 +5228,11 @@ yyreduce:
(yyval.interm.type).basicType = EbtInt16;
#endif
}
-#line 5212 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5232 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 184:
-#line 1391 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1395 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
@@ -5220,83 +5240,83 @@ yyreduce:
(yyval.interm.type).basicType = EbtUint16;
#endif
}
-#line 5224 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5244 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 185:
-#line 1398 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1402 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtBool;
}
-#line 5233 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5253 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 186:
-#line 1402 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1406 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(2);
}
-#line 5243 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5263 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 187:
-#line 1407 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1411 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(3);
}
-#line 5253 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5273 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 188:
-#line 1412 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1416 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(4);
}
-#line 5263 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5283 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 189:
-#line 1417 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1421 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double vector");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(2);
}
-#line 5274 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5294 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 190:
-#line 1423 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1427 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double vector");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(3);
}
-#line 5285 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5305 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 191:
-#line 1429 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1433 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double vector");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(4);
}
-#line 5296 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5316 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 192:
-#line 1435 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1439 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
@@ -5305,11 +5325,11 @@ yyreduce:
(yyval.interm.type).setVector(2);
#endif
}
-#line 5309 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5329 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 193:
-#line 1443 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1447 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
@@ -5318,11 +5338,11 @@ yyreduce:
(yyval.interm.type).setVector(3);
#endif
}
-#line 5322 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5342 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 194:
-#line 1451 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1455 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
@@ -5331,104 +5351,104 @@ yyreduce:
(yyval.interm.type).setVector(4);
#endif
}
-#line 5335 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5355 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 195:
-#line 1459 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1463 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtBool;
(yyval.interm.type).setVector(2);
}
-#line 5345 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5365 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 196:
-#line 1464 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1468 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtBool;
(yyval.interm.type).setVector(3);
}
-#line 5355 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5375 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 197:
-#line 1469 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1473 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtBool;
(yyval.interm.type).setVector(4);
}
-#line 5365 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5385 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 198:
-#line 1474 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1478 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).setVector(2);
}
-#line 5375 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5395 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 199:
-#line 1479 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1483 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).setVector(3);
}
-#line 5385 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5405 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 200:
-#line 1484 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1488 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).setVector(4);
}
-#line 5395 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5415 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 201:
-#line 1489 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1493 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt64;
(yyval.interm.type).setVector(2);
}
-#line 5406 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5426 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 202:
-#line 1495 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1499 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt64;
(yyval.interm.type).setVector(3);
}
-#line 5417 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5437 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 203:
-#line 1501 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1505 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt64;
(yyval.interm.type).setVector(4);
}
-#line 5428 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5448 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 204:
-#line 1507 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1511 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
@@ -5437,11 +5457,11 @@ yyreduce:
(yyval.interm.type).setVector(2);
#endif
}
-#line 5441 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5461 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 205:
-#line 1515 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1519 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
@@ -5450,11 +5470,11 @@ yyreduce:
(yyval.interm.type).setVector(3);
#endif
}
-#line 5454 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5474 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 206:
-#line 1523 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1527 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
@@ -5463,77 +5483,77 @@ yyreduce:
(yyval.interm.type).setVector(4);
#endif
}
-#line 5467 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5487 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 207:
-#line 1531 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1535 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).setVector(2);
}
-#line 5478 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5498 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 208:
-#line 1537 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1541 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).setVector(3);
}
-#line 5489 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5509 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 209:
-#line 1543 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1547 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).setVector(4);
}
-#line 5500 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5520 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 210:
-#line 1549 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1553 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint64;
(yyval.interm.type).setVector(2);
}
-#line 5511 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5531 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 211:
-#line 1555 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1559 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint64;
(yyval.interm.type).setVector(3);
}
-#line 5522 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5542 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 212:
-#line 1561 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1565 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint64;
(yyval.interm.type).setVector(4);
}
-#line 5533 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5553 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 213:
-#line 1567 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1571 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
@@ -5542,11 +5562,11 @@ yyreduce:
(yyval.interm.type).setVector(2);
#endif
}
-#line 5546 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5566 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 214:
-#line 1575 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1579 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
@@ -5555,11 +5575,11 @@ yyreduce:
(yyval.interm.type).setVector(3);
#endif
}
-#line 5559 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5579 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 215:
-#line 1583 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1587 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.int16Check((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
@@ -5568,263 +5588,263 @@ yyreduce:
(yyval.interm.type).setVector(4);
#endif
}
-#line 5572 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5592 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 216:
-#line 1591 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1595 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 5582 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5602 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 217:
-#line 1596 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1600 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 5592 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5612 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 218:
-#line 1601 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1605 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 5602 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5622 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 219:
-#line 1606 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1610 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 5612 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5632 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 220:
-#line 1611 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1615 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 3);
}
-#line 5622 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5642 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 221:
-#line 1616 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1620 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 4);
}
-#line 5632 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5652 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 222:
-#line 1621 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1625 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 2);
}
-#line 5642 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5662 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 223:
-#line 1626 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1630 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 5652 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5672 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 224:
-#line 1631 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1635 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 4);
}
-#line 5662 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5682 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 225:
-#line 1636 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1640 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 2);
}
-#line 5672 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5692 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 226:
-#line 1641 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1645 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 3);
}
-#line 5682 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5702 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 227:
-#line 1646 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1650 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 5692 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5712 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 228:
-#line 1651 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1655 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 5703 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5723 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 229:
-#line 1657 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1661 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 5714 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5734 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 230:
-#line 1663 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1667 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 5725 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5745 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 231:
-#line 1669 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1673 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 5736 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5756 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 232:
-#line 1675 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1679 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 3);
}
-#line 5747 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5767 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 233:
-#line 1681 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1685 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 4);
}
-#line 5758 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5778 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 234:
-#line 1687 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1691 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 2);
}
-#line 5769 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5789 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 235:
-#line 1693 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1697 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 5780 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5800 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 236:
-#line 1699 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1703 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 4);
}
-#line 5791 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5811 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 237:
-#line 1705 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1709 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 2);
}
-#line 5802 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5822 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 238:
-#line 1711 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1715 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 3);
}
-#line 5813 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5833 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 239:
-#line 1717 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1721 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.doubleCheck((yyvsp[0].lex).loc, "double matrix");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 5824 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5844 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 240:
-#line 1723 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1727 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5833,11 +5853,11 @@ yyreduce:
(yyval.interm.type).setMatrix(2, 2);
#endif
}
-#line 5837 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5857 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 241:
-#line 1731 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1735 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5846,11 +5866,11 @@ yyreduce:
(yyval.interm.type).setMatrix(3, 3);
#endif
}
-#line 5850 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5870 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 242:
-#line 1739 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1743 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5859,11 +5879,11 @@ yyreduce:
(yyval.interm.type).setMatrix(4, 4);
#endif
}
-#line 5863 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5883 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 243:
-#line 1747 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1751 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5872,11 +5892,11 @@ yyreduce:
(yyval.interm.type).setMatrix(2, 2);
#endif
}
-#line 5876 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5896 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 244:
-#line 1755 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1759 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5885,11 +5905,11 @@ yyreduce:
(yyval.interm.type).setMatrix(2, 3);
#endif
}
-#line 5889 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5909 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 245:
-#line 1763 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1767 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5898,11 +5918,11 @@ yyreduce:
(yyval.interm.type).setMatrix(2, 4);
#endif
}
-#line 5902 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5922 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 246:
-#line 1771 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1775 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5911,11 +5931,11 @@ yyreduce:
(yyval.interm.type).setMatrix(3, 2);
#endif
}
-#line 5915 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5935 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 247:
-#line 1779 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1783 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5924,11 +5944,11 @@ yyreduce:
(yyval.interm.type).setMatrix(3, 3);
#endif
}
-#line 5928 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5948 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 248:
-#line 1787 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1791 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5937,11 +5957,11 @@ yyreduce:
(yyval.interm.type).setMatrix(3, 4);
#endif
}
-#line 5941 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5961 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 249:
-#line 1795 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1799 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5950,11 +5970,11 @@ yyreduce:
(yyval.interm.type).setMatrix(4, 2);
#endif
}
-#line 5954 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5974 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 250:
-#line 1803 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1807 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5963,11 +5983,11 @@ yyreduce:
(yyval.interm.type).setMatrix(4, 3);
#endif
}
-#line 5967 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 5987 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 251:
-#line 1811 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1815 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
#ifdef AMD_EXTENSIONS
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
@@ -5976,1188 +5996,1188 @@ yyreduce:
(yyval.interm.type).setMatrix(4, 4);
#endif
}
-#line 5980 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6000 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 252:
-#line 1819 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1823 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.vulkanRemoved((yyvsp[0].lex).loc, "atomic counter types");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtAtomicUint;
}
-#line 5990 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6010 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 253:
-#line 1824 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1828 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd1D);
}
-#line 6000 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6020 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 254:
-#line 1829 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1833 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D);
}
-#line 6010 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6030 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 255:
-#line 1834 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1838 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd3D);
}
-#line 6020 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6040 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 256:
-#line 1839 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1843 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdCube);
}
-#line 6030 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6050 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 257:
-#line 1844 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1848 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd1D, false, true);
}
-#line 6040 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6060 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 258:
-#line 1849 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1853 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, false, true);
}
-#line 6050 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6070 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 259:
-#line 1854 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1858 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdCube, false, true);
}
-#line 6060 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6080 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 260:
-#line 1859 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1863 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd1D, true);
}
-#line 6070 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6090 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 261:
-#line 1864 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1868 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, true);
}
-#line 6080 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6100 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 262:
-#line 1869 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1873 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd1D, true, true);
}
-#line 6090 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6110 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 263:
-#line 1874 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1878 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, true, true);
}
-#line 6100 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6120 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 264:
-#line 1879 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1883 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdCube, true);
}
-#line 6110 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6130 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 265:
-#line 1884 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1888 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdCube, true, true);
}
-#line 6120 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6140 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 266:
-#line 1889 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1893 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd1D);
}
-#line 6130 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6150 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 267:
-#line 1894 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1898 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd2D);
}
-#line 6140 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6160 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 268:
-#line 1899 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1903 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd3D);
}
-#line 6150 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6170 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 269:
-#line 1904 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1908 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, EsdCube);
}
-#line 6160 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6180 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 270:
-#line 1909 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1913 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd1D, true);
}
-#line 6170 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6190 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 271:
-#line 1914 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1918 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd2D, true);
}
-#line 6180 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6200 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 272:
-#line 1919 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1923 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, EsdCube, true);
}
-#line 6190 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6210 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 273:
-#line 1924 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1928 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd1D);
}
-#line 6200 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6220 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 274:
-#line 1929 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1933 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd2D);
}
-#line 6210 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6230 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 275:
-#line 1934 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1938 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd3D);
}
-#line 6220 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6240 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 276:
-#line 1939 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1943 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, EsdCube);
}
-#line 6230 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6250 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 277:
-#line 1944 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1948 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd1D, true);
}
-#line 6240 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6260 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 278:
-#line 1949 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1953 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd2D, true);
}
-#line 6250 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6270 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 279:
-#line 1954 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1958 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, EsdCube, true);
}
-#line 6260 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6280 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 280:
-#line 1959 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1963 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdRect);
}
-#line 6270 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6290 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 281:
-#line 1964 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1968 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdRect, false, true);
}
-#line 6280 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6300 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 282:
-#line 1969 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1973 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, EsdRect);
}
-#line 6290 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6310 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 283:
-#line 1974 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1978 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, EsdRect);
}
-#line 6300 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6320 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 284:
-#line 1979 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1983 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdBuffer);
}
-#line 6310 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6330 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 285:
-#line 1984 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1988 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, EsdBuffer);
}
-#line 6320 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6340 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 286:
-#line 1989 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1993 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, EsdBuffer);
}
-#line 6330 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6350 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 287:
-#line 1994 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 1998 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, false, false, true);
}
-#line 6340 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6360 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 288:
-#line 1999 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2003 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd2D, false, false, true);
}
-#line 6350 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6370 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 289:
-#line 2004 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2008 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd2D, false, false, true);
}
-#line 6360 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6380 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 290:
-#line 2009 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2013 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, true, false, true);
}
-#line 6370 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6390 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 291:
-#line 2014 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2018 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd2D, true, false, true);
}
-#line 6380 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6400 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 292:
-#line 2019 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2023 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd2D, true, false, true);
}
-#line 6390 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6410 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 293:
-#line 2024 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2028 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setPureSampler(false);
}
-#line 6400 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6420 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 294:
-#line 2029 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2033 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setPureSampler(true);
}
-#line 6410 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6430 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 295:
-#line 2034 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2038 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd1D);
}
-#line 6420 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6440 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 296:
-#line 2039 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2043 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D);
}
-#line 6430 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6450 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 297:
-#line 2044 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2048 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd3D);
}
-#line 6440 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6460 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 298:
-#line 2049 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2053 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, EsdCube);
}
-#line 6450 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6470 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 299:
-#line 2054 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2058 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd1D, true);
}
-#line 6460 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6480 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 300:
-#line 2059 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2063 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D, true);
}
-#line 6470 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6490 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 301:
-#line 2064 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2068 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, EsdCube, true);
}
-#line 6480 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6500 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 302:
-#line 2069 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2073 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd1D);
}
-#line 6490 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6510 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 303:
-#line 2074 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2078 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd2D);
}
-#line 6500 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6520 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 304:
-#line 2079 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2083 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd3D);
}
-#line 6510 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6530 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 305:
-#line 2084 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2088 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, EsdCube);
}
-#line 6520 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6540 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 306:
-#line 2089 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2093 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd1D, true);
}
-#line 6530 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6550 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 307:
-#line 2094 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2098 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd2D, true);
}
-#line 6540 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6560 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 308:
-#line 2099 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2103 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, EsdCube, true);
}
-#line 6550 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6570 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 309:
-#line 2104 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2108 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd1D);
}
-#line 6560 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6580 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 310:
-#line 2109 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2113 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd2D);
}
-#line 6570 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6590 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 311:
-#line 2114 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2118 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd3D);
}
-#line 6580 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6600 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 312:
-#line 2119 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2123 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, EsdCube);
}
-#line 6590 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6610 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 313:
-#line 2124 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2128 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd1D, true);
}
-#line 6600 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6620 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 314:
-#line 2129 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2133 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd2D, true);
}
-#line 6610 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6630 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 315:
-#line 2134 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2138 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, EsdCube, true);
}
-#line 6620 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6640 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 316:
-#line 2139 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2143 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, EsdRect);
}
-#line 6630 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6650 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 317:
-#line 2144 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2148 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, EsdRect);
}
-#line 6640 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6660 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 318:
-#line 2149 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2153 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, EsdRect);
}
-#line 6650 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6670 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 319:
-#line 2154 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2158 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, EsdBuffer);
}
-#line 6660 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6680 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 320:
-#line 2159 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2163 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, EsdBuffer);
}
-#line 6670 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6690 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 321:
-#line 2164 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2168 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, EsdBuffer);
}
-#line 6680 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6700 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 322:
-#line 2169 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2173 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D, false, false, true);
}
-#line 6690 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6710 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 323:
-#line 2174 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2178 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd2D, false, false, true);
}
-#line 6700 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6720 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 324:
-#line 2179 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2183 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd2D, false, false, true);
}
-#line 6710 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6730 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 325:
-#line 2184 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2188 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D, true, false, true);
}
-#line 6720 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6740 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 326:
-#line 2189 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2193 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd2D, true, false, true);
}
-#line 6730 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6750 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 327:
-#line 2194 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2198 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd2D, true, false, true);
}
-#line 6740 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6760 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 328:
-#line 2199 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2203 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd1D);
}
-#line 6750 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6770 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 329:
-#line 2204 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2208 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd1D);
}
-#line 6760 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6780 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 330:
-#line 2209 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2213 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd1D);
}
-#line 6770 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6790 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 331:
-#line 2214 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2218 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd2D);
}
-#line 6780 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6800 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 332:
-#line 2219 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2223 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd2D);
}
-#line 6790 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6810 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 333:
-#line 2224 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2228 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd2D);
}
-#line 6800 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6820 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 334:
-#line 2229 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2233 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd3D);
}
-#line 6810 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6830 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 335:
-#line 2234 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2238 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd3D);
}
-#line 6820 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6840 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 336:
-#line 2239 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2243 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd3D);
}
-#line 6830 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6850 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 337:
-#line 2244 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2248 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, EsdRect);
}
-#line 6840 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6860 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 338:
-#line 2249 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2253 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, EsdRect);
}
-#line 6850 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6870 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 339:
-#line 2254 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2258 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, EsdRect);
}
-#line 6860 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6880 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 340:
-#line 2259 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2263 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, EsdCube);
}
-#line 6870 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6890 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 341:
-#line 2264 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2268 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, EsdCube);
}
-#line 6880 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6900 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 342:
-#line 2269 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2273 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, EsdCube);
}
-#line 6890 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6910 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 343:
-#line 2274 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2278 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, EsdBuffer);
}
-#line 6900 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6920 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 344:
-#line 2279 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2283 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, EsdBuffer);
}
-#line 6910 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6930 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 345:
-#line 2284 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2288 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, EsdBuffer);
}
-#line 6920 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6940 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 346:
-#line 2289 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2293 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd1D, true);
}
-#line 6930 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6950 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 347:
-#line 2294 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2298 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd1D, true);
}
-#line 6940 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6960 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 348:
-#line 2299 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2303 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd1D, true);
}
-#line 6950 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6970 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 349:
-#line 2304 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2308 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd2D, true);
}
-#line 6960 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6980 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 350:
-#line 2309 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2313 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd2D, true);
}
-#line 6970 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 6990 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 351:
-#line 2314 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2318 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd2D, true);
}
-#line 6980 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7000 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 352:
-#line 2319 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2323 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, EsdCube, true);
}
-#line 6990 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7010 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 353:
-#line 2324 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2328 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, EsdCube, true);
}
-#line 7000 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7020 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 354:
-#line 2329 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2333 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, EsdCube, true);
}
-#line 7010 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7030 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 355:
-#line 2334 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2338 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd2D, false, false, true);
}
-#line 7020 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7040 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 356:
-#line 2339 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2343 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd2D, false, false, true);
}
-#line 7030 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7050 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 357:
-#line 2344 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2348 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd2D, false, false, true);
}
-#line 7040 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7060 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 358:
-#line 2349 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2353 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd2D, true, false, true);
}
-#line 7050 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7070 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 359:
-#line 2354 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2358 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd2D, true, false, true);
}
-#line 7060 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7080 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 360:
-#line 2359 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2363 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd2D, true, false, true);
}
-#line 7070 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7090 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 361:
-#line 2364 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2368 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ // GL_OES_EGL_image_external
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D);
(yyval.interm.type).sampler.external = true;
}
-#line 7081 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7101 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 362:
-#line 2370 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2374 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtFloat);
}
-#line 7092 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7112 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 363:
-#line 2376 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2380 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtFloat, true);
}
-#line 7103 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7123 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 364:
-#line 2382 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2386 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtInt);
}
-#line 7114 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7134 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 365:
-#line 2388 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2392 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtInt, true);
}
-#line 7125 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7145 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 366:
-#line 2394 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2398 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtUint);
}
-#line 7136 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7156 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 367:
-#line 2400 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2404 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtUint, true);
}
-#line 7147 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7167 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 368:
-#line 2406 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2410 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.type) = (yyvsp[0].interm.type);
(yyval.interm.type).qualifier.storage = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
parseContext.structTypeCheck((yyval.interm.type).loc, (yyval.interm.type));
}
-#line 7157 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7177 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 369:
-#line 2411 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2415 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
//
// This is for user defined type names. The lexical phase looked up the
@@ -7171,47 +7191,47 @@ yyreduce:
} else
parseContext.error((yyvsp[0].lex).loc, "expected type name", (yyvsp[0].lex).string->c_str(), "");
}
-#line 7175 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7195 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 370:
-#line 2427 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2431 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "highp precision qualifier");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqHigh);
}
-#line 7185 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7205 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 371:
-#line 2432 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2436 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "mediump precision qualifier");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqMedium);
}
-#line 7195 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7215 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 372:
-#line 2437 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2441 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "lowp precision qualifier");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqLow);
}
-#line 7205 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7225 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 373:
-#line 2445 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2449 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ parseContext.nestedStructCheck((yyvsp[-2].lex).loc); }
-#line 7211 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7231 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 374:
-#line 2445 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2449 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
TType* structure = new TType((yyvsp[-1].interm.typeList), *(yyvsp[-4].lex).string);
parseContext.structArrayCheck((yyvsp[-4].lex).loc, *structure);
@@ -7223,17 +7243,17 @@ yyreduce:
(yyval.interm.type).userDef = structure;
--parseContext.structNestingLevel;
}
-#line 7227 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7247 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 375:
-#line 2456 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2460 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ parseContext.nestedStructCheck((yyvsp[-1].lex).loc); }
-#line 7233 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7253 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 376:
-#line 2456 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2460 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
TType* structure = new TType((yyvsp[-1].interm.typeList), TString(""));
(yyval.interm.type).init((yyvsp[-4].lex).loc);
@@ -7241,19 +7261,19 @@ yyreduce:
(yyval.interm.type).userDef = structure;
--parseContext.structNestingLevel;
}
-#line 7245 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7265 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 377:
-#line 2466 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2470 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.typeList) = (yyvsp[0].interm.typeList);
}
-#line 7253 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7273 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 378:
-#line 2469 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2473 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.typeList) = (yyvsp[-1].interm.typeList);
for (unsigned int i = 0; i < (yyvsp[0].interm.typeList)->size(); ++i) {
@@ -7264,11 +7284,11 @@ yyreduce:
(yyval.interm.typeList)->push_back((*(yyvsp[0].interm.typeList))[i]);
}
}
-#line 7268 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7288 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 379:
-#line 2482 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2486 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[-2].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -7287,11 +7307,11 @@ yyreduce:
(*(yyval.interm.typeList))[i].type->mergeType((yyvsp[-2].interm.type));
}
}
-#line 7291 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7311 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 380:
-#line 2500 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2504 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.globalQualifierFixCheck((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).qualifier);
if ((yyvsp[-2].interm.type).arraySizes) {
@@ -7313,38 +7333,38 @@ yyreduce:
(*(yyval.interm.typeList))[i].type->mergeType((yyvsp[-2].interm.type));
}
}
-#line 7317 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7337 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 381:
-#line 2524 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2528 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.typeList) = new TTypeList;
(yyval.interm.typeList)->push_back((yyvsp[0].interm.typeLine));
}
-#line 7326 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7346 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 382:
-#line 2528 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2532 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.typeList)->push_back((yyvsp[0].interm.typeLine));
}
-#line 7334 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7354 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 383:
-#line 2534 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2538 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.typeLine).type = new TType(EbtVoid);
(yyval.interm.typeLine).loc = (yyvsp[0].lex).loc;
(yyval.interm.typeLine).type->setFieldName(*(yyvsp[0].lex).string);
}
-#line 7344 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7364 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 384:
-#line 2539 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2543 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.arrayDimCheck((yyvsp[-1].lex).loc, (yyvsp[0].interm).arraySizes, 0);
@@ -7353,219 +7373,219 @@ yyreduce:
(yyval.interm.typeLine).type->setFieldName(*(yyvsp[-1].lex).string);
(yyval.interm.typeLine).type->newArraySizes(*(yyvsp[0].interm).arraySizes);
}
-#line 7357 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7377 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 385:
-#line 2550 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2554 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 7365 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7385 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 386:
-#line 2553 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2557 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
const char* initFeature = "{ } style initializers";
parseContext.requireProfile((yyvsp[-2].lex).loc, ~EEsProfile, initFeature);
parseContext.profileRequires((yyvsp[-2].lex).loc, ~EEsProfile, 420, E_GL_ARB_shading_language_420pack, initFeature);
(yyval.interm.intermTypedNode) = (yyvsp[-1].interm.intermTypedNode);
}
-#line 7376 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7396 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 387:
-#line 2559 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2563 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
const char* initFeature = "{ } style initializers";
parseContext.requireProfile((yyvsp[-3].lex).loc, ~EEsProfile, initFeature);
parseContext.profileRequires((yyvsp[-3].lex).loc, ~EEsProfile, 420, E_GL_ARB_shading_language_420pack, initFeature);
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 7387 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7407 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 388:
-#line 2568 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2572 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate(0, (yyvsp[0].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)->getLoc());
}
-#line 7395 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7415 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 389:
-#line 2571 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2575 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
}
-#line 7403 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7423 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 390:
-#line 2577 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2581 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7409 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7429 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 391:
-#line 2581 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2585 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7415 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7435 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 392:
-#line 2582 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2586 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7421 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7441 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 393:
-#line 2588 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2592 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7427 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7447 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 394:
-#line 2589 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2593 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7433 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7453 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 395:
-#line 2590 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2594 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7439 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7459 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 396:
-#line 2591 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2595 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7445 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7465 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 397:
-#line 2592 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2596 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7451 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7471 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 398:
-#line 2593 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2597 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7457 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7477 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 399:
-#line 2594 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2598 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7463 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7483 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 400:
-#line 2598 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2602 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = 0; }
-#line 7469 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7489 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 401:
-#line 2599 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2603 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.symbolTable.push();
++parseContext.statementNestingLevel;
}
-#line 7478 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7498 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 402:
-#line 2603 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2607 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
--parseContext.statementNestingLevel;
}
-#line 7487 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7507 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 403:
-#line 2607 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2611 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[-2].interm.intermNode) && (yyvsp[-2].interm.intermNode)->getAsAggregate())
(yyvsp[-2].interm.intermNode)->getAsAggregate()->setOperator(EOpSequence);
(yyval.interm.intermNode) = (yyvsp[-2].interm.intermNode);
}
-#line 7497 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7517 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 404:
-#line 2615 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2619 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7503 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7523 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 405:
-#line 2616 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2620 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 7509 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7529 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 406:
-#line 2620 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2624 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
++parseContext.controlFlowNestingLevel;
}
-#line 7517 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7537 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 407:
-#line 2623 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2627 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
--parseContext.controlFlowNestingLevel;
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 7526 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7546 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 408:
-#line 2627 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2631 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.symbolTable.push();
++parseContext.statementNestingLevel;
++parseContext.controlFlowNestingLevel;
}
-#line 7536 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7556 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 409:
-#line 2632 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2636 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 7547 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7567 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 410:
-#line 2641 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2645 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = 0;
}
-#line 7555 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7575 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 411:
-#line 2644 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2648 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[-1].interm.intermNode) && (yyvsp[-1].interm.intermNode)->getAsAggregate())
(yyvsp[-1].interm.intermNode)->getAsAggregate()->setOperator(EOpSequence);
(yyval.interm.intermNode) = (yyvsp[-1].interm.intermNode);
}
-#line 7565 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7585 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 412:
-#line 2652 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2656 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[0].interm.intermNode));
if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase ||
@@ -7574,11 +7594,11 @@ yyreduce:
(yyval.interm.intermNode) = 0; // start a fresh subsequence for what's after this case
}
}
-#line 7578 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7598 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 413:
-#line 2660 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2664 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase ||
(yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpDefault)) {
@@ -7587,59 +7607,76 @@ yyreduce:
} else
(yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode));
}
-#line 7591 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7611 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 414:
-#line 2671 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2675 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = 0; }
-#line 7597 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7617 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 415:
-#line 2672 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2676 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ (yyval.interm.intermNode) = static_cast<TIntermNode*>((yyvsp[-1].interm.intermTypedNode)); }
-#line 7603 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7623 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 416:
-#line 2676 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+#line 2680 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
- parseContext.boolCheck((yyvsp[-4].lex).loc, (yyvsp[-2].interm.intermTypedNode));
- (yyval.interm.intermNode) = parseContext.intermediate.addSelection((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.nodePair), (yyvsp[-4].lex).loc);
+ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 7612 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7631 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
case 417:
#line 2683 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ parseContext.handleSelectionAttributes(*(yyvsp[-1].interm.attributes), (yyvsp[0].interm.intermNode));
+ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
+ }
+#line 7640 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 418:
+#line 2689 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ parseContext.boolCheck((yyvsp[-4].lex).loc, (yyvsp[-2].interm.intermTypedNode));
+ (yyval.interm.intermNode) = parseContext.intermediate.addSelection((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.nodePair), (yyvsp[-4].lex).loc);
+ }
+#line 7649 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 419:
+#line 2696 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermNode);
(yyval.interm.nodePair).node2 = (yyvsp[0].interm.intermNode);
}
-#line 7621 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7658 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 418:
-#line 2687 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 420:
+#line 2700 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.nodePair).node1 = (yyvsp[0].interm.intermNode);
(yyval.interm.nodePair).node2 = 0;
}
-#line 7630 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7667 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 419:
-#line 2695 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 421:
+#line 2708 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
parseContext.boolCheck((yyvsp[0].interm.intermTypedNode)->getLoc(), (yyvsp[0].interm.intermTypedNode));
}
-#line 7639 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7676 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 420:
-#line 2699 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 422:
+#line 2712 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.boolCheck((yyvsp[-2].lex).loc, (yyvsp[-3].interm.type));
@@ -7650,11 +7687,28 @@ yyreduce:
else
(yyval.interm.intermTypedNode) = 0;
}
-#line 7654 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7691 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 421:
-#line 2712 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 423:
+#line 2725 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
+ }
+#line 7699 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 424:
+#line 2728 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ parseContext.handleSwitchAttributes(*(yyvsp[-1].interm.attributes), (yyvsp[0].interm.intermNode));
+ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
+ }
+#line 7708 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 425:
+#line 2734 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
// start new switch sequence on the switch stack
++parseContext.controlFlowNestingLevel;
@@ -7663,11 +7717,11 @@ yyreduce:
parseContext.switchLevel.push_back(parseContext.statementNestingLevel);
parseContext.symbolTable.push();
}
-#line 7667 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7721 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 422:
-#line 2720 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 426:
+#line 2742 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = parseContext.addSwitch((yyvsp[-7].lex).loc, (yyvsp[-5].interm.intermTypedNode), (yyvsp[-1].interm.intermNode) ? (yyvsp[-1].interm.intermNode)->getAsAggregate() : 0);
delete parseContext.switchSequenceStack.back();
@@ -7677,27 +7731,27 @@ yyreduce:
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
}
-#line 7681 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7735 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 423:
-#line 2732 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 427:
+#line 2754 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = 0;
}
-#line 7689 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7743 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 424:
-#line 2735 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 428:
+#line 2757 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 7697 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7751 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 425:
-#line 2741 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 429:
+#line 2763 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = 0;
if (parseContext.switchLevel.size() == 0)
@@ -7710,11 +7764,11 @@ yyreduce:
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpCase, (yyvsp[-1].interm.intermTypedNode), (yyvsp[-2].lex).loc);
}
}
-#line 7714 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7768 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 426:
-#line 2753 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 430:
+#line 2775 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = 0;
if (parseContext.switchLevel.size() == 0)
@@ -7724,11 +7778,28 @@ yyreduce:
else
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpDefault, (yyvsp[-1].lex).loc);
}
-#line 7728 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7782 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 427:
-#line 2765 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 431:
+#line 2787 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
+ }
+#line 7790 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 432:
+#line 2790 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ parseContext.handleLoopAttributes(*(yyvsp[-1].interm.attributes), (yyvsp[0].interm.intermNode));
+ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
+ }
+#line 7799 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 433:
+#line 2796 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if (! parseContext.limits.whileLoops)
parseContext.error((yyvsp[-1].lex).loc, "while loops not available", "limitation", "");
@@ -7737,11 +7808,11 @@ yyreduce:
++parseContext.statementNestingLevel;
++parseContext.controlFlowNestingLevel;
}
-#line 7741 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7812 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 428:
-#line 2773 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 434:
+#line 2804 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
(yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[0].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), 0, true, (yyvsp[-5].lex).loc);
@@ -7749,21 +7820,21 @@ yyreduce:
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
}
-#line 7753 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7824 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 429:
-#line 2780 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 435:
+#line 2811 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
++parseContext.loopNestingLevel;
++parseContext.statementNestingLevel;
++parseContext.controlFlowNestingLevel;
}
-#line 7763 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7834 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 430:
-#line 2785 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 436:
+#line 2816 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if (! parseContext.limits.whileLoops)
parseContext.error((yyvsp[-7].lex).loc, "do-while loops not available", "limitation", "");
@@ -7775,22 +7846,22 @@ yyreduce:
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
}
-#line 7779 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7850 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 431:
-#line 2796 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 437:
+#line 2827 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.symbolTable.push();
++parseContext.loopNestingLevel;
++parseContext.statementNestingLevel;
++parseContext.controlFlowNestingLevel;
}
-#line 7790 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7861 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 432:
-#line 2802 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 438:
+#line 2833 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
(yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[-3].interm.intermNode), (yyvsp[-5].lex).loc);
@@ -7803,81 +7874,81 @@ yyreduce:
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
}
-#line 7807 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7878 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 433:
-#line 2817 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 439:
+#line 2848 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 7815 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7886 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 434:
-#line 2820 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 440:
+#line 2851 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 7823 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7894 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 435:
-#line 2826 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 441:
+#line 2857 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 7831 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7902 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 436:
-#line 2829 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 442:
+#line 2860 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermTypedNode) = 0;
}
-#line 7839 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7910 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 437:
-#line 2835 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 443:
+#line 2866 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.nodePair).node1 = (yyvsp[-1].interm.intermTypedNode);
(yyval.interm.nodePair).node2 = 0;
}
-#line 7848 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7919 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 438:
-#line 2839 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 444:
+#line 2870 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermTypedNode);
(yyval.interm.nodePair).node2 = (yyvsp[0].interm.intermTypedNode);
}
-#line 7857 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7928 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 439:
-#line 2846 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 445:
+#line 2877 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if (parseContext.loopNestingLevel <= 0)
parseContext.error((yyvsp[-1].lex).loc, "continue statement only allowed in loops", "", "");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpContinue, (yyvsp[-1].lex).loc);
}
-#line 7867 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7938 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 440:
-#line 2851 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 446:
+#line 2882 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if (parseContext.loopNestingLevel + parseContext.switchSequenceStack.size() <= 0)
parseContext.error((yyvsp[-1].lex).loc, "break statement only allowed in switch and loops", "", "");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpBreak, (yyvsp[-1].lex).loc);
}
-#line 7877 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7948 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 441:
-#line 2856 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 447:
+#line 2887 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpReturn, (yyvsp[-1].lex).loc);
if (parseContext.currentFunctionType->getBasicType() != EbtVoid)
@@ -7885,83 +7956,83 @@ yyreduce:
if (parseContext.inMain)
parseContext.postEntryPointReturn = true;
}
-#line 7889 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7960 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 442:
-#line 2863 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 448:
+#line 2894 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = parseContext.handleReturnValue((yyvsp[-2].lex).loc, (yyvsp[-1].interm.intermTypedNode));
}
-#line 7897 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7968 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 443:
-#line 2866 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 449:
+#line 2897 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.requireStage((yyvsp[-1].lex).loc, EShLangFragment, "discard");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpKill, (yyvsp[-1].lex).loc);
}
-#line 7906 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7977 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 444:
-#line 2875 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 450:
+#line 2906 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
parseContext.intermediate.setTreeRoot((yyval.interm.intermNode));
}
-#line 7915 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7986 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 445:
-#line 2879 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 451:
+#line 2910 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
if ((yyvsp[0].interm.intermNode) != nullptr) {
(yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode));
parseContext.intermediate.setTreeRoot((yyval.interm.intermNode));
}
}
-#line 7926 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 7997 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 446:
-#line 2888 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 452:
+#line 2919 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 7934 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 8005 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 447:
-#line 2891 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 453:
+#line 2922 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 7942 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 8013 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 448:
-#line 2894 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 454:
+#line 2925 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
parseContext.requireProfile((yyvsp[0].lex).loc, ~EEsProfile, "extraneous semicolon");
parseContext.profileRequires((yyvsp[0].lex).loc, ~EEsProfile, 460, nullptr, "extraneous semicolon");
(yyval.interm.intermNode) = nullptr;
}
-#line 7952 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 8023 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 449:
-#line 2902 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 455:
+#line 2933 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
(yyvsp[0].interm).function = parseContext.handleFunctionDeclarator((yyvsp[0].interm).loc, *(yyvsp[0].interm).function, false /* not prototype */);
(yyvsp[0].interm).intermNode = parseContext.handleFunctionDefinition((yyvsp[0].interm).loc, *(yyvsp[0].interm).function);
}
-#line 7961 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 8032 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
- case 450:
-#line 2906 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ case 456:
+#line 2937 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{
// May be best done as post process phase on intermediate code
if (parseContext.currentFunctionType->getBasicType() != EbtVoid && ! parseContext.functionReturnsValue)
@@ -7977,11 +8048,52 @@ yyreduce:
(yyval.interm.intermNode)->getAsAggregate()->setDebug(parseContext.contextPragma.debug);
(yyval.interm.intermNode)->getAsAggregate()->setPragmaTable(parseContext.contextPragma.pragmaTable);
}
-#line 7981 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 8052 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 457:
+#line 2955 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ (yyval.interm.attributes) = (yyvsp[-2].interm.attributes);
+ parseContext.requireExtensions((yyvsp[-4].lex).loc, 1, &E_GL_EXT_control_flow_attributes, "attribute");
+ }
+#line 8061 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 458:
+#line 2961 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ (yyval.interm.attributes) = (yyvsp[0].interm.attributes);
+ }
+#line 8069 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 459:
+#line 2964 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ (yyval.interm.attributes) = parseContext.mergeAttributes((yyvsp[-2].interm.attributes), (yyvsp[0].interm.attributes));
+ }
+#line 8077 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 460:
+#line 2969 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ (yyval.interm.attributes) = parseContext.makeAttributes(*(yyvsp[0].lex).string);
+ }
+#line 8085 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 461:
+#line 2972 "MachineIndependent/glslang.y" /* yacc.c:1646 */
+ {
+ (yyval.interm.attributes) = parseContext.makeAttributes(*(yyvsp[-3].lex).string, (yyvsp[-1].interm.intermTypedNode));
+ }
+#line 8093 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break;
-#line 7985 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
+#line 8097 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -8209,5 +8321,5 @@ yyreturn:
#endif
return yyresult;
}
-#line 2923 "MachineIndependent/glslang.y" /* yacc.c:1906 */
+#line 2976 "MachineIndependent/glslang.y" /* yacc.c:1906 */
diff --git a/glslang/MachineIndependent/glslang_tab.cpp.h b/glslang/MachineIndependent/glslang_tab.cpp.h
index b2e00632d9adaa28240a86c8d24f14eacc6b1b40..f3fc4280d6de2adb9fbe1580eff4506787ad2ed5 100644
--- a/glslang/MachineIndependent/glslang_tab.cpp.h
+++ b/glslang/MachineIndependent/glslang_tab.cpp.h
@@ -348,7 +348,7 @@ extern int yydebug;
typedef union YYSTYPE YYSTYPE;
union YYSTYPE
{
-#line 68 "MachineIndependent/glslang.y" /* yacc.c:1909 */
+#line 69 "MachineIndependent/glslang.y" /* yacc.c:1909 */
struct {
glslang::TSourceLoc loc;
@@ -370,6 +370,7 @@ union YYSTYPE
TIntermNode* intermNode;
glslang::TIntermNodePair nodePair;
glslang::TIntermTyped* intermTypedNode;
+ glslang::TAttributes* attributes;
};
union {
glslang::TPublicType type;
@@ -382,7 +383,7 @@ union YYSTYPE
};
} interm;
-#line 386 "MachineIndependent/glslang_tab.cpp.h" /* yacc.c:1909 */
+#line 387 "MachineIndependent/glslang_tab.cpp.h" /* yacc.c:1909 */
};
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
diff --git a/glslang/MachineIndependent/intermOut.cpp b/glslang/MachineIndependent/intermOut.cpp
index dd2cdc89f035442f9e331856fe8466bf452130a5..4c01284fe9a1884fe2137d695a6bc1ef699df4a9 100644
--- a/glslang/MachineIndependent/intermOut.cpp
+++ b/glslang/MachineIndependent/intermOut.cpp
@@ -817,7 +817,13 @@ bool TOutputTraverser::visitSelection(TVisit /* visit */, TIntermSelection* node
OutputTreeText(out, node, depth);
out.debug << "Test condition and select";
- out.debug << " (" << node->getCompleteString() << ")\n";
+ out.debug << " (" << node->getCompleteString() << ")";
+
+ if (node->getFlatten())
+ out.debug << ": Flatten";
+ if (node->getDontFlatten())
+ out.debug << ": DontFlatten";
+ out.debug << "\n";
++depth;
@@ -979,7 +985,17 @@ bool TOutputTraverser::visitLoop(TVisit /* visit */, TIntermLoop* node)
out.debug << "Loop with condition ";
if (! node->testFirst())
out.debug << "not ";
- out.debug << "tested first\n";
+ out.debug << "tested first";
+
+ if (node->getUnroll())
+ out.debug << ": Unroll";
+ if (node->getDontUnroll())
+ out.debug << ": DontUnroll";
+ if (node->getLoopDependency()) {
+ out.debug << ": Dependency ";
+ out.debug << node->getLoopDependency();
+ }
+ out.debug << "\n";
++depth;
@@ -1040,7 +1056,13 @@ bool TOutputTraverser::visitSwitch(TVisit /* visit */, TIntermSwitch* node)
TInfoSink& out = infoSink;
OutputTreeText(out, node, depth);
- out.debug << "switch\n";
+ out.debug << "switch";
+
+ if (node->getFlatten())
+ out.debug << ": Flatten";
+ if (node->getDontFlatten())
+ out.debug << ": DontFlatten";
+ out.debug << "\n";
OutputTreeText(out, node, depth);
out.debug << "condition\n";
diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h
index 4d48c68d49dda701d7bcce8d72187f8f20af3ba1..b0ef5fd039c242a8fa8b6b29fd680e173d13308f 100644
--- a/glslang/MachineIndependent/localintermediate.h
+++ b/glslang/MachineIndependent/localintermediate.h
@@ -420,8 +420,8 @@ public:
TIntermAggregate* makeAggregate(const TSourceLoc&);
TIntermTyped* setAggregateOperator(TIntermNode*, TOperator, const TType& type, TSourceLoc);
bool areAllChildConst(TIntermAggregate* aggrNode);
- TIntermTyped* addSelection(TIntermTyped* cond, TIntermNodePair code, const TSourceLoc&, TSelectionControl = ESelectionControlNone);
- TIntermTyped* addSelection(TIntermTyped* cond, TIntermTyped* trueBlock, TIntermTyped* falseBlock, const TSourceLoc&, TSelectionControl = ESelectionControlNone);
+ TIntermSelection* addSelection(TIntermTyped* cond, TIntermNodePair code, const TSourceLoc&);
+ TIntermTyped* addSelection(TIntermTyped* cond, TIntermTyped* trueBlock, TIntermTyped* falseBlock, const TSourceLoc&);
TIntermTyped* addComma(TIntermTyped* left, TIntermTyped* right, const TSourceLoc&);
TIntermTyped* addMethod(TIntermTyped*, const TType&, const TString*, const TSourceLoc&);
TIntermConstantUnion* addConstantUnion(const TConstUnionArray&, const TType&, const TSourceLoc&, bool literal = false) const;
@@ -439,8 +439,9 @@ public:
TIntermConstantUnion* addConstantUnion(const TString*, const TSourceLoc&, bool literal = false) const;
TIntermTyped* promoteConstantUnion(TBasicType, TIntermConstantUnion*) const;
bool parseConstTree(TIntermNode*, TConstUnionArray, TOperator, const TType&, bool singleConstantParam = false);
- TIntermLoop* addLoop(TIntermNode*, TIntermTyped*, TIntermTyped*, bool testFirst, const TSourceLoc&, TLoopControl = ELoopControlNone);
- TIntermAggregate* addForLoop(TIntermNode*, TIntermNode*, TIntermTyped*, TIntermTyped*, bool testFirst, const TSourceLoc&, TLoopControl = ELoopControlNone);
+ TIntermLoop* addLoop(TIntermNode*, TIntermTyped*, TIntermTyped*, bool testFirst, const TSourceLoc&);
+ TIntermAggregate* addForLoop(TIntermNode*, TIntermNode*, TIntermTyped*, TIntermTyped*, bool testFirst,
+ const TSourceLoc&, TIntermLoop*&);
TIntermBranch* addBranch(TOperator, const TSourceLoc&);
TIntermBranch* addBranch(TOperator, TIntermTyped*, const TSourceLoc&);
template<typename selectorType> TIntermTyped* addSwizzle(TSwizzleSelectors<selectorType>&, const TSourceLoc&);
diff --git a/gtests/Hlsl.FromFile.cpp b/gtests/Hlsl.FromFile.cpp
index 20fc69058da2547fd7658c15074156731a52c588..42d3061797d5c3a0207aefa370e42aa3e8f0af87 100644
--- a/gtests/Hlsl.FromFile.cpp
+++ b/gtests/Hlsl.FromFile.cpp
@@ -247,7 +247,7 @@ INSTANTIATE_TEST_CASE_P(
{"hlsl.matrixindex.frag", "main"},
{"hlsl.nonstaticMemberFunction.frag", "main"},
{"hlsl.numericsuffixes.frag", "main"},
- {"hlsl.numthreads.comp", "main_aux1"},
+ {"hlsl.numthreads.comp", "main_aux2"},
{"hlsl.overload.frag", "PixelShaderFunction"},
{"hlsl.opaque-type-bug.frag", "main"},
{"hlsl.params.default.frag", "main"},
diff --git a/gtests/Spv.FromFile.cpp b/gtests/Spv.FromFile.cpp
index 3c7643cc181ec88625de54bf20434cff4cda9543..c11f5b8375009b2038ce43e9abbc3cf99a005151 100644
--- a/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
@@ -235,6 +235,7 @@ INSTANTIATE_TEST_CASE_P(
"spv.branch-return.vert",
"spv.builtInXFB.vert",
"spv.conditionalDiscard.frag",
+ "spv.controlFlowAttributes.frag",
"spv.conversion.frag",
"spv.dataOut.frag",
"spv.dataOutIndirect.frag",
diff --git a/hlsl/hlslAttributes.cpp b/hlsl/hlslAttributes.cpp
index 2d204d31542daed93f86c3fbbf2f859aab687e08..261cec346f21e0955c41e67955d6ec6711403fe5 100644
--- a/hlsl/hlslAttributes.cpp
+++ b/hlsl/hlslAttributes.cpp
@@ -34,157 +34,73 @@
//
#include "hlslAttributes.h"
-#include <cstdlib>
-#include <cctype>
-#include <algorithm>
+#include "hlslParseHelper.h"
namespace glslang {
// Map the given string to an attribute enum from TAttributeType,
// or EatNone if invalid.
- TAttributeType TAttributeMap::attributeFromName(const TString& nameSpace, const TString& name)
+ TAttributeType HlslParseContext::attributeFromName(const TString& nameSpace, const TString& name) const
{
- // These are case insensitive.
- TString lowername(name);
- std::transform(lowername.begin(), lowername.end(), lowername.begin(), ::tolower);
- TString lowernameSpace(nameSpace);
- std::transform(lowernameSpace.begin(), lowernameSpace.end(), lowernameSpace.begin(), ::tolower);
-
// handle names within a namespace
- if (lowernameSpace == "vk") {
- if (lowername == "input_attachment_index")
+ if (nameSpace == "vk") {
+ if (name == "input_attachment_index")
return EatInputAttachment;
- else if (lowername == "location")
+ else if (name == "location")
return EatLocation;
- else if (lowername == "binding")
+ else if (name == "binding")
return EatBinding;
- else if (lowername == "global_cbuffer_binding")
+ else if (name == "global_cbuffer_binding")
return EatGlobalBinding;
- else if (lowername == "builtin")
+ else if (name == "builtin")
return EatBuiltIn;
- else if (lowername == "constant_id")
+ else if (name == "constant_id")
return EatConstantId;
- else if (lowername == "push_constant")
+ else if (name == "push_constant")
return EatPushConstant;
- } else if (lowernameSpace.size() > 0)
+ } else if (nameSpace.size() > 0)
return EatNone;
// handle names with no namespace
- if (lowername == "allow_uav_condition")
+ if (name == "allow_uav_condition")
return EatAllow_uav_condition;
- else if (lowername == "branch")
+ else if (name == "branch")
return EatBranch;
- else if (lowername == "call")
+ else if (name == "call")
return EatCall;
- else if (lowername == "domain")
+ else if (name == "domain")
return EatDomain;
- else if (lowername == "earlydepthstencil")
+ else if (name == "earlydepthstencil")
return EatEarlyDepthStencil;
- else if (lowername == "fastopt")
+ else if (name == "fastopt")
return EatFastOpt;
- else if (lowername == "flatten")
+ else if (name == "flatten")
return EatFlatten;
- else if (lowername == "forcecase")
+ else if (name == "forcecase")
return EatForceCase;
- else if (lowername == "instance")
+ else if (name == "instance")
return EatInstance;
- else if (lowername == "maxtessfactor")
+ else if (name == "maxtessfactor")
return EatMaxTessFactor;
- else if (lowername == "maxvertexcount")
+ else if (name == "maxvertexcount")
return EatMaxVertexCount;
- else if (lowername == "numthreads")
+ else if (name == "numthreads")
return EatNumThreads;
- else if (lowername == "outputcontrolpoints")
+ else if (name == "outputcontrolpoints")
return EatOutputControlPoints;
- else if (lowername == "outputtopology")
+ else if (name == "outputtopology")
return EatOutputTopology;
- else if (lowername == "partitioning")
+ else if (name == "partitioning")
return EatPartitioning;
- else if (lowername == "patchconstantfunc")
+ else if (name == "patchconstantfunc")
return EatPatchConstantFunc;
- else if (lowername == "unroll")
+ else if (name == "unroll")
return EatUnroll;
- else if (lowername == "loop")
+ else if (name == "loop")
return EatLoop;
else
return EatNone;
}
- // Look up entry, inserting if it's not there, and if name is a valid attribute name
- // as known by attributeFromName.
- TAttributeType TAttributeMap::setAttribute(const TString& nameSpace, const TString* name, TIntermAggregate* value)
- {
- if (name == nullptr)
- return EatNone;
-
- const TAttributeType attr = attributeFromName(nameSpace, *name);
-
- if (attr != EatNone)
- attributes[attr] = value;
-
- return attr;
- }
-
- // Look up entry (const version), and return aggregate node. This cannot change the map.
- const TIntermAggregate* TAttributeMap::operator[](TAttributeType attr) const
- {
- const auto entry = attributes.find(attr);
-
- return (entry == attributes.end()) ? nullptr : entry->second;
- }
-
- // True if entry exists in map (even if value is nullptr)
- bool TAttributeMap::contains(TAttributeType attr) const
- {
- return attributes.find(attr) != attributes.end();
- }
-
- // extract integers out of attribute arguments stored in attribute aggregate
- bool TAttributeMap::getInt(TAttributeType attr, int& value, int argNum) const
- {
- const TConstUnion* intConst = getConstUnion(attr, EbtInt, argNum);
-
- if (intConst == nullptr)
- return false;
-
- value = intConst->getIConst();
- return true;
- };
-
- // extract strings out of attribute arguments stored in attribute aggregate.
- // convert to lower case if converToLower is true (for case-insensitive compare convenience)
- bool TAttributeMap::getString(TAttributeType attr, TString& value, int argNum, bool convertToLower) const
- {
- const TConstUnion* stringConst = getConstUnion(attr, EbtString, argNum);
-
- if (stringConst == nullptr)
- return false;
-
- value = *stringConst->getSConst();
-
- // Convenience.
- if (convertToLower)
- std::transform(value.begin(), value.end(), value.begin(), ::tolower);
-
- return true;
- };
-
- // Helper to get attribute const union. Returns nullptr on failure.
- const TConstUnion* TAttributeMap::getConstUnion(TAttributeType attr, TBasicType basicType, int argNum) const
- {
- const TIntermAggregate* attrAgg = (*this)[attr];
- if (attrAgg == nullptr)
- return nullptr;
-
- if (argNum >= int(attrAgg->getSequence().size()))
- return nullptr;
-
- const TConstUnion* constVal = &attrAgg->getSequence()[argNum]->getAsConstantUnion()->getConstArray()[0];
- if (constVal == nullptr || constVal->getType() != basicType)
- return nullptr;
-
- return constVal;
- }
-
} // end namespace glslang
diff --git a/hlsl/hlslAttributes.h b/hlsl/hlslAttributes.h
index 2c3cf76e6bc597303517cf9530f827c7177a5794..b1cc0372e5e951356009c97c4d1a0d206b289620 100644
--- a/hlsl/hlslAttributes.h
+++ b/hlsl/hlslAttributes.h
@@ -38,93 +38,22 @@
#include <unordered_map>
#include <functional>
-#include "hlslScanContext.h"
-#include "../glslang/Include/Common.h"
-namespace glslang {
- enum TAttributeType {
- EatNone,
- EatAllow_uav_condition,
- EatBranch,
- EatCall,
- EatDomain,
- EatEarlyDepthStencil,
- EatFastOpt,
- EatFlatten,
- EatForceCase,
- EatInstance,
- EatMaxTessFactor,
- EatNumThreads,
- EatMaxVertexCount,
- EatOutputControlPoints,
- EatOutputTopology,
- EatPartitioning,
- EatPatchConstantFunc,
- EatPatchSize,
- EatUnroll,
- EatLoop,
- EatBinding,
- EatGlobalBinding,
- EatLocation,
- EatInputAttachment,
- EatBuiltIn,
- EatPushConstant,
- EatConstantId
- };
-}
-
-namespace std {
- // Allow use of TAttributeType enum in hash_map without calling code having to cast.
- template <> struct hash<glslang::TAttributeType> {
- std::size_t operator()(glslang::TAttributeType attr) const {
- return std::hash<int>()(int(attr));
- }
- };
-} // end namespace std
+#include "../glslang/MachineIndependent/attribute.h"
+#include "../glslang/MachineIndependent/SymbolTable.h"
+#include "hlslScanContext.h"
namespace glslang {
- class TIntermAggregate;
-
- class TAttributeMap {
- public:
- int size() const { return (int)attributes.size(); }
-
- // Search for and potentially add the attribute into the map. Return the
- // attribute type enum for it, if found, else EatNone.
- TAttributeType setAttribute(const TString& nameSpace, const TString* name, TIntermAggregate* value);
-
- // Const lookup: search for (but do not modify) the attribute in the map.
- const TIntermAggregate* operator[](TAttributeType) const;
-
- // True if entry exists in map (even if value is nullptr)
- bool contains(TAttributeType) const;
-
- // Obtain attribute as integer
- bool getInt(TAttributeType attr, int& value, int argNum = 0) const;
-
- // Obtain attribute as string, with optional to-lower transform
- bool getString(TAttributeType attr, TString& value, int argNum = 0, bool convertToLower = true) const;
-
- protected:
- // Helper to get attribute const union
- const TConstUnion* getConstUnion(TAttributeType attr, TBasicType, int argNum) const;
-
- // Find an attribute enum given its name.
- static TAttributeType attributeFromName(const TString& nameSpace, const TString& name);
-
- std::unordered_map<TAttributeType, TIntermAggregate*> attributes;
- };
class TFunctionDeclarator {
public:
TFunctionDeclarator() : function(nullptr), body(nullptr) { }
TSourceLoc loc;
TFunction* function;
- TAttributeMap attributes;
+ TAttributes attributes;
TVector<HlslToken>* body;
};
} // end namespace glslang
-
#endif // HLSLATTRIBUTES_H_
diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
index 60ea50e6e858e93a586f5df5d41077d5eb85ff21..57e34d1d1cf916bdea365a75728c9cca52fc1c7f 100755
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -396,6 +396,9 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& nodeList)
if (peekTokenClass(EHTokLeftParen)) {
// looks like function parameters
+ // merge in the attributes into the return type
+ parseContext.transferTypeAttributes(token.loc, declarator.attributes, declaredType, true);
+
// Potentially rename shader entry point function. No-op most of the time.
parseContext.renameShaderFunction(fullName);
@@ -423,7 +426,13 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& nodeList)
parseContext.handleFunctionDeclarator(declarator.loc, *declarator.function, true);
}
} else {
- // A variable declaration. Fix the storage qualifier if it's a global.
+ // A variable declaration.
+
+ // merge in the attributes, the first time around, into the shared type
+ if (! declarator_list)
+ parseContext.transferTypeAttributes(token.loc, declarator.attributes, declaredType);
+
+ // Fix the storage qualifier if it's a global.
if (declaredType.getQualifier().storage == EvqTemporary && parseContext.symbolTable.atGlobalLevel())
declaredType.getQualifier().storage = EvqUniform;
@@ -536,13 +545,16 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& nodeList)
bool HlslGrammar::acceptControlDeclaration(TIntermNode*& node)
{
node = nullptr;
- TAttributeMap attributes;
+ TAttributes attributes;
// fully_specified_type
TType type;
if (! acceptFullySpecifiedType(type, attributes))
return false;
+ if (attributes.size() > 0)
+ parseContext.warn(token.loc, "attributes don't apply to control declaration", "", "");
+
// filter out type casts
if (peekTokenClass(EHTokLeftParen)) {
recedeToken();
@@ -578,12 +590,12 @@ bool HlslGrammar::acceptControlDeclaration(TIntermNode*& node)
// : type_specifier
// | type_qualifier type_specifier
//
-bool HlslGrammar::acceptFullySpecifiedType(TType& type, const TAttributeMap& attributes)
+bool HlslGrammar::acceptFullySpecifiedType(TType& type, const TAttributes& attributes)
{
TIntermNode* nodeList = nullptr;
return acceptFullySpecifiedType(type, nodeList, attributes);
}
-bool HlslGrammar::acceptFullySpecifiedType(TType& type, TIntermNode*& nodeList, const TAttributeMap& attributes, bool forbidDeclarators)
+bool HlslGrammar::acceptFullySpecifiedType(TType& type, TIntermNode*& nodeList, const TAttributes& attributes, bool forbidDeclarators)
{
// type_qualifier
TQualifier qualifier;
@@ -608,7 +620,7 @@ bool HlslGrammar::acceptFullySpecifiedType(TType& type, TIntermNode*& nodeList,
parseContext.mergeQualifiers(type.getQualifier(), qualifier);
// merge in the attributes
- parseContext.transferTypeAttributes(attributes, type);
+ parseContext.transferTypeAttributes(token.loc, attributes, type);
// further, it can create an anonymous instance of the block
// (cbuffer and tbuffer don't consume the next identifier, and
@@ -633,9 +645,6 @@ bool HlslGrammar::acceptFullySpecifiedType(TType& type, TIntermNode*& nodeList,
qualifier.builtIn = type.getQualifier().builtIn;
type.getQualifier() = qualifier;
-
- // merge in the attributes
- parseContext.transferTypeAttributes(attributes, type);
}
return true;
@@ -2335,7 +2344,7 @@ bool HlslGrammar::acceptStructDeclarationList(TTypeList*& typeList, TIntermNode*
// struct_declaration
// attributes
- TAttributeMap attributes;
+ TAttributes attributes;
acceptAttributes(attributes);
bool declarator_list = false;
@@ -2346,6 +2355,9 @@ bool HlslGrammar::acceptStructDeclarationList(TTypeList*& typeList, TIntermNode*
expected("member type");
return false;
}
+
+ // merge in the attributes
+ parseContext.transferTypeAttributes(token.loc, attributes, memberType);
// struct_declarator COMMA struct_declarator ...
bool functionDefinitionAccepted = false;
@@ -2542,7 +2554,7 @@ bool HlslGrammar::acceptDefaultParameterDeclaration(const TType& type, TIntermTy
bool HlslGrammar::acceptParameterDeclaration(TFunction& function)
{
// attributes
- TAttributeMap attributes;
+ TAttributes attributes;
acceptAttributes(attributes);
// fully_specified_type
@@ -2550,6 +2562,9 @@ bool HlslGrammar::acceptParameterDeclaration(TFunction& function)
if (! acceptFullySpecifiedType(*type, attributes))
return false;
+ // merge in the attributes
+ parseContext.transferTypeAttributes(token.loc, attributes, *type);
+
// identifier
HlslToken idToken;
acceptIdentifier(idToken);
@@ -3386,7 +3401,7 @@ bool HlslGrammar::acceptStatement(TIntermNode*& statement)
statement = nullptr;
// attributes
- TAttributeMap attributes;
+ TAttributes attributes;
acceptAttributes(attributes);
// attributed_statement
@@ -3458,7 +3473,7 @@ bool HlslGrammar::acceptStatement(TIntermNode*& statement)
// | PATCHCONSTANTFUNC
// | NUMTHREADS LEFT_PAREN x_size, y_size,z z_size RIGHT_PAREN
//
-void HlslGrammar::acceptAttributes(TAttributeMap& attributes)
+void HlslGrammar::acceptAttributes(TAttributes& attributes)
{
// For now, accept the [ XXX(X) ] syntax, but drop all but
// numthreads, which is used to set the CS local size.
@@ -3529,9 +3544,16 @@ void HlslGrammar::acceptAttributes(TAttributeMap& attributes)
return;
}
- // Add any values we found into the attribute map. This accepts
- // (and ignores) values not mapping to a known TAttributeType;
- attributes.setAttribute(nameSpace, attributeToken.string, expressions);
+ // Add any values we found into the attribute map.
+ if (attributeToken.string != nullptr) {
+ TAttributeType attributeType = parseContext.attributeFromName(nameSpace, *attributeToken.string);
+ if (attributeType == EatNone)
+ parseContext.warn(attributeToken.loc, "unrecognized attribute", attributeToken.string->c_str(), "");
+ else {
+ TAttributeArgs attributeArgs = { attributeType, expressions };
+ attributes.push_back(attributeArgs);
+ }
+ }
} while (true);
}
@@ -3539,12 +3561,10 @@ void HlslGrammar::acceptAttributes(TAttributeMap& attributes)
// : IF LEFT_PAREN expression RIGHT_PAREN statement
// : IF LEFT_PAREN expression RIGHT_PAREN statement ELSE statement
//
-bool HlslGrammar::acceptSelectionStatement(TIntermNode*& statement, const TAttributeMap& attributes)
+bool HlslGrammar::acceptSelectionStatement(TIntermNode*& statement, const TAttributes& attributes)
{
TSourceLoc loc = token.loc;
- const TSelectionControl control = parseContext.handleSelectionControl(attributes);
-
// IF
if (! acceptTokenClass(EHTokIf))
return false;
@@ -3582,7 +3602,9 @@ bool HlslGrammar::acceptSelectionStatement(TIntermNode*& statement, const TAttri
}
// Put the pieces together
- statement = intermediate.addSelection(condition, thenElse, loc, control);
+ statement = intermediate.addSelection(condition, thenElse, loc);
+ parseContext.handleSelectionAttributes(loc, statement->getAsSelectionNode(), attributes);
+
parseContext.popScope();
--parseContext.controlFlowNestingLevel;
@@ -3592,13 +3614,11 @@ bool HlslGrammar::acceptSelectionStatement(TIntermNode*& statement, const TAttri
// switch_statement
// : SWITCH LEFT_PAREN expression RIGHT_PAREN compound_statement
//
-bool HlslGrammar::acceptSwitchStatement(TIntermNode*& statement, const TAttributeMap& attributes)
+bool HlslGrammar::acceptSwitchStatement(TIntermNode*& statement, const TAttributes& attributes)
{
// SWITCH
TSourceLoc loc = token.loc;
- const TSelectionControl control = parseContext.handleSelectionControl(attributes);
-
if (! acceptTokenClass(EHTokSwitch))
return false;
@@ -3618,7 +3638,8 @@ bool HlslGrammar::acceptSwitchStatement(TIntermNode*& statement, const TAttribut
--parseContext.controlFlowNestingLevel;
if (statementOkay)
- statement = parseContext.addSwitch(loc, switchExpression, statement ? statement->getAsAggregate() : nullptr, control);
+ statement = parseContext.addSwitch(loc, switchExpression, statement ? statement->getAsAggregate() : nullptr,
+ attributes);
parseContext.popSwitchSequence();
parseContext.popScope();
@@ -3632,7 +3653,7 @@ bool HlslGrammar::acceptSwitchStatement(TIntermNode*& statement, const TAttribut
// | FOR LEFT_PAREN for_init_statement for_rest_statement RIGHT_PAREN statement
//
// Non-speculative, only call if it needs to be found; WHILE or DO or FOR already seen.
-bool HlslGrammar::acceptIterationStatement(TIntermNode*& statement, const TAttributeMap& attributes)
+bool HlslGrammar::acceptIterationStatement(TIntermNode*& statement, const TAttributes& attributes)
{
TSourceLoc loc = token.loc;
TIntermTyped* condition = nullptr;
@@ -3642,9 +3663,8 @@ bool HlslGrammar::acceptIterationStatement(TIntermNode*& statement, const TAttri
// WHILE or DO or FOR
advanceToken();
-
- const TLoopControl control = parseContext.handleLoopControl(attributes);
+ TIntermLoop* loopNode = nullptr;
switch (loop) {
case EHTokWhile:
// so that something declared in the condition is scoped to the lifetime
@@ -3670,9 +3690,9 @@ bool HlslGrammar::acceptIterationStatement(TIntermNode*& statement, const TAttri
parseContext.popScope();
--parseContext.controlFlowNestingLevel;
- statement = intermediate.addLoop(statement, condition, nullptr, true, loc, control);
-
- return true;
+ loopNode = intermediate.addLoop(statement, condition, nullptr, true, loc);
+ statement = loopNode;
+ break;
case EHTokDo:
parseContext.nestLooping(); // this only needs to work right if no errors
@@ -3703,9 +3723,9 @@ bool HlslGrammar::acceptIterationStatement(TIntermNode*& statement, const TAttri
parseContext.unnestLooping();
--parseContext.controlFlowNestingLevel;
- statement = intermediate.addLoop(statement, condition, 0, false, loc, control);
-
- return true;
+ loopNode = intermediate.addLoop(statement, condition, 0, false, loc);
+ statement = loopNode;
+ break;
case EHTokFor:
{
@@ -3747,18 +3767,21 @@ bool HlslGrammar::acceptIterationStatement(TIntermNode*& statement, const TAttri
return false;
}
- statement = intermediate.addForLoop(statement, initNode, condition, iterator, true, loc, control);
+ statement = intermediate.addForLoop(statement, initNode, condition, iterator, true, loc, loopNode);
parseContext.popScope();
parseContext.unnestLooping();
--parseContext.controlFlowNestingLevel;
- return true;
+ break;
}
default:
return false;
}
+
+ parseContext.handleLoopAttributes(loc, loopNode, attributes);
+ return true;
}
// jump_statement
diff --git a/hlsl/hlslGrammar.h b/hlsl/hlslGrammar.h
index 9e58bfda2ae37fcfff0c197ed32eb03d1e9696bd..046f7957e53e21ea516be16dd5878d3f543952ac 100755
--- a/hlsl/hlslGrammar.h
+++ b/hlsl/hlslGrammar.h
@@ -43,7 +43,6 @@
namespace glslang {
- class TAttributeMap;
class TFunctionDeclarator;
// Should just be the grammar aspect of HLSL.
@@ -71,8 +70,8 @@ namespace glslang {
bool acceptControlDeclaration(TIntermNode*& node);
bool acceptSamplerDeclarationDX9(TType&);
bool acceptSamplerState();
- bool acceptFullySpecifiedType(TType&, const TAttributeMap&);
- bool acceptFullySpecifiedType(TType&, TIntermNode*& nodeList, const TAttributeMap&, bool forbidDeclarators = false);
+ bool acceptFullySpecifiedType(TType&, const TAttributes&);
+ bool acceptFullySpecifiedType(TType&, TIntermNode*& nodeList, const TAttributes&, bool forbidDeclarators = false);
bool acceptQualifier(TQualifier&);
bool acceptLayoutQualifierList(TQualifier&);
bool acceptType(TType&);
@@ -117,10 +116,10 @@ namespace glslang {
bool acceptScopedCompoundStatement(TIntermNode*&);
bool acceptStatement(TIntermNode*&);
bool acceptNestedStatement(TIntermNode*&);
- void acceptAttributes(TAttributeMap&);
- bool acceptSelectionStatement(TIntermNode*&, const TAttributeMap&);
- bool acceptSwitchStatement(TIntermNode*&, const TAttributeMap&);
- bool acceptIterationStatement(TIntermNode*&, const TAttributeMap&);
+ void acceptAttributes(TAttributes&);
+ bool acceptSelectionStatement(TIntermNode*&, const TAttributes&);
+ bool acceptSwitchStatement(TIntermNode*&, const TAttributes&);
+ bool acceptIterationStatement(TIntermNode*&, const TAttributes&);
bool acceptJumpStatement(TIntermNode*&);
bool acceptCaseLabel(TIntermNode*&);
bool acceptDefaultLabel(TIntermNode*&);
diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp
index ac72e27001c51148140d889f1b590f61ca16f440..6602ba28e937380066a2c5675fab4dbe8e15e0cb 100755
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -1620,7 +1620,7 @@ void HlslParseContext::addStructBufferHiddenCounterParam(const TSourceLoc& loc,
// Returns an aggregate of parameter-symbol nodes.
//
TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& loc, TFunction& function,
- const TAttributeMap& attributes,
+ const TAttributes& attributes,
TIntermNode*& entryPointTree)
{
currentCaller = function.getMangledName();
@@ -1717,189 +1717,217 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l
}
// Handle all [attrib] attribute for the shader entry point
-void HlslParseContext::handleEntryPointAttributes(const TSourceLoc& loc, const TAttributeMap& attributes)
+void HlslParseContext::handleEntryPointAttributes(const TSourceLoc& loc, const TAttributes& attributes)
{
- // Handle entry-point function attributes
- const TIntermAggregate* numThreads = attributes[EatNumThreads];
- if (numThreads != nullptr) {
- const TIntermSequence& sequence = numThreads->getSequence();
-
- for (int lid = 0; lid < int(sequence.size()); ++lid)
- intermediate.setLocalSize(lid, sequence[lid]->getAsConstantUnion()->getConstArray()[0].getIConst());
- }
-
- // MaxVertexCount
- if (attributes.contains(EatMaxVertexCount)) {
- int maxVertexCount;
-
- if (! attributes.getInt(EatMaxVertexCount, maxVertexCount)) {
- error(loc, "invalid maxvertexcount", "", "");
- } else {
- if (! intermediate.setVertices(maxVertexCount))
- error(loc, "cannot change previously set maxvertexcount attribute", "", "");
- }
- }
-
- // Handle [patchconstantfunction("...")]
- if (attributes.contains(EatPatchConstantFunc)) {
- TString pcfName;
- if (! attributes.getString(EatPatchConstantFunc, pcfName, 0, false)) {
- error(loc, "invalid patch constant function", "", "");
- } else {
- patchConstantFunctionName = pcfName;
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ switch (it->name) {
+ case EatNumThreads:
+ {
+ const TIntermSequence& sequence = it->args->getSequence();
+ for (int lid = 0; lid < int(sequence.size()); ++lid)
+ intermediate.setLocalSize(lid, sequence[lid]->getAsConstantUnion()->getConstArray()[0].getIConst());
+ break;
}
- }
+ case EatMaxVertexCount:
+ {
+ int maxVertexCount;
- // Handle [domain("...")]
- if (attributes.contains(EatDomain)) {
- TString domainStr;
- if (! attributes.getString(EatDomain, domainStr)) {
- error(loc, "invalid domain", "", "");
- } else {
- TLayoutGeometry domain = ElgNone;
-
- if (domainStr == "tri") {
- domain = ElgTriangles;
- } else if (domainStr == "quad") {
- domain = ElgQuads;
- } else if (domainStr == "isoline") {
- domain = ElgIsolines;
+ if (! it->getInt(maxVertexCount)) {
+ error(loc, "invalid maxvertexcount", "", "");
} else {
- error(loc, "unsupported domain type", domainStr.c_str(), "");
+ if (! intermediate.setVertices(maxVertexCount))
+ error(loc, "cannot change previously set maxvertexcount attribute", "", "");
}
-
- if (language == EShLangTessEvaluation) {
- if (! intermediate.setInputPrimitive(domain))
- error(loc, "cannot change previously set domain", TQualifier::getGeometryString(domain), "");
+ break;
+ }
+ case EatPatchConstantFunc:
+ {
+ TString pcfName;
+ if (! it->getString(pcfName, 0, false)) {
+ error(loc, "invalid patch constant function", "", "");
} else {
- if (! intermediate.setOutputPrimitive(domain))
- error(loc, "cannot change previously set domain", TQualifier::getGeometryString(domain), "");
+ patchConstantFunctionName = pcfName;
}
+ break;
}
- }
-
- // Handle [outputtopology("...")]
- if (attributes.contains(EatOutputTopology)) {
- TString topologyStr;
- if (! attributes.getString(EatOutputTopology, topologyStr)) {
- error(loc, "invalid outputtopology", "", "");
- } else {
- TVertexOrder vertexOrder = EvoNone;
- TLayoutGeometry primitive = ElgNone;
-
- if (topologyStr == "point") {
- intermediate.setPointMode();
- } else if (topologyStr == "line") {
- primitive = ElgIsolines;
- } else if (topologyStr == "triangle_cw") {
- vertexOrder = EvoCw;
- primitive = ElgTriangles;
- } else if (topologyStr == "triangle_ccw") {
- vertexOrder = EvoCcw;
- primitive = ElgTriangles;
+ case EatDomain:
+ {
+ // Handle [domain("...")]
+ TString domainStr;
+ if (! it->getString(domainStr)) {
+ error(loc, "invalid domain", "", "");
} else {
- error(loc, "unsupported outputtopology type", topologyStr.c_str(), "");
- }
+ TLayoutGeometry domain = ElgNone;
+
+ if (domainStr == "tri") {
+ domain = ElgTriangles;
+ } else if (domainStr == "quad") {
+ domain = ElgQuads;
+ } else if (domainStr == "isoline") {
+ domain = ElgIsolines;
+ } else {
+ error(loc, "unsupported domain type", domainStr.c_str(), "");
+ }
- if (vertexOrder != EvoNone) {
- if (! intermediate.setVertexOrder(vertexOrder)) {
- error(loc, "cannot change previously set outputtopology",
- TQualifier::getVertexOrderString(vertexOrder), "");
+ if (language == EShLangTessEvaluation) {
+ if (! intermediate.setInputPrimitive(domain))
+ error(loc, "cannot change previously set domain", TQualifier::getGeometryString(domain), "");
+ } else {
+ if (! intermediate.setOutputPrimitive(domain))
+ error(loc, "cannot change previously set domain", TQualifier::getGeometryString(domain), "");
}
}
- if (primitive != ElgNone)
- intermediate.setOutputPrimitive(primitive);
+ break;
}
- }
-
- // Handle [partitioning("...")]
- if (attributes.contains(EatPartitioning)) {
- TString partitionStr;
- if (! attributes.getString(EatPartitioning, partitionStr)) {
- error(loc, "invalid partitioning", "", "");
- } else {
- TVertexSpacing partitioning = EvsNone;
-
- if (partitionStr == "integer") {
- partitioning = EvsEqual;
- } else if (partitionStr == "fractional_even") {
- partitioning = EvsFractionalEven;
- } else if (partitionStr == "fractional_odd") {
- partitioning = EvsFractionalOdd;
- //} else if (partition == "pow2") { // TODO: currently nothing to map this to.
+ case EatOutputTopology:
+ {
+ // Handle [outputtopology("...")]
+ TString topologyStr;
+ if (! it->getString(topologyStr)) {
+ error(loc, "invalid outputtopology", "", "");
} else {
- error(loc, "unsupported partitioning type", partitionStr.c_str(), "");
- }
+ TVertexOrder vertexOrder = EvoNone;
+ TLayoutGeometry primitive = ElgNone;
+
+ if (topologyStr == "point") {
+ intermediate.setPointMode();
+ } else if (topologyStr == "line") {
+ primitive = ElgIsolines;
+ } else if (topologyStr == "triangle_cw") {
+ vertexOrder = EvoCw;
+ primitive = ElgTriangles;
+ } else if (topologyStr == "triangle_ccw") {
+ vertexOrder = EvoCcw;
+ primitive = ElgTriangles;
+ } else {
+ error(loc, "unsupported outputtopology type", topologyStr.c_str(), "");
+ }
- if (! intermediate.setVertexSpacing(partitioning))
- error(loc, "cannot change previously set partitioning",
- TQualifier::getVertexSpacingString(partitioning), "");
+ if (vertexOrder != EvoNone) {
+ if (! intermediate.setVertexOrder(vertexOrder)) {
+ error(loc, "cannot change previously set outputtopology",
+ TQualifier::getVertexOrderString(vertexOrder), "");
+ }
+ }
+ if (primitive != ElgNone)
+ intermediate.setOutputPrimitive(primitive);
+ }
+ break;
}
- }
+ case EatPartitioning:
+ {
+ // Handle [partitioning("...")]
+ TString partitionStr;
+ if (! it->getString(partitionStr)) {
+ error(loc, "invalid partitioning", "", "");
+ } else {
+ TVertexSpacing partitioning = EvsNone;
+
+ if (partitionStr == "integer") {
+ partitioning = EvsEqual;
+ } else if (partitionStr == "fractional_even") {
+ partitioning = EvsFractionalEven;
+ } else if (partitionStr == "fractional_odd") {
+ partitioning = EvsFractionalOdd;
+ //} else if (partition == "pow2") { // TODO: currently nothing to map this to.
+ } else {
+ error(loc, "unsupported partitioning type", partitionStr.c_str(), "");
+ }
- // Handle [outputcontrolpoints("...")]
- if (attributes.contains(EatOutputControlPoints)) {
- int ctrlPoints;
- if (! attributes.getInt(EatOutputControlPoints, ctrlPoints)) {
- error(loc, "invalid outputcontrolpoints", "", "");
- } else {
- if (! intermediate.setVertices(ctrlPoints)) {
- error(loc, "cannot change previously set outputcontrolpoints attribute", "", "");
+ if (! intermediate.setVertexSpacing(partitioning))
+ error(loc, "cannot change previously set partitioning",
+ TQualifier::getVertexSpacingString(partitioning), "");
+ }
+ break;
+ }
+ case EatOutputControlPoints:
+ {
+ // Handle [outputcontrolpoints("...")]
+ int ctrlPoints;
+ if (! it->getInt(ctrlPoints)) {
+ error(loc, "invalid outputcontrolpoints", "", "");
+ } else {
+ if (! intermediate.setVertices(ctrlPoints)) {
+ error(loc, "cannot change previously set outputcontrolpoints attribute", "", "");
+ }
}
+ break;
+ }
+ case EatBuiltIn:
+ case EatLocation:
+ // tolerate these because of dual use of entrypoint and type attributes
+ break;
+ default:
+ warn(loc, "attribute does not apply to entry point", "", "");
+ break;
}
}
}
// Update the given type with any type-like attribute information in the
// attributes.
-void HlslParseContext::transferTypeAttributes(const TAttributeMap& attributes, TType& type)
+void HlslParseContext::transferTypeAttributes(const TSourceLoc& loc, const TAttributes& attributes, TType& type,
+ bool allowEntry)
{
if (attributes.size() == 0)
return;
- // location
int value;
- if (attributes.getInt(EatLocation, value))
- type.getQualifier().layoutLocation = value;
-
- // binding
- if (attributes.getInt(EatBinding, value)) {
- type.getQualifier().layoutBinding = value;
- type.getQualifier().layoutSet = 0;
- }
-
- // set
- if (attributes.getInt(EatBinding, value, 1))
- type.getQualifier().layoutSet = value;
-
- // global cbuffer binding
- if (attributes.getInt(EatGlobalBinding, value))
- globalUniformBinding = value;
-
- // global cbuffer binding
- if (attributes.getInt(EatGlobalBinding, value, 1))
- globalUniformSet = value;
-
- // input attachment
- if (attributes.getInt(EatInputAttachment, value))
- type.getQualifier().layoutAttachment = value;
-
- // PointSize built-in
TString builtInString;
- if (attributes.getString(EatBuiltIn, builtInString, 0, false)) {
- if (builtInString == "PointSize")
- type.getQualifier().builtIn = EbvPointSize;
- }
-
- // push_constant
- if (attributes.contains(EatPushConstant))
- type.getQualifier().layoutPushConstant = true;
-
- // specialization constant
- if (attributes.getInt(EatConstantId, value)) {
- TSourceLoc loc;
- loc.init();
- setSpecConstantId(loc, type.getQualifier(), value);
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ switch (it->name) {
+ case EatLocation:
+ // location
+ if (it->getInt(value))
+ type.getQualifier().layoutLocation = value;
+ break;
+ case EatBinding:
+ // binding
+ if (it->getInt(value)) {
+ type.getQualifier().layoutBinding = value;
+ type.getQualifier().layoutSet = 0;
+ }
+ // set
+ if (it->getInt(value, 1))
+ type.getQualifier().layoutSet = value;
+ break;
+ case EatGlobalBinding:
+ // global cbuffer binding
+ if (it->getInt(value))
+ globalUniformBinding = value;
+ // global cbuffer binding
+ if (it->getInt(value, 1))
+ globalUniformSet = value;
+ break;
+ case EatInputAttachment:
+ // input attachment
+ if (it->getInt(value))
+ type.getQualifier().layoutAttachment = value;
+ break;
+ case EatBuiltIn:
+ // PointSize built-in
+ if (it->getString(builtInString, 0, false)) {
+ if (builtInString == "PointSize")
+ type.getQualifier().builtIn = EbvPointSize;
+ }
+ break;
+ case EatPushConstant:
+ // push_constant
+ type.getQualifier().layoutPushConstant = true;
+ break;
+ case EatConstantId:
+ // specialization constant
+ if (it->getInt(value)) {
+ TSourceLoc loc;
+ loc.init();
+ setSpecConstantId(loc, type.getQualifier(), value);
+ }
+ break;
+ default:
+ if (! allowEntry)
+ warn(loc, "attribute does not apply to a type", "", "");
+ break;
+ }
}
}
@@ -1936,7 +1964,7 @@ void HlslParseContext::transferTypeAttributes(const TAttributeMap& attributes, T
// a subtree that creates the entry point.
//
TIntermNode* HlslParseContext::transformEntryPoint(const TSourceLoc& loc, TFunction& userFunction,
- const TAttributeMap& attributes)
+ const TAttributes& attributes)
{
// Return true if this is a tessellation patch constant function input to a domain shader.
const auto isDsPcfInput = [this](const TType& type) {
@@ -8792,29 +8820,75 @@ bool HlslParseContext::handleOutputGeometry(const TSourceLoc& loc, const TLayout
}
//
-// Selection hints
+// Selection attributes
//
-TSelectionControl HlslParseContext::handleSelectionControl(const TAttributeMap& attributes) const
+void HlslParseContext::handleSelectionAttributes(const TSourceLoc& loc, TIntermSelection* selection,
+ const TAttributes& attributes)
{
- if (attributes.contains(EatFlatten))
- return ESelectionControlFlatten;
- else if (attributes.contains(EatBranch))
- return ESelectionControlDontFlatten;
- else
- return ESelectionControlNone;
+ if (selection == nullptr)
+ return;
+
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ switch (it->name) {
+ case EatFlatten:
+ selection->setFlatten();
+ break;
+ case EatBranch:
+ selection->setDontFlatten();
+ break;
+ default:
+ warn(loc, "attribute does not apply to a selection", "", "");
+ break;
+ }
+ }
}
//
-// Loop hints
+// Switch attributes
//
-TLoopControl HlslParseContext::handleLoopControl(const TAttributeMap& attributes) const
+void HlslParseContext::handleSwitchAttributes(const TSourceLoc& loc, TIntermSwitch* selection,
+ const TAttributes& attributes)
{
- if (attributes.contains(EatUnroll))
- return ELoopControlUnroll;
- else if (attributes.contains(EatLoop))
- return ELoopControlDontUnroll;
- else
- return ELoopControlNone;
+ if (selection == nullptr)
+ return;
+
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ switch (it->name) {
+ case EatFlatten:
+ selection->setFlatten();
+ break;
+ case EatBranch:
+ selection->setDontFlatten();
+ break;
+ default:
+ warn(loc, "attribute does not apply to a switch", "", "");
+ break;
+ }
+ }
+}
+
+//
+// Loop attributes
+//
+void HlslParseContext::handleLoopAttributes(const TSourceLoc& loc, TIntermLoop* loop,
+ const TAttributes& attributes)
+{
+ if (loop == nullptr)
+ return;
+
+ for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+ switch (it->name) {
+ case EatUnroll:
+ loop->setUnroll();
+ break;
+ case EatLoop:
+ loop->setDontUnroll();
+ break;
+ default:
+ warn(loc, "attribute does not apply to a loop", "", "");
+ break;
+ }
+ }
}
//
@@ -8959,7 +9033,7 @@ void HlslParseContext::wrapupSwitchSubsequence(TIntermAggregate* statements, TIn
// into a switch node.
//
TIntermNode* HlslParseContext::addSwitch(const TSourceLoc& loc, TIntermTyped* expression,
- TIntermAggregate* lastStatements, TSelectionControl control)
+ TIntermAggregate* lastStatements, const TAttributes& attributes)
{
wrapupSwitchSubsequence(lastStatements, nullptr);
@@ -8986,7 +9060,7 @@ TIntermNode* HlslParseContext::addSwitch(const TSourceLoc& loc, TIntermTyped* ex
TIntermSwitch* switchNode = new TIntermSwitch(expression, body);
switchNode->setLoc(loc);
- switchNode->setSelectionControl(control);
+ handleSwitchAttributes(loc, switchNode, attributes);
return switchNode;
}
diff --git a/hlsl/hlslParseHelper.h b/hlsl/hlslParseHelper.h
index 833eb8e5b8f789c9598628a87f6d1cfa9dd44732..d85bdfa22b71f1c74564a9939ac4a7ade24fd02a 100755
--- a/hlsl/hlslParseHelper.h
+++ b/hlsl/hlslParseHelper.h
@@ -38,12 +38,12 @@
#include "../glslang/MachineIndependent/parseVersions.h"
#include "../glslang/MachineIndependent/ParseHelper.h"
+#include "../glslang/MachineIndependent/attribute.h"
#include <array>
namespace glslang {
-class TAttributeMap; // forward declare
class TFunctionDeclarator;
class HlslParseContext : public TParseContextBase {
@@ -80,10 +80,10 @@ public:
bool isBuiltInMethod(const TSourceLoc&, TIntermTyped* base, const TString& field);
void assignToInterface(TVariable& variable);
void handleFunctionDeclarator(const TSourceLoc&, TFunction& function, bool prototype);
- TIntermAggregate* handleFunctionDefinition(const TSourceLoc&, TFunction&, const TAttributeMap&, TIntermNode*& entryPointTree);
- TIntermNode* transformEntryPoint(const TSourceLoc&, TFunction&, const TAttributeMap&);
- void handleEntryPointAttributes(const TSourceLoc&, const TAttributeMap&);
- void transferTypeAttributes(const TAttributeMap&, TType&);
+ TIntermAggregate* handleFunctionDefinition(const TSourceLoc&, TFunction&, const TAttributes&, TIntermNode*& entryPointTree);
+ TIntermNode* transformEntryPoint(const TSourceLoc&, TFunction&, const TAttributes&);
+ void handleEntryPointAttributes(const TSourceLoc&, const TAttributes&);
+ void transferTypeAttributes(const TSourceLoc&, const TAttributes&, TType&, bool allowEntry = false);
void handleFunctionBody(const TSourceLoc&, TFunction&, TIntermNode* functionBody, TIntermNode*& node);
void remapEntryPointIO(TFunction& function, TVariable*& returnValue, TVector<TVariable*>& inputs, TVector<TVariable*>& outputs);
void remapNonEntryPointIO(TFunction& function);
@@ -163,7 +163,7 @@ public:
void addQualifierToExisting(const TSourceLoc&, TQualifier, TIdentifierList&);
void updateStandaloneQualifierDefaults(const TSourceLoc&, const TPublicType&);
void wrapupSwitchSubsequence(TIntermAggregate* statements, TIntermNode* branchNode);
- TIntermNode* addSwitch(const TSourceLoc&, TIntermTyped* expression, TIntermAggregate* body, TSelectionControl control);
+ TIntermNode* addSwitch(const TSourceLoc&, TIntermTyped* expression, TIntermAggregate* body, const TAttributes&);
void updateImplicitArraySize(const TSourceLoc&, TIntermNode*, int index);
@@ -203,10 +203,11 @@ public:
bool handleInputGeometry(const TSourceLoc&, const TLayoutGeometry& geometry);
// Determine selection control from attributes
- TSelectionControl handleSelectionControl(const TAttributeMap& attributes) const;
+ void handleSelectionAttributes(const TSourceLoc& loc, TIntermSelection*, const TAttributes& attributes);
+ void handleSwitchAttributes(const TSourceLoc& loc, TIntermSwitch*, const TAttributes& attributes);
// Determine loop control from attributes
- TLoopControl handleLoopControl(const TAttributeMap& attributes) const;
+ void handleLoopAttributes(const TSourceLoc& loc, TIntermLoop*, const TAttributes& attributes);
// Share struct buffer deep types
void shareStructBufferType(TType&);
@@ -217,6 +218,8 @@ public:
// Obtain the sampler return type of the given sampler in retType.
void getTextureReturnType(const TSampler& sampler, TType& retType) const;
+ TAttributeType attributeFromName(const TString& nameSpace, const TString& name) const;
+
protected:
struct TFlattenData {
TFlattenData() : nextBinding(TQualifier::layoutBindingEnd),