From f29924308fd244707badfc09e8e17ff83980a341 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Fri, 26 Nov 2010 14:24:03 +0100 Subject: [PATCH] Added Engine::blockDiagnosticMessages() --- src/libs/glsl/glsl.g | 12 +- src/libs/glsl/glslengine.cpp | 11 +- src/libs/glsl/glslengine.h | 2 + src/libs/glsl/glsllexer.cpp | 12 +- src/libs/glsl/glslparser.cpp | 632 +++++++++++++++++++++---------------------- src/libs/glsl/glslparser.h | 12 +- 6 files changed, 334 insertions(+), 347 deletions(-) diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g index deae342c44..8d2ff92e42 100644 --- a/src/libs/glsl/glsl.g +++ b/src/libs/glsl/glsl.g @@ -320,20 +320,12 @@ private: void warning(int line, const QString &message) { - DiagnosticMessage m; - m.setKind(DiagnosticMessage::Warning); - m.setLine(line); - m.setMessage(message); - _engine->addDiagnosticMessage(m); + _engine->warning(line, message); } void error(int line, const QString &message) { - DiagnosticMessage m; - m.setKind(DiagnosticMessage::Error); - m.setLine(line); - m.setMessage(message); - _engine->addDiagnosticMessage(m); + _engine->error(line, message); } template diff --git a/src/libs/glsl/glslengine.cpp b/src/libs/glsl/glslengine.cpp index 31078dda86..2c6b228cfe 100644 --- a/src/libs/glsl/glslengine.cpp +++ b/src/libs/glsl/glslengine.cpp @@ -80,6 +80,7 @@ void DiagnosticMessage::setMessage(const QString &message) } Engine::Engine() + : _blockDiagnosticMessages(false) { } @@ -176,7 +177,8 @@ void Engine::clearDiagnosticMessages() void Engine::addDiagnosticMessage(const DiagnosticMessage &m) { - _diagnosticMessages.append(m); + if (! _blockDiagnosticMessages) + _diagnosticMessages.append(m); } void Engine::warning(int line, const QString &message) @@ -258,3 +260,10 @@ Variable *Engine::newVariable(Scope *scope, const QString &name, const Type *typ return var; } +bool Engine::blockDiagnosticMessages(bool block) +{ + bool previous = _blockDiagnosticMessages; + _blockDiagnosticMessages = block; + return previous; +} + diff --git a/src/libs/glsl/glslengine.h b/src/libs/glsl/glslengine.h index ffeb3d9ed0..b348042e6d 100644 --- a/src/libs/glsl/glslengine.h +++ b/src/libs/glsl/glslengine.h @@ -120,6 +120,7 @@ public: MemoryPool *pool(); + bool blockDiagnosticMessages(bool block); QList diagnosticMessages() const; void clearDiagnosticMessages(); void addDiagnosticMessage(const DiagnosticMessage &m); @@ -134,6 +135,7 @@ private: MemoryPool _pool; QList _diagnosticMessages; QList _symbols; + bool _blockDiagnosticMessages; }; } // namespace GLSL diff --git a/src/libs/glsl/glsllexer.cpp b/src/libs/glsl/glsllexer.cpp index 232ab46a28..3651d94f5d 100644 --- a/src/libs/glsl/glsllexer.cpp +++ b/src/libs/glsl/glsllexer.cpp @@ -404,18 +404,10 @@ int Lexer::findKeyword(const char *word, int length) const void Lexer::warning(int line, const QString &message) { - DiagnosticMessage m; - m.setKind(DiagnosticMessage::Warning); - m.setLine(line); - m.setMessage(message); - _engine->addDiagnosticMessage(m); + _engine->warning(line, message); } void Lexer::error(int line, const QString &message) { - DiagnosticMessage m; - m.setKind(DiagnosticMessage::Error); - m.setLine(line); - m.setMessage(message); - _engine->addDiagnosticMessage(m); + _engine->error(line, message); } diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp index d856ad5242..7285056b8c 100644 --- a/src/libs/glsl/glslparser.cpp +++ b/src/libs/glsl/glslparser.cpp @@ -1,5 +1,5 @@ -#line 400 "./glsl.g" +#line 392 "./glsl.g" /************************************************************************** ** @@ -168,137 +168,137 @@ TranslationUnitAST *Parser::parse() return 0; } -#line 571 "./glsl.g" +#line 563 "./glsl.g" void Parser::reduce(int ruleno) { switch(ruleno) { -#line 580 "./glsl.g" +#line 572 "./glsl.g" case 0: { ast(1) = makeAstNode(string(1)); } break; -#line 587 "./glsl.g" +#line 579 "./glsl.g" case 1: { ast(1) = makeAstNode(string(1)); } break; -#line 594 "./glsl.g" +#line 586 "./glsl.g" case 2: { ast(1) = makeAstNode(_engine->identifier("true", 4)); } break; -#line 601 "./glsl.g" +#line 593 "./glsl.g" case 3: { ast(1) = makeAstNode(_engine->identifier("false", 5)); } break; -#line 608 "./glsl.g" +#line 600 "./glsl.g" case 4: { // nothing to do. } break; -#line 615 "./glsl.g" +#line 607 "./glsl.g" case 5: { ast(1) = ast(2); } break; -#line 622 "./glsl.g" +#line 614 "./glsl.g" case 6: { // nothing to do. } break; -#line 629 "./glsl.g" +#line 621 "./glsl.g" case 7: { ast(1) = makeAstNode(AST::Kind_ArrayAccess, expression(1), expression(3)); } break; -#line 636 "./glsl.g" +#line 628 "./glsl.g" case 8: { // nothing to do. } break; -#line 643 "./glsl.g" +#line 635 "./glsl.g" case 9: { ast(1) = makeAstNode(expression(1), string(3)); } break; -#line 650 "./glsl.g" +#line 642 "./glsl.g" case 10: { ast(1) = makeAstNode(AST::Kind_PostIncrement, expression(1)); } break; -#line 657 "./glsl.g" +#line 649 "./glsl.g" case 11: { ast(1) = makeAstNode(AST::Kind_PostDecrement, expression(1)); } break; -#line 664 "./glsl.g" +#line 656 "./glsl.g" case 12: { // nothing to do. } break; -#line 671 "./glsl.g" +#line 663 "./glsl.g" case 13: { // nothing to do. } break; -#line 678 "./glsl.g" +#line 670 "./glsl.g" case 14: { ast(1) = makeAstNode (sym(1).function.id, sym(1).function.arguments); } break; -#line 686 "./glsl.g" +#line 678 "./glsl.g" case 15: { ast(1) = makeAstNode (expression(1), sym(3).function.id, sym(3).function.arguments); } break; -#line 694 "./glsl.g" +#line 686 "./glsl.g" case 16: { // nothing to do. } break; -#line 701 "./glsl.g" +#line 693 "./glsl.g" case 17: { // nothing to do. } break; -#line 708 "./glsl.g" +#line 700 "./glsl.g" case 18: { sym(1).function.id = sym(1).function_identifier; sym(1).function.arguments = 0; } break; -#line 716 "./glsl.g" +#line 708 "./glsl.g" case 19: { sym(1).function.id = sym(1).function_identifier; sym(1).function.arguments = 0; } break; -#line 724 "./glsl.g" +#line 716 "./glsl.g" case 20: { sym(1).function.id = sym(1).function_identifier; @@ -306,7 +306,7 @@ case 20: { makeAstNode< List >(expression(2)); } break; -#line 733 "./glsl.g" +#line 725 "./glsl.g" case 21: { sym(1).function.arguments = @@ -314,379 +314,379 @@ case 21: { (sym(1).function.arguments, expression(3)); } break; -#line 742 "./glsl.g" +#line 734 "./glsl.g" case 22: { // nothing to do. } break; -#line 749 "./glsl.g" +#line 741 "./glsl.g" case 23: { ast(1) = makeAstNode(type(1)); } break; -#line 756 "./glsl.g" +#line 748 "./glsl.g" case 24: { ast(1) = makeAstNode(string(1)); } break; -#line 763 "./glsl.g" +#line 755 "./glsl.g" case 25: { // nothing to do. } break; -#line 770 "./glsl.g" +#line 762 "./glsl.g" case 26: { ast(1) = makeAstNode(AST::Kind_PreIncrement, expression(2)); } break; -#line 777 "./glsl.g" +#line 769 "./glsl.g" case 27: { ast(1) = makeAstNode(AST::Kind_PreDecrement, expression(2)); } break; -#line 784 "./glsl.g" +#line 776 "./glsl.g" case 28: { ast(1) = makeAstNode(sym(1).kind, expression(2)); } break; -#line 791 "./glsl.g" +#line 783 "./glsl.g" case 29: { sym(1).kind = AST::Kind_UnaryPlus; } break; -#line 798 "./glsl.g" +#line 790 "./glsl.g" case 30: { sym(1).kind = AST::Kind_UnaryMinus; } break; -#line 805 "./glsl.g" +#line 797 "./glsl.g" case 31: { sym(1).kind = AST::Kind_LogicalNot; } break; -#line 812 "./glsl.g" +#line 804 "./glsl.g" case 32: { sym(1).kind = AST::Kind_BitwiseNot; } break; -#line 819 "./glsl.g" +#line 811 "./glsl.g" case 33: { // nothing to do. } break; -#line 826 "./glsl.g" +#line 818 "./glsl.g" case 34: { ast(1) = makeAstNode(AST::Kind_Multiply, expression(1), expression(3)); } break; -#line 833 "./glsl.g" +#line 825 "./glsl.g" case 35: { ast(1) = makeAstNode(AST::Kind_Divide, expression(1), expression(3)); } break; -#line 840 "./glsl.g" +#line 832 "./glsl.g" case 36: { ast(1) = makeAstNode(AST::Kind_Modulus, expression(1), expression(3)); } break; -#line 847 "./glsl.g" +#line 839 "./glsl.g" case 37: { // nothing to do. } break; -#line 854 "./glsl.g" +#line 846 "./glsl.g" case 38: { ast(1) = makeAstNode(AST::Kind_Plus, expression(1), expression(3)); } break; -#line 861 "./glsl.g" +#line 853 "./glsl.g" case 39: { ast(1) = makeAstNode(AST::Kind_Minus, expression(1), expression(3)); } break; -#line 868 "./glsl.g" +#line 860 "./glsl.g" case 40: { // nothing to do. } break; -#line 875 "./glsl.g" +#line 867 "./glsl.g" case 41: { ast(1) = makeAstNode(AST::Kind_ShiftLeft, expression(1), expression(3)); } break; -#line 882 "./glsl.g" +#line 874 "./glsl.g" case 42: { ast(1) = makeAstNode(AST::Kind_ShiftRight, expression(1), expression(3)); } break; -#line 889 "./glsl.g" +#line 881 "./glsl.g" case 43: { // nothing to do. } break; -#line 896 "./glsl.g" +#line 888 "./glsl.g" case 44: { ast(1) = makeAstNode(AST::Kind_LessThan, expression(1), expression(3)); } break; -#line 903 "./glsl.g" +#line 895 "./glsl.g" case 45: { ast(1) = makeAstNode(AST::Kind_GreaterThan, expression(1), expression(3)); } break; -#line 910 "./glsl.g" +#line 902 "./glsl.g" case 46: { ast(1) = makeAstNode(AST::Kind_LessEqual, expression(1), expression(3)); } break; -#line 917 "./glsl.g" +#line 909 "./glsl.g" case 47: { ast(1) = makeAstNode(AST::Kind_GreaterEqual, expression(1), expression(3)); } break; -#line 924 "./glsl.g" +#line 916 "./glsl.g" case 48: { // nothing to do. } break; -#line 931 "./glsl.g" +#line 923 "./glsl.g" case 49: { ast(1) = makeAstNode(AST::Kind_Equal, expression(1), expression(3)); } break; -#line 938 "./glsl.g" +#line 930 "./glsl.g" case 50: { ast(1) = makeAstNode(AST::Kind_NotEqual, expression(1), expression(3)); } break; -#line 945 "./glsl.g" +#line 937 "./glsl.g" case 51: { // nothing to do. } break; -#line 952 "./glsl.g" +#line 944 "./glsl.g" case 52: { ast(1) = makeAstNode(AST::Kind_BitwiseAnd, expression(1), expression(3)); } break; -#line 959 "./glsl.g" +#line 951 "./glsl.g" case 53: { // nothing to do. } break; -#line 966 "./glsl.g" +#line 958 "./glsl.g" case 54: { ast(1) = makeAstNode(AST::Kind_BitwiseXor, expression(1), expression(3)); } break; -#line 973 "./glsl.g" +#line 965 "./glsl.g" case 55: { // nothing to do. } break; -#line 980 "./glsl.g" +#line 972 "./glsl.g" case 56: { ast(1) = makeAstNode(AST::Kind_BitwiseOr, expression(1), expression(3)); } break; -#line 987 "./glsl.g" +#line 979 "./glsl.g" case 57: { // nothing to do. } break; -#line 994 "./glsl.g" +#line 986 "./glsl.g" case 58: { ast(1) = makeAstNode(AST::Kind_LogicalAnd, expression(1), expression(3)); } break; -#line 1001 "./glsl.g" +#line 993 "./glsl.g" case 59: { // nothing to do. } break; -#line 1008 "./glsl.g" +#line 1000 "./glsl.g" case 60: { ast(1) = makeAstNode(AST::Kind_LogicalXor, expression(1), expression(3)); } break; -#line 1015 "./glsl.g" +#line 1007 "./glsl.g" case 61: { // nothing to do. } break; -#line 1022 "./glsl.g" +#line 1014 "./glsl.g" case 62: { ast(1) = makeAstNode(AST::Kind_LogicalOr, expression(1), expression(3)); } break; -#line 1029 "./glsl.g" +#line 1021 "./glsl.g" case 63: { // nothing to do. } break; -#line 1036 "./glsl.g" +#line 1028 "./glsl.g" case 64: { ast(1) = makeAstNode(AST::Kind_Conditional, expression(1), expression(3), expression(5)); } break; -#line 1043 "./glsl.g" +#line 1035 "./glsl.g" case 65: { // nothing to do. } break; -#line 1050 "./glsl.g" +#line 1042 "./glsl.g" case 66: { ast(1) = makeAstNode(sym(2).kind, expression(1), expression(3)); } break; -#line 1057 "./glsl.g" +#line 1049 "./glsl.g" case 67: { sym(1).kind = AST::Kind_Assign; } break; -#line 1064 "./glsl.g" +#line 1056 "./glsl.g" case 68: { sym(1).kind = AST::Kind_AssignMultiply; } break; -#line 1071 "./glsl.g" +#line 1063 "./glsl.g" case 69: { sym(1).kind = AST::Kind_AssignDivide; } break; -#line 1078 "./glsl.g" +#line 1070 "./glsl.g" case 70: { sym(1).kind = AST::Kind_AssignModulus; } break; -#line 1085 "./glsl.g" +#line 1077 "./glsl.g" case 71: { sym(1).kind = AST::Kind_AssignPlus; } break; -#line 1092 "./glsl.g" +#line 1084 "./glsl.g" case 72: { sym(1).kind = AST::Kind_AssignMinus; } break; -#line 1099 "./glsl.g" +#line 1091 "./glsl.g" case 73: { sym(1).kind = AST::Kind_AssignShiftLeft; } break; -#line 1106 "./glsl.g" +#line 1098 "./glsl.g" case 74: { sym(1).kind = AST::Kind_AssignShiftRight; } break; -#line 1113 "./glsl.g" +#line 1105 "./glsl.g" case 75: { sym(1).kind = AST::Kind_AssignAnd; } break; -#line 1120 "./glsl.g" +#line 1112 "./glsl.g" case 76: { sym(1).kind = AST::Kind_AssignXor; } break; -#line 1127 "./glsl.g" +#line 1119 "./glsl.g" case 77: { sym(1).kind = AST::Kind_AssignOr; } break; -#line 1134 "./glsl.g" +#line 1126 "./glsl.g" case 78: { // nothing to do. } break; -#line 1141 "./glsl.g" +#line 1133 "./glsl.g" case 79: { ast(1) = makeAstNode(AST::Kind_Comma, expression(1), expression(3)); } break; -#line 1148 "./glsl.g" +#line 1140 "./glsl.g" case 80: { // nothing to do. } break; -#line 1155 "./glsl.g" +#line 1147 "./glsl.g" case 81: { // nothing to do. } break; -#line 1162 "./glsl.g" +#line 1154 "./glsl.g" case 82: { ast(1) = makeAstNode(sym(1).declaration_list); } break; -#line 1169 "./glsl.g" +#line 1161 "./glsl.g" case 83: { ast(1) = makeAstNode(sym(2).precision, type(3)); } break; -#line 1176 "./glsl.g" +#line 1168 "./glsl.g" case 84: { if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) { @@ -696,7 +696,7 @@ case 84: { ast(1) = makeAstNode(type); } break; -#line 1187 "./glsl.g" +#line 1179 "./glsl.g" case 85: { if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { @@ -714,7 +714,7 @@ case 85: { makeAstNode(qualtype, string(6))); } break; -#line 1206 "./glsl.g" +#line 1198 "./glsl.g" case 86: { if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { @@ -733,7 +733,7 @@ case 86: { (makeAstNode(qualtype), string(6))); } break; -#line 1226 "./glsl.g" +#line 1218 "./glsl.g" case 87: { if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { @@ -752,7 +752,7 @@ case 87: { (makeAstNode(qualtype, expression(8)), string(6))); } break; -#line 1246 "./glsl.g" +#line 1238 "./glsl.g" case 88: { TypeAST *type = makeAstNode @@ -761,59 +761,59 @@ case 88: { ast(1) = makeAstNode(type); } break; -#line 1256 "./glsl.g" +#line 1248 "./glsl.g" case 89: { function(1)->finishParams(); } break; -#line 1263 "./glsl.g" +#line 1255 "./glsl.g" case 90: { // nothing to do. } break; -#line 1270 "./glsl.g" +#line 1262 "./glsl.g" case 91: { // nothing to do. } break; -#line 1277 "./glsl.g" +#line 1269 "./glsl.g" case 92: { function(1)->params = makeAstNode< List > (sym(2).param_declaration); } break; -#line 1285 "./glsl.g" +#line 1277 "./glsl.g" case 93: { function(1)->params = makeAstNode< List > (function(1)->params, sym(3).param_declaration); } break; -#line 1293 "./glsl.g" +#line 1285 "./glsl.g" case 94: { function(1) = makeAstNode(type(1), string(2)); } break; -#line 1300 "./glsl.g" +#line 1292 "./glsl.g" case 95: { sym(1).param_declarator.type = type(1); sym(1).param_declarator.name = string(2); } break; -#line 1308 "./glsl.g" +#line 1300 "./glsl.g" case 96: { sym(1).param_declarator.type = makeAstNode(type(1), expression(4)); sym(1).param_declarator.name = string(2); } break; -#line 1316 "./glsl.g" +#line 1308 "./glsl.g" case 97: { ast(1) = makeAstNode @@ -824,7 +824,7 @@ case 97: { sym(3).param_declarator.name); } break; -#line 1328 "./glsl.g" +#line 1320 "./glsl.g" case 98: { ast(1) = makeAstNode @@ -833,7 +833,7 @@ case 98: { sym(2).param_declarator.name); } break; -#line 1338 "./glsl.g" +#line 1330 "./glsl.g" case 99: { ast(1) = makeAstNode @@ -843,7 +843,7 @@ case 99: { (const QString *)0); } break; -#line 1349 "./glsl.g" +#line 1341 "./glsl.g" case 100: { ast(1) = makeAstNode @@ -851,44 +851,44 @@ case 100: { (const QString *)0); } break; -#line 1358 "./glsl.g" +#line 1350 "./glsl.g" case 101: { sym(1).qualifier = ParameterDeclarationAST::In; } break; -#line 1365 "./glsl.g" +#line 1357 "./glsl.g" case 102: { sym(1).qualifier = ParameterDeclarationAST::In; } break; -#line 1372 "./glsl.g" +#line 1364 "./glsl.g" case 103: { sym(1).qualifier = ParameterDeclarationAST::Out; } break; -#line 1379 "./glsl.g" +#line 1371 "./glsl.g" case 104: { sym(1).qualifier = ParameterDeclarationAST::InOut; } break; -#line 1386 "./glsl.g" +#line 1378 "./glsl.g" case 105: { // nothing to do. } break; -#line 1393 "./glsl.g" +#line 1385 "./glsl.g" case 106: { sym(1).declaration_list = makeAstNode< List > (sym(1).declaration); } break; -#line 1401 "./glsl.g" +#line 1393 "./glsl.g" case 107: { TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); @@ -897,7 +897,7 @@ case 107: { (sym(1).declaration_list, decl); } break; -#line 1411 "./glsl.g" +#line 1403 "./glsl.g" case 108: { TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); @@ -907,7 +907,7 @@ case 108: { (sym(1).declaration_list, decl); } break; -#line 1422 "./glsl.g" +#line 1414 "./glsl.g" case 109: { TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); @@ -917,7 +917,7 @@ case 109: { (sym(1).declaration_list, decl); } break; -#line 1433 "./glsl.g" +#line 1425 "./glsl.g" case 110: { TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); @@ -928,7 +928,7 @@ case 110: { (sym(1).declaration_list, decl); } break; -#line 1445 "./glsl.g" +#line 1437 "./glsl.g" case 111: { TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); @@ -939,7 +939,7 @@ case 111: { (sym(1).declaration_list, decl); } break; -#line 1457 "./glsl.g" +#line 1449 "./glsl.g" case 112: { TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); @@ -949,40 +949,40 @@ case 112: { (sym(1).declaration_list, decl); } break; -#line 1468 "./glsl.g" +#line 1460 "./glsl.g" case 113: { ast(1) = makeAstNode(type(1)); } break; -#line 1475 "./glsl.g" +#line 1467 "./glsl.g" case 114: { ast(1) = makeAstNode(type(1), string(2)); } break; -#line 1482 "./glsl.g" +#line 1474 "./glsl.g" case 115: { ast(1) = makeAstNode (makeAstNode(type(1)), string(2)); } break; -#line 1490 "./glsl.g" +#line 1482 "./glsl.g" case 116: { ast(1) = makeAstNode (makeAstNode(type(1), expression(4)), string(2)); } break; -#line 1498 "./glsl.g" +#line 1490 "./glsl.g" case 117: { ast(1) = makeAstNode (makeAstNode(type(1)), string(2), expression(6)); } break; -#line 1506 "./glsl.g" +#line 1498 "./glsl.g" case 118: { ast(1) = makeAstNode @@ -990,26 +990,26 @@ case 118: { string(2), expression(7)); } break; -#line 1515 "./glsl.g" +#line 1507 "./glsl.g" case 119: { ast(1) = makeAstNode (type(1), string(2), expression(4)); } break; -#line 1523 "./glsl.g" +#line 1515 "./glsl.g" case 120: { ast(1) = makeAstNode(string(2)); } break; -#line 1530 "./glsl.g" +#line 1522 "./glsl.g" case 121: { ast(1) = makeAstNode(0, type(1), (List *)0); } break; -#line 1537 "./glsl.g" +#line 1529 "./glsl.g" case 122: { ast(1) = makeAstNode @@ -1017,207 +1017,207 @@ case 122: { sym(1).type_qualifier.layout_list); } break; -#line 1546 "./glsl.g" +#line 1538 "./glsl.g" case 123: { sym(1).qualifier = QualifiedTypeAST::Invariant; } break; -#line 1553 "./glsl.g" +#line 1545 "./glsl.g" case 124: { sym(1).qualifier = QualifiedTypeAST::Smooth; } break; -#line 1560 "./glsl.g" +#line 1552 "./glsl.g" case 125: { sym(1).qualifier = QualifiedTypeAST::Flat; } break; -#line 1567 "./glsl.g" +#line 1559 "./glsl.g" case 126: { sym(1).qualifier = QualifiedTypeAST::NoPerspective; } break; -#line 1574 "./glsl.g" +#line 1566 "./glsl.g" case 127: { sym(1) = sym(3); } break; -#line 1581 "./glsl.g" +#line 1573 "./glsl.g" case 128: { sym(1).layout_list = makeAstNode< List >(sym(1).layout); } break; -#line 1588 "./glsl.g" +#line 1580 "./glsl.g" case 129: { sym(1).layout_list = makeAstNode< List >(sym(1).layout_list, sym(3).layout); } break; -#line 1595 "./glsl.g" +#line 1587 "./glsl.g" case 130: { sym(1).layout = makeAstNode(string(1), (const QString *)0); } break; -#line 1602 "./glsl.g" +#line 1594 "./glsl.g" case 131: { sym(1).layout = makeAstNode(string(1), string(3)); } break; -#line 1609 "./glsl.g" +#line 1601 "./glsl.g" case 132: { sym(1).qualifier = QualifiedTypeAST::Const; } break; -#line 1616 "./glsl.g" +#line 1608 "./glsl.g" case 133: { sym(1).type_qualifier.qualifier = sym(1).qualifier; sym(1).type_qualifier.layout_list = 0; } break; -#line 1624 "./glsl.g" +#line 1616 "./glsl.g" case 134: { sym(1).type_qualifier.layout_list = sym(1).layout_list; sym(1).type_qualifier.qualifier = 0; } break; -#line 1632 "./glsl.g" +#line 1624 "./glsl.g" case 135: { sym(1).type_qualifier.layout_list = sym(1).layout_list; sym(1).type_qualifier.qualifier = sym(2).qualifier; } break; -#line 1640 "./glsl.g" +#line 1632 "./glsl.g" case 136: { sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; sym(1).type_qualifier.layout_list = 0; } break; -#line 1648 "./glsl.g" +#line 1640 "./glsl.g" case 137: { sym(1).type_qualifier.qualifier = sym(1).qualifier; sym(1).type_qualifier.layout_list = 0; } break; -#line 1656 "./glsl.g" +#line 1648 "./glsl.g" case 138: { sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; sym(1).type_qualifier.layout_list = 0; } break; -#line 1664 "./glsl.g" +#line 1656 "./glsl.g" case 139: { sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier; sym(1).type_qualifier.layout_list = 0; } break; -#line 1672 "./glsl.g" +#line 1664 "./glsl.g" case 140: { sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant; sym(1).type_qualifier.layout_list = 0; } break; -#line 1680 "./glsl.g" +#line 1672 "./glsl.g" case 141: { sym(1).qualifier = QualifiedTypeAST::Const; } break; -#line 1687 "./glsl.g" +#line 1679 "./glsl.g" case 142: { sym(1).qualifier = QualifiedTypeAST::Attribute; } break; -#line 1694 "./glsl.g" +#line 1686 "./glsl.g" case 143: { sym(1).qualifier = QualifiedTypeAST::Varying; } break; -#line 1701 "./glsl.g" +#line 1693 "./glsl.g" case 144: { sym(1).qualifier = QualifiedTypeAST::CentroidVarying; } break; -#line 1708 "./glsl.g" +#line 1700 "./glsl.g" case 145: { sym(1).qualifier = QualifiedTypeAST::In; } break; -#line 1715 "./glsl.g" +#line 1707 "./glsl.g" case 146: { sym(1).qualifier = QualifiedTypeAST::Out; } break; -#line 1722 "./glsl.g" +#line 1714 "./glsl.g" case 147: { sym(1).qualifier = QualifiedTypeAST::CentroidIn; } break; -#line 1729 "./glsl.g" +#line 1721 "./glsl.g" case 148: { sym(1).qualifier = QualifiedTypeAST::CentroidOut; } break; -#line 1736 "./glsl.g" +#line 1728 "./glsl.g" case 149: { sym(1).qualifier = QualifiedTypeAST::PatchIn; } break; -#line 1743 "./glsl.g" +#line 1735 "./glsl.g" case 150: { sym(1).qualifier = QualifiedTypeAST::PatchOut; } break; -#line 1750 "./glsl.g" +#line 1742 "./glsl.g" case 151: { sym(1).qualifier = QualifiedTypeAST::SampleIn; } break; -#line 1757 "./glsl.g" +#line 1749 "./glsl.g" case 152: { sym(1).qualifier = QualifiedTypeAST::SampleOut; } break; -#line 1764 "./glsl.g" +#line 1756 "./glsl.g" case 153: { sym(1).qualifier = QualifiedTypeAST::Uniform; } break; -#line 1771 "./glsl.g" +#line 1763 "./glsl.g" case 154: { // nothing to do. } break; -#line 1778 "./glsl.g" +#line 1770 "./glsl.g" case 155: { if (!type(2)->setPrecision(sym(1).precision)) { @@ -1226,595 +1226,595 @@ case 155: { ast(1) = type(2); } break; -#line 1788 "./glsl.g" +#line 1780 "./glsl.g" case 156: { // nothing to do. } break; -#line 1795 "./glsl.g" +#line 1787 "./glsl.g" case 157: { ast(1) = makeAstNode(type(1)); } break; -#line 1802 "./glsl.g" +#line 1794 "./glsl.g" case 158: { ast(1) = makeAstNode(type(1), expression(3)); } break; -#line 1809 "./glsl.g" +#line 1801 "./glsl.g" case 159: { ast(1) = makeBasicType(T_VOID, TypeAST::Void); } break; -#line 1816 "./glsl.g" +#line 1808 "./glsl.g" case 160: { ast(1) = makeBasicType(T_FLOAT, TypeAST::Primitive); } break; -#line 1823 "./glsl.g" +#line 1815 "./glsl.g" case 161: { ast(1) = makeBasicType(T_DOUBLE, TypeAST::Primitive); } break; -#line 1830 "./glsl.g" +#line 1822 "./glsl.g" case 162: { ast(1) = makeBasicType(T_INT, TypeAST::Primitive); } break; -#line 1837 "./glsl.g" +#line 1829 "./glsl.g" case 163: { ast(1) = makeBasicType(T_UINT, TypeAST::Primitive); } break; -#line 1844 "./glsl.g" +#line 1836 "./glsl.g" case 164: { ast(1) = makeBasicType(T_BOOL, TypeAST::Primitive); } break; -#line 1851 "./glsl.g" +#line 1843 "./glsl.g" case 165: { ast(1) = makeBasicType(T_VEC2, TypeAST::Vector2); } break; -#line 1858 "./glsl.g" +#line 1850 "./glsl.g" case 166: { ast(1) = makeBasicType(T_VEC3, TypeAST::Vector3); } break; -#line 1865 "./glsl.g" +#line 1857 "./glsl.g" case 167: { ast(1) = makeBasicType(T_VEC4, TypeAST::Vector4); } break; -#line 1872 "./glsl.g" +#line 1864 "./glsl.g" case 168: { ast(1) = makeBasicType(T_DVEC2, TypeAST::Vector2); } break; -#line 1879 "./glsl.g" +#line 1871 "./glsl.g" case 169: { ast(1) = makeBasicType(T_DVEC3, TypeAST::Vector3); } break; -#line 1886 "./glsl.g" +#line 1878 "./glsl.g" case 170: { ast(1) = makeBasicType(T_DVEC4, TypeAST::Vector4); } break; -#line 1893 "./glsl.g" +#line 1885 "./glsl.g" case 171: { ast(1) = makeBasicType(T_BVEC2, TypeAST::Vector2); } break; -#line 1900 "./glsl.g" +#line 1892 "./glsl.g" case 172: { ast(1) = makeBasicType(T_BVEC3, TypeAST::Vector3); } break; -#line 1907 "./glsl.g" +#line 1899 "./glsl.g" case 173: { ast(1) = makeBasicType(T_BVEC4, TypeAST::Vector4); } break; -#line 1914 "./glsl.g" +#line 1906 "./glsl.g" case 174: { ast(1) = makeBasicType(T_IVEC2, TypeAST::Vector2); } break; -#line 1921 "./glsl.g" +#line 1913 "./glsl.g" case 175: { ast(1) = makeBasicType(T_IVEC3, TypeAST::Vector3); } break; -#line 1928 "./glsl.g" +#line 1920 "./glsl.g" case 176: { ast(1) = makeBasicType(T_IVEC4, TypeAST::Vector4); } break; -#line 1935 "./glsl.g" +#line 1927 "./glsl.g" case 177: { ast(1) = makeBasicType(T_UVEC2, TypeAST::Vector2); } break; -#line 1942 "./glsl.g" +#line 1934 "./glsl.g" case 178: { ast(1) = makeBasicType(T_UVEC3, TypeAST::Vector3); } break; -#line 1949 "./glsl.g" +#line 1941 "./glsl.g" case 179: { ast(1) = makeBasicType(T_UVEC4, TypeAST::Vector4); } break; -#line 1956 "./glsl.g" +#line 1948 "./glsl.g" case 180: { ast(1) = makeBasicType(T_MAT2, TypeAST::Matrix); } break; -#line 1963 "./glsl.g" +#line 1955 "./glsl.g" case 181: { ast(1) = makeBasicType(T_MAT3, TypeAST::Matrix); } break; -#line 1970 "./glsl.g" +#line 1962 "./glsl.g" case 182: { ast(1) = makeBasicType(T_MAT4, TypeAST::Matrix); } break; -#line 1977 "./glsl.g" +#line 1969 "./glsl.g" case 183: { ast(1) = makeBasicType(T_MAT2, TypeAST::Matrix); } break; -#line 1984 "./glsl.g" +#line 1976 "./glsl.g" case 184: { ast(1) = makeBasicType(T_MAT2X3, TypeAST::Matrix); } break; -#line 1991 "./glsl.g" +#line 1983 "./glsl.g" case 185: { ast(1) = makeBasicType(T_MAT2X4, TypeAST::Matrix); } break; -#line 1998 "./glsl.g" +#line 1990 "./glsl.g" case 186: { ast(1) = makeBasicType(T_MAT3X2, TypeAST::Matrix); } break; -#line 2005 "./glsl.g" +#line 1997 "./glsl.g" case 187: { ast(1) = makeBasicType(T_MAT3, TypeAST::Matrix); } break; -#line 2012 "./glsl.g" +#line 2004 "./glsl.g" case 188: { ast(1) = makeBasicType(T_MAT3X4, TypeAST::Matrix); } break; -#line 2019 "./glsl.g" +#line 2011 "./glsl.g" case 189: { ast(1) = makeBasicType(T_MAT4X2, TypeAST::Matrix); } break; -#line 2026 "./glsl.g" +#line 2018 "./glsl.g" case 190: { ast(1) = makeBasicType(T_MAT4X3, TypeAST::Matrix); } break; -#line 2033 "./glsl.g" +#line 2025 "./glsl.g" case 191: { ast(1) = makeBasicType(T_MAT4, TypeAST::Matrix); } break; -#line 2040 "./glsl.g" +#line 2032 "./glsl.g" case 192: { ast(1) = makeBasicType(T_DMAT2, TypeAST::Matrix); } break; -#line 2047 "./glsl.g" +#line 2039 "./glsl.g" case 193: { ast(1) = makeBasicType(T_DMAT3, TypeAST::Matrix); } break; -#line 2054 "./glsl.g" +#line 2046 "./glsl.g" case 194: { ast(1) = makeBasicType(T_DMAT4, TypeAST::Matrix); } break; -#line 2061 "./glsl.g" +#line 2053 "./glsl.g" case 195: { ast(1) = makeBasicType(T_DMAT2, TypeAST::Matrix); } break; -#line 2068 "./glsl.g" +#line 2060 "./glsl.g" case 196: { ast(1) = makeBasicType(T_DMAT2X3, TypeAST::Matrix); } break; -#line 2075 "./glsl.g" +#line 2067 "./glsl.g" case 197: { ast(1) = makeBasicType(T_DMAT2X4, TypeAST::Matrix); } break; -#line 2082 "./glsl.g" +#line 2074 "./glsl.g" case 198: { ast(1) = makeBasicType(T_DMAT3X2, TypeAST::Matrix); } break; -#line 2089 "./glsl.g" +#line 2081 "./glsl.g" case 199: { ast(1) = makeBasicType(T_DMAT3, TypeAST::Matrix); } break; -#line 2096 "./glsl.g" +#line 2088 "./glsl.g" case 200: { ast(1) = makeBasicType(T_DMAT3X4, TypeAST::Matrix); } break; -#line 2103 "./glsl.g" +#line 2095 "./glsl.g" case 201: { ast(1) = makeBasicType(T_DMAT4X2, TypeAST::Matrix); } break; -#line 2110 "./glsl.g" +#line 2102 "./glsl.g" case 202: { ast(1) = makeBasicType(T_DMAT4X3, TypeAST::Matrix); } break; -#line 2117 "./glsl.g" +#line 2109 "./glsl.g" case 203: { ast(1) = makeBasicType(T_DMAT4, TypeAST::Matrix); } break; -#line 2124 "./glsl.g" +#line 2116 "./glsl.g" case 204: { ast(1) = makeBasicType(T_SAMPLER1D, TypeAST::Sampler1D); } break; -#line 2131 "./glsl.g" +#line 2123 "./glsl.g" case 205: { ast(1) = makeBasicType(T_SAMPLER2D, TypeAST::Sampler2D); } break; -#line 2138 "./glsl.g" +#line 2130 "./glsl.g" case 206: { ast(1) = makeBasicType(T_SAMPLER3D, TypeAST::Sampler3D); } break; -#line 2145 "./glsl.g" +#line 2137 "./glsl.g" case 207: { ast(1) = makeBasicType(T_SAMPLERCUBE, TypeAST::SamplerCube); } break; -#line 2152 "./glsl.g" +#line 2144 "./glsl.g" case 208: { ast(1) = makeBasicType(T_SAMPLER1DSHADOW, TypeAST::Sampler1DShadow); } break; -#line 2159 "./glsl.g" +#line 2151 "./glsl.g" case 209: { ast(1) = makeBasicType(T_SAMPLER2DSHADOW, TypeAST::Sampler2DShadow); } break; -#line 2166 "./glsl.g" +#line 2158 "./glsl.g" case 210: { ast(1) = makeBasicType(T_SAMPLERCUBESHADOW, TypeAST::SamplerCubeShadow); } break; -#line 2173 "./glsl.g" +#line 2165 "./glsl.g" case 211: { ast(1) = makeBasicType(T_SAMPLER1DARRAY, TypeAST::Sampler1DArray); } break; -#line 2180 "./glsl.g" +#line 2172 "./glsl.g" case 212: { ast(1) = makeBasicType(T_SAMPLER2DARRAY, TypeAST::Sampler2DArray); } break; -#line 2187 "./glsl.g" +#line 2179 "./glsl.g" case 213: { ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW, TypeAST::Sampler1DArrayShadow); } break; -#line 2194 "./glsl.g" +#line 2186 "./glsl.g" case 214: { ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW, TypeAST::Sampler2DArrayShadow); } break; -#line 2201 "./glsl.g" +#line 2193 "./glsl.g" case 215: { ast(1) = makeBasicType(T_SAMPLERCUBEARRAY, TypeAST::SamplerCubeShadow); } break; -#line 2208 "./glsl.g" +#line 2200 "./glsl.g" case 216: { ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW, TypeAST::SamplerCubeArrayShadow); } break; -#line 2215 "./glsl.g" +#line 2207 "./glsl.g" case 217: { ast(1) = makeBasicType(T_ISAMPLER1D, TypeAST::Sampler1D); } break; -#line 2222 "./glsl.g" +#line 2214 "./glsl.g" case 218: { ast(1) = makeBasicType(T_ISAMPLER2D, TypeAST::Sampler2D); } break; -#line 2229 "./glsl.g" +#line 2221 "./glsl.g" case 219: { ast(1) = makeBasicType(T_ISAMPLER3D, TypeAST::Sampler3D); } break; -#line 2236 "./glsl.g" +#line 2228 "./glsl.g" case 220: { ast(1) = makeBasicType(T_ISAMPLERCUBE, TypeAST::SamplerCube); } break; -#line 2243 "./glsl.g" +#line 2235 "./glsl.g" case 221: { ast(1) = makeBasicType(T_ISAMPLER1DARRAY, TypeAST::Sampler1DArray); } break; -#line 2250 "./glsl.g" +#line 2242 "./glsl.g" case 222: { ast(1) = makeBasicType(T_ISAMPLER2DARRAY, TypeAST::Sampler2DArray); } break; -#line 2257 "./glsl.g" +#line 2249 "./glsl.g" case 223: { ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY, TypeAST::SamplerCubeArray); } break; -#line 2264 "./glsl.g" +#line 2256 "./glsl.g" case 224: { ast(1) = makeBasicType(T_USAMPLER1D, TypeAST::Sampler1D); } break; -#line 2271 "./glsl.g" +#line 2263 "./glsl.g" case 225: { ast(1) = makeBasicType(T_USAMPLER2D, TypeAST::Sampler2D); } break; -#line 2278 "./glsl.g" +#line 2270 "./glsl.g" case 226: { ast(1) = makeBasicType(T_USAMPLER3D, TypeAST::Sampler3D); } break; -#line 2285 "./glsl.g" +#line 2277 "./glsl.g" case 227: { ast(1) = makeBasicType(T_USAMPLERCUBE, TypeAST::SamplerCube); } break; -#line 2292 "./glsl.g" +#line 2284 "./glsl.g" case 228: { ast(1) = makeBasicType(T_USAMPLER1DARRAY, TypeAST::Sampler1DArray); } break; -#line 2299 "./glsl.g" +#line 2291 "./glsl.g" case 229: { ast(1) = makeBasicType(T_USAMPLER2DARRAY, TypeAST::Sampler2DArray); } break; -#line 2306 "./glsl.g" +#line 2298 "./glsl.g" case 230: { ast(1) = makeBasicType(T_USAMPLERCUBEARRAY, TypeAST::SamplerCubeArray); } break; -#line 2313 "./glsl.g" +#line 2305 "./glsl.g" case 231: { ast(1) = makeBasicType(T_SAMPLER2DRECT, TypeAST::Sampler2DRect); } break; -#line 2320 "./glsl.g" +#line 2312 "./glsl.g" case 232: { ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW, TypeAST::Sampler2DRectShadow); } break; -#line 2327 "./glsl.g" +#line 2319 "./glsl.g" case 233: { ast(1) = makeBasicType(T_ISAMPLER2DRECT, TypeAST::Sampler2DRect); } break; -#line 2334 "./glsl.g" +#line 2326 "./glsl.g" case 234: { ast(1) = makeBasicType(T_USAMPLER2DRECT, TypeAST::Sampler2DRect); } break; -#line 2341 "./glsl.g" +#line 2333 "./glsl.g" case 235: { ast(1) = makeBasicType(T_SAMPLERBUFFER, TypeAST::SamplerBuffer); } break; -#line 2348 "./glsl.g" +#line 2340 "./glsl.g" case 236: { ast(1) = makeBasicType(T_ISAMPLERBUFFER, TypeAST::SamplerBuffer); } break; -#line 2355 "./glsl.g" +#line 2347 "./glsl.g" case 237: { ast(1) = makeBasicType(T_USAMPLERBUFFER, TypeAST::SamplerBuffer); } break; -#line 2362 "./glsl.g" +#line 2354 "./glsl.g" case 238: { ast(1) = makeBasicType(T_SAMPLER2DMS, TypeAST::Sampler2DMS); } break; -#line 2369 "./glsl.g" +#line 2361 "./glsl.g" case 239: { ast(1) = makeBasicType(T_ISAMPLER2DMS, TypeAST::Sampler2DMS); } break; -#line 2376 "./glsl.g" +#line 2368 "./glsl.g" case 240: { ast(1) = makeBasicType(T_USAMPLER2DMS, TypeAST::Sampler2DMS); } break; -#line 2383 "./glsl.g" +#line 2375 "./glsl.g" case 241: { ast(1) = makeBasicType(T_SAMPLER2DMSARRAY, TypeAST::Sampler2DMSArray); } break; -#line 2390 "./glsl.g" +#line 2382 "./glsl.g" case 242: { ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY, TypeAST::Sampler2DMSArray); } break; -#line 2397 "./glsl.g" +#line 2389 "./glsl.g" case 243: { ast(1) = makeBasicType(T_USAMPLER2DMSARRAY, TypeAST::Sampler2DMSArray); } break; -#line 2404 "./glsl.g" +#line 2396 "./glsl.g" case 244: { // nothing to do. } break; -#line 2411 "./glsl.g" +#line 2403 "./glsl.g" case 245: { ast(1) = makeAstNode(string(1)); } break; -#line 2418 "./glsl.g" +#line 2410 "./glsl.g" case 246: { sym(1).precision = TypeAST::Highp; } break; -#line 2425 "./glsl.g" +#line 2417 "./glsl.g" case 247: { sym(1).precision = TypeAST::Mediump; } break; -#line 2432 "./glsl.g" +#line 2424 "./glsl.g" case 248: { sym(1).precision = TypeAST::Lowp; } break; -#line 2439 "./glsl.g" +#line 2431 "./glsl.g" case 249: { ast(1) = makeAstNode(string(2), sym(4).field_list); } break; -#line 2446 "./glsl.g" +#line 2438 "./glsl.g" case 250: { ast(1) = makeAstNode(sym(3).field_list); } break; -#line 2453 "./glsl.g" +#line 2445 "./glsl.g" case 251: { // nothing to do. } break; -#line 2460 "./glsl.g" +#line 2452 "./glsl.g" case 252: { sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list); } break; -#line 2467 "./glsl.g" +#line 2459 "./glsl.g" case 253: { sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list); } break; -#line 2474 "./glsl.g" +#line 2466 "./glsl.g" case 254: { sym(1).field_list = StructTypeAST::fixInnerTypes @@ -1823,321 +1823,321 @@ case 254: { sym(1).type_qualifier.layout_list), sym(3).field_list); } break; -#line 2484 "./glsl.g" +#line 2476 "./glsl.g" case 255: { // nothing to do. sym(1).field_list = makeAstNode< List >(sym(1).field); } break; -#line 2492 "./glsl.g" +#line 2484 "./glsl.g" case 256: { sym(1).field_list = makeAstNode< List >(sym(1).field_list, sym(3).field); } break; -#line 2499 "./glsl.g" +#line 2491 "./glsl.g" case 257: { sym(1).field = makeAstNode(string(1)); } break; -#line 2506 "./glsl.g" +#line 2498 "./glsl.g" case 258: { sym(1).field = makeAstNode (string(1), makeAstNode((TypeAST *)0)); } break; -#line 2514 "./glsl.g" +#line 2506 "./glsl.g" case 259: { sym(1).field = makeAstNode (string(1), makeAstNode((TypeAST *)0, expression(3))); } break; -#line 2522 "./glsl.g" +#line 2514 "./glsl.g" case 260: { // nothing to do. } break; -#line 2529 "./glsl.g" +#line 2521 "./glsl.g" case 261: { ast(1) = makeAstNode(sym(1).declaration); } break; -#line 2536 "./glsl.g" +#line 2528 "./glsl.g" case 262: { // nothing to do. } break; -#line 2543 "./glsl.g" +#line 2535 "./glsl.g" case 263: { // nothing to do. } break; -#line 2550 "./glsl.g" +#line 2542 "./glsl.g" case 264: { // nothing to do. } break; -#line 2557 "./glsl.g" +#line 2549 "./glsl.g" case 265: { // nothing to do. } break; -#line 2564 "./glsl.g" +#line 2556 "./glsl.g" case 266: { // nothing to do. } break; -#line 2571 "./glsl.g" +#line 2563 "./glsl.g" case 267: { // nothing to do. } break; -#line 2578 "./glsl.g" +#line 2570 "./glsl.g" case 268: { // nothing to do. } break; -#line 2585 "./glsl.g" +#line 2577 "./glsl.g" case 269: { // nothing to do. } break; -#line 2592 "./glsl.g" +#line 2584 "./glsl.g" case 270: { // nothing to do. } break; -#line 2599 "./glsl.g" +#line 2591 "./glsl.g" case 271: { ast(1) = makeAstNode(); } break; -#line 2606 "./glsl.g" +#line 2598 "./glsl.g" case 272: { ast(1) = makeAstNode(sym(2).statement_list); } break; -#line 2613 "./glsl.g" +#line 2605 "./glsl.g" case 273: { // nothing to do. } break; -#line 2620 "./glsl.g" +#line 2612 "./glsl.g" case 274: { // nothing to do. } break; -#line 2627 "./glsl.g" +#line 2619 "./glsl.g" case 275: { ast(1) = makeAstNode(); } break; -#line 2634 "./glsl.g" +#line 2626 "./glsl.g" case 276: { ast(1) = makeAstNode(sym(2).statement_list); } break; -#line 2641 "./glsl.g" +#line 2633 "./glsl.g" case 277: { sym(1).statement_list = makeAstNode< List >(sym(1).statement); } break; -#line 2648 "./glsl.g" +#line 2640 "./glsl.g" case 278: { sym(1).statement_list = makeAstNode< List >(sym(1).statement_list, sym(2).statement); } break; -#line 2655 "./glsl.g" +#line 2647 "./glsl.g" case 279: { ast(1) = makeAstNode(); // Empty statement } break; -#line 2662 "./glsl.g" +#line 2654 "./glsl.g" case 280: { ast(1) = makeAstNode(expression(1)); } break; -#line 2669 "./glsl.g" +#line 2661 "./glsl.g" case 281: { ast(1) = makeAstNode(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause); } break; -#line 2676 "./glsl.g" +#line 2668 "./glsl.g" case 282: { sym(1).ifstmt.thenClause = statement(1); sym(1).ifstmt.elseClause = statement(3); } break; -#line 2684 "./glsl.g" +#line 2676 "./glsl.g" case 283: { sym(1).ifstmt.thenClause = statement(1); sym(1).ifstmt.elseClause = 0; } break; -#line 2692 "./glsl.g" +#line 2684 "./glsl.g" case 284: { // nothing to do. } break; -#line 2699 "./glsl.g" +#line 2691 "./glsl.g" case 285: { ast(1) = makeAstNode (type(1), string(2), expression(4)); } break; -#line 2707 "./glsl.g" +#line 2699 "./glsl.g" case 286: { ast(1) = makeAstNode(expression(3), statement(6)); } break; -#line 2714 "./glsl.g" +#line 2706 "./glsl.g" case 287: { ast(1) = makeAstNode(); } break; -#line 2721 "./glsl.g" +#line 2713 "./glsl.g" case 288: { ast(1) = makeAstNode(sym(1).statement_list); } break; -#line 2728 "./glsl.g" +#line 2720 "./glsl.g" case 289: { ast(1) = makeAstNode(expression(2)); } break; -#line 2735 "./glsl.g" +#line 2727 "./glsl.g" case 290: { ast(1) = makeAstNode(); } break; -#line 2742 "./glsl.g" +#line 2734 "./glsl.g" case 291: { ast(1) = makeAstNode(expression(3), statement(5)); } break; -#line 2749 "./glsl.g" +#line 2741 "./glsl.g" case 292: { ast(1) = makeAstNode(statement(2), expression(5)); } break; -#line 2756 "./glsl.g" +#line 2748 "./glsl.g" case 293: { ast(1) = makeAstNode(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6)); } break; -#line 2763 "./glsl.g" +#line 2755 "./glsl.g" case 294: { // nothing to do. } break; -#line 2770 "./glsl.g" +#line 2762 "./glsl.g" case 295: { // nothing to do. } break; -#line 2777 "./glsl.g" +#line 2769 "./glsl.g" case 296: { // nothing to do. } break; -#line 2784 "./glsl.g" +#line 2776 "./glsl.g" case 297: { // nothing to do. } break; -#line 2791 "./glsl.g" +#line 2783 "./glsl.g" case 298: { sym(1).forstmt.condition = expression(1); sym(1).forstmt.increment = 0; } break; -#line 2799 "./glsl.g" +#line 2791 "./glsl.g" case 299: { sym(1).forstmt.condition = expression(1); sym(1).forstmt.increment = expression(3); } break; -#line 2807 "./glsl.g" +#line 2799 "./glsl.g" case 300: { ast(1) = makeAstNode(AST::Kind_Continue); } break; -#line 2814 "./glsl.g" +#line 2806 "./glsl.g" case 301: { ast(1) = makeAstNode(AST::Kind_Break); } break; -#line 2821 "./glsl.g" +#line 2813 "./glsl.g" case 302: { ast(1) = makeAstNode(); } break; -#line 2828 "./glsl.g" +#line 2820 "./glsl.g" case 303: { ast(1) = makeAstNode(expression(2)); } break; -#line 2835 "./glsl.g" +#line 2827 "./glsl.g" case 304: { ast(1) = makeAstNode(AST::Kind_Discard); } break; -#line 2842 "./glsl.g" +#line 2834 "./glsl.g" case 305: { ast(1) = makeAstNode(sym(1).declaration_list); } break; -#line 2849 "./glsl.g" +#line 2841 "./glsl.g" case 306: { if (sym(1).declaration) { @@ -2148,7 +2148,7 @@ case 306: { } } break; -#line 2861 "./glsl.g" +#line 2853 "./glsl.g" case 307: { if (sym(1).declaration_list && sym(2).declaration) { @@ -2164,37 +2164,37 @@ case 307: { } } break; -#line 2878 "./glsl.g" +#line 2870 "./glsl.g" case 308: { // nothing to do. } break; -#line 2885 "./glsl.g" +#line 2877 "./glsl.g" case 309: { // nothing to do. } break; -#line 2892 "./glsl.g" +#line 2884 "./glsl.g" case 310: { ast(1) = 0; } break; -#line 2899 "./glsl.g" +#line 2891 "./glsl.g" case 311: { function(1)->body = statement(2); } break; -#line 2906 "./glsl.g" +#line 2898 "./glsl.g" case 312: { ast(1) = 0; } break; -#line 2914 "./glsl.g" +#line 2906 "./glsl.g" } // end switch } // end Parser::reduce() diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h index bdfc14e478..f5ce937d2d 100644 --- a/src/libs/glsl/glslparser.h +++ b/src/libs/glsl/glslparser.h @@ -109,20 +109,12 @@ private: void warning(int line, const QString &message) { - DiagnosticMessage m; - m.setKind(DiagnosticMessage::Warning); - m.setLine(line); - m.setMessage(message); - _engine->addDiagnosticMessage(m); + _engine->warning(line, message); } void error(int line, const QString &message) { - DiagnosticMessage m; - m.setKind(DiagnosticMessage::Error); - m.setLine(line); - m.setMessage(message); - _engine->addDiagnosticMessage(m); + _engine->error(line, message); } template -- 2.11.0