From cf793418c3e43081fc0bb19a013a89fbd0445ee0 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 30 Nov 2010 15:47:03 +0100
Subject: [PATCH] Handle logical xor.

---
 src/libs/glsl/glsl.g              |   6 +-
 src/libs/glsl/glsllexer.cpp       |   5 +-
 src/libs/glsl/glslparser.cpp      | 636 +++++++++++++++++++-------------------
 src/libs/glsl/glslparser.h        |   2 +-
 src/libs/glsl/glslparsertable.cpp |   2 +-
 5 files changed, 325 insertions(+), 326 deletions(-)

diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g
index 890c7694d2..49bd5ed05d 100644
--- a/src/libs/glsl/glsl.g
+++ b/src/libs/glsl/glsl.g
@@ -26,10 +26,6 @@
 -- contact the sales department at http://qt.nokia.com/contact.
 ---------------------------------------------------------------------------
 
---
--- todo:
---    spelling of XOR_OP and CARET
-
 %decl glslparser.h
 %impl glslparser.cpp
 %parser GLSLParserTable
@@ -204,7 +200,7 @@
 %token VOID "void"
 %token WHILE "while"
 %token XOR_ASSIGN "^="
-%token XOR_OP "^"
+%token XOR_OP "^^"
 %token TRUE "true"
 %token FALSE "false"
 %token PREPROC "preprocessor directive"
diff --git a/src/libs/glsl/glsllexer.cpp b/src/libs/glsl/glsllexer.cpp
index ba67c865c5..e297a7ae92 100644
--- a/src/libs/glsl/glsllexer.cpp
+++ b/src/libs/glsl/glsllexer.cpp
@@ -331,8 +331,11 @@ int Lexer::yylex_helper(const char **position, int *line)
         if (_yychar == '=') {
             yyinp();
             return Parser::T_XOR_ASSIGN;
+        } else if (_yychar == '^') {
+            yyinp();
+            return Parser::T_XOR_OP;
         }
-        return Parser::T_XOR_OP;
+        return Parser::T_CARET;
 
         // {
     case '{':
diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp
index 14e0cd086b..85a190aa52 100644
--- a/src/libs/glsl/glslparser.cpp
+++ b/src/libs/glsl/glslparser.cpp
@@ -1,5 +1,5 @@
 
-#line 424 "./glsl.g"
+#line 420 "./glsl.g"
 
 /**************************************************************************
 **
@@ -214,137 +214,137 @@ AST *Parser::parse(int startToken)
     return 0;
 }
 
-#line 641 "./glsl.g"
+#line 637 "./glsl.g"
 
 void Parser::reduce(int ruleno)
 {
 switch(ruleno) {
 
-#line 650 "./glsl.g"
+#line 646 "./glsl.g"
 
 case 0: {
     ast(1) = makeAstNode<IdentifierExpressionAST>(string(1));
 }   break;
 
-#line 657 "./glsl.g"
+#line 653 "./glsl.g"
 
 case 1: {
     ast(1) = makeAstNode<LiteralExpressionAST>(string(1));
 }   break;
 
-#line 664 "./glsl.g"
+#line 660 "./glsl.g"
 
 case 2: {
     ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("true", 4));
 }   break;
 
-#line 671 "./glsl.g"
+#line 667 "./glsl.g"
 
 case 3: {
     ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("false", 5));
 }   break;
 
-#line 678 "./glsl.g"
+#line 674 "./glsl.g"
 
 case 4: {
     // nothing to do.
 }   break;
 
-#line 685 "./glsl.g"
+#line 681 "./glsl.g"
 
 case 5: {
     ast(1) = ast(2);
 }   break;
 
-#line 692 "./glsl.g"
+#line 688 "./glsl.g"
 
 case 6: {
     // nothing to do.
 }   break;
 
-#line 699 "./glsl.g"
+#line 695 "./glsl.g"
 
 case 7: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ArrayAccess, expression(1), expression(3));
 }   break;
 
-#line 706 "./glsl.g"
+#line 702 "./glsl.g"
 
 case 8: {
     // nothing to do.
 }   break;
 
-#line 713 "./glsl.g"
+#line 709 "./glsl.g"
 
 case 9: {
     ast(1) = makeAstNode<MemberAccessExpressionAST>(expression(1), string(3));
 }   break;
 
-#line 720 "./glsl.g"
+#line 716 "./glsl.g"
 
 case 10: {
     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostIncrement, expression(1));
 }   break;
 
-#line 727 "./glsl.g"
+#line 723 "./glsl.g"
 
 case 11: {
     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostDecrement, expression(1));
 }   break;
 
-#line 734 "./glsl.g"
+#line 730 "./glsl.g"
 
 case 12: {
     // nothing to do.
 }   break;
 
-#line 741 "./glsl.g"
+#line 737 "./glsl.g"
 
 case 13: {
     // nothing to do.
 }   break;
 
-#line 748 "./glsl.g"
+#line 744 "./glsl.g"
 
 case 14: {
     ast(1) = makeAstNode<FunctionCallExpressionAST>
         (sym(1).function.id, sym(1).function.arguments);
 }   break;
 
-#line 756 "./glsl.g"
+#line 752 "./glsl.g"
 
 case 15: {
     ast(1) = makeAstNode<FunctionCallExpressionAST>
         (expression(1), sym(3).function.id, sym(3).function.arguments);
 }   break;
 
-#line 764 "./glsl.g"
+#line 760 "./glsl.g"
 
 case 16: {
     // nothing to do.
 }   break;
 
-#line 771 "./glsl.g"
+#line 767 "./glsl.g"
 
 case 17: {
     // nothing to do.
 }   break;
 
-#line 778 "./glsl.g"
+#line 774 "./glsl.g"
 
 case 18: {
     sym(1).function.id = sym(1).function_identifier;
     sym(1).function.arguments = 0;
 }   break;
 
-#line 786 "./glsl.g"
+#line 782 "./glsl.g"
 
 case 19: {
     sym(1).function.id = sym(1).function_identifier;
     sym(1).function.arguments = 0;
 }   break;
 
-#line 794 "./glsl.g"
+#line 790 "./glsl.g"
 
 case 20: {
     sym(1).function.id = sym(1).function_identifier;
@@ -352,7 +352,7 @@ case 20: {
         makeAstNode< List<ExpressionAST *> >(expression(2));
 }   break;
 
-#line 803 "./glsl.g"
+#line 799 "./glsl.g"
 
 case 21: {
     sym(1).function.arguments =
@@ -360,379 +360,379 @@ case 21: {
             (sym(1).function.arguments, expression(3));
 }   break;
 
-#line 812 "./glsl.g"
+#line 808 "./glsl.g"
 
 case 22: {
     // nothing to do.
 }   break;
 
-#line 819 "./glsl.g"
+#line 815 "./glsl.g"
 
 case 23: {
     ast(1) = makeAstNode<FunctionIdentifierAST>(type(1));
 }   break;
 
-#line 826 "./glsl.g"
+#line 822 "./glsl.g"
 
 case 24: {
     ast(1) = makeAstNode<FunctionIdentifierAST>(string(1));
 }   break;
 
-#line 833 "./glsl.g"
+#line 829 "./glsl.g"
 
 case 25: {
     // nothing to do.
 }   break;
 
-#line 840 "./glsl.g"
+#line 836 "./glsl.g"
 
 case 26: {
     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreIncrement, expression(2));
 }   break;
 
-#line 847 "./glsl.g"
+#line 843 "./glsl.g"
 
 case 27: {
     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreDecrement, expression(2));
 }   break;
 
-#line 854 "./glsl.g"
+#line 850 "./glsl.g"
 
 case 28: {
     ast(1) = makeAstNode<UnaryExpressionAST>(sym(1).kind, expression(2));
 }   break;
 
-#line 861 "./glsl.g"
+#line 857 "./glsl.g"
 
 case 29: {
     sym(1).kind = AST::Kind_UnaryPlus;
 }   break;
 
-#line 868 "./glsl.g"
+#line 864 "./glsl.g"
 
 case 30: {
     sym(1).kind = AST::Kind_UnaryMinus;
 }   break;
 
-#line 875 "./glsl.g"
+#line 871 "./glsl.g"
 
 case 31: {
     sym(1).kind = AST::Kind_LogicalNot;
 }   break;
 
-#line 882 "./glsl.g"
+#line 878 "./glsl.g"
 
 case 32: {
     sym(1).kind = AST::Kind_BitwiseNot;
 }   break;
 
-#line 889 "./glsl.g"
+#line 885 "./glsl.g"
 
 case 33: {
     // nothing to do.
 }   break;
 
-#line 896 "./glsl.g"
+#line 892 "./glsl.g"
 
 case 34: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Multiply, expression(1), expression(3));
 }   break;
 
-#line 903 "./glsl.g"
+#line 899 "./glsl.g"
 
 case 35: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Divide, expression(1), expression(3));
 }   break;
 
-#line 910 "./glsl.g"
+#line 906 "./glsl.g"
 
 case 36: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Modulus, expression(1), expression(3));
 }   break;
 
-#line 917 "./glsl.g"
+#line 913 "./glsl.g"
 
 case 37: {
     // nothing to do.
 }   break;
 
-#line 924 "./glsl.g"
+#line 920 "./glsl.g"
 
 case 38: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Plus, expression(1), expression(3));
 }   break;
 
-#line 931 "./glsl.g"
+#line 927 "./glsl.g"
 
 case 39: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Minus, expression(1), expression(3));
 }   break;
 
-#line 938 "./glsl.g"
+#line 934 "./glsl.g"
 
 case 40: {
     // nothing to do.
 }   break;
 
-#line 945 "./glsl.g"
+#line 941 "./glsl.g"
 
 case 41: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftLeft, expression(1), expression(3));
 }   break;
 
-#line 952 "./glsl.g"
+#line 948 "./glsl.g"
 
 case 42: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftRight, expression(1), expression(3));
 }   break;
 
-#line 959 "./glsl.g"
+#line 955 "./glsl.g"
 
 case 43: {
     // nothing to do.
 }   break;
 
-#line 966 "./glsl.g"
+#line 962 "./glsl.g"
 
 case 44: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessThan, expression(1), expression(3));
 }   break;
 
-#line 973 "./glsl.g"
+#line 969 "./glsl.g"
 
 case 45: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterThan, expression(1), expression(3));
 }   break;
 
-#line 980 "./glsl.g"
+#line 976 "./glsl.g"
 
 case 46: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessEqual, expression(1), expression(3));
 }   break;
 
-#line 987 "./glsl.g"
+#line 983 "./glsl.g"
 
 case 47: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterEqual, expression(1), expression(3));
 }   break;
 
-#line 994 "./glsl.g"
+#line 990 "./glsl.g"
 
 case 48: {
     // nothing to do.
 }   break;
 
-#line 1001 "./glsl.g"
+#line 997 "./glsl.g"
 
 case 49: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Equal, expression(1), expression(3));
 }   break;
 
-#line 1008 "./glsl.g"
+#line 1004 "./glsl.g"
 
 case 50: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_NotEqual, expression(1), expression(3));
 }   break;
 
-#line 1015 "./glsl.g"
+#line 1011 "./glsl.g"
 
 case 51: {
     // nothing to do.
 }   break;
 
-#line 1022 "./glsl.g"
+#line 1018 "./glsl.g"
 
 case 52: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseAnd, expression(1), expression(3));
 }   break;
 
-#line 1029 "./glsl.g"
+#line 1025 "./glsl.g"
 
 case 53: {
     // nothing to do.
 }   break;
 
-#line 1036 "./glsl.g"
+#line 1032 "./glsl.g"
 
 case 54: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseXor, expression(1), expression(3));
 }   break;
 
-#line 1043 "./glsl.g"
+#line 1039 "./glsl.g"
 
 case 55: {
     // nothing to do.
 }   break;
 
-#line 1050 "./glsl.g"
+#line 1046 "./glsl.g"
 
 case 56: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseOr, expression(1), expression(3));
 }   break;
 
-#line 1057 "./glsl.g"
+#line 1053 "./glsl.g"
 
 case 57: {
     // nothing to do.
 }   break;
 
-#line 1064 "./glsl.g"
+#line 1060 "./glsl.g"
 
 case 58: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalAnd, expression(1), expression(3));
 }   break;
 
-#line 1071 "./glsl.g"
+#line 1067 "./glsl.g"
 
 case 59: {
     // nothing to do.
 }   break;
 
-#line 1078 "./glsl.g"
+#line 1074 "./glsl.g"
 
 case 60: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalXor, expression(1), expression(3));
 }   break;
 
-#line 1085 "./glsl.g"
+#line 1081 "./glsl.g"
 
 case 61: {
     // nothing to do.
 }   break;
 
-#line 1092 "./glsl.g"
+#line 1088 "./glsl.g"
 
 case 62: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalOr, expression(1), expression(3));
 }   break;
 
-#line 1099 "./glsl.g"
+#line 1095 "./glsl.g"
 
 case 63: {
     // nothing to do.
 }   break;
 
-#line 1106 "./glsl.g"
+#line 1102 "./glsl.g"
 
 case 64: {
     ast(1) = makeAstNode<TernaryExpressionAST>(AST::Kind_Conditional, expression(1), expression(3), expression(5));
 }   break;
 
-#line 1113 "./glsl.g"
+#line 1109 "./glsl.g"
 
 case 65: {
     // nothing to do.
 }   break;
 
-#line 1120 "./glsl.g"
+#line 1116 "./glsl.g"
 
 case 66: {
     ast(1) = makeAstNode<AssignmentExpressionAST>(sym(2).kind, expression(1), expression(3));
 }   break;
 
-#line 1127 "./glsl.g"
+#line 1123 "./glsl.g"
 
 case 67: {
     sym(1).kind = AST::Kind_Assign;
 }   break;
 
-#line 1134 "./glsl.g"
+#line 1130 "./glsl.g"
 
 case 68: {
     sym(1).kind = AST::Kind_AssignMultiply;
 }   break;
 
-#line 1141 "./glsl.g"
+#line 1137 "./glsl.g"
 
 case 69: {
     sym(1).kind = AST::Kind_AssignDivide;
 }   break;
 
-#line 1148 "./glsl.g"
+#line 1144 "./glsl.g"
 
 case 70: {
     sym(1).kind = AST::Kind_AssignModulus;
 }   break;
 
-#line 1155 "./glsl.g"
+#line 1151 "./glsl.g"
 
 case 71: {
     sym(1).kind = AST::Kind_AssignPlus;
 }   break;
 
-#line 1162 "./glsl.g"
+#line 1158 "./glsl.g"
 
 case 72: {
     sym(1).kind = AST::Kind_AssignMinus;
 }   break;
 
-#line 1169 "./glsl.g"
+#line 1165 "./glsl.g"
 
 case 73: {
     sym(1).kind = AST::Kind_AssignShiftLeft;
 }   break;
 
-#line 1176 "./glsl.g"
+#line 1172 "./glsl.g"
 
 case 74: {
     sym(1).kind = AST::Kind_AssignShiftRight;
 }   break;
 
-#line 1183 "./glsl.g"
+#line 1179 "./glsl.g"
 
 case 75: {
     sym(1).kind = AST::Kind_AssignAnd;
 }   break;
 
-#line 1190 "./glsl.g"
+#line 1186 "./glsl.g"
 
 case 76: {
     sym(1).kind = AST::Kind_AssignXor;
 }   break;
 
-#line 1197 "./glsl.g"
+#line 1193 "./glsl.g"
 
 case 77: {
     sym(1).kind = AST::Kind_AssignOr;
 }   break;
 
-#line 1204 "./glsl.g"
+#line 1200 "./glsl.g"
 
 case 78: {
     // nothing to do.
 }   break;
 
-#line 1211 "./glsl.g"
+#line 1207 "./glsl.g"
 
 case 79: {
     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Comma, expression(1), expression(3));
 }   break;
 
-#line 1218 "./glsl.g"
+#line 1214 "./glsl.g"
 
 case 80: {
     // nothing to do.
 }   break;
 
-#line 1225 "./glsl.g"
+#line 1221 "./glsl.g"
 
 case 81: {
     // nothing to do.
 }   break;
 
-#line 1232 "./glsl.g"
+#line 1228 "./glsl.g"
 
 case 82: {
     ast(1) = makeAstNode<InitDeclarationAST>(sym(1).declaration_list);
 }   break;
 
-#line 1239 "./glsl.g"
+#line 1235 "./glsl.g"
 
 case 83: {
     ast(1) = makeAstNode<PrecisionDeclarationAST>(sym(2).precision, type(3));
 }   break;
 
-#line 1246 "./glsl.g"
+#line 1242 "./glsl.g"
 
 case 84: {
     if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) {
@@ -742,7 +742,7 @@ case 84: {
     ast(1) = makeAstNode<TypeDeclarationAST>(type);
 }   break;
 
-#line 1257 "./glsl.g"
+#line 1253 "./glsl.g"
 
 case 85: {
     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
@@ -760,7 +760,7 @@ case 85: {
          makeAstNode<VariableDeclarationAST>(qualtype, string(6)));
 }   break;
 
-#line 1276 "./glsl.g"
+#line 1272 "./glsl.g"
 
 case 86: {
     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
@@ -779,7 +779,7 @@ case 86: {
             (makeAstNode<ArrayTypeAST>(qualtype), string(6)));
 }   break;
 
-#line 1296 "./glsl.g"
+#line 1292 "./glsl.g"
 
 case 87: {
     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
@@ -798,7 +798,7 @@ case 87: {
             (makeAstNode<ArrayTypeAST>(qualtype, expression(8)), string(6)));
 }   break;
 
-#line 1316 "./glsl.g"
+#line 1312 "./glsl.g"
 
 case 88: {
     TypeAST *type = makeAstNode<QualifiedTypeAST>
@@ -807,59 +807,59 @@ case 88: {
     ast(1) = makeAstNode<TypeDeclarationAST>(type);
 }   break;
 
-#line 1326 "./glsl.g"
+#line 1322 "./glsl.g"
 
 case 89: {
     function(1)->finishParams();
 }   break;
 
-#line 1333 "./glsl.g"
+#line 1329 "./glsl.g"
 
 case 90: {
     // nothing to do.
 }   break;
 
-#line 1340 "./glsl.g"
+#line 1336 "./glsl.g"
 
 case 91: {
     // nothing to do.
 }   break;
 
-#line 1347 "./glsl.g"
+#line 1343 "./glsl.g"
 
 case 92: {
     function(1)->params = makeAstNode< List<ParameterDeclarationAST *> >
         (sym(2).param_declaration);
 }   break;
 
-#line 1355 "./glsl.g"
+#line 1351 "./glsl.g"
 
 case 93: {
     function(1)->params = makeAstNode< List<ParameterDeclarationAST *> >
         (function(1)->params, sym(3).param_declaration);
 }   break;
 
-#line 1363 "./glsl.g"
+#line 1359 "./glsl.g"
 
 case 94: {
     function(1) = makeAstNode<FunctionDeclarationAST>(type(1), string(2));
 }   break;
 
-#line 1370 "./glsl.g"
+#line 1366 "./glsl.g"
 
 case 95: {
     sym(1).param_declarator.type = type(1);
     sym(1).param_declarator.name = string(2);
 }   break;
 
-#line 1378 "./glsl.g"
+#line 1374 "./glsl.g"
 
 case 96: {
     sym(1).param_declarator.type = makeAstNode<ArrayTypeAST>(type(1), expression(4));
     sym(1).param_declarator.name = string(2);
 }   break;
 
-#line 1386 "./glsl.g"
+#line 1382 "./glsl.g"
 
 case 97: {
     ast(1) = makeAstNode<ParameterDeclarationAST>
@@ -870,7 +870,7 @@ case 97: {
          sym(3).param_declarator.name);
 }   break;
 
-#line 1398 "./glsl.g"
+#line 1394 "./glsl.g"
 
 case 98: {
     ast(1) = makeAstNode<ParameterDeclarationAST>
@@ -879,7 +879,7 @@ case 98: {
          sym(2).param_declarator.name);
 }   break;
 
-#line 1408 "./glsl.g"
+#line 1404 "./glsl.g"
 
 case 99: {
     ast(1) = makeAstNode<ParameterDeclarationAST>
@@ -889,7 +889,7 @@ case 99: {
          (const QString *)0);
 }   break;
 
-#line 1419 "./glsl.g"
+#line 1415 "./glsl.g"
 
 case 100: {
     ast(1) = makeAstNode<ParameterDeclarationAST>
@@ -897,44 +897,44 @@ case 100: {
          (const QString *)0);
 }   break;
 
-#line 1428 "./glsl.g"
+#line 1424 "./glsl.g"
 
 case 101: {
     sym(1).qualifier = ParameterDeclarationAST::In;
 }   break;
 
-#line 1435 "./glsl.g"
+#line 1431 "./glsl.g"
 
 case 102: {
     sym(1).qualifier = ParameterDeclarationAST::In;
 }   break;
 
-#line 1442 "./glsl.g"
+#line 1438 "./glsl.g"
 
 case 103: {
     sym(1).qualifier = ParameterDeclarationAST::Out;
 }   break;
 
-#line 1449 "./glsl.g"
+#line 1445 "./glsl.g"
 
 case 104: {
     sym(1).qualifier = ParameterDeclarationAST::InOut;
 }   break;
 
-#line 1456 "./glsl.g"
+#line 1452 "./glsl.g"
 
 case 105: {
     // nothing to do.
 }   break;
 
-#line 1463 "./glsl.g"
+#line 1459 "./glsl.g"
 
 case 106: {
     sym(1).declaration_list = makeAstNode< List<DeclarationAST *> >
         (sym(1).declaration);
 }   break;
 
-#line 1471 "./glsl.g"
+#line 1467 "./glsl.g"
 
 case 107: {
     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
@@ -943,7 +943,7 @@ case 107: {
             (sym(1).declaration_list, decl);
 }   break;
 
-#line 1481 "./glsl.g"
+#line 1477 "./glsl.g"
 
 case 108: {
     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
@@ -953,7 +953,7 @@ case 108: {
             (sym(1).declaration_list, decl);
 }   break;
 
-#line 1492 "./glsl.g"
+#line 1488 "./glsl.g"
 
 case 109: {
     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
@@ -963,7 +963,7 @@ case 109: {
             (sym(1).declaration_list, decl);
 }   break;
 
-#line 1503 "./glsl.g"
+#line 1499 "./glsl.g"
 
 case 110: {
     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
@@ -974,7 +974,7 @@ case 110: {
             (sym(1).declaration_list, decl);
 }   break;
 
-#line 1515 "./glsl.g"
+#line 1511 "./glsl.g"
 
 case 111: {
     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
@@ -985,7 +985,7 @@ case 111: {
             (sym(1).declaration_list, decl);
 }   break;
 
-#line 1527 "./glsl.g"
+#line 1523 "./glsl.g"
 
 case 112: {
     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
@@ -995,40 +995,40 @@ case 112: {
             (sym(1).declaration_list, decl);
 }   break;
 
-#line 1538 "./glsl.g"
+#line 1534 "./glsl.g"
 
 case 113: {
     ast(1) = makeAstNode<TypeDeclarationAST>(type(1));
 }   break;
 
-#line 1545 "./glsl.g"
+#line 1541 "./glsl.g"
 
 case 114: {
     ast(1) = makeAstNode<VariableDeclarationAST>(type(1), string(2));
 }   break;
 
-#line 1552 "./glsl.g"
+#line 1548 "./glsl.g"
 
 case 115: {
     ast(1) = makeAstNode<VariableDeclarationAST>
         (makeAstNode<ArrayTypeAST>(type(1)), string(2));
 }   break;
 
-#line 1560 "./glsl.g"
+#line 1556 "./glsl.g"
 
 case 116: {
     ast(1) = makeAstNode<VariableDeclarationAST>
         (makeAstNode<ArrayTypeAST>(type(1), expression(4)), string(2));
 }   break;
 
-#line 1568 "./glsl.g"
+#line 1564 "./glsl.g"
 
 case 117: {
     ast(1) = makeAstNode<VariableDeclarationAST>
         (makeAstNode<ArrayTypeAST>(type(1)), string(2), expression(6));
 }   break;
 
-#line 1576 "./glsl.g"
+#line 1572 "./glsl.g"
 
 case 118: {
     ast(1) = makeAstNode<VariableDeclarationAST>
@@ -1036,26 +1036,26 @@ case 118: {
          string(2), expression(7));
 }   break;
 
-#line 1585 "./glsl.g"
+#line 1581 "./glsl.g"
 
 case 119: {
     ast(1) = makeAstNode<VariableDeclarationAST>
         (type(1), string(2), expression(4));
 }   break;
 
-#line 1593 "./glsl.g"
+#line 1589 "./glsl.g"
 
 case 120: {
     ast(1) = makeAstNode<InvariantDeclarationAST>(string(2));
 }   break;
 
-#line 1600 "./glsl.g"
+#line 1596 "./glsl.g"
 
 case 121: {
     ast(1) = makeAstNode<QualifiedTypeAST>(0, type(1), (List<LayoutQualifier *> *)0);
 }   break;
 
-#line 1607 "./glsl.g"
+#line 1603 "./glsl.g"
 
 case 122: {
     ast(1) = makeAstNode<QualifiedTypeAST>
@@ -1063,207 +1063,207 @@ case 122: {
          sym(1).type_qualifier.layout_list);
 }   break;
 
-#line 1616 "./glsl.g"
+#line 1612 "./glsl.g"
 
 case 123: {
     sym(1).qualifier = QualifiedTypeAST::Invariant;
 }   break;
 
-#line 1623 "./glsl.g"
+#line 1619 "./glsl.g"
 
 case 124: {
     sym(1).qualifier = QualifiedTypeAST::Smooth;
 }   break;
 
-#line 1630 "./glsl.g"
+#line 1626 "./glsl.g"
 
 case 125: {
     sym(1).qualifier = QualifiedTypeAST::Flat;
 }   break;
 
-#line 1637 "./glsl.g"
+#line 1633 "./glsl.g"
 
 case 126: {
     sym(1).qualifier = QualifiedTypeAST::NoPerspective;
 }   break;
 
-#line 1644 "./glsl.g"
+#line 1640 "./glsl.g"
 
 case 127: {
     sym(1) = sym(3);
 }   break;
 
-#line 1651 "./glsl.g"
+#line 1647 "./glsl.g"
 
 case 128: {
     sym(1).layout_list = makeAstNode< List<LayoutQualifier *> >(sym(1).layout);
 }   break;
 
-#line 1658 "./glsl.g"
+#line 1654 "./glsl.g"
 
 case 129: {
     sym(1).layout_list = makeAstNode< List<LayoutQualifier *> >(sym(1).layout_list, sym(3).layout);
 }   break;
 
-#line 1665 "./glsl.g"
+#line 1661 "./glsl.g"
 
 case 130: {
     sym(1).layout = makeAstNode<LayoutQualifier>(string(1), (const QString *)0);
 }   break;
 
-#line 1672 "./glsl.g"
+#line 1668 "./glsl.g"
 
 case 131: {
     sym(1).layout = makeAstNode<LayoutQualifier>(string(1), string(3));
 }   break;
 
-#line 1679 "./glsl.g"
+#line 1675 "./glsl.g"
 
 case 132: {
     sym(1).qualifier = QualifiedTypeAST::Const;
 }   break;
 
-#line 1686 "./glsl.g"
+#line 1682 "./glsl.g"
 
 case 133: {
     sym(1).type_qualifier.qualifier = sym(1).qualifier;
     sym(1).type_qualifier.layout_list = 0;
 }   break;
 
-#line 1694 "./glsl.g"
+#line 1690 "./glsl.g"
 
 case 134: {
     sym(1).type_qualifier.layout_list = sym(1).layout_list;
     sym(1).type_qualifier.qualifier = 0;
 }   break;
 
-#line 1702 "./glsl.g"
+#line 1698 "./glsl.g"
 
 case 135: {
     sym(1).type_qualifier.layout_list = sym(1).layout_list;
     sym(1).type_qualifier.qualifier = sym(2).qualifier;
 }   break;
 
-#line 1710 "./glsl.g"
+#line 1706 "./glsl.g"
 
 case 136: {
     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier;
     sym(1).type_qualifier.layout_list = 0;
 }   break;
 
-#line 1718 "./glsl.g"
+#line 1714 "./glsl.g"
 
 case 137: {
     sym(1).type_qualifier.qualifier = sym(1).qualifier;
     sym(1).type_qualifier.layout_list = 0;
 }   break;
 
-#line 1726 "./glsl.g"
+#line 1722 "./glsl.g"
 
 case 138: {
     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier;
     sym(1).type_qualifier.layout_list = 0;
 }   break;
 
-#line 1734 "./glsl.g"
+#line 1730 "./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 1742 "./glsl.g"
+#line 1738 "./glsl.g"
 
 case 140: {
     sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant;
     sym(1).type_qualifier.layout_list = 0;
 }   break;
 
-#line 1750 "./glsl.g"
+#line 1746 "./glsl.g"
 
 case 141: {
     sym(1).qualifier = QualifiedTypeAST::Const;
 }   break;
 
-#line 1757 "./glsl.g"
+#line 1753 "./glsl.g"
 
 case 142: {
     sym(1).qualifier = QualifiedTypeAST::Attribute;
 }   break;
 
-#line 1764 "./glsl.g"
+#line 1760 "./glsl.g"
 
 case 143: {
     sym(1).qualifier = QualifiedTypeAST::Varying;
 }   break;
 
-#line 1771 "./glsl.g"
+#line 1767 "./glsl.g"
 
 case 144: {
     sym(1).qualifier = QualifiedTypeAST::CentroidVarying;
 }   break;
 
-#line 1778 "./glsl.g"
+#line 1774 "./glsl.g"
 
 case 145: {
     sym(1).qualifier = QualifiedTypeAST::In;
 }   break;
 
-#line 1785 "./glsl.g"
+#line 1781 "./glsl.g"
 
 case 146: {
     sym(1).qualifier = QualifiedTypeAST::Out;
 }   break;
 
-#line 1792 "./glsl.g"
+#line 1788 "./glsl.g"
 
 case 147: {
     sym(1).qualifier = QualifiedTypeAST::CentroidIn;
 }   break;
 
-#line 1799 "./glsl.g"
+#line 1795 "./glsl.g"
 
 case 148: {
     sym(1).qualifier = QualifiedTypeAST::CentroidOut;
 }   break;
 
-#line 1806 "./glsl.g"
+#line 1802 "./glsl.g"
 
 case 149: {
     sym(1).qualifier = QualifiedTypeAST::PatchIn;
 }   break;
 
-#line 1813 "./glsl.g"
+#line 1809 "./glsl.g"
 
 case 150: {
     sym(1).qualifier = QualifiedTypeAST::PatchOut;
 }   break;
 
-#line 1820 "./glsl.g"
+#line 1816 "./glsl.g"
 
 case 151: {
     sym(1).qualifier = QualifiedTypeAST::SampleIn;
 }   break;
 
-#line 1827 "./glsl.g"
+#line 1823 "./glsl.g"
 
 case 152: {
     sym(1).qualifier = QualifiedTypeAST::SampleOut;
 }   break;
 
-#line 1834 "./glsl.g"
+#line 1830 "./glsl.g"
 
 case 153: {
     sym(1).qualifier = QualifiedTypeAST::Uniform;
 }   break;
 
-#line 1841 "./glsl.g"
+#line 1837 "./glsl.g"
 
 case 154: {
     // nothing to do.
 }   break;
 
-#line 1848 "./glsl.g"
+#line 1844 "./glsl.g"
 
 case 155: {
     if (!type(2)->setPrecision(sym(1).precision)) {
@@ -1272,595 +1272,595 @@ case 155: {
     ast(1) = type(2);
 }   break;
 
-#line 1858 "./glsl.g"
+#line 1854 "./glsl.g"
 
 case 156: {
     // nothing to do.
 }   break;
 
-#line 1865 "./glsl.g"
+#line 1861 "./glsl.g"
 
 case 157: {
     ast(1) = makeAstNode<ArrayTypeAST>(type(1));
 }   break;
 
-#line 1872 "./glsl.g"
+#line 1868 "./glsl.g"
 
 case 158: {
     ast(1) = makeAstNode<ArrayTypeAST>(type(1), expression(3));
 }   break;
 
-#line 1879 "./glsl.g"
+#line 1875 "./glsl.g"
 
 case 159: {
     ast(1) = makeBasicType(T_VOID);
 }   break;
 
-#line 1886 "./glsl.g"
+#line 1882 "./glsl.g"
 
 case 160: {
     ast(1) = makeBasicType(T_FLOAT);
 }   break;
 
-#line 1893 "./glsl.g"
+#line 1889 "./glsl.g"
 
 case 161: {
     ast(1) = makeBasicType(T_DOUBLE);
 }   break;
 
-#line 1900 "./glsl.g"
+#line 1896 "./glsl.g"
 
 case 162: {
     ast(1) = makeBasicType(T_INT);
 }   break;
 
-#line 1907 "./glsl.g"
+#line 1903 "./glsl.g"
 
 case 163: {
     ast(1) = makeBasicType(T_UINT);
 }   break;
 
-#line 1914 "./glsl.g"
+#line 1910 "./glsl.g"
 
 case 164: {
     ast(1) = makeBasicType(T_BOOL);
 }   break;
 
-#line 1921 "./glsl.g"
+#line 1917 "./glsl.g"
 
 case 165: {
     ast(1) = makeBasicType(T_VEC2);
 }   break;
 
-#line 1928 "./glsl.g"
+#line 1924 "./glsl.g"
 
 case 166: {
     ast(1) = makeBasicType(T_VEC3);
 }   break;
 
-#line 1935 "./glsl.g"
+#line 1931 "./glsl.g"
 
 case 167: {
     ast(1) = makeBasicType(T_VEC4);
 }   break;
 
-#line 1942 "./glsl.g"
+#line 1938 "./glsl.g"
 
 case 168: {
     ast(1) = makeBasicType(T_DVEC2);
 }   break;
 
-#line 1949 "./glsl.g"
+#line 1945 "./glsl.g"
 
 case 169: {
     ast(1) = makeBasicType(T_DVEC3);
 }   break;
 
-#line 1956 "./glsl.g"
+#line 1952 "./glsl.g"
 
 case 170: {
     ast(1) = makeBasicType(T_DVEC4);
 }   break;
 
-#line 1963 "./glsl.g"
+#line 1959 "./glsl.g"
 
 case 171: {
     ast(1) = makeBasicType(T_BVEC2);
 }   break;
 
-#line 1970 "./glsl.g"
+#line 1966 "./glsl.g"
 
 case 172: {
     ast(1) = makeBasicType(T_BVEC3);
 }   break;
 
-#line 1977 "./glsl.g"
+#line 1973 "./glsl.g"
 
 case 173: {
     ast(1) = makeBasicType(T_BVEC4);
 }   break;
 
-#line 1984 "./glsl.g"
+#line 1980 "./glsl.g"
 
 case 174: {
     ast(1) = makeBasicType(T_IVEC2);
 }   break;
 
-#line 1991 "./glsl.g"
+#line 1987 "./glsl.g"
 
 case 175: {
     ast(1) = makeBasicType(T_IVEC3);
 }   break;
 
-#line 1998 "./glsl.g"
+#line 1994 "./glsl.g"
 
 case 176: {
     ast(1) = makeBasicType(T_IVEC4);
 }   break;
 
-#line 2005 "./glsl.g"
+#line 2001 "./glsl.g"
 
 case 177: {
     ast(1) = makeBasicType(T_UVEC2);
 }   break;
 
-#line 2012 "./glsl.g"
+#line 2008 "./glsl.g"
 
 case 178: {
     ast(1) = makeBasicType(T_UVEC3);
 }   break;
 
-#line 2019 "./glsl.g"
+#line 2015 "./glsl.g"
 
 case 179: {
     ast(1) = makeBasicType(T_UVEC4);
 }   break;
 
-#line 2026 "./glsl.g"
+#line 2022 "./glsl.g"
 
 case 180: {
     ast(1) = makeBasicType(T_MAT2);
 }   break;
 
-#line 2033 "./glsl.g"
+#line 2029 "./glsl.g"
 
 case 181: {
     ast(1) = makeBasicType(T_MAT3);
 }   break;
 
-#line 2040 "./glsl.g"
+#line 2036 "./glsl.g"
 
 case 182: {
     ast(1) = makeBasicType(T_MAT4);
 }   break;
 
-#line 2047 "./glsl.g"
+#line 2043 "./glsl.g"
 
 case 183: {
     ast(1) = makeBasicType(T_MAT2);
 }   break;
 
-#line 2054 "./glsl.g"
+#line 2050 "./glsl.g"
 
 case 184: {
     ast(1) = makeBasicType(T_MAT2X3);
 }   break;
 
-#line 2061 "./glsl.g"
+#line 2057 "./glsl.g"
 
 case 185: {
     ast(1) = makeBasicType(T_MAT2X4);
 }   break;
 
-#line 2068 "./glsl.g"
+#line 2064 "./glsl.g"
 
 case 186: {
     ast(1) = makeBasicType(T_MAT3X2);
 }   break;
 
-#line 2075 "./glsl.g"
+#line 2071 "./glsl.g"
 
 case 187: {
     ast(1) = makeBasicType(T_MAT3);
 }   break;
 
-#line 2082 "./glsl.g"
+#line 2078 "./glsl.g"
 
 case 188: {
     ast(1) = makeBasicType(T_MAT3X4);
 }   break;
 
-#line 2089 "./glsl.g"
+#line 2085 "./glsl.g"
 
 case 189: {
     ast(1) = makeBasicType(T_MAT4X2);
 }   break;
 
-#line 2096 "./glsl.g"
+#line 2092 "./glsl.g"
 
 case 190: {
     ast(1) = makeBasicType(T_MAT4X3);
 }   break;
 
-#line 2103 "./glsl.g"
+#line 2099 "./glsl.g"
 
 case 191: {
     ast(1) = makeBasicType(T_MAT4);
 }   break;
 
-#line 2110 "./glsl.g"
+#line 2106 "./glsl.g"
 
 case 192: {
     ast(1) = makeBasicType(T_DMAT2);
 }   break;
 
-#line 2117 "./glsl.g"
+#line 2113 "./glsl.g"
 
 case 193: {
     ast(1) = makeBasicType(T_DMAT3);
 }   break;
 
-#line 2124 "./glsl.g"
+#line 2120 "./glsl.g"
 
 case 194: {
     ast(1) = makeBasicType(T_DMAT4);
 }   break;
 
-#line 2131 "./glsl.g"
+#line 2127 "./glsl.g"
 
 case 195: {
     ast(1) = makeBasicType(T_DMAT2);
 }   break;
 
-#line 2138 "./glsl.g"
+#line 2134 "./glsl.g"
 
 case 196: {
     ast(1) = makeBasicType(T_DMAT2X3);
 }   break;
 
-#line 2145 "./glsl.g"
+#line 2141 "./glsl.g"
 
 case 197: {
     ast(1) = makeBasicType(T_DMAT2X4);
 }   break;
 
-#line 2152 "./glsl.g"
+#line 2148 "./glsl.g"
 
 case 198: {
     ast(1) = makeBasicType(T_DMAT3X2);
 }   break;
 
-#line 2159 "./glsl.g"
+#line 2155 "./glsl.g"
 
 case 199: {
     ast(1) = makeBasicType(T_DMAT3);
 }   break;
 
-#line 2166 "./glsl.g"
+#line 2162 "./glsl.g"
 
 case 200: {
     ast(1) = makeBasicType(T_DMAT3X4);
 }   break;
 
-#line 2173 "./glsl.g"
+#line 2169 "./glsl.g"
 
 case 201: {
     ast(1) = makeBasicType(T_DMAT4X2);
 }   break;
 
-#line 2180 "./glsl.g"
+#line 2176 "./glsl.g"
 
 case 202: {
     ast(1) = makeBasicType(T_DMAT4X3);
 }   break;
 
-#line 2187 "./glsl.g"
+#line 2183 "./glsl.g"
 
 case 203: {
     ast(1) = makeBasicType(T_DMAT4);
 }   break;
 
-#line 2194 "./glsl.g"
+#line 2190 "./glsl.g"
 
 case 204: {
     ast(1) = makeBasicType(T_SAMPLER1D);
 }   break;
 
-#line 2201 "./glsl.g"
+#line 2197 "./glsl.g"
 
 case 205: {
     ast(1) = makeBasicType(T_SAMPLER2D);
 }   break;
 
-#line 2208 "./glsl.g"
+#line 2204 "./glsl.g"
 
 case 206: {
     ast(1) = makeBasicType(T_SAMPLER3D);
 }   break;
 
-#line 2215 "./glsl.g"
+#line 2211 "./glsl.g"
 
 case 207: {
     ast(1) = makeBasicType(T_SAMPLERCUBE);
 }   break;
 
-#line 2222 "./glsl.g"
+#line 2218 "./glsl.g"
 
 case 208: {
     ast(1) = makeBasicType(T_SAMPLER1DSHADOW);
 }   break;
 
-#line 2229 "./glsl.g"
+#line 2225 "./glsl.g"
 
 case 209: {
     ast(1) = makeBasicType(T_SAMPLER2DSHADOW);
 }   break;
 
-#line 2236 "./glsl.g"
+#line 2232 "./glsl.g"
 
 case 210: {
     ast(1) = makeBasicType(T_SAMPLERCUBESHADOW);
 }   break;
 
-#line 2243 "./glsl.g"
+#line 2239 "./glsl.g"
 
 case 211: {
     ast(1) = makeBasicType(T_SAMPLER1DARRAY);
 }   break;
 
-#line 2250 "./glsl.g"
+#line 2246 "./glsl.g"
 
 case 212: {
     ast(1) = makeBasicType(T_SAMPLER2DARRAY);
 }   break;
 
-#line 2257 "./glsl.g"
+#line 2253 "./glsl.g"
 
 case 213: {
     ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW);
 }   break;
 
-#line 2264 "./glsl.g"
+#line 2260 "./glsl.g"
 
 case 214: {
     ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW);
 }   break;
 
-#line 2271 "./glsl.g"
+#line 2267 "./glsl.g"
 
 case 215: {
     ast(1) = makeBasicType(T_SAMPLERCUBEARRAY);
 }   break;
 
-#line 2278 "./glsl.g"
+#line 2274 "./glsl.g"
 
 case 216: {
     ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW);
 }   break;
 
-#line 2285 "./glsl.g"
+#line 2281 "./glsl.g"
 
 case 217: {
     ast(1) = makeBasicType(T_ISAMPLER1D);
 }   break;
 
-#line 2292 "./glsl.g"
+#line 2288 "./glsl.g"
 
 case 218: {
     ast(1) = makeBasicType(T_ISAMPLER2D);
 }   break;
 
-#line 2299 "./glsl.g"
+#line 2295 "./glsl.g"
 
 case 219: {
     ast(1) = makeBasicType(T_ISAMPLER3D);
 }   break;
 
-#line 2306 "./glsl.g"
+#line 2302 "./glsl.g"
 
 case 220: {
     ast(1) = makeBasicType(T_ISAMPLERCUBE);
 }   break;
 
-#line 2313 "./glsl.g"
+#line 2309 "./glsl.g"
 
 case 221: {
     ast(1) = makeBasicType(T_ISAMPLER1DARRAY);
 }   break;
 
-#line 2320 "./glsl.g"
+#line 2316 "./glsl.g"
 
 case 222: {
     ast(1) = makeBasicType(T_ISAMPLER2DARRAY);
 }   break;
 
-#line 2327 "./glsl.g"
+#line 2323 "./glsl.g"
 
 case 223: {
     ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY);
 }   break;
 
-#line 2334 "./glsl.g"
+#line 2330 "./glsl.g"
 
 case 224: {
     ast(1) = makeBasicType(T_USAMPLER1D);
 }   break;
 
-#line 2341 "./glsl.g"
+#line 2337 "./glsl.g"
 
 case 225: {
     ast(1) = makeBasicType(T_USAMPLER2D);
 }   break;
 
-#line 2348 "./glsl.g"
+#line 2344 "./glsl.g"
 
 case 226: {
     ast(1) = makeBasicType(T_USAMPLER3D);
 }   break;
 
-#line 2355 "./glsl.g"
+#line 2351 "./glsl.g"
 
 case 227: {
     ast(1) = makeBasicType(T_USAMPLERCUBE);
 }   break;
 
-#line 2362 "./glsl.g"
+#line 2358 "./glsl.g"
 
 case 228: {
     ast(1) = makeBasicType(T_USAMPLER1DARRAY);
 }   break;
 
-#line 2369 "./glsl.g"
+#line 2365 "./glsl.g"
 
 case 229: {
     ast(1) = makeBasicType(T_USAMPLER2DARRAY);
 }   break;
 
-#line 2376 "./glsl.g"
+#line 2372 "./glsl.g"
 
 case 230: {
     ast(1) = makeBasicType(T_USAMPLERCUBEARRAY);
 }   break;
 
-#line 2383 "./glsl.g"
+#line 2379 "./glsl.g"
 
 case 231: {
     ast(1) = makeBasicType(T_SAMPLER2DRECT);
 }   break;
 
-#line 2390 "./glsl.g"
+#line 2386 "./glsl.g"
 
 case 232: {
     ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW);
 }   break;
 
-#line 2397 "./glsl.g"
+#line 2393 "./glsl.g"
 
 case 233: {
     ast(1) = makeBasicType(T_ISAMPLER2DRECT);
 }   break;
 
-#line 2404 "./glsl.g"
+#line 2400 "./glsl.g"
 
 case 234: {
     ast(1) = makeBasicType(T_USAMPLER2DRECT);
 }   break;
 
-#line 2411 "./glsl.g"
+#line 2407 "./glsl.g"
 
 case 235: {
     ast(1) = makeBasicType(T_SAMPLERBUFFER);
 }   break;
 
-#line 2418 "./glsl.g"
+#line 2414 "./glsl.g"
 
 case 236: {
     ast(1) = makeBasicType(T_ISAMPLERBUFFER);
 }   break;
 
-#line 2425 "./glsl.g"
+#line 2421 "./glsl.g"
 
 case 237: {
     ast(1) = makeBasicType(T_USAMPLERBUFFER);
 }   break;
 
-#line 2432 "./glsl.g"
+#line 2428 "./glsl.g"
 
 case 238: {
     ast(1) = makeBasicType(T_SAMPLER2DMS);
 }   break;
 
-#line 2439 "./glsl.g"
+#line 2435 "./glsl.g"
 
 case 239: {
     ast(1) = makeBasicType(T_ISAMPLER2DMS);
 }   break;
 
-#line 2446 "./glsl.g"
+#line 2442 "./glsl.g"
 
 case 240: {
     ast(1) = makeBasicType(T_USAMPLER2DMS);
 }   break;
 
-#line 2453 "./glsl.g"
+#line 2449 "./glsl.g"
 
 case 241: {
     ast(1) = makeBasicType(T_SAMPLER2DMSARRAY);
 }   break;
 
-#line 2460 "./glsl.g"
+#line 2456 "./glsl.g"
 
 case 242: {
     ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY);
 }   break;
 
-#line 2467 "./glsl.g"
+#line 2463 "./glsl.g"
 
 case 243: {
     ast(1) = makeBasicType(T_USAMPLER2DMSARRAY);
 }   break;
 
-#line 2474 "./glsl.g"
+#line 2470 "./glsl.g"
 
 case 244: {
     // nothing to do.
 }   break;
 
-#line 2481 "./glsl.g"
+#line 2477 "./glsl.g"
 
 case 245: {
     ast(1) = makeAstNode<NamedTypeAST>(string(1));
 }   break;
 
-#line 2488 "./glsl.g"
+#line 2484 "./glsl.g"
 
 case 246: {
     sym(1).precision = TypeAST::Highp;
 }   break;
 
-#line 2495 "./glsl.g"
+#line 2491 "./glsl.g"
 
 case 247: {
     sym(1).precision = TypeAST::Mediump;
 }   break;
 
-#line 2502 "./glsl.g"
+#line 2498 "./glsl.g"
 
 case 248: {
     sym(1).precision = TypeAST::Lowp;
 }   break;
 
-#line 2509 "./glsl.g"
+#line 2505 "./glsl.g"
 
 case 249: {
     ast(1) = makeAstNode<StructTypeAST>(string(2), sym(4).field_list);
 }   break;
 
-#line 2516 "./glsl.g"
+#line 2512 "./glsl.g"
 
 case 250: {
     ast(1) = makeAstNode<StructTypeAST>(sym(3).field_list);
 }   break;
 
-#line 2523 "./glsl.g"
+#line 2519 "./glsl.g"
 
 case 251: {
     // nothing to do.
 }   break;
 
-#line 2530 "./glsl.g"
+#line 2526 "./glsl.g"
 
 case 252: {
     sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list);
 }   break;
 
-#line 2537 "./glsl.g"
+#line 2533 "./glsl.g"
 
 case 253: {
     sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list);
 }   break;
 
-#line 2544 "./glsl.g"
+#line 2540 "./glsl.g"
 
 case 254: {
     sym(1).field_list = StructTypeAST::fixInnerTypes
@@ -1869,106 +1869,106 @@ case 254: {
              sym(1).type_qualifier.layout_list), sym(3).field_list);
 }   break;
 
-#line 2554 "./glsl.g"
+#line 2550 "./glsl.g"
 
 case 255: {
     // nothing to do.
     sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field);
 }   break;
 
-#line 2562 "./glsl.g"
+#line 2558 "./glsl.g"
 
 case 256: {
     sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field_list, sym(3).field);
 }   break;
 
-#line 2569 "./glsl.g"
+#line 2565 "./glsl.g"
 
 case 257: {
     sym(1).field = makeAstNode<StructTypeAST::Field>(string(1));
 }   break;
 
-#line 2576 "./glsl.g"
+#line 2572 "./glsl.g"
 
 case 258: {
     sym(1).field = makeAstNode<StructTypeAST::Field>
         (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0));
 }   break;
 
-#line 2584 "./glsl.g"
+#line 2580 "./glsl.g"
 
 case 259: {
     sym(1).field = makeAstNode<StructTypeAST::Field>
         (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0, expression(3)));
 }   break;
 
-#line 2592 "./glsl.g"
+#line 2588 "./glsl.g"
 
 case 260: {
     // nothing to do.
 }   break;
 
-#line 2599 "./glsl.g"
+#line 2595 "./glsl.g"
 
 case 261: {
     ast(1) = makeAstNode<DeclarationStatementAST>(sym(1).declaration);
 }   break;
 
-#line 2606 "./glsl.g"
+#line 2602 "./glsl.g"
 
 case 262: {
     // nothing to do.
 }   break;
 
-#line 2613 "./glsl.g"
+#line 2609 "./glsl.g"
 
 case 263: {
     // nothing to do.
 }   break;
 
-#line 2620 "./glsl.g"
+#line 2616 "./glsl.g"
 
 case 264: {
     // nothing to do.
 }   break;
 
-#line 2627 "./glsl.g"
+#line 2623 "./glsl.g"
 
 case 265: {
     // nothing to do.
 }   break;
 
-#line 2634 "./glsl.g"
+#line 2630 "./glsl.g"
 
 case 266: {
     // nothing to do.
 }   break;
 
-#line 2641 "./glsl.g"
+#line 2637 "./glsl.g"
 
 case 267: {
     // nothing to do.
 }   break;
 
-#line 2648 "./glsl.g"
+#line 2644 "./glsl.g"
 
 case 268: {
     // nothing to do.
 }   break;
 
-#line 2655 "./glsl.g"
+#line 2651 "./glsl.g"
 
 case 269: {
     // nothing to do.
 }   break;
 
-#line 2662 "./glsl.g"
+#line 2658 "./glsl.g"
 
 case 270: {
     // nothing to do.
 }   break;
 
-#line 2669 "./glsl.g"
+#line 2665 "./glsl.g"
 
 case 271: {
     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>();
@@ -1977,7 +1977,7 @@ case 271: {
     ast(1) = stmt;
 }   break;
 
-#line 2679 "./glsl.g"
+#line 2675 "./glsl.g"
 
 case 272: {
     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list);
@@ -1986,19 +1986,19 @@ case 272: {
     ast(1) = stmt;
 }   break;
 
-#line 2689 "./glsl.g"
+#line 2685 "./glsl.g"
 
 case 273: {
     // nothing to do.
 }   break;
 
-#line 2696 "./glsl.g"
+#line 2692 "./glsl.g"
 
 case 274: {
     // nothing to do.
 }   break;
 
-#line 2703 "./glsl.g"
+#line 2699 "./glsl.g"
 
 case 275: {
     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>();
@@ -2007,7 +2007,7 @@ case 275: {
     ast(1) = stmt;
 }   break;
 
-#line 2713 "./glsl.g"
+#line 2709 "./glsl.g"
 
 case 276: {
     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list);
@@ -2016,186 +2016,186 @@ case 276: {
     ast(1) = stmt;
 }   break;
 
-#line 2723 "./glsl.g"
+#line 2719 "./glsl.g"
 
 case 277: {
     sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement);
 }   break;
 
-#line 2730 "./glsl.g"
+#line 2726 "./glsl.g"
 
 case 278: {
     sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement_list, sym(2).statement);
 }   break;
 
-#line 2737 "./glsl.g"
+#line 2733 "./glsl.g"
 
 case 279: {
     ast(1) = makeAstNode<CompoundStatementAST>();  // Empty statement
 }   break;
 
-#line 2744 "./glsl.g"
+#line 2740 "./glsl.g"
 
 case 280: {
     ast(1) = makeAstNode<ExpressionStatementAST>(expression(1));
 }   break;
 
-#line 2751 "./glsl.g"
+#line 2747 "./glsl.g"
 
 case 281: {
     ast(1) = makeAstNode<IfStatementAST>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause);
 }   break;
 
-#line 2758 "./glsl.g"
+#line 2754 "./glsl.g"
 
 case 282: {
     sym(1).ifstmt.thenClause = statement(1);
     sym(1).ifstmt.elseClause = statement(3);
 }   break;
 
-#line 2766 "./glsl.g"
+#line 2762 "./glsl.g"
 
 case 283: {
     sym(1).ifstmt.thenClause = statement(1);
     sym(1).ifstmt.elseClause = 0;
 }   break;
 
-#line 2774 "./glsl.g"
+#line 2770 "./glsl.g"
 
 case 284: {
     // nothing to do.
 }   break;
 
-#line 2781 "./glsl.g"
+#line 2777 "./glsl.g"
 
 case 285: {
     ast(1) = makeAstNode<DeclarationExpressionAST>
         (type(1), string(2), expression(4));
 }   break;
 
-#line 2789 "./glsl.g"
+#line 2785 "./glsl.g"
 
 case 286: {
     ast(1) = makeAstNode<SwitchStatementAST>(expression(3), statement(6));
 }   break;
 
-#line 2796 "./glsl.g"
+#line 2792 "./glsl.g"
 
 case 287: {
     ast(1) = makeAstNode<CompoundStatementAST>();
 }   break;
 
-#line 2803 "./glsl.g"
+#line 2799 "./glsl.g"
 
 case 288: {
     ast(1) = makeAstNode<CompoundStatementAST>(sym(1).statement_list);
 }   break;
 
-#line 2810 "./glsl.g"
+#line 2806 "./glsl.g"
 
 case 289: {
     ast(1) = makeAstNode<CaseLabelStatementAST>(expression(2));
 }   break;
 
-#line 2817 "./glsl.g"
+#line 2813 "./glsl.g"
 
 case 290: {
     ast(1) = makeAstNode<CaseLabelStatementAST>();
 }   break;
 
-#line 2824 "./glsl.g"
+#line 2820 "./glsl.g"
 
 case 291: {
     ast(1) = makeAstNode<WhileStatementAST>(expression(3), statement(5));
 }   break;
 
-#line 2831 "./glsl.g"
+#line 2827 "./glsl.g"
 
 case 292: {
     ast(1) = makeAstNode<DoStatementAST>(statement(2), expression(5));
 }   break;
 
-#line 2838 "./glsl.g"
+#line 2834 "./glsl.g"
 
 case 293: {
     ast(1) = makeAstNode<ForStatementAST>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6));
 }   break;
 
-#line 2845 "./glsl.g"
+#line 2841 "./glsl.g"
 
 case 294: {
     // nothing to do.
 }   break;
 
-#line 2852 "./glsl.g"
+#line 2848 "./glsl.g"
 
 case 295: {
     // nothing to do.
 }   break;
 
-#line 2859 "./glsl.g"
+#line 2855 "./glsl.g"
 
 case 296: {
     // nothing to do.
 }   break;
 
-#line 2866 "./glsl.g"
+#line 2862 "./glsl.g"
 
 case 297: {
     // nothing to do.
 }   break;
 
-#line 2873 "./glsl.g"
+#line 2869 "./glsl.g"
 
 case 298: {
     sym(1).forstmt.condition = expression(1);
     sym(1).forstmt.increment = 0;
 }   break;
 
-#line 2881 "./glsl.g"
+#line 2877 "./glsl.g"
 
 case 299: {
     sym(1).forstmt.condition = expression(1);
     sym(1).forstmt.increment = expression(3);
 }   break;
 
-#line 2889 "./glsl.g"
+#line 2885 "./glsl.g"
 
 case 300: {
     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Continue);
 }   break;
 
-#line 2896 "./glsl.g"
+#line 2892 "./glsl.g"
 
 case 301: {
     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Break);
 }   break;
 
-#line 2903 "./glsl.g"
+#line 2899 "./glsl.g"
 
 case 302: {
     ast(1) = makeAstNode<ReturnStatementAST>();
 }   break;
 
-#line 2910 "./glsl.g"
+#line 2906 "./glsl.g"
 
 case 303: {
     ast(1) = makeAstNode<ReturnStatementAST>(expression(2));
 }   break;
 
-#line 2917 "./glsl.g"
+#line 2913 "./glsl.g"
 
 case 304: {
     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Discard);
 }   break;
 
-#line 2924 "./glsl.g"
+#line 2920 "./glsl.g"
 
 case 305: {
     ast(1) = makeAstNode<TranslationUnitAST>(sym(1).declaration_list);
 }   break;
 
-#line 2931 "./glsl.g"
+#line 2927 "./glsl.g"
 
 case 306: {
     if (sym(1).declaration) {
@@ -2206,7 +2206,7 @@ case 306: {
     }
 }   break;
 
-#line 2943 "./glsl.g"
+#line 2939 "./glsl.g"
 
 case 307: {
     if (sym(1).declaration_list && sym(2).declaration) {
@@ -2222,49 +2222,49 @@ case 307: {
     }
 }   break;
 
-#line 2960 "./glsl.g"
+#line 2956 "./glsl.g"
 
 case 308: {
     // nothing to do.
 }   break;
 
-#line 2967 "./glsl.g"
+#line 2963 "./glsl.g"
 
 case 309: {
     // nothing to do.
 }   break;
 
-#line 2974 "./glsl.g"
+#line 2970 "./glsl.g"
 
 case 310: {
     ast(1) = 0;
 }   break;
 
-#line 2981 "./glsl.g"
+#line 2977 "./glsl.g"
 
 case 311: {
     function(1)->body = statement(2);
 }   break;
 
-#line 2988 "./glsl.g"
+#line 2984 "./glsl.g"
 
 case 312: {
     ast(1) = 0;
 }   break;
 
-#line 2996 "./glsl.g"
+#line 2992 "./glsl.g"
 
 case 313: {
     ast(1) = ast(2);
 }   break;
 
-#line 3003 "./glsl.g"
+#line 2999 "./glsl.g"
 
 case 314: {
     ast(1) = ast(2);
 }   break;
 
-#line 3009 "./glsl.g"
+#line 3005 "./glsl.g"
 
 } // end switch
 } // end Parser::reduce()
diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h
index 8857b580c1..45acaf00cd 100644
--- a/src/libs/glsl/glslparser.h
+++ b/src/libs/glsl/glslparser.h
@@ -1,5 +1,5 @@
 
-#line 217 "./glsl.g"
+#line 213 "./glsl.g"
 
 /**************************************************************************
 **
diff --git a/src/libs/glsl/glslparsertable.cpp b/src/libs/glsl/glslparsertable.cpp
index 40d653058a..61a805dfeb 100644
--- a/src/libs/glsl/glslparsertable.cpp
+++ b/src/libs/glsl/glslparsertable.cpp
@@ -61,7 +61,7 @@ const char *const GLSLParserTable::spell [] = {
   "samplerCube", "samplerCubeArray", "samplerCubeArrayShadow", "samplerCubeShadow", ";", "/", "smooth", "*", "struct", "subroutine", 
   "-=", "switch", "~", "type_name", "uint", "uniform", "usampler1D", "usampler1DArray", "usampler2D", "usampler2DArray", 
   "usampler2DMS", "usampler2DMSarray", "usampler2DRect", "usampler3D", "usamplerBuffer", "usamplerCube", "usamplerCubeArray", "uvec2", "uvec3", "uvec4", 
-  "varying", "vec2", "vec3", "vec4", "|", "void", "while", "^=", "^", "true", 
+  "varying", "vec2", "vec3", "vec4", "|", "void", "while", "^=", "^^", "true", 
   "false", "preprocessor directive", "comment", "error", "reserved word"};
 
 const short GLSLParserTable::lhs [] = {
-- 
2.11.0