diff --git a/docs/feature_flags.md b/docs/feature_flags.md
index 0051859d66..74daa11c13 100644
--- a/docs/feature_flags.md
+++ b/docs/feature_flags.md
@@ -197,7 +197,12 @@ the offset calculation.
 
 `step()` can be used in duration expressions.
 For a **range query**, it resolves to the step width of the range query.
-For an **instant query**, it resolves to `0s`. 
+For an **instant query**, it resolves to `0s`.
+
+`range()` can be used in duration expressions.
+For a **range query**, it resolves to the full range of the query (end time - start time).
+For an **instant query**, it resolves to `0s`.
+This is particularly useful in combination with `@end()` to look back over the entire query range, e.g., `max_over_time(metric[range()] @ end())`.
 
 `min(<duration>, <duration>)` and `max(<duration>, <duration>)` can be used to find the minimum or maximum of two duration expressions.
 
diff --git a/promql/durations.go b/promql/durations.go
index c882adfbb6..216dd02725 100644
--- a/promql/durations.go
+++ b/promql/durations.go
@@ -28,7 +28,8 @@ import (
 // in OriginalOffsetExpr representing (1h / 2). This visitor evaluates
 // such duration expression, setting OriginalOffset to 30m.
 type durationVisitor struct {
-	step time.Duration
+	step       time.Duration
+	queryRange time.Duration
 }
 
 // Visit finds any duration expressions in AST Nodes and modifies the Node to
@@ -121,6 +122,8 @@ func (v *durationVisitor) evaluateDurationExpr(expr parser.Expr) (float64, error
 		switch n.Op {
 		case parser.STEP:
 			return float64(v.step.Seconds()), nil
+		case parser.RANGE:
+			return float64(v.queryRange.Seconds()), nil
 		case parser.MIN:
 			return math.Min(lhs, rhs), nil
 		case parser.MAX:
diff --git a/promql/durations_test.go b/promql/durations_test.go
index 18592a0d0a..7a5e8f00a4 100644
--- a/promql/durations_test.go
+++ b/promql/durations_test.go
@@ -213,6 +213,37 @@ func TestCalculateDuration(t *testing.T) {
 			},
 			expected: 3 * time.Second,
 		},
+		{
+			name: "range",
+			expr: &parser.DurationExpr{
+				Op: parser.RANGE,
+			},
+			expected: 5 * time.Minute,
+		},
+		{
+			name: "range division",
+			expr: &parser.DurationExpr{
+				LHS: &parser.DurationExpr{
+					Op: parser.RANGE,
+				},
+				RHS: &parser.NumberLiteral{Val: 2},
+				Op:  parser.DIV,
+			},
+			expected: 150 * time.Second,
+		},
+		{
+			name: "max of step and range",
+			expr: &parser.DurationExpr{
+				LHS: &parser.DurationExpr{
+					Op: parser.STEP,
+				},
+				RHS: &parser.DurationExpr{
+					Op: parser.RANGE,
+				},
+				Op: parser.MAX,
+			},
+			expected: 5 * time.Minute,
+		},
 		{
 			name: "division by zero",
 			expr: &parser.DurationExpr{
@@ -243,7 +274,7 @@ func TestCalculateDuration(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			v := &durationVisitor{step: 1 * time.Second}
+			v := &durationVisitor{step: 1 * time.Second, queryRange: 5 * time.Minute}
 			result, err := v.calculateDuration(tt.expr, tt.allowedNegative)
 			if tt.errorMessage != "" {
 				require.Error(t, err)
diff --git a/promql/engine.go b/promql/engine.go
index 6ba6008b19..52c52b9617 100644
--- a/promql/engine.go
+++ b/promql/engine.go
@@ -3991,7 +3991,7 @@ func unwrapStepInvariantExpr(e parser.Expr) parser.Expr {
 func PreprocessExpr(expr parser.Expr, start, end time.Time, step time.Duration) (parser.Expr, error) {
 	detectHistogramStatsDecoding(expr)
 
-	if err := parser.Walk(&durationVisitor{step: step}, expr, nil); err != nil {
+	if err := parser.Walk(&durationVisitor{step: step, queryRange: end.Sub(start)}, expr, nil); err != nil {
 		return nil, err
 	}
 
diff --git a/promql/parser/ast.go b/promql/parser/ast.go
index 67ecb190fe..8a1a094b79 100644
--- a/promql/parser/ast.go
+++ b/promql/parser/ast.go
@@ -116,8 +116,8 @@ type DurationExpr struct {
 	LHS, RHS Expr     // The operands on the respective sides of the operator.
 	Wrapped  bool     // Set when the duration is wrapped in parentheses.
 
-	StartPos posrange.Pos // For unary operations and step(), the start position of the operator.
-	EndPos   posrange.Pos // For step(), the end position of the operator.
+	StartPos posrange.Pos // For unary operations, step(), and range(), the start position of the operator.
+	EndPos   posrange.Pos // For step() and range(), the end position of the operator.
 }
 
 // Call represents a function call.
@@ -474,7 +474,7 @@ func (e *BinaryExpr) PositionRange() posrange.PositionRange {
 }
 
 func (e *DurationExpr) PositionRange() posrange.PositionRange {
-	if e.Op == STEP {
+	if e.Op == STEP || e.Op == RANGE {
 		return posrange.PositionRange{
 			Start: e.StartPos,
 			End:   e.EndPos,
diff --git a/promql/parser/generated_parser.y b/promql/parser/generated_parser.y
index d9bbb10b28..47776f53d0 100644
--- a/promql/parser/generated_parser.y
+++ b/promql/parser/generated_parser.y
@@ -153,6 +153,7 @@ WITHOUT
 START
 END
 STEP
+RANGE
 %token preprocessorEnd
 
 // Counter reset hints.
@@ -465,7 +466,7 @@ offset_expr: expr OFFSET offset_duration_expr
                         $$ = $1
                         }
                 | expr OFFSET error
-                        { yylex.(*parser).unexpected("offset", "number, duration, or step()"); $$ = $1 }
+                        { yylex.(*parser).unexpected("offset", "number, duration, step(), or range()"); $$ = $1 }
                 ;
 
 /*
@@ -575,11 +576,11 @@ subquery_expr   : expr LEFT_BRACKET positive_duration_expr COLON positive_durati
                 | expr LEFT_BRACKET positive_duration_expr COLON positive_duration_expr error
                         { yylex.(*parser).unexpected("subquery selector", "\"]\""); $$ = $1 }
                 | expr LEFT_BRACKET positive_duration_expr COLON error
-                        { yylex.(*parser).unexpected("subquery selector", "number, duration, or step() or \"]\""); $$ = $1 }
+                        { yylex.(*parser).unexpected("subquery selector", "number, duration, step(), range(), or \"]\""); $$ = $1 }
                 | expr LEFT_BRACKET positive_duration_expr error
                         { yylex.(*parser).unexpected("subquery or range", "\":\" or \"]\""); $$ = $1 }
                 | expr LEFT_BRACKET error
-		        { yylex.(*parser).unexpected("subquery or range selector", "number, duration, or step()"); $$ = $1 }
+		        { yylex.(*parser).unexpected("subquery or range selector", "number, duration, step(), or range()"); $$ = $1 }
                 ;
 
 /*
@@ -696,7 +697,7 @@ metric          : metric_identifier label_set
                 ;
 
 
-metric_identifier: AVG | BOTTOMK | BY | COUNT | COUNT_VALUES | GROUP | IDENTIFIER |  LAND | LOR | LUNLESS | MAX | METRIC_IDENTIFIER | MIN | OFFSET | QUANTILE | STDDEV | STDVAR | SUM | TOPK | WITHOUT | START | END | LIMITK | LIMIT_RATIO | STEP | ANCHORED | SMOOTHED;
+metric_identifier: AVG | BOTTOMK | BY | COUNT | COUNT_VALUES | GROUP | IDENTIFIER |  LAND | LOR | LUNLESS | MAX | METRIC_IDENTIFIER | MIN | OFFSET | QUANTILE | STDDEV | STDVAR | SUM | TOPK | WITHOUT | START | END | LIMITK | LIMIT_RATIO | STEP | RANGE | ANCHORED | SMOOTHED;
 
 label_set       : LEFT_BRACE label_set_list RIGHT_BRACE
                         { $$ = labels.New($2...) }
@@ -953,7 +954,7 @@ counter_reset_hint : UNKNOWN_COUNTER_RESET | COUNTER_RESET | NOT_COUNTER_RESET |
 aggregate_op    : AVG | BOTTOMK | COUNT | COUNT_VALUES | GROUP | MAX | MIN | QUANTILE | STDDEV | STDVAR | SUM | TOPK | LIMITK | LIMIT_RATIO;
 
 // Inside of grouping options label names can be recognized as keywords by the lexer. This is a list of keywords that could also be a label name.
-maybe_label     : AVG | BOOL | BOTTOMK | BY | COUNT | COUNT_VALUES | GROUP | GROUP_LEFT | GROUP_RIGHT | IDENTIFIER | IGNORING | LAND | LOR | LUNLESS | MAX | METRIC_IDENTIFIER | MIN | OFFSET | ON | QUANTILE | STDDEV | STDVAR | SUM | TOPK | START | END | ATAN2 | LIMITK | LIMIT_RATIO | STEP | ANCHORED | SMOOTHED;
+maybe_label     : AVG | BOOL | BOTTOMK | BY | COUNT | COUNT_VALUES | GROUP | GROUP_LEFT | GROUP_RIGHT | IDENTIFIER | IGNORING | LAND | LOR | LUNLESS | MAX | METRIC_IDENTIFIER | MIN | OFFSET | ON | QUANTILE | STDDEV | STDVAR | SUM | TOPK | START | END | ATAN2 | LIMITK | LIMIT_RATIO | STEP | RANGE | ANCHORED | SMOOTHED;
 
 unary_op        : ADD | SUB;
 
@@ -1088,6 +1089,14 @@ offset_duration_expr    : number_duration_literal
                                         EndPos: $3.PositionRange().End,
                                 }
                                 }
+                        | RANGE LEFT_PAREN RIGHT_PAREN
+                                {
+                                $$ = &DurationExpr{
+                                        Op:  RANGE,
+                                        StartPos: $1.PositionRange().Start,
+                                        EndPos: $3.PositionRange().End,
+                                }
+                                }
                         | unary_op STEP LEFT_PAREN RIGHT_PAREN
                                 {
                                 $$ = &DurationExpr{
@@ -1100,6 +1109,18 @@ offset_duration_expr    : number_duration_literal
                                         StartPos: $1.Pos,
                                 }
                                 }
+                        | unary_op RANGE LEFT_PAREN RIGHT_PAREN
+                                {
+                                $$ = &DurationExpr{
+                                        Op:  $1.Typ,
+                                        RHS: &DurationExpr{
+                                                Op:       RANGE,
+                                                StartPos: $2.PositionRange().Start,
+                                                EndPos:   $4.PositionRange().End,
+                                        },
+                                        StartPos: $1.Pos,
+                                }
+                                }
                         | min_max LEFT_PAREN duration_expr COMMA duration_expr RIGHT_PAREN
                                 {
                                     $$ = &DurationExpr{
@@ -1234,6 +1255,14 @@ duration_expr   : number_duration_literal
                                 EndPos:   $3.PositionRange().End,
                             }
                         }
+                | RANGE LEFT_PAREN RIGHT_PAREN
+                        {
+                            $$ = &DurationExpr{
+                                Op:       RANGE,
+                                StartPos: $1.PositionRange().Start,
+                                EndPos:   $3.PositionRange().End,
+                            }
+                        }
                 | min_max LEFT_PAREN duration_expr COMMA duration_expr RIGHT_PAREN
                         {
                             $$ = &DurationExpr{
diff --git a/promql/parser/generated_parser.y.go b/promql/parser/generated_parser.y.go
index eb4b32129a..f5feec0b55 100644
--- a/promql/parser/generated_parser.y.go
+++ b/promql/parser/generated_parser.y.go
@@ -124,19 +124,20 @@ const preprocessorStart = 57431
 const START = 57432
 const END = 57433
 const STEP = 57434
-const preprocessorEnd = 57435
-const counterResetHintsStart = 57436
-const UNKNOWN_COUNTER_RESET = 57437
-const COUNTER_RESET = 57438
-const NOT_COUNTER_RESET = 57439
-const GAUGE_TYPE = 57440
-const counterResetHintsEnd = 57441
-const startSymbolsStart = 57442
-const START_METRIC = 57443
-const START_SERIES_DESCRIPTION = 57444
-const START_EXPRESSION = 57445
-const START_METRIC_SELECTOR = 57446
-const startSymbolsEnd = 57447
+const RANGE = 57435
+const preprocessorEnd = 57436
+const counterResetHintsStart = 57437
+const UNKNOWN_COUNTER_RESET = 57438
+const COUNTER_RESET = 57439
+const NOT_COUNTER_RESET = 57440
+const GAUGE_TYPE = 57441
+const counterResetHintsEnd = 57442
+const startSymbolsStart = 57443
+const START_METRIC = 57444
+const START_SERIES_DESCRIPTION = 57445
+const START_EXPRESSION = 57446
+const START_METRIC_SELECTOR = 57447
+const startSymbolsEnd = 57448
 
 var yyToknames = [...]string{
 	"$end",
@@ -231,6 +232,7 @@ var yyToknames = [...]string{
 	"START",
 	"END",
 	"STEP",
+	"RANGE",
 	"preprocessorEnd",
 	"counterResetHintsStart",
 	"UNKNOWN_COUNTER_RESET",
@@ -256,344 +258,344 @@ var yyExca = [...]int16{
 	-1, 1,
 	1, -1,
 	-2, 0,
-	-1, 40,
-	1, 149,
-	10, 149,
-	24, 149,
+	-1, 41,
+	1, 150,
+	10, 150,
+	24, 150,
 	-2, 0,
-	-1, 70,
-	2, 192,
-	15, 192,
-	79, 192,
-	87, 192,
-	-2, 107,
-	-1, 71,
+	-1, 72,
 	2, 193,
 	15, 193,
 	79, 193,
 	87, 193,
-	-2, 108,
-	-1, 72,
+	-2, 107,
+	-1, 73,
 	2, 194,
 	15, 194,
 	79, 194,
 	87, 194,
-	-2, 110,
-	-1, 73,
+	-2, 108,
+	-1, 74,
 	2, 195,
 	15, 195,
 	79, 195,
 	87, 195,
-	-2, 111,
-	-1, 74,
+	-2, 110,
+	-1, 75,
 	2, 196,
 	15, 196,
 	79, 196,
 	87, 196,
-	-2, 112,
-	-1, 75,
+	-2, 111,
+	-1, 76,
 	2, 197,
 	15, 197,
 	79, 197,
 	87, 197,
-	-2, 117,
-	-1, 76,
+	-2, 112,
+	-1, 77,
 	2, 198,
 	15, 198,
 	79, 198,
 	87, 198,
-	-2, 119,
-	-1, 77,
+	-2, 117,
+	-1, 78,
 	2, 199,
 	15, 199,
 	79, 199,
 	87, 199,
-	-2, 121,
-	-1, 78,
+	-2, 119,
+	-1, 79,
 	2, 200,
 	15, 200,
 	79, 200,
 	87, 200,
-	-2, 122,
-	-1, 79,
+	-2, 121,
+	-1, 80,
 	2, 201,
 	15, 201,
 	79, 201,
 	87, 201,
-	-2, 123,
-	-1, 80,
+	-2, 122,
+	-1, 81,
 	2, 202,
 	15, 202,
 	79, 202,
 	87, 202,
-	-2, 124,
-	-1, 81,
+	-2, 123,
+	-1, 82,
 	2, 203,
 	15, 203,
 	79, 203,
 	87, 203,
-	-2, 125,
-	-1, 82,
+	-2, 124,
+	-1, 83,
 	2, 204,
 	15, 204,
 	79, 204,
 	87, 204,
-	-2, 129,
-	-1, 83,
+	-2, 125,
+	-1, 84,
 	2, 205,
 	15, 205,
 	79, 205,
 	87, 205,
+	-2, 129,
+	-1, 85,
+	2, 206,
+	15, 206,
+	79, 206,
+	87, 206,
 	-2, 130,
-	-1, 135,
-	41, 270,
-	42, 270,
-	52, 270,
-	53, 270,
-	57, 270,
+	-1, 137,
+	41, 274,
+	42, 274,
+	52, 274,
+	53, 274,
+	57, 274,
 	-2, 22,
-	-1, 245,
-	9, 257,
-	12, 257,
-	13, 257,
-	18, 257,
-	19, 257,
-	25, 257,
-	41, 257,
-	47, 257,
-	48, 257,
-	51, 257,
-	57, 257,
-	62, 257,
-	63, 257,
-	64, 257,
-	65, 257,
-	66, 257,
-	67, 257,
-	68, 257,
-	69, 257,
-	70, 257,
-	71, 257,
-	72, 257,
-	73, 257,
-	74, 257,
-	75, 257,
-	79, 257,
-	83, 257,
-	84, 257,
-	85, 257,
-	87, 257,
-	90, 257,
-	91, 257,
-	92, 257,
+	-1, 251,
+	9, 259,
+	12, 259,
+	13, 259,
+	18, 259,
+	19, 259,
+	25, 259,
+	41, 259,
+	47, 259,
+	48, 259,
+	51, 259,
+	57, 259,
+	62, 259,
+	63, 259,
+	64, 259,
+	65, 259,
+	66, 259,
+	67, 259,
+	68, 259,
+	69, 259,
+	70, 259,
+	71, 259,
+	72, 259,
+	73, 259,
+	74, 259,
+	75, 259,
+	79, 259,
+	83, 259,
+	84, 259,
+	85, 259,
+	87, 259,
+	90, 259,
+	91, 259,
+	92, 259,
+	93, 259,
 	-2, 0,
-	-1, 246,
-	9, 257,
-	12, 257,
-	13, 257,
-	18, 257,
-	19, 257,
-	25, 257,
-	41, 257,
-	47, 257,
-	48, 257,
-	51, 257,
-	57, 257,
-	62, 257,
-	63, 257,
-	64, 257,
-	65, 257,
-	66, 257,
-	67, 257,
-	68, 257,
-	69, 257,
-	70, 257,
-	71, 257,
-	72, 257,
-	73, 257,
-	74, 257,
-	75, 257,
-	79, 257,
-	83, 257,
-	84, 257,
-	85, 257,
-	87, 257,
-	90, 257,
-	91, 257,
-	92, 257,
+	-1, 252,
+	9, 259,
+	12, 259,
+	13, 259,
+	18, 259,
+	19, 259,
+	25, 259,
+	41, 259,
+	47, 259,
+	48, 259,
+	51, 259,
+	57, 259,
+	62, 259,
+	63, 259,
+	64, 259,
+	65, 259,
+	66, 259,
+	67, 259,
+	68, 259,
+	69, 259,
+	70, 259,
+	71, 259,
+	72, 259,
+	73, 259,
+	74, 259,
+	75, 259,
+	79, 259,
+	83, 259,
+	84, 259,
+	85, 259,
+	87, 259,
+	90, 259,
+	91, 259,
+	92, 259,
+	93, 259,
 	-2, 0,
 }
 
 const yyPrivate = 57344
 
-const yyLast = 1071
+const yyLast = 1050
 
 var yyAct = [...]int16{
-	57, 182, 401, 399, 185, 406, 278, 237, 193, 332,
-	93, 47, 346, 141, 68, 221, 91, 413, 414, 415,
-	416, 127, 128, 64, 156, 186, 66, 126, 347, 326,
-	129, 243, 122, 125, 130, 244, 245, 246, 119, 122,
-	118, 124, 123, 121, 327, 151, 124, 118, 214, 123,
-	121, 396, 373, 124, 120, 364, 395, 366, 323, 385,
-	328, 354, 352, 133, 216, 135, 6, 98, 100, 101,
-	364, 102, 103, 104, 105, 106, 107, 108, 109, 110,
-	111, 324, 112, 113, 117, 99, 42, 131, 315, 112,
-	144, 117, 136, 400, 241, 350, 191, 143, 128, 349,
-	142, 137, 270, 314, 322, 320, 129, 268, 317, 114,
-	116, 115, 192, 95, 233, 178, 114, 116, 115, 195,
-	199, 200, 201, 202, 203, 204, 174, 321, 319, 177,
-	196, 196, 196, 196, 196, 196, 196, 232, 175, 217,
-	267, 130, 197, 197, 197, 197, 197, 197, 197, 132,
-	196, 134, 138, 205, 390, 407, 239, 207, 210, 227,
-	206, 223, 197, 229, 428, 2, 3, 4, 5, 360,
-	190, 194, 429, 389, 359, 7, 266, 240, 61, 86,
-	189, 231, 269, 427, 181, 150, 426, 262, 60, 358,
-	264, 119, 122, 196, 425, 209, 271, 272, 266, 197,
-	152, 225, 123, 121, 230, 197, 124, 120, 208, 196,
-	84, 224, 226, 119, 122, 38, 384, 213, 222, 383,
-	223, 197, 10, 382, 123, 121, 85, 235, 124, 120,
-	143, 190, 88, 318, 238, 381, 180, 179, 241, 242,
-	380, 189, 379, 378, 247, 248, 249, 250, 251, 252,
-	253, 254, 255, 256, 257, 258, 259, 260, 261, 348,
-	225, 198, 325, 191, 94, 377, 351, 376, 97, 353,
-	224, 226, 344, 345, 92, 195, 375, 196, 374, 192,
-	196, 39, 228, 355, 61, 55, 196, 95, 1, 197,
-	181, 87, 197, 149, 60, 148, 172, 69, 197, 54,
-	157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
-	167, 168, 169, 170, 171, 417, 84, 362, 65, 53,
-	190, 9, 9, 144, 52, 51, 363, 365, 196, 367,
-	189, 155, 85, 142, 275, 368, 369, 184, 274, 50,
-	197, 140, 180, 179, 190, 49, 95, 48, 372, 119,
-	122, 386, 191, 273, 189, 8, 46, 153, 211, 40,
-	123, 121, 196, 371, 124, 120, 392, 198, 192, 394,
-	370, 388, 94, 45, 197, 154, 191, 402, 403, 404,
-	398, 44, 92, 405, 43, 409, 408, 411, 410, 418,
-	90, 281, 192, 56, 236, 95, 422, 316, 419, 420,
-	196, 291, 361, 421, 393, 119, 122, 297, 329, 423,
-	96, 391, 197, 234, 280, 276, 123, 121, 424, 89,
-	124, 120, 412, 119, 122, 187, 188, 183, 431, 196,
-	279, 119, 122, 58, 123, 121, 293, 294, 124, 120,
-	295, 197, 123, 121, 139, 0, 124, 120, 308, 0,
-	0, 282, 284, 286, 287, 288, 296, 298, 301, 302,
-	303, 304, 305, 309, 310, 0, 281, 283, 285, 289,
-	290, 292, 299, 313, 312, 300, 291, 0, 220, 306,
-	307, 311, 297, 219, 0, 0, 277, 387, 0, 280,
-	147, 0, 190, 61, 0, 146, 218, 0, 0, 265,
-	0, 0, 189, 60, 430, 0, 119, 122, 145, 0,
-	0, 293, 294, 0, 0, 295, 0, 123, 121, 0,
-	0, 124, 120, 308, 191, 84, 282, 284, 286, 287,
-	288, 296, 298, 301, 302, 303, 304, 305, 309, 310,
-	192, 85, 283, 285, 289, 290, 292, 299, 313, 312,
-	300, 180, 179, 0, 306, 307, 311, 61, 0, 118,
-	59, 86, 0, 62, 0, 0, 22, 60, 0, 0,
-	212, 0, 0, 63, 0, 0, 263, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 98, 100, 0, 84,
-	0, 0, 0, 0, 0, 18, 19, 109, 110, 20,
-	0, 112, 113, 117, 99, 85, 0, 0, 0, 0,
-	70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-	80, 81, 82, 83, 0, 0, 0, 13, 114, 116,
-	115, 24, 37, 36, 215, 30, 0, 0, 31, 32,
-	67, 61, 41, 0, 59, 86, 0, 62, 0, 0,
-	22, 60, 0, 119, 122, 0, 0, 63, 0, 0,
-	0, 0, 0, 0, 123, 121, 0, 0, 124, 120,
-	0, 357, 0, 84, 0, 0, 0, 0, 61, 18,
-	19, 0, 0, 20, 181, 0, 0, 0, 60, 85,
-	356, 0, 0, 0, 70, 71, 72, 73, 74, 75,
-	76, 77, 78, 79, 80, 81, 82, 83, 0, 0,
-	84, 13, 0, 0, 0, 24, 37, 36, 0, 30,
-	0, 0, 31, 32, 67, 61, 85, 0, 59, 86,
-	0, 62, 331, 0, 22, 60, 180, 179, 0, 330,
-	0, 63, 0, 334, 335, 333, 340, 342, 339, 341,
-	336, 337, 338, 343, 0, 0, 0, 84, 0, 0,
-	0, 198, 0, 18, 19, 0, 0, 20, 0, 0,
-	0, 0, 0, 85, 0, 0, 0, 0, 70, 71,
-	72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
-	82, 83, 17, 86, 0, 13, 0, 0, 22, 24,
-	37, 36, 397, 30, 0, 0, 31, 32, 67, 0,
-	0, 0, 0, 334, 335, 333, 340, 342, 339, 341,
-	336, 337, 338, 343, 0, 0, 0, 18, 19, 0,
-	0, 20, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 11, 12, 14, 15, 16, 21, 23, 25,
-	26, 27, 28, 29, 33, 34, 17, 38, 0, 13,
-	0, 0, 22, 24, 37, 36, 0, 30, 0, 0,
-	31, 32, 35, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 18, 19, 0, 0, 20, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 11, 12, 14, 15,
-	16, 21, 23, 25, 26, 27, 28, 29, 33, 34,
-	118, 0, 0, 13, 0, 0, 0, 24, 37, 36,
-	0, 30, 0, 0, 31, 32, 35, 0, 0, 118,
-	0, 0, 0, 0, 0, 0, 0, 98, 100, 101,
-	0, 102, 103, 104, 105, 106, 107, 108, 109, 110,
-	111, 0, 112, 113, 117, 99, 98, 100, 101, 0,
-	102, 103, 104, 0, 106, 107, 108, 109, 110, 111,
-	173, 112, 113, 117, 99, 118, 0, 61, 0, 114,
-	116, 115, 0, 181, 118, 0, 0, 60, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 114, 116,
-	115, 0, 98, 100, 101, 0, 102, 103, 0, 84,
-	106, 107, 100, 109, 110, 111, 0, 112, 113, 117,
-	99, 0, 109, 110, 0, 85, 112, 0, 117, 99,
-	0, 0, 0, 0, 0, 180, 179, 0, 0, 0,
-	0, 0, 0, 0, 114, 116, 115, 0, 0, 0,
-	0, 0, 0, 114, 116, 115, 0, 0, 0, 0,
-	176,
+	58, 186, 413, 411, 341, 418, 286, 243, 197, 95,
+	189, 48, 355, 144, 70, 227, 93, 251, 252, 356,
+	159, 190, 65, 120, 17, 88, 127, 130, 128, 129,
+	22, 425, 426, 427, 428, 131, 249, 121, 124, 335,
+	250, 67, 132, 126, 408, 407, 377, 332, 125, 123,
+	331, 102, 126, 122, 336, 154, 324, 6, 397, 18,
+	19, 111, 112, 20, 135, 114, 137, 119, 101, 375,
+	337, 323, 375, 330, 11, 12, 14, 15, 16, 21,
+	23, 25, 26, 27, 28, 29, 33, 34, 43, 133,
+	329, 13, 116, 118, 117, 24, 38, 37, 146, 30,
+	402, 124, 31, 32, 35, 36, 130, 412, 138, 396,
+	194, 125, 123, 328, 131, 126, 365, 182, 239, 401,
+	193, 199, 204, 205, 206, 207, 208, 209, 177, 363,
+	362, 181, 200, 200, 200, 200, 200, 200, 200, 178,
+	120, 238, 223, 201, 201, 201, 201, 201, 201, 201,
+	212, 215, 134, 200, 136, 211, 210, 2, 3, 4,
+	5, 222, 233, 221, 201, 245, 235, 384, 333, 371,
+	228, 247, 229, 360, 370, 359, 246, 358, 188, 273,
+	140, 368, 114, 195, 119, 194, 277, 139, 62, 369,
+	268, 237, 229, 271, 185, 193, 441, 200, 61, 196,
+	367, 201, 273, 383, 155, 278, 279, 280, 201, 116,
+	118, 117, 231, 200, 236, 121, 124, 195, 382, 440,
+	86, 218, 230, 232, 201, 381, 125, 123, 276, 275,
+	126, 122, 231, 196, 274, 146, 87, 132, 439, 327,
+	429, 438, 230, 232, 248, 141, 184, 183, 419, 253,
+	254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+	264, 265, 266, 267, 334, 357, 191, 192, 214, 353,
+	354, 202, 203, 361, 121, 124, 88, 364, 283, 7,
+	39, 213, 282, 199, 200, 125, 123, 395, 200, 126,
+	122, 366, 10, 194, 200, 201, 394, 281, 393, 201,
+	392, 391, 90, 193, 390, 201, 160, 161, 162, 163,
+	164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+	174, 389, 194, 388, 120, 195, 373, 387, 386, 385,
+	153, 99, 193, 62, 442, 374, 376, 200, 378, 185,
+	56, 196, 40, 61, 379, 380, 89, 152, 201, 151,
+	1, 100, 102, 103, 195, 104, 105, 175, 71, 108,
+	109, 398, 111, 112, 113, 86, 114, 115, 119, 101,
+	196, 66, 200, 55, 9, 9, 54, 404, 8, 53,
+	406, 87, 41, 201, 52, 158, 410, 51, 414, 415,
+	416, 184, 183, 116, 118, 117, 421, 420, 423, 422,
+	417, 430, 50, 49, 289, 47, 156, 216, 147, 46,
+	431, 432, 200, 372, 299, 433, 202, 203, 145, 96,
+	305, 435, 157, 201, 403, 437, 326, 288, 147, 94,
+	436, 97, 45, 44, 57, 242, 434, 234, 145, 338,
+	443, 200, 97, 98, 121, 124, 143, 240, 284, 301,
+	302, 97, 201, 303, 91, 125, 123, 424, 187, 126,
+	122, 316, 287, 59, 290, 292, 294, 295, 296, 304,
+	306, 309, 310, 311, 312, 313, 317, 318, 142, 0,
+	291, 293, 297, 298, 300, 307, 322, 321, 308, 289,
+	96, 0, 314, 315, 319, 320, 226, 150, 405, 299,
+	94, 225, 149, 0, 0, 305, 0, 0, 92, 285,
+	0, 0, 288, 97, 224, 148, 62, 121, 124, 0,
+	0, 0, 272, 0, 0, 0, 61, 0, 125, 123,
+	0, 0, 126, 122, 301, 302, 0, 0, 303, 0,
+	0, 0, 0, 0, 0, 0, 316, 0, 86, 290,
+	292, 294, 295, 296, 304, 306, 309, 310, 311, 312,
+	313, 317, 318, 0, 87, 291, 293, 297, 298, 300,
+	307, 322, 321, 308, 184, 183, 0, 314, 315, 319,
+	320, 62, 0, 120, 60, 88, 0, 63, 0, 0,
+	22, 61, 0, 0, 217, 0, 0, 64, 0, 269,
+	270, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	100, 102, 0, 86, 0, 0, 0, 0, 0, 18,
+	19, 111, 112, 20, 0, 114, 115, 119, 101, 87,
+	0, 0, 0, 0, 72, 73, 74, 75, 76, 77,
+	78, 79, 80, 81, 82, 83, 84, 85, 0, 0,
+	400, 13, 116, 118, 117, 24, 38, 37, 399, 30,
+	0, 0, 31, 32, 68, 69, 62, 42, 0, 60,
+	88, 0, 63, 0, 0, 22, 61, 121, 124, 0,
+	0, 0, 64, 0, 121, 124, 0, 0, 125, 123,
+	0, 0, 126, 122, 0, 125, 123, 0, 86, 126,
+	122, 0, 0, 0, 18, 19, 0, 0, 20, 0,
+	0, 0, 0, 0, 87, 0, 0, 0, 0, 72,
+	73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+	83, 84, 85, 0, 0, 0, 13, 0, 0, 220,
+	24, 38, 37, 0, 30, 0, 325, 31, 32, 68,
+	69, 62, 0, 0, 60, 88, 0, 63, 121, 124,
+	22, 61, 0, 0, 0, 0, 0, 64, 0, 125,
+	123, 0, 0, 126, 122, 0, 0, 0, 0, 0,
+	121, 124, 0, 86, 0, 0, 0, 0, 0, 18,
+	19, 125, 123, 20, 0, 126, 122, 0, 0, 87,
+	0, 0, 0, 0, 72, 73, 74, 75, 76, 77,
+	78, 79, 80, 81, 82, 83, 84, 85, 17, 39,
+	0, 13, 0, 0, 22, 24, 38, 37, 0, 30,
+	340, 0, 31, 32, 68, 69, 0, 339, 0, 0,
+	0, 343, 344, 342, 349, 351, 348, 350, 345, 346,
+	347, 352, 241, 18, 19, 0, 194, 20, 0, 244,
+	0, 0, 0, 247, 0, 0, 193, 0, 11, 12,
+	14, 15, 16, 21, 23, 25, 26, 27, 28, 29,
+	33, 34, 0, 0, 120, 13, 0, 0, 195, 24,
+	38, 37, 219, 30, 0, 0, 31, 32, 35, 36,
+	0, 0, 0, 120, 196, 0, 0, 0, 0, 0,
+	0, 100, 102, 103, 0, 104, 105, 106, 107, 108,
+	109, 110, 111, 112, 113, 0, 114, 115, 119, 101,
+	100, 102, 103, 0, 104, 105, 106, 107, 108, 109,
+	110, 111, 112, 113, 198, 114, 115, 119, 101, 120,
+	0, 62, 0, 116, 118, 117, 0, 185, 176, 0,
+	0, 61, 0, 0, 0, 62, 0, 0, 0, 0,
+	0, 185, 116, 118, 117, 61, 100, 102, 103, 0,
+	104, 105, 106, 86, 108, 109, 110, 111, 112, 113,
+	0, 114, 115, 119, 101, 0, 0, 86, 0, 87,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 184,
+	183, 0, 0, 87, 0, 0, 0, 0, 116, 118,
+	117, 0, 0, 184, 183, 409, 0, 0, 0, 0,
+	0, 0, 0, 0, 202, 203, 343, 344, 342, 349,
+	351, 348, 350, 345, 346, 347, 352, 0, 179, 180,
 }
 
 var yyPact = [...]int16{
-	64, 165, 844, 844, 632, 780, -1000, -1000, -1000, 202,
+	55, 269, 806, 806, 657, 12, -1000, -1000, -1000, 267,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 370, -1000,
-	266, -1000, 906, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -3, 19, 126,
-	-1000, -1000, 716, -1000, 716, 166, -1000, 86, 137, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 321, -1000, -1000, 488,
-	-1000, -1000, 291, 181, -1000, -1000, 21, -1000, -54, -54,
-	-54, -54, -54, -54, -54, -54, -54, -54, -54, -54,
-	-54, -54, -54, -54, 978, -1000, -1000, 335, 169, 275,
-	275, 275, 275, 275, 275, 126, -57, -1000, 193, 193,
-	548, -1000, 26, 612, 33, -15, -1000, 42, 275, 476,
-	-1000, -1000, 216, 157, -1000, -1000, 262, -1000, 179, -1000,
-	112, 222, 716, -1000, -51, -44, -1000, 716, 716, 716,
-	716, 716, 716, 716, 716, 716, 716, 716, 716, 716,
-	716, 716, -1000, -1000, -1000, 484, 125, 92, -3, -1000,
-	-1000, 275, -1000, 87, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 161, 161, 332, -1000, -3, -1000, 275, 86, -10,
-	-10, -15, -15, -15, -15, -1000, -1000, -1000, 464, -1000,
-	-1000, 81, -1000, 906, -1000, -1000, -1000, 390, -1000, 88,
-	-1000, 103, -1000, -1000, -1000, -1000, -1000, 102, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 32, 55, 3, -1000, -1000,
-	-1000, 715, 980, 193, 193, 193, 193, 33, 33, 545,
-	545, 545, 971, 925, 545, 545, 971, 33, 33, 545,
-	33, 980, -1000, 84, 80, 275, -15, 40, 275, 612,
-	39, -1000, -1000, -1000, 669, -1000, 167, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 488,
+	-1000, 329, -1000, 889, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -4, 27,
+	222, -1000, -1000, 742, -1000, 742, 263, -1000, 172, 165,
+	230, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 426, -1000,
+	-1000, 495, -1000, -1000, 345, 326, -1000, -1000, 31, -1000,
+	-58, -58, -58, -58, -58, -58, -58, -58, -58, -58,
+	-58, -58, -58, -58, -58, -58, 956, -1000, -1000, 176,
+	942, 324, 324, 324, 324, 324, 324, 222, -52, -1000,
+	266, 266, 572, -1000, 870, 717, 126, -13, -1000, 141,
+	139, 324, 494, -1000, -1000, 168, 188, -1000, -1000, 417,
+	-1000, 189, -1000, 116, 847, 742, -1000, -46, -63, -1000,
+	742, 742, 742, 742, 742, 742, 742, 742, 742, 742,
+	742, 742, 742, 742, 742, -1000, -1000, -1000, 507, 219,
+	214, 213, -4, -1000, -1000, 324, -1000, 190, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 101, 101, 276, -1000, -4,
+	-1000, 324, 172, 165, 59, 59, -13, -13, -13, -13,
+	-1000, -1000, -1000, 487, -1000, -1000, 49, -1000, 889, -1000,
+	-1000, -1000, -1000, 739, -1000, 406, -1000, 88, -1000, -1000,
+	-1000, -1000, -1000, 48, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, 21, 142, 13, -1000, -1000, -1000, 813, 9, 266,
+	266, 266, 266, 126, 126, 569, 569, 569, 310, 935,
+	569, 569, 310, 126, 126, 569, 126, 9, -1000, 162,
+	160, 158, 324, -13, 108, 107, 324, 717, 94, -1000,
+	-1000, -1000, 179, -1000, 167, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 716, 275, -1000, -1000, -1000,
-	-1000, -1000, -1000, 51, 51, 31, 51, 78, 78, 346,
-	35, -1000, -1000, 272, 270, 261, 259, 237, 236, 234,
-	229, 217, 213, 210, -1000, -1000, -1000, -1000, -1000, 37,
-	275, 465, -1000, 364, -1000, 152, -1000, -1000, -1000, 389,
-	-1000, 906, 382, -1000, -1000, -1000, 51, -1000, 30, 25,
-	785, -1000, -1000, -1000, 36, 311, 311, 311, 161, 141,
-	141, 36, 141, 36, -78, -1000, 308, -1000, 275, -1000,
-	-1000, -1000, -1000, -1000, -1000, 51, 51, -1000, -1000, -1000,
-	51, -1000, -1000, -1000, -1000, -1000, -1000, 311, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 275, 172, -1000,
-	-1000, -1000, 162, -1000, 150, -1000, 483, -1000, -1000, -1000,
-	-1000, -1000,
+	-1000, -1000, -1000, -1000, 742, 324, -1000, -1000, -1000, -1000,
+	-1000, -1000, 53, 53, 20, 53, 155, 155, 201, 150,
+	-1000, -1000, 323, 322, 321, 317, 315, 298, 295, 294,
+	292, 290, 281, -1000, -1000, -1000, -1000, -1000, 87, 36,
+	324, 636, -1000, -1000, 643, -1000, 98, -1000, -1000, -1000,
+	402, -1000, 889, 476, -1000, -1000, -1000, 53, -1000, 19,
+	18, 1008, -1000, -1000, -1000, 50, 284, 284, 284, 101,
+	234, 234, 50, 234, 50, -65, -1000, -1000, 233, -1000,
+	324, -1000, -1000, -1000, -1000, -1000, -1000, 53, 53, -1000,
+	-1000, -1000, 53, -1000, -1000, -1000, -1000, -1000, -1000, 284,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 324,
+	403, -1000, -1000, -1000, 217, -1000, 174, -1000, 313, -1000,
+	-1000, -1000, -1000, -1000,
 }
 
 var yyPgo = [...]int16{
-	0, 444, 13, 433, 6, 15, 430, 318, 23, 427,
-	10, 422, 14, 222, 355, 419, 16, 415, 28, 12,
-	413, 410, 7, 408, 9, 5, 396, 3, 2, 4,
-	394, 25, 1, 393, 384, 33, 200, 381, 375, 86,
-	373, 358, 27, 357, 26, 356, 11, 347, 345, 339,
-	331, 325, 324, 319, 299, 285, 0, 297, 8, 296,
-	288, 281,
+	0, 478, 13, 463, 6, 15, 462, 371, 22, 458,
+	9, 457, 14, 292, 378, 454, 16, 448, 19, 12,
+	447, 443, 7, 439, 4, 5, 436, 3, 2, 10,
+	435, 21, 1, 434, 433, 26, 204, 432, 422, 88,
+	409, 407, 28, 406, 41, 405, 11, 403, 402, 387,
+	385, 384, 379, 376, 373, 340, 0, 358, 8, 357,
+	350, 342,
 }
 
 var yyR1 = [...]int8{
@@ -610,22 +612,22 @@ var yyR1 = [...]int8{
 	2, 2, 2, 2, 2, 14, 14, 7, 7, 7,
 	7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
 	7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 13, 13, 13, 13, 15, 15,
-	15, 16, 16, 16, 16, 16, 16, 16, 61, 21,
-	21, 21, 21, 20, 20, 20, 20, 20, 20, 20,
-	20, 20, 30, 30, 30, 22, 22, 22, 22, 23,
-	23, 23, 24, 24, 24, 24, 24, 24, 24, 24,
-	24, 24, 24, 25, 25, 26, 26, 26, 11, 11,
-	11, 11, 3, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 3, 3, 3, 6, 6, 6, 6,
+	7, 7, 7, 7, 7, 13, 13, 13, 13, 15,
+	15, 15, 16, 16, 16, 16, 16, 16, 16, 61,
+	21, 21, 21, 21, 20, 20, 20, 20, 20, 20,
+	20, 20, 20, 30, 30, 30, 22, 22, 22, 22,
+	23, 23, 23, 24, 24, 24, 24, 24, 24, 24,
+	24, 24, 24, 24, 25, 25, 26, 26, 26, 11,
+	11, 11, 11, 3, 3, 3, 3, 3, 3, 3,
+	3, 3, 3, 3, 3, 3, 3, 6, 6, 6,
 	6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
 	6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-	6, 6, 6, 6, 6, 6, 6, 6, 8, 8,
-	5, 5, 5, 5, 46, 46, 29, 29, 31, 31,
-	32, 32, 28, 27, 27, 52, 10, 19, 19, 59,
-	59, 59, 59, 59, 59, 59, 59, 12, 12, 56,
-	56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-	57,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	8, 8, 5, 5, 5, 5, 46, 46, 29, 29,
+	31, 31, 32, 32, 28, 27, 27, 52, 10, 19,
+	19, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+	59, 12, 12, 56, 56, 56, 56, 56, 56, 56,
+	56, 56, 56, 56, 56, 57,
 }
 
 var yyR2 = [...]int8{
@@ -642,116 +644,118 @@ var yyR2 = [...]int8{
 	1, 3, 3, 2, 1, 2, 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, 3, 4, 2, 0, 3, 1,
-	2, 3, 3, 1, 3, 3, 2, 1, 2, 0,
-	3, 2, 1, 1, 3, 1, 3, 4, 1, 3,
-	5, 5, 1, 1, 1, 4, 3, 3, 2, 3,
-	1, 2, 3, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 4, 3, 3, 1, 2, 1, 1,
+	1, 1, 1, 1, 1, 3, 4, 2, 0, 3,
+	1, 2, 3, 3, 1, 3, 3, 2, 1, 2,
+	0, 3, 2, 1, 1, 3, 1, 3, 4, 1,
+	3, 5, 5, 1, 1, 1, 4, 3, 3, 2,
+	3, 1, 2, 3, 3, 3, 3, 3, 3, 3,
+	3, 3, 3, 3, 4, 3, 3, 1, 2, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
-	1, 1, 1, 2, 1, 1, 1, 0, 1, 1,
-	2, 3, 4, 6, 7, 4, 1, 1, 1, 1,
-	2, 3, 3, 3, 3, 3, 3, 3, 6, 1,
-	3,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	2, 2, 1, 1, 1, 2, 1, 1, 1, 0,
+	1, 1, 2, 3, 3, 4, 4, 6, 7, 4,
+	1, 1, 1, 1, 2, 3, 3, 3, 3, 3,
+	3, 3, 3, 6, 1, 3,
 }
 
 var yyChk = [...]int16{
-	-1000, -60, 101, 102, 103, 104, 2, 10, -14, -7,
+	-1000, -60, 102, 103, 104, 105, 2, 10, -14, -7,
 	-13, 62, 63, 79, 64, 65, 66, 12, 47, 48,
 	51, 67, 18, 68, 83, 69, 70, 71, 72, 73,
-	87, 90, 91, 74, 75, 92, 85, 84, 13, -61,
-	-14, 10, -39, -34, -37, -40, -45, -46, -47, -48,
-	-49, -51, -52, -53, -54, -55, -33, -56, -3, 12,
-	19, 9, 15, 25, -8, -7, -44, 92, -12, -57,
-	62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
-	72, 73, 74, 75, 41, 57, 13, -55, -13, -15,
-	20, -16, 12, -10, 2, 25, -21, 2, 41, 59,
-	42, 43, 45, 46, 47, 48, 49, 50, 51, 52,
-	53, 54, 56, 57, 83, 85, 84, 58, 14, 41,
-	57, 53, 42, 52, 56, -35, -42, 2, 79, 87,
-	15, -42, -39, -56, -39, -56, -44, 15, 15, -1,
-	20, -2, 12, -10, 2, 20, 7, 2, 4, 2,
-	4, 24, -36, -43, -38, -50, 78, -36, -36, -36,
+	87, 90, 91, 74, 75, 92, 93, 85, 84, 13,
+	-61, -14, 10, -39, -34, -37, -40, -45, -46, -47,
+	-48, -49, -51, -52, -53, -54, -55, -33, -56, -3,
+	12, 19, 9, 15, 25, -8, -7, -44, 92, 93,
+	-12, -57, 62, 63, 64, 65, 66, 67, 68, 69,
+	70, 71, 72, 73, 74, 75, 41, 57, 13, -55,
+	-13, -15, 20, -16, 12, -10, 2, 25, -21, 2,
+	41, 59, 42, 43, 45, 46, 47, 48, 49, 50,
+	51, 52, 53, 54, 56, 57, 83, 85, 84, 58,
+	14, 41, 57, 53, 42, 52, 56, -35, -42, 2,
+	79, 87, 15, -42, -39, -56, -39, -56, -44, 15,
+	15, 15, -1, 20, -2, 12, -10, 2, 20, 7,
+	2, 4, 2, 4, 24, -36, -43, -38, -50, 78,
 	-36, -36, -36, -36, -36, -36, -36, -36, -36, -36,
-	-36, -36, -59, 2, -46, -8, 92, -12, -56, 68,
-	67, 15, -32, -9, 2, -29, -31, 90, 91, 19,
-	9, 41, 57, -58, 2, -56, -46, -8, 92, -56,
-	-56, -56, -56, -56, -56, -42, -35, -18, 15, 2,
-	-18, -41, 22, -39, 22, 22, 22, -56, 20, 7,
-	2, -5, 2, 4, 54, 44, 55, -5, 20, -16,
-	25, 2, 25, 2, -20, 5, -30, -22, 12, -29,
-	-31, 16, -39, 82, 86, 80, 81, -39, -39, -39,
-	-39, -39, -39, -39, -39, -39, -39, -39, -39, -39,
-	-39, -39, -46, 92, -12, 15, -56, 15, 15, -56,
-	15, -29, -29, 21, 6, 2, -17, 22, -4, -6,
-	25, 2, 62, 78, 63, 79, 64, 65, 66, 80,
-	81, 12, 82, 47, 48, 51, 67, 18, 68, 83,
-	86, 69, 70, 71, 72, 73, 90, 91, 59, 74,
-	75, 92, 85, 84, 22, 7, 7, 20, -2, 25,
-	2, 25, 2, 26, 26, -31, 26, 41, 57, -23,
-	24, 17, -24, 30, 28, 29, 35, 36, 37, 33,
-	31, 34, 32, 38, -18, -18, -19, -18, -19, 15,
-	15, -56, 22, -56, 22, -58, 21, 2, 22, 7,
-	2, -39, -56, -28, 19, -28, 26, -28, -22, -22,
-	24, 17, 2, 17, 6, 6, 6, 6, 6, 6,
-	6, 6, 6, 6, 6, 22, -56, 22, 7, 21,
-	2, 22, -4, 22, -28, 26, 26, 17, -24, -27,
-	57, -28, -32, -32, -32, -29, -25, 14, -25, -27,
-	-25, -27, -11, 95, 96, 97, 98, 7, -56, -28,
-	-28, -28, -26, -32, -56, 22, 24, 21, 2, 22,
-	21, -32,
+	-36, -36, -36, -36, -36, -59, 2, -46, -8, 92,
+	93, -12, -56, 68, 67, 15, -32, -9, 2, -29,
+	-31, 90, 91, 19, 9, 41, 57, -58, 2, -56,
+	-46, -8, 92, 93, -56, -56, -56, -56, -56, -56,
+	-42, -35, -18, 15, 2, -18, -41, 22, -39, 22,
+	22, 22, 22, -56, 20, 7, 2, -5, 2, 4,
+	54, 44, 55, -5, 20, -16, 25, 2, 25, 2,
+	-20, 5, -30, -22, 12, -29, -31, 16, -39, 82,
+	86, 80, 81, -39, -39, -39, -39, -39, -39, -39,
+	-39, -39, -39, -39, -39, -39, -39, -39, -46, 92,
+	93, -12, 15, -56, 15, 15, 15, -56, 15, -29,
+	-29, 21, 6, 2, -17, 22, -4, -6, 25, 2,
+	62, 78, 63, 79, 64, 65, 66, 80, 81, 12,
+	82, 47, 48, 51, 67, 18, 68, 83, 86, 69,
+	70, 71, 72, 73, 90, 91, 59, 74, 75, 92,
+	93, 85, 84, 22, 7, 7, 20, -2, 25, 2,
+	25, 2, 26, 26, -31, 26, 41, 57, -23, 24,
+	17, -24, 30, 28, 29, 35, 36, 37, 33, 31,
+	34, 32, 38, -18, -18, -19, -18, -19, 15, 15,
+	15, -56, 22, 22, -56, 22, -58, 21, 2, 22,
+	7, 2, -39, -56, -28, 19, -28, 26, -28, -22,
+	-22, 24, 17, 2, 17, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 22, 22, -56, 22,
+	7, 21, 2, 22, -4, 22, -28, 26, 26, 17,
+	-24, -27, 57, -28, -32, -32, -32, -29, -25, 14,
+	-25, -27, -25, -27, -11, 96, 97, 98, 99, 7,
+	-56, -28, -28, -28, -26, -32, -56, 22, 24, 21,
+	2, 22, 21, -32,
 }
 
 var yyDef = [...]int16{
-	0, -2, 137, 137, 0, 0, 7, 6, 1, 137,
+	0, -2, 138, 138, 0, 0, 7, 6, 1, 138,
 	106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
 	116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
-	126, 127, 128, 129, 130, 131, 132, 133, 0, 2,
-	-2, 3, 4, 8, 9, 10, 11, 12, 13, 14,
-	15, 16, 17, 18, 19, 20, 21, 22, 0, 113,
-	244, 245, 0, 255, 0, 90, 91, 131, 0, 279,
-	-2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-	-2, -2, -2, -2, 238, 239, 0, 5, 105, 0,
-	136, 139, 0, 143, 147, 256, 148, 152, 46, 46,
+	126, 127, 128, 129, 130, 131, 132, 133, 134, 0,
+	2, -2, 3, 4, 8, 9, 10, 11, 12, 13,
+	14, 15, 16, 17, 18, 19, 20, 21, 22, 0,
+	113, 246, 247, 0, 257, 0, 90, 91, 131, 132,
+	0, 284, -2, -2, -2, -2, -2, -2, -2, -2,
+	-2, -2, -2, -2, -2, -2, 240, 241, 0, 5,
+	105, 0, 137, 140, 0, 144, 148, 258, 149, 153,
 	46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
-	46, 46, 46, 46, 0, 74, 75, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 25, 26, 0, 0,
-	0, 64, 0, 22, 88, -2, 89, 0, 0, 0,
-	94, 96, 0, 100, 104, 134, 0, 140, 0, 146,
-	0, 151, 0, 45, 50, 51, 47, 0, 0, 0,
+	46, 46, 46, 46, 46, 46, 0, 74, 75, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 25, 26,
+	0, 0, 0, 64, 0, 22, 88, -2, 89, 0,
+	0, 0, 0, 94, 96, 0, 100, 104, 135, 0,
+	141, 0, 147, 0, 152, 0, 45, 50, 51, 47,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 72, 73, 259, 0, 0, 0, 266, 267,
-	268, 0, 76, 0, 78, 250, 251, 79, 80, 246,
-	247, 0, 0, 0, 87, 71, 269, 0, 0, 271,
-	272, 273, 274, 275, 276, 23, 24, 27, 0, 57,
-	28, 0, 66, 68, 70, 280, 277, 0, 92, 0,
-	97, 0, 103, 240, 241, 242, 243, 0, 135, 138,
-	141, 144, 142, 145, 150, 153, 155, 158, 162, 163,
-	164, 0, 29, 0, 0, -2, -2, 30, 31, 32,
-	33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
-	43, 44, 260, 0, 0, 0, 270, 0, 0, 0,
-	0, 248, 249, 81, 0, 86, 0, 56, 59, 61,
-	62, 63, 206, 207, 208, 209, 210, 211, 212, 213,
-	214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
-	224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
-	234, 235, 236, 237, 65, 69, 0, 93, 95, 98,
-	102, 99, 101, 0, 0, 0, 0, 0, 0, 0,
-	0, 168, 170, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 48, 49, 52, 258, 53, 0,
-	0, 0, 261, 0, 77, 0, 83, 85, 54, 0,
-	60, 67, 0, 154, 252, 156, 0, 159, 0, 0,
-	0, 166, 171, 167, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 262, 0, 265, 0, 82,
-	84, 55, 58, 278, 157, 0, 0, 165, 169, 172,
-	0, 254, 173, 174, 175, 176, 177, 0, 178, 179,
-	180, 181, 182, 188, 189, 190, 191, 0, 0, 160,
-	161, 253, 0, 186, 0, 263, 0, 184, 187, 264,
-	183, 185,
+	0, 0, 0, 0, 0, 72, 73, 261, 0, 0,
+	0, 0, 270, 271, 272, 0, 76, 0, 78, 252,
+	253, 79, 80, 248, 249, 0, 0, 0, 87, 71,
+	273, 0, 0, 0, 275, 276, 277, 278, 279, 280,
+	23, 24, 27, 0, 57, 28, 0, 66, 68, 70,
+	285, 281, 282, 0, 92, 0, 97, 0, 103, 242,
+	243, 244, 245, 0, 136, 139, 142, 145, 143, 146,
+	151, 154, 156, 159, 163, 164, 165, 0, 29, 0,
+	0, -2, -2, 30, 31, 32, 33, 34, 35, 36,
+	37, 38, 39, 40, 41, 42, 43, 44, 262, 0,
+	0, 0, 0, 274, 0, 0, 0, 0, 0, 250,
+	251, 81, 0, 86, 0, 56, 59, 61, 62, 63,
+	207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+	217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
+	227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
+	237, 238, 239, 65, 69, 0, 93, 95, 98, 102,
+	99, 101, 0, 0, 0, 0, 0, 0, 0, 0,
+	169, 171, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 48, 49, 52, 260, 53, 0, 0,
+	0, 0, 263, 264, 0, 77, 0, 83, 85, 54,
+	0, 60, 67, 0, 155, 254, 157, 0, 160, 0,
+	0, 0, 167, 172, 168, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 265, 266, 0, 269,
+	0, 82, 84, 55, 58, 283, 158, 0, 0, 166,
+	170, 173, 0, 256, 174, 175, 176, 177, 178, 0,
+	179, 180, 181, 182, 183, 189, 190, 191, 192, 0,
+	0, 161, 162, 255, 0, 187, 0, 267, 0, 185,
+	188, 268, 184, 186,
 }
 
 var yyTok1 = [...]int8{
@@ -769,7 +773,7 @@ var yyTok2 = [...]int8{
 	72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
 	82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
 	92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
-	102, 103, 104, 105,
+	102, 103, 104, 105, 106,
 }
 
 var yyTok3 = [...]int8{
@@ -1434,7 +1438,7 @@ yydefault:
 	case 73:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yylex.(*parser).unexpected("offset", "number, duration, or step()")
+			yylex.(*parser).unexpected("offset", "number, duration, step(), or range()")
 			yyVAL.node = yyDollar[1].node
 		}
 	case 74:
@@ -1541,7 +1545,7 @@ yydefault:
 	case 85:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		{
-			yylex.(*parser).unexpected("subquery selector", "number, duration, or step() or \"]\"")
+			yylex.(*parser).unexpected("subquery selector", "number, duration, step(), range(), or \"]\"")
 			yyVAL.node = yyDollar[1].node
 		}
 	case 86:
@@ -1553,7 +1557,7 @@ yydefault:
 	case 87:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yylex.(*parser).unexpected("subquery or range selector", "number, duration, or step()")
+			yylex.(*parser).unexpected("subquery or range selector", "number, duration, step(), or range()")
 			yyVAL.node = yyDollar[1].node
 		}
 	case 88:
@@ -1691,63 +1695,57 @@ yydefault:
 		{
 			yyVAL.labels = yyDollar[1].labels
 		}
-	case 134:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		{
-			yyVAL.labels = labels.New(yyDollar[2].lblList...)
-		}
 	case 135:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.labels = labels.New(yyDollar[2].lblList...)
 		}
 	case 136:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		{
-			yyVAL.labels = labels.New()
+			yyVAL.labels = labels.New(yyDollar[2].lblList...)
 		}
 	case 137:
-		yyDollar = yyS[yypt-0 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yyVAL.labels = labels.New()
 		}
 	case 138:
+		yyDollar = yyS[yypt-0 : yypt+1]
+		{
+			yyVAL.labels = labels.New()
+		}
+	case 139:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.lblList = append(yyDollar[1].lblList, yyDollar[3].label)
 		}
-	case 139:
+	case 140:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.lblList = []labels.Label{yyDollar[1].label}
 		}
-	case 140:
+	case 141:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yylex.(*parser).unexpected("label set", "\",\" or \"}\"")
 			yyVAL.lblList = yyDollar[1].lblList
 		}
-	case 141:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		{
-			yyVAL.label = labels.Label{Name: yyDollar[1].item.Val, Value: yylex.(*parser).unquoteString(yyDollar[3].item.Val)}
-		}
 	case 142:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.label = labels.Label{Name: yyDollar[1].item.Val, Value: yylex.(*parser).unquoteString(yyDollar[3].item.Val)}
 		}
 	case 143:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		{
+			yyVAL.label = labels.Label{Name: yyDollar[1].item.Val, Value: yylex.(*parser).unquoteString(yyDollar[3].item.Val)}
+		}
+	case 144:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.label = labels.Label{Name: labels.MetricName, Value: yyDollar[1].item.Val}
 		}
-	case 144:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		{
-			yylex.(*parser).unexpected("label set", "string")
-			yyVAL.label = labels.Label{}
-		}
 	case 145:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
@@ -1755,18 +1753,24 @@ yydefault:
 			yyVAL.label = labels.Label{}
 		}
 	case 146:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		{
+			yylex.(*parser).unexpected("label set", "string")
+			yyVAL.label = labels.Label{}
+		}
+	case 147:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yylex.(*parser).unexpected("label set", "\"=\"")
 			yyVAL.label = labels.Label{}
 		}
-	case 147:
+	case 148:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yylex.(*parser).unexpected("label set", "identifier or \"}\"")
 			yyVAL.label = labels.Label{}
 		}
-	case 148:
+	case 149:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yylex.(*parser).generatedParserResult = &seriesDescription{
@@ -1774,33 +1778,33 @@ yydefault:
 				values: yyDollar[2].series,
 			}
 		}
-	case 149:
+	case 150:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
 		}
-	case 150:
+	case 151:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.series = append(yyDollar[1].series, yyDollar[3].series...)
 		}
-	case 151:
+	case 152:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yyVAL.series = yyDollar[1].series
 		}
-	case 152:
+	case 153:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yylex.(*parser).unexpected("series values", "")
 			yyVAL.series = nil
 		}
-	case 153:
+	case 154:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{{Omitted: true}}
 		}
-	case 154:
+	case 155:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
@@ -1808,12 +1812,12 @@ yydefault:
 				yyVAL.series = append(yyVAL.series, SequenceValue{Omitted: true})
 			}
 		}
-	case 155:
+	case 156:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{{Value: yyDollar[1].float}}
 		}
-	case 156:
+	case 157:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
@@ -1822,7 +1826,7 @@ yydefault:
 				yyVAL.series = append(yyVAL.series, SequenceValue{Value: yyDollar[1].float})
 			}
 		}
-	case 157:
+	case 158:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
@@ -1832,12 +1836,12 @@ yydefault:
 				yyDollar[1].float += yyDollar[2].float
 			}
 		}
-	case 158:
+	case 159:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{{Histogram: yyDollar[1].histogram}}
 		}
-	case 159:
+	case 160:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.series = []SequenceValue{}
@@ -1847,7 +1851,7 @@ yydefault:
 				//$1 += $2
 			}
 		}
-	case 160:
+	case 161:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		{
 			val, err := yylex.(*parser).histogramsIncreaseSeries(yyDollar[1].histogram, yyDollar[3].histogram, yyDollar[5].uint)
@@ -1856,7 +1860,7 @@ yydefault:
 			}
 			yyVAL.series = val
 		}
-	case 161:
+	case 162:
 		yyDollar = yyS[yypt-5 : yypt+1]
 		{
 			val, err := yylex.(*parser).histogramsDecreaseSeries(yyDollar[1].histogram, yyDollar[3].histogram, yyDollar[5].uint)
@@ -1865,7 +1869,7 @@ yydefault:
 			}
 			yyVAL.series = val
 		}
-	case 162:
+	case 163:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			if yyDollar[1].item.Val != "stale" {
@@ -1873,130 +1877,130 @@ yydefault:
 			}
 			yyVAL.float = math.Float64frombits(value.StaleNaN)
 		}
-	case 165:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		{
-			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&yyDollar[2].descriptors)
-		}
 	case 166:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		{
 			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&yyDollar[2].descriptors)
 		}
 	case 167:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			m := yylex.(*parser).newMap()
-			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&m)
+			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&yyDollar[2].descriptors)
 		}
 	case 168:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			m := yylex.(*parser).newMap()
 			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&m)
 		}
 	case 169:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		{
+			m := yylex.(*parser).newMap()
+			yyVAL.histogram = yylex.(*parser).buildHistogramFromMap(&m)
+		}
+	case 170:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = *(yylex.(*parser).mergeMaps(&yyDollar[1].descriptors, &yyDollar[3].descriptors))
 		}
-	case 170:
+	case 171:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.descriptors = yyDollar[1].descriptors
 		}
-	case 171:
+	case 172:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yylex.(*parser).unexpected("histogram description", "histogram description key, e.g. buckets:[5 10 7]")
 		}
-	case 172:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		{
-			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["schema"] = yyDollar[3].int
-		}
 	case 173:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["sum"] = yyDollar[3].float
+			yyVAL.descriptors["schema"] = yyDollar[3].int
 		}
 	case 174:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["count"] = yyDollar[3].float
+			yyVAL.descriptors["sum"] = yyDollar[3].float
 		}
 	case 175:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["z_bucket"] = yyDollar[3].float
+			yyVAL.descriptors["count"] = yyDollar[3].float
 		}
 	case 176:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["z_bucket_w"] = yyDollar[3].float
+			yyVAL.descriptors["z_bucket"] = yyDollar[3].float
 		}
 	case 177:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["custom_values"] = yyDollar[3].bucket_set
+			yyVAL.descriptors["z_bucket_w"] = yyDollar[3].float
 		}
 	case 178:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["buckets"] = yyDollar[3].bucket_set
+			yyVAL.descriptors["custom_values"] = yyDollar[3].bucket_set
 		}
 	case 179:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["offset"] = yyDollar[3].int
+			yyVAL.descriptors["buckets"] = yyDollar[3].bucket_set
 		}
 	case 180:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["n_buckets"] = yyDollar[3].bucket_set
+			yyVAL.descriptors["offset"] = yyDollar[3].int
 		}
 	case 181:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["n_offset"] = yyDollar[3].int
+			yyVAL.descriptors["n_buckets"] = yyDollar[3].bucket_set
 		}
 	case 182:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.descriptors = yylex.(*parser).newMap()
-			yyVAL.descriptors["counter_reset_hint"] = yyDollar[3].item
+			yyVAL.descriptors["n_offset"] = yyDollar[3].int
 		}
 	case 183:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yyVAL.bucket_set = yyDollar[2].bucket_set
+			yyVAL.descriptors = yylex.(*parser).newMap()
+			yyVAL.descriptors["counter_reset_hint"] = yyDollar[3].item
 		}
 	case 184:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		{
 			yyVAL.bucket_set = yyDollar[2].bucket_set
 		}
 	case 185:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yyVAL.bucket_set = append(yyDollar[1].bucket_set, yyDollar[3].float)
+			yyVAL.bucket_set = yyDollar[2].bucket_set
 		}
 	case 186:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		{
+			yyVAL.bucket_set = append(yyDollar[1].bucket_set, yyDollar[3].float)
+		}
+	case 187:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.bucket_set = []float64{yyDollar[1].float}
 		}
-	case 244:
+	case 246:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.node = &NumberLiteral{
@@ -2004,7 +2008,7 @@ yydefault:
 				PosRange: yyDollar[1].item.PositionRange(),
 			}
 		}
-	case 245:
+	case 247:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			var err error
@@ -2019,12 +2023,12 @@ yydefault:
 				Duration: true,
 			}
 		}
-	case 246:
+	case 248:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.float = yylex.(*parser).number(yyDollar[1].item.Val)
 		}
-	case 247:
+	case 249:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			var err error
@@ -2035,17 +2039,17 @@ yydefault:
 			}
 			yyVAL.float = dur.Seconds()
 		}
-	case 248:
+	case 250:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yyVAL.float = yyDollar[2].float
 		}
-	case 249:
+	case 251:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yyVAL.float = -yyDollar[2].float
 		}
-	case 252:
+	case 254:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			var err error
@@ -2054,17 +2058,17 @@ yydefault:
 				yylex.(*parser).addParseErrf(yyDollar[1].item.PositionRange(), "invalid repetition in series values: %s", err)
 			}
 		}
-	case 253:
+	case 255:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			yyVAL.int = -int64(yyDollar[2].uint)
 		}
-	case 254:
+	case 256:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.int = int64(yyDollar[1].uint)
 		}
-	case 255:
+	case 257:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.node = &StringLiteral{
@@ -2072,7 +2076,7 @@ yydefault:
 				PosRange: yyDollar[1].item.PositionRange(),
 			}
 		}
-	case 256:
+	case 258:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			yyVAL.item = Item{
@@ -2081,12 +2085,12 @@ yydefault:
 				Val: yylex.(*parser).unquoteString(yyDollar[1].item.Val),
 			}
 		}
-	case 257:
+	case 259:
 		yyDollar = yyS[yypt-0 : yypt+1]
 		{
 			yyVAL.strings = nil
 		}
-	case 259:
+	case 261:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			nl := yyDollar[1].node.(*NumberLiteral)
@@ -2097,7 +2101,7 @@ yydefault:
 			}
 			yyVAL.node = nl
 		}
-	case 260:
+	case 262:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			nl := yyDollar[2].node.(*NumberLiteral)
@@ -2112,7 +2116,7 @@ yydefault:
 			nl.PosRange.Start = yyDollar[1].item.Pos
 			yyVAL.node = nl
 		}
-	case 261:
+	case 263:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.node = &DurationExpr{
@@ -2121,7 +2125,16 @@ yydefault:
 				EndPos:   yyDollar[3].item.PositionRange().End,
 			}
 		}
-	case 262:
+	case 264:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		{
+			yyVAL.node = &DurationExpr{
+				Op:       RANGE,
+				StartPos: yyDollar[1].item.PositionRange().Start,
+				EndPos:   yyDollar[3].item.PositionRange().End,
+			}
+		}
+	case 265:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		{
 			yyVAL.node = &DurationExpr{
@@ -2134,7 +2147,20 @@ yydefault:
 				StartPos: yyDollar[1].item.Pos,
 			}
 		}
-	case 263:
+	case 266:
+		yyDollar = yyS[yypt-4 : yypt+1]
+		{
+			yyVAL.node = &DurationExpr{
+				Op: yyDollar[1].item.Typ,
+				RHS: &DurationExpr{
+					Op:       RANGE,
+					StartPos: yyDollar[2].item.PositionRange().Start,
+					EndPos:   yyDollar[4].item.PositionRange().End,
+				},
+				StartPos: yyDollar[1].item.Pos,
+			}
+		}
+	case 267:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		{
 			yyVAL.node = &DurationExpr{
@@ -2145,7 +2171,7 @@ yydefault:
 				RHS:      yyDollar[5].node.(Expr),
 			}
 		}
-	case 264:
+	case 268:
 		yyDollar = yyS[yypt-7 : yypt+1]
 		{
 			yyVAL.node = &DurationExpr{
@@ -2161,7 +2187,7 @@ yydefault:
 				},
 			}
 		}
-	case 265:
+	case 269:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		{
 			de := yyDollar[3].node.(*DurationExpr)
@@ -2176,7 +2202,7 @@ yydefault:
 			}
 			yyVAL.node = yyDollar[3].node
 		}
-	case 269:
+	case 273:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		{
 			nl := yyDollar[1].node.(*NumberLiteral)
@@ -2187,7 +2213,7 @@ yydefault:
 			}
 			yyVAL.node = nl
 		}
-	case 270:
+	case 274:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		{
 			switch expr := yyDollar[2].node.(type) {
@@ -2220,25 +2246,25 @@ yydefault:
 				break
 			}
 		}
-	case 271:
+	case 275:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yylex.(*parser).experimentalDurationExpr(yyDollar[1].node.(Expr))
 			yyVAL.node = &DurationExpr{Op: ADD, LHS: yyDollar[1].node.(Expr), RHS: yyDollar[3].node.(Expr)}
 		}
-	case 272:
+	case 276:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yylex.(*parser).experimentalDurationExpr(yyDollar[1].node.(Expr))
 			yyVAL.node = &DurationExpr{Op: SUB, LHS: yyDollar[1].node.(Expr), RHS: yyDollar[3].node.(Expr)}
 		}
-	case 273:
+	case 277:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yylex.(*parser).experimentalDurationExpr(yyDollar[1].node.(Expr))
 			yyVAL.node = &DurationExpr{Op: MUL, LHS: yyDollar[1].node.(Expr), RHS: yyDollar[3].node.(Expr)}
 		}
-	case 274:
+	case 278:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yylex.(*parser).experimentalDurationExpr(yyDollar[1].node.(Expr))
@@ -2249,7 +2275,7 @@ yydefault:
 			}
 			yyVAL.node = &DurationExpr{Op: DIV, LHS: yyDollar[1].node.(Expr), RHS: yyDollar[3].node.(Expr)}
 		}
-	case 275:
+	case 279:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yylex.(*parser).experimentalDurationExpr(yyDollar[1].node.(Expr))
@@ -2260,13 +2286,13 @@ yydefault:
 			}
 			yyVAL.node = &DurationExpr{Op: MOD, LHS: yyDollar[1].node.(Expr), RHS: yyDollar[3].node.(Expr)}
 		}
-	case 276:
+	case 280:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yylex.(*parser).experimentalDurationExpr(yyDollar[1].node.(Expr))
 			yyVAL.node = &DurationExpr{Op: POW, LHS: yyDollar[1].node.(Expr), RHS: yyDollar[3].node.(Expr)}
 		}
-	case 277:
+	case 281:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yyVAL.node = &DurationExpr{
@@ -2275,7 +2301,16 @@ yydefault:
 				EndPos:   yyDollar[3].item.PositionRange().End,
 			}
 		}
-	case 278:
+	case 282:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		{
+			yyVAL.node = &DurationExpr{
+				Op:       RANGE,
+				StartPos: yyDollar[1].item.PositionRange().Start,
+				EndPos:   yyDollar[3].item.PositionRange().End,
+			}
+		}
+	case 283:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		{
 			yyVAL.node = &DurationExpr{
@@ -2286,7 +2321,7 @@ yydefault:
 				RHS:      yyDollar[5].node.(Expr),
 			}
 		}
-	case 280:
+	case 285:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		{
 			yylex.(*parser).experimentalDurationExpr(yyDollar[2].node.(Expr))
diff --git a/promql/parser/lex.go b/promql/parser/lex.go
index 296b91d1ae..ad4b685150 100644
--- a/promql/parser/lex.go
+++ b/promql/parser/lex.go
@@ -143,6 +143,7 @@ var key = map[string]ItemType{
 	"start": START,
 	"end":   END,
 	"step":  STEP,
+	"range": RANGE,
 }
 
 var histogramDesc = map[string]ItemType{
@@ -915,6 +916,9 @@ func (l *Lexer) scanDurationKeyword() bool {
 			case "step":
 				l.emit(STEP)
 				return true
+			case "range":
+				l.emit(RANGE)
+				return true
 			case "min":
 				l.emit(MIN)
 				return true
@@ -1175,7 +1179,7 @@ func lexDurationExpr(l *Lexer) stateFn {
 	case r == ',':
 		l.emit(COMMA)
 		return lexDurationExpr
-	case r == 's' || r == 'S' || r == 'm' || r == 'M':
+	case r == 's' || r == 'S' || r == 'm' || r == 'M' || r == 'r' || r == 'R':
 		if l.scanDurationKeyword() {
 			return lexDurationExpr
 		}
diff --git a/promql/parser/parse_test.go b/promql/parser/parse_test.go
index b5d7c288d1..62349efd93 100644
--- a/promql/parser/parse_test.go
+++ b/promql/parser/parse_test.go
@@ -2708,7 +2708,7 @@ var testExpr = []struct {
 		errors: ParseErrors{
 			ParseErr{
 				PositionRange: posrange.PositionRange{Start: 4, End: 5},
-				Err:           errors.New("unexpected \"]\" in subquery or range selector, expected number, duration, or step()"),
+				Err:           errors.New("unexpected \"]\" in subquery or range selector, expected number, duration, step(), or range()"),
 				Query:         `foo[]`,
 			},
 		},
@@ -2741,7 +2741,7 @@ var testExpr = []struct {
 		errors: ParseErrors{
 			ParseErr{
 				PositionRange: posrange.PositionRange{Start: 22, End: 22},
-				Err:           errors.New("unexpected end of input in offset, expected number, duration, or step()"),
+				Err:           errors.New("unexpected end of input in offset, expected number, duration, step(), or range()"),
 				Query:         `some_metric[5m] OFFSET`,
 			},
 		},
@@ -4698,6 +4698,100 @@ var testExpr = []struct {
 			},
 		},
 	},
+	{
+		input: `foo[range()]`,
+		expected: &MatrixSelector{
+			VectorSelector: &VectorSelector{
+				Name: "foo",
+				LabelMatchers: []*labels.Matcher{
+					MustLabelMatcher(labels.MatchEqual, model.MetricNameLabel, "foo"),
+				},
+				PosRange: posrange.PositionRange{Start: 0, End: 3},
+			},
+			RangeExpr: &DurationExpr{
+				Op:       RANGE,
+				StartPos: 4,
+				EndPos:   11,
+			},
+			EndPos: 12,
+		},
+	},
+	{
+		input: `foo[-range()]`,
+		expected: &MatrixSelector{
+			VectorSelector: &VectorSelector{
+				Name: "foo",
+				LabelMatchers: []*labels.Matcher{
+					MustLabelMatcher(labels.MatchEqual, model.MetricNameLabel, "foo"),
+				},
+				PosRange: posrange.PositionRange{Start: 0, End: 3},
+			},
+			RangeExpr: &DurationExpr{
+				Op:       SUB,
+				StartPos: 4,
+				RHS:      &DurationExpr{Op: RANGE, StartPos: 5, EndPos: 12},
+			},
+			EndPos: 13,
+		},
+	},
+	{
+		input: `foo offset range()`,
+		expected: &VectorSelector{
+			Name: "foo",
+			LabelMatchers: []*labels.Matcher{
+				MustLabelMatcher(labels.MatchEqual, model.MetricNameLabel, "foo"),
+			},
+			PosRange: posrange.PositionRange{Start: 0, End: 18},
+			OriginalOffsetExpr: &DurationExpr{
+				Op:       RANGE,
+				StartPos: 11,
+				EndPos:   18,
+			},
+		},
+	},
+	{
+		input: `foo offset -range()`,
+		expected: &VectorSelector{
+			Name: "foo",
+			LabelMatchers: []*labels.Matcher{
+				MustLabelMatcher(labels.MatchEqual, model.MetricNameLabel, "foo"),
+			},
+			PosRange: posrange.PositionRange{Start: 0, End: 19},
+			OriginalOffsetExpr: &DurationExpr{
+				Op:       SUB,
+				RHS:      &DurationExpr{Op: RANGE, StartPos: 12, EndPos: 19},
+				StartPos: 11,
+			},
+		},
+	},
+	{
+		input: `foo[max(range(),5s)]`,
+		expected: &MatrixSelector{
+			VectorSelector: &VectorSelector{
+				Name: "foo",
+				LabelMatchers: []*labels.Matcher{
+					MustLabelMatcher(labels.MatchEqual, model.MetricNameLabel, "foo"),
+				},
+				PosRange: posrange.PositionRange{Start: 0, End: 3},
+			},
+			RangeExpr: &DurationExpr{
+				Op: MAX,
+				LHS: &DurationExpr{
+					Op:       RANGE,
+					StartPos: 8,
+					EndPos:   15,
+				},
+				RHS: &NumberLiteral{
+					Val:      5,
+					Duration: true,
+					PosRange: posrange.PositionRange{Start: 16, End: 18},
+				},
+				StartPos: 4,
+				EndPos:   19,
+			},
+			EndPos: 20,
+		},
+	},
 	{
 		input: `foo[4s+4s:1s*2] offset (5s-8)`,
 		expected: &SubqueryExpr{
@@ -4942,7 +5036,7 @@ var testExpr = []struct {
 		errors: ParseErrors{
 			ParseErr{
 				PositionRange: posrange.PositionRange{Start: 8, End: 9},
-				Err:           errors.New(`unexpected "]" in subquery or range selector, expected number, duration, or step()`),
+				Err:           errors.New(`unexpected "]" in subquery or range selector, expected number, duration, step(), or range()`),
 				Query:         `foo[step]`,
 			},
 		},
diff --git a/promql/parser/printer.go b/promql/parser/printer.go
index 961167428b..2531bb6272 100644
--- a/promql/parser/printer.go
+++ b/promql/parser/printer.go
@@ -182,6 +182,8 @@ func (node *DurationExpr) writeTo(b *bytes.Buffer) {
 	switch {
 	case node.Op == STEP:
 		b.WriteString("step()")
+	case node.Op == RANGE:
+		b.WriteString("range()")
 	case node.Op == MIN:
 		b.WriteString("min(")
 		b.WriteString(node.LHS.String())
diff --git a/promql/parser/printer_test.go b/promql/parser/printer_test.go
index b28da988da..b7fa3e6ccb 100644
--- a/promql/parser/printer_test.go
+++ b/promql/parser/printer_test.go
@@ -266,6 +266,21 @@ func TestExprString(t *testing.T) {
 		{
 			in: "foo[200 - min(step() + 10s, -max(step() ^ 2, 3))]",
 		},
+		{
+			in: "foo[range()]",
+		},
+		{
+			in: "foo[-range()]",
+		},
+		{
+			in: "foo offset range()",
+		},
+		{
+			in: "foo offset -range()",
+		},
+		{
+			in: "foo[max(range(), 5s)]",
+		},
 		{
 			in: `predict_linear(foo[1h], 3000)`,
 		},
diff --git a/promql/promqltest/test.go b/promql/promqltest/test.go
index d4a11b9e50..83e47f1915 100644
--- a/promql/promqltest/test.go
+++ b/promql/promqltest/test.go
@@ -1519,6 +1519,10 @@ func (t *test) runInstantQuery(iq atModifierTestCase, cmd *evalCmd, engine promq
 
 	// Check query returns same result in range mode,
 	// by checking against the middle step.
+	// Skip this check for queries containing range() since it would resolve differently.
+	if strings.Contains(iq.expr, "range()") {
+		return nil
+	}
 	q, err = engine.NewRangeQuery(t.context, t.storage, nil, iq.expr, iq.evalTime.Add(-time.Minute), iq.evalTime.Add(time.Minute), time.Minute)
 	if err != nil {
 		return fmt.Errorf("error creating range query for %q (line %d): %w", cmd.expr, cmd.line, err)
diff --git a/promql/promqltest/testdata/duration_expression.test b/promql/promqltest/testdata/duration_expression.test
index db8253777b..e58b34131b 100644
--- a/promql/promqltest/testdata/duration_expression.test
+++ b/promql/promqltest/testdata/duration_expression.test
@@ -225,4 +225,27 @@ eval range from 50s to 60s step 5s metric1_total offset max(3s,min(step(), 1s))+
 	{} 8047 8052 8057
 
 eval range from 50s to 60s step 5s metric1_total offset -(min(step(), 2s)-5)+8000
-	{} 8047 8052 8057
\ No newline at end of file
+	{} 8047 8052 8057
+
+# Test range() function - resolves to query range (end - start).
+# For a range query from 50s to 60s, range() = 10s.
+eval range from 50s to 60s step 10s count_over_time(metric1_total[range()])
+	{} 10 10
+
+eval range from 50s to 60s step 5s count_over_time(metric1_total[range()])
+	{} 10 10 10
+
+eval range from 50s to 60s step 5s metric1_total offset range()
+	metric1_total{} 40 45 50
+
+eval range from 50s to 60s step 5s metric1_total offset min(range(), 8s)
+	metric1_total{} 42 47 52
+
+clear
+
+load 1s
+  metric1_total 0+1x100
+
+# For an instant query (start == end), range() = 0s, offset 0s.
+eval instant at 50s metric1_total offset range()
+	metric1_total{} 50