summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-01 01:22:38 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-01 01:22:38 (GMT)
commite93e5076e11a7a9cfdd4b9cb1a2d4dbf1f579177 (patch)
tree9a214273e5ec3b0eb3f4a0bc0f8ecd7f3762eb28
parent1206e9fb0c9a21e60b1e6841bb3071daa1f0da8a (diff)
parent4eb455e6e109052ec39b10bfe36f7649c3c7cf0b (diff)
downloadQt-e93e5076e11a7a9cfdd4b9cb1a2d4dbf1f579177.zip
Qt-e93e5076e11a7a9cfdd4b9cb1a2d4dbf1f579177.tar.gz
Qt-e93e5076e11a7a9cfdd4b9cb1a2d4dbf1f579177.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat
-rw-r--r--examples/declarative/aspectratio/face_fit.qml26
-rw-r--r--examples/declarative/aspectratio/face_fit_animated.qml28
-rw-r--r--examples/declarative/aspectratio/pics/face.pngbin0 -> 905 bytes
-rw-r--r--examples/declarative/aspectratio/scale_and_crop.qml21
-rw-r--r--examples/declarative/aspectratio/scale_and_sidecrop.qml22
-rw-r--r--examples/declarative/aspectratio/scale_to_fit.qml21
-rw-r--r--examples/declarative/listview/dummydata/Recipies.qml125
-rw-r--r--src/declarative/qml/parser/javascript.g22
-rw-r--r--src/declarative/qml/parser/javascriptgrammar.cpp1179
-rw-r--r--src/declarative/qml/parser/javascriptgrammar_p.h25
-rw-r--r--src/declarative/qml/parser/javascriptlexer.cpp7
-rw-r--r--src/declarative/qml/parser/javascriptparser.cpp396
-rw-r--r--src/declarative/qml/parser/javascriptparser_p.h4
-rw-r--r--src/declarative/util/qmlfollow.cpp29
-rw-r--r--src/declarative/util/qmlfollow.h3
15 files changed, 1056 insertions, 852 deletions
diff --git a/examples/declarative/aspectratio/face_fit.qml b/examples/declarative/aspectratio/face_fit.qml
new file mode 100644
index 0000000..35c63ce
--- /dev/null
+++ b/examples/declarative/aspectratio/face_fit.qml
@@ -0,0 +1,26 @@
+// The Image primitive does not have any special handling for maintaining
+// aspect ratio. This example shows that you can provide whatever specific
+// behaviour you like.
+//
+// Here, we implement a hybrid of the "scale to fit" and "scale and crop"
+// behaviours which will crop up to 25% from *one* dimension if necessary
+// to fully scale the other. This is a realistic algorithm, for example
+// when the edges of the image contain less vital information than the
+// center - such as a face.
+//
+Rect {
+ // default size: whole image, unscaled
+ width: Image.width
+ height: Image.height
+ color: "gray"
+ clip: true
+
+ Image {
+ id: Image
+ source: "pics/face.png"
+ x: (parent.width-width*scale)/2
+ y: (parent.height-height*scale)/2
+ scale: Math.max(Math.min(parent.width/width*1.333,parent.height/height),
+ Math.min(parent.width/width,parent.height/height*1.333))
+ }
+}
diff --git a/examples/declarative/aspectratio/face_fit_animated.qml b/examples/declarative/aspectratio/face_fit_animated.qml
new file mode 100644
index 0000000..366d27b
--- /dev/null
+++ b/examples/declarative/aspectratio/face_fit_animated.qml
@@ -0,0 +1,28 @@
+// The Image primitive does not have any special handling for maintaining
+// aspect ratio. This example shows that you can provide whatever specific
+// behaviour you like.
+//
+// Here, we extend the "face_fit" example with animation to show how truly
+// diverse and usage-specific behaviours are made possible by NOT putting a
+// hard-coded aspect ratio feature into the Image primitive.
+//
+Rect {
+ // default size: whole image, unscaled
+ width: Image.width
+ height: Image.height
+ color: "gray"
+ clip: true
+
+ Image {
+ id: Image
+ source: "pics/face.png"
+ x: (parent.width-width*scale)/2
+ y: (parent.height-height*scale)/2
+ scale: Follow {
+ source: Math.max(Math.min(Image.parent.width/Image.width*1.333,Image.parent.height/Image.height),
+ Math.min(Image.parent.width/Image.width,Image.parent.height/Image.height*1.333))
+ spring: 1
+ damping: 0.05
+ }
+ }
+}
diff --git a/examples/declarative/aspectratio/pics/face.png b/examples/declarative/aspectratio/pics/face.png
new file mode 100644
index 0000000..9623b1a
--- /dev/null
+++ b/examples/declarative/aspectratio/pics/face.png
Binary files differ
diff --git a/examples/declarative/aspectratio/scale_and_crop.qml b/examples/declarative/aspectratio/scale_and_crop.qml
new file mode 100644
index 0000000..a5409f9
--- /dev/null
+++ b/examples/declarative/aspectratio/scale_and_crop.qml
@@ -0,0 +1,21 @@
+// The Image primitive does not have any special handling for maintaining
+// aspect ratio. This example shows that you can provide whatever specific
+// behaviour you like.
+//
+// Here, we implement "Scale and Crop" behaviour.
+//
+Rect {
+ // default size: whole image, unscaled
+ width: Image.width
+ height: Image.height
+ color: "gray"
+ clip: true
+
+ Image {
+ id: Image
+ source: "pics/face.png"
+ x: (parent.width-width*scale)/2
+ y: (parent.height-height*scale)/2
+ scale: Math.max(parent.width/width,parent.height/height)
+ }
+}
diff --git a/examples/declarative/aspectratio/scale_and_sidecrop.qml b/examples/declarative/aspectratio/scale_and_sidecrop.qml
new file mode 100644
index 0000000..e076735
--- /dev/null
+++ b/examples/declarative/aspectratio/scale_and_sidecrop.qml
@@ -0,0 +1,22 @@
+// The Image primitive does not have any special handling for maintaining
+// aspect ratio. This example shows that you can provide whatever specific
+// behaviour you like.
+//
+// Here, we implement a variant of "Scale and Crop" behaviour, where we
+// crop the sides if necessary to fully fit vertically, but not the reverse.
+//
+Rect {
+ // default size: whole image, unscaled
+ width: Image.width
+ height: Image.height
+ color: "gray"
+ clip: true
+
+ Image {
+ id: Image
+ source: "pics/face.png"
+ x: (parent.width-width*scale)/2
+ y: (parent.height-height*scale)/2
+ scale: parent.height/height
+ }
+}
diff --git a/examples/declarative/aspectratio/scale_to_fit.qml b/examples/declarative/aspectratio/scale_to_fit.qml
new file mode 100644
index 0000000..61a4082
--- /dev/null
+++ b/examples/declarative/aspectratio/scale_to_fit.qml
@@ -0,0 +1,21 @@
+// The Image primitive does not have any special handling for maintaining
+// aspect ratio. This example shows that you can provide whatever specific
+// behaviour you like.
+//
+// Here, we implement "Scale to Fit" behaviour.
+//
+Rect {
+ // default size: whole image, unscaled
+ width: Image.width
+ height: Image.height
+ color: "gray"
+ clip: true
+
+ Image {
+ id: Image
+ source: "pics/face.png"
+ x: (parent.width-width*scale)/2
+ y: (parent.height-height*scale)/2
+ scale: Math.min(parent.width/width,parent.height/height)
+ }
+}
diff --git a/examples/declarative/listview/dummydata/Recipies.qml b/examples/declarative/listview/dummydata/Recipies.qml
index 6b20409..8f464da 100644
--- a/examples/declarative/listview/dummydata/Recipies.qml
+++ b/examples/declarative/listview/dummydata/Recipies.qml
@@ -3,21 +3,22 @@ ListModel2 {
ListElement {
title: "Pancakes"
picture: "content/pics/pancakes.jpg"
- ingredients: "<html> \
- <ul> \
- <li> 1 cup (150g) self-raising flour \
- <li> 1 tbs caster sugar \
- <li> 3/4 cup (185ml) milk \
- <li> 1 egg \
- </ul> \
- </html>"
- method: "<html> \
- <ol> \
- <li> Sift flour and sugar together into a bowl. Add a pinch of salt. \
- <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. \
- <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. \
- <li> Turn over and cook other side until golden. \
- </ol>"
+ ingredients: "<html>
+ <ul>
+ <li> 1 cup (150g) self-raising flour
+ <li> 1 tbs caster sugar
+ <li> 3/4 cup (185ml) milk
+ <li> 1 egg
+ </ul>
+ </html>"
+ method: "<html>
+ <ol>
+ <li> Sift flour and sugar together into a bowl. Add a pinch of salt.
+ <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth.
+ <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface.
+ <li> Turn over and cook other side until golden.
+ </ol>
+ </html>"
}
ListElement {
title: "Fruit Salad"
@@ -28,60 +29,60 @@ ListModel2 {
ListElement {
title: "Vegetable Soup"
picture: "content/pics/vegetable-soup.jpg"
- ingredients: "<html> \
- <ul> \
- <li> 1 onion \
- <li> 1 turnip \
- <li> 1 potato \
- <li> 1 carrot \
- <li> 1 head of celery \
- <li> 1 1/2 litres of water \
- </ul> \
- </html>"
- method: "<html> \
- <ol> \
- <li> Chop vegetables. \
- <li> Boil in water until vegetables soften. \
- <li> Season with salt and pepper to taste. \
- </ol> \
- </html>"
+ ingredients: "<html>
+ <ul>
+ <li> 1 onion
+ <li> 1 turnip
+ <li> 1 potato
+ <li> 1 carrot
+ <li> 1 head of celery
+ <li> 1 1/2 litres of water
+ </ul>
+ </html>"
+ method: "<html>
+ <ol>
+ <li> Chop vegetables.
+ <li> Boil in water until vegetables soften.
+ <li> Season with salt and pepper to taste.
+ </ol>
+ </html>"
}
ListElement {
title: "Hamburger"
picture: "content/pics/hamburger.jpg"
- ingredients: "<html> \
- <ul> \
- <li> 500g minced beef \
- <li> Seasoning \
- <li> lettuce, tomato, onion, cheese \
- <li> 1 hamburger bun for each burger \
- </ul> \
- </html>"
- method: "<html> \
- <ol> \
- <li> Mix the beef, together with seasoning, in a food processor. \
- <li> Shape the beef into burgers. \
- <li> Grill the burgers for about 5 mins on each side (until cooked through) \
- <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. \
- </ol> \
- </html>"
+ ingredients: "<html>
+ <ul>
+ <li> 500g minced beef
+ <li> Seasoning
+ <li> lettuce, tomato, onion, cheese
+ <li> 1 hamburger bun for each burger
+ </ul>
+ </html>"
+ method: "<html>
+ <ol>
+ <li> Mix the beef, together with seasoning, in a food processor.
+ <li> Shape the beef into burgers.
+ <li> Grill the burgers for about 5 mins on each side (until cooked through)
+ <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion.
+ </ol>
+ </html>"
}
ListElement {
title: "Lemonade"
picture: "content/pics/lemonade.jpg"
- ingredients: "<html> \
- <ul> \
- <li> 1 cup Lemon Juice \
- <li> 1 cup Sugar \
- <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) \
- </ul> \
- </html>"
- method: "<html> \
- <ol> \
- <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. \
- <li> Pour in lemon juice, stir again, and add 4 cups of cold water. \
- <li> Chill or serve over ice cubes. \
- </ol> \
- </html>"
+ ingredients: "<html>
+ <ul>
+ <li> 1 cup Lemon Juice
+ <li> 1 cup Sugar
+ <li> 6 Cups of Water (2 cups warm water, 4 cups cold water)
+ </ul>
+ </html>"
+ method: "<html>
+ <ol>
+ <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves.
+ <li> Pour in lemon juice, stir again, and add 4 cups of cold water.
+ <li> Chill or serve over ice cubes.
+ </ol>
+ </html>"
}
}
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g
index cc72737..59ab529 100644
--- a/src/declarative/qml/parser/javascript.g
+++ b/src/declarative/qml/parser/javascript.g
@@ -78,6 +78,7 @@
%token T_CONST "const"
%token T_DEBUGGER "debugger"
%token T_RESERVED_WORD "reserved word"
+%token T_MULTILINE_STRING_LITERAL "multiline string literal"
--- context keywords.
%token T_PUBLIC "public"
@@ -611,6 +612,27 @@ case $rule_number: {
} break;
./
+UiMultilineStringLiteral: T_MULTILINE_STRING_LITERAL ;
+/.
+case $rule_number: {
+ AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
+ node->literalToken = loc(1);
+ sym(1).Node = node;
+} break;
+./
+
+UiMultilineStringStatement: UiMultilineStringLiteral T_AUTOMATIC_SEMICOLON ; -- automatic semicolon
+UiMultilineStringStatement: UiMultilineStringLiteral T_SEMICOLON ;
+/.
+case $rule_number: {
+ AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
+ node->semicolonToken = loc(2);
+ sym(1).Node = node;
+} break;
+./
+
+UiObjectMember: UiQualifiedId T_COLON UiMultilineStringStatement ;
+/. case $rule_number: ./
UiArrayObjectMember: UiQualifiedId T_COLON Statement ;
/. case $rule_number: ./
UiObjectMember: UiQualifiedId T_COLON Statement ;
diff --git a/src/declarative/qml/parser/javascriptgrammar.cpp b/src/declarative/qml/parser/javascriptgrammar.cpp
index 0d2a215..9fceeb8 100644
--- a/src/declarative/qml/parser/javascriptgrammar.cpp
+++ b/src/declarative/qml/parser/javascriptgrammar.cpp
@@ -51,347 +51,343 @@ const char *const JavaScriptGrammar::spell [] = {
"||", "+", "+=", "++", "?", "}", "]", "%", "%=", "return",
")", ";", 0, "*", "*=", "string literal", "switch", "this", "throw", "~",
"try", "typeof", "var", "void", "while", "with", "^", "^=", "null", "true",
- "false", "const", "debugger", "reserved word", "public", "import", 0, 0};
+ "false", "const", "debugger", "reserved word", "multiline string literal", "public", "import", 0, 0};
const int JavaScriptGrammar::lhs [] = {
- 88, 89, 89, 92, 92, 93, 93, 91, 90, 90,
- 95, 95, 97, 97, 96, 94, 96, 94, 96, 94,
- 96, 94, 94, 94, 94, 94, 94, 94, 98, 98,
- 98, 98, 103, 103, 103, 103, 103, 103, 103, 103,
- 103, 103, 103, 103, 103, 103, 103, 105, 105, 109,
- 109, 104, 104, 107, 107, 110, 110, 110, 110, 111,
- 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
- 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
- 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
- 112, 112, 113, 113, 113, 113, 113, 116, 116, 117,
- 117, 117, 117, 115, 115, 118, 118, 119, 119, 120,
- 120, 120, 121, 121, 121, 121, 121, 121, 121, 121,
- 121, 121, 122, 122, 122, 122, 123, 123, 123, 124,
- 124, 124, 124, 125, 125, 125, 125, 125, 125, 125,
- 126, 126, 126, 126, 126, 126, 127, 127, 127, 127,
- 127, 128, 128, 128, 128, 128, 129, 129, 130, 130,
- 131, 131, 132, 132, 133, 133, 134, 134, 135, 135,
- 136, 136, 137, 137, 138, 138, 139, 139, 140, 140,
- 108, 108, 141, 141, 142, 142, 142, 142, 142, 142,
- 142, 142, 142, 142, 142, 142, 100, 100, 143, 143,
- 144, 144, 145, 145, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99, 99, 146,
- 161, 161, 160, 160, 102, 102, 162, 162, 163, 163,
- 165, 165, 164, 166, 169, 167, 167, 170, 168, 168,
- 147, 148, 148, 149, 149, 150, 150, 150, 150, 150,
- 150, 150, 151, 151, 151, 151, 152, 152, 152, 152,
- 153, 153, 154, 156, 171, 171, 174, 174, 172, 172,
- 175, 173, 155, 157, 157, 158, 158, 158, 176, 177,
- 159, 159, 101, 114, 181, 181, 178, 178, 179, 179,
- 182, 183, 183, 184, 184, 180, 180, 106, 106, 185};
+ 89, 90, 90, 93, 93, 94, 94, 92, 91, 91,
+ 96, 96, 98, 98, 97, 95, 97, 95, 97, 95,
+ 100, 101, 101, 95, 97, 95, 95, 95, 95, 95,
+ 95, 95, 99, 99, 99, 99, 106, 106, 106, 106,
+ 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
+ 106, 108, 108, 112, 112, 107, 107, 110, 110, 113,
+ 113, 113, 113, 114, 114, 114, 114, 114, 114, 114,
+ 114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
+ 114, 114, 114, 114, 114, 114, 114, 114, 114, 114,
+ 114, 114, 114, 114, 115, 115, 116, 116, 116, 116,
+ 116, 119, 119, 120, 120, 120, 120, 118, 118, 121,
+ 121, 122, 122, 123, 123, 123, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 125, 125, 125, 125,
+ 126, 126, 126, 127, 127, 127, 127, 128, 128, 128,
+ 128, 128, 128, 128, 129, 129, 129, 129, 129, 129,
+ 130, 130, 130, 130, 130, 131, 131, 131, 131, 131,
+ 132, 132, 133, 133, 134, 134, 135, 135, 136, 136,
+ 137, 137, 138, 138, 139, 139, 140, 140, 141, 141,
+ 142, 142, 143, 143, 111, 111, 144, 144, 145, 145,
+ 145, 145, 145, 145, 145, 145, 145, 145, 145, 145,
+ 103, 103, 146, 146, 147, 147, 148, 148, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 149, 164, 164, 163, 163, 105, 105,
+ 165, 165, 166, 166, 168, 168, 167, 169, 172, 170,
+ 170, 173, 171, 171, 150, 151, 151, 152, 152, 153,
+ 153, 153, 153, 153, 153, 153, 154, 154, 154, 154,
+ 155, 155, 155, 155, 156, 156, 157, 159, 174, 174,
+ 177, 177, 175, 175, 178, 176, 158, 160, 160, 161,
+ 161, 161, 179, 180, 162, 162, 104, 117, 184, 184,
+ 181, 181, 182, 182, 185, 186, 186, 187, 187, 183,
+ 183, 109, 109, 188};
const int JavaScriptGrammar:: rhs[] = {
2, 1, 1, 1, 2, 3, 3, 0, 1, 2,
1, 3, 2, 3, 4, 4, 2, 2, 5, 5,
- 3, 3, 3, 4, 5, 6, 1, 1, 1, 1,
- 1, 3, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 3, 3, 5, 3, 4, 3, 2, 4, 1,
- 2, 0, 1, 3, 5, 1, 1, 1, 1, 1,
+ 1, 2, 2, 3, 3, 3, 3, 4, 5, 6,
+ 1, 1, 1, 1, 1, 3, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 3, 3, 5, 3, 4,
+ 3, 2, 4, 1, 2, 0, 1, 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, 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, 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, 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, 4, 5, 2,
- 2, 2, 8, 8, 1, 3, 0, 1, 0, 1,
- 1, 1, 2, 1, 1, 0, 1, 0, 1, 2};
+ 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, 4, 5, 2, 2, 2, 8, 8, 1, 3,
+ 0, 1, 0, 1, 1, 1, 2, 1, 1, 0,
+ 1, 0, 1, 2};
const int JavaScriptGrammar::action_default [] = {
8, 2, 0, 4, 3, 0, 0, 0, 6, 7,
- 5, 27, 227, 0, 31, 0, 29, 30, 228, 9,
- 1, 0, 0, 28, 0, 287, 288, 0, 285, 0,
- 286, 0, 289, 130, 197, 161, 169, 165, 205, 212,
- 109, 181, 211, 219, 207, 157, 0, 208, 290, 0,
- 295, 94, 209, 210, 215, 110, 173, 177, 98, 127,
- 108, 113, 93, 147, 213, 134, 292, 291, 294, 216,
- 0, 0, 0, 0, 40, 41, 0, 37, 0, 296,
- 34, 0, 298, 52, 0, 0, 0, 0, 0, 35,
- 38, 0, 0, 199, 241, 39, 0, 33, 0, 0,
- 36, 0, 0, 0, 0, 0, 217, 218, 123, 206,
- 214, 0, 0, 110, 129, 296, 34, 298, 112, 111,
- 0, 0, 0, 125, 126, 124, 0, 297, 287, 0,
- 0, 289, 0, 284, 0, 299, 0, 59, 60, 61,
- 62, 87, 63, 88, 64, 65, 66, 67, 68, 69,
- 70, 71, 56, 72, 73, 74, 75, 76, 58, 89,
- 77, 57, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 90, 0, 54, 0, 0, 46, 0, 55, 45,
- 128, 0, 158, 0, 0, 0, 0, 148, 0, 0,
- 0, 0, 0, 0, 138, 0, 0, 0, 132, 133,
- 131, 136, 140, 139, 137, 135, 150, 149, 151, 0,
- 166, 0, 162, 0, 0, 104, 103, 92, 91, 0,
- 0, 102, 198, 105, 0, 106, 0, 107, 101, 242,
- 243, 283, 0, 194, 187, 185, 192, 193, 191, 190,
- 196, 189, 188, 186, 195, 182, 0, 170, 0, 0,
- 174, 0, 0, 178, 0, 0, 104, 96, 0, 95,
- 0, 100, 293, 257, 0, 258, 259, 260, 253, 0,
- 254, 255, 256, 281, 282, 114, 0, 0, 0, 0,
- 0, 246, 247, 203, 201, 163, 171, 167, 183, 159,
- 204, 0, 110, 175, 179, 152, 141, 0, 0, 160,
- 0, 0, 0, 0, 153, 0, 0, 0, 0, 0,
- 145, 143, 146, 144, 142, 155, 154, 156, 0, 168,
- 0, 164, 0, 202, 110, 0, 184, 199, 200, 0,
- 199, 0, 0, 249, 0, 0, 0, 251, 0, 172,
- 0, 0, 176, 0, 0, 180, 239, 0, 231, 240,
- 234, 0, 238, 0, 199, 232, 0, 199, 0, 0,
- 250, 0, 0, 0, 252, 297, 0, 273, 0, 0,
- 0, 245, 0, 244, 221, 224, 0, 60, 87, 63,
- 88, 65, 66, 37, 70, 71, 34, 72, 75, 35,
- 38, 199, 39, 78, 33, 80, 36, 82, 83, 84,
- 85, 86, 90, 222, 220, 98, 99, 104, 0, 97,
- 0, 261, 262, 0, 0, 0, 264, 269, 267, 270,
- 0, 0, 268, 269, 0, 265, 0, 266, 223, 272,
- 0, 223, 271, 0, 274, 275, 0, 223, 276, 277,
- 0, 0, 278, 0, 0, 0, 279, 280, 116, 115,
- 0, 0, 0, 248, 0, 0, 0, 263, 0, 53,
- 0, 50, 52, 43, 0, 49, 44, 51, 48, 42,
- 0, 47, 120, 118, 122, 119, 117, 121, 0, 18,
- 13, 0, 14, 10, 0, 0, 0, 24, 0, 26,
- 23, 0, 25, 0, 0, 22, 34, 52, 16, 31,
- 0, 11, 0, 17, 0, 20, 12, 0, 21, 34,
- 52, 15, 0, 19, 32, 236, 229, 0, 237, 233,
- 0, 235, 225, 0, 226, 230, 300};
+ 5, 31, 231, 0, 35, 0, 33, 34, 232, 9,
+ 1, 0, 0, 32, 0, 291, 292, 0, 289, 0,
+ 290, 0, 293, 134, 201, 165, 173, 169, 209, 216,
+ 113, 185, 215, 223, 211, 161, 0, 212, 294, 0,
+ 299, 98, 213, 214, 219, 114, 177, 181, 102, 131,
+ 112, 117, 97, 151, 217, 138, 296, 295, 298, 220,
+ 0, 0, 0, 0, 44, 45, 0, 41, 0, 300,
+ 38, 0, 302, 56, 0, 0, 0, 0, 0, 39,
+ 42, 0, 0, 203, 245, 43, 0, 37, 0, 0,
+ 40, 0, 0, 0, 0, 0, 221, 222, 127, 210,
+ 218, 0, 0, 114, 133, 300, 38, 302, 116, 115,
+ 0, 0, 0, 129, 130, 128, 0, 301, 291, 0,
+ 0, 293, 0, 288, 0, 303, 0, 63, 64, 65,
+ 66, 91, 67, 92, 68, 69, 70, 71, 72, 73,
+ 74, 75, 60, 76, 77, 78, 79, 80, 62, 93,
+ 81, 61, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 94, 0, 58, 0, 0, 50, 0, 59, 49,
+ 132, 0, 162, 0, 0, 0, 0, 152, 0, 0,
+ 0, 0, 0, 0, 142, 0, 0, 0, 136, 137,
+ 135, 140, 144, 143, 141, 139, 154, 153, 155, 0,
+ 170, 0, 166, 0, 0, 108, 107, 96, 95, 0,
+ 0, 106, 202, 109, 0, 110, 0, 111, 105, 246,
+ 247, 287, 0, 198, 191, 189, 196, 197, 195, 194,
+ 200, 193, 192, 190, 199, 186, 0, 174, 0, 0,
+ 178, 0, 0, 182, 0, 0, 108, 100, 0, 99,
+ 0, 104, 297, 261, 0, 262, 263, 264, 257, 0,
+ 258, 259, 260, 285, 286, 118, 0, 0, 0, 0,
+ 0, 250, 251, 207, 205, 167, 175, 171, 187, 163,
+ 208, 0, 114, 179, 183, 156, 145, 0, 0, 164,
+ 0, 0, 0, 0, 157, 0, 0, 0, 0, 0,
+ 149, 147, 150, 148, 146, 159, 158, 160, 0, 172,
+ 0, 168, 0, 206, 114, 0, 188, 203, 204, 0,
+ 203, 0, 0, 253, 0, 0, 0, 255, 0, 176,
+ 0, 0, 180, 0, 0, 184, 243, 0, 235, 244,
+ 238, 0, 242, 0, 203, 236, 0, 203, 0, 0,
+ 254, 0, 0, 0, 256, 301, 0, 277, 0, 0,
+ 0, 249, 0, 248, 225, 228, 0, 64, 91, 67,
+ 92, 69, 70, 41, 74, 75, 38, 76, 79, 39,
+ 42, 203, 43, 82, 37, 84, 40, 86, 87, 88,
+ 89, 90, 94, 226, 224, 102, 103, 108, 0, 101,
+ 0, 265, 266, 0, 0, 0, 268, 273, 271, 274,
+ 0, 0, 272, 273, 0, 269, 0, 270, 227, 276,
+ 0, 227, 275, 0, 278, 279, 0, 227, 280, 281,
+ 0, 0, 282, 0, 0, 0, 283, 284, 120, 119,
+ 0, 0, 0, 252, 0, 0, 0, 267, 0, 57,
+ 0, 54, 56, 47, 0, 53, 48, 55, 52, 46,
+ 0, 51, 124, 122, 126, 123, 121, 125, 0, 18,
+ 13, 0, 14, 10, 0, 0, 0, 28, 0, 30,
+ 27, 0, 29, 0, 0, 26, 38, 56, 21, 0,
+ 24, 16, 35, 0, 11, 0, 17, 0, 20, 12,
+ 0, 25, 38, 56, 15, 0, 19, 22, 23, 36,
+ 240, 233, 0, 241, 237, 0, 239, 229, 0, 230,
+ 234, 304};
const int JavaScriptGrammar::goto_default [] = {
- 6, 5, 20, 1, 4, 3, 19, 500, 501, 479,
- 21, 374, 46, 11, 109, 62, 460, 458, 136, 135,
- 34, 459, 134, 137, 216, 58, 51, 224, 60, 40,
- 223, 55, 61, 108, 59, 33, 65, 63, 295, 45,
- 289, 35, 285, 37, 287, 36, 286, 56, 293, 57,
- 294, 41, 288, 284, 325, 410, 290, 291, 38, 44,
- 47, 52, 53, 42, 39, 64, 110, 54, 69, 106,
- 107, 43, 376, 375, 22, 517, 516, 347, 348, 519,
- 350, 518, 349, 416, 420, 423, 419, 418, 438, 439,
- 27, 49, 126, 26, 48, 67, 66, 0};
+ 6, 5, 20, 1, 4, 3, 19, 503, 504, 479,
+ 21, 499, 500, 374, 46, 11, 109, 62, 460, 458,
+ 136, 135, 34, 459, 134, 137, 216, 58, 51, 224,
+ 60, 40, 223, 55, 61, 108, 59, 33, 65, 63,
+ 295, 45, 289, 35, 285, 37, 287, 36, 286, 56,
+ 293, 57, 294, 41, 288, 284, 325, 410, 290, 291,
+ 38, 44, 47, 52, 53, 42, 39, 64, 110, 54,
+ 69, 106, 107, 43, 376, 375, 22, 522, 521, 347,
+ 348, 524, 350, 523, 349, 416, 420, 423, 419, 418,
+ 438, 439, 27, 49, 126, 26, 48, 67, 66, 0};
const int JavaScriptGrammar::action_index [] = {
- 20, -88, 13, -88, -14, 289, 57, 97, -88, -88,
- -88, -88, -88, 64, 70, 118, -88, -88, -88, -88,
- 247, 160, 11, -88, 7, 24, 37, -9, -88, 0,
- -88, -10, 1383, 126, -88, 86, -16, -39, -88, -88,
- 214, -88, -88, -88, -88, 235, 161, -88, -88, 15,
- -88, -88, -88, -88, -88, 574, 77, 62, 215, 195,
- -88, -88, -88, 312, -88, 274, -88, 1383, -88, -88,
- 150, 141, 79, 651, -88, -88, 1299, -88, -21, -8,
- -4, -36, 1635, 78, 651, 651, 651, 418, 651, -88,
- -88, 651, 651, 651, -88, -88, 65, -88, 651, 651,
- -88, 29, 651, 651, 47, 33, -88, -88, -88, -88,
- -88, 651, 651, 109, 181, 21, -88, 1131, -88, -88,
- 651, 651, 651, -88, -88, -88, -28, -88, 24, -27,
- -6, 1383, -17, -88, 3, 5, 35, -88, -88, -88,
- -88, -88, -88, -88, -88, -88, -88, -88, -88, -88,
- -88, -88, -88, -88, -88, -88, -88, -88, -88, -88,
- -88, -88, -88, -88, -88, -88, -88, -88, -88, -88,
- -88, -88, 651, -88, 1215, 10, -88, 651, -88, -88,
- 176, 651, 244, 651, 651, 651, 651, 404, 651, 651,
- 651, 651, 651, 651, 157, 651, 651, 651, 104, 103,
- 106, 189, 190, 172, 193, 274, 292, 322, 302, 651,
- 4, 651, 81, 1047, 651, 651, -88, -88, -88, 142,
- 651, -88, -88, 48, -5, -88, 651, -88, -88, -88,
- -88, -88, 651, -88, -88, -88, -88, -88, -88, -88,
- -88, -88, -88, -88, -88, -88, 651, 59, 651, 651,
- 98, 89, 651, -88, 1047, 651, 651, -88, 145, -88,
- 38, -88, -88, -88, 72, -88, -88, -88, -88, 74,
- -88, -88, -88, -88, -88, -88, -65, -22, 651, 121,
- 87, -88, -88, 805, -88, 19, -20, -57, -88, 242,
- -3, -59, 526, 50, 73, 339, 274, -25, 651, 246,
- 651, 651, 651, 651, 339, 651, 651, 651, 651, 651,
- 274, 274, 274, 167, 162, 339, 339, 270, 651, -46,
- 651, 23, 651, -88, 489, 651, -88, 651, 27, -19,
- 651, -29, 1299, -88, 651, 116, 1299, -88, 651, -12,
- 651, 651, 50, 18, 651, -88, 22, 102, 16, -88,
- -88, 651, -88, 25, 651, -88, -15, 651, -11, 1299,
- -88, 651, 211, 1299, -88, -24, 1299, -88, 651, 111,
- 1299, 28, 1299, -88, -88, 1299, 39, 205, 63, 184,
- 69, 651, 1299, 88, 49, 84, 99, 66, 444, 90,
- 92, 963, 51, 32, 53, 651, 131, 31, 651, 30,
- 651, 36, 40, -88, -88, 206, -88, 651, 17, -88,
- 56, -88, -88, 651, 100, 42, -88, 61, -88, 68,
- 154, 651, -88, 60, 67, -88, 12, -88, 1299, -88,
- 107, 1299, -88, 175, -88, -88, 105, 1299, -2, -88,
- -35, -26, -88, -23, -34, 8, -88, -88, -88, -88,
- 651, 113, 1299, -88, 651, 101, 1299, -88, 148, 14,
- 728, -88, 26, -88, 882, -88, -88, -88, -88, -88,
- 114, -88, -88, -88, -88, -88, -88, -88, 329, -88,
- -88, 361, -88, -88, -13, -18, 34, 41, 651, 83,
- 82, 651, 80, 1467, 55, -88, 119, 239, -88, 71,
- 124, -88, 130, -88, 149, -88, -88, 1551, -88, 132,
- 227, -88, 134, -88, -88, 44, -88, 164, -88, -88,
- 651, -88, -88, 52, -88, -88, -88,
+ 67, -89, 30, -89, 67, 346, 173, 79, -89, -89,
+ -89, -89, -89, 32, 33, 90, -89, -89, -89, -89,
+ 336, 106, 45, -89, 55, 65, 85, 66, -89, 70,
+ -89, 59, 1539, 111, -89, 11, -34, -17, -89, -89,
+ 188, -89, -89, -89, -89, 269, 150, -89, -89, -51,
+ -89, -89, -89, -89, -89, 549, 41, 146, 247, 158,
+ -89, -89, -89, 329, -89, 311, -89, 1539, -89, -89,
+ 196, 191, 118, 713, -89, -89, 1454, -89, -23, 16,
+ 83, 61, 1709, 78, 713, 713, 713, 452, 713, -89,
+ -89, 713, 713, 713, -89, -89, 47, -89, 713, 713,
+ -89, 37, 713, 713, 73, 53, -89, -89, -89, -89,
+ -89, 713, 713, 76, 193, 46, -89, 1199, -89, -89,
+ 713, 713, 713, -89, -89, -89, -25, -89, -13, -52,
+ -9, 1539, 60, -89, 77, 80, 17, -89, -89, -89,
+ -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
+ -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
+ -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
+ -89, -89, 713, -89, 1284, 21, -89, 713, -89, -89,
+ 211, 713, 267, 713, 713, 713, 713, 319, 713, 713,
+ 713, 713, 713, 713, 201, 713, 713, 713, 96, 91,
+ 110, 189, 242, 246, 238, 234, 359, 339, 349, 713,
+ 63, 713, 68, 1114, 713, 713, -89, -89, -89, 104,
+ 713, -89, -89, 69, 18, -89, 713, -89, -89, -89,
+ -89, -89, 713, -89, -89, -89, -89, -89, -89, -89,
+ -89, -89, -89, -89, -89, -89, 713, 48, 713, 713,
+ 74, 64, 713, -89, 1114, 713, 713, -89, 116, -89,
+ 2, -89, -89, -89, 87, -89, -89, -89, -89, 113,
+ -89, -89, -89, -89, -89, -89, 56, 62, 713, 103,
+ 130, -89, -89, 791, -89, 84, -38, -67, -89, 260,
+ 10, -41, 635, 20, 117, 302, 239, -10, 713, 271,
+ 713, 713, 713, 713, 272, 713, 713, 713, 713, 713,
+ 208, 222, 205, 213, 217, 287, 377, 377, 713, -73,
+ 713, 84, 713, -89, 463, 713, -89, 713, 42, -15,
+ 713, -16, 1454, -89, 713, 144, 1454, -89, 713, 6,
+ 713, 713, 54, 51, 713, -89, 38, 95, 26, -89,
+ -89, 713, -89, -2, 713, -89, -31, 713, -37, 1454,
+ -89, 713, 99, 1454, -89, 4, 1454, -89, 713, 97,
+ 1454, 22, 1454, -89, -89, 1454, 49, 140, 5, 147,
+ 82, 713, 1454, 29, 1, 81, 34, 3, 538, 28,
+ 25, 873, 19, -3, 24, 713, 35, 14, 713, 23,
+ 713, 15, 27, -89, -89, 163, -89, 713, -7, -89,
+ 128, -89, -89, 713, 138, -8, -89, 44, -89, 43,
+ 127, 713, -89, 12, -1, -89, -50, -89, 1454, -89,
+ 115, 1454, -89, 175, -89, -89, 108, 1454, -18, -89,
+ -29, -4, -89, -28, -60, -4, -89, -89, -89, -89,
+ 713, 124, 1454, -89, 713, 125, 1454, -89, 112, 13,
+ 1029, -89, 7, -89, 951, -89, -89, -89, -89, -89,
+ 126, -89, -89, -89, -89, -89, -89, -89, 356, -89,
+ -89, 375, -89, -89, 39, 31, 36, 57, 713, 71,
+ 75, 713, 72, 1624, 52, -89, 131, 274, -89, 133,
+ -89, -89, 40, 137, -89, 101, -89, 148, -89, -89,
+ 1369, -89, 94, 262, -89, 98, -89, -89, -89, -89,
+ 50, -89, 157, -89, -89, 713, -89, -89, 58, -89,
+ -89, -89,
- -98, -98, -98, -98, -2, -7, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- 184, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, 164, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -32, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, 181, -98, -98,
- -98, -98, -98, 105, -98, -98, -5, -98, -98, -98,
- -98, -98, -98, -98, 51, 79, 84, 44, 91, -98,
- -98, 42, 55, 52, -98, -98, -98, -98, 45, 110,
- -98, -12, 125, 128, -98, -98, -98, -98, -98, -98,
- -98, 131, 132, -98, -98, -98, -98, -98, -98, -98,
- 111, 120, 116, -98, -98, -98, -98, -98, -63, -98,
- -98, 182, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, 35, -98, 25, -98, -98, 39, -98, -98,
- -98, 56, -98, 59, 61, 62, 60, -98, 46, 43,
- 47, 49, 53, 95, -98, 97, 83, 72, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, -98, 70,
- -98, 80, -98, 17, 33, 15, -98, -98, -98, -98,
- 10, -98, -98, -98, -98, -98, 30, -98, -98, -98,
- -98, -98, 34, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, 63, -98, 88, 36,
- -98, -98, 38, -98, 82, 37, 89, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, 32, -98,
- -98, -98, -98, 94, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, 179, -98,
- 189, 176, 251, 175, -98, 133, 143, 149, 137, 109,
- -98, -98, -98, -98, -98, -98, -98, -98, 165, -98,
- 166, -98, 186, -98, -98, 193, -98, 121, -98, -98,
- 136, -98, 31, -98, 19, -98, 21, -98, 195, -98,
- 187, 185, -98, -98, 152, -98, -98, -98, -98, -98,
- -98, 151, -98, -54, 134, -98, -98, 117, -98, 22,
- -98, 24, -98, 28, -98, -98, 27, -98, 29, -98,
- 26, -98, 23, -98, -98, 14, -98, -98, -98, -98,
- -98, 106, 50, -98, -98, -98, -98, -98, 129, -98,
- -98, 40, -98, -98, -98, 41, -98, 13, 119, -98,
- 69, -98, -98, -98, -98, -98, -98, 107, -98, -98,
- -98, -98, -98, 48, -98, -98, -98, -98, -98, -44,
- -98, -10, -98, -79, -98, -98, -98, -98, -72, -98,
- -98, -68, -98, -98, -98, -98, -98, -98, -71, -98,
- -98, -41, -98, -98, -98, -37, -98, -98, -98, -98,
- 92, -98, -1, -98, 2, -98, 4, -98, -98, -98,
- 8, -98, -3, -98, 9, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, 153, -98,
- -98, 172, -98, -98, -98, -98, -98, -98, -4, -98,
- -98, 7, -98, 5, -98, -98, 3, 1, -98, 0,
- -98, -98, -98, -98, 57, -98, -98, 12, -98, 11,
- 113, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- 6, -98, -98, -75, -98, -98, -98};
+ -100, -100, -100, -100, 12, 4, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ 59, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, 117, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -54, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, 184, -100, -100,
+ -100, -100, -100, 116, -100, -100, 47, -100, -100, -100,
+ -100, -100, -100, -100, 39, 141, 89, 65, 48, -100,
+ -100, 51, 52, 38, -100, -100, -100, -100, 40, 83,
+ -100, -16, 61, 66, -100, -100, -100, -100, -100, -100,
+ -100, 44, 57, -100, -100, -100, -100, -100, -100, -100,
+ 112, 109, 133, -100, -100, -100, -100, -100, -61, -100,
+ -100, 193, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -13, -100, -18, -100, -100, -7, -100, -100,
+ -100, 121, -100, 113, 104, 90, 92, -100, 123, 103,
+ 101, 102, 95, 137, -100, 145, 132, 126, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, 58,
+ -100, 84, -100, 11, 7, 3, -100, -100, -100, -100,
+ 6, -100, -100, -100, -100, -100, 10, -100, -100, -100,
+ -100, -100, 5, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, 41, -100, 56, -3,
+ -100, -100, 0, -100, 147, 64, 138, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, 2, -100,
+ -100, -100, -100, 115, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, 187, -100,
+ 154, 195, 183, 198, -100, 33, 73, 82, 71, 75,
+ -100, -100, -100, -100, -100, -100, -100, -100, 165, -100,
+ 146, -100, 150, -100, -100, 177, -100, 50, -100, -100,
+ 53, -100, 22, -100, 9, -100, 45, -100, 171, -100,
+ 189, 169, -100, -100, 163, -100, -100, -100, -100, -100,
+ -100, 162, -100, -68, 136, -100, -100, 124, -100, -2,
+ -100, -4, -100, -5, -100, -100, 46, -100, 43, -100,
+ 35, -100, 34, -100, -100, 42, -100, -100, -100, -100,
+ -100, 122, 30, -100, -100, -100, -100, -100, 70, -100,
+ -100, 49, -100, -100, -100, 36, -100, -15, 86, -100,
+ 79, -100, -100, -100, -100, -100, -100, 142, -100, -100,
+ -100, -100, -100, 37, -100, -100, -100, -100, -100, -40,
+ -100, 32, -100, -44, -100, -100, -100, -100, -33, -100,
+ -100, -12, -100, -100, -100, -100, -100, -100, -35, -100,
+ -100, -36, -100, -100, -100, -53, -100, -100, -100, -100,
+ -1, -100, 1, -100, -10, -100, -8, -100, -100, -100,
+ -19, -100, -17, -100, -22, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, 175, -100,
+ -100, 236, -100, -100, -100, -100, -100, -100, 19, -100,
+ -100, 15, -100, 21, -100, -100, 28, 29, -100, -100,
+ -100, -100, 31, -100, -100, -100, -100, 60, -100, -100,
+ 25, -100, 17, 62, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, 8, -100, -100, -60, -100,
+ -100, -100};
const int JavaScriptGrammar::action_info [] = {
- 368, 443, 327, 366, 346, 322, 444, 437, 128, 277,
- 172, 490, 25, 174, 278, 283, 486, 177, 441, 320,
- 298, 365, 467, 32, 298, 344, 445, 131, 318, 30,
- 320, 332, 209, 130, 461, 220, 318, 211, 133, 351,
- 515, 437, 330, 25, 372, 29, 357, 361, 488, 359,
- 127, 31, 338, 28, 346, 228, 226, 526, -57, -228,
- -79, 520, 437, 487, 437, 421, 421, 427, 413, 454,
- 231, 2, 450, 421, 428, 417, 454, 409, 7, 246,
- 211, 515, 181, 450, 514, 283, 461, 181, 220, 491,
- 179, 220, -227, 24, 404, -68, 252, -76, 261, -58,
- 246, 413, 368, 478, 478, 2, -56, 209, 220, 220,
- 353, 440, 248, 127, 431, 220, 249, 412, 411, 220,
- -296, 220, 220, 340, 220, 441, 366, 341, 484, 220,
- 274, 273, 504, 267, 266, 272, 271, 507, -81, 366,
- 274, 273, 504, 111, 111, 494, 111, 485, 282, 281,
- 220, 118, 478, 220, 112, 112, 462, 112, 9, 8,
- 415, 456, 119, 354, 424, 478, 111, 493, 0, 220,
- 269, 370, 523, 452, 471, 494, 336, 112, 499, 264,
- 505, 280, 195, 220, 196, 0, 0, 195, 120, 196,
- 513, 0, 195, 120, 196, 197, 0, 195, 221, 196,
- 197, 259, 270, 268, 463, 197, 0, 120, 17, 425,
- 197, 265, 263, 269, 195, 195, 196, 196, 195, 220,
- 196, 254, 230, 229, 0, 524, 522, 197, 197, 213,
- 254, 197, 16, 121, 264, 461, 435, 434, 121, 122,
- 255, 0, 407, 0, 122, 270, 268, 461, 214, 255,
- 215, 256, 121, 183, 184, 0, 499, 0, 122, 0,
- 300, 301, 183, 184, 300, 301, 265, 263, 499, 13,
- 0, 363, 0, 0, 0, 0, 14, 0, 0, 0,
- 185, 186, 0, 0, 0, 0, 17, 302, 303, 185,
- 186, 302, 303, 305, 306, 0, 0, 0, 17, 195,
- 0, 196, 307, 0, 0, 308, 17, 309, 0, 0,
- 16, 13, 197, 0, 0, 188, 189, 0, 14, 18,
- 0, 0, 16, 190, 191, 188, 189, 192, 12, 193,
- 16, 15, 0, 190, 191, 188, 189, 192, 0, 193,
- 0, 0, 0, 190, 191, 188, 189, 192, 17, 193,
- 0, 13, 0, 190, 191, 0, 0, 192, 14, 193,
- 0, 18, 305, 306, 0, 0, 0, 0, 0, 0,
- 12, 307, 16, 15, 308, 0, 309, 0, 0, 0,
- 0, 0, 0, 13, 480, 0, 0, 0, 17, 0,
- 14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 18, 0, 0, 0, 0, 0, 0, 0, 0,
- 12, 0, 16, 15, 0, 0, 482, 0, 0, 0,
- 17, 0, 0, 0, 0, 0, 0, 188, 189, 0,
- 74, 75, 0, 18, 0, 190, 191, 0, 0, 192,
- 115, 193, 12, 0, 16, 15, 0, 116, 0, 0,
- 0, 117, 83, 0, 84, 0, 74, 75, 0, 0,
- 0, 87, 0, 0, 0, 90, 115, 0, 0, 0,
- 0, 0, 0, 116, 0, 0, 0, 117, 83, 0,
- 84, 0, 0, 95, 0, 97, 0, 87, 0, 0,
- 0, 90, 233, 0, 0, 0, 89, 100, 77, 0,
- 0, 0, 234, 0, 0, 0, 235, 0, 0, 95,
- 0, 97, 0, 0, 0, 236, 0, 237, 0, 0,
- 0, 0, 89, 100, 77, 0, 0, 0, 238, 233,
- 239, 118, 0, 0, 0, 0, 0, 0, 240, 234,
- 0, 241, 119, 235, 0, 0, 0, 242, 0, 0,
- 0, 0, 236, 243, 237, 0, 0, 334, 0, 0,
- 0, 0, 0, 0, 0, 238, 244, 239, 118, 0,
- 0, 0, 0, 0, 0, 240, 0, 233, 241, 119,
- 0, 0, 0, 0, 242, 0, 0, 234, 0, 0,
- 243, 235, 0, 0, 0, 0, 0, 0, 0, 0,
- 236, 0, 237, 244, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 238, 0, 239, 118, 0, 0, 0,
- 0, 0, 0, 240, 0, 0, 241, 119, 0, 0,
- 0, 0, 242, 0, 0, 0, 0, 0, 243, 0,
+ 445, 444, 441, 320, 231, 427, 428, 443, 130, 320,
+ 318, 128, 181, 283, 209, 461, 28, 421, 322, 346,
+ 327, 467, 338, 359, 131, 417, -61, 346, 177, 437,
+ 357, -83, -62, 413, -231, -80, -72, 283, 372, 368,
+ 25, -60, -85, 246, 332, 365, 330, 437, 421, 421,
+ 220, 450, -232, 409, 318, 351, 338, 361, 344, 211,
+ 490, 24, 261, 454, 488, 487, 478, 525, 486, 181,
+ 437, 252, 179, 478, 520, 127, 246, 226, 228, 220,
+ 220, 519, 491, 413, 172, 298, 461, 520, 174, 454,
+ 366, 25, 32, 29, 28, 7, 209, 368, 278, 30,
+ 484, 366, 0, 353, 404, 220, 507, 220, 510, 450,
+ 127, 220, 220, 493, 440, 133, 494, -300, 118, 485,
+ 462, 494, 431, 220, 220, 0, 31, 478, 441, 119,
+ 277, 111, 220, 220, 220, 0, 111, 424, 366, 211,
+ 9, 8, 112, 274, 273, 507, 220, 112, 267, 266,
+ 111, 111, 220, 2, 516, 0, 354, 370, 220, 363,
+ 221, 112, 112, 280, 478, 528, 0, 340, 463, 264,
+ 120, 341, 259, 531, 272, 271, 269, 502, 254, 274,
+ 273, 0, 425, 220, 452, 456, 471, 0, 0, 412,
+ 411, 282, 281, 508, 518, 517, 248, 255, 415, 407,
+ 249, 265, 263, 213, 336, 120, 0, 17, 270, 268,
+ 0, 230, 229, 0, 195, 121, 196, 0, 529, 527,
+ 269, 122, 214, 120, 215, 264, 195, 197, 196, 0,
+ 195, 16, 196, 195, 0, 196, 435, 434, 195, 197,
+ 196, 0, 195, 197, 196, 0, 197, 195, 0, 196,
+ 121, 197, 270, 268, 0, 197, 122, 265, 263, 195,
+ 197, 196, 254, 195, 195, 196, 196, 195, 121, 196,
+ 461, 195, 197, 196, 122, 0, 197, 197, 300, 301,
+ 197, 255, 461, 256, 197, 183, 184, 183, 184, 300,
+ 301, 502, 0, 0, 0, 305, 306, 0, 0, 0,
+ 0, 0, 0, 502, 307, 302, 303, 308, 0, 309,
+ 305, 306, 185, 186, 185, 186, 302, 303, 0, 307,
+ 0, 17, 308, 0, 309, 305, 306, 0, 0, 0,
+ 0, 0, 0, 17, 307, 0, 195, 308, 196, 309,
+ 0, 0, 188, 189, 0, 16, 0, 0, 0, 197,
+ 190, 191, 188, 189, 192, 0, 193, 16, 13, 0,
+ 190, 191, 188, 189, 192, 14, 193, 0, 13, 0,
+ 190, 191, 188, 189, 192, 14, 193, 0, 13, 0,
+ 190, 191, 188, 189, 192, 14, 193, 0, 0, 0,
+ 190, 191, 0, 0, 192, 17, 193, 13, 0, 0,
+ 305, 306, 0, 0, 14, 17, 0, 0, 18, 307,
+ 0, 480, 308, 0, 309, 17, 0, 12, 18, 16,
+ 0, 15, 0, 0, 0, 0, 0, 12, 18, 16,
+ 482, 15, 0, 0, 17, 0, 0, 12, 0, 16,
+ 0, 15, 0, 0, 0, 0, 0, 18, 0, 0,
+ 0, 0, 0, 0, 0, 0, 12, 0, 16, 0,
+ 15, 0, 0, 0, 74, 75, 233, 0, 0, 0,
+ 0, 0, 0, 0, 115, 0, 234, 0, 0, 0,
+ 235, 116, 0, 0, 0, 117, 83, 0, 84, 236,
+ 0, 237, 0, 0, 0, 87, 0, 0, 0, 90,
+ 0, 0, 238, 0, 239, 118, 0, 0, 0, 0,
+ 0, 0, 240, 0, 0, 241, 119, 95, 0, 97,
+ 0, 242, 0, 0, 0, 0, 0, 243, 0, 0,
+ 89, 100, 77, 0, 0, 0, 0, 0, 0, 0,
+ 244, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 74, 75, 233, 0, 0, 0, 0, 0, 0, 0,
+ 115, 0, 234, 0, 0, 0, 235, 116, 0, 0,
+ 0, 117, 83, 0, 84, 236, 0, 237, 0, 0,
+ 0, 87, 0, 0, 0, 90, 0, 0, 238, 0,
+ 239, 118, 0, 0, 0, 0, 0, 0, 240, 0,
+ 0, 241, 119, 95, 0, 97, 0, 242, 0, 0,
+ 0, 0, 0, 243, 0, 0, 89, 100, 77, 0,
+ 0, 0, 0, 0, 0, 0, 244, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 233, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 234, 0,
+ 0, 0, 235, 0, 0, 0, 0, 0, 0, 0,
+ 0, 236, 0, 237, 0, 0, 334, 0, 0, 0,
+ 0, 0, 0, 0, 238, 0, 239, 118, 0, 0,
+ 0, 0, 0, 0, 240, 0, 0, 241, 119, 0,
+ 0, 0, 0, 242, 0, 0, 0, 0, 0, 243,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 244, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 244, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 73, 74, 75, 0, 0, 0,
+ 0, 0, 0, 0, 0, 115, 0, 0, 0, 0,
+ 0, 0, 116, 0, 0, 0, 117, 83, 0, 84,
+ 0, 0, 0, 85, 0, 86, 87, 88, 0, 0,
+ 90, 0, 0, 0, 91, 0, 92, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 95, 0,
+ 97, 0, 99, 0, 102, 0, 103, 0, 0, 0,
+ 0, 89, 100, 77, 0, 0, 0, 0, 0, 0,
0, 0, 73, 74, 75, 0, 0, 0, 0, 0,
0, 0, 0, 115, 0, 0, 0, 0, 0, 0,
116, 0, 0, 0, 117, 83, 0, 84, 0, 0,
0, 85, 0, 86, 87, 88, 0, 0, 90, 0,
0, 0, 91, 0, 92, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 95, 0, 97, 0,
- 99, 0, 102, 0, 103, 0, 0, 0, 0, 89,
- 100, 77, 0, 0, 0, 0, 0, 0, 0, 73,
- 74, 75, 0, 0, 0, 0, 0, 0, 0, 0,
- 115, 0, 0, 0, 0, 0, 0, 116, 0, 0,
- 0, 117, 83, 0, 84, 0, 0, 0, 85, 0,
- 86, 87, 88, 0, 0, 90, 0, 0, 0, 91,
- 0, 92, 0, 0, 469, 0, 0, 0, 0, 0,
- 0, 0, 0, 95, 0, 97, 0, 99, 0, 102,
- 0, 103, 0, 0, 0, 0, 89, 100, 77, 0,
- 0, 0, 0, 0, 0, 0, 73, 74, 75, 0,
- 0, 0, 0, 0, 0, 0, 0, 115, 0, 0,
- 0, 0, 0, 0, 116, 0, 0, 0, 117, 83,
- 0, 84, 0, 0, 0, 85, 0, 86, 87, 88,
- 0, 0, 90, 0, 0, 0, 91, 0, 92, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 95, 0, 97, 0, 99, 0, 102, 297, 103, 0,
- 0, 0, 0, 89, 100, 77, 0, 0, 0, 0,
- 0, 0, 0, 73, 74, 75, 0, 0, 0, 0,
- 0, 0, 0, 0, 115, 0, 0, 0, 0, 0,
- 0, 116, 0, 0, 0, 117, 83, 0, 84, 0,
- 0, 0, 85, 0, 86, 87, 88, 0, 0, 90,
- 0, 0, 0, 91, 0, 92, 0, 0, 466, 0,
- 0, 0, 0, 0, 0, 0, 0, 95, 0, 97,
- 0, 99, 0, 102, 0, 103, 0, 0, 0, 0,
- 89, 100, 77, 0, 0, 0, 0, 0, 0, 0,
- -77, 0, 0, 0, 73, 74, 75, 0, 0, 0,
+ 99, 0, 102, 297, 103, 0, 0, 0, 0, 89,
+ 100, 77, 0, 0, 0, 0, 0, 0, 0, 0,
+ -81, 0, 0, 0, 73, 74, 75, 0, 0, 0,
0, 0, 0, 0, 0, 115, 0, 0, 0, 0,
0, 0, 116, 0, 0, 0, 117, 83, 0, 84,
0, 0, 0, 85, 0, 86, 87, 88, 0, 0,
@@ -399,209 +395,215 @@ const int JavaScriptGrammar::action_info [] = {
0, 0, 0, 0, 0, 0, 0, 0, 95, 0,
97, 0, 99, 0, 102, 0, 103, 0, 0, 0,
0, 89, 100, 77, 0, 0, 0, 0, 0, 0,
- 0, 138, 139, 140, 0, 0, 142, 144, 145, 0,
- 0, 146, 0, 147, 0, 0, 0, 149, 150, 151,
- 0, 0, 0, 0, 0, 0, 218, 153, 154, 155,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 156, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 160, 0, 0, 0,
- 0, 0, 0, 162, 163, 164, 0, 166, 167, 168,
- 169, 170, 171, 0, 0, 157, 165, 148, 141, 143,
- 159, 0, 0, 0, 0, 138, 139, 140, 0, 0,
- 142, 144, 145, 0, 0, 146, 0, 147, 0, 0,
- 0, 149, 150, 151, 0, 0, 0, 0, 0, 0,
- 152, 153, 154, 155, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 156, 0, 0, 0, 158, 0,
+ 0, 0, 73, 74, 75, 0, 0, 0, 0, 0,
+ 0, 0, 0, 115, 0, 0, 0, 0, 0, 0,
+ 116, 0, 0, 0, 117, 83, 0, 84, 0, 0,
+ 0, 85, 0, 86, 87, 88, 0, 0, 90, 0,
+ 0, 0, 91, 0, 92, 0, 0, 466, 0, 0,
+ 0, 0, 0, 0, 0, 0, 95, 0, 97, 0,
+ 99, 0, 102, 0, 103, 0, 0, 0, 0, 89,
+ 100, 77, 0, 0, 0, 0, 0, 0, 0, 0,
+ 73, 74, 75, 0, 0, 0, 0, 0, 0, 0,
+ 0, 115, 0, 0, 0, 0, 0, 0, 116, 0,
+ 0, 0, 117, 83, 0, 84, 0, 0, 0, 85,
+ 0, 86, 87, 88, 0, 0, 90, 0, 0, 0,
+ 91, 0, 92, 0, 0, 469, 0, 0, 0, 0,
+ 0, 0, 0, 0, 95, 0, 97, 0, 99, 0,
+ 102, 0, 103, 0, 0, 0, 0, 89, 100, 77,
+ 0, 0, 0, 0, 0, 0, 0, 0, 138, 139,
+ 140, 0, 0, 142, 144, 145, 0, 0, 146, 0,
+ 147, 0, 0, 0, 149, 150, 151, 0, 0, 0,
+ 0, 0, 0, 218, 153, 154, 155, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 156, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 160, 0, 0, 0, 0, 0, 161, 162, 163, 164,
- 0, 166, 167, 168, 169, 170, 171, 0, 0, 157,
- 165, 148, 141, 143, 159, 0, 0, 0, 0, 138,
- 139, 140, 0, 0, 142, 144, 145, 0, 0, 146,
- 0, 147, 0, 0, 0, 149, 150, 151, 0, 0,
- 0, 0, 0, 0, 152, 153, 154, 155, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 156, 0,
- 0, 0, 158, 0, 0, 0, 0, 0, 0, 0,
- 176, 0, 0, 0, 160, 0, 0, 0, 0, 0,
- 161, 162, 163, 164, 0, 166, 167, 168, 169, 170,
- 171, 0, 0, 157, 165, 148, 141, 143, 159, 0,
+ 0, 0, 0, 160, 0, 0, 0, 0, 0, 0,
+ 162, 163, 164, 0, 166, 167, 168, 169, 170, 171,
+ 0, 0, 157, 165, 148, 141, 143, 159, 0, 0,
+ 0, 0, 0, 138, 139, 140, 0, 0, 142, 144,
+ 145, 0, 0, 146, 0, 147, 0, 0, 0, 149,
+ 150, 151, 0, 0, 0, 0, 0, 0, 152, 153,
+ 154, 155, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 156, 0, 0, 0, 158, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 160, 0,
+ 0, 0, 0, 0, 161, 162, 163, 164, 0, 166,
+ 167, 168, 169, 170, 171, 0, 0, 157, 165, 148,
+ 141, 143, 159, 0, 0, 0, 0, 0, 138, 139,
+ 140, 0, 0, 142, 144, 145, 0, 0, 146, 0,
+ 147, 0, 0, 0, 149, 150, 151, 0, 0, 0,
+ 0, 0, 0, 152, 153, 154, 155, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 156, 0, 0,
+ 0, 158, 0, 0, 0, 0, 0, 0, 0, 176,
+ 0, 0, 0, 160, 0, 0, 0, 0, 0, 161,
+ 162, 163, 164, 0, 166, 167, 168, 169, 170, 171,
+ 0, 0, 157, 165, 148, 141, 143, 159, 0, 0,
+ 0, 0, 0, 70, 0, 0, 0, 0, 71, 0,
+ 73, 74, 75, 76, 0, 0, 0, 0, 0, 0,
+ 78, 115, 0, 0, 0, 0, 0, 0, 512, 81,
+ 0, 0, 82, 513, 0, 84, 0, 0, 0, 85,
+ 0, 86, 87, 88, 0, 0, 90, 0, 0, 0,
+ 91, 0, 92, 0, 0, 0, 0, 0, 93, 0,
+ 94, 0, 0, 0, 95, 96, 97, 98, 99, 101,
+ 102, 18, 103, 104, 105, 0, 0, 89, 100, 77,
+ 12, 72, 0, 0, 0, 0, 0, 0, 70, 0,
+ 0, 0, 0, 71, 0, 73, 74, 75, 76, 0,
+ 0, 0, 0, 0, 0, 78, 115, 0, 0, 0,
+ 0, 0, 0, 80, 81, 0, 0, 82, 83, 0,
+ 84, 0, 0, 0, 85, 0, 86, 87, 88, 0,
+ 0, 90, 0, 0, 0, 91, 0, 92, 0, 0,
+ 0, 0, 0, 93, 0, 94, 0, 0, 0, 95,
+ 96, 97, 98, 99, 101, 102, 18, 103, 104, 105,
+ 0, 0, 89, 100, 77, 12, 72, 0, 0, 0,
0, 0, 0, 70, 0, 0, 0, 0, 71, 0,
73, 74, 75, 76, 0, 0, 0, 0, 0, 0,
- 78, 115, 0, 0, 0, 0, 0, 0, 80, 81,
+ 78, 79, 0, 0, 0, 0, 0, 0, 80, 81,
0, 0, 82, 83, 0, 84, 0, 0, 0, 85,
0, 86, 87, 88, 0, 0, 90, 0, 0, 0,
91, 0, 92, 0, 0, 0, 0, 0, 93, 0,
94, 0, 0, 0, 95, 96, 97, 98, 99, 101,
102, 18, 103, 104, 105, 0, 0, 89, 100, 77,
- 12, 72, 0, 0, 0, 0, 0, 70, 0, 0,
- 0, 0, 71, 0, 73, 74, 75, 76, 0, 0,
- 0, 0, 0, 0, 78, 79, 0, 0, 0, 0,
- 0, 0, 80, 81, 0, 0, 82, 83, 0, 84,
- 0, 0, 0, 85, 0, 86, 87, 88, 0, 0,
- 90, 0, 0, 0, 91, 0, 92, 0, 0, 0,
- 0, 0, 93, 0, 94, 0, 0, 0, 95, 96,
- 97, 98, 99, 101, 102, 18, 103, 104, 105, 0,
- 0, 89, 100, 77, 12, 72, 0, 0, 0, 0,
- 0, 70, 0, 0, 0, 0, 71, 0, 73, 74,
- 75, 76, 0, 0, 0, 0, 0, 0, 78, 115,
- 0, 0, 0, 0, 0, 0, 496, 81, 0, 0,
- 82, 497, 0, 84, 0, 0, 0, 85, 0, 86,
- 87, 88, 0, 0, 90, 0, 0, 0, 91, 0,
- 92, 0, 0, 0, 0, 0, 93, 0, 94, 0,
- 0, 0, 95, 96, 97, 98, 99, 101, 102, 18,
- 103, 104, 105, 0, 0, 89, 100, 77, 12, 72,
- 0, 0, 0, 0, 0, 70, 0, 0, 0, 0,
- 71, 0, 73, 74, 75, 76, 0, 0, 0, 0,
- 0, 0, 78, 115, 0, 0, 0, 0, 0, 0,
- 509, 81, 0, 0, 82, 510, 0, 84, 0, 0,
- 0, 85, 0, 86, 87, 88, 0, 0, 90, 0,
- 0, 0, 91, 0, 92, 0, 0, 0, 0, 0,
- 93, 0, 94, 0, 0, 0, 95, 96, 97, 98,
- 99, 101, 102, 18, 103, 104, 105, 0, 0, 89,
- 100, 77, 12, 72, 0, 0, 0, 0, 0, 377,
- 139, 140, 0, 0, 379, 144, 381, 74, 75, 382,
- 0, 147, 0, 0, 0, 149, 384, 385, 0, 0,
- 0, 0, 0, 0, 386, 387, 154, 155, 82, 83,
- 0, 84, 0, 0, 0, 85, 0, 86, 388, 88,
- 0, 0, 390, 0, 0, 0, 91, 0, 92, 0,
- -223, 0, 0, 0, 391, 0, 94, 0, 0, 0,
- 392, 393, 394, 395, 99, 397, 398, 399, 400, 401,
- 402, 0, 0, 389, 396, 383, 378, 380, 159, 0,
- 0, 0, 0,
+ 12, 72, 0, 0, 0, 0, 0, 0, 70, 0,
+ 0, 0, 0, 71, 0, 73, 74, 75, 76, 0,
+ 0, 0, 0, 0, 0, 78, 115, 0, 0, 0,
+ 0, 0, 0, 496, 81, 0, 0, 82, 497, 0,
+ 84, 0, 0, 0, 85, 0, 86, 87, 88, 0,
+ 0, 90, 0, 0, 0, 91, 0, 92, 0, 0,
+ 0, 0, 0, 93, 0, 94, 0, 0, 0, 95,
+ 96, 97, 98, 99, 101, 102, 18, 103, 104, 105,
+ 0, 0, 89, 100, 77, 12, 72, 0, 498, 0,
+ 0, 0, 0, 377, 139, 140, 0, 0, 379, 144,
+ 381, 74, 75, 382, 0, 147, 0, 0, 0, 149,
+ 384, 385, 0, 0, 0, 0, 0, 0, 386, 387,
+ 154, 155, 82, 83, 0, 84, 0, 0, 0, 85,
+ 0, 86, 388, 88, 0, 0, 390, 0, 0, 0,
+ 91, 0, 92, 0, -227, 0, 0, 0, 391, 0,
+ 94, 0, 0, 0, 392, 393, 394, 395, 99, 397,
+ 398, 399, 400, 401, 402, 0, 0, 389, 396, 383,
+ 378, 380, 159, 0, 0, 0, 0, 0,
- 429, 525, 430, 10, 432, 426, 276, 23, 489, 503,
- 453, 502, 498, 464, 455, 457, 495, 447, 442, 492,
- 511, 446, 232, 508, 355, 403, 521, 129, 468, 465,
- 222, 335, 337, 360, 373, 225, 362, 371, 367, 364,
- 217, 369, 333, 422, 279, 219, 436, 175, 0, 258,
- 227, 0, 328, 433, 245, 173, 251, 433, 253, 178,
- 414, 276, 0, 470, 328, 506, 0, 502, 0, 405,
- 0, 436, 406, 113, 113, 475, 0, 113, 113, 201,
- 113, 0, 194, 202, 113, 203, 113, 113, 476, 204,
- 113, 113, 113, 113, 113, 182, 187, 208, 206, 207,
- 113, 113, 449, 113, 451, 217, 257, 200, 247, 225,
- 113, 113, 472, 210, 113, 113, 260, 473, 199, 113,
- 512, 212, 113, 502, 474, 292, 113, 225, 113, 328,
- 296, 205, 198, 328, 408, 250, 113, 113, 275, 275,
- 113, 113, 113, 477, 123, 314, 328, 113, 328, 125,
- 113, 113, 448, 124, 405, 481, 113, 406, 448, 113,
- 0, 449, 113, 113, 113, 114, 180, 23, 113, 310,
- 0, 0, 358, 313, 113, 68, 329, 50, 483, 311,
- 113, 0, 324, 324, 0, 312, 23, 296, 296, 356,
- 483, 331, 68, 68, 50, 50, 113, 113, 23, 0,
- 0, 296, 296, 0, 352, 345, 113, 113, 321, 319,
- 113, 296, 296, 317, 315, 296, 324, 324, 113, 299,
- 113, 296, 296, 296, 324, 296, 113, 304, 0, 296,
- 0, 296, 0, 0, 0, 342, 0, 0, 343, 323,
- 0, 339, 0, 0, 0, 0, 326, 0, 0, 0,
+ 465, 464, 232, 468, 455, 457, 175, 446, 364, 173,
+ 362, 360, 355, 451, 453, 178, 279, 10, 530, 251,
+ 23, 219, 253, 335, 447, 225, 514, 245, 222, 492,
+ 526, 129, 227, 489, 495, 333, 217, 501, 511, 505,
+ 506, 429, 426, 276, 436, 436, 430, 373, 371, 422,
+ 433, 414, 328, 470, 433, 403, 442, 369, 337, 367,
+ 276, 0, 432, 328, 328, 483, 113, 328, 509, 515,
+ 505, 310, 505, 0, 113, 23, 0, 113, 258, 0,
+ 114, 113, 0, 474, 113, 113, 475, 476, 247, 113,
+ 113, 113, 405, 180, 113, 406, 448, 405, 0, 113,
+ 406, 449, 0, 210, 113, 250, 113, 329, 113, 313,
+ 331, 311, 113, 314, 449, 113, 113, 113, 477, 113,
+ 312, 448, 113, 113, 473, 113, 0, 212, 113, 207,
+ 68, 208, 50, 204, 113, 113, 113, 113, 328, 202,
+ 203, 201, 113, 206, 124, 113, 113, 123, 292, 113,
+ 328, 275, 187, 296, 113, 113, 113, 275, 0, 113,
+ 225, 194, 182, 200, 225, 113, 113, 260, 125, 199,
+ 113, 408, 217, 257, 113, 205, 472, 481, 113, 113,
+ 0, 358, 198, 324, 296, 0, 0, 113, 296, 0,
+ 321, 23, 296, 356, 304, 324, 324, 68, 113, 50,
+ 296, 296, 324, 296, 113, 323, 68, 296, 50, 296,
+ 324, 319, 0, 0, 0, 296, 113, 352, 345, 339,
+ 113, 296, 113, 316, 343, 296, 0, 296, 113, 299,
+ 0, 113, 326, 296, 0, 315, 296, 0, 317, 342,
+ 0, 0, 483, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 23, 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, 132, 0, 0, 0, 262, 0, 0,
- 0, 0, 113, 0, 0, 0, 0, 296, 0, 316,
+ 0, 0, 262, 0, 0, 0, 132, 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 int JavaScriptGrammar::action_check [] = {
- 36, 36, 61, 7, 29, 8, 29, 33, 36, 74,
- 7, 29, 36, 8, 36, 36, 29, 7, 20, 76,
- 1, 29, 8, 33, 1, 7, 60, 33, 48, 29,
- 76, 60, 48, 60, 8, 8, 48, 76, 55, 17,
- 29, 33, 61, 36, 16, 8, 61, 31, 7, 60,
- 29, 60, 2, 29, 29, 60, 8, 0, 7, 29,
- 7, 17, 33, 29, 33, 5, 5, 55, 36, 36,
- 55, 85, 36, 5, 7, 33, 36, 60, 65, 2,
- 76, 29, 1, 36, 29, 36, 8, 1, 8, 7,
- 55, 8, 29, 29, 55, 7, 7, 7, 60, 7,
- 2, 36, 36, 33, 33, 85, 7, 48, 8, 8,
- 8, 6, 50, 29, 7, 8, 54, 61, 62, 8,
- 36, 8, 8, 50, 8, 20, 7, 54, 10, 8,
- 61, 62, 8, 61, 62, 61, 62, 7, 7, 7,
- 61, 62, 8, 40, 40, 15, 40, 29, 61, 62,
- 8, 42, 33, 8, 51, 51, 8, 51, 61, 62,
- 60, 60, 53, 61, 10, 33, 40, 7, -1, 8,
- 29, 60, 8, 60, 60, 15, 60, 51, 29, 29,
- 56, 60, 25, 8, 27, -1, -1, 25, 12, 27,
- 56, -1, 25, 12, 27, 38, -1, 25, 56, 27,
- 38, 56, 61, 62, 56, 38, -1, 12, 59, 55,
- 38, 61, 62, 29, 25, 25, 27, 27, 25, 8,
- 27, 15, 61, 62, -1, 61, 62, 38, 38, 15,
- 15, 38, 83, 57, 29, 8, 61, 62, 57, 63,
- 34, -1, 36, -1, 63, 61, 62, 8, 34, 34,
- 36, 36, 57, 18, 19, -1, 29, -1, 63, -1,
- 18, 19, 18, 19, 18, 19, 61, 62, 29, 22,
- -1, 60, -1, -1, -1, -1, 29, -1, -1, -1,
- 45, 46, -1, -1, -1, -1, 59, 45, 46, 45,
- 46, 45, 46, 23, 24, -1, -1, -1, 59, 25,
- -1, 27, 32, -1, -1, 35, 59, 37, -1, -1,
- 83, 22, 38, -1, -1, 23, 24, -1, 29, 72,
- -1, -1, 83, 31, 32, 23, 24, 35, 81, 37,
- 83, 84, -1, 31, 32, 23, 24, 35, -1, 37,
- -1, -1, -1, 31, 32, 23, 24, 35, 59, 37,
- -1, 22, -1, 31, 32, -1, -1, 35, 29, 37,
- -1, 72, 23, 24, -1, -1, -1, -1, -1, -1,
- 81, 32, 83, 84, 35, -1, 37, -1, -1, -1,
- -1, -1, -1, 22, 55, -1, -1, -1, 59, -1,
- 29, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 72, -1, -1, -1, -1, -1, -1, -1, -1,
- 81, -1, 83, 84, -1, -1, 55, -1, -1, -1,
- 59, -1, -1, -1, -1, -1, -1, 23, 24, -1,
- 12, 13, -1, 72, -1, 31, 32, -1, -1, 35,
- 22, 37, 81, -1, 83, 84, -1, 29, -1, -1,
- -1, 33, 34, -1, 36, -1, 12, 13, -1, -1,
- -1, 43, -1, -1, -1, 47, 22, -1, -1, -1,
- -1, -1, -1, 29, -1, -1, -1, 33, 34, -1,
- 36, -1, -1, 65, -1, 67, -1, 43, -1, -1,
- -1, 47, 3, -1, -1, -1, 78, 79, 80, -1,
- -1, -1, 13, -1, -1, -1, 17, -1, -1, 65,
- -1, 67, -1, -1, -1, 26, -1, 28, -1, -1,
- -1, -1, 78, 79, 80, -1, -1, -1, 39, 3,
- 41, 42, -1, -1, -1, -1, -1, -1, 49, 13,
- -1, 52, 53, 17, -1, -1, -1, 58, -1, -1,
- -1, -1, 26, 64, 28, -1, -1, 31, -1, -1,
- -1, -1, -1, -1, -1, 39, 77, 41, 42, -1,
- -1, -1, -1, -1, -1, 49, -1, 3, 52, 53,
- -1, -1, -1, -1, 58, -1, -1, 13, -1, -1,
- 64, 17, -1, -1, -1, -1, -1, -1, -1, -1,
- 26, -1, 28, 77, -1, -1, -1, -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, -1, -1, -1, -1, 64, -1,
+ 60, 29, 20, 76, 55, 55, 7, 36, 60, 76,
+ 48, 36, 1, 36, 48, 8, 29, 5, 8, 29,
+ 61, 8, 2, 60, 33, 33, 7, 29, 7, 33,
+ 61, 7, 7, 36, 29, 7, 7, 36, 16, 36,
+ 36, 7, 7, 2, 60, 29, 61, 33, 5, 5,
+ 8, 36, 29, 60, 48, 17, 2, 31, 7, 76,
+ 29, 29, 60, 36, 7, 29, 33, 17, 29, 1,
+ 33, 7, 55, 33, 29, 29, 2, 8, 60, 8,
+ 8, 29, 7, 36, 7, 1, 8, 29, 8, 36,
+ 7, 36, 33, 8, 29, 65, 48, 36, 36, 29,
+ 10, 7, -1, 8, 55, 8, 8, 8, 7, 36,
+ 29, 8, 8, 7, 6, 55, 15, 36, 42, 29,
+ 8, 15, 7, 8, 8, -1, 60, 33, 20, 53,
+ 74, 40, 8, 8, 8, -1, 40, 10, 7, 76,
+ 61, 62, 51, 61, 62, 8, 8, 51, 61, 62,
+ 40, 40, 8, 86, 56, -1, 61, 60, 8, 60,
+ 56, 51, 51, 60, 33, 8, -1, 50, 56, 29,
+ 12, 54, 56, 0, 61, 62, 29, 29, 15, 61,
+ 62, -1, 55, 8, 60, 60, 60, -1, -1, 61,
+ 62, 61, 62, 56, 61, 62, 50, 34, 60, 36,
+ 54, 61, 62, 15, 60, 12, -1, 59, 61, 62,
+ -1, 61, 62, -1, 25, 57, 27, -1, 61, 62,
+ 29, 63, 34, 12, 36, 29, 25, 38, 27, -1,
+ 25, 83, 27, 25, -1, 27, 61, 62, 25, 38,
+ 27, -1, 25, 38, 27, -1, 38, 25, -1, 27,
+ 57, 38, 61, 62, -1, 38, 63, 61, 62, 25,
+ 38, 27, 15, 25, 25, 27, 27, 25, 57, 27,
+ 8, 25, 38, 27, 63, -1, 38, 38, 18, 19,
+ 38, 34, 8, 36, 38, 18, 19, 18, 19, 18,
+ 19, 29, -1, -1, -1, 23, 24, -1, -1, -1,
+ -1, -1, -1, 29, 32, 45, 46, 35, -1, 37,
+ 23, 24, 45, 46, 45, 46, 45, 46, -1, 32,
+ -1, 59, 35, -1, 37, 23, 24, -1, -1, -1,
+ -1, -1, -1, 59, 32, -1, 25, 35, 27, 37,
+ -1, -1, 23, 24, -1, 83, -1, -1, -1, 38,
+ 31, 32, 23, 24, 35, -1, 37, 83, 22, -1,
+ 31, 32, 23, 24, 35, 29, 37, -1, 22, -1,
+ 31, 32, 23, 24, 35, 29, 37, -1, 22, -1,
+ 31, 32, 23, 24, 35, 29, 37, -1, -1, -1,
+ 31, 32, -1, -1, 35, 59, 37, 22, -1, -1,
+ 23, 24, -1, -1, 29, 59, -1, -1, 72, 32,
+ -1, 55, 35, -1, 37, 59, -1, 81, 72, 83,
+ -1, 85, -1, -1, -1, -1, -1, 81, 72, 83,
+ 55, 85, -1, -1, 59, -1, -1, 81, -1, 83,
+ -1, 85, -1, -1, -1, -1, -1, 72, -1, -1,
+ -1, -1, -1, -1, -1, -1, 81, -1, 83, -1,
+ 85, -1, -1, -1, 12, 13, 3, -1, -1, -1,
+ -1, -1, -1, -1, 22, -1, 13, -1, -1, -1,
+ 17, 29, -1, -1, -1, 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, -1, 67,
+ -1, 58, -1, -1, -1, -1, -1, 64, -1, -1,
+ 78, 79, 80, -1, -1, -1, -1, -1, -1, -1,
+ 77, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 12, 13, 3, -1, -1, -1, -1, -1, -1, -1,
+ 22, -1, 13, -1, -1, -1, 17, 29, -1, -1,
+ -1, 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, -1, 67, -1, 58, -1, -1,
+ -1, -1, -1, 64, -1, -1, 78, 79, 80, -1,
+ -1, -1, -1, -1, -1, -1, 77, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 13, -1,
+ -1, -1, 17, -1, -1, -1, -1, -1, -1, -1,
+ -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, -1, -1, 58, -1, -1, -1, -1, -1, 64,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 77, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 77, -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, -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, -1,
+ 67, -1, 69, -1, 71, -1, 73, -1, -1, -1,
+ -1, 78, 79, 80, -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, -1, 67, -1,
- 69, -1, 71, -1, 73, -1, -1, -1, -1, 78,
- 79, 80, -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, 56, -1, -1, -1, -1, -1,
- -1, -1, -1, 65, -1, 67, -1, 69, -1, 71,
- -1, 73, -1, -1, -1, -1, 78, 79, 80, -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, -1, 67, -1, 69, -1, 71, 72, 73, -1,
- -1, -1, -1, 78, 79, 80, -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, 56, -1,
- -1, -1, -1, -1, -1, -1, -1, 65, -1, 67,
- -1, 69, -1, 71, -1, 73, -1, -1, -1, -1,
- 78, 79, 80, -1, -1, -1, -1, -1, -1, -1,
+ 69, -1, 71, 72, 73, -1, -1, -1, -1, 78,
+ 79, 80, -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,
@@ -610,31 +612,47 @@ const int JavaScriptGrammar::action_check [] = {
-1, -1, -1, -1, -1, -1, -1, -1, 65, -1,
67, -1, 69, -1, 71, -1, 73, -1, -1, -1,
-1, 78, 79, 80, -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, -1, 70, 71, 72,
- 73, 74, 75, -1, -1, 78, 79, 80, 81, 82,
- 83, -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, 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, -1, 67, -1,
+ 69, -1, 71, -1, 73, -1, -1, -1, -1, 78,
+ 79, 80, -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, 56, -1, -1, -1, -1,
+ -1, -1, -1, -1, 65, -1, 67, -1, 69, -1,
+ 71, -1, 73, -1, -1, -1, -1, 78, 79, 80,
+ -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,
- 59, -1, -1, -1, -1, -1, 65, 66, 67, 68,
- -1, 70, 71, 72, 73, 74, 75, -1, -1, 78,
- 79, 80, 81, 82, 83, -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, 68, -1, 70, 71, 72, 73, 74,
- 75, -1, -1, 78, 79, 80, 81, 82, 83, -1,
+ -1, -1, -1, 59, -1, -1, -1, -1, -1, -1,
+ 66, 67, 68, -1, 70, 71, 72, 73, 74, 75,
+ -1, -1, 78, 79, 80, 81, 82, 83, -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, 59, -1,
+ -1, -1, -1, -1, 65, 66, 67, 68, -1, 70,
+ 71, 72, 73, 74, 75, -1, -1, 78, 79, 80,
+ 81, 82, 83, -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, 68, -1, 70, 71, 72, 73, 74, 75,
+ -1, -1, 78, 79, 80, 81, 82, 83, -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,
@@ -643,75 +661,74 @@ const int JavaScriptGrammar::action_check [] = {
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, -1, -1, 78, 79, 80,
- 81, 82, -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, -1,
- -1, 78, 79, 80, 81, 82, -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, -1, -1, 78, 79, 80, 81, 82,
- -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, -1, -1, 78,
- 79, 80, 81, 82, -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, -1, -1, 78, 79, 80, 81, 82, 83, -1,
- -1, -1, -1,
+ 81, 82, -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,
+ -1, -1, 78, 79, 80, 81, 82, -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, -1, -1, 78, 79, 80,
+ 81, 82, -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,
+ -1, -1, 78, 79, 80, 81, 82, -1, 84, -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, -1, -1, 78, 79, 80,
+ 81, 82, 83, -1, -1, -1, -1, -1,
- 72, 76, 12, 5, 72, 84, 11, 14, 12, 9,
- 11, 10, 9, 16, 12, 11, 11, 58, 89, 12,
- 9, 58, 54, 11, 78, 11, 20, 90, 20, 20,
- 20, 12, 11, 11, 11, 20, 12, 11, 11, 11,
- 23, 12, 11, 87, 12, 12, 58, 22, -1, 12,
- 20, -1, 12, 12, 20, 20, 20, 12, 20, 20,
- 12, 11, -1, 12, 12, 8, -1, 10, -1, 25,
- -1, 58, 28, 31, 31, 33, -1, 31, 31, 36,
- 31, -1, 36, 36, 31, 36, 31, 31, 33, 36,
- 31, 31, 31, 31, 31, 39, 37, 37, 37, 37,
- 31, 31, 33, 31, 12, 23, 24, 35, 45, 20,
- 31, 31, 33, 43, 31, 31, 27, 33, 35, 31,
- 7, 41, 31, 10, 33, 31, 31, 20, 31, 12,
- 36, 36, 35, 12, 27, 47, 31, 31, 33, 33,
- 31, 31, 31, 33, 33, 36, 12, 31, 12, 33,
- 31, 31, 33, 33, 25, 2, 31, 28, 33, 31,
- -1, 33, 31, 31, 31, 34, 34, 14, 31, 36,
- -1, -1, 55, 36, 31, 11, 55, 13, 6, 36,
- 31, -1, 31, 31, -1, 36, 14, 36, 36, 55,
- 6, 55, 11, 11, 13, 13, 31, 31, 14, -1,
- -1, 36, 36, -1, 53, 53, 31, 31, 42, 44,
- 31, 36, 36, 38, 38, 36, 31, 31, 31, 40,
- 31, 36, 36, 36, 31, 36, 31, 38, -1, 36,
- -1, 36, -1, -1, -1, 48, -1, -1, 53, 53,
- -1, 46, -1, -1, -1, -1, 53, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 22, 18, 56, 22, 14, 13, 24, 60, 13, 22,
+ 14, 13, 80, 14, 13, 22, 14, 5, 78, 22,
+ 16, 14, 22, 14, 60, 22, 9, 22, 22, 14,
+ 22, 92, 22, 14, 13, 13, 25, 9, 13, 10,
+ 9, 74, 86, 13, 60, 60, 14, 13, 13, 89,
+ 14, 14, 14, 14, 14, 13, 91, 14, 13, 13,
+ 13, -1, 74, 14, 14, 6, 33, 14, 8, 7,
+ 10, 38, 10, -1, 33, 16, -1, 33, 14, -1,
+ 36, 33, -1, 35, 33, 33, 35, 35, 47, 33,
+ 33, 33, 27, 36, 33, 30, 35, 27, -1, 33,
+ 30, 35, -1, 45, 33, 49, 33, 57, 33, 38,
+ 57, 38, 33, 38, 35, 33, 33, 33, 35, 33,
+ 38, 35, 33, 33, 35, 33, -1, 43, 33, 39,
+ 13, 39, 15, 38, 33, 33, 33, 33, 14, 38,
+ 38, 38, 33, 39, 35, 33, 33, 35, 33, 33,
+ 14, 35, 39, 38, 33, 33, 33, 35, -1, 33,
+ 22, 38, 41, 37, 22, 33, 33, 29, 35, 37,
+ 33, 29, 25, 26, 33, 38, 35, 2, 33, 33,
+ -1, 57, 37, 33, 38, -1, -1, 33, 38, -1,
+ 44, 16, 38, 57, 40, 33, 33, 13, 33, 15,
+ 38, 38, 33, 38, 33, 55, 13, 38, 15, 38,
+ 33, 46, -1, -1, -1, 38, 33, 55, 55, 48,
+ 33, 38, 33, 40, 55, 38, -1, 38, 33, 42,
+ -1, 33, 55, 38, -1, 40, 38, -1, 40, 50,
+ -1, -1, 6, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 16, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 91, -1, -1, -1, 96, -1, -1,
- -1, -1, 31, -1, -1, -1, -1, 36, -1, 38,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 98, -1, -1, -1, 93, -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};
diff --git a/src/declarative/qml/parser/javascriptgrammar_p.h b/src/declarative/qml/parser/javascriptgrammar_p.h
index 3412844..61a2eb0 100644
--- a/src/declarative/qml/parser/javascriptgrammar_p.h
+++ b/src/declarative/qml/parser/javascriptgrammar_p.h
@@ -59,8 +59,8 @@ class JavaScriptGrammar
public:
enum {
EOF_SYMBOL = 0,
- REDUCE_HERE = 87,
- SHIFT_THERE = 86,
+ REDUCE_HERE = 88,
+ SHIFT_THERE = 87,
T_AND = 1,
T_AND_AND = 2,
T_AND_EQ = 3,
@@ -95,7 +95,7 @@ public:
T_GT_GT_GT_EQ = 28,
T_IDENTIFIER = 29,
T_IF = 30,
- T_IMPORT = 85,
+ T_IMPORT = 86,
T_IN = 31,
T_INSTANCEOF = 32,
T_LBRACE = 33,
@@ -108,6 +108,7 @@ public:
T_MINUS = 40,
T_MINUS_EQ = 41,
T_MINUS_MINUS = 42,
+ T_MULTILINE_STRING_LITERAL = 84,
T_NEW = 43,
T_NOT = 44,
T_NOT_EQ = 45,
@@ -120,7 +121,7 @@ public:
T_PLUS = 51,
T_PLUS_EQ = 52,
T_PLUS_PLUS = 53,
- T_PUBLIC = 84,
+ T_PUBLIC = 85,
T_QUESTION = 54,
T_RBRACE = 55,
T_RBRACKET = 56,
@@ -147,15 +148,15 @@ public:
T_XOR = 76,
T_XOR_EQ = 77,
- ACCEPT_STATE = 526,
- RULE_COUNT = 300,
- STATE_COUNT = 527,
- TERMINAL_COUNT = 88,
- NON_TERMINAL_COUNT = 98,
+ ACCEPT_STATE = 531,
+ RULE_COUNT = 304,
+ STATE_COUNT = 532,
+ TERMINAL_COUNT = 89,
+ NON_TERMINAL_COUNT = 100,
- GOTO_INDEX_OFFSET = 527,
- GOTO_INFO_OFFSET = 1723,
- GOTO_CHECK_OFFSET = 1723
+ GOTO_INDEX_OFFSET = 532,
+ GOTO_INFO_OFFSET = 1798,
+ GOTO_CHECK_OFFSET = 1798
};
static const char *const spell [];
diff --git a/src/declarative/qml/parser/javascriptlexer.cpp b/src/declarative/qml/parser/javascriptlexer.cpp
index 81f0983..90f8e44 100644
--- a/src/declarative/qml/parser/javascriptlexer.cpp
+++ b/src/declarative/qml/parser/javascriptlexer.cpp
@@ -450,6 +450,7 @@ int JavaScript::Lexer::lex()
int token = 0;
state = Start;
ushort stringType = 0; // either single or double quotes
+ bool multiLineString = false;
pos8 = pos16 = 0;
done = false;
terminator = false;
@@ -499,6 +500,7 @@ int JavaScript::Lexer::lex()
} else if (current == '"' || current == '\'') {
recordStartPos();
state = InString;
+ multiLineString = false;
stringType = current;
} else if (isIdentLetter(current)) {
recordStartPos();
@@ -540,6 +542,9 @@ int JavaScript::Lexer::lex()
if (current == stringType) {
shift(1);
setDone(String);
+ } else if (isLineTerminator()) {
+ multiLineString = true;
+ record16(current);
} else if (current == 0 || isLineTerminator()) {
setDone(Bad);
err = UnclosedStringLiteral;
@@ -817,7 +822,7 @@ int JavaScript::Lexer::lex()
qsyylval.ustr = driver->intern(buffer16, pos16);
else
qsyylval.ustr = 0;
- return JavaScriptGrammar::T_STRING_LITERAL;
+ return multiLineString?JavaScriptGrammar::T_MULTILINE_STRING_LITERAL:JavaScriptGrammar::T_STRING_LITERAL;
case Number:
qsyylval.dval = dval;
return JavaScriptGrammar::T_NUMERIC_LITERAL;
diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp
index 137e2b0..58b7a5b 100644
--- a/src/declarative/qml/parser/javascriptparser.cpp
+++ b/src/declarative/qml/parser/javascriptparser.cpp
@@ -251,15 +251,27 @@ case 19: {
node->rbracketToken = loc(5);
sym(1).Node = node;
} break;
- case 20:
-case 21: {
+
+case 20: {
+ AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
+ node->literalToken = loc(1);
+ sym(1).Node = node;
+} break;
+
+case 22: {
+ AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
+ node->semicolonToken = loc(2);
+ sym(1).Node = node;
+} break;
+ case 23: case 24:
+case 25: {
AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(), sym(1).UiQualifiedId->finish(),
sym(3).Statement);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 22: {
+case 26: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
node->publicToken = loc(1);
node->attributeTypeToken = loc(2);
@@ -267,7 +279,7 @@ case 22: {
sym(1).Node = node;
} break;
-case 23: {
+case 27: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
node->isDefaultMember = true;
node->publicToken = loc(1);
@@ -276,7 +288,7 @@ case 23: {
sym(1).Node = node;
} break;
-case 24: {
+case 28: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
sym(5).Expression);
node->publicToken = loc(1);
@@ -286,7 +298,7 @@ case 24: {
sym(1).Node = node;
} break;
-case 25: {
+case 29: {
AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
sym(6).Expression);
node->isDefaultMember = true;
@@ -297,78 +309,78 @@ case 25: {
sym(1).Node = node;
} break;
-case 26: {
+case 30: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 27: {
+case 31: {
sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
} break;
-case 28:
+case 32:
-case 29:
+case 33:
{
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 30: {
+case 34: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 31: {
+case 35: {
AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), sym(1).UiQualifiedId, sym(3).sval);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 32: {
+case 36: {
AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
node->thisToken = loc(1);
sym(1).Node = node;
} break;
-case 33: {
+case 37: {
AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 34: {
+case 38: {
AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
node->nullToken = loc(1);
sym(1).Node = node;
} break;
-case 35: {
+case 39: {
AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
node->trueToken = loc(1);
sym(1).Node = node;
} break;
-case 36: {
+case 40: {
AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
node->falseToken = loc(1);
sym(1).Node = node;
} break;
-case 37: {
+case 41: {
AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 38: {
+case 42: {
AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
node->literalToken = loc(1);
sym(1).Node = node;
} break;
-case 39: {
+case 43: {
bool rx = lexer->scanRegExp(Lexer::NoPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
@@ -380,7 +392,7 @@ case 39: {
sym(1).Node = node;
} break;
-case 40: {
+case 44: {
bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
if (!rx) {
diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, lexer->startLineNo(),
@@ -392,21 +404,21 @@ case 40: {
sym(1).Node = node;
} break;
-case 41: {
+case 45: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision);
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 42: {
+case 46: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
node->lbracketToken = loc(1);
node->rbracketToken = loc(3);
sym(1).Node = node;
} break;
-case 43: {
+case 47: {
AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (), sym(4).Elision);
node->lbracketToken = loc(1);
node->commaToken = loc(3);
@@ -414,7 +426,7 @@ case 43: {
sym(1).Node = node;
} break;
-case 44: {
+case 48: {
AST::ObjectLiteral *node = 0;
if (sym(2).Node)
node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
@@ -426,7 +438,7 @@ case 44: {
sym(1).Node = node;
} break;
-case 45: {
+case 49: {
AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
sym(2).PropertyNameAndValueList->finish ());
node->lbraceToken = loc(1);
@@ -434,51 +446,51 @@ case 45: {
sym(1).Node = node;
} break;
-case 46: {
+case 50: {
AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
node->lparenToken = loc(1);
node->rparenToken = loc(3);
sym(1).Node = node;
} break;
-case 47: {
+case 51: {
sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision, sym(2).Expression);
} break;
-case 48: {
+case 52: {
AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision, sym(4).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 49: {
+case 53: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
node->commaToken = loc(1);
sym(1).Node = node;
} break;
-case 50: {
+case 54: {
AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 51: {
+case 55: {
sym(1).Node = 0;
} break;
-case 52: {
+case 56: {
sym(1).Elision = sym(1).Elision->finish ();
} break;
-case 53: {
+case 57: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyName, sym(3).Expression);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 54: {
+case 58: {
AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
node->commaToken = loc(2);
@@ -486,38 +498,30 @@ case 54: {
sym(1).Node = node;
} break;
-case 55: {
+case 59: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 56: {
+case 60: {
AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 57: {
+case 61: {
AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 58: {
+case 62: {
AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
node->propertyNameToken = loc(1);
sym(1).Node = node;
} break;
-case 59:
-
-case 60:
-
-case 61:
-
-case 62:
-
case 63:
case 64:
@@ -571,25 +575,33 @@ case 87:
case 88:
case 89:
+
+case 90:
+
+case 91:
+
+case 92:
+
+case 93:
{
sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
} break;
-case 94: {
+case 98: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 95: {
+case 99: {
AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 96: {
+case 100: {
AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
node->newToken = loc(1);
node->lparenToken = loc(3);
@@ -597,384 +609,384 @@ case 96: {
sym(1).Node = node;
} break;
-case 98: {
+case 102: {
AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
node->newToken = loc(1);
sym(1).Node = node;
} break;
-case 99: {
+case 103: {
AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 100: {
+case 104: {
AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
node->lparenToken = loc(2);
node->rparenToken = loc(4);
sym(1).Node = node;
} break;
-case 101: {
+case 105: {
AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->lbracketToken = loc(2);
node->rbracketToken = loc(4);
sym(1).Node = node;
} break;
-case 102: {
+case 106: {
AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
node->dotToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 103: {
+case 107: {
sym(1).Node = 0;
} break;
-case 104: {
+case 108: {
sym(1).Node = sym(1).ArgumentList->finish();
} break;
-case 105: {
+case 109: {
sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
} break;
-case 106: {
+case 110: {
AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 110: {
+case 114: {
AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
node->incrementToken = loc(2);
sym(1).Node = node;
} break;
-case 111: {
+case 115: {
AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
node->decrementToken = loc(2);
sym(1).Node = node;
} break;
-case 113: {
+case 117: {
AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
node->deleteToken = loc(1);
sym(1).Node = node;
} break;
-case 114: {
+case 118: {
AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
node->voidToken = loc(1);
sym(1).Node = node;
} break;
-case 115: {
+case 119: {
AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
node->typeofToken = loc(1);
sym(1).Node = node;
} break;
-case 116: {
+case 120: {
AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
node->incrementToken = loc(1);
sym(1).Node = node;
} break;
-case 117: {
+case 121: {
AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
node->decrementToken = loc(1);
sym(1).Node = node;
} break;
-case 118: {
+case 122: {
AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
node->plusToken = loc(1);
sym(1).Node = node;
} break;
-case 119: {
+case 123: {
AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
node->minusToken = loc(1);
sym(1).Node = node;
} break;
-case 120: {
+case 124: {
AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
node->tildeToken = loc(1);
sym(1).Node = node;
} break;
-case 121: {
+case 125: {
AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
node->notToken = loc(1);
sym(1).Node = node;
} break;
-case 123: {
+case 127: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mul, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 124: {
+case 128: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Div, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 125: {
+case 129: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Mod, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 127: {
+case 131: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Add, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 128: {
+case 132: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Sub, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 130: {
+case 134: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::LShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 131: {
+case 135: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::RShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 132: {
+case 136: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::URShift, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 134: {
+case 138: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 135: {
+case 139: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 136: {
+case 140: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 137: {
+case 141: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 138: {
+case 142: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 139: {
+case 143: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::In, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 141: {
+case 145: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Lt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 142: {
+case 146: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Gt, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 143: {
+case 147: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Le, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 144: {
+case 148: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Ge, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 145: {
+case 149: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::InstanceOf, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 147: {
+case 151: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 148: {
+case 152: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 149: {
+case 153: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 150: {
+case 154: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 152: {
+case 156: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Equal, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 153: {
+case 157: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::NotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 154: {
+case 158: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 155: {
+case 159: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::StrictNotEqual, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 157: {
+case 161: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 159: {
+case 163: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitAnd, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 161: {
+case 165: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 163: {
+case 167: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitXor, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 165: {
+case 169: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 167: {
+case 171: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::BitOr, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 169: {
+case 173: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 171: {
+case 175: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::And, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 173: {
+case 177: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Or, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 175: {
+case 179: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
QSOperator::Or, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 177: {
+case 181: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -982,7 +994,7 @@ case 177: {
sym(1).Node = node;
} break;
-case 179: {
+case 183: {
AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
sym(3).Expression, sym(5).Expression);
node->questionToken = loc(2);
@@ -990,112 +1002,112 @@ case 179: {
sym(1).Node = node;
} break;
-case 181: {
+case 185: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 183: {
+case 187: {
AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
sym(2).ival, sym(3).Expression);
node->operatorToken = loc(2);
sym(1).Node = node;
} break;
-case 184: {
+case 188: {
sym(1).ival = QSOperator::Assign;
} break;
-case 185: {
+case 189: {
sym(1).ival = QSOperator::InplaceMul;
} break;
-case 186: {
+case 190: {
sym(1).ival = QSOperator::InplaceDiv;
} break;
-case 187: {
+case 191: {
sym(1).ival = QSOperator::InplaceMod;
} break;
-case 188: {
+case 192: {
sym(1).ival = QSOperator::InplaceAdd;
} break;
-case 189: {
+case 193: {
sym(1).ival = QSOperator::InplaceSub;
} break;
-case 190: {
+case 194: {
sym(1).ival = QSOperator::InplaceLeftShift;
} break;
-case 191: {
+case 195: {
sym(1).ival = QSOperator::InplaceRightShift;
} break;
-case 192: {
+case 196: {
sym(1).ival = QSOperator::InplaceURightShift;
} break;
-case 193: {
+case 197: {
sym(1).ival = QSOperator::InplaceAnd;
} break;
-case 194: {
+case 198: {
sym(1).ival = QSOperator::InplaceXor;
} break;
-case 195: {
+case 199: {
sym(1).ival = QSOperator::InplaceOr;
} break;
-case 197: {
+case 201: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 198: {
+case 202: {
sym(1).Node = 0;
} break;
-case 201: {
+case 205: {
AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 202: {
+case 206: {
sym(1).Node = 0;
} break;
-case 219: {
+case 223: {
AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 220: {
+case 224: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
} break;
-case 221: {
+case 225: {
sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
} break;
-case 222: {
+case 226: {
sym(1).Node = 0;
} break;
-case 223: {
+case 227: {
sym(1).Node = sym(1).StatementList->finish ();
} break;
-case 225: {
+case 229: {
AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
node->declarationKindToken = loc(1);
@@ -1103,76 +1115,76 @@ case 225: {
sym(1).Node = node;
} break;
-case 226: {
+case 230: {
sym(1).ival = T_CONST;
} break;
-case 227: {
+case 231: {
sym(1).ival = T_VAR;
} break;
-case 228: {
+case 232: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 229: {
+case 233: {
AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
node->commaToken = loc(2);
sym(1).Node = node;
} break;
-case 230: {
+case 234: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
} break;
-case 231: {
+case 235: {
sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
} break;
-case 232: {
+case 236: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 233: {
+case 237: {
AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 234: {
+case 238: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 235: {
+case 239: {
sym(1).Node = 0;
} break;
-case 237: {
+case 241: {
// ### TODO: AST for initializer
sym(1) = sym(2);
} break;
-case 238: {
+case 242: {
sym(1).Node = 0;
} break;
-case 240: {
+case 244: {
AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
node->semicolonToken = loc(1);
sym(1).Node = node;
} break;
-case 242: {
+case 246: {
AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 243: {
+case 247: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1181,7 +1193,7 @@ case 243: {
sym(1).Node = node;
} break;
-case 244: {
+case 248: {
AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->ifToken = loc(1);
node->lparenToken = loc(2);
@@ -1189,7 +1201,7 @@ case 244: {
sym(1).Node = node;
} break;
-case 246: {
+case 250: {
AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
node->doToken = loc(1);
node->whileToken = loc(3);
@@ -1199,7 +1211,7 @@ case 246: {
sym(1).Node = node;
} break;
-case 247: {
+case 251: {
AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->whileToken = loc(1);
node->lparenToken = loc(2);
@@ -1207,7 +1219,7 @@ case 247: {
sym(1).Node = node;
} break;
-case 248: {
+case 252: {
AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Expression, sym(9).Statement);
node->forToken = loc(1);
@@ -1218,7 +1230,7 @@ case 248: {
sym(1).Node = node;
} break;
-case 249: {
+case 253: {
AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
sym(8).Expression, sym(10).Statement);
@@ -1231,7 +1243,7 @@ case 249: {
sym(1).Node = node;
} break;
-case 250: {
+case 254: {
AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
sym(5).Expression, sym(7).Statement);
node->forToken = loc(1);
@@ -1241,7 +1253,7 @@ case 250: {
sym(1).Node = node;
} break;
-case 251: {
+case 255: {
AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
node->forToken = loc(1);
@@ -1252,14 +1264,14 @@ case 251: {
sym(1).Node = node;
} break;
-case 253: {
+case 257: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
node->continueToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 255: {
+case 259: {
AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
node->continueToken = loc(1);
node->identifierToken = loc(2);
@@ -1267,14 +1279,14 @@ case 255: {
sym(1).Node = node;
} break;
-case 257: {
+case 261: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
node->breakToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 259: {
+case 263: {
AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
node->breakToken = loc(1);
node->identifierToken = loc(2);
@@ -1282,14 +1294,14 @@ case 259: {
sym(1).Node = node;
} break;
-case 261: {
+case 265: {
AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
node->returnToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 262: {
+case 266: {
AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
node->withToken = loc(1);
node->lparenToken = loc(2);
@@ -1297,7 +1309,7 @@ case 262: {
sym(1).Node = node;
} break;
-case 263: {
+case 267: {
AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
node->switchToken = loc(1);
node->lparenToken = loc(2);
@@ -1305,83 +1317,83 @@ case 263: {
sym(1).Node = node;
} break;
-case 264: {
+case 268: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(3);
sym(1).Node = node;
} break;
-case 265: {
+case 269: {
AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
node->lbraceToken = loc(1);
node->rbraceToken = loc(5);
sym(1).Node = node;
} break;
-case 266: {
+case 270: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
} break;
-case 267: {
+case 271: {
sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
} break;
-case 268: {
+case 272: {
sym(1).Node = 0;
} break;
-case 269: {
+case 273: {
sym(1).Node = sym(1).CaseClauses->finish ();
} break;
-case 270: {
+case 274: {
AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
node->caseToken = loc(1);
node->colonToken = loc(3);
sym(1).Node = node;
} break;
-case 271: {
+case 275: {
AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
node->defaultToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 272: {
+case 276: {
AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
node->identifierToken = loc(1);
node->colonToken = loc(2);
sym(1).Node = node;
} break;
-case 274: {
+case 278: {
AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
node->throwToken = loc(1);
node->semicolonToken = loc(3);
sym(1).Node = node;
} break;
-case 275: {
+case 279: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 276: {
+case 280: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 277: {
+case 281: {
AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
node->tryToken = loc(1);
sym(1).Node = node;
} break;
-case 278: {
+case 282: {
AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
node->catchToken = loc(1);
node->lparenToken = loc(2);
@@ -1390,20 +1402,20 @@ case 278: {
sym(1).Node = node;
} break;
-case 279: {
+case 283: {
AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
node->finallyToken = loc(1);
sym(1).Node = node;
} break;
-case 281: {
+case 285: {
AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
node->debuggerToken = loc(1);
node->semicolonToken = loc(2);
sym(1).Node = node;
} break;
-case 282: {
+case 286: {
AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
node->identifierToken = loc(2);
@@ -1414,7 +1426,7 @@ case 282: {
sym(1).Node = node;
} break;
-case 283: {
+case 287: {
AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
node->functionToken = loc(1);
if (sym(2).sval)
@@ -1426,56 +1438,56 @@ case 283: {
sym(1).Node = node;
} break;
-case 284: {
+case 288: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
node->identifierToken = loc(1);
sym(1).Node = node;
} break;
-case 285: {
+case 289: {
AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval);
node->commaToken = loc(2);
node->identifierToken = loc(3);
sym(1).Node = node;
} break;
-case 286: {
+case 290: {
sym(1).Node = 0;
} break;
-case 287: {
+case 291: {
sym(1).Node = sym(1).FormalParameterList->finish ();
} break;
-case 288: {
+case 292: {
sym(1).Node = 0;
} break;
-case 290: {
+case 294: {
sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
} break;
-case 291: {
+case 295: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
} break;
-case 292: {
+case 296: {
sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
} break;
-case 293: {
+case 297: {
sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
} break;
-case 294: {
+case 298: {
sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
} break;
-case 295: {
+case 299: {
sym(1).sval = 0;
} break;
-case 297: {
+case 301: {
sym(1).Node = 0;
} break;
diff --git a/src/declarative/qml/parser/javascriptparser_p.h b/src/declarative/qml/parser/javascriptparser_p.h
index e91286d..34f41a8 100644
--- a/src/declarative/qml/parser/javascriptparser_p.h
+++ b/src/declarative/qml/parser/javascriptparser_p.h
@@ -206,9 +206,9 @@ protected:
};
-#define J_SCRIPT_REGEXPLITERAL_RULE1 39
+#define J_SCRIPT_REGEXPLITERAL_RULE1 43
-#define J_SCRIPT_REGEXPLITERAL_RULE2 40
+#define J_SCRIPT_REGEXPLITERAL_RULE2 44
QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp
index 998166a..8e5ae69 100644
--- a/src/declarative/util/qmlfollow.cpp
+++ b/src/declarative/util/qmlfollow.cpp
@@ -55,7 +55,7 @@ class QmlFollowPrivate : public QObjectPrivate
public:
QmlFollowPrivate()
: sourceValue(0), maxVelocity(0), lastTime(0)
- , mass(1.0), spring(0.), damping(0.), velocity(0), enabled(true), mode(Track), clock(this) {}
+ , mass(1.0), spring(0.), damping(0.), velocity(0), epsilon(0.005), enabled(true), mode(Track), clock(this) {}
QmlMetaProperty property;
qreal currentValue;
@@ -67,6 +67,7 @@ public:
qreal spring;
qreal damping;
qreal velocity;
+ qreal epsilon;
bool enabled;
enum Mode {
@@ -111,7 +112,7 @@ void QmlFollowPrivate::tick(int time)
}
currentValue += velocity * 10.0 / 1000.0;
}
- if (qAbs(velocity) < 0.5 && qAbs(sourceValue - currentValue) < 0.5) {
+ if (qAbs(velocity) < epsilon && qAbs(sourceValue - currentValue) < epsilon) {
velocity = 0.0;
currentValue = sourceValue;
clock.stop();
@@ -300,6 +301,30 @@ void QmlFollow::setDamping(qreal damping)
d->damping = damping;
}
+
+/*!
+ \qmlproperty qreal Follow::epsilon
+ This property holds the spring epsilon
+
+ The epsilon is the rate and amount of change in the value which is close enough
+ to 0 to be considered equal to zero. This will depend on the usage of the value.
+ For pixel positions, 0.25 would suffice. For scale, 0.005 will suffice.
+
+ The default is 0.005. Small performance improvements can result in tuning this
+ value.
+*/
+qreal QmlFollow::epsilon() const
+{
+ Q_D(const QmlFollow);
+ return d->epsilon;
+}
+
+void QmlFollow::setEpsilon(qreal epsilon)
+{
+ Q_D(QmlFollow);
+ d->epsilon = epsilon;
+}
+
/*!
\qmlproperty qreal Follow::followValue
The current value.
diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h
index aac4c01..bd9363a 100644
--- a/src/declarative/util/qmlfollow.h
+++ b/src/declarative/util/qmlfollow.h
@@ -63,6 +63,7 @@ class Q_DECLARATIVE_EXPORT QmlFollow : public QmlPropertyValueSource,
Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity);
Q_PROPERTY(qreal spring READ spring WRITE setSpring);
Q_PROPERTY(qreal damping READ damping WRITE setDamping);
+ Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon);
Q_PROPERTY(bool enabled READ enabled WRITE setEnabled);
Q_PROPERTY(qreal followValue READ value NOTIFY valueChanged);
@@ -80,6 +81,8 @@ public:
void setSpring(qreal spring);
qreal damping() const;
void setDamping(qreal damping);
+ qreal epsilon() const;
+ void setEpsilon(qreal epsilon);
bool enabled() const;
void setEnabled(bool enabled);
generated by cgit v0.12 at 2024-12-26 07:01:07 (GMT)