Skip to content

G
glslang
Commit b10feabc by John Kessenich
Options

Front-end: Non-functional: Move return-value handling from .y to .cpp.

This is to make the real change needed in the next commit easier.
parent 10119719
Showing with 42 additions and 51 deletions
glslang/MachineIndependent/ParseHelper.cpp
...@@ -1199,6 +1199,26 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction ...@@ -1199,6 +1199,26 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
return result; return result;
} }
TIntermNode* TParseContext::handleReturnValue(const TSourceLoc& loc, TIntermTyped* value)
{
functionReturnsValue = true;
if (currentFunctionType->getBasicType() == EbtVoid) {
error(loc, "void function cannot return a value", "return", "");
return intermediate.addBranch(EOpReturn, loc);
} else if (*currentFunctionType != value->getType()) {
TIntermTyped* converted = intermediate.addConversion(EOpReturn, *currentFunctionType, value);
if (converted) {
if (version < 420)
warn(loc, "type conversion on return values was not explicitly allowed until version 420", "return", "");
return intermediate.addBranch(EOpReturn, converted, loc);
} else {
error(loc, "type does not match, or is not convertible to, the function's return type", "return", "");
return intermediate.addBranch(EOpReturn, value, loc);
}
} else
return intermediate.addBranch(EOpReturn, value, loc);
}
// See if the operation is being done in an illegal location. // See if the operation is being done in an illegal location.
void TParseContext::checkLocation(const TSourceLoc& loc, TOperator op) void TParseContext::checkLocation(const TSourceLoc& loc, TOperator op)
{ {
......
glslang/MachineIndependent/ParseHelper.h
...@@ -197,6 +197,7 @@ public: ...@@ -197,6 +197,7 @@ public:
TFunction* handleFunctionDeclarator(const TSourceLoc&, TFunction& function, bool prototype); TFunction* handleFunctionDeclarator(const TSourceLoc&, TFunction& function, bool prototype);
TIntermAggregate* handleFunctionDefinition(const TSourceLoc&, TFunction&); TIntermAggregate* handleFunctionDefinition(const TSourceLoc&, TFunction&);
TIntermTyped* handleFunctionCall(const TSourceLoc&, TFunction*, TIntermNode*); TIntermTyped* handleFunctionCall(const TSourceLoc&, TFunction*, TIntermNode*);
TIntermNode* handleReturnValue(const TSourceLoc&, TIntermTyped*);
void checkLocation(const TSourceLoc&, TOperator); void checkLocation(const TSourceLoc&, TOperator);
TIntermTyped* handleLengthMethod(const TSourceLoc&, TFunction*, TIntermNode*); TIntermTyped* handleLengthMethod(const TSourceLoc&, TFunction*, TIntermNode*);
void addInputArgumentConversions(const TFunction&, TIntermNode*&) const; void addInputArgumentConversions(const TFunction&, TIntermNode*&) const;
......
glslang/MachineIndependent/glslang.y
...@@ -2633,22 +2633,7 @@ jump_statement ...@@ -2633,22 +2633,7 @@ jump_statement
parseContext.postMainReturn = true; parseContext.postMainReturn = true;
} }
| RETURN expression SEMICOLON { | RETURN expression SEMICOLON {
parseContext.functionReturnsValue = true; $$ = parseContext.handleReturnValue($1.loc, $2);
if (parseContext.currentFunctionType->getBasicType() == EbtVoid) {
parseContext.error($1.loc, "void function cannot return a value", "return", "");
$$ = parseContext.intermediate.addBranch(EOpReturn, $1.loc);
} else if (*(parseContext.currentFunctionType) != $2->getType()) {
TIntermTyped* converted = parseContext.intermediate.addConversion(EOpReturn, *parseContext.currentFunctionType, $2);
if (converted) {
if (parseContext.version < 420)
parseContext.warn($1.loc, "type conversion on return values was not explicitly allowed until version 420", "return", "");
$$ = parseContext.intermediate.addBranch(EOpReturn, converted, $1.loc);
} else {
parseContext.error($1.loc, "type does not match, or is not convertible to, the function's return type", "return", "");
$$ = parseContext.intermediate.addBranch(EOpReturn, $2, $1.loc);
}
} else
$$ = parseContext.intermediate.addBranch(EOpReturn, $2, $1.loc);
} }
| DISCARD SEMICOLON { | DISCARD SEMICOLON {
parseContext.requireStage($1.loc, EShLangFragment, "discard"); parseContext.requireStage($1.loc, EShLangFragment, "discard");
......
glslang/MachineIndependent/glslang_tab.cpp
...@@ -827,8 +827,8 @@ static const yytype_uint16 yyrline[] = ...@@ -827,8 +827,8 @@ static const yytype_uint16 yyrline[] =
2399, 2399, 2413, 2416, 2424, 2432, 2443, 2444, 2448, 2455, 2399, 2399, 2413, 2416, 2424, 2432, 2443, 2444, 2448, 2455,
2459, 2467, 2471, 2484, 2484, 2504, 2507, 2513, 2525, 2537, 2459, 2467, 2471, 2484, 2484, 2504, 2507, 2513, 2525, 2537,
2537, 2552, 2552, 2568, 2568, 2589, 2592, 2598, 2601, 2607, 2537, 2552, 2552, 2568, 2568, 2589, 2592, 2598, 2601, 2607,
2611, 2618, 2623, 2628, 2635, 2653, 2662, 2666, 2673, 2676, 2611, 2618, 2623, 2628, 2635, 2638, 2647, 2651, 2658, 2661,
2682, 2682 2667, 2667
}; };
#endif #endif
...@@ -7360,80 +7360,65 @@ yyreduce: ...@@ -7360,80 +7360,65 @@ yyreduce:
case 414: case 414:
#line 2635 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2635 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.functionReturnsValue = true; (yyval.interm.intermNode) = parseContext.handleReturnValue((yyvsp[-2].lex).loc, (yyvsp[-1].interm.intermTypedNode));
if (parseContext.currentFunctionType->getBasicType() == EbtVoid) {
parseContext.error((yyvsp[-2].lex).loc, "void function cannot return a value", "return", "");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpReturn, (yyvsp[-2].lex).loc);
} else if (*(parseContext.currentFunctionType) != (yyvsp[-1].interm.intermTypedNode)->getType()) {
TIntermTyped* converted = parseContext.intermediate.addConversion(EOpReturn, *parseContext.currentFunctionType, (yyvsp[-1].interm.intermTypedNode));
if (converted) {
if (parseContext.version < 420)
parseContext.warn((yyvsp[-2].lex).loc, "type conversion on return values was not explicitly allowed until version 420", "return", "");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpReturn, converted, (yyvsp[-2].lex).loc);
} else {
parseContext.error((yyvsp[-2].lex).loc, "type does not match, or is not convertible to, the function's return type", "return", "");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpReturn, (yyvsp[-1].interm.intermTypedNode), (yyvsp[-2].lex).loc);
}
} else
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpReturn, (yyvsp[-1].interm.intermTypedNode), (yyvsp[-2].lex).loc);
} }
#line 7381 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7366 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
case 415: case 415:
#line 2653 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2638 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.requireStage((yyvsp[-1].lex).loc, EShLangFragment, "discard"); parseContext.requireStage((yyvsp[-1].lex).loc, EShLangFragment, "discard");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpKill, (yyvsp[-1].lex).loc); (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpKill, (yyvsp[-1].lex).loc);
} }
#line 7390 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7375 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
case 416: case 416:
#line 2662 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2647 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
parseContext.intermediate.setTreeRoot((yyval.interm.intermNode)); parseContext.intermediate.setTreeRoot((yyval.interm.intermNode));
} }
#line 7399 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7384 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
case 417: case 417:
#line 2666 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2651 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
(yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode)); (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode));
parseContext.intermediate.setTreeRoot((yyval.interm.intermNode)); parseContext.intermediate.setTreeRoot((yyval.interm.intermNode));
} }
#line 7408 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7393 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
case 418: case 418:
#line 2673 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2658 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
} }
#line 7416 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7401 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
case 419: case 419:
#line 2676 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2661 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
} }
#line 7424 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7409 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
case 420: case 420:
#line 2682 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2667 "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).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); (yyvsp[0].interm).intermNode = parseContext.handleFunctionDefinition((yyvsp[0].interm).loc, *(yyvsp[0].interm).function);
} }
#line 7433 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7418 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
case 421: case 421:
#line 2686 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2671 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
// May be best done as post process phase on intermediate code // May be best done as post process phase on intermediate code
if (parseContext.currentFunctionType->getBasicType() != EbtVoid && ! parseContext.functionReturnsValue) if (parseContext.currentFunctionType->getBasicType() != EbtVoid && ! parseContext.functionReturnsValue)
...@@ -7449,11 +7434,11 @@ yyreduce: ...@@ -7449,11 +7434,11 @@ yyreduce:
(yyval.interm.intermNode)->getAsAggregate()->setDebug(parseContext.contextPragma.debug); (yyval.interm.intermNode)->getAsAggregate()->setDebug(parseContext.contextPragma.debug);
(yyval.interm.intermNode)->getAsAggregate()->addToPragmaTable(parseContext.contextPragma.pragmaTable); (yyval.interm.intermNode)->getAsAggregate()->addToPragmaTable(parseContext.contextPragma.pragmaTable);
} }
#line 7453 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7438 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
#line 7457 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7442 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
default: break; default: break;
} }
/* User semantic actions sometimes alter yychar, and that requires /* User semantic actions sometimes alter yychar, and that requires
...@@ -7681,5 +7666,5 @@ yyreturn: ...@@ -7681,5 +7666,5 @@ yyreturn:
#endif #endif
return yyresult; return yyresult;
} }
#line 2703 "MachineIndependent/glslang.y" /* yacc.c:1906 */ #line 2688 "MachineIndependent/glslang.y" /* yacc.c:1906 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment