#4 Added range operator

pkg/compiler/compiler_test.go

@@ -1395,6 +1395,59 @@ func TestTernaryOperator(t *testing.T) {
 	})
 }
 
+func TestRangeOperator(t *testing.T) {
+	Convey("Should compile RETURN 1..10", t, func() {
+		c := compiler.New()
+
+		prog, err := c.Compile(`
+				RETURN 1..10
+			`)
+
+		So(err, ShouldBeNil)
+
+		out, err := prog.Run(context.Background())
+
+		So(err, ShouldBeNil)
+
+		So(string(out), ShouldEqual, `[1,2,3,4,5,6,7,8,9,10]`)
+	})
+
+	Convey("Should compile FOR i IN 1..10 RETURN i * 2", t, func() {
+		c := compiler.New()
+
+		prog, err := c.Compile(`
+				FOR i IN 1..10
+					RETURN i * 2
+			`)
+
+		So(err, ShouldBeNil)
+
+		out, err := prog.Run(context.Background())
+
+		So(err, ShouldBeNil)
+
+		So(string(out), ShouldEqual, `[2,4,6,8,10,12,14,16,18,20]`)
+	})
+
+	Convey("Should compile LET arr = 1..10 FOR i IN arr RETURN i * 2", t, func() {
+		c := compiler.New()
+
+		prog, err := c.Compile(`
+				LET arr = 1..10
+				FOR i IN arr
+					RETURN i * 2
+			`)
+
+		So(err, ShouldBeNil)
+
+		out, err := prog.Run(context.Background())
+
+		So(err, ShouldBeNil)
+
+		So(string(out), ShouldEqual, `[2,4,6,8,10,12,14,16,18,20]`)
+	})
+}
+
 //func TestHtml(t *testing.T) {
 //	Convey("Should load a document", t, func() {
 //		c := compiler.New()

pkg/compiler/visitor.go

@@ -379,6 +379,12 @@ func (v *visitor) doVisitForExpressionSource(ctx *fql.ForExpressionSourceContext
 		return v.doVisitMemberExpression(memberExp.(*fql.MemberExpressionContext), scope)
 	}
 
+	rangeOp := ctx.RangeOperator()
+
+	if rangeOp != nil {
+		return v.doVisitRangeOperator(rangeOp.(*fql.RangeOperatorContext), scope)
+	}
+
 	return nil, core.Error(ErrInvalidDataSource, ctx.GetText())
 }
 
@@ -626,6 +632,28 @@ func (v *visitor) doVisitVariableDeclaration(ctx *fql.VariableDeclarationContext
 	)
 }
 
+func (v *visitor) doVisitRangeOperator(ctx *fql.RangeOperatorContext, scope *scope) (collections.IterableExpression, error) {
+	ints := ctx.AllIntegerLiteral()
+
+	left, err := v.doVisitIntegerLiteral(ints[0].(*fql.IntegerLiteralContext))
+
+	if err != nil {
+		return nil, err
+	}
+
+	right, err := v.doVisitIntegerLiteral(ints[1].(*fql.IntegerLiteralContext))
+
+	if err != nil {
+		return nil, err
+	}
+
+	return operators.NewRangeOperator(
+		v.getSourceMap(ctx),
+		left,
+		right,
+	)
+}
+
 func (v *visitor) doVisitChildren(node antlr.RuleNode, scope *scope) ([]core.Expression, error) {
 	children := node.GetChildren()
 
@@ -787,6 +815,12 @@ func (v *visitor) doVisitExpression(ctx *fql.ExpressionContext, scope *scope) (c
 		)
 	}
 
+	rangeOp := ctx.RangeOperator()
+
+	if rangeOp != nil {
+		return v.doVisitRangeOperator(rangeOp.(*fql.RangeOperatorContext), scope)
+	}
+
 	seq := ctx.ExpressionSequence()
 
 	if seq != nil {

pkg/parser/antlr/FqlLexer.g4

@@ -9,9 +9,8 @@ LineTerminator: [\r\n\u2028\u2029] -> channel(HIDDEN);
 // Punctuation
 Colon: ':';
 SemiColon: ';';
-Comma: ',';
 Dot: '.';
-Ellipsis: '...';
+Comma: ',';
 OpenBracket: '[';
 CloseBracket: ']';
 OpenParen: '(';
@@ -41,8 +40,8 @@ And: 'AND' | '&&';
 Or: 'OR' | '||';
 
 // Other operators
+Range: Dot Dot;
 Assign: '=';
-Range: '..';
 QuestionMark: '?';
 RegexNotMatch: '!~';
 RegexMatch: '=~';
@@ -81,8 +80,7 @@ Identifier: Letter+ (Digit)*;
 StringLiteral: SQString | DQSring;
 IntegerLiteral: [0-9]+;
 FloatLiteral
-    : DecimalIntegerLiteral '.' [0-9]* ExponentPart?
-    | '.' [0-9]+ ExponentPart?
+    : DecimalIntegerLiteral Dot [0-9]+ ExponentPart?
     | DecimalIntegerLiteral ExponentPart?
     ;
 

pkg/parser/antlr/FqlLexer.tokens

@@ -4,106 +4,103 @@ WhiteSpaces=3
 LineTerminator=4
 Colon=5
 SemiColon=6
-Comma=7
-Dot=8
-Ellipsis=9
-OpenBracket=10
-CloseBracket=11
-OpenParen=12
-CloseParen=13
-OpenBrace=14
-CloseBrace=15
-Gt=16
-Lt=17
-Eq=18
-Gte=19
-Lte=20
-Neq=21
-Plus=22
-Minus=23
-MinusMinus=24
-PlusPlus=25
-Multi=26
-Div=27
-Mod=28
-And=29
-Or=30
+Dot=7
+Comma=8
+OpenBracket=9
+CloseBracket=10
+OpenParen=11
+CloseParen=12
+OpenBrace=13
+CloseBrace=14
+Gt=15
+Lt=16
+Eq=17
+Gte=18
+Lte=19
+Neq=20
+Plus=21
+Minus=22
+MinusMinus=23
+PlusPlus=24
+Multi=25
+Div=26
+Mod=27
+And=28
+Or=29
+Range=30
 Assign=31
-Range=32
-QuestionMark=33
-RegexNotMatch=34
-RegexMatch=35
-For=36
-Return=37
-Distinct=38
-Filter=39
-Sort=40
-Limit=41
-Let=42
-Collect=43
-SortDirection=44
-None=45
-Null=46
-BooleanLiteral=47
-Into=48
-Keep=49
-With=50
-Count=51
-All=52
-Any=53
-Aggregate=54
-Like=55
-Not=56
-In=57
-Identifier=58
-StringLiteral=59
-IntegerLiteral=60
-FloatLiteral=61
+QuestionMark=32
+RegexNotMatch=33
+RegexMatch=34
+For=35
+Return=36
+Distinct=37
+Filter=38
+Sort=39
+Limit=40
+Let=41
+Collect=42
+SortDirection=43
+None=44
+Null=45
+BooleanLiteral=46
+Into=47
+Keep=48
+With=49
+Count=50
+All=51
+Any=52
+Aggregate=53
+Like=54
+Not=55
+In=56
+Identifier=57
+StringLiteral=58
+IntegerLiteral=59
+FloatLiteral=60
 ':'=5
 ';'=6
-','=7
-'.'=8
-'...'=9
-'['=10
-']'=11
-'('=12
-')'=13
-'{'=14
-'}'=15
-'>'=16
-'<'=17
-'=='=18
-'>='=19
-'<='=20
-'!='=21
-'+'=22
-'-'=23
-'--'=24
-'++'=25
-'*'=26
-'/'=27
-'%'=28
+'.'=7
+','=8
+'['=9
+']'=10
+'('=11
+')'=12
+'{'=13
+'}'=14
+'>'=15
+'<'=16
+'=='=17
+'>='=18
+'<='=19
+'!='=20
+'+'=21
+'-'=22
+'--'=23
+'++'=24
+'*'=25
+'/'=26
+'%'=27
 '='=31
-'..'=32
-'?'=33
-'!~'=34
-'=~'=35
-'FOR'=36
-'RETURN'=37
-'DISTINCT'=38
-'FILTER'=39
-'SORT'=40
-'LIMIT'=41
-'LET'=42
-'COLLECT'=43
-'NONE'=45
-'NULL'=46
-'INTO'=48
-'KEEP'=49
-'WITH'=50
-'COUNT'=51
-'ALL'=52
-'ANY'=53
-'AGGREGATE'=54
-'LIKE'=55
-'IN'=57
+'?'=32
+'!~'=33
+'=~'=34
+'FOR'=35
+'RETURN'=36
+'DISTINCT'=37
+'FILTER'=38
+'SORT'=39
+'LIMIT'=40
+'LET'=41
+'COLLECT'=42
+'NONE'=44
+'NULL'=45
+'INTO'=47
+'KEEP'=48
+'WITH'=49
+'COUNT'=50
+'ALL'=51
+'ANY'=52
+'AGGREGATE'=53
+'LIKE'=54
+'IN'=56

pkg/parser/antlr/FqlParser.g4

@@ -46,6 +46,7 @@ forExpressionSource
     | objectLiteral
     | variable
     | memberExpression
+    | rangeOperator
     ;
 
 forExpressionClause
@@ -64,7 +65,7 @@ limitClause
     ;
 
 sortClause
-    : Sort sortClauseExpression (',' sortClauseExpression)*
+    : Sort sortClauseExpression (Comma sortClauseExpression)*
     ;
 
 sortClauseExpression
@@ -129,6 +130,10 @@ variable
     : Identifier
     ;
 
+rangeOperator
+    : integerLiteral Range integerLiteral
+    ;
+
 arrayLiteral
     : OpenBracket arrayElementList? CloseBracket
     ;
@@ -211,6 +216,7 @@ expression
     | Minus expression
     | Not expression
     | expression QuestionMark expression? Colon expression
+    | rangeOperator
     | stringLiteral
     | integerLiteral
     | floatLiteral
@@ -222,28 +228,6 @@ expression
     | noneLiteral
     ;
 
-reservedWord
-    : keyword
-    ;
-
-keyword
-    : Return
-    | In
-    | Filter
-    | Sort
-    | SortDirection
-    | Limit
-    | Let
-    | Collect
-    | Distinct
-    | BooleanLiteral
-    | None
-    | Null
-    | All
-    | Any
-    | Aggregate
-    ;
-
 equalityOperator
     : Gt
     | Lt

pkg/parser/fql/FqlLexer.tokens

@@ -4,106 +4,103 @@ WhiteSpaces=3
 LineTerminator=4
 Colon=5
 SemiColon=6
-Comma=7
-Dot=8
-Ellipsis=9
-OpenBracket=10
-CloseBracket=11
-OpenParen=12
-CloseParen=13
-OpenBrace=14
-CloseBrace=15
-Gt=16
-Lt=17
-Eq=18
-Gte=19
-Lte=20
-Neq=21
-Plus=22
-Minus=23
-MinusMinus=24
-PlusPlus=25
-Multi=26
-Div=27
-Mod=28
-And=29
-Or=30
+Dot=7
+Comma=8
+OpenBracket=9
+CloseBracket=10
+OpenParen=11
+CloseParen=12
+OpenBrace=13
+CloseBrace=14
+Gt=15
+Lt=16
+Eq=17
+Gte=18
+Lte=19
+Neq=20
+Plus=21
+Minus=22
+MinusMinus=23
+PlusPlus=24
+Multi=25
+Div=26
+Mod=27
+And=28
+Or=29
+Range=30
 Assign=31
-Range=32
-QuestionMark=33
-RegexNotMatch=34
-RegexMatch=35
-For=36
-Return=37
-Distinct=38
-Filter=39
-Sort=40
-Limit=41
-Let=42
-Collect=43
-SortDirection=44
-None=45
-Null=46
-BooleanLiteral=47
-Into=48
-Keep=49
-With=50
-Count=51
-All=52
-Any=53
-Aggregate=54
-Like=55
-Not=56
-In=57
-Identifier=58
-StringLiteral=59
-IntegerLiteral=60
-FloatLiteral=61
+QuestionMark=32
+RegexNotMatch=33
+RegexMatch=34
+For=35
+Return=36
+Distinct=37
+Filter=38
+Sort=39
+Limit=40
+Let=41
+Collect=42
+SortDirection=43
+None=44
+Null=45
+BooleanLiteral=46
+Into=47
+Keep=48
+With=49
+Count=50
+All=51
+Any=52
+Aggregate=53
+Like=54
+Not=55
+In=56
+Identifier=57
+StringLiteral=58
+IntegerLiteral=59
+FloatLiteral=60
 ':'=5
 ';'=6
-','=7
-'.'=8
-'...'=9
-'['=10
-']'=11
-'('=12
-')'=13
-'{'=14
-'}'=15
-'>'=16
-'<'=17
-'=='=18
-'>='=19
-'<='=20
-'!='=21
-'+'=22
-'-'=23
-'--'=24
-'++'=25
-'*'=26
-'/'=27
-'%'=28
+'.'=7
+','=8
+'['=9
+']'=10
+'('=11
+')'=12
+'{'=13
+'}'=14
+'>'=15
+'<'=16
+'=='=17
+'>='=18
+'<='=19
+'!='=20
+'+'=21
+'-'=22
+'--'=23
+'++'=24
+'*'=25
+'/'=26
+'%'=27
 '='=31
-'..'=32
-'?'=33
-'!~'=34
-'=~'=35
-'FOR'=36
-'RETURN'=37
-'DISTINCT'=38
-'FILTER'=39
-'SORT'=40
-'LIMIT'=41
-'LET'=42
-'COLLECT'=43
-'NONE'=45
-'NULL'=46
-'INTO'=48
-'KEEP'=49
-'WITH'=50
-'COUNT'=51
-'ALL'=52
-'ANY'=53
-'AGGREGATE'=54
-'LIKE'=55
-'IN'=57
+'?'=32
+'!~'=33
+'=~'=34
+'FOR'=35
+'RETURN'=36
+'DISTINCT'=37
+'FILTER'=38
+'SORT'=39
+'LIMIT'=40
+'LET'=41
+'COLLECT'=42
+'NONE'=44
+'NULL'=45
+'INTO'=47
+'KEEP'=48
+'WITH'=49
+'COUNT'=50
+'ALL'=51
+'ANY'=52
+'AGGREGATE'=53
+'LIKE'=54
+'IN'=56

pkg/parser/fql/FqlParser.tokens

@@ -4,106 +4,103 @@ WhiteSpaces=3
 LineTerminator=4
 Colon=5
 SemiColon=6
-Comma=7
-Dot=8
-Ellipsis=9
-OpenBracket=10
-CloseBracket=11
-OpenParen=12
-CloseParen=13
-OpenBrace=14
-CloseBrace=15
-Gt=16
-Lt=17
-Eq=18
-Gte=19
-Lte=20
-Neq=21
-Plus=22
-Minus=23
-MinusMinus=24
-PlusPlus=25
-Multi=26
-Div=27
-Mod=28
-And=29
-Or=30
+Dot=7
+Comma=8
+OpenBracket=9
+CloseBracket=10
+OpenParen=11
+CloseParen=12
+OpenBrace=13
+CloseBrace=14
+Gt=15
+Lt=16
+Eq=17
+Gte=18
+Lte=19
+Neq=20
+Plus=21
+Minus=22
+MinusMinus=23
+PlusPlus=24
+Multi=25
+Div=26
+Mod=27
+And=28
+Or=29
+Range=30
 Assign=31
-Range=32
-QuestionMark=33
-RegexNotMatch=34
-RegexMatch=35
-For=36
-Return=37
-Distinct=38
-Filter=39
-Sort=40
-Limit=41
-Let=42
-Collect=43
-SortDirection=44
-None=45
-Null=46
-BooleanLiteral=47
-Into=48
-Keep=49
-With=50
-Count=51
-All=52
-Any=53
-Aggregate=54
-Like=55
-Not=56
-In=57
-Identifier=58
-StringLiteral=59
-IntegerLiteral=60
-FloatLiteral=61
+QuestionMark=32
+RegexNotMatch=33
+RegexMatch=34
+For=35
+Return=36
+Distinct=37
+Filter=38
+Sort=39
+Limit=40
+Let=41
+Collect=42
+SortDirection=43
+None=44
+Null=45
+BooleanLiteral=46
+Into=47
+Keep=48
+With=49
+Count=50
+All=51
+Any=52
+Aggregate=53
+Like=54
+Not=55
+In=56
+Identifier=57
+StringLiteral=58
+IntegerLiteral=59
+FloatLiteral=60
 ':'=5
 ';'=6
-','=7
-'.'=8
-'...'=9
-'['=10
-']'=11
-'('=12
-')'=13
-'{'=14
-'}'=15
-'>'=16
-'<'=17
-'=='=18
-'>='=19
-'<='=20
-'!='=21
-'+'=22
-'-'=23
-'--'=24
-'++'=25
-'*'=26
-'/'=27
-'%'=28
+'.'=7
+','=8
+'['=9
+']'=10
+'('=11
+')'=12
+'{'=13
+'}'=14
+'>'=15
+'<'=16
+'=='=17
+'>='=18
+'<='=19
+'!='=20
+'+'=21
+'-'=22
+'--'=23
+'++'=24
+'*'=25
+'/'=26
+'%'=27
 '='=31
-'..'=32
-'?'=33
-'!~'=34
-'=~'=35
-'FOR'=36
-'RETURN'=37
-'DISTINCT'=38
-'FILTER'=39
-'SORT'=40
-'LIMIT'=41
-'LET'=42
-'COLLECT'=43
-'NONE'=45
-'NULL'=46
-'INTO'=48
-'KEEP'=49
-'WITH'=50
-'COUNT'=51
-'ALL'=52
-'ANY'=53
-'AGGREGATE'=54
-'LIKE'=55
-'IN'=57
+'?'=32
+'!~'=33
+'=~'=34
+'FOR'=35
+'RETURN'=36
+'DISTINCT'=37
+'FILTER'=38
+'SORT'=39
+'LIMIT'=40
+'LET'=41
+'COLLECT'=42
+'NONE'=44
+'NULL'=45
+'INTO'=47
+'KEEP'=48
+'WITH'=49
+'COUNT'=50
+'ALL'=51
+'ANY'=52
+'AGGREGATE'=53
+'LIKE'=54
+'IN'=56

pkg/parser/fql/fql_lexer.go

@@ -14,7 +14,7 @@ var _ = fmt.Printf
 var _ = unicode.IsLetter
 
 var serializedLexerAtn = []uint16{
-	3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 63, 496,
+	3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 62, 480,
 	8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7,
 	9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12,
 	4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4,
@@ -27,56 +27,54 @@ var serializedLexerAtn = []uint16{
 	49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54,
 	4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4,
 	60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65,
-	9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 3, 2, 3,
-	2, 3, 2, 3, 2, 7, 2, 144, 10, 2, 12, 2, 14, 2, 147, 11, 2, 3, 2, 3, 2,
-	3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 7, 3, 158, 10, 3, 12, 3, 14,
-	3, 161, 11, 3, 3, 3, 3, 3, 3, 4, 6, 4, 166, 10, 4, 13, 4, 14, 4, 167, 3,
-	4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3,
-	9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13,
-	3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 3, 16, 3, 16, 3, 17, 3, 17, 3, 18, 3,
-	18, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22,
-	3, 22, 3, 22, 3, 23, 3, 23, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 26, 3,
-	26, 3, 26, 3, 27, 3, 27, 3, 28, 3, 28, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30,
-	3, 30, 3, 30, 5, 30, 237, 10, 30, 3, 31, 3, 31, 3, 31, 3, 31, 5, 31, 243,
-	10, 31, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 35, 3, 35,
-	3, 35, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3,
-	38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39,
-	3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3,
-	41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42, 3, 42,
-	3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3,
-	44, 3, 44, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 5, 45, 315,
-	10, 45, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 47, 3, 47,
-	3, 47, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3,
-	48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 5, 48, 345,
-	10, 48, 3, 49, 3, 49, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 50,
-	3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 52, 3,
-	52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 54, 3, 55,
-	3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 56, 3,
-	56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 57, 5, 57, 395, 10, 57,
-	3, 58, 3, 58, 3, 58, 3, 59, 6, 59, 401, 10, 59, 13, 59, 14, 59, 402, 3,
-	59, 7, 59, 406, 10, 59, 12, 59, 14, 59, 409, 11, 59, 3, 60, 3, 60, 5, 60,
-	413, 10, 60, 3, 61, 6, 61, 416, 10, 61, 13, 61, 14, 61, 417, 3, 62, 3,
-	62, 3, 62, 7, 62, 423, 10, 62, 12, 62, 14, 62, 426, 11, 62, 3, 62, 5, 62,
-	429, 10, 62, 3, 62, 3, 62, 6, 62, 433, 10, 62, 13, 62, 14, 62, 434, 3,
-	62, 5, 62, 438, 10, 62, 3, 62, 3, 62, 5, 62, 442, 10, 62, 5, 62, 444, 10,
-	62, 3, 63, 3, 63, 3, 64, 3, 64, 3, 64, 7, 64, 451, 10, 64, 12, 64, 14,
-	64, 454, 11, 64, 5, 64, 456, 10, 64, 3, 65, 3, 65, 5, 65, 460, 10, 65,
-	3, 65, 6, 65, 463, 10, 65, 13, 65, 14, 65, 464, 3, 66, 3, 66, 3, 67, 3,
-	67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 7, 68, 477, 10, 68, 12, 68,
-	14, 68, 480, 11, 68, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3,
-	69, 7, 69, 490, 10, 69, 12, 69, 14, 69, 493, 11, 69, 3, 69, 3, 69, 3, 145,
-	2, 70, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21,
-	12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39,
-	21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29, 57,
-	30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38, 75,
-	39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47, 93,
-	48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109, 56,
-	111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 63, 125, 2,
-	127, 2, 129, 2, 131, 2, 133, 2, 135, 2, 137, 2, 3, 2, 12, 5, 2, 12, 12,
-	15, 15, 8234, 8235, 6, 2, 11, 11, 13, 14, 34, 34, 162, 162, 3, 2, 50, 59,
-	5, 2, 50, 59, 67, 72, 99, 104, 3, 2, 51, 59, 4, 2, 71, 71, 103, 103, 4,
-	2, 45, 45, 47, 47, 4, 2, 67, 92, 99, 124, 4, 2, 36, 36, 94, 94, 4, 2, 41,
-	41, 94, 94, 2, 519, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2,
+	9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 3, 2, 3, 2, 3, 2, 3, 2,
+	7, 2, 142, 10, 2, 12, 2, 14, 2, 145, 11, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
+	2, 3, 3, 3, 3, 3, 3, 3, 3, 7, 3, 156, 10, 3, 12, 3, 14, 3, 159, 11, 3,
+	3, 3, 3, 3, 3, 4, 6, 4, 164, 10, 4, 13, 4, 14, 4, 165, 3, 4, 3, 4, 3, 5,
+	3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10,
+	3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3,
+	15, 3, 16, 3, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19,
+	3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 23, 3, 23, 3,
+	24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 27, 3, 27, 3, 28,
+	3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 5, 29, 231, 10, 29, 3, 30, 3,
+	30, 3, 30, 3, 30, 5, 30, 237, 10, 30, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32,
+	3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3,
+	36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38,
+	3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3,
+	39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41,
+	3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3,
+	43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44,
+	3, 44, 3, 44, 5, 44, 309, 10, 44, 3, 45, 3, 45, 3, 45, 3, 45, 3, 45, 3,
+	46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 47, 3, 47, 3, 47, 3, 47,
+	3, 47, 3, 47, 3, 47, 3, 47, 3, 47, 3, 47, 3, 47, 3, 47, 3, 47, 3, 47, 3,
+	47, 3, 47, 5, 47, 339, 10, 47, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 49,
+	3, 49, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 50, 3, 50, 3, 51, 3,
+	51, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53,
+	3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3,
+	54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56,
+	5, 56, 389, 10, 56, 3, 57, 3, 57, 3, 57, 3, 58, 6, 58, 395, 10, 58, 13,
+	58, 14, 58, 396, 3, 58, 7, 58, 400, 10, 58, 12, 58, 14, 58, 403, 11, 58,
+	3, 59, 3, 59, 5, 59, 407, 10, 59, 3, 60, 6, 60, 410, 10, 60, 13, 60, 14,
+	60, 411, 3, 61, 3, 61, 3, 61, 6, 61, 417, 10, 61, 13, 61, 14, 61, 418,
+	3, 61, 5, 61, 422, 10, 61, 3, 61, 3, 61, 5, 61, 426, 10, 61, 5, 61, 428,
+	10, 61, 3, 62, 3, 62, 3, 63, 3, 63, 3, 63, 7, 63, 435, 10, 63, 12, 63,
+	14, 63, 438, 11, 63, 5, 63, 440, 10, 63, 3, 64, 3, 64, 5, 64, 444, 10,
+	64, 3, 64, 6, 64, 447, 10, 64, 13, 64, 14, 64, 448, 3, 65, 3, 65, 3, 66,
+	3, 66, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 7, 67, 461, 10, 67, 12,
+	67, 14, 67, 464, 11, 67, 3, 67, 3, 67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68,
+	3, 68, 7, 68, 474, 10, 68, 12, 68, 14, 68, 477, 11, 68, 3, 68, 3, 68, 3,
+	143, 2, 69, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11,
+	21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20,
+	39, 21, 41, 22, 43, 23, 45, 24, 47, 25, 49, 26, 51, 27, 53, 28, 55, 29,
+	57, 30, 59, 31, 61, 32, 63, 33, 65, 34, 67, 35, 69, 36, 71, 37, 73, 38,
+	75, 39, 77, 40, 79, 41, 81, 42, 83, 43, 85, 44, 87, 45, 89, 46, 91, 47,
+	93, 48, 95, 49, 97, 50, 99, 51, 101, 52, 103, 53, 105, 54, 107, 55, 109,
+	56, 111, 57, 113, 58, 115, 59, 117, 60, 119, 61, 121, 62, 123, 2, 125,
+	2, 127, 2, 129, 2, 131, 2, 133, 2, 135, 2, 3, 2, 12, 5, 2, 12, 12, 15,
+	15, 8234, 8235, 6, 2, 11, 11, 13, 14, 34, 34, 162, 162, 3, 2, 50, 59, 5,
+	2, 50, 59, 67, 72, 99, 104, 3, 2, 51, 59, 4, 2, 71, 71, 103, 103, 4, 2,
+	45, 45, 47, 47, 4, 2, 67, 92, 99, 124, 4, 2, 36, 36, 94, 94, 4, 2, 41,
+	41, 94, 94, 2, 500, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2,
 	2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2,
 	2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3,
 	2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31,
@@ -92,149 +90,143 @@ var serializedLexerAtn = []uint16{
 	2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107,
 	3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2,
 	2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3,
-	2, 2, 2, 2, 123, 3, 2, 2, 2, 3, 139, 3, 2, 2, 2, 5, 153, 3, 2, 2, 2, 7,
-	165, 3, 2, 2, 2, 9, 171, 3, 2, 2, 2, 11, 175, 3, 2, 2, 2, 13, 177, 3, 2,
-	2, 2, 15, 179, 3, 2, 2, 2, 17, 181, 3, 2, 2, 2, 19, 183, 3, 2, 2, 2, 21,
-	187, 3, 2, 2, 2, 23, 189, 3, 2, 2, 2, 25, 191, 3, 2, 2, 2, 27, 193, 3,
-	2, 2, 2, 29, 195, 3, 2, 2, 2, 31, 197, 3, 2, 2, 2, 33, 199, 3, 2, 2, 2,
-	35, 201, 3, 2, 2, 2, 37, 203, 3, 2, 2, 2, 39, 206, 3, 2, 2, 2, 41, 209,
-	3, 2, 2, 2, 43, 212, 3, 2, 2, 2, 45, 215, 3, 2, 2, 2, 47, 217, 3, 2, 2,
-	2, 49, 219, 3, 2, 2, 2, 51, 222, 3, 2, 2, 2, 53, 225, 3, 2, 2, 2, 55, 227,
-	3, 2, 2, 2, 57, 229, 3, 2, 2, 2, 59, 236, 3, 2, 2, 2, 61, 242, 3, 2, 2,
-	2, 63, 244, 3, 2, 2, 2, 65, 246, 3, 2, 2, 2, 67, 249, 3, 2, 2, 2, 69, 251,
-	3, 2, 2, 2, 71, 254, 3, 2, 2, 2, 73, 257, 3, 2, 2, 2, 75, 261, 3, 2, 2,
-	2, 77, 268, 3, 2, 2, 2, 79, 277, 3, 2, 2, 2, 81, 284, 3, 2, 2, 2, 83, 289,
-	3, 2, 2, 2, 85, 295, 3, 2, 2, 2, 87, 299, 3, 2, 2, 2, 89, 314, 3, 2, 2,
-	2, 91, 316, 3, 2, 2, 2, 93, 321, 3, 2, 2, 2, 95, 344, 3, 2, 2, 2, 97, 346,
-	3, 2, 2, 2, 99, 351, 3, 2, 2, 2, 101, 356, 3, 2, 2, 2, 103, 361, 3, 2,
-	2, 2, 105, 367, 3, 2, 2, 2, 107, 371, 3, 2, 2, 2, 109, 375, 3, 2, 2, 2,
-	111, 385, 3, 2, 2, 2, 113, 394, 3, 2, 2, 2, 115, 396, 3, 2, 2, 2, 117,
-	400, 3, 2, 2, 2, 119, 412, 3, 2, 2, 2, 121, 415, 3, 2, 2, 2, 123, 443,
-	3, 2, 2, 2, 125, 445, 3, 2, 2, 2, 127, 455, 3, 2, 2, 2, 129, 457, 3, 2,
-	2, 2, 131, 466, 3, 2, 2, 2, 133, 468, 3, 2, 2, 2, 135, 470, 3, 2, 2, 2,
-	137, 483, 3, 2, 2, 2, 139, 140, 7, 49, 2, 2, 140, 141, 7, 44, 2, 2, 141,
-	145, 3, 2, 2, 2, 142, 144, 11, 2, 2, 2, 143, 142, 3, 2, 2, 2, 144, 147,
-	3, 2, 2, 2, 145, 146, 3, 2, 2, 2, 145, 143, 3, 2, 2, 2, 146, 148, 3, 2,
-	2, 2, 147, 145, 3, 2, 2, 2, 148, 149, 7, 44, 2, 2, 149, 150, 7, 49, 2,
-	2, 150, 151, 3, 2, 2, 2, 151, 152, 8, 2, 2, 2, 152, 4, 3, 2, 2, 2, 153,
-	154, 7, 49, 2, 2, 154, 155, 7, 49, 2, 2, 155, 159, 3, 2, 2, 2, 156, 158,
-	10, 2, 2, 2, 157, 156, 3, 2, 2, 2, 158, 161, 3, 2, 2, 2, 159, 157, 3, 2,
-	2, 2, 159, 160, 3, 2, 2, 2, 160, 162, 3, 2, 2, 2, 161, 159, 3, 2, 2, 2,
-	162, 163, 8, 3, 2, 2, 163, 6, 3, 2, 2, 2, 164, 166, 9, 3, 2, 2, 165, 164,
-	3, 2, 2, 2, 166, 167, 3, 2, 2, 2, 167, 165, 3, 2, 2, 2, 167, 168, 3, 2,
-	2, 2, 168, 169, 3, 2, 2, 2, 169, 170, 8, 4, 2, 2, 170, 8, 3, 2, 2, 2, 171,
-	172, 9, 2, 2, 2, 172, 173, 3, 2, 2, 2, 173, 174, 8, 5, 2, 2, 174, 10, 3,
-	2, 2, 2, 175, 176, 7, 60, 2, 2, 176, 12, 3, 2, 2, 2, 177, 178, 7, 61, 2,
-	2, 178, 14, 3, 2, 2, 2, 179, 180, 7, 46, 2, 2, 180, 16, 3, 2, 2, 2, 181,
-	182, 7, 48, 2, 2, 182, 18, 3, 2, 2, 2, 183, 184, 7, 48, 2, 2, 184, 185,
-	7, 48, 2, 2, 185, 186, 7, 48, 2, 2, 186, 20, 3, 2, 2, 2, 187, 188, 7, 93,
-	2, 2, 188, 22, 3, 2, 2, 2, 189, 190, 7, 95, 2, 2, 190, 24, 3, 2, 2, 2,
-	191, 192, 7, 42, 2, 2, 192, 26, 3, 2, 2, 2, 193, 194, 7, 43, 2, 2, 194,
-	28, 3, 2, 2, 2, 195, 196, 7, 125, 2, 2, 196, 30, 3, 2, 2, 2, 197, 198,
-	7, 127, 2, 2, 198, 32, 3, 2, 2, 2, 199, 200, 7, 64, 2, 2, 200, 34, 3, 2,
-	2, 2, 201, 202, 7, 62, 2, 2, 202, 36, 3, 2, 2, 2, 203, 204, 7, 63, 2, 2,
-	204, 205, 7, 63, 2, 2, 205, 38, 3, 2, 2, 2, 206, 207, 7, 64, 2, 2, 207,
-	208, 7, 63, 2, 2, 208, 40, 3, 2, 2, 2, 209, 210, 7, 62, 2, 2, 210, 211,
-	7, 63, 2, 2, 211, 42, 3, 2, 2, 2, 212, 213, 7, 35, 2, 2, 213, 214, 7, 63,
-	2, 2, 214, 44, 3, 2, 2, 2, 215, 216, 7, 45, 2, 2, 216, 46, 3, 2, 2, 2,
-	217, 218, 7, 47, 2, 2, 218, 48, 3, 2, 2, 2, 219, 220, 7, 47, 2, 2, 220,
-	221, 7, 47, 2, 2, 221, 50, 3, 2, 2, 2, 222, 223, 7, 45, 2, 2, 223, 224,
-	7, 45, 2, 2, 224, 52, 3, 2, 2, 2, 225, 226, 7, 44, 2, 2, 226, 54, 3, 2,
-	2, 2, 227, 228, 7, 49, 2, 2, 228, 56, 3, 2, 2, 2, 229, 230, 7, 39, 2, 2,
-	230, 58, 3, 2, 2, 2, 231, 232, 7, 67, 2, 2, 232, 233, 7, 80, 2, 2, 233,
-	237, 7, 70, 2, 2, 234, 235, 7, 40, 2, 2, 235, 237, 7, 40, 2, 2, 236, 231,
-	3, 2, 2, 2, 236, 234, 3, 2, 2, 2, 237, 60, 3, 2, 2, 2, 238, 239, 7, 81,
-	2, 2, 239, 243, 7, 84, 2, 2, 240, 241, 7, 126, 2, 2, 241, 243, 7, 126,
-	2, 2, 242, 238, 3, 2, 2, 2, 242, 240, 3, 2, 2, 2, 243, 62, 3, 2, 2, 2,
-	244, 245, 7, 63, 2, 2, 245, 64, 3, 2, 2, 2, 246, 247, 7, 48, 2, 2, 247,
-	248, 7, 48, 2, 2, 248, 66, 3, 2, 2, 2, 249, 250, 7, 65, 2, 2, 250, 68,
-	3, 2, 2, 2, 251, 252, 7, 35, 2, 2, 252, 253, 7, 128, 2, 2, 253, 70, 3,
-	2, 2, 2, 254, 255, 7, 63, 2, 2, 255, 256, 7, 128, 2, 2, 256, 72, 3, 2,
-	2, 2, 257, 258, 7, 72, 2, 2, 258, 259, 7, 81, 2, 2, 259, 260, 7, 84, 2,
-	2, 260, 74, 3, 2, 2, 2, 261, 262, 7, 84, 2, 2, 262, 263, 7, 71, 2, 2, 263,
-	264, 7, 86, 2, 2, 264, 265, 7, 87, 2, 2, 265, 266, 7, 84, 2, 2, 266, 267,
-	7, 80, 2, 2, 267, 76, 3, 2, 2, 2, 268, 269, 7, 70, 2, 2, 269, 270, 7, 75,
-	2, 2, 270, 271, 7, 85, 2, 2, 271, 272, 7, 86, 2, 2, 272, 273, 7, 75, 2,
-	2, 273, 274, 7, 80, 2, 2, 274, 275, 7, 69, 2, 2, 275, 276, 7, 86, 2, 2,
-	276, 78, 3, 2, 2, 2, 277, 278, 7, 72, 2, 2, 278, 279, 7, 75, 2, 2, 279,
-	280, 7, 78, 2, 2, 280, 281, 7, 86, 2, 2, 281, 282, 7, 71, 2, 2, 282, 283,
-	7, 84, 2, 2, 283, 80, 3, 2, 2, 2, 284, 285, 7, 85, 2, 2, 285, 286, 7, 81,
-	2, 2, 286, 287, 7, 84, 2, 2, 287, 288, 7, 86, 2, 2, 288, 82, 3, 2, 2, 2,
-	289, 290, 7, 78, 2, 2, 290, 291, 7, 75, 2, 2, 291, 292, 7, 79, 2, 2, 292,
-	293, 7, 75, 2, 2, 293, 294, 7, 86, 2, 2, 294, 84, 3, 2, 2, 2, 295, 296,
-	7, 78, 2, 2, 296, 297, 7, 71, 2, 2, 297, 298, 7, 86, 2, 2, 298, 86, 3,
-	2, 2, 2, 299, 300, 7, 69, 2, 2, 300, 301, 7, 81, 2, 2, 301, 302, 7, 78,
-	2, 2, 302, 303, 7, 78, 2, 2, 303, 304, 7, 71, 2, 2, 304, 305, 7, 69, 2,
-	2, 305, 306, 7, 86, 2, 2, 306, 88, 3, 2, 2, 2, 307, 308, 7, 67, 2, 2, 308,
-	309, 7, 85, 2, 2, 309, 315, 7, 69, 2, 2, 310, 311, 7, 70, 2, 2, 311, 312,
-	7, 71, 2, 2, 312, 313, 7, 85, 2, 2, 313, 315, 7, 69, 2, 2, 314, 307, 3,
-	2, 2, 2, 314, 310, 3, 2, 2, 2, 315, 90, 3, 2, 2, 2, 316, 317, 7, 80, 2,
-	2, 317, 318, 7, 81, 2, 2, 318, 319, 7, 80, 2, 2, 319, 320, 7, 71, 2, 2,
-	320, 92, 3, 2, 2, 2, 321, 322, 7, 80, 2, 2, 322, 323, 7, 87, 2, 2, 323,
-	324, 7, 78, 2, 2, 324, 325, 7, 78, 2, 2, 325, 94, 3, 2, 2, 2, 326, 327,
-	7, 86, 2, 2, 327, 328, 7, 84, 2, 2, 328, 329, 7, 87, 2, 2, 329, 345, 7,
-	71, 2, 2, 330, 331, 7, 118, 2, 2, 331, 332, 7, 116, 2, 2, 332, 333, 7,
-	119, 2, 2, 333, 345, 7, 103, 2, 2, 334, 335, 7, 72, 2, 2, 335, 336, 7,
-	67, 2, 2, 336, 337, 7, 78, 2, 2, 337, 338, 7, 85, 2, 2, 338, 345, 7, 71,
-	2, 2, 339, 340, 7, 104, 2, 2, 340, 341, 7, 99, 2, 2, 341, 342, 7, 110,
-	2, 2, 342, 343, 7, 117, 2, 2, 343, 345, 7, 103, 2, 2, 344, 326, 3, 2, 2,
-	2, 344, 330, 3, 2, 2, 2, 344, 334, 3, 2, 2, 2, 344, 339, 3, 2, 2, 2, 345,
-	96, 3, 2, 2, 2, 346, 347, 7, 75, 2, 2, 347, 348, 7, 80, 2, 2, 348, 349,
-	7, 86, 2, 2, 349, 350, 7, 81, 2, 2, 350, 98, 3, 2, 2, 2, 351, 352, 7, 77,
-	2, 2, 352, 353, 7, 71, 2, 2, 353, 354, 7, 71, 2, 2, 354, 355, 7, 82, 2,
-	2, 355, 100, 3, 2, 2, 2, 356, 357, 7, 89, 2, 2, 357, 358, 7, 75, 2, 2,
-	358, 359, 7, 86, 2, 2, 359, 360, 7, 74, 2, 2, 360, 102, 3, 2, 2, 2, 361,
-	362, 7, 69, 2, 2, 362, 363, 7, 81, 2, 2, 363, 364, 7, 87, 2, 2, 364, 365,
-	7, 80, 2, 2, 365, 366, 7, 86, 2, 2, 366, 104, 3, 2, 2, 2, 367, 368, 7,
-	67, 2, 2, 368, 369, 7, 78, 2, 2, 369, 370, 7, 78, 2, 2, 370, 106, 3, 2,
-	2, 2, 371, 372, 7, 67, 2, 2, 372, 373, 7, 80, 2, 2, 373, 374, 7, 91, 2,
-	2, 374, 108, 3, 2, 2, 2, 375, 376, 7, 67, 2, 2, 376, 377, 7, 73, 2, 2,
-	377, 378, 7, 73, 2, 2, 378, 379, 7, 84, 2, 2, 379, 380, 7, 71, 2, 2, 380,
-	381, 7, 73, 2, 2, 381, 382, 7, 67, 2, 2, 382, 383, 7, 86, 2, 2, 383, 384,
-	7, 71, 2, 2, 384, 110, 3, 2, 2, 2, 385, 386, 7, 78, 2, 2, 386, 387, 7,
-	75, 2, 2, 387, 388, 7, 77, 2, 2, 388, 389, 7, 71, 2, 2, 389, 112, 3, 2,
-	2, 2, 390, 391, 7, 80, 2, 2, 391, 392, 7, 81, 2, 2, 392, 395, 7, 86, 2,
-	2, 393, 395, 7, 35, 2, 2, 394, 390, 3, 2, 2, 2, 394, 393, 3, 2, 2, 2, 395,
-	114, 3, 2, 2, 2, 396, 397, 7, 75, 2, 2, 397, 398, 7, 80, 2, 2, 398, 116,
-	3, 2, 2, 2, 399, 401, 5, 131, 66, 2, 400, 399, 3, 2, 2, 2, 401, 402, 3,
-	2, 2, 2, 402, 400, 3, 2, 2, 2, 402, 403, 3, 2, 2, 2, 403, 407, 3, 2, 2,
-	2, 404, 406, 5, 133, 67, 2, 405, 404, 3, 2, 2, 2, 406, 409, 3, 2, 2, 2,
-	407, 405, 3, 2, 2, 2, 407, 408, 3, 2, 2, 2, 408, 118, 3, 2, 2, 2, 409,
-	407, 3, 2, 2, 2, 410, 413, 5, 137, 69, 2, 411, 413, 5, 135, 68, 2, 412,
-	410, 3, 2, 2, 2, 412, 411, 3, 2, 2, 2, 413, 120, 3, 2, 2, 2, 414, 416,
-	9, 4, 2, 2, 415, 414, 3, 2, 2, 2, 416, 417, 3, 2, 2, 2, 417, 415, 3, 2,
-	2, 2, 417, 418, 3, 2, 2, 2, 418, 122, 3, 2, 2, 2, 419, 420, 5, 127, 64,
-	2, 420, 424, 7, 48, 2, 2, 421, 423, 9, 4, 2, 2, 422, 421, 3, 2, 2, 2, 423,
-	426, 3, 2, 2, 2, 424, 422, 3, 2, 2, 2, 424, 425, 3, 2, 2, 2, 425, 428,
-	3, 2, 2, 2, 426, 424, 3, 2, 2, 2, 427, 429, 5, 129, 65, 2, 428, 427, 3,
-	2, 2, 2, 428, 429, 3, 2, 2, 2, 429, 444, 3, 2, 2, 2, 430, 432, 7, 48, 2,
-	2, 431, 433, 9, 4, 2, 2, 432, 431, 3, 2, 2, 2, 433, 434, 3, 2, 2, 2, 434,
-	432, 3, 2, 2, 2, 434, 435, 3, 2, 2, 2, 435, 437, 3, 2, 2, 2, 436, 438,
-	5, 129, 65, 2, 437, 436, 3, 2, 2, 2, 437, 438, 3, 2, 2, 2, 438, 444, 3,
-	2, 2, 2, 439, 441, 5, 127, 64, 2, 440, 442, 5, 129, 65, 2, 441, 440, 3,
-	2, 2, 2, 441, 442, 3, 2, 2, 2, 442, 444, 3, 2, 2, 2, 443, 419, 3, 2, 2,
-	2, 443, 430, 3, 2, 2, 2, 443, 439, 3, 2, 2, 2, 444, 124, 3, 2, 2, 2, 445,
-	446, 9, 5, 2, 2, 446, 126, 3, 2, 2, 2, 447, 456, 7, 50, 2, 2, 448, 452,
-	9, 6, 2, 2, 449, 451, 9, 4, 2, 2, 450, 449, 3, 2, 2, 2, 451, 454, 3, 2,
-	2, 2, 452, 450, 3, 2, 2, 2, 452, 453, 3, 2, 2, 2, 453, 456, 3, 2, 2, 2,
-	454, 452, 3, 2, 2, 2, 455, 447, 3, 2, 2, 2, 455, 448, 3, 2, 2, 2, 456,
-	128, 3, 2, 2, 2, 457, 459, 9, 7, 2, 2, 458, 460, 9, 8, 2, 2, 459, 458,
-	3, 2, 2, 2, 459, 460, 3, 2, 2, 2, 460, 462, 3, 2, 2, 2, 461, 463, 9, 4,
-	2, 2, 462, 461, 3, 2, 2, 2, 463, 464, 3, 2, 2, 2, 464, 462, 3, 2, 2, 2,
-	464, 465, 3, 2, 2, 2, 465, 130, 3, 2, 2, 2, 466, 467, 9, 9, 2, 2, 467,
-	132, 3, 2, 2, 2, 468, 469, 4, 50, 59, 2, 469, 134, 3, 2, 2, 2, 470, 478,
-	7, 36, 2, 2, 471, 472, 7, 94, 2, 2, 472, 477, 11, 2, 2, 2, 473, 474, 7,
-	36, 2, 2, 474, 477, 7, 36, 2, 2, 475, 477, 10, 10, 2, 2, 476, 471, 3, 2,
-	2, 2, 476, 473, 3, 2, 2, 2, 476, 475, 3, 2, 2, 2, 477, 480, 3, 2, 2, 2,
-	478, 476, 3, 2, 2, 2, 478, 479, 3, 2, 2, 2, 479, 481, 3, 2, 2, 2, 480,
-	478, 3, 2, 2, 2, 481, 482, 7, 36, 2, 2, 482, 136, 3, 2, 2, 2, 483, 491,
-	7, 41, 2, 2, 484, 485, 7, 94, 2, 2, 485, 490, 11, 2, 2, 2, 486, 487, 7,
-	41, 2, 2, 487, 490, 7, 41, 2, 2, 488, 490, 10, 11, 2, 2, 489, 484, 3, 2,
-	2, 2, 489, 486, 3, 2, 2, 2, 489, 488, 3, 2, 2, 2, 490, 493, 3, 2, 2, 2,
-	491, 489, 3, 2, 2, 2, 491, 492, 3, 2, 2, 2, 492, 494, 3, 2, 2, 2, 493,
-	491, 3, 2, 2, 2, 494, 495, 7, 41, 2, 2, 495, 138, 3, 2, 2, 2, 29, 2, 145,
-	159, 167, 236, 242, 314, 344, 394, 402, 407, 412, 417, 424, 428, 434, 437,
-	441, 443, 452, 455, 459, 464, 476, 478, 489, 491, 3, 2, 3, 2,
+	2, 2, 2, 3, 137, 3, 2, 2, 2, 5, 151, 3, 2, 2, 2, 7, 163, 3, 2, 2, 2, 9,
+	169, 3, 2, 2, 2, 11, 173, 3, 2, 2, 2, 13, 175, 3, 2, 2, 2, 15, 177, 3,
+	2, 2, 2, 17, 179, 3, 2, 2, 2, 19, 181, 3, 2, 2, 2, 21, 183, 3, 2, 2, 2,
+	23, 185, 3, 2, 2, 2, 25, 187, 3, 2, 2, 2, 27, 189, 3, 2, 2, 2, 29, 191,
+	3, 2, 2, 2, 31, 193, 3, 2, 2, 2, 33, 195, 3, 2, 2, 2, 35, 197, 3, 2, 2,
+	2, 37, 200, 3, 2, 2, 2, 39, 203, 3, 2, 2, 2, 41, 206, 3, 2, 2, 2, 43, 209,
+	3, 2, 2, 2, 45, 211, 3, 2, 2, 2, 47, 213, 3, 2, 2, 2, 49, 216, 3, 2, 2,
+	2, 51, 219, 3, 2, 2, 2, 53, 221, 3, 2, 2, 2, 55, 223, 3, 2, 2, 2, 57, 230,
+	3, 2, 2, 2, 59, 236, 3, 2, 2, 2, 61, 238, 3, 2, 2, 2, 63, 241, 3, 2, 2,
+	2, 65, 243, 3, 2, 2, 2, 67, 245, 3, 2, 2, 2, 69, 248, 3, 2, 2, 2, 71, 251,
+	3, 2, 2, 2, 73, 255, 3, 2, 2, 2, 75, 262, 3, 2, 2, 2, 77, 271, 3, 2, 2,
+	2, 79, 278, 3, 2, 2, 2, 81, 283, 3, 2, 2, 2, 83, 289, 3, 2, 2, 2, 85, 293,
+	3, 2, 2, 2, 87, 308, 3, 2, 2, 2, 89, 310, 3, 2, 2, 2, 91, 315, 3, 2, 2,
+	2, 93, 338, 3, 2, 2, 2, 95, 340, 3, 2, 2, 2, 97, 345, 3, 2, 2, 2, 99, 350,
+	3, 2, 2, 2, 101, 355, 3, 2, 2, 2, 103, 361, 3, 2, 2, 2, 105, 365, 3, 2,
+	2, 2, 107, 369, 3, 2, 2, 2, 109, 379, 3, 2, 2, 2, 111, 388, 3, 2, 2, 2,
+	113, 390, 3, 2, 2, 2, 115, 394, 3, 2, 2, 2, 117, 406, 3, 2, 2, 2, 119,
+	409, 3, 2, 2, 2, 121, 427, 3, 2, 2, 2, 123, 429, 3, 2, 2, 2, 125, 439,
+	3, 2, 2, 2, 127, 441, 3, 2, 2, 2, 129, 450, 3, 2, 2, 2, 131, 452, 3, 2,
+	2, 2, 133, 454, 3, 2, 2, 2, 135, 467, 3, 2, 2, 2, 137, 138, 7, 49, 2, 2,
+	138, 139, 7, 44, 2, 2, 139, 143, 3, 2, 2, 2, 140, 142, 11, 2, 2, 2, 141,
+	140, 3, 2, 2, 2, 142, 145, 3, 2, 2, 2, 143, 144, 3, 2, 2, 2, 143, 141,
+	3, 2, 2, 2, 144, 146, 3, 2, 2, 2, 145, 143, 3, 2, 2, 2, 146, 147, 7, 44,
+	2, 2, 147, 148, 7, 49, 2, 2, 148, 149, 3, 2, 2, 2, 149, 150, 8, 2, 2, 2,
+	150, 4, 3, 2, 2, 2, 151, 152, 7, 49, 2, 2, 152, 153, 7, 49, 2, 2, 153,
+	157, 3, 2, 2, 2, 154, 156, 10, 2, 2, 2, 155, 154, 3, 2, 2, 2, 156, 159,
+	3, 2, 2, 2, 157, 155, 3, 2, 2, 2, 157, 158, 3, 2, 2, 2, 158, 160, 3, 2,
+	2, 2, 159, 157, 3, 2, 2, 2, 160, 161, 8, 3, 2, 2, 161, 6, 3, 2, 2, 2, 162,
+	164, 9, 3, 2, 2, 163, 162, 3, 2, 2, 2, 164, 165, 3, 2, 2, 2, 165, 163,
+	3, 2, 2, 2, 165, 166, 3, 2, 2, 2, 166, 167, 3, 2, 2, 2, 167, 168, 8, 4,
+	2, 2, 168, 8, 3, 2, 2, 2, 169, 170, 9, 2, 2, 2, 170, 171, 3, 2, 2, 2, 171,
+	172, 8, 5, 2, 2, 172, 10, 3, 2, 2, 2, 173, 174, 7, 60, 2, 2, 174, 12, 3,
+	2, 2, 2, 175, 176, 7, 61, 2, 2, 176, 14, 3, 2, 2, 2, 177, 178, 7, 48, 2,
+	2, 178, 16, 3, 2, 2, 2, 179, 180, 7, 46, 2, 2, 180, 18, 3, 2, 2, 2, 181,
+	182, 7, 93, 2, 2, 182, 20, 3, 2, 2, 2, 183, 184, 7, 95, 2, 2, 184, 22,
+	3, 2, 2, 2, 185, 186, 7, 42, 2, 2, 186, 24, 3, 2, 2, 2, 187, 188, 7, 43,
+	2, 2, 188, 26, 3, 2, 2, 2, 189, 190, 7, 125, 2, 2, 190, 28, 3, 2, 2, 2,
+	191, 192, 7, 127, 2, 2, 192, 30, 3, 2, 2, 2, 193, 194, 7, 64, 2, 2, 194,
+	32, 3, 2, 2, 2, 195, 196, 7, 62, 2, 2, 196, 34, 3, 2, 2, 2, 197, 198, 7,
+	63, 2, 2, 198, 199, 7, 63, 2, 2, 199, 36, 3, 2, 2, 2, 200, 201, 7, 64,
+	2, 2, 201, 202, 7, 63, 2, 2, 202, 38, 3, 2, 2, 2, 203, 204, 7, 62, 2, 2,
+	204, 205, 7, 63, 2, 2, 205, 40, 3, 2, 2, 2, 206, 207, 7, 35, 2, 2, 207,
+	208, 7, 63, 2, 2, 208, 42, 3, 2, 2, 2, 209, 210, 7, 45, 2, 2, 210, 44,
+	3, 2, 2, 2, 211, 212, 7, 47, 2, 2, 212, 46, 3, 2, 2, 2, 213, 214, 7, 47,
+	2, 2, 214, 215, 7, 47, 2, 2, 215, 48, 3, 2, 2, 2, 216, 217, 7, 45, 2, 2,
+	217, 218, 7, 45, 2, 2, 218, 50, 3, 2, 2, 2, 219, 220, 7, 44, 2, 2, 220,
+	52, 3, 2, 2, 2, 221, 222, 7, 49, 2, 2, 222, 54, 3, 2, 2, 2, 223, 224, 7,
+	39, 2, 2, 224, 56, 3, 2, 2, 2, 225, 226, 7, 67, 2, 2, 226, 227, 7, 80,
+	2, 2, 227, 231, 7, 70, 2, 2, 228, 229, 7, 40, 2, 2, 229, 231, 7, 40, 2,
+	2, 230, 225, 3, 2, 2, 2, 230, 228, 3, 2, 2, 2, 231, 58, 3, 2, 2, 2, 232,
+	233, 7, 81, 2, 2, 233, 237, 7, 84, 2, 2, 234, 235, 7, 126, 2, 2, 235, 237,
+	7, 126, 2, 2, 236, 232, 3, 2, 2, 2, 236, 234, 3, 2, 2, 2, 237, 60, 3, 2,
+	2, 2, 238, 239, 5, 15, 8, 2, 239, 240, 5, 15, 8, 2, 240, 62, 3, 2, 2, 2,
+	241, 242, 7, 63, 2, 2, 242, 64, 3, 2, 2, 2, 243, 244, 7, 65, 2, 2, 244,
+	66, 3, 2, 2, 2, 245, 246, 7, 35, 2, 2, 246, 247, 7, 128, 2, 2, 247, 68,
+	3, 2, 2, 2, 248, 249, 7, 63, 2, 2, 249, 250, 7, 128, 2, 2, 250, 70, 3,
+	2, 2, 2, 251, 252, 7, 72, 2, 2, 252, 253, 7, 81, 2, 2, 253, 254, 7, 84,
+	2, 2, 254, 72, 3, 2, 2, 2, 255, 256, 7, 84, 2, 2, 256, 257, 7, 71, 2, 2,
+	257, 258, 7, 86, 2, 2, 258, 259, 7, 87, 2, 2, 259, 260, 7, 84, 2, 2, 260,
+	261, 7, 80, 2, 2, 261, 74, 3, 2, 2, 2, 262, 263, 7, 70, 2, 2, 263, 264,
+	7, 75, 2, 2, 264, 265, 7, 85, 2, 2, 265, 266, 7, 86, 2, 2, 266, 267, 7,
+	75, 2, 2, 267, 268, 7, 80, 2, 2, 268, 269, 7, 69, 2, 2, 269, 270, 7, 86,
+	2, 2, 270, 76, 3, 2, 2, 2, 271, 272, 7, 72, 2, 2, 272, 273, 7, 75, 2, 2,
+	273, 274, 7, 78, 2, 2, 274, 275, 7, 86, 2, 2, 275, 276, 7, 71, 2, 2, 276,
+	277, 7, 84, 2, 2, 277, 78, 3, 2, 2, 2, 278, 279, 7, 85, 2, 2, 279, 280,
+	7, 81, 2, 2, 280, 281, 7, 84, 2, 2, 281, 282, 7, 86, 2, 2, 282, 80, 3,
+	2, 2, 2, 283, 284, 7, 78, 2, 2, 284, 285, 7, 75, 2, 2, 285, 286, 7, 79,
+	2, 2, 286, 287, 7, 75, 2, 2, 287, 288, 7, 86, 2, 2, 288, 82, 3, 2, 2, 2,
+	289, 290, 7, 78, 2, 2, 290, 291, 7, 71, 2, 2, 291, 292, 7, 86, 2, 2, 292,
+	84, 3, 2, 2, 2, 293, 294, 7, 69, 2, 2, 294, 295, 7, 81, 2, 2, 295, 296,
+	7, 78, 2, 2, 296, 297, 7, 78, 2, 2, 297, 298, 7, 71, 2, 2, 298, 299, 7,
+	69, 2, 2, 299, 300, 7, 86, 2, 2, 300, 86, 3, 2, 2, 2, 301, 302, 7, 67,
+	2, 2, 302, 303, 7, 85, 2, 2, 303, 309, 7, 69, 2, 2, 304, 305, 7, 70, 2,
+	2, 305, 306, 7, 71, 2, 2, 306, 307, 7, 85, 2, 2, 307, 309, 7, 69, 2, 2,
+	308, 301, 3, 2, 2, 2, 308, 304, 3, 2, 2, 2, 309, 88, 3, 2, 2, 2, 310, 311,
+	7, 80, 2, 2, 311, 312, 7, 81, 2, 2, 312, 313, 7, 80, 2, 2, 313, 314, 7,
+	71, 2, 2, 314, 90, 3, 2, 2, 2, 315, 316, 7, 80, 2, 2, 316, 317, 7, 87,
+	2, 2, 317, 318, 7, 78, 2, 2, 318, 319, 7, 78, 2, 2, 319, 92, 3, 2, 2, 2,
+	320, 321, 7, 86, 2, 2, 321, 322, 7, 84, 2, 2, 322, 323, 7, 87, 2, 2, 323,
+	339, 7, 71, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 116, 2, 2, 326,
+	327, 7, 119, 2, 2, 327, 339, 7, 103, 2, 2, 328, 329, 7, 72, 2, 2, 329,
+	330, 7, 67, 2, 2, 330, 331, 7, 78, 2, 2, 331, 332, 7, 85, 2, 2, 332, 339,
+	7, 71, 2, 2, 333, 334, 7, 104, 2, 2, 334, 335, 7, 99, 2, 2, 335, 336, 7,
+	110, 2, 2, 336, 337, 7, 117, 2, 2, 337, 339, 7, 103, 2, 2, 338, 320, 3,
+	2, 2, 2, 338, 324, 3, 2, 2, 2, 338, 328, 3, 2, 2, 2, 338, 333, 3, 2, 2,
+	2, 339, 94, 3, 2, 2, 2, 340, 341, 7, 75, 2, 2, 341, 342, 7, 80, 2, 2, 342,
+	343, 7, 86, 2, 2, 343, 344, 7, 81, 2, 2, 344, 96, 3, 2, 2, 2, 345, 346,
+	7, 77, 2, 2, 346, 347, 7, 71, 2, 2, 347, 348, 7, 71, 2, 2, 348, 349, 7,
+	82, 2, 2, 349, 98, 3, 2, 2, 2, 350, 351, 7, 89, 2, 2, 351, 352, 7, 75,
+	2, 2, 352, 353, 7, 86, 2, 2, 353, 354, 7, 74, 2, 2, 354, 100, 3, 2, 2,
+	2, 355, 356, 7, 69, 2, 2, 356, 357, 7, 81, 2, 2, 357, 358, 7, 87, 2, 2,
+	358, 359, 7, 80, 2, 2, 359, 360, 7, 86, 2, 2, 360, 102, 3, 2, 2, 2, 361,
+	362, 7, 67, 2, 2, 362, 363, 7, 78, 2, 2, 363, 364, 7, 78, 2, 2, 364, 104,
+	3, 2, 2, 2, 365, 366, 7, 67, 2, 2, 366, 367, 7, 80, 2, 2, 367, 368, 7,
+	91, 2, 2, 368, 106, 3, 2, 2, 2, 369, 370, 7, 67, 2, 2, 370, 371, 7, 73,
+	2, 2, 371, 372, 7, 73, 2, 2, 372, 373, 7, 84, 2, 2, 373, 374, 7, 71, 2,
+	2, 374, 375, 7, 73, 2, 2, 375, 376, 7, 67, 2, 2, 376, 377, 7, 86, 2, 2,
+	377, 378, 7, 71, 2, 2, 378, 108, 3, 2, 2, 2, 379, 380, 7, 78, 2, 2, 380,
+	381, 7, 75, 2, 2, 381, 382, 7, 77, 2, 2, 382, 383, 7, 71, 2, 2, 383, 110,
+	3, 2, 2, 2, 384, 385, 7, 80, 2, 2, 385, 386, 7, 81, 2, 2, 386, 389, 7,
+	86, 2, 2, 387, 389, 7, 35, 2, 2, 388, 384, 3, 2, 2, 2, 388, 387, 3, 2,
+	2, 2, 389, 112, 3, 2, 2, 2, 390, 391, 7, 75, 2, 2, 391, 392, 7, 80, 2,
+	2, 392, 114, 3, 2, 2, 2, 393, 395, 5, 129, 65, 2, 394, 393, 3, 2, 2, 2,
+	395, 396, 3, 2, 2, 2, 396, 394, 3, 2, 2, 2, 396, 397, 3, 2, 2, 2, 397,
+	401, 3, 2, 2, 2, 398, 400, 5, 131, 66, 2, 399, 398, 3, 2, 2, 2, 400, 403,
+	3, 2, 2, 2, 401, 399, 3, 2, 2, 2, 401, 402, 3, 2, 2, 2, 402, 116, 3, 2,
+	2, 2, 403, 401, 3, 2, 2, 2, 404, 407, 5, 135, 68, 2, 405, 407, 5, 133,
+	67, 2, 406, 404, 3, 2, 2, 2, 406, 405, 3, 2, 2, 2, 407, 118, 3, 2, 2, 2,
+	408, 410, 9, 4, 2, 2, 409, 408, 3, 2, 2, 2, 410, 411, 3, 2, 2, 2, 411,
+	409, 3, 2, 2, 2, 411, 412, 3, 2, 2, 2, 412, 120, 3, 2, 2, 2, 413, 414,
+	5, 125, 63, 2, 414, 416, 5, 15, 8, 2, 415, 417, 9, 4, 2, 2, 416, 415, 3,
+	2, 2, 2, 417, 418, 3, 2, 2, 2, 418, 416, 3, 2, 2, 2, 418, 419, 3, 2, 2,
+	2, 419, 421, 3, 2, 2, 2, 420, 422, 5, 127, 64, 2, 421, 420, 3, 2, 2, 2,
+	421, 422, 3, 2, 2, 2, 422, 428, 3, 2, 2, 2, 423, 425, 5, 125, 63, 2, 424,
+	426, 5, 127, 64, 2, 425, 424, 3, 2, 2, 2, 425, 426, 3, 2, 2, 2, 426, 428,
+	3, 2, 2, 2, 427, 413, 3, 2, 2, 2, 427, 423, 3, 2, 2, 2, 428, 122, 3, 2,
+	2, 2, 429, 430, 9, 5, 2, 2, 430, 124, 3, 2, 2, 2, 431, 440, 7, 50, 2, 2,
+	432, 436, 9, 6, 2, 2, 433, 435, 9, 4, 2, 2, 434, 433, 3, 2, 2, 2, 435,
+	438, 3, 2, 2, 2, 436, 434, 3, 2, 2, 2, 436, 437, 3, 2, 2, 2, 437, 440,
+	3, 2, 2, 2, 438, 436, 3, 2, 2, 2, 439, 431, 3, 2, 2, 2, 439, 432, 3, 2,
+	2, 2, 440, 126, 3, 2, 2, 2, 441, 443, 9, 7, 2, 2, 442, 444, 9, 8, 2, 2,
+	443, 442, 3, 2, 2, 2, 443, 444, 3, 2, 2, 2, 444, 446, 3, 2, 2, 2, 445,
+	447, 9, 4, 2, 2, 446, 445, 3, 2, 2, 2, 447, 448, 3, 2, 2, 2, 448, 446,
+	3, 2, 2, 2, 448, 449, 3, 2, 2, 2, 449, 128, 3, 2, 2, 2, 450, 451, 9, 9,
+	2, 2, 451, 130, 3, 2, 2, 2, 452, 453, 4, 50, 59, 2, 453, 132, 3, 2, 2,
+	2, 454, 462, 7, 36, 2, 2, 455, 456, 7, 94, 2, 2, 456, 461, 11, 2, 2, 2,
+	457, 458, 7, 36, 2, 2, 458, 461, 7, 36, 2, 2, 459, 461, 10, 10, 2, 2, 460,
+	455, 3, 2, 2, 2, 460, 457, 3, 2, 2, 2, 460, 459, 3, 2, 2, 2, 461, 464,
+	3, 2, 2, 2, 462, 460, 3, 2, 2, 2, 462, 463, 3, 2, 2, 2, 463, 465, 3, 2,
+	2, 2, 464, 462, 3, 2, 2, 2, 465, 466, 7, 36, 2, 2, 466, 134, 3, 2, 2, 2,
+	467, 475, 7, 41, 2, 2, 468, 469, 7, 94, 2, 2, 469, 474, 11, 2, 2, 2, 470,
+	471, 7, 41, 2, 2, 471, 474, 7, 41, 2, 2, 472, 474, 10, 11, 2, 2, 473, 468,
+	3, 2, 2, 2, 473, 470, 3, 2, 2, 2, 473, 472, 3, 2, 2, 2, 474, 477, 3, 2,
+	2, 2, 475, 473, 3, 2, 2, 2, 475, 476, 3, 2, 2, 2, 476, 478, 3, 2, 2, 2,
+	477, 475, 3, 2, 2, 2, 478, 479, 7, 41, 2, 2, 479, 136, 3, 2, 2, 2, 27,
+	2, 143, 157, 165, 230, 236, 308, 338, 388, 396, 401, 406, 411, 418, 421,
+	425, 427, 436, 439, 443, 448, 460, 462, 473, 475, 3, 2, 3, 2,
 }
 
 var lexerDeserializer = antlr.NewATNDeserializer(nil)
@@ -249,36 +241,35 @@ var lexerModeNames = []string{
 }
 
 var lexerLiteralNames = []string{
-	"", "", "", "", "", "':'", "';'", "','", "'.'", "'...'", "'['", "']'",
-	"'('", "')'", "'{'", "'}'", "'>'", "'<'", "'=='", "'>='", "'<='", "'!='",
-	"'+'", "'-'", "'--'", "'++'", "'*'", "'/'", "'%'", "", "", "'='", "'..'",
-	"'?'", "'!~'", "'=~'", "'FOR'", "'RETURN'", "'DISTINCT'", "'FILTER'", "'SORT'",
-	"'LIMIT'", "'LET'", "'COLLECT'", "", "'NONE'", "'NULL'", "", "'INTO'",
-	"'KEEP'", "'WITH'", "'COUNT'", "'ALL'", "'ANY'", "'AGGREGATE'", "'LIKE'",
-	"", "'IN'",
+	"", "", "", "", "", "':'", "';'", "'.'", "','", "'['", "']'", "'('", "')'",
+	"'{'", "'}'", "'>'", "'<'", "'=='", "'>='", "'<='", "'!='", "'+'", "'-'",
+	"'--'", "'++'", "'*'", "'/'", "'%'", "", "", "", "'='", "'?'", "'!~'",
+	"'=~'", "'FOR'", "'RETURN'", "'DISTINCT'", "'FILTER'", "'SORT'", "'LIMIT'",
+	"'LET'", "'COLLECT'", "", "'NONE'", "'NULL'", "", "'INTO'", "'KEEP'", "'WITH'",
+	"'COUNT'", "'ALL'", "'ANY'", "'AGGREGATE'", "'LIKE'", "", "'IN'",
 }
 
 var lexerSymbolicNames = []string{
 	"", "MultiLineComment", "SingleLineComment", "WhiteSpaces", "LineTerminator",
-	"Colon", "SemiColon", "Comma", "Dot", "Ellipsis", "OpenBracket", "CloseBracket",
-	"OpenParen", "CloseParen", "OpenBrace", "CloseBrace", "Gt", "Lt", "Eq",
-	"Gte", "Lte", "Neq", "Plus", "Minus", "MinusMinus", "PlusPlus", "Multi",
-	"Div", "Mod", "And", "Or", "Assign", "Range", "QuestionMark", "RegexNotMatch",
-	"RegexMatch", "For", "Return", "Distinct", "Filter", "Sort", "Limit", "Let",
-	"Collect", "SortDirection", "None", "Null", "BooleanLiteral", "Into", "Keep",
-	"With", "Count", "All", "Any", "Aggregate", "Like", "Not", "In", "Identifier",
+	"Colon", "SemiColon", "Dot", "Comma", "OpenBracket", "CloseBracket", "OpenParen",
+	"CloseParen", "OpenBrace", "CloseBrace", "Gt", "Lt", "Eq", "Gte", "Lte",
+	"Neq", "Plus", "Minus", "MinusMinus", "PlusPlus", "Multi", "Div", "Mod",
+	"And", "Or", "Range", "Assign", "QuestionMark", "RegexNotMatch", "RegexMatch",
+	"For", "Return", "Distinct", "Filter", "Sort", "Limit", "Let", "Collect",
+	"SortDirection", "None", "Null", "BooleanLiteral", "Into", "Keep", "With",
+	"Count", "All", "Any", "Aggregate", "Like", "Not", "In", "Identifier",
 	"StringLiteral", "IntegerLiteral", "FloatLiteral",
 }
 
 var lexerRuleNames = []string{
 	"MultiLineComment", "SingleLineComment", "WhiteSpaces", "LineTerminator",
-	"Colon", "SemiColon", "Comma", "Dot", "Ellipsis", "OpenBracket", "CloseBracket",
-	"OpenParen", "CloseParen", "OpenBrace", "CloseBrace", "Gt", "Lt", "Eq",
-	"Gte", "Lte", "Neq", "Plus", "Minus", "MinusMinus", "PlusPlus", "Multi",
-	"Div", "Mod", "And", "Or", "Assign", "Range", "QuestionMark", "RegexNotMatch",
-	"RegexMatch", "For", "Return", "Distinct", "Filter", "Sort", "Limit", "Let",
-	"Collect", "SortDirection", "None", "Null", "BooleanLiteral", "Into", "Keep",
-	"With", "Count", "All", "Any", "Aggregate", "Like", "Not", "In", "Identifier",
+	"Colon", "SemiColon", "Dot", "Comma", "OpenBracket", "CloseBracket", "OpenParen",
+	"CloseParen", "OpenBrace", "CloseBrace", "Gt", "Lt", "Eq", "Gte", "Lte",
+	"Neq", "Plus", "Minus", "MinusMinus", "PlusPlus", "Multi", "Div", "Mod",
+	"And", "Or", "Range", "Assign", "QuestionMark", "RegexNotMatch", "RegexMatch",
+	"For", "Return", "Distinct", "Filter", "Sort", "Limit", "Let", "Collect",
+	"SortDirection", "None", "Null", "BooleanLiteral", "Into", "Keep", "With",
+	"Count", "All", "Any", "Aggregate", "Like", "Not", "In", "Identifier",
 	"StringLiteral", "IntegerLiteral", "FloatLiteral", "HexDigit", "DecimalIntegerLiteral",
 	"ExponentPart", "Letter", "Digit", "DQSring", "SQString",
 }
@@ -324,59 +315,58 @@ const (
 	FqlLexerLineTerminator    = 4
 	FqlLexerColon             = 5
 	FqlLexerSemiColon         = 6
-	FqlLexerComma             = 7
-	FqlLexerDot               = 8
-	FqlLexerEllipsis          = 9
-	FqlLexerOpenBracket       = 10
-	FqlLexerCloseBracket      = 11
-	FqlLexerOpenParen         = 12
-	FqlLexerCloseParen        = 13
-	FqlLexerOpenBrace         = 14
-	FqlLexerCloseBrace        = 15
-	FqlLexerGt                = 16
-	FqlLexerLt                = 17
-	FqlLexerEq                = 18
-	FqlLexerGte               = 19
-	FqlLexerLte               = 20
-	FqlLexerNeq               = 21
-	FqlLexerPlus              = 22
-	FqlLexerMinus             = 23
-	FqlLexerMinusMinus        = 24
-	FqlLexerPlusPlus          = 25
-	FqlLexerMulti             = 26
-	FqlLexerDiv               = 27
-	FqlLexerMod               = 28
-	FqlLexerAnd               = 29
-	FqlLexerOr                = 30
+	FqlLexerDot               = 7
+	FqlLexerComma             = 8
+	FqlLexerOpenBracket       = 9
+	FqlLexerCloseBracket      = 10
+	FqlLexerOpenParen         = 11
+	FqlLexerCloseParen        = 12
+	FqlLexerOpenBrace         = 13
+	FqlLexerCloseBrace        = 14
+	FqlLexerGt                = 15
+	FqlLexerLt                = 16
+	FqlLexerEq                = 17
+	FqlLexerGte               = 18
+	FqlLexerLte               = 19
+	FqlLexerNeq               = 20
+	FqlLexerPlus              = 21
+	FqlLexerMinus             = 22
+	FqlLexerMinusMinus        = 23
+	FqlLexerPlusPlus          = 24
+	FqlLexerMulti             = 25
+	FqlLexerDiv               = 26
+	FqlLexerMod               = 27
+	FqlLexerAnd               = 28
+	FqlLexerOr                = 29
+	FqlLexerRange             = 30
 	FqlLexerAssign            = 31
-	FqlLexerRange             = 32
-	FqlLexerQuestionMark      = 33
-	FqlLexerRegexNotMatch     = 34
-	FqlLexerRegexMatch        = 35
-	FqlLexerFor               = 36
-	FqlLexerReturn            = 37
-	FqlLexerDistinct          = 38
-	FqlLexerFilter            = 39
-	FqlLexerSort              = 40
-	FqlLexerLimit             = 41
-	FqlLexerLet               = 42
-	FqlLexerCollect           = 43
-	FqlLexerSortDirection     = 44
-	FqlLexerNone              = 45
-	FqlLexerNull              = 46
-	FqlLexerBooleanLiteral    = 47
-	FqlLexerInto              = 48
-	FqlLexerKeep              = 49
-	FqlLexerWith              = 50
-	FqlLexerCount             = 51
-	FqlLexerAll               = 52
-	FqlLexerAny               = 53
-	FqlLexerAggregate         = 54
-	FqlLexerLike              = 55
-	FqlLexerNot               = 56
-	FqlLexerIn                = 57
-	FqlLexerIdentifier        = 58
-	FqlLexerStringLiteral     = 59
-	FqlLexerIntegerLiteral    = 60
-	FqlLexerFloatLiteral      = 61
+	FqlLexerQuestionMark      = 32
+	FqlLexerRegexNotMatch     = 33
+	FqlLexerRegexMatch        = 34
+	FqlLexerFor               = 35
+	FqlLexerReturn            = 36
+	FqlLexerDistinct          = 37
+	FqlLexerFilter            = 38
+	FqlLexerSort              = 39
+	FqlLexerLimit             = 40
+	FqlLexerLet               = 41
+	FqlLexerCollect           = 42
+	FqlLexerSortDirection     = 43
+	FqlLexerNone              = 44
+	FqlLexerNull              = 45
+	FqlLexerBooleanLiteral    = 46
+	FqlLexerInto              = 47
+	FqlLexerKeep              = 48
+	FqlLexerWith              = 49
+	FqlLexerCount             = 50
+	FqlLexerAll               = 51
+	FqlLexerAny               = 52
+	FqlLexerAggregate         = 53
+	FqlLexerLike              = 54
+	FqlLexerNot               = 55
+	FqlLexerIn                = 56
+	FqlLexerIdentifier        = 57
+	FqlLexerStringLiteral     = 58
+	FqlLexerIntegerLiteral    = 59
+	FqlLexerFloatLiteral      = 60
 )

pkg/parser/fql/fqlparser_base_listener.go

@@ -180,6 +180,12 @@ func (s *BaseFqlParserListener) EnterVariable(ctx *VariableContext) {}
 // ExitVariable is called when production variable is exited.
 func (s *BaseFqlParserListener) ExitVariable(ctx *VariableContext) {}
 
+// EnterRangeOperator is called when production rangeOperator is entered.
+func (s *BaseFqlParserListener) EnterRangeOperator(ctx *RangeOperatorContext) {}
+
+// ExitRangeOperator is called when production rangeOperator is exited.
+func (s *BaseFqlParserListener) ExitRangeOperator(ctx *RangeOperatorContext) {}
+
 // EnterArrayLiteral is called when production arrayLiteral is entered.
 func (s *BaseFqlParserListener) EnterArrayLiteral(ctx *ArrayLiteralContext) {}
 
@@ -282,18 +288,6 @@ func (s *BaseFqlParserListener) EnterExpression(ctx *ExpressionContext) {}
 // ExitExpression is called when production expression is exited.
 func (s *BaseFqlParserListener) ExitExpression(ctx *ExpressionContext) {}
 
-// EnterReservedWord is called when production reservedWord is entered.
-func (s *BaseFqlParserListener) EnterReservedWord(ctx *ReservedWordContext) {}
-
-// ExitReservedWord is called when production reservedWord is exited.
-func (s *BaseFqlParserListener) ExitReservedWord(ctx *ReservedWordContext) {}
-
-// EnterKeyword is called when production keyword is entered.
-func (s *BaseFqlParserListener) EnterKeyword(ctx *KeywordContext) {}
-
-// ExitKeyword is called when production keyword is exited.
-func (s *BaseFqlParserListener) ExitKeyword(ctx *KeywordContext) {}
-
 // EnterEqualityOperator is called when production equalityOperator is entered.
 func (s *BaseFqlParserListener) EnterEqualityOperator(ctx *EqualityOperatorContext) {}
 

pkg/parser/fql/fqlparser_base_visitor.go

@@ -111,6 +111,10 @@ func (v *BaseFqlParserVisitor) VisitVariable(ctx *VariableContext) interface{} {
 	return v.VisitChildren(ctx)
 }
 
+func (v *BaseFqlParserVisitor) VisitRangeOperator(ctx *RangeOperatorContext) interface{} {
+	return v.VisitChildren(ctx)
+}
+
 func (v *BaseFqlParserVisitor) VisitArrayLiteral(ctx *ArrayLiteralContext) interface{} {
 	return v.VisitChildren(ctx)
 }
@@ -179,14 +183,6 @@ func (v *BaseFqlParserVisitor) VisitExpression(ctx *ExpressionContext) interface
 	return v.VisitChildren(ctx)
 }
 
-func (v *BaseFqlParserVisitor) VisitReservedWord(ctx *ReservedWordContext) interface{} {
-	return v.VisitChildren(ctx)
-}
-
-func (v *BaseFqlParserVisitor) VisitKeyword(ctx *KeywordContext) interface{} {
-	return v.VisitChildren(ctx)
-}
-
 func (v *BaseFqlParserVisitor) VisitEqualityOperator(ctx *EqualityOperatorContext) interface{} {
 	return v.VisitChildren(ctx)
 }

pkg/parser/fql/fqlparser_listener.go

@@ -85,6 +85,9 @@ type FqlParserListener interface {
 	// EnterVariable is called when entering the variable production.
 	EnterVariable(c *VariableContext)
 
+	// EnterRangeOperator is called when entering the rangeOperator production.
+	EnterRangeOperator(c *RangeOperatorContext)
+
 	// EnterArrayLiteral is called when entering the arrayLiteral production.
 	EnterArrayLiteral(c *ArrayLiteralContext)
 
@@ -136,12 +139,6 @@ type FqlParserListener interface {
 	// EnterExpression is called when entering the expression production.
 	EnterExpression(c *ExpressionContext)
 
-	// EnterReservedWord is called when entering the reservedWord production.
-	EnterReservedWord(c *ReservedWordContext)
-
-	// EnterKeyword is called when entering the keyword production.
-	EnterKeyword(c *KeywordContext)
-
 	// EnterEqualityOperator is called when entering the equalityOperator production.
 	EnterEqualityOperator(c *EqualityOperatorContext)
 
@@ -232,6 +229,9 @@ type FqlParserListener interface {
 	// ExitVariable is called when exiting the variable production.
 	ExitVariable(c *VariableContext)
 
+	// ExitRangeOperator is called when exiting the rangeOperator production.
+	ExitRangeOperator(c *RangeOperatorContext)
+
 	// ExitArrayLiteral is called when exiting the arrayLiteral production.
 	ExitArrayLiteral(c *ArrayLiteralContext)
 
@@ -283,12 +283,6 @@ type FqlParserListener interface {
 	// ExitExpression is called when exiting the expression production.
 	ExitExpression(c *ExpressionContext)
 
-	// ExitReservedWord is called when exiting the reservedWord production.
-	ExitReservedWord(c *ReservedWordContext)
-
-	// ExitKeyword is called when exiting the keyword production.
-	ExitKeyword(c *KeywordContext)
-
 	// ExitEqualityOperator is called when exiting the equalityOperator production.
 	ExitEqualityOperator(c *EqualityOperatorContext)
 

pkg/parser/fql/fqlparser_visitor.go

@@ -85,6 +85,9 @@ type FqlParserVisitor interface {
 	// Visit a parse tree produced by FqlParser#variable.
 	VisitVariable(ctx *VariableContext) interface{}
 
+	// Visit a parse tree produced by FqlParser#rangeOperator.
+	VisitRangeOperator(ctx *RangeOperatorContext) interface{}
+
 	// Visit a parse tree produced by FqlParser#arrayLiteral.
 	VisitArrayLiteral(ctx *ArrayLiteralContext) interface{}
 
@@ -136,12 +139,6 @@ type FqlParserVisitor interface {
 	// Visit a parse tree produced by FqlParser#expression.
 	VisitExpression(ctx *ExpressionContext) interface{}
 
-	// Visit a parse tree produced by FqlParser#reservedWord.
-	VisitReservedWord(ctx *ReservedWordContext) interface{}
-
-	// Visit a parse tree produced by FqlParser#keyword.
-	VisitKeyword(ctx *KeywordContext) interface{}
-
 	// Visit a parse tree produced by FqlParser#equalityOperator.
 	VisitEqualityOperator(ctx *EqualityOperatorContext) interface{}
 

pkg/runtime/expressions/operators/range.go

@@ -0,0 +1,74 @@
+package operators
+
+import (
+	"context"
+	"github.com/MontFerret/ferret/pkg/runtime/collections"
+	"github.com/MontFerret/ferret/pkg/runtime/core"
+	"github.com/MontFerret/ferret/pkg/runtime/values"
+)
+
+type RangeOperator struct {
+	*baseOperator
+}
+
+func NewRangeOperator(
+	src core.SourceMap,
+	left core.Expression,
+	right core.Expression,
+) (*RangeOperator, error) {
+	if core.IsNil(left) {
+		return nil, core.Error(core.ErrMissedArgument, "left expression")
+	}
+
+	if core.IsNil(right) {
+		return nil, core.Error(core.ErrMissedArgument, "right expression")
+	}
+
+	return &RangeOperator{&baseOperator{src, left, right}}, nil
+}
+
+func (operator *RangeOperator) Iterate(ctx context.Context, scope *core.Scope) (collections.Iterator, error) {
+	arr, err := operator.Exec(ctx, scope)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return collections.NewArrayIterator(arr.(*values.Array)), nil
+}
+
+func (operator *RangeOperator) Exec(ctx context.Context, scope *core.Scope) (core.Value, error) {
+	left, err := operator.left.Exec(ctx, scope)
+
+	if err != nil {
+		return values.None, core.SourceError(operator.src, err)
+	}
+
+	err = core.ValidateType(left, core.IntType)
+
+	if err != nil {
+		return values.None, core.SourceError(operator.src, err)
+	}
+
+	right, err := operator.right.Exec(ctx, scope)
+
+	if err != nil {
+		return values.None, core.SourceError(operator.src, err)
+	}
+
+	err = core.ValidateType(right, core.IntType)
+
+	if err != nil {
+		return values.None, core.SourceError(operator.src, err)
+	}
+
+	arr := values.NewArray(10)
+	start := left.(values.Int)
+	end := right.(values.Int)
+
+	for i := start; i <= end; i++ {
+		arr.Push(i)
+	}
+
+	return arr, nil
+}