Extend the grammar of QML binding declarations.

This allows the use of non-iterative statements
on the right hand side of a binding declaration.

Change-Id: I60fac880766ba99a410b3647e41b1252677a372f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g
index 7f8e0b6..da8ce4c 100644 (file)
--- a/src/declarative/qml/parser/qdeclarativejs.g
+++ b/src/declarative/qml/parser/qdeclarativejs.g
@@ -790,7 +790,10 @@ case $rule_number: {
 UiScriptStatement: Block ;
 UiScriptStatement: EmptyStatement ;
 UiScriptStatement: ExpressionStatement ;
-UiScriptStatement: IfStatement ;  --- ### do we really want if statement in a binding?
+UiScriptStatement: IfStatement ;
+UiScriptStatement: WithStatement ;
+UiScriptStatement: SwitchStatement ;
+UiScriptStatement: TryStatement ;
 
 UiObjectMember: UiQualifiedId T_COLON UiScriptStatement ;
 /.

diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
index 89c00c2..54510a0 100644 (file)
--- a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp
@@ -61,397 +61,405 @@ const short QDeclarativeJSGrammar::lhs [] = {
   102, 102, 102, 102, 102, 102, 103, 109, 109, 112, 
   112, 114, 113, 113, 113, 113, 113, 113, 113, 113, 
   116, 111, 110, 119, 119, 120, 120, 121, 121, 118, 
-  107, 107, 107, 107, 123, 123, 123, 123, 107, 128, 
-  128, 128, 129, 129, 130, 130, 107, 107, 107, 107, 
+  107, 107, 107, 107, 123, 123, 123, 123, 123, 123, 
+  123, 107, 131, 131, 131, 132, 132, 133, 133, 107, 
   107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-  107, 107, 107, 117, 117, 117, 117, 117, 133, 133, 
-  133, 133, 133, 133, 133, 133, 133, 133, 133, 133, 
-  133, 133, 133, 133, 133, 133, 122, 135, 135, 135, 
-  135, 134, 134, 137, 137, 139, 139, 139, 139, 139, 
-  139, 140, 140, 140, 140, 140, 140, 140, 140, 140, 
-  140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 
-  140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 
-  140, 140, 141, 141, 115, 115, 115, 115, 115, 144, 
-  144, 145, 145, 145, 145, 143, 143, 146, 146, 147, 
-  147, 148, 148, 148, 149, 149, 149, 149, 149, 149, 
-  149, 149, 149, 149, 150, 150, 150, 150, 151, 151, 
-  151, 152, 152, 152, 152, 153, 153, 153, 153, 153, 
-  153, 153, 154, 154, 154, 154, 154, 154, 155, 155, 
-  155, 155, 155, 156, 156, 156, 156, 156, 157, 157, 
-  158, 158, 159, 159, 160, 160, 161, 161, 162, 162, 
-  163, 163, 164, 164, 165, 165, 166, 166, 167, 167, 
-  168, 168, 138, 138, 169, 169, 170, 170, 170, 170, 
-  170, 170, 170, 170, 170, 170, 170, 170, 105, 105, 
-  171, 171, 172, 172, 173, 173, 104, 104, 104, 104, 
+  107, 107, 107, 107, 107, 107, 117, 117, 117, 117, 
+  117, 136, 136, 136, 136, 136, 136, 136, 136, 136, 
+  136, 136, 136, 136, 136, 136, 136, 136, 136, 122, 
+  138, 138, 138, 138, 137, 137, 140, 140, 142, 142, 
+  142, 142, 142, 142, 143, 143, 143, 143, 143, 143, 
+  143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 
+  143, 143, 143, 143, 143, 143, 143, 143, 143, 143, 
+  143, 143, 143, 143, 143, 144, 144, 115, 115, 115, 
+  115, 115, 147, 147, 148, 148, 148, 148, 146, 146, 
+  149, 149, 150, 150, 151, 151, 151, 152, 152, 152, 
+  152, 152, 152, 152, 152, 152, 152, 153, 153, 153, 
+  153, 154, 154, 154, 155, 155, 155, 155, 156, 156, 
+  156, 156, 156, 156, 156, 157, 157, 157, 157, 157, 
+  157, 158, 158, 158, 158, 158, 159, 159, 159, 159, 
+  159, 160, 160, 161, 161, 162, 162, 163, 163, 164, 
+  164, 165, 165, 166, 166, 167, 167, 168, 168, 169, 
+  169, 170, 170, 171, 171, 141, 141, 172, 172, 173, 
+  173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
+  173, 105, 105, 174, 174, 175, 175, 176, 176, 104, 
   104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 
-  104, 124, 185, 185, 184, 184, 132, 132, 186, 186, 
-  187, 187, 189, 189, 188, 190, 193, 191, 191, 194, 
-  192, 192, 125, 126, 126, 127, 127, 174, 174, 174, 
-  174, 174, 174, 174, 175, 175, 175, 175, 176, 176, 
-  176, 176, 177, 177, 178, 180, 195, 195, 198, 198, 
-  196, 196, 199, 197, 179, 179, 179, 181, 181, 182, 
-  182, 182, 200, 201, 183, 183, 131, 142, 205, 205, 
-  202, 202, 203, 203, 206, 108, 207, 207, 106, 106, 
-  204, 204, 136, 136, 208};
+  104, 104, 104, 104, 124, 185, 185, 184, 184, 135, 
+  135, 186, 186, 187, 187, 189, 189, 188, 190, 193, 
+  191, 191, 194, 192, 192, 125, 126, 126, 127, 127, 
+  177, 177, 177, 177, 177, 177, 177, 178, 178, 178, 
+  178, 179, 179, 179, 179, 180, 180, 128, 129, 195, 
+  195, 198, 198, 196, 196, 199, 197, 181, 181, 181, 
+  182, 182, 130, 130, 130, 200, 201, 183, 183, 134, 
+  145, 205, 205, 202, 202, 203, 203, 206, 108, 207, 
+  207, 106, 106, 204, 204, 139, 139, 208};
 
 const short QDeclarativeJSGrammar::rhs [] = {
   2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 
   2, 1, 2, 2, 3, 3, 5, 5, 4, 4, 
   2, 0, 1, 1, 2, 1, 3, 2, 3, 2, 
-  1, 5, 4, 4, 1, 1, 1, 1, 3, 1, 
-  1, 1, 0, 1, 2, 4, 6, 6, 3, 3, 
-  7, 7, 4, 4, 5, 5, 5, 6, 6, 10, 
-  6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 
-  3, 4, 5, 3, 4, 3, 1, 1, 2, 3, 
-  4, 1, 2, 3, 5, 1, 1, 1, 1, 1, 
+  1, 5, 4, 4, 1, 1, 1, 1, 1, 1, 
+  1, 3, 1, 1, 1, 0, 1, 2, 4, 6, 
+  6, 3, 3, 7, 7, 4, 4, 5, 5, 5, 
+  6, 6, 10, 6, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 2, 3, 3, 4, 5, 3, 4, 3, 1, 
+  1, 2, 3, 4, 1, 2, 3, 5, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 4, 3, 5, 1, 
-  2, 4, 4, 4, 3, 0, 1, 1, 3, 1, 
-  1, 1, 2, 2, 1, 2, 2, 2, 2, 2, 
-  2, 2, 2, 2, 1, 3, 3, 3, 1, 3, 
-  3, 1, 3, 3, 3, 1, 3, 3, 3, 3, 
-  3, 3, 1, 3, 3, 3, 3, 3, 1, 3, 
-  3, 3, 3, 1, 3, 3, 3, 3, 1, 3, 
-  1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 
-  1, 3, 1, 3, 1, 3, 1, 3, 1, 5, 
-  1, 5, 1, 3, 1, 3, 1, 1, 1, 1, 
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 
-  0, 1, 1, 3, 0, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  1, 3, 1, 2, 0, 1, 3, 3, 1, 1, 
-  1, 3, 1, 3, 2, 2, 2, 0, 1, 2, 
-  0, 1, 1, 2, 2, 7, 5, 7, 7, 5, 
-  9, 10, 7, 8, 2, 2, 3, 3, 2, 2, 
-  3, 3, 3, 3, 5, 5, 3, 5, 1, 2, 
-  0, 1, 4, 3, 3, 3, 3, 3, 3, 3, 
-  3, 4, 5, 2, 2, 2, 8, 8, 1, 3, 
-  0, 1, 0, 1, 1, 1, 1, 2, 1, 1, 
-  0, 1, 0, 1, 2};
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 
+  3, 5, 1, 2, 4, 4, 4, 3, 0, 1, 
+  1, 3, 1, 1, 1, 2, 2, 1, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 1, 3, 3, 
+  3, 1, 3, 3, 1, 3, 3, 3, 1, 3, 
+  3, 3, 3, 3, 3, 1, 3, 3, 3, 3, 
+  3, 1, 3, 3, 3, 3, 1, 3, 3, 3, 
+  3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 
+  3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 
+  3, 1, 5, 1, 5, 1, 3, 1, 3, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 3, 0, 1, 1, 3, 0, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 3, 1, 2, 0, 1, 3, 
+  3, 1, 1, 1, 3, 1, 3, 2, 2, 2, 
+  0, 1, 2, 0, 1, 1, 2, 2, 7, 5, 
+  7, 7, 5, 9, 10, 7, 8, 2, 2, 3, 
+  3, 2, 2, 3, 3, 3, 3, 5, 5, 3, 
+  5, 1, 2, 0, 1, 4, 3, 3, 3, 3, 
+  3, 3, 3, 3, 4, 5, 2, 2, 2, 8, 
+  8, 1, 3, 0, 1, 0, 1, 1, 1, 1, 
+  2, 1, 1, 0, 1, 0, 1, 2};
 
 const short QDeclarativeJSGrammar::action_default [] = {
-  0, 0, 0, 0, 0, 0, 22, 0, 172, 239, 
-  203, 211, 207, 151, 223, 199, 3, 136, 70, 152, 
-  215, 219, 140, 169, 150, 155, 135, 189, 176, 0, 
-  77, 78, 73, 341, 64, 343, 0, 0, 0, 0, 
-  75, 0, 0, 71, 74, 68, 0, 0, 65, 67, 
-  66, 76, 69, 0, 72, 0, 0, 165, 0, 0, 
-  152, 171, 154, 153, 0, 0, 0, 167, 168, 166, 
-  170, 0, 200, 0, 0, 0, 0, 190, 0, 0, 
-  0, 0, 0, 0, 180, 0, 0, 0, 174, 175, 
-  173, 178, 182, 181, 179, 177, 192, 191, 193, 0, 
-  208, 0, 204, 0, 0, 146, 133, 145, 134, 102, 
-  103, 104, 129, 105, 130, 106, 107, 108, 109, 110, 
-  111, 112, 113, 114, 115, 116, 117, 118, 131, 119, 
-  120, 121, 122, 123, 124, 125, 126, 127, 128, 132, 
-  0, 0, 144, 240, 147, 0, 148, 0, 149, 143, 
-  0, 236, 229, 227, 234, 235, 233, 232, 238, 231, 
-  230, 228, 237, 224, 0, 212, 0, 0, 216, 0, 
-  0, 220, 0, 0, 146, 138, 0, 137, 0, 142, 
-  156, 0, 342, 331, 332, 0, 329, 0, 330, 0, 
-  333, 247, 254, 253, 261, 249, 0, 250, 334, 0, 
-  340, 251, 252, 257, 255, 337, 335, 339, 258, 0, 
-  269, 0, 0, 0, 0, 341, 64, 0, 343, 65, 
-  241, 283, 66, 0, 0, 0, 270, 0, 0, 259, 
-  260, 0, 248, 256, 284, 285, 328, 338, 0, 299, 
-  300, 301, 302, 0, 295, 296, 297, 298, 325, 326, 
-  0, 0, 0, 0, 0, 288, 289, 245, 243, 205, 
-  213, 209, 225, 201, 246, 0, 152, 217, 221, 194, 
-  183, 0, 0, 202, 0, 0, 0, 0, 195, 0, 
-  0, 0, 0, 0, 187, 185, 188, 186, 184, 197, 
-  196, 198, 0, 210, 0, 206, 0, 244, 152, 0, 
-  226, 241, 242, 0, 241, 0, 0, 291, 0, 0, 
-  0, 293, 0, 214, 0, 0, 218, 0, 0, 222, 
-  281, 0, 273, 282, 276, 0, 280, 0, 241, 274, 
-  0, 241, 0, 0, 292, 0, 0, 0, 294, 342, 
-  331, 0, 0, 333, 0, 327, 0, 317, 0, 0, 
-  0, 287, 0, 286, 0, 344, 0, 101, 263, 266, 
-  0, 102, 269, 105, 130, 107, 108, 73, 112, 113, 
-  64, 114, 117, 71, 74, 65, 241, 66, 76, 120, 
-  69, 122, 72, 124, 125, 270, 127, 128, 132, 0, 
-  94, 0, 0, 96, 100, 98, 85, 97, 99, 0, 
-  95, 84, 264, 262, 140, 141, 146, 0, 139, 0, 
-  316, 0, 303, 304, 0, 315, 0, 0, 0, 306, 
-  311, 309, 312, 0, 0, 310, 311, 0, 307, 0, 
-  308, 265, 314, 0, 265, 313, 0, 318, 319, 0, 
-  265, 320, 321, 0, 0, 322, 0, 0, 0, 323, 
-  324, 158, 157, 0, 0, 0, 290, 0, 0, 0, 
-  305, 278, 271, 0, 279, 275, 0, 277, 267, 0, 
-  268, 272, 88, 0, 0, 92, 79, 0, 81, 90, 
-  0, 82, 91, 93, 83, 89, 80, 0, 86, 162, 
-  160, 164, 161, 159, 163, 6, 336, 4, 2, 62, 
-  87, 0, 0, 65, 67, 66, 31, 5, 0, 63, 
-  0, 42, 41, 40, 0, 0, 55, 0, 56, 35, 
-  36, 37, 38, 59, 0, 42, 0, 0, 0, 0, 
-  0, 51, 0, 52, 0, 0, 26, 0, 0, 60, 
-  27, 0, 30, 28, 24, 0, 29, 25, 0, 53, 
-  0, 54, 140, 0, 57, 61, 0, 0, 0, 0, 
-  58, 0, 49, 43, 50, 44, 0, 0, 0, 0, 
-  46, 0, 47, 48, 45, 0, 0, 140, 265, 0, 
-  0, 39, 102, 269, 105, 130, 107, 108, 73, 112, 
-  113, 64, 114, 117, 71, 74, 65, 241, 66, 76, 
-  120, 69, 122, 72, 124, 125, 270, 127, 128, 132, 
-  0, 32, 33, 0, 34, 8, 0, 10, 0, 9, 
-  0, 1, 21, 12, 0, 13, 0, 14, 0, 19, 
-  20, 0, 15, 16, 0, 17, 18, 11, 23, 7, 
-  345};
+  0, 0, 0, 0, 0, 0, 22, 0, 175, 242, 
+  206, 214, 210, 154, 226, 202, 3, 139, 73, 155, 
+  218, 222, 143, 172, 153, 158, 138, 192, 179, 0, 
+  80, 81, 76, 344, 67, 346, 0, 0, 0, 0, 
+  78, 0, 0, 74, 77, 71, 0, 0, 68, 70, 
+  69, 79, 72, 0, 75, 0, 0, 168, 0, 0, 
+  155, 174, 157, 156, 0, 0, 0, 170, 171, 169, 
+  173, 0, 203, 0, 0, 0, 0, 193, 0, 0, 
+  0, 0, 0, 0, 183, 0, 0, 0, 177, 178, 
+  176, 181, 185, 184, 182, 180, 195, 194, 196, 0, 
+  211, 0, 207, 0, 0, 149, 136, 148, 137, 105, 
+  106, 107, 132, 108, 133, 109, 110, 111, 112, 113, 
+  114, 115, 116, 117, 118, 119, 120, 121, 134, 122, 
+  123, 124, 125, 126, 127, 128, 129, 130, 131, 135, 
+  0, 0, 147, 243, 150, 0, 151, 0, 152, 146, 
+  0, 239, 232, 230, 237, 238, 236, 235, 241, 234, 
+  233, 231, 240, 227, 0, 215, 0, 0, 219, 0, 
+  0, 223, 0, 0, 149, 141, 0, 140, 0, 145, 
+  159, 0, 345, 334, 335, 0, 332, 0, 333, 0, 
+  336, 250, 257, 256, 264, 252, 0, 253, 337, 0, 
+  343, 254, 255, 260, 258, 340, 338, 342, 261, 0, 
+  272, 0, 0, 0, 0, 344, 67, 0, 346, 68, 
+  244, 286, 69, 0, 0, 0, 273, 0, 0, 262, 
+  263, 0, 251, 259, 287, 288, 331, 341, 0, 302, 
+  303, 304, 305, 0, 298, 299, 300, 301, 328, 329, 
+  0, 0, 0, 0, 0, 291, 292, 248, 246, 208, 
+  216, 212, 228, 204, 249, 0, 155, 220, 224, 197, 
+  186, 0, 0, 205, 0, 0, 0, 0, 198, 0, 
+  0, 0, 0, 0, 190, 188, 191, 189, 187, 200, 
+  199, 201, 0, 213, 0, 209, 0, 247, 155, 0, 
+  229, 244, 245, 0, 244, 0, 0, 294, 0, 0, 
+  0, 296, 0, 217, 0, 0, 221, 0, 0, 225, 
+  284, 0, 276, 285, 279, 0, 283, 0, 244, 277, 
+  0, 244, 0, 0, 295, 0, 0, 0, 297, 345, 
+  334, 0, 0, 336, 0, 330, 0, 320, 0, 0, 
+  0, 290, 0, 289, 0, 347, 0, 104, 266, 269, 
+  0, 105, 272, 108, 133, 110, 111, 76, 115, 116, 
+  67, 117, 120, 74, 77, 68, 244, 69, 79, 123, 
+  72, 125, 75, 127, 128, 273, 130, 131, 135, 0, 
+  97, 0, 0, 99, 103, 101, 88, 100, 102, 0, 
+  98, 87, 267, 265, 143, 144, 149, 0, 142, 0, 
+  319, 0, 306, 307, 0, 318, 0, 0, 0, 309, 
+  314, 312, 315, 0, 0, 313, 314, 0, 310, 0, 
+  311, 268, 317, 0, 268, 316, 0, 321, 322, 0, 
+  268, 323, 324, 0, 0, 325, 0, 0, 0, 326, 
+  327, 161, 160, 0, 0, 0, 293, 0, 0, 0, 
+  308, 281, 274, 0, 282, 278, 0, 280, 270, 0, 
+  271, 275, 91, 0, 0, 95, 82, 0, 84, 93, 
+  0, 85, 94, 96, 86, 92, 83, 0, 89, 165, 
+  163, 167, 164, 162, 166, 6, 339, 4, 2, 65, 
+  90, 0, 0, 68, 70, 69, 31, 5, 0, 66, 
+  0, 45, 44, 43, 0, 0, 58, 0, 59, 35, 
+  36, 37, 38, 40, 41, 62, 39, 0, 45, 0, 
+  0, 0, 0, 0, 54, 0, 55, 0, 0, 26, 
+  0, 0, 63, 27, 0, 30, 28, 24, 0, 29, 
+  25, 0, 56, 0, 57, 143, 0, 60, 64, 0, 
+  0, 0, 0, 61, 0, 52, 46, 53, 47, 0, 
+  0, 0, 0, 49, 0, 50, 51, 48, 0, 0, 
+  143, 268, 0, 0, 42, 105, 272, 108, 133, 110, 
+  111, 76, 115, 116, 67, 117, 120, 74, 77, 68, 
+  244, 69, 79, 123, 72, 125, 75, 127, 128, 273, 
+  130, 131, 135, 0, 32, 33, 0, 34, 8, 0, 
+  10, 0, 9, 0, 1, 21, 12, 0, 13, 0, 
+  14, 0, 19, 20, 0, 15, 16, 0, 17, 18, 
+  11, 23, 7, 348};
 
 const short QDeclarativeJSGrammar::goto_default [] = {
-  7, 621, 207, 196, 205, 507, 495, 620, 639, 615, 
-  619, 617, 622, 22, 618, 18, 506, 545, 535, 542, 
-  537, 523, 191, 195, 197, 201, 526, 566, 565, 200, 
-  232, 26, 474, 473, 356, 355, 9, 354, 357, 107, 
-  17, 145, 24, 13, 144, 19, 25, 57, 23, 8, 
-  28, 27, 269, 15, 263, 10, 259, 12, 261, 11, 
-  260, 20, 267, 21, 268, 14, 262, 258, 299, 411, 
-  264, 265, 202, 193, 192, 204, 233, 203, 208, 229, 
-  230, 194, 360, 359, 231, 463, 462, 321, 322, 465, 
+  7, 624, 207, 196, 205, 507, 495, 623, 642, 618, 
+  622, 620, 625, 22, 621, 18, 506, 548, 538, 545, 
+  540, 525, 191, 195, 197, 201, 233, 208, 230, 529, 
+  569, 568, 200, 232, 26, 474, 473, 356, 355, 9, 
+  354, 357, 107, 17, 145, 24, 13, 144, 19, 25, 
+  57, 23, 8, 28, 27, 269, 15, 263, 10, 259, 
+  12, 261, 11, 260, 20, 267, 21, 268, 14, 262, 
+  258, 299, 411, 264, 265, 202, 193, 192, 204, 203, 
+  229, 194, 360, 359, 231, 463, 462, 321, 322, 465, 
   324, 464, 323, 419, 423, 426, 422, 421, 441, 442, 
   185, 199, 181, 184, 198, 206, 0};
 
 const short QDeclarativeJSGrammar::action_index [] = {
-  360, 1286, 2520, 2520, 2422, 1011, 52, 96, 132, -102, 
-  104, 69, 66, 177, -102, 283, 80, -102, -102, 649, 
-  71, 120, 160, 169, -102, -102, -102, 444, 325, 1286, 
-  -102, -102, -102, 324, -102, 2226, 2030, 1286, 1286, 1286, 
-  -102, 801, 1286, -102, -102, -102, 1286, 1286, -102, -102, 
-  -102, -102, -102, 1286, -102, 1286, 1286, -102, 1286, 1286, 
-  87, 190, -102, -102, 1286, 1286, 1286, -102, -102, -102, 
-  187, 1286, 251, 1286, 1286, 1286, 1286, 471, 1286, 1286, 
-  1286, 1286, 1286, 1286, 325, 1286, 1286, 1286, 128, 113, 
-  127, 182, 168, 159, 325, 325, 454, 406, 416, 1286, 
-  -7, 1286, 76, 2128, 1286, 1286, -102, -102, -102, -102, 
+  390, 1274, 2508, 2508, 2410, 999, 51, 95, 120, -102, 
+  96, 68, 61, 178, -102, 275, 153, -102, -102, 637, 
+  71, 115, 174, 171, -102, -102, -102, 538, 307, 1274, 
+  -102, -102, -102, 380, -102, 2214, 1554, 1274, 1274, 1274, 
+  -102, 699, 1274, -102, -102, -102, 1274, 1274, -102, -102, 
+  -102, -102, -102, 1274, -102, 1274, 1274, -102, 1274, 1274, 
+  80, 185, -102, -102, 1274, 1274, 1274, -102, -102, -102, 
+  197, 1274, 277, 1274, 1274, 1274, 1274, 538, 1274, 1274, 
+  1274, 1274, 1274, 1274, 307, 1274, 1274, 1274, 103, 107, 
+  139, 186, 230, 230, 307, 307, 391, 538, 433, 1274, 
+  13, 1274, 75, 2116, 1274, 1274, -102, -102, -102, -102, 
   -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
   -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
   -102, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
-  107, 1286, -102, -102, 68, 44, -102, 1286, -102, -102, 
-  1286, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
-  -102, -102, -102, -102, 1286, 32, 1286, 1286, 88, 86, 
-  1286, -102, 2128, 1286, 1286, -102, 103, -102, 56, -102, 
-  -102, 65, -102, 398, 89, 63, -102, 274, -102, 62, 
-  2520, -102, -102, -102, -102, -102, 248, -102, -102, 47, 
-  -102, -102, -102, -102, -102, -102, 2520, -102, -102, 467, 
-  -102, 470, 73, 2422, 53, 398, 91, 67, 2716, 154, 
-  1286, -102, 64, 43, 1286, 41, -102, 39, 34, -102, 
-  -102, 398, -102, -102, -102, -102, -102, -102, 82, -102, 
-  -102, -102, -102, 90, -102, -102, -102, -102, -102, -102, 
-  -8, 51, 1286, 100, 77, -102, -102, 1472, -102, 84, 
-  38, 5, -102, 266, 70, 33, 555, 79, 74, 477, 
-  234, 320, 1286, 281, 1286, 1286, 1286, 1286, 311, 1286, 
-  1286, 1286, 1286, 1286, 230, 189, 213, 208, 325, 371, 
-  386, 396, 1286, 35, 1286, 81, 1286, -102, 649, 1286, 
-  -102, 1286, 60, 1, 1286, 31, 2422, -102, 1286, 140, 
-  2422, -102, 1286, 72, 1286, 1286, 97, 93, 1286, -102, 
-  50, 149, 61, -102, -102, 1286, -102, 310, 1286, -102, 
-  58, 1286, -25, 2422, -102, 1286, 125, 2422, -102, -35, 
-  292, -56, -31, 2520, -39, -102, 2422, -102, 1286, 141, 
-  2422, -5, 2422, -102, 6, 0, -33, -102, -102, 2422, 
-  -43, 550, 7, 478, 115, 1286, 2422, -1, -27, 451, 
-  8, -18, 627, 14, 16, -102, 1381, -102, 12, -19, 
-  3, 1286, 59, -30, 1286, -2, 1286, -29, -36, 1286, 
-  -102, 2324, 18, -102, -102, -102, -102, -102, -102, 1286, 
-  -102, -102, -102, -102, 203, -102, 1286, -10, -102, 2422, 
-  -102, 94, -102, -102, 2422, -102, 1286, 102, 20, -102, 
-  40, -102, 46, 99, 1286, -102, 55, 57, -102, 28, 
-  -102, 2422, -102, 114, 2422, -102, 161, -102, -102, 121, 
-  2422, 37, -102, -12, -4, -102, 398, -34, -6, -102, 
-  -102, -102, -102, 1286, 98, 2422, -102, 1286, 105, 2422, 
-  -102, 19, -102, 181, -102, -102, 1286, -102, -102, 288, 
-  -102, -102, -102, 110, 1657, -102, -102, 1842, -102, -102, 
-  1936, -102, -102, -102, -102, -102, -102, 122, -102, -102, 
-  -102, -102, -102, -102, -102, -102, 2520, -102, -102, -102, 
-  92, -26, 829, 142, -28, 4, -102, -102, 191, -102, 
-  202, -102, -102, -102, 398, 218, -102, 1563, -102, -102, 
-  -102, -102, -102, -102, 237, 2, 368, 207, 17, 398, 
-  205, -102, 10, -102, 919, 124, -102, 13, 919, -102, 
-  -102, 1103, -102, -102, -102, 1195, -102, -102, 214, -102, 
-  1563, -102, 271, 9, -102, -102, 174, 307, 30, 1563, 
-  -102, 228, -102, 212, -102, 26, -32, 301, 179, 265, 
-  -102, 75, -102, -102, -102, 1748, 919, 280, 2618, 2030, 
-  -3, -102, 459, 25, 486, 85, 1286, 2422, 24, 11, 
-  378, 36, 27, 711, 48, 49, -102, 1381, -102, 54, 
-  29, 45, 1286, 59, 15, 1286, 42, 1286, 23, 22, 
-  117, -102, -102, 21, -102, -102, 739, -102, 201, -70, 
-  919, -102, -102, 116, 398, -102, 143, -102, 129, -102, 
-  -102, 252, -102, -102, 126, -102, -102, -102, -102, -102, 
-  -102, 
+  100, 1274, -102, -102, 73, 20, -102, 1274, -102, -102, 
+  1274, -102, -102, -102, -102, -102, -102, -102, -102, -102, 
+  -102, -102, -102, -102, 1274, 36, 1274, 1274, 85, 84, 
+  1274, -102, 2116, 1274, 1274, -102, 124, -102, 64, -102, 
+  -102, 63, -102, 245, 81, 55, -102, 295, -102, 57, 
+  2508, -102, -102, -102, -102, -102, 229, -102, -102, 54, 
+  -102, -102, -102, -102, -102, -102, 2508, -102, -102, 474, 
+  -102, 510, 89, 2410, 52, 374, 79, 60, 2704, 58, 
+  1274, -102, 65, 39, 1274, 44, -102, 42, 49, -102, 
+  -102, 380, -102, -102, -102, -102, -102, -102, 83, -102, 
+  -102, -102, -102, 69, -102, -102, -102, -102, -102, -102, 
+  -8, 31, 1274, 121, 101, -102, -102, 1460, -102, 82, 
+  46, 23, -102, 252, 74, 32, 578, 72, 67, 375, 
+  307, 310, 1274, 269, 1274, 1274, 1274, 1274, 459, 1274, 
+  1274, 1274, 1274, 1274, 307, 191, 211, 195, 192, 357, 
+  459, 351, 1274, 23, 1274, 78, 1274, -102, 637, 1274, 
+  -102, 1274, 153, 10, 1274, 8, 2410, -102, 1274, 128, 
+  2410, -102, 1274, 62, 1274, 1274, 98, 91, 1274, -102, 
+  86, 131, 33, -102, -102, 1274, -102, 380, 1274, -102, 
+  53, 1274, 45, 2410, -102, 1274, 140, 2410, -102, -17, 
+  290, -39, -15, 2508, -38, -102, 2410, -102, 1274, 127, 
+  2410, 14, 2410, -102, 18, 15, -31, -102, -102, 2410, 
+  -52, 464, -5, 461, 111, 1274, 2410, 59, -36, 442, 
+  -3, -25, 626, 3, 5, -102, 1369, -102, 0, -1, 
+  47, 1274, 48, 19, 1274, 43, 1274, 17, 12, 1274, 
+  -102, 2312, 50, -102, -102, -102, -102, -102, -102, 1274, 
+  -102, -102, -102, -102, 169, -102, 1274, -28, -102, 2410, 
+  -102, 66, -102, -102, 2410, -102, 1274, 99, 7, -102, 
+  40, -102, 41, 94, 1274, -102, 38, 34, -102, -22, 
+  -102, 2410, -102, 112, 2410, -102, 190, -102, -102, 105, 
+  2410, -12, -102, -10, -18, -102, 384, -9, 25, -102, 
+  -102, -102, -102, 1274, 110, 2410, -102, 1274, 104, 2410, 
+  -102, -4, -102, 183, -102, -102, 1274, -102, -102, 380, 
+  -102, -102, -102, 118, 1742, -102, -102, 1648, -102, -102, 
+  1836, -102, -102, -102, -102, -102, -102, 93, -102, -102, 
+  -102, -102, -102, -102, -102, -102, 2508, -102, -102, -102, 
+  108, 4, 817, 172, -6, 30, -102, -102, 208, -102, 
+  194, -102, -102, -102, 366, 214, -102, 1927, -102, -102, 
+  -102, -102, -102, -102, -102, -102, -102, 231, -32, 338, 
+  206, -23, 387, 145, -102, -7, -102, 907, 126, -102, 
+  -19, 907, -102, -102, 1091, -102, -102, -102, 1183, -102, 
+  -102, 224, -102, 1927, -102, 268, -11, -102, -102, 175, 
+  304, 22, 1927, -102, 217, -102, 198, -102, -2, -51, 
+  287, 157, 276, -102, 106, -102, -102, -102, 2018, 907, 
+  274, 2606, 1554, 6, -102, 451, 35, 518, 76, 1274, 
+  2410, 59, 26, 407, 56, -16, 789, 21, 9, -102, 
+  1369, -102, 27, 1, 29, 1274, 37, 16, 1274, 24, 
+  1274, 2, 11, 138, -102, -102, 28, -102, -102, 907, 
+  -102, 256, -34, 727, -102, -102, 151, 371, -102, 134, 
+  -102, 116, -102, -102, 298, -102, -102, 114, -102, -102, 
+  -102, -102, -102, -102, 
 
-  -107, 25, -75, 27, 30, 272, -107, -107, -107, -107, 
-  -107, -107, -107, -107, -107, -107, -107, -107, -107, -42, 
-  -107, -107, -107, -107, -107, -107, -107, -107, -107, 95, 
-  -107, -107, -107, 31, -107, -107, 1, 37, 91, 80, 
-  -107, 89, 167, -107, -107, -107, 175, 181, -107, -107, 
-  -107, -107, -107, 137, -107, 130, 129, -107, 144, 152, 
-  -107, -107, -107, -107, 140, 133, 149, -107, -107, -107, 
-  -107, 157, -107, 182, 179, 170, 70, -107, 66, 78, 
-  55, 94, 100, 114, -107, 120, 109, 104, -107, -107, 
-  -107, -107, -107, -107, -107, -107, -107, -107, -107, 172, 
-  -107, 128, -107, 122, 58, 34, -107, -107, -107, -107, 
+  -107, 7, -99, 1, 5, 273, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, -40, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, 92, 
+  -107, -107, -107, 9, -107, -107, -19, 18, 95, 87, 
+  -107, 82, 180, -107, -107, -107, 172, 115, -107, -107, 
+  -107, -107, -107, 171, -107, 176, 168, -107, 162, 185, 
+  -107, -107, -107, -107, 179, 184, 118, -107, -107, -107, 
+  -107, 133, -107, 132, 161, 116, 119, -107, 130, 121, 
+  139, 143, 149, 153, -107, 159, 156, 151, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, 177, 
+  -107, 136, -107, 173, 71, 53, -107, -107, -107, -107, 
   -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
   -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
   -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
-  -107, 51, -107, -107, -107, -107, -107, 36, -107, -107, 
-  47, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
-  -107, -107, -107, -107, 154, -107, 158, -35, -107, -107, 
-  13, -107, 248, 42, 115, -107, -107, -107, -107, -107, 
-  -107, -107, -107, 20, -107, -107, -107, 2, -107, -107, 
+  -107, 43, -107, -107, -107, -107, -107, 36, -107, -107, 
+  30, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107, 109, -107, 111, 63, -107, -107, 
+  54, -107, 216, 75, 89, -107, -107, -107, -107, -107, 
+  -107, -107, -107, 29, -107, -107, -107, 61, -107, -107, 
   -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
-  -107, -107, -107, -107, -107, -107, 61, -107, -107, 67, 
-  -107, 64, -107, 76, -107, 43, -107, -107, 57, -107, 
-  60, -107, -107, -107, 85, 69, -107, -107, -107, -107, 
-  -107, -5, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, 58, -107, -107, 50, 
+  -107, 33, -107, 37, -107, 40, -107, -107, 85, -107, 
+  69, -107, -107, -107, 81, -22, -107, -107, -107, -107, 
+  -107, -4, -107, -107, -107, -107, -107, -107, -107, -107, 
   -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
-  -107, -107, 24, -107, -107, -107, -107, 148, -107, -107, 
+  -107, -107, 27, -107, -107, -107, -107, 72, -107, -107, 
   -107, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
-  -107, 9, 186, -107, 196, 221, 220, 212, -107, 102, 
-  98, 96, 116, 118, -107, -107, -107, -107, -107, -107, 
-  -107, -107, 230, -107, 199, -107, 193, -107, -107, 211, 
-  -107, 132, -107, -107, 126, -107, 14, -107, 5, -107, 
-  10, -107, 208, -107, 189, 202, -107, -107, 209, -107, 
-  -107, -107, -107, -107, -107, 200, -107, 103, 121, -107, 
-  -107, 168, -107, 50, -107, 54, -107, 62, -107, -107, 
-  88, -107, -107, -21, -107, -107, 184, -107, 63, -107, 
-  65, -107, 74, -107, -107, -107, -107, -107, -107, 92, 
-  -107, 35, -107, 45, -107, 171, 75, -107, -107, 56, 
-  -107, -107, 166, -107, -107, -107, 90, -107, -107, -107, 
-  -107, 39, -107, 32, 159, -107, 178, -107, -107, -3, 
-  -107, -17, -107, -107, -107, -107, -107, -107, -107, 3, 
-  -107, -107, -107, -107, -107, -107, 68, -107, -107, 79, 
-  -107, -107, -107, -107, 16, -107, 11, -107, -107, -107, 
-  -107, -107, -8, -107, 59, -107, -41, -107, -107, -107, 
-  -107, 99, -107, -107, 160, -107, -107, -107, -107, -107, 
-  93, -7, -107, -107, 77, -107, 40, -107, 46, -107, 
-  -107, -107, -107, 53, -107, 83, -107, 72, -107, 71, 
-  -107, -107, -107, -107, -107, -107, 48, -107, -107, 81, 
-  -107, -107, -107, -107, 38, -107, -107, 173, -107, -107, 
-  33, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
-  -107, -107, -107, -107, -107, -107, 86, -107, -107, -107, 
-  -107, -107, 73, -107, -107, -107, -107, -107, -107, -107, 
-  22, -107, -107, -107, -10, -107, -107, 259, -107, -107, 
-  -107, -107, -107, -107, -107, -107, -6, -15, -107, -2, 
-  -107, -107, -107, -107, 101, -107, -107, -107, 106, -107, 
-  -107, 290, -107, -107, -107, 294, -107, -107, -107, -107, 
-  318, -107, -107, -4, -107, -107, -19, -13, -107, 364, 
-  -107, -107, -107, -26, -107, -107, -107, -11, -20, -12, 
-  -107, -107, -107, -107, -107, 305, 278, -107, 17, 261, 
-  4, -107, 28, -107, 26, -107, 87, 19, -107, -107, 
-  23, -107, -107, 84, -107, -107, -107, 44, -107, -107, 
-  -107, -107, 41, -107, 29, 125, -107, 110, -107, -107, 
-  -107, -107, -107, 15, -107, -107, 12, -107, -107, 18, 
-  97, -107, -107, -107, 7, -107, -107, -107, -107, -107, 
-  -107, 21, -107, -107, -107, -107, -107, -107, -107, -107, 
-  -107};
+  -107, 70, 237, -107, 212, 218, 228, 224, -107, 98, 
+  91, 108, 100, 102, -107, -107, -107, -107, -107, -107, 
+  -107, -107, 201, -107, 164, -107, 227, -107, -107, 200, 
+  -107, 279, -107, -107, 187, -107, 11, -107, -2, -107, 
+  0, -107, 236, -107, 190, 191, -107, -107, 193, -107, 
+  -107, -107, -107, -107, -107, 194, -107, 157, 123, -107, 
+  -107, 128, -107, 66, -107, 86, -107, 79, -107, -107, 
+  93, -107, -107, -58, -107, -107, 31, -107, 47, -107, 
+  62, -107, 65, -107, -107, -107, -107, -107, -107, 44, 
+  -107, 45, -107, 48, -107, 110, 34, -107, -107, 41, 
+  -107, -107, 96, -107, -107, -107, 83, -107, -107, -107, 
+  -107, 67, -107, 57, 74, -107, 88, -107, -107, 68, 
+  -107, 60, -107, -107, -107, -107, -107, -107, -107, 59, 
+  -107, -107, -107, -107, -107, -107, 90, -107, -107, 78, 
+  -107, -107, -107, -107, 175, -107, 80, -107, -107, -107, 
+  -107, -107, -59, -107, 46, -107, -52, -107, -107, -107, 
+  -107, 94, -107, -107, 97, -107, -107, -107, -107, -107, 
+  35, -47, -107, -107, 51, -107, 42, -107, 39, -107, 
+  -107, -107, -107, 55, -107, 49, -107, 56, -107, 64, 
+  -107, -107, -107, -107, -107, -107, 38, -107, -107, 183, 
+  -107, -107, -107, -107, 52, -107, -107, 76, -107, -107, 
+  32, -107, -107, -107, -107, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107, -107, -107, 84, -107, -107, -107, 
+  -107, -107, 3, -107, -107, -107, -107, -107, -107, -107, 
+  -21, -107, -107, -107, -6, -107, -107, 299, -107, -107, 
+  -107, -107, -107, -107, -107, -107, -107, -107, -107, -1, 
+  -25, -107, -12, -107, -107, -107, -107, 169, -107, -107, 
+  -107, 103, -107, -107, 287, -107, -107, -107, 282, -107, 
+  -107, -107, -107, 348, -107, -107, 21, -107, -107, 16, 
+  2, -107, 307, -107, -107, -107, 25, -107, -107, -107, 
+  26, 24, 14, -107, -107, -107, -107, -107, 332, 77, 
+  -107, 13, 373, 6, -107, 4, -107, 8, -107, 73, 
+  20, -107, -107, 12, -107, -107, 117, -107, -107, -107, 
+  23, -107, -107, -107, -107, 15, -107, 10, 99, -107, 
+  104, -107, -107, -107, -107, -107, 28, -107, -107, 22, 
+  -107, -107, 17, 101, -107, -107, -107, 19, -107, -107, 
+  -107, -107, -107, -107, -3, -107, -107, -107, -107, -107, 
+  -107, -107, -107, -107};
 
 const short QDeclarativeJSGrammar::action_info [] = {
-  457, 340, 343, 440, 342, -126, -110, 453, 391, 257, 
-  -121, 352, 403, 389, -129, 346, 345, 416, 348, -99, 
-  616, -118, 401, -100, 446, 399, 448, 440, 571, 440, 
-  541, -110, -129, 561, 568, 333, 466, 559, 556, 527, 
-  510, 529, 541, 346, 534, 424, 541, 257, 440, -126, 
-  408, 424, -121, 420, 541, -118, -100, 444, 457, 453, 
-  424, -99, 304, 348, 431, 416, -123, 325, 141, 251, 
-  457, 414, 101, 164, 440, 453, 147, 71, 296, 416, 
-  99, 312, 272, 430, 294, 272, 292, 252, 141, 257, 
-  164, 306, 335, 170, 301, 190, 640, 187, 346, 312, 
-  318, 183, 236, 348, 149, 71, 141, 172, 141, 427, 
-  141, 141, 0, 141, 294, 141, 179, 99, 477, 331, 
-  292, 434, 141, 189, 314, 538, 173, 443, 315, 62, 
-  141, 172, 538, 141, 249, 248, 573, 572, 256, 255, 
-  63, 444, 616, 242, 241, 101, 249, 248, 141, 141, 
-  173, 247, 246, 58, 428, 413, 412, 327, 455, 177, 
-  254, 409, 418, 142, 59, 459, 478, 58, 58, 141, 
-  166, 525, 58, 611, 167, 172, 249, 248, 59, 59, 
-  539, 64, 488, 59, 85, 337, 86, 636, 635, 469, 
-  630, 629, 103, 85, 173, 86, 174, 87, 575, 64, 
-  310, 350, 64, 511, 633, 632, 87, 85, 511, 86, 
-  328, 104, 532, 105, 85, 0, 86, 513, 172, 0, 
-  87, 550, 438, 437, 541, 517, 65, 87, 512, 0, 
-  0, 511, 66, 85, 631, 86, 511, 173, 85, 406, 
-  86, 511, 470, 468, 65, 0, 87, 65, 626, 513, 
-  66, 87, 172, 66, 513, 85, 141, 86, 0, 85, 
-  512, 86, 627, 625, 563, 512, 533, 531, 87, 73, 
-  74, 173, 87, 406, 0, 551, 549, 513, 0, 518, 
-  516, 34, 513, 576, 274, 275, 172, 513, 512, 564, 
-  562, 0, 624, 512, 34, 172, 75, 76, 512, 274, 
-  275, 73, 74, 34, -87, 173, 0, 174, 0, 235, 
-  234, 276, 277, -87, 173, 0, 174, 34, 48, 50, 
-  49, 34, 0, 0, 0, 0, 276, 277, 75, 76, 
-  34, 48, 50, 49, 279, 280, 34, 0, 0, 34, 
-  48, 50, 49, 281, 45, 0, 282, 0, 283, 34, 
-  85, 0, 86, 34, 48, 50, 49, 45, 48, 50, 
-  49, 0, 0, 87, 0, 0, 45, 48, 50, 49, 
+  257, 532, -132, 403, 346, 530, 571, -102, 444, 574, 
+  -121, 348, -103, 466, 544, 440, -103, 345, 343, 340, 
+  348, 342, 544, 391, 401, 389, 446, 537, -121, 562, 
+  352, -129, 408, 430, -102, 416, -124, 416, 453, 544, 
+  420, 431, -132, 424, -126, 424, 424, 457, 457, 440, 
+  -129, 448, 440, 453, -124, -126, 619, 399, 440, 564, 
+  559, 544, 257, 346, 335, 409, -113, 252, 306, 251, 
+  510, 304, 414, 164, 312, 416, 71, 440, 453, 272, 
+  149, 147, 296, 272, 99, 457, 346, 164, 257, 187, 
+  190, 170, 101, 301, 292, 643, 348, 71, 318, 183, 
+  312, 141, 294, 325, 427, 333, 0, 141, 141, 236, 
+  292, 443, 141, 0, 331, 189, 99, 314, 141, 434, 
+  141, 315, 62, 172, 179, 444, 477, 413, 412, 141, 
+  247, 246, 141, 63, 541, 141, 141, 249, 248, 327, 
+  101, 619, 173, 58, 242, 241, 541, 58, 141, 428, 
+  249, 248, 535, 488, 59, 0, 142, 0, 59, 418, 
+  58, 141, 256, 255, 459, 166, 172, 576, 575, 167, 
+  455, 59, 249, 248, 478, 639, 638, 633, 632, 58, 
+  177, 254, 542, 64, 172, 173, 511, 350, 310, 172, 
+  59, 469, 328, 103, 614, 636, 635, 64, 141, 0, 
+  337, 528, 0, 173, 511, 406, 536, 534, 173, 64, 
+  174, 85, 104, 86, 105, 578, 85, 85, 86, 86, 
+  85, 517, 86, 511, 87, 634, 0, 511, 65, 87, 
+  87, 553, 513, 87, 66, 511, 85, 141, 86, 0, 
+  0, 544, 65, 512, 470, 468, 172, 513, 66, 87, 
+  513, 438, 437, 566, 65, 85, 0, 86, 512, 0, 
+  66, 512, 0, 0, 0, 173, 0, 406, 87, 513, 
+  274, 275, 0, 513, 34, 518, 516, 0, 567, 565, 
+  512, 513, 0, 172, 512, 554, 552, 274, 275, 172, 
+  235, 234, 512, 73, 74, 73, 74, 276, 277, 0, 
+  579, -90, 173, 629, 174, 34, 0, -90, 173, 0, 
+  174, 48, 50, 49, 276, 277, 34, 630, 628, 34, 
+  75, 76, 75, 76, 34, 0, 0, 34, 0, 0, 
+  0, 0, 85, 34, 86, 0, 0, 45, 0, 34, 
+  0, 0, 48, 50, 49, 87, 0, 627, 0, 0, 
   0, 0, 0, 48, 50, 49, 48, 50, 49, 0, 
-  45, 0, 0, 0, 45, 0, 48, 50, 49, 0, 
-  48, 50, 49, 45, 279, 280, 0, 34, 0, 45, 
-  0, 0, 45, 281, 0, 0, 282, 34, 283, 279, 
-  280, 0, 45, 0, -341, 0, 45, 0, 281, 279, 
-  280, 282, 0, 283, 0, 0, 0, 34, 281, 78, 
-  79, 282, 0, 283, 48, 50, 49, 80, 81, 78, 
-  79, 82, 0, 83, 48, 50, 49, 80, 81, 0, 
-  0, 82, 0, 83, 6, 5, 4, 1, 3, 2, 
-  45, 0, 0, 0, 48, 50, 49, 78, 79, 0, 
-  45, 0, 0, 0, 0, 80, 81, 78, 79, 82, 
-  34, 83, 0, 0, 0, 80, 81, -341, 34, 82, 
-  45, 83, 0, 0, 78, 79, 34, 0, 0, 34, 
-  279, 280, 80, 81, 0, 0, 82, 34, 83, 281, 
-  0, 0, 282, 0, 283, 34, 0, 48, 50, 49, 
-  240, 239, 0, 0, 0, 48, 50, 49, 240, 239, 
-  0, 245, 244, 48, 50, 49, 48, 50, 49, 245, 
-  244, 0, 0, 45, 48, 50, 49, 245, 244, 0, 
-  0, 45, 48, 50, 49, 0, 0, 0, 151, 45, 
-  0, 0, 45, 0, 0, 0, 0, 0, 152, 0, 
-  45, 0, 153, 0, 0, 0, 0, 0, 45, 34, 
-  0, 154, 0, 155, 0, 0, 308, 0, 0, 0, 
-  0, 0, 0, 0, 156, 0, 157, 62, 0, 0, 
-  0, 0, 0, 0, 158, 0, 0, 159, 63, 0, 
-  0, 240, 239, 160, 0, 0, 48, 50, 49, 161, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 162, 0, 0, 0, 30, 
-  31, 0, 45, 0, 0, 0, 0, 0, 0, 33, 
-  0, 0, 151, 0, 0, 0, 34, 0, 0, 0, 
-  35, 36, 152, 37, 0, 0, 153, 0, 0, 0, 
-  41, 0, 0, 0, 44, 154, 0, 155, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 156, 0, 
-  157, 62, 51, 48, 50, 49, 0, 52, 158, 0, 
-  0, 159, 63, 0, 0, 0, 0, 160, 43, 54, 
-  32, 0, 0, 161, 40, 0, 0, 0, 0, 45, 
-  0, 0, 0, 30, 31, 0, 0, 0, 0, 162, 
-  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
-  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
-  0, 30, 31, 0, 41, 0, 0, 0, 44, 0, 
-  0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
-  0, 0, 35, 36, 0, 37, 51, 48, 50, 49, 
-  0, 52, 502, 0, 0, 0, 44, 0, 0, 0, 
-  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
-  0, 0, 0, 45, 51, 48, 50, 49, 0, 52, 
-  0, 0, 0, 30, 31, 0, 0, 0, 0, 0, 
-  43, 54, 32, 33, 0, 0, 40, 0, 0, 0, 
-  34, 45, 0, 0, 35, 36, 0, 37, 0, 0, 
-  0, 30, 31, 0, 41, 0, 0, 0, 44, 0, 
+  0, 48, 50, 49, 48, 50, 49, 34, 45, 0, 
+  48, 50, 49, 0, 279, 280, 48, 50, 49, 45, 
+  279, 280, 45, 281, 0, 0, 282, 45, 283, 281, 
+  45, 0, 282, 0, 283, 34, 45, 0, 279, 280, 
+  34, 0, 45, 34, 48, 50, 49, 281, 0, 34, 
+  282, 0, 283, 34, 78, 79, 34, 0, 0, 0, 
+  0, 0, 80, 81, 0, 0, 82, 0, 83, 0, 
+  45, 0, 48, 50, 49, 0, 34, 48, 50, 49, 
+  48, 50, 49, -344, 0, 0, 48, 50, 49, 0, 
+  48, 50, 49, 48, 50, 49, 78, 79, 45, 0, 
+  0, 0, 0, 45, 80, 81, 45, 0, 82, 0, 
+  83, 34, 45, 48, 50, 49, 45, 0, -344, 45, 
+  34, 0, 279, 280, 6, 5, 4, 1, 3, 2, 
+  34, 281, 0, 34, 282, 0, 283, 0, 0, 45, 
+  0, 0, 0, 34, 0, 0, 0, 0, 48, 50, 
+  49, 0, 240, 239, 0, 0, 0, 48, 50, 49, 
+  0, 0, 245, 244, 0, 240, 239, 48, 50, 49, 
+  48, 50, 49, 0, 45, 240, 239, 0, 0, 34, 
+  48, 50, 49, 45, 0, 0, 0, 34, 0, 0, 
+  0, 0, 0, 45, 0, 0, 45, 0, 0, 0, 
+  0, 78, 79, 0, 0, 0, 45, 0, 0, 80, 
+  81, 245, 244, 82, 0, 83, 48, 50, 49, 245, 
+  244, 151, 0, 0, 48, 50, 49, 0, 0, 0, 
+  0, 152, 0, 0, 0, 153, 0, 0, 0, 0, 
+  0, 0, 45, 0, 154, 0, 155, 0, 0, 308, 
+  45, 0, 0, 0, 0, 0, 0, 156, 0, 157, 
+  62, 0, 0, 0, 0, 0, 0, 158, 0, 0, 
+  159, 63, 0, 0, 0, 0, 160, 0, 30, 31, 
+  151, 0, 161, 0, 0, 0, 0, 0, 33, 0, 
+  152, 0, 0, 0, 153, 34, 0, 0, 162, 35, 
+  36, 0, 37, 154, 0, 155, 0, 0, 0, 41, 
+  0, 0, 0, 44, 0, 0, 156, 0, 157, 62, 
+  0, 0, 0, 0, 0, 0, 158, 0, 0, 159, 
+  63, 51, 48, 50, 49, 160, 52, 0, 0, 0, 
+  0, 161, 0, 0, 0, 0, 0, 43, 54, 32, 
+  0, 30, 31, 40, 0, 0, 0, 162, 45, 0, 
   0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
-  0, 0, 35, 36, 0, 37, 51, 48, 50, 49, 
-  0, 52, 502, 0, 0, 0, 44, 0, 0, 0, 
-  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
-  0, 0, 0, 45, 51, 48, 50, 49, 0, 52, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 35, 36, 0, 37, 0, 0, 0, 30, 
+  31, 0, 41, 0, 0, 0, 44, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 51, 48, 50, 49, 0, 52, 
+  502, 0, 0, 0, 44, 0, 0, 0, 0, 0, 
   43, 54, 32, 0, 0, 0, 40, 0, 0, 0, 
-  0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 45, 51, 48, 50, 49, 0, 52, 0, 0, 
+  0, 30, 31, 0, 0, 0, 0, 0, 43, 54, 
+  32, 33, 0, 0, 40, 0, 0, 0, 34, 45, 
+  0, 0, 35, 36, 0, 37, 0, 0, 0, 30, 
+  31, 0, 41, 0, 0, 0, 44, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 51, 48, 50, 49, 0, 52, 
+  502, 0, 0, 0, 44, 0, 0, 0, 0, 0, 
+  43, 54, 32, 0, 0, 0, 40, 0, 0, 0, 
+  0, 45, 51, 48, 50, 49, 0, 52, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 43, 54, 
+  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 
+  31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 0, 0, 0, 0, 0, 0, 
+  502, 0, 0, 0, 44, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 51, 48, 50, 49, 0, 52, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 43, 54, 
+  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 501, 
   0, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
-  0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
+  0, 215, 0, 0, 0, 0, 0, 0, 34, 0, 
   0, 0, 35, 36, 0, 37, 0, 0, 0, 0, 
   0, 0, 502, 0, 0, 0, 44, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 51, 48, 50, 49, 0, 52, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  43, 54, 32, 0, 0, 0, 40, 0, 0, 0, 
+  0, 0, 0, 0, 51, 503, 505, 504, 0, 52, 
+  0, 0, 0, 0, 226, 0, 0, 0, 0, 0, 
+  43, 54, 32, 210, 0, 0, 40, 0, 0, 0, 
   0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 501, 0, 30, 31, 0, 0, 0, 0, 0, 
   0, 0, 0, 215, 0, 0, 0, 0, 0, 0, 
   34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
   0, 0, 0, 0, 502, 0, 0, 0, 44, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 546, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 51, 503, 505, 504, 
   0, 52, 0, 0, 0, 0, 226, 0, 0, 0, 
   0, 0, 43, 54, 32, 210, 0, 0, 40, 0, 
@@ -460,81 +468,63 @@ const short QDeclarativeJSGrammar::action_info [] = {
   0, 0, 0, 0, 0, 215, 0, 0, 0, 0, 
   0, 0, 34, 0, 0, 0, 35, 36, 0, 37, 
   0, 0, 0, 0, 0, 0, 502, 0, 0, 0, 
-  44, 0, 0, 0, 0, 0, 0, 0, 543, 0, 
+  44, 0, 0, 0, 0, 0, 0, 0, 549, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 51, 503, 
   505, 504, 0, 52, 0, 0, 0, 0, 226, 0, 
   0, 0, 0, 0, 43, 54, 32, 210, 0, 0, 
   40, 0, 0, 0, 0, 45, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 501, 0, 30, 31, 0, 
-  0, 0, 0, 0, 0, 0, 0, 215, 0, 0, 
-  0, 0, 0, 0, 34, 0, 0, 0, 35, 36, 
-  0, 37, 0, 0, 0, 0, 0, 0, 502, 0, 
-  0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 
-  546, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  51, 503, 505, 504, 0, 52, 0, 0, 0, 0, 
-  226, 0, 0, 0, 0, 0, 43, 54, 32, 210, 
-  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 29, 30, 31, 
-  0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 
-  0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 
-  36, 0, 37, 0, 0, 0, 38, 0, 39, 41, 
-  42, 0, 0, 44, 0, 0, 0, 46, 0, 47, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 51, 48, 50, 49, 0, 52, 0, 53, 0, 
-  55, 0, 56, 0, 0, 0, 0, 43, 54, 32, 
-  0, 0, 0, 40, 0, 0, 0, 0, 45, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, -119, 0, 
-  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
-  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
-  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
-  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
-  0, 0, 46, 0, 47, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 51, 48, 50, 49, 
-  0, 52, 0, 53, 0, 55, 0, 56, 0, 0, 
-  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
-  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
-  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
-  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 46, 0, 47, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 51, 48, 50, 
-  49, 0, 52, 0, 53, 0, 55, 271, 56, 0, 
-  0, 0, 0, 43, 54, 32, 0, 0, 0, 40, 
-  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 29, 30, 31, 0, 0, 0, 
-  0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 
-  0, 0, 34, 217, 0, 0, 218, 36, 0, 37, 
-  0, 0, 0, 38, 0, 39, 41, 42, 0, 0, 
-  44, 0, 0, 0, 46, 0, 47, 0, 0, 0, 
-  0, 0, 0, 0, 221, 0, 0, 0, 51, 48, 
-  50, 49, 0, 52, 0, 53, 0, 55, 0, 56, 
-  0, 0, 0, 0, 43, 54, 32, 0, 0, 0, 
-  40, 0, 0, 0, 0, 45, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 483, 0, 0, 29, 30, 
-  31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
-  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
-  35, 36, 0, 37, 0, 0, 0, 38, 0, 39, 
-  41, 42, 0, 0, 44, 0, 0, 0, 46, 0, 
-  47, 0, 0, 486, 0, 0, 0, 0, 0, 0, 
-  0, 0, 51, 48, 50, 49, 0, 52, 0, 53, 
-  0, 55, 0, 56, 0, 0, 0, 0, 43, 54, 
-  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 
+  0, 0, 0, 0, 0, 29, 30, 31, 0, 0, 
+  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
+  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
+  37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
+  0, 44, 0, 0, 0, 46, 0, 47, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 51, 
+  48, 50, 49, 0, 52, 0, 53, 0, 55, 0, 
+  56, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
+  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, -122, 0, 0, 0, 
+  29, 30, 31, 0, 0, 0, 0, 0, 0, 0, 
+  0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
+  0, 0, 35, 36, 0, 37, 0, 0, 0, 38, 
+  0, 39, 41, 42, 0, 0, 44, 0, 0, 0, 
+  46, 0, 47, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 51, 48, 50, 49, 0, 52, 
+  0, 53, 0, 55, 0, 56, 0, 0, 0, 0, 
+  43, 54, 32, 0, 0, 0, 40, 0, 0, 0, 
+  0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
+  0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 
+  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
+  38, 0, 39, 41, 42, 0, 0, 44, 0, 0, 
+  0, 46, 0, 47, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 51, 48, 50, 49, 0, 
+  52, 0, 53, 0, 55, 271, 56, 0, 0, 0, 
+  0, 43, 54, 32, 0, 0, 0, 40, 0, 0, 
+  0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 475, 0, 0, 29, 30, 31, 0, 0, 
+  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
+  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
+  37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
+  0, 44, 0, 0, 0, 46, 0, 47, 0, 0, 
+  476, 0, 0, 0, 0, 0, 0, 0, 0, 51, 
+  48, 50, 49, 0, 52, 0, 53, 0, 55, 0, 
+  56, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
+  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 475, 0, 0, 29, 
   30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
-  33, 0, 0, 0, 0, 0, 0, 34, 217, 0, 
-  0, 578, 579, 0, 37, 0, 0, 0, 38, 0, 
+  33, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
+  0, 35, 36, 0, 37, 0, 0, 0, 38, 0, 
   39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
-  0, 47, 0, 0, 0, 0, 0, 0, 0, 221, 
+  0, 47, 0, 0, 481, 0, 0, 0, 0, 0, 
   0, 0, 0, 51, 48, 50, 49, 0, 52, 0, 
   53, 0, 55, 0, 56, 0, 0, 0, 0, 43, 
   54, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
   45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  475, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
+  483, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
   0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
   0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
   0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 46, 0, 47, 0, 0, 481, 0, 
+  0, 0, 0, 46, 0, 47, 0, 0, 486, 0, 
   0, 0, 0, 0, 0, 0, 0, 51, 48, 50, 
   49, 0, 52, 0, 53, 0, 55, 0, 56, 0, 
   0, 0, 0, 43, 54, 32, 0, 0, 0, 40, 
@@ -548,58 +538,57 @@ const short QDeclarativeJSGrammar::action_info [] = {
   0, 51, 48, 50, 49, 0, 52, 0, 53, 0, 
   55, 0, 56, 0, 0, 0, 0, 43, 54, 32, 
   0, 0, 0, 40, 0, 0, 0, 0, 45, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 475, 0, 
-  0, 29, 30, 31, 0, 0, 0, 0, 0, 0, 
-  0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 
-  0, 0, 0, 35, 36, 0, 37, 0, 0, 0, 
-  38, 0, 39, 41, 42, 0, 0, 44, 0, 0, 
-  0, 46, 0, 47, 0, 0, 476, 0, 0, 0, 
-  0, 0, 0, 0, 0, 51, 48, 50, 49, 0, 
-  52, 0, 53, 0, 55, 0, 56, 0, 0, 0, 
-  0, 43, 54, 32, 0, 0, 0, 40, 0, 0, 
-  0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 109, 110, 111, 0, 0, 113, 115, 116, 
-  0, 0, 117, 0, 118, 0, 0, 0, 120, 121, 
-  122, 0, 0, 0, 0, 0, 0, 34, 123, 124, 
-  125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 126, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 129, 0, 0, 
-  0, 0, 0, 0, 48, 50, 49, 130, 131, 132, 
-  0, 134, 135, 136, 137, 138, 139, 0, 0, 127, 
-  133, 119, 112, 114, 128, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 29, 30, 
+  31, 0, 0, 0, 0, 0, 0, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 34, 217, 0, 0, 
+  218, 36, 0, 37, 0, 0, 0, 38, 0, 39, 
+  41, 42, 0, 0, 44, 0, 0, 0, 46, 0, 
+  47, 0, 0, 0, 0, 0, 0, 0, 221, 0, 
+  0, 0, 51, 48, 50, 49, 223, 52, 0, 53, 
+  225, 55, 0, 56, 0, 228, 0, 0, 43, 54, 
+  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  33, 0, 0, 0, 0, 0, 0, 34, 217, 0, 
+  0, 581, 582, 0, 37, 0, 0, 0, 38, 0, 
+  39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
+  0, 47, 0, 0, 0, 0, 0, 0, 0, 221, 
+  0, 0, 0, 51, 48, 50, 49, 223, 52, 0, 
+  53, 225, 55, 0, 56, 0, 228, 0, 0, 43, 
+  54, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
   45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   109, 110, 111, 0, 0, 113, 115, 116, 0, 0, 
   117, 0, 118, 0, 0, 0, 120, 121, 122, 0, 
-  0, 0, 0, 0, 0, 393, 123, 124, 125, 0, 
+  0, 0, 0, 0, 0, 34, 123, 124, 125, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 
-  0, 0, 0, 394, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 129, 0, 0, 0, 0, 
-  0, 398, 395, 397, 0, 130, 131, 132, 0, 134, 
+  0, 0, 48, 50, 49, 130, 131, 132, 0, 134, 
   135, 136, 137, 138, 139, 0, 0, 127, 133, 119, 
-  112, 114, 128, 0, 0, 0, 0, 0, 0, 0, 
+  112, 114, 128, 0, 0, 0, 0, 0, 45, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 109, 110, 
   111, 0, 0, 113, 115, 116, 0, 0, 117, 0, 
   118, 0, 0, 0, 120, 121, 122, 0, 0, 0, 
   0, 0, 0, 393, 123, 124, 125, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 126, 0, 0, 
-  0, 394, 0, 0, 0, 0, 0, 0, 0, 396, 
+  0, 394, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 129, 0, 0, 0, 0, 0, 398, 
   395, 397, 0, 130, 131, 132, 0, 134, 135, 136, 
   137, 138, 139, 0, 0, 127, 133, 119, 112, 114, 
   128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 209, 0, 0, 0, 
-  0, 211, 0, 29, 30, 31, 213, 0, 0, 0, 
-  0, 0, 0, 214, 33, 0, 0, 0, 0, 0, 
-  0, 216, 217, 0, 0, 218, 36, 0, 37, 0, 
-  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
-  0, 0, 0, 46, 0, 47, 0, 0, 0, 0, 
-  0, 220, 0, 221, 0, 0, 0, 51, 219, 222, 
-  49, 223, 52, 224, 53, 225, 55, 226, 56, 227, 
-  228, 0, 0, 43, 54, 32, 210, 212, 0, 40, 
-  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 109, 110, 111, 0, 
+  0, 113, 115, 116, 0, 0, 117, 0, 118, 0, 
+  0, 0, 120, 121, 122, 0, 0, 0, 0, 0, 
+  0, 393, 123, 124, 125, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 126, 0, 0, 0, 394, 
+  0, 0, 0, 0, 0, 0, 0, 396, 0, 0, 
+  0, 129, 0, 0, 0, 0, 0, 398, 395, 397, 
+  0, 130, 131, 132, 0, 134, 135, 136, 137, 138, 
+  139, 0, 0, 127, 133, 119, 112, 114, 128, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 209, 0, 0, 0, 0, 211, 
   0, 29, 30, 31, 213, 0, 0, 0, 0, 0, 
-  0, 214, 215, 0, 0, 0, 0, 0, 0, 216, 
+  0, 214, 33, 0, 0, 0, 0, 0, 0, 216, 
   217, 0, 0, 218, 36, 0, 37, 0, 0, 0, 
   38, 0, 39, 41, 42, 0, 0, 44, 0, 0, 
   0, 46, 0, 47, 0, 0, 0, 0, 0, 220, 
@@ -607,184 +596,202 @@ const short QDeclarativeJSGrammar::action_info [] = {
   52, 224, 53, 225, 55, 226, 56, 227, 228, 0, 
   0, 43, 54, 32, 210, 212, 0, 40, 0, 0, 
   0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 582, 110, 111, 0, 0, 584, 115, 586, 
-  30, 31, 587, 0, 118, 0, 0, 0, 120, 589, 
-  590, 0, 0, 0, 0, 0, 0, 591, 592, 124, 
-  125, 218, 36, 0, 37, 0, 0, 0, 38, 0, 
-  39, 593, 42, 0, 0, 595, 0, 0, 0, 46, 
-  0, 47, 0, 0, 0, 0, 0, 597, 0, 221, 
-  0, 0, 0, 599, 596, 598, 49, 600, 601, 602, 
-  53, 604, 605, 606, 607, 608, 609, 0, 0, 594, 
-  603, 588, 583, 585, 128, 40, 0, 0, 0, 0, 
+  0, 0, 209, 0, 0, 0, 0, 211, 0, 29, 
+  30, 31, 213, 0, 0, 0, 0, 0, 0, 214, 
+  215, 0, 0, 0, 0, 0, 0, 216, 217, 0, 
+  0, 218, 36, 0, 37, 0, 0, 0, 38, 0, 
+  39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
+  0, 47, 0, 0, 0, 0, 0, 220, 0, 221, 
+  0, 0, 0, 51, 219, 222, 49, 223, 52, 224, 
+  53, 225, 55, 226, 56, 227, 228, 0, 0, 43, 
+  54, 32, 210, 212, 0, 40, 0, 0, 0, 0, 
   45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  361, 110, 111, 0, 0, 363, 115, 365, 30, 31, 
-  366, 0, 118, 0, 0, 0, 120, 368, 369, 0, 
-  0, 0, 0, 0, 0, 370, 371, 124, 125, 218, 
-  36, 0, 37, 0, 0, 0, 38, 0, 39, 372, 
-  42, 0, 0, 374, 0, 0, 0, 46, 0, 47, 
-  0, -265, 0, 0, 0, 376, 0, 221, 0, 0, 
-  0, 378, 375, 377, 49, 379, 380, 381, 53, 383, 
-  384, 385, 386, 387, 388, 0, 0, 373, 382, 367, 
-  362, 364, 128, 40, 0, 0, 0, 0, 45, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 
+  585, 110, 111, 0, 0, 587, 115, 589, 30, 31, 
+  590, 0, 118, 0, 0, 0, 120, 592, 593, 0, 
+  0, 0, 0, 0, 0, 594, 595, 124, 125, 218, 
+  36, 0, 37, 0, 0, 0, 38, 0, 39, 596, 
+  42, 0, 0, 598, 0, 0, 0, 46, 0, 47, 
+  0, 0, 0, 0, 0, 600, 0, 221, 0, 0, 
+  0, 602, 599, 601, 49, 603, 604, 605, 53, 607, 
+  608, 609, 610, 611, 612, 0, 0, 597, 606, 591, 
+  586, 588, 128, 40, 0, 0, 0, 0, 45, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 361, 110, 
+  111, 0, 0, 363, 115, 365, 30, 31, 366, 0, 
+  118, 0, 0, 0, 120, 368, 369, 0, 0, 0, 
+  0, 0, 0, 370, 371, 124, 125, 218, 36, 0, 
+  37, 0, 0, 0, 38, 0, 39, 372, 42, 0, 
+  0, 374, 0, 0, 0, 46, 0, 47, 0, -268, 
+  0, 0, 0, 376, 0, 221, 0, 0, 0, 378, 
+  375, 377, 49, 379, 380, 381, 53, 383, 384, 385, 
+  386, 387, 388, 0, 0, 373, 382, 367, 362, 364, 
+  128, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 
 
-  567, 169, 558, 570, 574, 515, 569, 557, 309, 548, 
-  461, 528, 311, 530, 417, 555, 307, 188, 415, 358, 
-  392, 250, 628, 612, 320, 623, 150, 253, 16, 637, 
-  496, 497, 498, 390, 614, 186, 634, 472, 182, 400, 
-  487, 243, 436, 238, 436, 176, 182, 302, 514, 171, 
-  238, 439, 334, 429, 439, 447, 454, 336, 339, 358, 
-  243, 140, 433, 302, 338, 237, 349, 351, 449, 482, 
-  146, 182, 148, 460, 485, 458, 353, 250, 250, 243, 
-  344, 410, 238, 163, 467, 456, 524, 143, 436, 425, 
-  237, 439, 445, 302, 402, 358, 461, 404, 0, 450, 
-  60, 358, 404, 186, 146, 92, 0, 0, 0, 407, 
-  500, 60, 0, 638, 500, 60, 84, 536, 320, 500, 
-  0, 98, 540, 60, 302, 60, 405, 490, 91, 302, 
-  0, 405, 60, 0, 180, 302, 60, 106, 489, 60, 
-  60, 60, 180, 60, 93, 60, 286, 60, 285, 60, 
-  94, 146, 284, 90, 60, 60, 178, 452, 89, 60, 
-  108, 60, 358, 60, 95, 60, 287, 471, 288, 88, 
-  60, 302, 451, 60, 60, 60, 452, 451, 60, 404, 
-  68, 432, 60, 102, 494, 60, 347, 67, 341, 60, 
-  330, 329, 61, 266, 60, 305, 69, 60, 270, 60, 
-  70, 303, 60, 60, 60, 480, 451, 0, 405, 479, 
-  72, 0, 60, 165, 491, 60, 60, 60, 180, 168, 
-  60, 97, 492, 60, 60, 452, 60, 60, 493, 100, 
-  96, 60, 0, 77, 60, 0, 270, 332, 298, 270, 
-  273, 60, 435, 270, 60, 298, 270, 298, 278, 270, 
-  270, 316, 270, 60, 298, 295, 298, 60, 270, 270, 
-  297, 270, 270, 106, 291, 60, 60, 326, 313, 317, 
-  270, 270, 290, 289, 552, 60, 319, 536, 300, 610, 
-  270, 519, 520, 521, 522, 500, 108, 175, 293, 0, 
-  0, 500, 508, 0, 0, 544, 0, 472, 613, 547, 
-  0, 499, 509, 500, 0, 0, 0, 500, 0, 0, 
-  508, 0, 0, 0, 508, 0, 0, 0, 577, 499, 
-  509, 0, 0, 499, 509, 580, 581, 519, 520, 521, 
-  522, 552, 0, 0, 0, 0, 0, 0, 553, 554, 
-  519, 520, 521, 522, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 560, 519, 520, 521, 522, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  439, 309, 311, 533, 531, 497, 496, 498, 514, 515, 
+  16, 461, 637, 307, 551, 358, 527, 561, 436, 238, 
+  472, 487, 250, 243, 182, 615, 302, 182, 640, 573, 
+  253, 150, 439, 347, 631, 626, 250, 358, 425, 250, 
+  558, 577, 429, 344, 186, 560, 402, 617, 243, 433, 
+  349, 456, 445, 572, 570, 339, 182, 447, 454, 458, 
+  238, 449, 237, 243, 351, 238, 460, 353, 334, 163, 
+  436, 482, 302, 450, 140, 148, 188, 467, 176, 439, 
+  410, 338, 143, 417, 436, 320, 302, 358, 237, 336, 
+  500, 485, 146, 171, 0, 404, 358, 616, 400, 358, 
+  392, 0, 169, 0, 0, 0, 0, 390, 186, 404, 
+  0, 480, 0, 0, 500, 479, 500, 641, 0, 543, 
+  266, 60, 60, 180, 451, 270, 302, 405, 146, 146, 
+  404, 302, 0, 178, 407, 60, 60, 490, 452, 60, 
+  60, 405, 180, 60, 285, 489, 60, 60, 60, 451, 
+  60, 284, 60, 287, 452, 288, 60, 60, 60, 60, 
+  180, 286, 405, 60, 60, 493, 60, 60, 69, 60, 
+  97, 165, 320, 98, 91, 168, 432, 415, 60, 435, 
+  60, 60, 500, 84, 60, 539, 77, 60, 106, 72, 
+  302, 60, 92, 341, 102, 330, 93, 60, 461, 60, 
+  332, 60, 94, 90, 60, 0, 95, 60, 89, 60, 
+  60, 88, 60, 61, 108, 96, 60, 270, 452, 60, 
+  60, 494, 492, 295, 60, 60, 451, 60, 60, 67, 
+  491, 106, 60, 60, 68, 0, 70, 100, 60, 298, 
+  0, 298, 298, 270, 270, 329, 270, 270, 298, 60, 
+  0, 0, 0, 270, 270, 316, 0, 108, 175, 305, 
+  60, 317, 293, 319, 326, 270, 60, 278, 0, 471, 
+  300, 270, 60, 289, 0, 298, 60, 270, 0, 291, 
+  270, 270, 302, 290, 60, 60, 500, 550, 0, 270, 
+  270, 0, 547, 508, 273, 500, 0, 297, 0, 313, 
+  500, 0, 508, 0, 0, 499, 509, 508, 0, 0, 
+  0, 0, 0, 0, 499, 509, 0, 0, 0, 499, 
+  509, 519, 520, 521, 522, 526, 523, 524, 563, 519, 
+  520, 521, 522, 526, 523, 524, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 580, 0, 0, 0, 0, 
+  0, 303, 583, 584, 519, 520, 521, 522, 526, 523, 
+  524, 555, 0, 0, 0, 0, 0, 0, 556, 557, 
+  519, 520, 521, 522, 526, 523, 524, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 555, 0, 0, 539, 
+  0, 613, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 472, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0};
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 const short QDeclarativeJSGrammar::action_check [] = {
-  36, 36, 33, 33, 60, 7, 7, 36, 8, 36, 
-  7, 16, 55, 7, 7, 7, 55, 36, 36, 7, 
-  90, 7, 55, 7, 36, 7, 60, 33, 60, 33, 
-  33, 7, 7, 29, 8, 60, 17, 7, 66, 37, 
-  66, 24, 33, 7, 34, 5, 33, 36, 33, 7, 
-  60, 5, 7, 33, 33, 7, 7, 20, 36, 36, 
-  5, 7, 61, 36, 7, 36, 7, 17, 8, 77, 
-  36, 7, 79, 2, 33, 36, 8, 1, 8, 36, 
-  48, 2, 1, 55, 79, 1, 48, 36, 8, 36, 
-  2, 60, 31, 7, 61, 33, 0, 8, 7, 2, 
-  7, 36, 55, 36, 60, 1, 8, 15, 8, 10, 
-  8, 8, -1, 8, 79, 8, 60, 48, 8, 61, 
-  48, 7, 8, 60, 50, 8, 34, 6, 54, 42, 
-  8, 15, 8, 8, 61, 62, 61, 62, 61, 62, 
-  53, 20, 90, 61, 62, 79, 61, 62, 8, 8, 
-  34, 61, 62, 40, 55, 61, 62, 8, 60, 56, 
-  60, 7, 60, 56, 51, 60, 56, 40, 40, 8, 
-  50, 29, 40, 56, 54, 15, 61, 62, 51, 51, 
-  56, 12, 60, 51, 25, 60, 27, 61, 62, 8, 
-  61, 62, 15, 25, 34, 27, 36, 38, 7, 12, 
-  60, 60, 12, 29, 61, 62, 38, 25, 29, 27, 
-  61, 34, 7, 36, 25, -1, 27, 75, 15, -1, 
-  38, 7, 61, 62, 33, 7, 57, 38, 86, -1, 
-  -1, 29, 63, 25, 91, 27, 29, 34, 25, 36, 
-  27, 29, 61, 62, 57, -1, 38, 57, 47, 75, 
-  63, 38, 15, 63, 75, 25, 8, 27, -1, 25, 
-  86, 27, 61, 62, 36, 86, 61, 62, 38, 18, 
-  19, 34, 38, 36, -1, 61, 62, 75, -1, 61, 
-  62, 29, 75, 92, 18, 19, 15, 75, 86, 61, 
-  62, -1, 91, 86, 29, 15, 45, 46, 86, 18, 
-  19, 18, 19, 29, 33, 34, -1, 36, -1, 61, 
-  62, 45, 46, 33, 34, -1, 36, 29, 66, 67, 
-  68, 29, -1, -1, -1, -1, 45, 46, 45, 46, 
-  29, 66, 67, 68, 23, 24, 29, -1, -1, 29, 
-  66, 67, 68, 32, 92, -1, 35, -1, 37, 29, 
-  25, -1, 27, 29, 66, 67, 68, 92, 66, 67, 
-  68, -1, -1, 38, -1, -1, 92, 66, 67, 68, 
+  36, 24, 7, 55, 7, 37, 8, 7, 20, 60, 
+  7, 36, 7, 17, 33, 33, 7, 55, 33, 36, 
+  36, 60, 33, 8, 55, 7, 36, 34, 7, 7, 
+  16, 7, 60, 55, 7, 36, 7, 36, 36, 33, 
+  33, 7, 7, 5, 7, 5, 5, 36, 36, 33, 
+  7, 60, 33, 36, 7, 7, 90, 7, 33, 29, 
+  66, 33, 36, 7, 31, 7, 7, 36, 60, 77, 
+  66, 61, 7, 2, 2, 36, 1, 33, 36, 1, 
+  60, 8, 8, 1, 48, 36, 7, 2, 36, 8, 
+  33, 7, 79, 61, 48, 0, 36, 1, 7, 36, 
+  2, 8, 79, 17, 10, 60, -1, 8, 8, 55, 
+  48, 6, 8, -1, 61, 60, 48, 50, 8, 7, 
+  8, 54, 42, 15, 60, 20, 8, 61, 62, 8, 
+  61, 62, 8, 53, 8, 8, 8, 61, 62, 8, 
+  79, 90, 34, 40, 61, 62, 8, 40, 8, 55, 
+  61, 62, 7, 60, 51, -1, 56, -1, 51, 60, 
+  40, 8, 61, 62, 60, 50, 15, 61, 62, 54, 
+  60, 51, 61, 62, 56, 61, 62, 61, 62, 40, 
+  56, 60, 56, 12, 15, 34, 29, 60, 60, 15, 
+  51, 8, 61, 15, 56, 61, 62, 12, 8, -1, 
+  60, 29, -1, 34, 29, 36, 61, 62, 34, 12, 
+  36, 25, 34, 27, 36, 7, 25, 25, 27, 27, 
+  25, 7, 27, 29, 38, 91, -1, 29, 57, 38, 
+  38, 7, 75, 38, 63, 29, 25, 8, 27, -1, 
+  -1, 33, 57, 86, 61, 62, 15, 75, 63, 38, 
+  75, 61, 62, 36, 57, 25, -1, 27, 86, -1, 
+  63, 86, -1, -1, -1, 34, -1, 36, 38, 75, 
+  18, 19, -1, 75, 29, 61, 62, -1, 61, 62, 
+  86, 75, -1, 15, 86, 61, 62, 18, 19, 15, 
+  61, 62, 86, 18, 19, 18, 19, 45, 46, -1, 
+  92, 33, 34, 47, 36, 29, -1, 33, 34, -1, 
+  36, 66, 67, 68, 45, 46, 29, 61, 62, 29, 
+  45, 46, 45, 46, 29, -1, -1, 29, -1, -1, 
+  -1, -1, 25, 29, 27, -1, -1, 92, -1, 29, 
+  -1, -1, 66, 67, 68, 38, -1, 91, -1, -1, 
   -1, -1, -1, 66, 67, 68, 66, 67, 68, -1, 
-  92, -1, -1, -1, 92, -1, 66, 67, 68, -1, 
-  66, 67, 68, 92, 23, 24, -1, 29, -1, 92, 
-  -1, -1, 92, 32, -1, -1, 35, 29, 37, 23, 
-  24, -1, 92, -1, 36, -1, 92, -1, 32, 23, 
-  24, 35, -1, 37, -1, -1, -1, 29, 32, 23, 
-  24, 35, -1, 37, 66, 67, 68, 31, 32, 23, 
-  24, 35, -1, 37, 66, 67, 68, 31, 32, -1, 
-  -1, 35, -1, 37, 94, 95, 96, 97, 98, 99, 
-  92, -1, -1, -1, 66, 67, 68, 23, 24, -1, 
-  92, -1, -1, -1, -1, 31, 32, 23, 24, 35, 
-  29, 37, -1, -1, -1, 31, 32, 36, 29, 35, 
-  92, 37, -1, -1, 23, 24, 29, -1, -1, 29, 
-  23, 24, 31, 32, -1, -1, 35, 29, 37, 32, 
-  -1, -1, 35, -1, 37, 29, -1, 66, 67, 68, 
-  61, 62, -1, -1, -1, 66, 67, 68, 61, 62, 
-  -1, 61, 62, 66, 67, 68, 66, 67, 68, 61, 
-  62, -1, -1, 92, 66, 67, 68, 61, 62, -1, 
-  -1, 92, 66, 67, 68, -1, -1, -1, 3, 92, 
-  -1, -1, 92, -1, -1, -1, -1, -1, 13, -1, 
-  92, -1, 17, -1, -1, -1, -1, -1, 92, 29, 
-  -1, 26, -1, 28, -1, -1, 31, -1, -1, -1, 
-  -1, -1, -1, -1, 39, -1, 41, 42, -1, -1, 
-  -1, -1, -1, -1, 49, -1, -1, 52, 53, -1, 
-  -1, 61, 62, 58, -1, -1, 66, 67, 68, 64, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 80, -1, -1, -1, 12, 
-  13, -1, 92, -1, -1, -1, -1, -1, -1, 22, 
-  -1, -1, 3, -1, -1, -1, 29, -1, -1, -1, 
-  33, 34, 13, 36, -1, -1, 17, -1, -1, -1, 
-  43, -1, -1, -1, 47, 26, -1, 28, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 39, -1, 
-  41, 42, 65, 66, 67, 68, -1, 70, 49, -1, 
-  -1, 52, 53, -1, -1, -1, -1, 58, 81, 82, 
-  83, -1, -1, 64, 87, -1, -1, -1, -1, 92, 
-  -1, -1, -1, 12, 13, -1, -1, -1, -1, 80, 
-  -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 
-  29, -1, -1, -1, 33, 34, -1, 36, -1, -1, 
-  -1, 12, 13, -1, 43, -1, -1, -1, 47, -1, 
-  -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
-  -1, -1, 33, 34, -1, 36, 65, 66, 67, 68, 
-  -1, 70, 43, -1, -1, -1, 47, -1, -1, -1, 
-  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
-  -1, -1, -1, 92, 65, 66, 67, 68, -1, 70, 
-  -1, -1, -1, 12, 13, -1, -1, -1, -1, -1, 
-  81, 82, 83, 22, -1, -1, 87, -1, -1, -1, 
-  29, 92, -1, -1, 33, 34, -1, 36, -1, -1, 
-  -1, 12, 13, -1, 43, -1, -1, -1, 47, -1, 
+  -1, 66, 67, 68, 66, 67, 68, 29, 92, -1, 
+  66, 67, 68, -1, 23, 24, 66, 67, 68, 92, 
+  23, 24, 92, 32, -1, -1, 35, 92, 37, 32, 
+  92, -1, 35, -1, 37, 29, 92, -1, 23, 24, 
+  29, -1, 92, 29, 66, 67, 68, 32, -1, 29, 
+  35, -1, 37, 29, 23, 24, 29, -1, -1, -1, 
+  -1, -1, 31, 32, -1, -1, 35, -1, 37, -1, 
+  92, -1, 66, 67, 68, -1, 29, 66, 67, 68, 
+  66, 67, 68, 36, -1, -1, 66, 67, 68, -1, 
+  66, 67, 68, 66, 67, 68, 23, 24, 92, -1, 
+  -1, -1, -1, 92, 31, 32, 92, -1, 35, -1, 
+  37, 29, 92, 66, 67, 68, 92, -1, 36, 92, 
+  29, -1, 23, 24, 94, 95, 96, 97, 98, 99, 
+  29, 32, -1, 29, 35, -1, 37, -1, -1, 92, 
+  -1, -1, -1, 29, -1, -1, -1, -1, 66, 67, 
+  68, -1, 61, 62, -1, -1, -1, 66, 67, 68, 
+  -1, -1, 61, 62, -1, 61, 62, 66, 67, 68, 
+  66, 67, 68, -1, 92, 61, 62, -1, -1, 29, 
+  66, 67, 68, 92, -1, -1, -1, 29, -1, -1, 
+  -1, -1, -1, 92, -1, -1, 92, -1, -1, -1, 
+  -1, 23, 24, -1, -1, -1, 92, -1, -1, 31, 
+  32, 61, 62, 35, -1, 37, 66, 67, 68, 61, 
+  62, 3, -1, -1, 66, 67, 68, -1, -1, -1, 
+  -1, 13, -1, -1, -1, 17, -1, -1, -1, -1, 
+  -1, -1, 92, -1, 26, -1, 28, -1, -1, 31, 
+  92, -1, -1, -1, -1, -1, -1, 39, -1, 41, 
+  42, -1, -1, -1, -1, -1, -1, 49, -1, -1, 
+  52, 53, -1, -1, -1, -1, 58, -1, 12, 13, 
+  3, -1, 64, -1, -1, -1, -1, -1, 22, -1, 
+  13, -1, -1, -1, 17, 29, -1, -1, 80, 33, 
+  34, -1, 36, 26, -1, 28, -1, -1, -1, 43, 
+  -1, -1, -1, 47, -1, -1, 39, -1, 41, 42, 
+  -1, -1, -1, -1, -1, -1, 49, -1, -1, 52, 
+  53, 65, 66, 67, 68, 58, 70, -1, -1, -1, 
+  -1, 64, -1, -1, -1, -1, -1, 81, 82, 83, 
+  -1, 12, 13, 87, -1, -1, -1, 80, 92, -1, 
   -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
-  -1, -1, 33, 34, -1, 36, 65, 66, 67, 68, 
-  -1, 70, 43, -1, -1, -1, 47, -1, -1, -1, 
-  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
-  -1, -1, -1, 92, 65, 66, 67, 68, -1, 70, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, 12, 
+  13, -1, 43, -1, -1, -1, 47, -1, -1, 22, 
+  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
+  33, 34, -1, 36, 65, 66, 67, 68, -1, 70, 
+  43, -1, -1, -1, 47, -1, -1, -1, -1, -1, 
   81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
-  -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 92, 65, 66, 67, 68, -1, 70, -1, -1, 
+  -1, 12, 13, -1, -1, -1, -1, -1, 81, 82, 
+  83, 22, -1, -1, 87, -1, -1, -1, 29, 92, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, 12, 
+  13, -1, 43, -1, -1, -1, 47, -1, -1, 22, 
+  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
+  33, 34, -1, 36, 65, 66, 67, 68, -1, 70, 
+  43, -1, -1, -1, 47, -1, -1, -1, -1, -1, 
+  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
+  -1, 92, 65, 66, 67, 68, -1, 70, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 12, 
+  13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
+  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
+  33, 34, -1, 36, -1, -1, -1, -1, -1, -1, 
+  43, -1, -1, -1, 47, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 65, 66, 67, 68, -1, 70, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 10, 
   -1, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
   -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
   -1, -1, 33, 34, -1, 36, -1, -1, -1, -1, 
   -1, -1, 43, -1, -1, -1, 47, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, 65, 66, 67, 68, -1, 70, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
+  -1, -1, -1, -1, 75, -1, -1, -1, -1, -1, 
+  81, 82, 83, 84, -1, -1, 87, -1, -1, -1, 
   -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, 10, -1, 12, 13, -1, -1, -1, -1, -1, 
   -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 
   29, -1, -1, -1, 33, 34, -1, 36, -1, -1, 
   -1, -1, -1, -1, 43, -1, -1, -1, 47, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 55, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
   -1, 70, -1, -1, -1, -1, 75, -1, -1, -1, 
   -1, -1, 81, 82, 83, 84, -1, -1, 87, -1, 
@@ -798,67 +805,49 @@ const short QDeclarativeJSGrammar::action_check [] = {
   67, 68, -1, 70, -1, -1, -1, -1, 75, -1, 
   -1, -1, -1, -1, 81, 82, 83, 84, -1, -1, 
   87, -1, -1, -1, -1, 92, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 10, -1, 12, 13, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
-  -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
-  -1, 36, -1, -1, -1, -1, -1, -1, 43, -1, 
-  -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, 
-  55, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  65, 66, 67, 68, -1, 70, -1, -1, -1, -1, 
-  75, -1, -1, -1, -1, -1, 81, 82, 83, 84, 
-  -1, -1, 87, -1, -1, -1, -1, 92, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
-  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
-  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
-  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 
-  74, -1, 76, -1, -1, -1, -1, 81, 82, 83, 
-  -1, -1, -1, 87, -1, -1, -1, -1, 92, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 7, -1, 
-  -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 
-  29, -1, -1, -1, 33, 34, -1, 36, -1, -1, 
-  -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, 
-  -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
-  -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, 
-  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
-  -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
-  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
-  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
-  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
-  68, -1, 70, -1, 72, -1, 74, 75, 76, -1, 
-  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
-  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, 11, 12, 13, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, 
-  -1, -1, 29, 30, -1, -1, 33, 34, -1, 36, 
-  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
-  47, -1, -1, -1, 51, -1, 53, -1, -1, -1, 
-  -1, -1, -1, -1, 61, -1, -1, -1, 65, 66, 
-  67, 68, -1, 70, -1, 72, -1, 74, -1, 76, 
-  -1, -1, -1, -1, 81, 82, 83, -1, -1, -1, 
-  87, -1, -1, -1, -1, 92, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 8, -1, -1, 11, 12, 
-  13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
-  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
-  33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
-  43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
-  53, -1, -1, 56, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 65, 66, 67, 68, -1, 70, -1, 72, 
-  -1, 74, -1, 76, -1, -1, -1, -1, 81, 82, 
-  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, 
+  -1, -1, -1, -1, -1, 11, 12, 13, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
+  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
+  -1, 87, -1, -1, -1, -1, 92, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 7, -1, -1, -1, 
+  11, 12, 13, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
+  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
+  51, -1, 53, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 65, 66, 67, 68, -1, 70, 
+  -1, 72, -1, 74, -1, 76, -1, -1, -1, -1, 
+  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
+  -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, 
+  -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
+  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
+  -1, 51, -1, 53, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 
+  70, -1, 72, -1, 74, 75, 76, -1, -1, -1, 
+  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
+  -1, -1, 92, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
+  56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
+  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
+  -1, 87, -1, -1, -1, -1, 92, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 8, -1, -1, 11, 
   12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
-  22, -1, -1, -1, -1, -1, -1, 29, 30, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
   -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
   42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
-  -1, 53, -1, -1, -1, -1, -1, -1, -1, 61, 
+  -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, 
   -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
   72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
   82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
@@ -881,55 +870,54 @@ const short QDeclarativeJSGrammar::action_check [] = {
   -1, 65, 66, 67, 68, -1, 70, -1, 72, -1, 
   74, -1, 76, -1, -1, -1, -1, 81, 82, 83, 
   -1, -1, -1, 87, -1, -1, -1, -1, 92, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, 
-  -1, 11, 12, 13, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 22, -1, -1, -1, -1, -1, -1, 29, 
-  -1, -1, -1, 33, 34, -1, 36, -1, -1, -1, 
-  40, -1, 42, 43, 44, -1, -1, 47, -1, -1, 
-  -1, 51, -1, 53, -1, -1, 56, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 65, 66, 67, 68, -1, 
-  70, -1, 72, -1, 74, -1, 76, -1, -1, -1, 
-  -1, 81, 82, 83, -1, -1, -1, 87, -1, -1, 
-  -1, -1, 92, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
-  -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 
-  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
-  32, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, 43, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, 
-  -1, -1, -1, -1, 66, 67, 68, 69, 70, 71, 
-  -1, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
-  82, 83, 84, 85, 86, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 11, 12, 
+  13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
+  -1, -1, -1, -1, -1, -1, 29, 30, -1, -1, 
+  33, 34, -1, 36, -1, -1, -1, 40, -1, 42, 
+  43, 44, -1, -1, 47, -1, -1, -1, 51, -1, 
+  53, -1, -1, -1, -1, -1, -1, -1, 61, -1, 
+  -1, -1, 65, 66, 67, 68, 69, 70, -1, 72, 
+  73, 74, -1, 76, -1, 78, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 11, 
+  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, 30, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
+  42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
+  -1, 53, -1, -1, -1, -1, -1, -1, -1, 61, 
+  -1, -1, -1, 65, 66, 67, 68, 69, 70, -1, 
+  72, 73, 74, -1, 76, -1, 78, -1, -1, 81, 
+  82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
   92, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   4, 5, 6, -1, -1, 9, 10, 11, -1, -1, 
   14, -1, 16, -1, -1, -1, 20, 21, 22, -1, 
   -1, -1, -1, -1, -1, 29, 30, 31, 32, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, 
-  -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, 59, -1, -1, -1, -1, 
-  -1, 65, 66, 67, -1, 69, 70, 71, -1, 73, 
+  -1, -1, 66, 67, 68, 69, 70, 71, -1, 73, 
   74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
-  84, 85, 86, -1, -1, -1, -1, -1, -1, -1, 
+  84, 85, 86, -1, -1, -1, -1, -1, 92, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, 
   6, -1, -1, 9, 10, 11, -1, -1, 14, -1, 
   16, -1, -1, -1, 20, 21, 22, -1, -1, -1, 
   -1, -1, -1, 29, 30, 31, 32, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, 43, -1, -1, 
-  -1, 47, -1, -1, -1, -1, -1, -1, -1, 55, 
+  -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, 59, -1, -1, -1, -1, -1, 65, 
   66, 67, -1, 69, 70, 71, -1, 73, 74, 75, 
   76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
   86, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, 
-  -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, 
-  -1, -1, -1, 21, 22, -1, -1, -1, -1, -1, 
-  -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, 
-  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
-  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
-  -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 
-  68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 
-  78, -1, -1, 81, 82, 83, 84, 85, -1, 87, 
-  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 4, 5, 6, -1, 
+  -1, 9, 10, 11, -1, -1, 14, -1, 16, -1, 
+  -1, -1, 20, 21, 22, -1, -1, -1, -1, -1, 
+  -1, 29, 30, 31, 32, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 43, -1, -1, -1, 47, 
+  -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, 
+  -1, 59, -1, -1, -1, -1, -1, 65, 66, 67, 
+  -1, 69, 70, 71, -1, 73, 74, 75, 76, 77, 
+  78, -1, -1, 81, 82, 83, 84, 85, 86, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, 4, -1, -1, -1, -1, 9, 
   -1, 11, 12, 13, 14, -1, -1, -1, -1, -1, 
   -1, 21, 22, -1, -1, -1, -1, -1, -1, 29, 
@@ -940,74 +928,84 @@ const short QDeclarativeJSGrammar::action_check [] = {
   70, 71, 72, 73, 74, 75, 76, 77, 78, -1, 
   -1, 81, 82, 83, 84, 85, -1, 87, -1, -1, 
   -1, -1, 92, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
-  12, 13, 14, -1, 16, -1, -1, -1, 20, 21, 
-  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
-  32, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
+  -1, -1, 4, -1, -1, -1, -1, 9, -1, 11, 
+  12, 13, 14, -1, -1, -1, -1, -1, -1, 21, 
+  22, -1, -1, -1, -1, -1, -1, 29, 30, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
   42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
   -1, 53, -1, -1, -1, -1, -1, 59, -1, 61, 
   -1, -1, -1, 65, 66, 67, 68, 69, 70, 71, 
   72, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
-  82, 83, 84, 85, 86, 87, -1, -1, -1, -1, 
+  82, 83, 84, 85, -1, 87, -1, -1, -1, -1, 
   92, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   4, 5, 6, -1, -1, 9, 10, 11, 12, 13, 
   14, -1, 16, -1, -1, -1, 20, 21, 22, -1, 
   -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, 
   34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
   44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
-  -1, 55, -1, -1, -1, 59, -1, 61, -1, -1, 
+  -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, 
   -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 
   74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
   84, 85, 86, 87, -1, -1, -1, -1, 92, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, 
+  6, -1, -1, 9, 10, 11, 12, 13, 14, -1, 
+  16, -1, -1, -1, 20, 21, 22, -1, -1, -1, 
+  -1, -1, -1, 29, 30, 31, 32, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, 55, 
+  -1, -1, -1, 59, -1, 61, -1, -1, -1, 65, 
+  66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 
+  76, 77, 78, -1, -1, 81, 82, 83, 84, 85, 
+  86, 87, -1, -1, -1, -1, 92, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 
 
-  26, 36, 15, 15, 15, 15, 26, 26, 3, 15, 
-  15, 26, 2, 15, 3, 19, 2, 15, 2, 2, 
-  37, 2, 15, 19, 15, 13, 68, 3, 3, 11, 
-  105, 4, 2, 36, 19, 15, 15, 36, 15, 36, 
-  3, 15, 3, 15, 3, 3, 15, 3, 26, 36, 
-  15, 22, 2, 94, 22, 15, 3, 3, 15, 2, 
-  15, 3, 3, 3, 2, 4, 3, 2, 22, 36, 
-  36, 15, 36, 2, 36, 3, 2, 2, 2, 15, 
-  101, 2, 15, 36, 36, 2, 13, 36, 3, 97, 
-  4, 22, 99, 3, 2, 2, 15, 13, -1, 22, 
-  45, 2, 13, 15, 36, 50, -1, -1, -1, 41, 
-  13, 45, -1, 16, 13, 45, 50, 16, 15, 13, 
-  -1, 51, 16, 45, 3, 45, 42, 47, 50, 3, 
-  -1, 42, 45, -1, 47, 3, 45, 15, 47, 45, 
-  45, 45, 47, 45, 50, 45, 50, 45, 50, 45, 
-  50, 36, 50, 49, 45, 45, 41, 47, 49, 45, 
-  38, 45, 2, 45, 50, 45, 50, 86, 50, 49, 
-  45, 3, 47, 45, 45, 45, 47, 47, 45, 13, 
-  47, 82, 45, 55, 47, 45, 2, 47, 100, 45, 
-  69, 88, 48, 45, 45, 69, 47, 45, 50, 45, 
-  48, 69, 45, 45, 45, 32, 47, -1, 42, 36, 
-  53, -1, 45, 59, 47, 45, 45, 45, 47, 61, 
-  45, 51, 47, 45, 45, 47, 45, 45, 47, 57, 
-  51, 45, -1, 51, 45, -1, 50, 69, 45, 50, 
-  54, 45, 82, 50, 45, 45, 50, 45, 52, 50, 
-  50, 62, 50, 45, 45, 56, 45, 45, 50, 50, 
-  67, 50, 50, 15, 52, 45, 45, 67, 60, 67, 
-  50, 50, 52, 52, 13, 45, 67, 16, 67, 18, 
-  50, 22, 23, 24, 25, 13, 38, 39, 58, -1, 
-  -1, 13, 20, -1, -1, 5, -1, 36, 20, 5, 
-  -1, 29, 30, 13, -1, -1, -1, 13, -1, -1, 
-  20, -1, -1, -1, 20, -1, -1, -1, 13, 29, 
-  30, -1, -1, 29, 30, 20, 21, 22, 23, 24, 
-  25, 13, -1, -1, -1, -1, -1, -1, 20, 21, 
-  22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, 21, 22, 23, 24, 25, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  22, 3, 2, 15, 29, 4, 105, 2, 29, 15, 
+  3, 15, 15, 2, 15, 2, 13, 15, 3, 15, 
+  39, 3, 2, 15, 15, 19, 3, 15, 11, 15, 
+  3, 71, 22, 2, 15, 13, 2, 2, 97, 2, 
+  19, 15, 94, 101, 15, 29, 2, 19, 15, 3, 
+  3, 2, 99, 29, 29, 15, 15, 15, 3, 3, 
+  15, 22, 4, 15, 2, 15, 2, 2, 2, 39, 
+  3, 39, 3, 22, 3, 39, 15, 39, 3, 22, 
+  2, 2, 39, 3, 3, 15, 3, 2, 4, 3, 
+  13, 39, 39, 39, -1, 13, 2, 20, 39, 2, 
+  40, -1, 39, -1, -1, -1, -1, 39, 15, 13, 
+  -1, 35, -1, -1, 13, 39, 13, 16, -1, 16, 
+  48, 48, 48, 50, 50, 53, 3, 45, 39, 39, 
+  13, 3, -1, 44, 44, 48, 48, 50, 50, 48, 
+  48, 45, 50, 48, 53, 50, 48, 48, 48, 50, 
+  48, 53, 48, 53, 50, 53, 48, 48, 48, 48, 
+  50, 53, 45, 48, 48, 50, 48, 48, 50, 48, 
+  54, 62, 15, 54, 53, 64, 82, 2, 48, 82, 
+  48, 48, 13, 53, 48, 16, 54, 48, 15, 56, 
+  3, 48, 53, 100, 58, 72, 53, 48, 15, 48, 
+  72, 48, 53, 52, 48, -1, 53, 48, 52, 48, 
+  48, 52, 48, 51, 41, 54, 48, 53, 50, 48, 
+  48, 50, 50, 59, 48, 48, 50, 48, 48, 50, 
+  50, 15, 48, 48, 50, -1, 51, 60, 48, 48, 
+  -1, 48, 48, 53, 53, 88, 53, 53, 48, 48, 
+  -1, -1, -1, 53, 53, 65, -1, 41, 42, 72, 
+  48, 70, 61, 70, 70, 53, 48, 55, -1, 86, 
+  70, 53, 48, 55, -1, 48, 48, 53, -1, 55, 
+  53, 53, 3, 55, 48, 48, 13, 5, -1, 53, 
+  53, -1, 5, 20, 57, 13, -1, 70, -1, 63, 
+  13, -1, 20, -1, -1, 32, 33, 20, -1, -1, 
+  -1, -1, -1, -1, 32, 33, -1, -1, -1, 32, 
+  33, 22, 23, 24, 25, 26, 27, 28, 21, 22, 
+  23, 24, 25, 26, 27, 28, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 
+  -1, 72, 20, 21, 22, 23, 24, 25, 26, 27, 
+  28, 13, -1, -1, -1, -1, -1, -1, 20, 21, 
+  22, 23, 24, 25, 26, 27, 28, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 13, -1, -1, 16, 
+  -1, 18, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 39, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-  -1};
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 
 QT_END_NAMESPACE

diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
index 0dae476..0126f57 100644 (file)
--- a/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsgrammar_p.h
@@ -165,15 +165,15 @@ public:
     T_XOR = 79,
     T_XOR_EQ = 80,
 
-    ACCEPT_STATE = 640,
-    RULE_COUNT = 345,
-    STATE_COUNT = 641,
+    ACCEPT_STATE = 643,
+    RULE_COUNT = 348,
+    STATE_COUNT = 644,
     TERMINAL_COUNT = 102,
     NON_TERMINAL_COUNT = 107,
 
-    GOTO_INDEX_OFFSET = 641,
-    GOTO_INFO_OFFSET = 2818,
-    GOTO_CHECK_OFFSET = 2818
+    GOTO_INDEX_OFFSET = 644,
+    GOTO_INFO_OFFSET = 2806,
+    GOTO_CHECK_OFFSET = 2806
   };
 
   static const char  *const    spell [];

diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp
index b6cb1fa..b1384d3 100644 (file)
--- a/src/declarative/qml/parser/qdeclarativejsparser.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp
@@ -360,7 +360,7 @@ case 33: {
     sym(1).Node = node;
 } break;
 
-case 38:
+case 41:
 {
     AST::UiScriptBinding *node = new (pool) AST::UiScriptBinding(
         sym(1).UiQualifiedId, sym(3).Statement);
@@ -368,28 +368,28 @@ case 38:
     sym(1).Node = node;
 }   break;
 
-case 42: {
+case 45: {
   sym(1).Node = 0;
 } break;
 
-case 43: {
+case 46: {
   sym(1).Node = sym(1).UiParameterList->finish ();
 } break;
 
-case 44: {
+case 47: {
   AST::UiParameterList *node = new (pool) AST::UiParameterList(stringRef(1), stringRef(2));
   node->identifierToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 45: {
+case 48: {
   AST::UiParameterList *node = new (pool) AST::UiParameterList(sym(1).UiParameterList, stringRef(3), stringRef(4));
   node->commaToken = loc(2);
   node->identifierToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 47: {
+case 50: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(QStringRef(), stringRef(2));
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -400,7 +400,7 @@ case 47: {
     sym(1).Node = node;
 }   break;
 
-case 49: {
+case 52: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(QStringRef(), stringRef(2));
     node->type = AST::UiPublicMember::Signal;
     node->propertyToken = loc(1);
@@ -410,7 +410,7 @@ case 49: {
     sym(1).Node = node;
 }   break;
 
-case 51: {
+case 54: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(4), stringRef(6));
     node->typeModifier = stringRef(2);
     node->propertyToken = loc(1);
@@ -421,7 +421,7 @@ case 51: {
     sym(1).Node = node;
 }   break;
 
-case 53: {
+case 56: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3));
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -430,7 +430,7 @@ case 53: {
     sym(1).Node = node;
 }   break;
 
-case 55: {
+case 58: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4));
     node->isDefaultMember = true;
     node->defaultToken = loc(1);
@@ -441,7 +441,7 @@ case 55: {
     sym(1).Node = node;
 }   break;
 
-case 56: {
+case 59: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3),
         sym(5).Statement);
     node->propertyToken = loc(1);
@@ -451,7 +451,7 @@ case 56: {
     sym(1).Node = node;
 }   break;
 
-case 57: {
+case 60: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4),
         sym(6).Statement);
     node->isReadonlyMember = true;
@@ -463,7 +463,7 @@ case 57: {
     sym(1).Node = node;
 }   break;
 
-case 58: {
+case 61: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(3), stringRef(4),
         sym(6).Statement);
     node->isDefaultMember = true;
@@ -475,7 +475,7 @@ case 58: {
     sym(1).Node = node;
 }   break;
 
-case 59: {
+case 62: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(4), stringRef(6));
     node->typeModifier = stringRef(2);
     node->propertyToken = loc(1);
@@ -499,7 +499,7 @@ case 59: {
     sym(1).Node = node;
 }   break;
 
-case 60: {
+case 63: {
     AST::UiPublicMember *node = new (pool) AST::UiPublicMember(stringRef(2), stringRef(3));
     node->propertyToken = loc(1);
     node->typeToken = loc(2);
@@ -519,57 +519,57 @@ case 60: {
     sym(1).Node = node;
 }   break;
 
-case 61: {
+case 64: {
     sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
 }   break;
 
-case 62: {
+case 65: {
     sym(1).Node = new (pool) AST::UiSourceElement(sym(1).Node);
 }   break;
 
-case 68: {
+case 71: {
   AST::ThisExpression *node = new (pool) AST::ThisExpression();
   node->thisToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 69: {
+case 72: {
   AST::IdentifierExpression *node = new (pool) AST::IdentifierExpression(stringRef(1));
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 70: {
+case 73: {
   AST::NullExpression *node = new (pool) AST::NullExpression();
   node->nullToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 71: {
+case 74: {
   AST::TrueLiteral *node = new (pool) AST::TrueLiteral();
   node->trueToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 72: {
+case 75: {
   AST::FalseLiteral *node = new (pool) AST::FalseLiteral();
   node->falseToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 73: {
+case 76: {
   AST::NumericLiteral *node = new (pool) AST::NumericLiteral(sym(1).dval);
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
-case 74:
-case 75: {
+case 77:
+case 78: {
   AST::StringLiteral *node = new (pool) AST::StringLiteral(stringRef(1));
   node->literalToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 76: {
+case 79: {
   bool rx = lexer->scanRegExp(Lexer::NoPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -584,7 +584,7 @@ case 76: {
   sym(1).Node = node;
 } break;
 
-case 77: {
+case 80: {
   bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
   if (!rx) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
@@ -599,28 +599,28 @@ case 77: {
   sym(1).Node = node;
 } break;
 
-case 78: {
+case 81: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral((AST::Elision *) 0);
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 79: {
+case 82: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).Elision->finish());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 80: {
+case 83: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish ());
   node->lbracketToken = loc(1);
   node->rbracketToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 81: {
+case 84: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (),
     (AST::Elision *) 0);
   node->lbracketToken = loc(1);
@@ -629,7 +629,7 @@ case 81: {
   sym(1).Node = node;
 } break;
 
-case 82: {
+case 85: {
   AST::ArrayLiteral *node = new (pool) AST::ArrayLiteral(sym(2).ElementList->finish (),
     sym(4).Elision->finish());
   node->lbracketToken = loc(1);
@@ -638,7 +638,7 @@ case 82: {
   sym(1).Node = node;
 } break;
 
-case 83: {
+case 86: {
   AST::ObjectLiteral *node = 0;
   if (sym(2).Node)
     node = new (pool) AST::ObjectLiteral(
@@ -650,7 +650,7 @@ case 83: {
   sym(1).Node = node;
 } break;
 
-case 84: {
+case 87: {
   AST::ObjectLiteral *node = new (pool) AST::ObjectLiteral(
     sym(2).PropertyNameAndValueList->finish ());
   node->lbraceToken = loc(1);
@@ -658,14 +658,14 @@ case 84: {
   sym(1).Node = node;
 } break;
 
-case 85: {
+case 88: {
   AST::NestedExpression *node = new (pool) AST::NestedExpression(sym(2).Expression);
   node->lparenToken = loc(1);
   node->rparenToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 86: {
+case 89: {
   if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
     diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
       QLatin1String("Ignored annotation")));
@@ -685,48 +685,48 @@ case 86: {
   }
 } break;
 
-case 87: {
+case 90: {
   sym(1).Node = new (pool) AST::ElementList((AST::Elision *) 0, sym(1).Expression);
 } break;
 
-case 88: {
+case 91: {
   sym(1).Node = new (pool) AST::ElementList(sym(1).Elision->finish(), sym(2).Expression);
 } break;
 
-case 89: {
+case 92: {
   AST::ElementList *node = new (pool) AST::ElementList(sym(1).ElementList,
     (AST::Elision *) 0, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 90: {
+case 93: {
   AST::ElementList *node = new (pool) AST::ElementList(sym(1).ElementList, sym(3).Elision->finish(),
     sym(4).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 91: {
+case 94: {
   AST::Elision *node = new (pool) AST::Elision();
   node->commaToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 92: {
+case 95: {
   AST::Elision *node = new (pool) AST::Elision(sym(1).Elision);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 93: {
+case 96: {
   AST::PropertyNameAndValueList *node = new (pool) AST::PropertyNameAndValueList(
       sym(1).PropertyName, sym(3).Expression);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 94: {
+case 97: {
   AST::PropertyNameAndValueList *node = new (pool) AST::PropertyNameAndValueList(
       sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
   node->commaToken = loc(2);
@@ -734,51 +734,51 @@ case 94: {
   sym(1).Node = node;
 } break;
 
-case 95: {
+case 98: {
   AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
-case 96:
-case 97: {
+case 99:
+case 100: {
   AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 98: {
+case 101: {
   AST::StringLiteralPropertyName *node = new (pool) AST::StringLiteralPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 99: {
+case 102: {
   AST::NumericLiteralPropertyName *node = new (pool) AST::NumericLiteralPropertyName(sym(1).dval);
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 100: {
+case 103: {
   AST::IdentifierPropertyName *node = new (pool) AST::IdentifierPropertyName(stringRef(1));
   node->propertyNameToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 136: {
+case 139: {
   AST::ArrayMemberExpression *node = new (pool) AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 137: {
+case 140: {
   AST::FieldMemberExpression *node = new (pool) AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 138: {
+case 141: {
   AST::NewMemberExpression *node = new (pool) AST::NewMemberExpression(sym(2).Expression, sym(4).ArgumentList);
   node->newToken = loc(1);
   node->lparenToken = loc(3);
@@ -786,384 +786,384 @@ case 138: {
   sym(1).Node = node;
 } break;
 
-case 140: {
+case 143: {
   AST::NewExpression *node = new (pool) AST::NewExpression(sym(2).Expression);
   node->newToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 141: {
+case 144: {
   AST::CallExpression *node = new (pool) AST::CallExpression(sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 142: {
+case 145: {
   AST::CallExpression *node = new (pool) AST::CallExpression(sym(1).Expression, sym(3).ArgumentList);
   node->lparenToken = loc(2);
   node->rparenToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 143: {
+case 146: {
   AST::ArrayMemberExpression *node = new (pool) AST::ArrayMemberExpression(sym(1).Expression, sym(3).Expression);
   node->lbracketToken = loc(2);
   node->rbracketToken = loc(4);
   sym(1).Node = node;
 } break;
 
-case 144: {
+case 147: {
   AST::FieldMemberExpression *node = new (pool) AST::FieldMemberExpression(sym(1).Expression, stringRef(3));
   node->dotToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 145: {
+case 148: {
   sym(1).Node = 0;
 } break;
 
-case 146: {
+case 149: {
   sym(1).Node = sym(1).ArgumentList->finish();
 } break;
 
-case 147: {
+case 150: {
   sym(1).Node = new (pool) AST::ArgumentList(sym(1).Expression);
 } break;
 
-case 148: {
+case 151: {
   AST::ArgumentList *node = new (pool) AST::ArgumentList(sym(1).ArgumentList, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 152: {
+case 155: {
   AST::PostIncrementExpression *node = new (pool) AST::PostIncrementExpression(sym(1).Expression);
   node->incrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 153: {
+case 156: {
   AST::PostDecrementExpression *node = new (pool) AST::PostDecrementExpression(sym(1).Expression);
   node->decrementToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 155: {
+case 158: {
   AST::DeleteExpression *node = new (pool) AST::DeleteExpression(sym(2).Expression);
   node->deleteToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 156: {
+case 159: {
   AST::VoidExpression *node = new (pool) AST::VoidExpression(sym(2).Expression);
   node->voidToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 157: {
+case 160: {
   AST::TypeOfExpression *node = new (pool) AST::TypeOfExpression(sym(2).Expression);
   node->typeofToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 158: {
+case 161: {
   AST::PreIncrementExpression *node = new (pool) AST::PreIncrementExpression(sym(2).Expression);
   node->incrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 159: {
+case 162: {
   AST::PreDecrementExpression *node = new (pool) AST::PreDecrementExpression(sym(2).Expression);
   node->decrementToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 160: {
+case 163: {
   AST::UnaryPlusExpression *node = new (pool) AST::UnaryPlusExpression(sym(2).Expression);
   node->plusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 161: {
+case 164: {
   AST::UnaryMinusExpression *node = new (pool) AST::UnaryMinusExpression(sym(2).Expression);
   node->minusToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 162: {
+case 165: {
   AST::TildeExpression *node = new (pool) AST::TildeExpression(sym(2).Expression);
   node->tildeToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 163: {
+case 166: {
   AST::NotExpression *node = new (pool) AST::NotExpression(sym(2).Expression);
   node->notToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 165: {
+case 168: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Mul, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 166: {
+case 169: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Div, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 167: {
+case 170: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Mod, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 169: {
+case 172: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Add, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 170: {
+case 173: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Sub, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 172: {
+case 175: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::LShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 173: {
+case 176: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::RShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 174: {
+case 177: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::URShift, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 176: {
+case 179: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 177: {
+case 180: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 178: {
+case 181: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 179: {
+case 182: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 180: {
+case 183: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 181: {
+case 184: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::In, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 183: {
+case 186: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Lt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 184: {
+case 187: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Gt, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 185: {
+case 188: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Le, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 186: {
+case 189: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
    QSOperator::Ge, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 187: {
+case 190: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::InstanceOf, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 189: {
+case 192: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 190: {
+case 193: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 191: {
+case 194: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 192: {
+case 195: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 194: {
+case 197: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Equal, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 195: {
+case 198: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::NotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 196: {
+case 199: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 197: {
+case 200: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::StrictNotEqual, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 199: {
+case 202: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 201: {
+case 204: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitAnd, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 203: {
+case 206: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 205: {
+case 208: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitXor, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 207: {
+case 210: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 209: {
+case 212: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::BitOr, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 211: {
+case 214: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 213: {
+case 216: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::And, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 215: {
+case 218: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Or, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 217: {
+case 220: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     QSOperator::Or, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 219: {
+case 222: {
   AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1171,7 +1171,7 @@ case 219: {
   sym(1).Node = node;
 } break;
 
-case 221: {
+case 224: {
   AST::ConditionalExpression *node = new (pool) AST::ConditionalExpression(sym(1).Expression,
     sym(3).Expression, sym(5).Expression);
   node->questionToken = loc(2);
@@ -1179,112 +1179,112 @@ case 221: {
   sym(1).Node = node;
 } break;
 
-case 223: {
+case 226: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 225: {
+case 228: {
   AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression,
     sym(2).ival, sym(3).Expression);
   node->operatorToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 226: {
+case 229: {
   sym(1).ival = QSOperator::Assign;
 } break;
 
-case 227: {
+case 230: {
   sym(1).ival = QSOperator::InplaceMul;
 } break;
 
-case 228: {
+case 231: {
   sym(1).ival = QSOperator::InplaceDiv;
 } break;
 
-case 229: {
+case 232: {
   sym(1).ival = QSOperator::InplaceMod;
 } break;
 
-case 230: {
+case 233: {
   sym(1).ival = QSOperator::InplaceAdd;
 } break;
 
-case 231: {
+case 234: {
   sym(1).ival = QSOperator::InplaceSub;
 } break;
 
-case 232: {
+case 235: {
   sym(1).ival = QSOperator::InplaceLeftShift;
 } break;
 
-case 233: {
+case 236: {
   sym(1).ival = QSOperator::InplaceRightShift;
 } break;
 
-case 234: {
+case 237: {
   sym(1).ival = QSOperator::InplaceURightShift;
 } break;
 
-case 235: {
+case 238: {
   sym(1).ival = QSOperator::InplaceAnd;
 } break;
 
-case 236: {
+case 239: {
   sym(1).ival = QSOperator::InplaceXor;
 } break;
 
-case 237: {
+case 240: {
   sym(1).ival = QSOperator::InplaceOr;
 } break;
 
-case 239: {
+case 242: {
   AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 240: {
+case 243: {
   sym(1).Node = 0;
 } break;
 
-case 243: {
+case 246: {
   AST::Expression *node = new (pool) AST::Expression(sym(1).Expression, sym(3).Expression);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 244: {
+case 247: {
   sym(1).Node = 0;
 } break;
 
-case 261: {
+case 264: {
   AST::Block *node = new (pool) AST::Block(sym(2).StatementList);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 262: {
+case 265: {
   sym(1).Node = new (pool) AST::StatementList(sym(1).Statement);
 } break;
 
-case 263: {
+case 266: {
   sym(1).Node = new (pool) AST::StatementList(sym(1).StatementList, sym(2).Statement);
 } break;
 
-case 264: {
+case 267: {
   sym(1).Node = 0;
 } break;
 
-case 265: {
+case 268: {
   sym(1).Node = sym(1).StatementList->finish ();
 } break;
 
-case 267: {
+case 270: {
   AST::VariableStatement *node = new (pool) AST::VariableStatement(
      sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
   node->declarationKindToken = loc(1);
@@ -1292,76 +1292,76 @@ case 267: {
   sym(1).Node = node;
 } break;
 
-case 268: {
+case 271: {
   sym(1).ival = T_CONST;
 } break;
 
-case 269: {
+case 272: {
   sym(1).ival = T_VAR;
 } break;
 
-case 270: {
+case 273: {
   sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration);
 } break;
 
-case 271: {
+case 274: {
   AST::VariableDeclarationList *node = new (pool) AST::VariableDeclarationList(
     sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
   node->commaToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 272: {
+case 275: {
   sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclaration);
 } break;
 
-case 273: {
+case 276: {
   sym(1).Node = new (pool) AST::VariableDeclarationList(sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
 } break;
 
-case 274: {
+case 277: {
   AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 275: {
+case 278: {
   AST::VariableDeclaration *node = new (pool) AST::VariableDeclaration(stringRef(1), sym(2).Expression);
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 276: {
+case 279: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 277: {
+case 280: {
   sym(1).Node = 0;
 } break;
 
-case 279: {
+case 282: {
   // ### TODO: AST for initializer
   sym(1) = sym(2);
 } break;
 
-case 280: {
+case 283: {
   sym(1).Node = 0;
 } break;
 
-case 282: {
+case 285: {
   AST::EmptyStatement *node = new (pool) AST::EmptyStatement();
   node->semicolonToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 284: {
+case 287: {
   AST::ExpressionStatement *node = new (pool) AST::ExpressionStatement(sym(1).Expression);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 285: {
+case 288: {
   AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement, sym(7).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1370,7 +1370,7 @@ case 285: {
   sym(1).Node = node;
 } break;
 
-case 286: {
+case 289: {
   AST::IfStatement *node = new (pool) AST::IfStatement(sym(3).Expression, sym(5).Statement);
   node->ifToken = loc(1);
   node->lparenToken = loc(2);
@@ -1378,7 +1378,7 @@ case 286: {
   sym(1).Node = node;
 } break;
 
-case 288: {
+case 291: {
   AST::DoWhileStatement *node = new (pool) AST::DoWhileStatement(sym(2).Statement, sym(5).Expression);
   node->doToken = loc(1);
   node->whileToken = loc(3);
@@ -1388,7 +1388,7 @@ case 288: {
   sym(1).Node = node;
 } break;
 
-case 289: {
+case 292: {
   AST::WhileStatement *node = new (pool) AST::WhileStatement(sym(3).Expression, sym(5).Statement);
   node->whileToken = loc(1);
   node->lparenToken = loc(2);
@@ -1396,7 +1396,7 @@ case 289: {
   sym(1).Node = node;
 } break;
 
-case 290: {
+case 293: {
   AST::ForStatement *node = new (pool) AST::ForStatement(sym(3).Expression,
     sym(5).Expression, sym(7).Expression, sym(9).Statement);
   node->forToken = loc(1);
@@ -1407,7 +1407,7 @@ case 290: {
   sym(1).Node = node;
 } break;
 
-case 291: {
+case 294: {
   AST::LocalForStatement *node = new (pool) AST::LocalForStatement(
      sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
      sym(8).Expression, sym(10).Statement);
@@ -1420,7 +1420,7 @@ case 291: {
   sym(1).Node = node;
 } break;
 
-case 292: {
+case 295: {
   AST:: ForEachStatement *node = new (pool) AST::ForEachStatement(sym(3).Expression,
     sym(5).Expression, sym(7).Statement);
   node->forToken = loc(1);
@@ -1430,7 +1430,7 @@ case 292: {
   sym(1).Node = node;
 } break;
 
-case 293: {
+case 296: {
   AST::LocalForEachStatement *node = new (pool) AST::LocalForEachStatement(
     sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
   node->forToken = loc(1);
@@ -1441,14 +1441,14 @@ case 293: {
   sym(1).Node = node;
 } break;
 
-case 295: {
+case 298: {
   AST::ContinueStatement *node = new (pool) AST::ContinueStatement();
   node->continueToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 297: {
+case 300: {
   AST::ContinueStatement *node = new (pool) AST::ContinueStatement(stringRef(2));
   node->continueToken = loc(1);
   node->identifierToken = loc(2);
@@ -1456,14 +1456,14 @@ case 297: {
   sym(1).Node = node;
 } break;
 
-case 299: {
+case 302: {
   AST::BreakStatement *node = new (pool) AST::BreakStatement(QStringRef());
   node->breakToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 301: {
+case 304: {
   AST::BreakStatement *node = new (pool) AST::BreakStatement(stringRef(2));
   node->breakToken = loc(1);
   node->identifierToken = loc(2);
@@ -1471,14 +1471,14 @@ case 301: {
   sym(1).Node = node;
 } break;
 
-case 303: {
+case 306: {
   AST::ReturnStatement *node = new (pool) AST::ReturnStatement(sym(2).Expression);
   node->returnToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 304: {
+case 307: {
   AST::WithStatement *node = new (pool) AST::WithStatement(sym(3).Expression, sym(5).Statement);
   node->withToken = loc(1);
   node->lparenToken = loc(2);
@@ -1486,7 +1486,7 @@ case 304: {
   sym(1).Node = node;
 } break;
 
-case 305: {
+case 308: {
   AST::SwitchStatement *node = new (pool) AST::SwitchStatement(sym(3).Expression, sym(5).CaseBlock);
   node->switchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1494,90 +1494,90 @@ case 305: {
   sym(1).Node = node;
 } break;
 
-case 306: {
+case 309: {
   AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 307: {
+case 310: {
   AST::CaseBlock *node = new (pool) AST::CaseBlock(sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
   node->lbraceToken = loc(1);
   node->rbraceToken = loc(5);
   sym(1).Node = node;
 } break;
 
-case 308: {
+case 311: {
   sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClause);
 } break;
 
-case 309: {
+case 312: {
   sym(1).Node = new (pool) AST::CaseClauses(sym(1).CaseClauses, sym(2).CaseClause);
 } break;
 
-case 310: {
+case 313: {
   sym(1).Node = 0;
 } break;
 
-case 311: {
+case 314: {
   sym(1).Node = sym(1).CaseClauses->finish ();
 } break;
 
-case 312: {
+case 315: {
   AST::CaseClause *node = new (pool) AST::CaseClause(sym(2).Expression, sym(4).StatementList);
   node->caseToken = loc(1);
   node->colonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 313: {
+case 316: {
   AST::DefaultClause *node = new (pool) AST::DefaultClause(sym(3).StatementList);
   node->defaultToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
-case 314:
-case 315: {
+case 317:
+case 318: {
   AST::LabelledStatement *node = new (pool) AST::LabelledStatement(stringRef(1), sym(3).Statement);
   node->identifierToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 316: {
+case 319: {
   AST::LabelledStatement *node = new (pool) AST::LabelledStatement(stringRef(1), sym(3).Statement);
   node->identifierToken = loc(1);
   node->colonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 318: {
+case 321: {
   AST::ThrowStatement *node = new (pool) AST::ThrowStatement(sym(2).Expression);
   node->throwToken = loc(1);
   node->semicolonToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 319: {
+case 322: {
   AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 320: {
+case 323: {
   AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 321: {
+case 324: {
   AST::TryStatement *node = new (pool) AST::TryStatement(sym(2).Statement, sym(3).Catch, sym(4).Finally);
   node->tryToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 322: {
+case 325: {
   AST::Catch *node = new (pool) AST::Catch(stringRef(3), sym(5).Block);
   node->catchToken = loc(1);
   node->lparenToken = loc(2);
@@ -1586,20 +1586,20 @@ case 322: {
   sym(1).Node = node;
 } break;
 
-case 323: {
+case 326: {
   AST::Finally *node = new (pool) AST::Finally(sym(2).Block);
   node->finallyToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 325: {
+case 328: {
   AST::DebuggerStatement *node = new (pool) AST::DebuggerStatement();
   node->debuggerToken = loc(1);
   node->semicolonToken = loc(2);
   sym(1).Node = node;
 } break;
 
-case 326: {
+case 329: {
   AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   node->identifierToken = loc(2);
@@ -1610,7 +1610,7 @@ case 326: {
   sym(1).Node = node;
 } break;
 
-case 327: {
+case 330: {
   AST::FunctionExpression *node = new (pool) AST::FunctionExpression(stringRef(2), sym(4).FormalParameterList, sym(7).FunctionBody);
   node->functionToken = loc(1);
   if (! stringRef(2).isNull())
@@ -1622,60 +1622,60 @@ case 327: {
   sym(1).Node = node;
 } break;
 
-case 328: {
+case 331: {
   AST::FormalParameterList *node = new (pool) AST::FormalParameterList(stringRef(1));
   node->identifierToken = loc(1);
   sym(1).Node = node;
 } break;
 
-case 329: {
+case 332: {
   AST::FormalParameterList *node = new (pool) AST::FormalParameterList(sym(1).FormalParameterList, stringRef(3));
   node->commaToken = loc(2);
   node->identifierToken = loc(3);
   sym(1).Node = node;
 } break;
 
-case 330: {
+case 333: {
   sym(1).Node = 0;
 } break;
 
-case 331: {
+case 334: {
   sym(1).Node = sym(1).FormalParameterList->finish ();
 } break;
 
-case 332: {
+case 335: {
   sym(1).Node = 0;
 } break;
 
-case 334: {
+case 337: {
   sym(1).Node = new (pool) AST::FunctionBody(sym(1).SourceElements->finish ());
 } break;
 
-case 335: {
+case 338: {
   sym(1).Node = new (pool) AST::Program(sym(1).SourceElements->finish ());
 } break;
 
-case 336: {
+case 339: {
   sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElement);
 } break;
 
-case 337: {
+case 340: {
   sym(1).Node = new (pool) AST::SourceElements(sym(1).SourceElements, sym(2).SourceElement);
 } break;
 
-case 338: {
+case 341: {
   sym(1).Node = new (pool) AST::StatementSourceElement(sym(1).Statement);
 } break;
 
-case 339: {
+case 342: {
   sym(1).Node = new (pool) AST::FunctionSourceElement(sym(1).FunctionDeclaration);
 } break;
 
-case 340: {
+case 343: {
   stringRef(1) = QStringRef();
 } break;
 
-case 342: {
+case 345: {
   sym(1).Node = 0;
 } break;
 

diff --git a/src/declarative/qml/parser/qdeclarativejsparser_p.h b/src/declarative/qml/parser/qdeclarativejsparser_p.h
index d94b3df..a398015 100644 (file)
--- a/src/declarative/qml/parser/qdeclarativejsparser_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsparser_p.h
@@ -240,9 +240,9 @@ protected:
 
 
 
-#define J_SCRIPT_REGEXPLITERAL_RULE1 76
+#define J_SCRIPT_REGEXPLITERAL_RULE1 79
 
-#define J_SCRIPT_REGEXPLITERAL_RULE2 77
+#define J_SCRIPT_REGEXPLITERAL_RULE2 80
 
 QT_QML_END_NAMESPACE
 

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.6.qml b/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.6.qml
new file mode 100644 (file)
index 0000000..6fb71eb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/switchStatement.6.qml
@@ -0,0 +1,13 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    function one(kind) { return 123 }
+    function two(kind) { return 321 }
+
+    value: switch (stringProperty) {
+               case "A": case "S": one(stringProperty); break;
+               case "D": case "F": two(stringProperty); break;
+               default: 0
+           }
+}
+

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.1.qml
new file mode 100644 (file)
index 0000000..71cc67a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.1.qml
@@ -0,0 +1,13 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int defaultValue: 123
+
+    function go() {
+        undefinedObject.method() // this call will throw an exception
+        return 321
+    }
+
+    value: try { go() } catch(e) { defaultValue }
+}
+

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.2.qml
new file mode 100644 (file)
index 0000000..e7fca0b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.2.qml
@@ -0,0 +1,11 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int defaultValue: 123
+
+    function go() {
+        return 321
+    }
+
+    value: try { go() } catch(e) { defaultValue }
+}

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.3.qml
new file mode 100644 (file)
index 0000000..04b39f7
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.3.qml
@@ -0,0 +1,13 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int defaultValue: 123
+
+    function go() {
+        undefinedObject.method() // this call will throw an exception
+        return 321
+    }
+
+    value: try { var p = go() } catch(e) { var p = defaultValue } finally { p == 123 }
+}
+

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.4.qml
new file mode 100644 (file)
index 0000000..231aaf0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/tryStatement.4.qml
@@ -0,0 +1,12 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property int defaultValue: 123
+
+    function go() {
+        return 321
+    }
+
+    value: try { var p = go() } catch(e) { var p = defaultValue } finally { p == 321 }
+}
+

diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/withStatement.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/withStatement.1.qml
new file mode 100644 (file)
index 0000000..28f0c08
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/withStatement.1.qml
@@ -0,0 +1,14 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    property var other: MyQmlObject {
+        intProperty: 123
+
+        function go() {
+            return intProperty;
+        }
+    }
+
+    value: with(other) go()
+}
+

diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 5565aaf..3fdf1e9 100644 (file)
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -233,6 +233,8 @@ private slots:
     void automaticSemicolon();
     void unaryExpression();
     void switchStatement();
+    void withStatement();
+    void tryStatement();
 
 private:
     static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
@@ -5339,6 +5341,75 @@ void tst_qdeclarativeecmascript::switchStatement()
         object->setStringProperty("something else");
         QCOMPARE(object->value(), 1);
     }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("switchStatement.6.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        // `object->value()' is the number of executed statements
+
+        object->setStringProperty("A");
+        QCOMPARE(object->value(), 123);
+
+        object->setStringProperty("S");
+        QCOMPARE(object->value(), 123);
+
+        object->setStringProperty("D");
+        QCOMPARE(object->value(), 321);
+
+        object->setStringProperty("F");
+        QCOMPARE(object->value(), 321);
+
+        object->setStringProperty("something else");
+        QCOMPARE(object->value(), 0);
+    }
+}
+
+void tst_qdeclarativeecmascript::withStatement()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("withStatement.1.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->value(), 123);
+    }
+}
+
+void tst_qdeclarativeecmascript::tryStatement()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("tryStatement.1.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->value(), 123);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("tryStatement.2.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->value(), 321);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("tryStatement.3.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->value(), 1);
+    }
+
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("tryStatement.4.qml"));
+        MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->value(), 1);
+    }
 }
 
 QTEST_MAIN(tst_qdeclarativeecmascript)