diff --git a/pkg/logql/log/label_extraction_expr.go b/pkg/logql/log/label_extraction_expr.go new file mode 100644 index 0000000000..79a0ab7162 --- /dev/null +++ b/pkg/logql/log/label_extraction_expr.go @@ -0,0 +1,13 @@ +package log + +type LabelExtractionExpr struct { + Identifier string + Expression string +} + +func NewLabelExtractionExpr(identifier, expression string) LabelExtractionExpr { + return LabelExtractionExpr{ + Identifier: identifier, + Expression: expression, + } +} diff --git a/pkg/logql/log/parser.go b/pkg/logql/log/parser.go index 7e2781e265..811e7f639b 100644 --- a/pkg/logql/log/parser.go +++ b/pkg/logql/log/parser.go @@ -347,7 +347,7 @@ type LogfmtExpressionParser struct { keys internedStringSet } -func NewLogfmtExpressionParser(expressions []XExpression) (*LogfmtExpressionParser, error) { +func NewLogfmtExpressionParser(expressions []LabelExtractionExpr) (*LogfmtExpressionParser, error) { if len(expressions) == 0 { return nil, fmt.Errorf("no logfmt expression provided") } @@ -447,7 +447,7 @@ type JSONExpressionParser struct { keys internedStringSet } -func NewJSONExpressionParser(expressions []XExpression) (*JSONExpressionParser, error) { +func NewJSONExpressionParser(expressions []LabelExtractionExpr) (*JSONExpressionParser, error) { paths := make(map[string][]interface{}) for _, exp := range expressions { diff --git a/pkg/logql/log/parser_test.go b/pkg/logql/log/parser_test.go index e9ab7f92be..bf6487677f 100644 --- a/pkg/logql/log/parser_test.go +++ b/pkg/logql/log/parser_test.go @@ -117,15 +117,15 @@ func TestJSONExpressionParser(t *testing.T) { tests := []struct { name string line []byte - expressions []XExpression + expressions []LabelExtractionExpr lbs labels.Labels want labels.Labels }{ { "single field", testLine, - []XExpression{ - NewXExpr("app", "app"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("app", "app"), }, labels.Labels{}, labels.Labels{ @@ -135,8 +135,8 @@ func TestJSONExpressionParser(t *testing.T) { { "alternate syntax", testLine, - []XExpression{ - NewXExpr("test", `["field with space"]`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("test", `["field with space"]`), }, labels.Labels{}, labels.Labels{ @@ -146,9 +146,9 @@ func TestJSONExpressionParser(t *testing.T) { { "multiple fields", testLine, - []XExpression{ - NewXExpr("app", "app"), - NewXExpr("namespace", "namespace"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("app", "app"), + NewLabelExtractionExpr("namespace", "namespace"), }, labels.Labels{}, labels.Labels{ @@ -159,8 +159,8 @@ func TestJSONExpressionParser(t *testing.T) { { "utf8", testLine, - []XExpression{ - NewXExpr("utf8", `["field with ÜFT8👌"]`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("utf8", `["field with ÜFT8👌"]`), }, labels.Labels{}, labels.Labels{ @@ -170,8 +170,8 @@ func TestJSONExpressionParser(t *testing.T) { { "nested field", testLine, - []XExpression{ - NewXExpr("uuid", "pod.uuid"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("uuid", "pod.uuid"), }, labels.Labels{}, labels.Labels{ @@ -181,8 +181,8 @@ func TestJSONExpressionParser(t *testing.T) { { "nested field alternate syntax", testLine, - []XExpression{ - NewXExpr("uuid", `pod["uuid"]`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("uuid", `pod["uuid"]`), }, labels.Labels{}, labels.Labels{ @@ -192,8 +192,8 @@ func TestJSONExpressionParser(t *testing.T) { { "nested field alternate syntax 2", testLine, - []XExpression{ - NewXExpr("uuid", `["pod"]["uuid"]`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("uuid", `["pod"]["uuid"]`), }, labels.Labels{}, labels.Labels{ @@ -203,8 +203,8 @@ func TestJSONExpressionParser(t *testing.T) { { "nested field alternate syntax 3", testLine, - []XExpression{ - NewXExpr("uuid", `["pod"].uuid`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("uuid", `["pod"].uuid`), }, labels.Labels{}, labels.Labels{ @@ -214,8 +214,8 @@ func TestJSONExpressionParser(t *testing.T) { { "array element", testLine, - []XExpression{ - NewXExpr("param", `pod.deployment.params[0]`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("param", `pod.deployment.params[0]`), }, labels.Labels{}, labels.Labels{ @@ -225,8 +225,8 @@ func TestJSONExpressionParser(t *testing.T) { { "full array", testLine, - []XExpression{ - NewXExpr("params", `pod.deployment.params`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("params", `pod.deployment.params`), }, labels.Labels{}, labels.Labels{ @@ -236,8 +236,8 @@ func TestJSONExpressionParser(t *testing.T) { { "full object", testLine, - []XExpression{ - NewXExpr("deployment", `pod.deployment`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("deployment", `pod.deployment`), }, labels.Labels{}, labels.Labels{ @@ -247,8 +247,8 @@ func TestJSONExpressionParser(t *testing.T) { { "expression matching nothing", testLine, - []XExpression{ - NewXExpr("nope", `pod.nope`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("nope", `pod.nope`), }, labels.Labels{}, labels.Labels{ @@ -258,8 +258,8 @@ func TestJSONExpressionParser(t *testing.T) { { "null field", testLine, - []XExpression{ - NewXExpr("nf", `null_field`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("nf", `null_field`), }, labels.Labels{}, labels.Labels{ @@ -269,8 +269,8 @@ func TestJSONExpressionParser(t *testing.T) { { "boolean field", testLine, - []XExpression{ - NewXExpr("bool", `bool_field`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("bool", `bool_field`), }, labels.Labels{}, labels.Labels{ @@ -280,8 +280,8 @@ func TestJSONExpressionParser(t *testing.T) { { "label override", testLine, - []XExpression{ - NewXExpr("uuid", `pod.uuid`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("uuid", `pod.uuid`), }, labels.Labels{ {Name: "uuid", Value: "bar"}, @@ -294,8 +294,8 @@ func TestJSONExpressionParser(t *testing.T) { { "non-matching expression", testLine, - []XExpression{ - NewXExpr("request_size", `request.size.invalid`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("request_size", `request.size.invalid`), }, labels.Labels{ {Name: "uuid", Value: "bar"}, @@ -308,8 +308,8 @@ func TestJSONExpressionParser(t *testing.T) { { "empty line", []byte("{}"), - []XExpression{ - NewXExpr("uuid", `pod.uuid`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("uuid", `pod.uuid`), }, labels.Labels{}, labels.Labels{ @@ -319,8 +319,8 @@ func TestJSONExpressionParser(t *testing.T) { { "existing labels are not affected", testLine, - []XExpression{ - NewXExpr("uuid", `will.not.work`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("uuid", `will.not.work`), }, labels.Labels{ {Name: "foo", Value: "bar"}, @@ -333,8 +333,8 @@ func TestJSONExpressionParser(t *testing.T) { { "invalid JSON line", []byte(`invalid json`), - []XExpression{ - NewXExpr("uuid", `will.not.work`), + []LabelExtractionExpr{ + NewLabelExtractionExpr("uuid", `will.not.work`), }, labels.Labels{ {Name: "foo", Value: "bar"}, @@ -363,38 +363,38 @@ func TestJSONExpressionParser(t *testing.T) { func TestJSONExpressionParserFailures(t *testing.T) { tests := []struct { name string - expression XExpression + expression LabelExtractionExpr error string }{ { "invalid field name", - NewXExpr("app", `field with space`), + NewLabelExtractionExpr("app", `field with space`), "unexpected FIELD", }, { "missing opening square bracket", - NewXExpr("app", `"pod"]`), + NewLabelExtractionExpr("app", `"pod"]`), "unexpected STRING, expecting LSB or FIELD", }, { "missing closing square bracket", - NewXExpr("app", `["pod"`), + NewLabelExtractionExpr("app", `["pod"`), "unexpected $end, expecting RSB", }, { "missing closing square bracket", - NewXExpr("app", `["pod""uuid"]`), + NewLabelExtractionExpr("app", `["pod""uuid"]`), "unexpected STRING, expecting RSB", }, { "invalid nesting", - NewXExpr("app", `pod..uuid`), + NewLabelExtractionExpr("app", `pod..uuid`), "unexpected DOT, expecting FIELD", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - _, err := NewJSONExpressionParser([]XExpression{tt.expression}) + _, err := NewJSONExpressionParser([]LabelExtractionExpr{tt.expression}) require.NotNil(t, err) require.Equal(t, err.Error(), fmt.Sprintf("cannot parse expression [%s]: syntax error: %s", tt.expression.Expression, tt.error)) @@ -727,15 +727,15 @@ func TestLogfmtExpressionParser(t *testing.T) { tests := []struct { name string line []byte - expressions []XExpression + expressions []LabelExtractionExpr lbs labels.Labels want labels.Labels }{ { "single field", testLine, - []XExpression{ - NewXExpr("app", "app"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("app", "app"), }, labels.Labels{}, labels.Labels{ @@ -745,10 +745,10 @@ func TestLogfmtExpressionParser(t *testing.T) { { "multiple fields", testLine, - []XExpression{ - NewXExpr("app", "app"), - NewXExpr("level", "level"), - NewXExpr("ts", "ts"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("app", "app"), + NewLabelExtractionExpr("level", "level"), + NewLabelExtractionExpr("ts", "ts"), }, labels.Labels{}, labels.Labels{ @@ -760,8 +760,8 @@ func TestLogfmtExpressionParser(t *testing.T) { { "label renaming", testLine, - []XExpression{ - NewXExpr("test", "level"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("test", "level"), }, labels.Labels{}, labels.Labels{ @@ -771,10 +771,10 @@ func TestLogfmtExpressionParser(t *testing.T) { { "multiple fields with label renaming", testLine, - []XExpression{ - NewXExpr("app", "app"), - NewXExpr("lvl", "level"), - NewXExpr("timestamp", "ts"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("app", "app"), + NewLabelExtractionExpr("lvl", "level"), + NewLabelExtractionExpr("timestamp", "ts"), }, labels.Labels{}, labels.Labels{ @@ -786,8 +786,8 @@ func TestLogfmtExpressionParser(t *testing.T) { { "value with spaces and ÜFT8👌", testLine, - []XExpression{ - NewXExpr("spaces", "spaces"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("spaces", "spaces"), }, labels.Labels{}, labels.Labels{ @@ -797,8 +797,8 @@ func TestLogfmtExpressionParser(t *testing.T) { { "expression matching nothing", testLine, - []XExpression{ - NewXExpr("nope", "nope"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("nope", "nope"), }, labels.Labels{}, labels.Labels{ @@ -808,8 +808,8 @@ func TestLogfmtExpressionParser(t *testing.T) { { "double property logfmt", testLine, - []XExpression{ - NewXExpr("app", "app"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("app", "app"), }, labels.Labels{ {Name: "ap", Value: "bar"}, @@ -822,8 +822,8 @@ func TestLogfmtExpressionParser(t *testing.T) { { "label override", testLine, - []XExpression{ - NewXExpr("app", "app"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("app", "app"), }, labels.Labels{ {Name: "app", Value: "bar"}, @@ -836,8 +836,8 @@ func TestLogfmtExpressionParser(t *testing.T) { { "label override 2", testLine, - []XExpression{ - NewXExpr("lvl", "level"), + []LabelExtractionExpr{ + NewLabelExtractionExpr("lvl", "level"), }, labels.Labels{ {Name: "level", Value: "debug"}, @@ -866,19 +866,19 @@ func TestLogfmtExpressionParser(t *testing.T) { func TestXExpressionParserFailures(t *testing.T) { tests := []struct { name string - expression XExpression + expression LabelExtractionExpr error string }{ { "invalid field name", - NewXExpr("app", `field with space`), + NewLabelExtractionExpr("app", `field with space`), "unexpected KEY", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - _, err := NewLogfmtExpressionParser([]XExpression{tt.expression}) + _, err := NewLogfmtExpressionParser([]LabelExtractionExpr{tt.expression}) require.NotNil(t, err) require.Equal(t, err.Error(), fmt.Sprintf("cannot parse expression [%s]: syntax error: %s", tt.expression.Expression, tt.error)) diff --git a/pkg/logql/log/pipeline_test.go b/pkg/logql/log/pipeline_test.go index a72b8a6b83..0a014e84af 100644 --- a/pkg/logql/log/pipeline_test.go +++ b/pkg/logql/log/pipeline_test.go @@ -388,8 +388,8 @@ func BenchmarkJSONParserInvalidLine(b *testing.B) { } func BenchmarkJSONExpressionParser(b *testing.B) { - parser, err := NewJSONExpressionParser([]XExpression{ - NewXExpr("context_file", "context.file"), + parser, err := NewJSONExpressionParser([]LabelExtractionExpr{ + NewLabelExtractionExpr("context_file", "context.file"), }) if err != nil { b.Fatal("cannot create new JSON expression parser") @@ -399,8 +399,8 @@ func BenchmarkJSONExpressionParser(b *testing.B) { } func BenchmarkJSONExpressionParserInvalidLine(b *testing.B) { - parser, err := NewJSONExpressionParser([]XExpression{ - NewXExpr("context_file", "some.expression"), + parser, err := NewJSONExpressionParser([]LabelExtractionExpr{ + NewLabelExtractionExpr("context_file", "some.expression"), }) if err != nil { b.Fatal("cannot create new JSON expression parser") @@ -443,8 +443,8 @@ func BenchmarkLogfmtParser(b *testing.B) { } func BenchmarkLogfmtExpressionParser(b *testing.B) { - parser, err := NewLogfmtExpressionParser([]XExpression{ - NewXExpr("timestamp", "ts"), + parser, err := NewLogfmtExpressionParser([]LabelExtractionExpr{ + NewLabelExtractionExpr("timestamp", "ts"), }) if err != nil { b.Fatal("cannot create new logfmt expression parser:", err.Error()) diff --git a/pkg/logql/log/x_expr.go b/pkg/logql/log/x_expr.go deleted file mode 100644 index 8a1c63e5fa..0000000000 --- a/pkg/logql/log/x_expr.go +++ /dev/null @@ -1,13 +0,0 @@ -package log - -type XExpression struct { - Identifier string - Expression string -} - -func NewXExpr(identifier, expression string) XExpression { - return XExpression{ - Identifier: identifier, - Expression: expression, - } -} diff --git a/pkg/logql/syntax/ast.go b/pkg/logql/syntax/ast.go index 3082b0bc5f..75001b0d50 100644 --- a/pkg/logql/syntax/ast.go +++ b/pkg/logql/syntax/ast.go @@ -537,12 +537,12 @@ func (e *LabelFmtExpr) String() string { } type JSONExpressionParser struct { - Expressions []log.XExpression + Expressions []log.LabelExtractionExpr implicit } -func newJSONExpressionParser(expressions []log.XExpression) *JSONExpressionParser { +func newJSONExpressionParser(expressions []log.LabelExtractionExpr) *JSONExpressionParser { return &JSONExpressionParser{ Expressions: expressions, } @@ -577,14 +577,14 @@ type internedStringSet map[string]struct { } type LogfmtExpressionParser struct { - Expressions []log.XExpression + Expressions []log.LabelExtractionExpr dec *logfmt.Decoder keys internedStringSet implicit } -func newLogfmtExpressionParser(expressions []log.XExpression) *LogfmtExpressionParser { +func newLogfmtExpressionParser(expressions []log.LabelExtractionExpr) *LogfmtExpressionParser { return &LogfmtExpressionParser{ Expressions: expressions, } diff --git a/pkg/logql/syntax/expr.y b/pkg/logql/syntax/expr.y index 3c2dab1ae5..fafd46a73b 100644 --- a/pkg/logql/syntax/expr.y +++ b/pkg/logql/syntax/expr.y @@ -53,12 +53,11 @@ import ( LabelFormatExpr *LabelFmtExpr LabelFormat log.LabelFmt LabelsFormat []log.LabelFmt - JSONExpressionParser *JSONExpressionParser - JSONExpression log.XExpression - JSONExpressionList []log.XExpression - LogfmtExpressionParser *LogfmtExpressionParser - LogfmtExpression log.XExpression - LogfmtExpressionList []log.XExpression + + LabelExtractionExpression log.LabelExtractionExpr + LabelExtractionExpressionList []log.LabelExtractionExpr + JSONExpressionParser *JSONExpressionParser + LogfmtExpressionParser *LogfmtExpressionParser UnwrapExpr *UnwrapExpr DecolorizeExpr *DecolorizeExpr @@ -111,12 +110,10 @@ import ( %type labelFormatExpr %type labelFormat %type labelsFormat -%type jsonExpressionParser -%type jsonExpression -%type jsonExpressionList -%type logfmtExpressionParser -%type logfmtExpression -%type logfmtExpressionList +%type labelExtractionExpression +%type labelExtractionExpressionList +%type logfmtExpressionParser +%type jsonExpressionParser %type unwrapExpr %type unitFilter %type ipLabelFilter @@ -294,10 +291,10 @@ labelParser: ; jsonExpressionParser: - JSON jsonExpressionList { $$ = newJSONExpressionParser($2) } + JSON labelExtractionExpressionList { $$ = newJSONExpressionParser($2) } logfmtExpressionParser: - LOGFMT logfmtExpressionList { $$ = newLogfmtExpressionParser($2)} + LOGFMT labelExtractionExpressionList { $$ = newLogfmtExpressionParser($2)} lineFormatExpr: LINE_FMT STRING { $$ = newLineFmtExpr($2) }; @@ -329,22 +326,13 @@ labelFilter: | labelFilter OR labelFilter { $$ = log.NewOrLabelFilter($1, $3 ) } ; -jsonExpression: - IDENTIFIER EQ STRING { $$ = log.NewXExpr($1, $3) } - | IDENTIFIER { $$ = log.NewXExpr($1, $1) } - -jsonExpressionList: - jsonExpression { $$ = []log.XExpression{$1} } - | jsonExpressionList COMMA jsonExpression { $$ = append($1, $3) } - ; - -logfmtExpression: - IDENTIFIER EQ STRING { $$ = log.NewXExpr($1, $3) } - | IDENTIFIER { $$ = log.NewXExpr($1, $1) } +labelExtractionExpression: + IDENTIFIER EQ STRING { $$ = log.NewLabelExtractionExpr($1, $3) } + | IDENTIFIER { $$ = log.NewLabelExtractionExpr($1, $1) } -logfmtExpressionList: - logfmtExpression { $$ = []log.XExpression{$1} } - | logfmtExpressionList COMMA logfmtExpression { $$ = append($1, $3) } +labelExtractionExpressionList: + labelExtractionExpression { $$ = []log.LabelExtractionExpr{$1} } + | labelExtractionExpressionList COMMA labelExtractionExpression { $$ = append($1, $3) } ; ipLabelFilter: diff --git a/pkg/logql/syntax/expr.y.go b/pkg/logql/syntax/expr.y.go index 848d5940bc..2a9ba7ba80 100644 --- a/pkg/logql/syntax/expr.y.go +++ b/pkg/logql/syntax/expr.y.go @@ -1,11 +1,9 @@ -// Code generated by goyacc -p expr -o expr.y.go expr.y. DO NOT EDIT. +// Code generated by goyacc -p expr -o pkg/logql/syntax/expr.y.go pkg/logql/syntax/expr.y. DO NOT EDIT. -//line expr.y:2 package syntax import __yyfmt__ "fmt" -//line expr.y:2 import ( "github.com/grafana/loki/pkg/logql/log" @@ -13,58 +11,56 @@ import ( "time" ) -//line expr.y:12 type exprSymType struct { - yys int - Expr Expr - Filter labels.MatchType - Grouping *Grouping - Labels []string - LogExpr LogSelectorExpr - LogRangeExpr *LogRange - Matcher *labels.Matcher - Matchers []*labels.Matcher - RangeAggregationExpr SampleExpr - RangeOp string - ConvOp string - Selector []*labels.Matcher - VectorAggregationExpr SampleExpr - VectorExpr *VectorExpr - Vector string - MetricExpr SampleExpr - VectorOp string - FilterOp string - BinOpExpr SampleExpr - LabelReplaceExpr SampleExpr - binOp string - bytes uint64 - str string - duration time.Duration - LiteralExpr *LiteralExpr - BinOpModifier *BinOpOptions - BoolModifier *BinOpOptions - OnOrIgnoringModifier *BinOpOptions - LabelParser *LabelParserExpr - LineFilters *LineFilterExpr - LineFilter *LineFilterExpr - PipelineExpr MultiStageExpr - PipelineStage StageExpr - BytesFilter log.LabelFilterer - NumberFilter log.LabelFilterer - DurationFilter log.LabelFilterer - LabelFilter log.LabelFilterer - UnitFilter log.LabelFilterer - IPLabelFilter log.LabelFilterer - LineFormatExpr *LineFmtExpr - LabelFormatExpr *LabelFmtExpr - LabelFormat log.LabelFmt - LabelsFormat []log.LabelFmt - JSONExpressionParser *JSONExpressionParser - JSONExpression log.XExpression - JSONExpressionList []log.XExpression - LogfmtExpressionParser *LogfmtExpressionParser - LogfmtExpression log.XExpression - LogfmtExpressionList []log.XExpression + yys int + Expr Expr + Filter labels.MatchType + Grouping *Grouping + Labels []string + LogExpr LogSelectorExpr + LogRangeExpr *LogRange + Matcher *labels.Matcher + Matchers []*labels.Matcher + RangeAggregationExpr SampleExpr + RangeOp string + ConvOp string + Selector []*labels.Matcher + VectorAggregationExpr SampleExpr + VectorExpr *VectorExpr + Vector string + MetricExpr SampleExpr + VectorOp string + FilterOp string + BinOpExpr SampleExpr + LabelReplaceExpr SampleExpr + binOp string + bytes uint64 + str string + duration time.Duration + LiteralExpr *LiteralExpr + BinOpModifier *BinOpOptions + BoolModifier *BinOpOptions + OnOrIgnoringModifier *BinOpOptions + LabelParser *LabelParserExpr + LineFilters *LineFilterExpr + LineFilter *LineFilterExpr + PipelineExpr MultiStageExpr + PipelineStage StageExpr + BytesFilter log.LabelFilterer + NumberFilter log.LabelFilterer + DurationFilter log.LabelFilterer + LabelFilter log.LabelFilterer + UnitFilter log.LabelFilterer + IPLabelFilter log.LabelFilterer + LineFormatExpr *LineFmtExpr + LabelFormatExpr *LabelFmtExpr + LabelFormat log.LabelFmt + LabelsFormat []log.LabelFmt + + LabelExtractionExpression log.LabelExtractionExpr + LabelExtractionExpressionList []log.LabelExtractionExpr + JSONExpressionParser *JSONExpressionParser + LogfmtExpressionParser *LogfmtExpressionParser UnwrapExpr *UnwrapExpr DecolorizeExpr *DecolorizeExpr @@ -254,17 +250,14 @@ var exprToknames = [...]string{ "MOD", "POW", } - var exprStatenames = [...]string{} const exprEofCode = 1 const exprErrCode = 2 const exprInitialStackSize = 16 -//line expr.y:548 -//line yacctab:1 -var exprExca = [...]int8{ +var exprExca = [...]int{ -1, 1, 1, -1, -2, 0, @@ -272,143 +265,144 @@ var exprExca = [...]int8{ const exprPrivate = 57344 -const exprLast = 569 - -var exprAct = [...]int16{ - 271, 214, 82, 4, 122, 64, 176, 194, 191, 181, - 73, 223, 56, 63, 184, 5, 274, 146, 78, 75, - 2, 51, 52, 53, 54, 55, 56, 53, 54, 55, - 56, 346, 16, 160, 161, 158, 159, 279, 276, 321, - 13, 346, 92, 366, 142, 144, 145, 81, 6, 83, - 84, 274, 21, 22, 23, 36, 45, 46, 37, 39, - 40, 38, 41, 42, 43, 44, 24, 25, 134, 107, - 197, 144, 145, 112, 83, 84, 26, 27, 28, 29, - 30, 31, 32, 67, 361, 150, 33, 34, 35, 47, - 19, 155, 323, 324, 325, 354, 148, 57, 58, 61, - 62, 59, 60, 51, 52, 53, 54, 55, 56, 157, - 17, 18, 143, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 288, 147, 210, - 353, 136, 337, 188, 131, 196, 13, 203, 198, 201, - 202, 199, 200, 351, 149, 277, 205, 71, 178, 108, - 71, 312, 126, 241, 69, 70, 221, 69, 70, 288, - 328, 330, 215, 320, 336, 217, 226, 218, 48, 49, - 50, 57, 58, 61, 62, 59, 60, 51, 52, 53, - 54, 55, 56, 216, 234, 235, 236, 49, 50, 57, - 58, 61, 62, 59, 60, 51, 52, 53, 54, 55, - 56, 276, 71, 320, 71, 179, 177, 225, 275, 69, - 70, 69, 70, 72, 269, 272, 72, 278, 349, 281, - 131, 107, 284, 112, 285, 311, 298, 273, 148, 286, - 270, 282, 71, 229, 178, 216, 210, 216, 126, 69, - 70, 276, 292, 294, 297, 299, 276, 300, 213, 196, - 225, 304, 308, 71, 302, 274, 219, 138, 283, 277, - 69, 70, 131, 280, 71, 66, 137, 343, 72, 296, - 72, 69, 70, 313, 275, 315, 317, 288, 319, 107, - 126, 225, 335, 318, 329, 314, 216, 210, 107, 327, - 288, 331, 177, 131, 225, 334, 131, 216, 72, 288, - 295, 117, 119, 118, 290, 127, 129, 279, 131, 211, - 178, 126, 276, 293, 126, 340, 341, 225, 225, 72, - 107, 342, 178, 120, 288, 121, 126, 344, 345, 289, - 72, 128, 130, 350, 310, 13, 227, 224, 309, 233, - 213, 232, 222, 149, 231, 71, 356, 230, 357, 358, - 13, 204, 69, 70, 243, 154, 153, 152, 6, 88, - 362, 87, 21, 22, 23, 36, 45, 46, 37, 39, - 40, 38, 41, 42, 43, 44, 24, 25, 216, 179, - 177, 80, 364, 360, 333, 287, 26, 27, 28, 29, - 30, 31, 32, 244, 242, 239, 33, 34, 35, 47, - 19, 131, 151, 251, 237, 207, 252, 250, 228, 220, - 13, 72, 247, 212, 206, 248, 246, 240, 6, 126, - 17, 18, 21, 22, 23, 36, 45, 46, 37, 39, - 40, 38, 41, 42, 43, 44, 24, 25, 89, 238, - 117, 119, 118, 79, 127, 129, 26, 27, 28, 29, - 30, 31, 32, 359, 77, 140, 33, 34, 35, 47, - 19, 348, 120, 266, 121, 347, 267, 265, 249, 139, - 128, 130, 141, 326, 316, 263, 156, 245, 264, 262, - 17, 18, 260, 86, 85, 261, 259, 365, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 257, 363, 254, 258, 256, 255, 253, 306, - 307, 3, 352, 339, 338, 303, 305, 301, 74, 192, - 123, 291, 268, 209, 208, 207, 206, 189, 187, 186, - 355, 332, 195, 185, 182, 79, 192, 124, 183, 111, - 180, 110, 190, 115, 193, 116, 114, 113, 65, 132, - 125, 133, 109, 91, 90, 11, 10, 9, 135, 20, - 12, 15, 8, 322, 14, 7, 76, 68, 1, +const exprLast = 563 + +var exprAct = [...]int{ + + 267, 212, 82, 4, 122, 64, 176, 192, 189, 221, + 73, 75, 2, 63, 181, 5, 146, 180, 78, 48, + 49, 50, 57, 58, 61, 62, 59, 60, 51, 52, + 53, 54, 55, 56, 49, 50, 57, 58, 61, 62, + 59, 60, 51, 52, 53, 54, 55, 56, 57, 58, + 61, 62, 59, 60, 51, 52, 53, 54, 55, 56, + 51, 52, 53, 54, 55, 56, 56, 160, 161, 107, + 195, 144, 145, 112, 53, 54, 55, 56, 340, 142, + 144, 145, 273, 158, 159, 150, 134, 71, 270, 67, + 275, 155, 71, 272, 69, 70, 148, 322, 270, 69, + 70, 157, 340, 92, 337, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 174, 175, 211, + 214, 71, 314, 271, 71, 214, 83, 84, 69, 70, + 131, 69, 70, 186, 276, 194, 183, 201, 196, 199, + 200, 197, 198, 360, 71, 270, 203, 143, 126, 136, + 355, 69, 70, 72, 214, 108, 219, 214, 72, 208, + 272, 272, 213, 223, 224, 215, 216, 284, 314, 117, + 119, 118, 331, 127, 129, 275, 81, 66, 83, 84, + 131, 306, 294, 343, 232, 233, 234, 72, 348, 315, + 72, 120, 273, 121, 178, 71, 211, 71, 126, 128, + 130, 71, 69, 70, 69, 70, 272, 239, 69, 70, + 72, 304, 265, 268, 131, 274, 271, 277, 284, 107, + 280, 112, 281, 330, 347, 269, 148, 266, 178, 278, + 214, 321, 126, 237, 214, 131, 345, 223, 288, 290, + 293, 295, 317, 318, 319, 194, 223, 298, 302, 178, + 296, 179, 177, 126, 272, 131, 292, 284, 223, 284, + 208, 72, 329, 72, 328, 291, 324, 72, 305, 307, + 223, 309, 311, 126, 313, 107, 282, 289, 227, 312, + 323, 308, 279, 131, 107, 179, 177, 325, 247, 225, + 205, 248, 246, 223, 117, 119, 118, 178, 127, 129, + 284, 126, 131, 217, 208, 286, 284, 177, 303, 334, + 335, 285, 222, 138, 107, 336, 120, 137, 121, 231, + 126, 338, 339, 147, 128, 130, 209, 344, 230, 13, + 243, 13, 204, 244, 242, 229, 16, 149, 228, 149, + 350, 202, 351, 352, 13, 154, 153, 152, 88, 358, + 87, 80, 6, 245, 356, 354, 21, 22, 23, 36, + 45, 46, 37, 39, 40, 38, 41, 42, 43, 44, + 24, 25, 327, 283, 240, 238, 235, 226, 218, 210, + 26, 27, 28, 29, 30, 31, 32, 79, 140, 236, + 33, 34, 35, 47, 19, 241, 220, 262, 77, 353, + 263, 261, 139, 259, 13, 141, 260, 258, 349, 342, + 341, 320, 6, 310, 17, 18, 21, 22, 23, 36, + 45, 46, 37, 39, 40, 38, 41, 42, 43, 44, + 24, 25, 256, 156, 253, 257, 255, 254, 252, 86, + 26, 27, 28, 29, 30, 31, 32, 300, 301, 359, + 33, 34, 35, 47, 19, 250, 151, 85, 251, 249, + 3, 357, 346, 333, 13, 89, 332, 74, 299, 297, + 287, 190, 6, 264, 17, 18, 21, 22, 23, 36, + 45, 46, 37, 39, 40, 38, 41, 42, 43, 44, + 24, 25, 207, 206, 205, 204, 187, 185, 184, 326, + 26, 27, 28, 29, 30, 31, 32, 193, 182, 79, + 33, 34, 35, 47, 19, 93, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 190, + 123, 124, 110, 111, 17, 18, 188, 115, 191, 116, + 114, 113, 65, 132, 125, 133, 109, 91, 90, 11, + 10, 9, 135, 20, 12, 15, 8, 316, 14, 7, + 76, 68, 1, } +var exprPact = [...]int{ -var exprPact = [...]int16{ - 25, -1000, 92, -1000, -1000, 218, 25, -1000, -1000, -1000, - -1000, -1000, -1000, 438, 358, 24, -1000, 477, 476, 338, - 336, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, + 329, -1000, -57, -1000, -1000, 130, 329, -1000, -1000, -1000, + -1000, -1000, -1000, 382, 328, 153, -1000, 450, 432, 327, + 325, -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, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 218, -1000, 133, 396, -1000, 62, -1000, - -1000, -1000, -1000, 242, 233, 92, 453, -1000, -1000, 32, - 121, 395, 334, 333, 332, -1000, -1000, 25, 469, 25, - -35, -39, -1000, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, -1000, -1000, -1000, - -1000, -1000, 303, -1000, -1000, -1000, -1000, 529, 528, 523, - -1000, 522, -1000, -1000, -1000, -1000, 288, 521, -1000, 531, - 527, 58, -1000, -1000, -1000, 328, -1000, -1000, -1000, -1000, - -1000, 530, 520, 519, 518, 517, 285, 394, 331, 320, - 232, 390, 335, 313, 312, 389, 209, 110, 324, 321, - 318, 316, 18, 18, -60, -60, -78, -78, -78, -78, - -64, -64, -64, -64, -64, -64, 303, 288, 288, 288, - 385, -1000, 427, 376, -1000, 405, -1000, -1000, 129, -1000, - 375, -1000, 342, 374, -1000, 32, -1000, 408, 399, 500, - 498, 478, 471, 459, 516, -1000, -1000, -1000, -1000, -1000, - -1000, 49, 320, 188, 199, 250, 257, 239, 234, 49, - 25, 205, 366, 305, -1000, -1000, 280, -1000, 515, -1000, - 289, 276, 245, 202, 291, 303, 215, 529, 511, 528, - 509, -1000, 514, 504, 527, 315, -1000, -1000, -1000, 311, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 130, -1000, 181, 250, -1000, 80, -1000, + -1000, -1000, -1000, 293, 289, -57, 386, -1000, -1000, 67, + 316, 449, 324, 323, 322, -1000, -1000, 329, 426, 329, + 13, -5, -1000, 329, 329, 329, 329, 329, 329, 329, + 329, 329, 329, 329, 329, 329, 329, -1000, -1000, -1000, + -1000, -1000, 175, -1000, -1000, -1000, -1000, 503, 503, 492, + -1000, 491, -1000, -1000, -1000, -1000, 297, 490, -1000, 524, + 502, 58, -1000, -1000, -1000, 318, -1000, -1000, -1000, -1000, + -1000, 504, 489, 488, 487, 486, 302, 360, 187, 314, + 279, 359, 389, 288, 265, 358, 254, -43, 315, 312, + 305, 296, -31, -31, -13, -13, -24, -24, -24, -24, + -25, -25, -25, -25, -25, -25, 175, 297, 297, 297, + 357, -1000, 377, 357, -1000, -1000, 209, -1000, 356, -1000, + 195, 355, -1000, 67, -1000, 326, 284, 451, 430, 428, + 399, 393, 467, -1000, -1000, -1000, -1000, -1000, -1000, 101, + 314, 78, 114, 183, 125, 110, 258, 101, 329, 252, + 354, 287, -1000, -1000, 281, -1000, 464, -1000, 253, 241, + 232, 158, 278, 175, 230, 503, 463, -1000, 466, 442, + 502, 285, -1000, -1000, -1000, 188, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 201, -1000, - 127, 190, -9, 190, 466, -51, 288, -51, 154, 34, - 464, 265, 136, -1000, -1000, 137, -1000, 25, 526, -1000, - -1000, 365, 271, -1000, 258, -1000, -1000, 140, -1000, 108, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 508, - 507, -1000, 49, -9, 190, -9, -1000, -1000, 303, -1000, - -51, -1000, 244, -1000, -1000, -1000, -16, 456, 452, 194, - 49, 119, -1000, 506, -1000, -1000, -1000, -1000, 106, 71, - -1000, -9, -1000, 525, -6, -9, -13, -51, -51, 444, - -1000, -1000, 364, -1000, -1000, 60, -9, -1000, -1000, -51, - 497, -1000, -1000, 363, 481, 19, -1000, + -1000, -1000, -1000, -1000, 244, -1000, 157, 107, 46, 107, + 405, 21, 297, 21, 113, 184, 402, 207, 73, -1000, + -1000, 242, -1000, 329, 494, -1000, -1000, 353, 240, -1000, + 238, -1000, -1000, 199, -1000, 148, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, 460, 457, -1000, 101, 46, 107, 46, + -1000, -1000, 175, -1000, 21, -1000, 81, -1000, -1000, -1000, + 31, 401, 400, 159, 101, 212, -1000, 456, -1000, -1000, + -1000, -1000, 200, 164, -1000, 46, -1000, 403, 55, 46, + 40, 21, 21, 390, -1000, -1000, 336, -1000, -1000, 126, + 46, -1000, -1000, 21, 455, -1000, -1000, 330, 443, 119, + -1000, } +var exprPgo = [...]int{ -var exprPgo = [...]int16{ - 0, 568, 19, 567, 2, 11, 511, 3, 17, 4, - 566, 565, 564, 563, 15, 562, 561, 560, 559, 558, - 557, 556, 555, 438, 554, 553, 552, 13, 5, 551, - 550, 549, 6, 548, 83, 547, 546, 545, 544, 7, - 543, 8, 542, 541, 9, 540, 539, 14, 538, 1, - 537, 520, 0, + 0, 562, 11, 561, 2, 9, 460, 3, 16, 4, + 560, 559, 558, 557, 15, 556, 555, 554, 553, 552, + 551, 550, 549, 465, 548, 547, 546, 13, 5, 545, + 544, 543, 6, 542, 89, 541, 540, 539, 538, 7, + 537, 8, 536, 14, 17, 533, 532, 1, 531, 530, + 0, } +var exprR1 = [...]int{ -var exprR1 = [...]int8{ 0, 1, 2, 2, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 49, 49, 49, 13, 13, 13, 11, 11, 11, 11, + 47, 47, 47, 13, 13, 13, 11, 11, 11, 11, 15, 15, 15, 15, 15, 15, 22, 3, 3, 3, 3, 14, 14, 14, 10, 10, 9, 9, 9, 9, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 19, 34, 34, 33, 33, 26, 26, 26, 26, - 26, 43, 46, 35, 36, 41, 41, 42, 42, 42, + 26, 46, 45, 35, 36, 41, 41, 42, 42, 42, 40, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 44, 44, 45, 45, 47, 47, 48, 48, 51, 51, - 50, 50, 31, 31, 31, 31, 31, 31, 31, 29, - 29, 29, 29, 29, 29, 29, 30, 30, 30, 30, - 30, 30, 30, 39, 39, 38, 38, 37, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 24, 24, 25, 25, 25, 25, 23, - 23, 23, 23, 23, 23, 23, 23, 21, 21, 21, - 17, 18, 16, 16, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 52, 5, - 5, 4, 4, 4, 4, + 43, 43, 44, 44, 49, 49, 48, 48, 31, 31, + 31, 31, 31, 31, 31, 29, 29, 29, 29, 29, + 29, 29, 30, 30, 30, 30, 30, 30, 30, 39, + 39, 38, 38, 37, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 24, + 24, 25, 25, 25, 25, 23, 23, 23, 23, 23, + 23, 23, 23, 21, 21, 21, 17, 18, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 12, 50, 5, 5, 4, 4, 4, + 4, } +var exprR2 = [...]int{ -var exprR2 = [...]int8{ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 3, 2, 3, 4, 5, 3, 4, 5, 6, 3, 4, 5, 6, 3, 4, 5, 6, @@ -420,20 +414,20 @@ var exprR2 = [...]int8{ 2, 1, 2, 5, 1, 2, 1, 1, 2, 1, 2, 2, 2, 2, 1, 3, 3, 1, 3, 3, 2, 1, 1, 1, 1, 3, 2, 3, 3, 3, - 3, 1, 1, 3, 3, 1, 1, 3, 6, 6, - 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 1, 1, 3, 6, 6, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 1, 1, 1, 3, 2, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 0, 1, 5, 4, 5, 4, 1, - 1, 2, 4, 5, 2, 4, 5, 1, 2, 2, - 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, + 1, 1, 3, 2, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, + 1, 5, 4, 5, 4, 1, 1, 2, 4, 5, + 2, 4, 5, 1, 2, 2, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, - 3, 4, 4, 3, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 1, 3, 4, 4, 3, + 3, } +var exprChk = [...]int{ -var exprChk = [...]int16{ -1000, -1, -2, -6, -7, -14, 23, -11, -15, -20, -21, -22, -17, 15, -12, -16, 7, 85, 86, 65, -18, 27, 28, 29, 41, 42, 51, 52, 53, 54, @@ -445,79 +439,79 @@ var exprChk = [...]int16{ 23, 23, -4, 25, 26, 7, 7, 23, 23, -23, -24, -25, 43, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -28, -34, -26, - -43, -46, -32, -35, -36, -40, -37, 44, 46, 45, - 66, 68, -9, -51, -50, -30, 23, 48, 74, 49, + -46, -45, -32, -35, -36, -40, -37, 44, 46, 45, + 66, 68, -9, -49, -48, -30, 23, 48, 74, 49, 75, 5, -31, -29, 6, -19, 69, 24, 24, 16, 2, 19, 12, 80, 13, 14, -8, 7, -14, 23, -7, 7, 23, 23, 23, -7, 7, -2, 70, 71, 72, 73, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -32, 77, 19, 76, - -45, -44, 5, -48, -47, 5, 6, 6, -32, 6, - -42, -41, 5, -38, -39, 5, -9, 12, 80, 83, - 84, 81, 82, 79, 23, -9, 6, 6, 6, 6, - 2, 24, 19, 9, -49, -27, 47, -14, -8, 24, - 19, -7, 7, -5, 24, 5, -5, 24, 19, 24, - 23, 23, 23, 23, -32, -32, -32, 19, 12, 19, - 12, 24, 19, 12, 19, 69, 8, 4, 7, 69, - 8, 4, 7, 8, 4, 7, 8, 4, 7, 8, - 4, 7, 8, 4, 7, 8, 4, 7, 6, -4, - -8, -52, -49, -27, 67, 9, 47, 9, -49, 50, - 24, -49, -27, 24, -4, -7, 24, 19, 19, 24, - 24, 6, -5, 24, -5, 24, 24, -5, 24, -5, - -44, 6, -47, 6, -41, 2, 5, 6, -39, 23, - 23, 24, 24, -49, -27, -49, 8, -52, -32, -52, - 9, 5, -13, 58, 59, 60, 9, 24, 24, -49, - 24, -7, 5, 19, 24, 24, 24, 24, 6, 6, - -4, -49, -52, 23, -52, -49, 47, 9, 9, 24, - -4, 24, 6, 24, 24, 5, -49, -52, -52, 9, - 19, 24, -52, 6, 19, 6, 24, + -44, -43, 5, -44, 6, 6, -32, 6, -42, -41, + 5, -38, -39, 5, -9, 12, 80, 83, 84, 81, + 82, 79, 23, -9, 6, 6, 6, 6, 2, 24, + 19, 9, -47, -27, 47, -14, -8, 24, 19, -7, + 7, -5, 24, 5, -5, 24, 19, 24, 23, 23, + 23, 23, -32, -32, -32, 19, 12, 24, 19, 12, + 19, 69, 8, 4, 7, 69, 8, 4, 7, 8, + 4, 7, 8, 4, 7, 8, 4, 7, 8, 4, + 7, 8, 4, 7, 6, -4, -8, -50, -47, -27, + 67, 9, 47, 9, -47, 50, 24, -47, -27, 24, + -4, -7, 24, 19, 19, 24, 24, 6, -5, 24, + -5, 24, 24, -5, 24, -5, -43, 6, -41, 2, + 5, 6, -39, 23, 23, 24, 24, -47, -27, -47, + 8, -50, -32, -50, 9, 5, -13, 58, 59, 60, + 9, 24, 24, -47, 24, -7, 5, 19, 24, 24, + 24, 24, 6, 6, -4, -47, -50, 23, -50, -47, + 47, 9, 9, 24, -4, 24, 6, 24, 24, 5, + -47, -50, -50, 9, 19, 24, -50, 6, 19, 6, + 24, } +var exprDef = [...]int{ -var exprDef = [...]int16{ 0, -2, 1, 2, 3, 11, 0, 4, 5, 6, - 7, 8, 9, 0, 0, 0, 177, 0, 0, 0, - 0, 193, 194, 195, 196, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 206, 207, 182, 183, 184, 185, - 186, 187, 188, 189, 190, 191, 192, 181, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 12, 70, 72, 0, 84, 0, 57, + 7, 8, 9, 0, 0, 0, 173, 0, 0, 0, + 0, 189, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 202, 203, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 177, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 12, 70, 72, 0, 84, 0, 57, 58, 59, 60, 3, 2, 0, 0, 63, 64, 0, - 0, 0, 0, 0, 0, 178, 179, 0, 0, 0, - 169, 170, 164, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 174, 175, 0, 0, 0, + 165, 166, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 85, 73, 74, 75, 76, 77, 78, 79, 80, 86, 87, 0, 89, 0, 101, 102, 103, 104, 0, 0, 94, 0, - 0, 0, 120, 121, 82, 0, 81, 10, 13, 61, + 0, 0, 116, 117, 82, 0, 81, 10, 13, 61, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 177, 0, 0, 0, 3, 0, 148, 0, 0, - 171, 174, 149, 150, 151, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 106, 0, 0, 0, - 91, 112, 111, 92, 116, 115, 88, 90, 0, 93, - 100, 97, 0, 147, 145, 143, 144, 0, 0, 0, - 0, 0, 0, 0, 0, 65, 66, 67, 68, 69, - 39, 46, 0, 14, 0, 0, 0, 0, 0, 50, - 0, 3, 177, 0, 213, 209, 0, 214, 0, 180, - 0, 0, 0, 0, 107, 108, 109, 0, 0, 0, - 0, 105, 0, 0, 0, 0, 127, 134, 141, 0, - 126, 133, 140, 122, 129, 136, 123, 130, 137, 124, - 131, 138, 125, 132, 139, 128, 135, 142, 0, 48, - 0, 15, 18, 34, 0, 22, 0, 26, 0, 0, - 0, 0, 0, 38, 52, 3, 51, 0, 0, 211, - 212, 0, 0, 166, 0, 168, 172, 0, 175, 0, - 113, 110, 117, 114, 98, 99, 95, 96, 146, 0, - 0, 83, 47, 19, 35, 36, 208, 23, 42, 27, - 30, 40, 0, 43, 44, 45, 16, 0, 0, 0, - 53, 3, 210, 0, 165, 167, 173, 176, 0, 0, - 49, 37, 31, 0, 17, 20, 0, 24, 28, 0, - 54, 55, 0, 118, 119, 0, 21, 25, 29, 32, - 0, 41, 33, 0, 0, 0, 56, + 3, 173, 0, 0, 0, 3, 0, 144, 0, 0, + 167, 170, 145, 146, 147, 148, 149, 150, 151, 152, + 153, 154, 155, 156, 157, 158, 106, 0, 0, 0, + 91, 112, 111, 92, 88, 90, 0, 93, 100, 97, + 0, 143, 141, 139, 140, 0, 0, 0, 0, 0, + 0, 0, 0, 65, 66, 67, 68, 69, 39, 46, + 0, 14, 0, 0, 0, 0, 0, 50, 0, 3, + 173, 0, 209, 205, 0, 210, 0, 176, 0, 0, + 0, 0, 107, 108, 109, 0, 0, 105, 0, 0, + 0, 0, 123, 130, 137, 0, 122, 129, 136, 118, + 125, 132, 119, 126, 133, 120, 127, 134, 121, 128, + 135, 124, 131, 138, 0, 48, 0, 15, 18, 34, + 0, 22, 0, 26, 0, 0, 0, 0, 0, 38, + 52, 3, 51, 0, 0, 207, 208, 0, 0, 162, + 0, 164, 168, 0, 171, 0, 113, 110, 98, 99, + 95, 96, 142, 0, 0, 83, 47, 19, 35, 36, + 204, 23, 42, 27, 30, 40, 0, 43, 44, 45, + 16, 0, 0, 0, 53, 3, 206, 0, 161, 163, + 169, 172, 0, 0, 49, 37, 31, 0, 17, 20, + 0, 24, 28, 0, 54, 55, 0, 114, 115, 0, + 21, 25, 29, 32, 0, 41, 33, 0, 0, 0, + 56, } +var exprTok1 = [...]int{ -var exprTok1 = [...]int8{ 1, } +var exprTok2 = [...]int{ -var exprTok2 = [...]int8{ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, @@ -528,8 +522,7 @@ var exprTok2 = [...]int8{ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, } - -var exprTok3 = [...]int8{ +var exprTok3 = [...]int{ 0, } @@ -539,7 +532,6 @@ var exprErrorMessages = [...]struct { msg string }{} -//line yaccpar:1 /* parser for yacc output */ @@ -611,9 +603,9 @@ func exprErrorMessage(state, lookAhead int) string { expected := make([]int, 0, 4) // Look for shiftable tokens. - base := int(exprPact[state]) + base := exprPact[state] for tok := TOKSTART; tok-1 < len(exprToknames); tok++ { - if n := base + tok; n >= 0 && n < exprLast && int(exprChk[int(exprAct[n])]) == tok { + if n := base + tok; n >= 0 && n < exprLast && exprChk[exprAct[n]] == tok { if len(expected) == cap(expected) { return res } @@ -623,13 +615,13 @@ func exprErrorMessage(state, lookAhead int) string { if exprDef[state] == -2 { i := 0 - for exprExca[i] != -1 || int(exprExca[i+1]) != state { + for exprExca[i] != -1 || exprExca[i+1] != state { i += 2 } // Look for tokens that we accept or reduce. for i += 2; exprExca[i] >= 0; i += 2 { - tok := int(exprExca[i]) + tok := exprExca[i] if tok < TOKSTART || exprExca[i+1] == 0 { continue } @@ -660,30 +652,30 @@ func exprlex1(lex exprLexer, lval *exprSymType) (char, token int) { token = 0 char = lex.Lex(lval) if char <= 0 { - token = int(exprTok1[0]) + token = exprTok1[0] goto out } if char < len(exprTok1) { - token = int(exprTok1[char]) + token = exprTok1[char] goto out } if char >= exprPrivate { if char < exprPrivate+len(exprTok2) { - token = int(exprTok2[char-exprPrivate]) + token = exprTok2[char-exprPrivate] goto out } } for i := 0; i < len(exprTok3); i += 2 { - token = int(exprTok3[i+0]) + token = exprTok3[i+0] if token == char { - token = int(exprTok3[i+1]) + token = exprTok3[i+1] goto out } } out: if token == 0 { - token = int(exprTok2[1]) /* unknown char */ + token = exprTok2[1] /* unknown char */ } if exprDebug >= 3 { __yyfmt__.Printf("lex %s(%d)\n", exprTokname(token), uint(char)) @@ -738,7 +730,7 @@ exprstack: exprS[exprp].yys = exprstate exprnewstate: - exprn = int(exprPact[exprstate]) + exprn = exprPact[exprstate] if exprn <= exprFlag { goto exprdefault /* simple state */ } @@ -749,8 +741,8 @@ exprnewstate: if exprn < 0 || exprn >= exprLast { goto exprdefault } - exprn = int(exprAct[exprn]) - if int(exprChk[exprn]) == exprtoken { /* valid shift */ + exprn = exprAct[exprn] + if exprChk[exprn] == exprtoken { /* valid shift */ exprrcvr.char = -1 exprtoken = -1 exprVAL = exprrcvr.lval @@ -763,7 +755,7 @@ exprnewstate: exprdefault: /* default state action */ - exprn = int(exprDef[exprstate]) + exprn = exprDef[exprstate] if exprn == -2 { if exprrcvr.char < 0 { exprrcvr.char, exprtoken = exprlex1(exprlex, &exprrcvr.lval) @@ -772,18 +764,18 @@ exprdefault: /* look through exception table */ xi := 0 for { - if exprExca[xi+0] == -1 && int(exprExca[xi+1]) == exprstate { + if exprExca[xi+0] == -1 && exprExca[xi+1] == exprstate { break } xi += 2 } for xi += 2; ; xi += 2 { - exprn = int(exprExca[xi+0]) + exprn = exprExca[xi+0] if exprn < 0 || exprn == exprtoken { break } } - exprn = int(exprExca[xi+1]) + exprn = exprExca[xi+1] if exprn < 0 { goto ret0 } @@ -805,10 +797,10 @@ exprdefault: /* find a state where "error" is a legal shift action */ for exprp >= 0 { - exprn = int(exprPact[exprS[exprp].yys]) + exprErrCode + exprn = exprPact[exprS[exprp].yys] + exprErrCode if exprn >= 0 && exprn < exprLast { - exprstate = int(exprAct[exprn]) /* simulate a shift of "error" */ - if int(exprChk[exprstate]) == exprErrCode { + exprstate = exprAct[exprn] /* simulate a shift of "error" */ + if exprChk[exprstate] == exprErrCode { goto exprstack } } @@ -844,7 +836,7 @@ exprdefault: exprpt := exprp _ = exprpt // guard against "declared and not used" - exprp -= int(exprR2[exprn]) + exprp -= exprR2[exprn] // exprp is now the index of $0. Perform the default action. Iff the // reduced production is ε, $1 is possibly out of range. if exprp+1 >= len(exprS) { @@ -855,16 +847,16 @@ exprdefault: exprVAL = exprS[exprp+1] /* consult goto table to find next state */ - exprn = int(exprR1[exprn]) - exprg := int(exprPgo[exprn]) + exprn = exprR1[exprn] + exprg := exprPgo[exprn] exprj := exprg + exprS[exprp].yys + 1 if exprj >= exprLast { - exprstate = int(exprAct[exprg]) + exprstate = exprAct[exprg] } else { - exprstate = int(exprAct[exprj]) - if int(exprChk[exprstate]) != -exprn { - exprstate = int(exprAct[exprg]) + exprstate = exprAct[exprj] + if exprChk[exprstate] != -exprn { + exprstate = exprAct[exprg] } } // dummy call; replaced with literal code @@ -872,1284 +864,1052 @@ exprdefault: case 1: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:145 { exprlex.(*parser).expr = exprDollar[1].Expr } case 2: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:148 { exprVAL.Expr = exprDollar[1].LogExpr } case 3: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:149 { exprVAL.Expr = exprDollar[1].MetricExpr } case 4: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:153 { exprVAL.MetricExpr = exprDollar[1].RangeAggregationExpr } case 5: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:154 { exprVAL.MetricExpr = exprDollar[1].VectorAggregationExpr } case 6: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:155 { exprVAL.MetricExpr = exprDollar[1].BinOpExpr } case 7: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:156 { exprVAL.MetricExpr = exprDollar[1].LiteralExpr } case 8: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:157 { exprVAL.MetricExpr = exprDollar[1].LabelReplaceExpr } case 9: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:158 { exprVAL.MetricExpr = exprDollar[1].VectorExpr } case 10: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:159 { exprVAL.MetricExpr = exprDollar[2].MetricExpr } case 11: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:163 { exprVAL.LogExpr = newMatcherExpr(exprDollar[1].Selector) } case 12: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:164 { exprVAL.LogExpr = newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr) } case 13: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:165 { exprVAL.LogExpr = exprDollar[2].LogExpr } case 14: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:169 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].duration, nil, nil) } case 15: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:170 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].duration, nil, exprDollar[3].OffsetExpr) } case 16: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:171 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[4].duration, nil, nil) } case 17: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:172 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[4].duration, nil, exprDollar[5].OffsetExpr) } case 18: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:173 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].duration, exprDollar[3].UnwrapExpr, nil) } case 19: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:174 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].duration, exprDollar[4].UnwrapExpr, exprDollar[3].OffsetExpr) } case 20: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:175 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[4].duration, exprDollar[5].UnwrapExpr, nil) } case 21: exprDollar = exprS[exprpt-6 : exprpt+1] -//line expr.y:176 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[4].duration, exprDollar[6].UnwrapExpr, exprDollar[5].OffsetExpr) } case 22: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:177 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[3].duration, exprDollar[2].UnwrapExpr, nil) } case 23: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:178 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[3].duration, exprDollar[2].UnwrapExpr, exprDollar[4].OffsetExpr) } case 24: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:179 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[5].duration, exprDollar[3].UnwrapExpr, nil) } case 25: exprDollar = exprS[exprpt-6 : exprpt+1] -//line expr.y:180 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[5].duration, exprDollar[3].UnwrapExpr, exprDollar[6].OffsetExpr) } case 26: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:181 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr), exprDollar[3].duration, nil, nil) } case 27: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:182 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr), exprDollar[3].duration, nil, exprDollar[4].OffsetExpr) } case 28: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:183 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[2].Selector), exprDollar[3].PipelineExpr), exprDollar[5].duration, nil, nil) } case 29: exprDollar = exprS[exprpt-6 : exprpt+1] -//line expr.y:184 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[2].Selector), exprDollar[3].PipelineExpr), exprDollar[5].duration, nil, exprDollar[6].OffsetExpr) } case 30: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:185 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr), exprDollar[4].duration, exprDollar[3].UnwrapExpr, nil) } case 31: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:186 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr), exprDollar[4].duration, exprDollar[3].UnwrapExpr, exprDollar[5].OffsetExpr) } case 32: exprDollar = exprS[exprpt-6 : exprpt+1] -//line expr.y:187 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[2].Selector), exprDollar[3].PipelineExpr), exprDollar[6].duration, exprDollar[4].UnwrapExpr, nil) } case 33: exprDollar = exprS[exprpt-7 : exprpt+1] -//line expr.y:188 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[2].Selector), exprDollar[3].PipelineExpr), exprDollar[6].duration, exprDollar[4].UnwrapExpr, exprDollar[7].OffsetExpr) } case 34: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:189 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[3].PipelineExpr), exprDollar[2].duration, nil, nil) } case 35: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:190 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[4].PipelineExpr), exprDollar[2].duration, nil, exprDollar[3].OffsetExpr) } case 36: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:191 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[3].PipelineExpr), exprDollar[2].duration, exprDollar[4].UnwrapExpr, nil) } case 37: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:192 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[4].PipelineExpr), exprDollar[2].duration, exprDollar[5].UnwrapExpr, exprDollar[3].OffsetExpr) } case 38: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:193 { exprVAL.LogRangeExpr = exprDollar[2].LogRangeExpr } case 40: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:198 { exprVAL.UnwrapExpr = newUnwrapExpr(exprDollar[3].str, "") } case 41: exprDollar = exprS[exprpt-6 : exprpt+1] -//line expr.y:199 { exprVAL.UnwrapExpr = newUnwrapExpr(exprDollar[5].str, exprDollar[3].ConvOp) } case 42: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:200 { exprVAL.UnwrapExpr = exprDollar[1].UnwrapExpr.addPostFilter(exprDollar[3].LabelFilter) } case 43: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:204 { exprVAL.ConvOp = OpConvBytes } case 44: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:205 { exprVAL.ConvOp = OpConvDuration } case 45: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:206 { exprVAL.ConvOp = OpConvDurationSeconds } case 46: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:210 { exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[3].LogRangeExpr, exprDollar[1].RangeOp, nil, nil) } case 47: exprDollar = exprS[exprpt-6 : exprpt+1] -//line expr.y:211 { exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[5].LogRangeExpr, exprDollar[1].RangeOp, nil, &exprDollar[3].str) } case 48: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:212 { exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[3].LogRangeExpr, exprDollar[1].RangeOp, exprDollar[5].Grouping, nil) } case 49: exprDollar = exprS[exprpt-7 : exprpt+1] -//line expr.y:213 { exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[5].LogRangeExpr, exprDollar[1].RangeOp, exprDollar[7].Grouping, &exprDollar[3].str) } case 50: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:218 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].MetricExpr, exprDollar[1].VectorOp, nil, nil) } case 51: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:219 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[4].MetricExpr, exprDollar[1].VectorOp, exprDollar[2].Grouping, nil) } case 52: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:220 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].MetricExpr, exprDollar[1].VectorOp, exprDollar[5].Grouping, nil) } case 53: exprDollar = exprS[exprpt-6 : exprpt+1] -//line expr.y:222 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].MetricExpr, exprDollar[1].VectorOp, nil, &exprDollar[3].str) } case 54: exprDollar = exprS[exprpt-7 : exprpt+1] -//line expr.y:223 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].MetricExpr, exprDollar[1].VectorOp, exprDollar[7].Grouping, &exprDollar[3].str) } case 55: exprDollar = exprS[exprpt-7 : exprpt+1] -//line expr.y:224 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[6].MetricExpr, exprDollar[1].VectorOp, exprDollar[2].Grouping, &exprDollar[4].str) } case 56: exprDollar = exprS[exprpt-12 : exprpt+1] -//line expr.y:229 { exprVAL.LabelReplaceExpr = mustNewLabelReplaceExpr(exprDollar[3].MetricExpr, exprDollar[5].str, exprDollar[7].str, exprDollar[9].str, exprDollar[11].str) } case 57: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:233 { exprVAL.Filter = labels.MatchRegexp } case 58: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:234 { exprVAL.Filter = labels.MatchEqual } case 59: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:235 { exprVAL.Filter = labels.MatchNotRegexp } case 60: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:236 { exprVAL.Filter = labels.MatchNotEqual } case 61: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:240 { exprVAL.Selector = exprDollar[2].Matchers } case 62: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:241 { exprVAL.Selector = exprDollar[2].Matchers } case 63: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:242 { } case 64: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:246 { exprVAL.Matchers = []*labels.Matcher{exprDollar[1].Matcher} } case 65: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:247 { exprVAL.Matchers = append(exprDollar[1].Matchers, exprDollar[3].Matcher) } case 66: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:251 { exprVAL.Matcher = mustNewMatcher(labels.MatchEqual, exprDollar[1].str, exprDollar[3].str) } case 67: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:252 { exprVAL.Matcher = mustNewMatcher(labels.MatchNotEqual, exprDollar[1].str, exprDollar[3].str) } case 68: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:253 { exprVAL.Matcher = mustNewMatcher(labels.MatchRegexp, exprDollar[1].str, exprDollar[3].str) } case 69: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:254 { exprVAL.Matcher = mustNewMatcher(labels.MatchNotRegexp, exprDollar[1].str, exprDollar[3].str) } case 70: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:258 { exprVAL.PipelineExpr = MultiStageExpr{exprDollar[1].PipelineStage} } case 71: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:259 { exprVAL.PipelineExpr = append(exprDollar[1].PipelineExpr, exprDollar[2].PipelineStage) } case 72: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:263 { exprVAL.PipelineStage = exprDollar[1].LineFilters } case 73: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:264 { exprVAL.PipelineStage = exprDollar[2].LabelParser } case 74: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:265 { exprVAL.PipelineStage = exprDollar[2].JSONExpressionParser } case 75: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:266 { exprVAL.PipelineStage = exprDollar[2].LogfmtExpressionParser } case 76: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:267 { exprVAL.PipelineStage = &LabelFilterExpr{LabelFilterer: exprDollar[2].LabelFilter} } case 77: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:268 { exprVAL.PipelineStage = exprDollar[2].LineFormatExpr } case 78: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:269 { exprVAL.PipelineStage = exprDollar[2].DecolorizeExpr } case 79: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:270 { exprVAL.PipelineStage = exprDollar[2].LabelFormatExpr } case 80: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:271 { exprVAL.PipelineStage = exprDollar[2].DropLabelsExpr } case 81: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:275 { exprVAL.FilterOp = OpFilterIP } case 82: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:279 { exprVAL.LineFilter = newLineFilterExpr(exprDollar[1].Filter, "", exprDollar[2].str) } case 83: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:280 { exprVAL.LineFilter = newLineFilterExpr(exprDollar[1].Filter, exprDollar[2].FilterOp, exprDollar[4].str) } case 84: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:284 { exprVAL.LineFilters = exprDollar[1].LineFilter } case 85: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:285 { exprVAL.LineFilters = newNestedLineFilterExpr(exprDollar[1].LineFilters, exprDollar[2].LineFilter) } case 86: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:289 { exprVAL.LabelParser = newLabelParserExpr(OpParserTypeJSON, "") } case 87: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:290 { exprVAL.LabelParser = newLabelParserExpr(OpParserTypeLogfmt, "") } case 88: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:291 { exprVAL.LabelParser = newLabelParserExpr(OpParserTypeRegexp, exprDollar[2].str) } case 89: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:292 { exprVAL.LabelParser = newLabelParserExpr(OpParserTypeUnpack, "") } case 90: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:293 { exprVAL.LabelParser = newLabelParserExpr(OpParserTypePattern, exprDollar[2].str) } case 91: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:297 { - exprVAL.JSONExpressionParser = newJSONExpressionParser(exprDollar[2].JSONExpressionList) + exprVAL.JSONExpressionParser = newJSONExpressionParser(exprDollar[2].LabelExtractionExpressionList) } case 92: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:300 { - exprVAL.LogfmtExpressionParser = newLogfmtExpressionParser(exprDollar[2].LogfmtExpressionList) + exprVAL.LogfmtExpressionParser = newLogfmtExpressionParser(exprDollar[2].LabelExtractionExpressionList) } case 93: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:302 { exprVAL.LineFormatExpr = newLineFmtExpr(exprDollar[2].str) } case 94: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:304 { exprVAL.DecolorizeExpr = newDecolorizeExpr() } case 95: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:307 { exprVAL.LabelFormat = log.NewRenameLabelFmt(exprDollar[1].str, exprDollar[3].str) } case 96: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:308 { exprVAL.LabelFormat = log.NewTemplateLabelFmt(exprDollar[1].str, exprDollar[3].str) } case 97: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:312 { exprVAL.LabelsFormat = []log.LabelFmt{exprDollar[1].LabelFormat} } case 98: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:313 { exprVAL.LabelsFormat = append(exprDollar[1].LabelsFormat, exprDollar[3].LabelFormat) } case 100: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:318 { exprVAL.LabelFormatExpr = newLabelFmtExpr(exprDollar[2].LabelsFormat) } case 101: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:321 { exprVAL.LabelFilter = log.NewStringLabelFilter(exprDollar[1].Matcher) } case 102: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:322 { exprVAL.LabelFilter = exprDollar[1].IPLabelFilter } case 103: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:323 { exprVAL.LabelFilter = exprDollar[1].UnitFilter } case 104: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:324 { exprVAL.LabelFilter = exprDollar[1].NumberFilter } case 105: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:325 { exprVAL.LabelFilter = exprDollar[2].LabelFilter } case 106: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:326 { exprVAL.LabelFilter = log.NewAndLabelFilter(exprDollar[1].LabelFilter, exprDollar[2].LabelFilter) } case 107: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:327 { exprVAL.LabelFilter = log.NewAndLabelFilter(exprDollar[1].LabelFilter, exprDollar[3].LabelFilter) } case 108: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:328 { exprVAL.LabelFilter = log.NewAndLabelFilter(exprDollar[1].LabelFilter, exprDollar[3].LabelFilter) } case 109: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:329 { exprVAL.LabelFilter = log.NewOrLabelFilter(exprDollar[1].LabelFilter, exprDollar[3].LabelFilter) } case 110: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:333 { - exprVAL.JSONExpression = log.NewXExpr(exprDollar[1].str, exprDollar[3].str) + exprVAL.LabelExtractionExpression = log.NewLabelExtractionExpr(exprDollar[1].str, exprDollar[3].str) } case 111: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:334 { - exprVAL.JSONExpression = log.NewXExpr(exprDollar[1].str, exprDollar[1].str) + exprVAL.LabelExtractionExpression = log.NewLabelExtractionExpr(exprDollar[1].str, exprDollar[1].str) } case 112: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:337 { - exprVAL.JSONExpressionList = []log.XExpression{exprDollar[1].JSONExpression} + exprVAL.LabelExtractionExpressionList = []log.LabelExtractionExpr{exprDollar[1].LabelExtractionExpression} } case 113: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:338 { - exprVAL.JSONExpressionList = append(exprDollar[1].JSONExpressionList, exprDollar[3].JSONExpression) + exprVAL.LabelExtractionExpressionList = append(exprDollar[1].LabelExtractionExpressionList, exprDollar[3].LabelExtractionExpression) } case 114: - exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:342 - { - exprVAL.LogfmtExpression = log.NewXExpr(exprDollar[1].str, exprDollar[3].str) - } - case 115: - exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:343 - { - exprVAL.LogfmtExpression = log.NewXExpr(exprDollar[1].str, exprDollar[1].str) - } - case 116: - exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:346 - { - exprVAL.LogfmtExpressionList = []log.XExpression{exprDollar[1].LogfmtExpression} - } - case 117: - exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:347 - { - exprVAL.LogfmtExpressionList = append(exprDollar[1].LogfmtExpressionList, exprDollar[3].LogfmtExpression) - } - case 118: exprDollar = exprS[exprpt-6 : exprpt+1] -//line expr.y:351 { exprVAL.IPLabelFilter = log.NewIPLabelFilter(exprDollar[5].str, exprDollar[1].str, log.LabelFilterEqual) } - case 119: + case 115: exprDollar = exprS[exprpt-6 : exprpt+1] -//line expr.y:352 { exprVAL.IPLabelFilter = log.NewIPLabelFilter(exprDollar[5].str, exprDollar[1].str, log.LabelFilterNotEqual) } - case 120: + case 116: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:356 { exprVAL.UnitFilter = exprDollar[1].DurationFilter } - case 121: + case 117: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:357 { exprVAL.UnitFilter = exprDollar[1].BytesFilter } - case 122: + case 118: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:360 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterGreaterThan, exprDollar[1].str, exprDollar[3].duration) } - case 123: + case 119: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:361 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterGreaterThanOrEqual, exprDollar[1].str, exprDollar[3].duration) } - case 124: + case 120: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:362 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterLesserThan, exprDollar[1].str, exprDollar[3].duration) } - case 125: + case 121: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:363 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterLesserThanOrEqual, exprDollar[1].str, exprDollar[3].duration) } - case 126: + case 122: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:364 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterNotEqual, exprDollar[1].str, exprDollar[3].duration) } - case 127: + case 123: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:365 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].duration) } - case 128: + case 124: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:366 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].duration) } - case 129: + case 125: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:370 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterGreaterThan, exprDollar[1].str, exprDollar[3].bytes) } - case 130: + case 126: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:371 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterGreaterThanOrEqual, exprDollar[1].str, exprDollar[3].bytes) } - case 131: + case 127: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:372 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterLesserThan, exprDollar[1].str, exprDollar[3].bytes) } - case 132: + case 128: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:373 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterLesserThanOrEqual, exprDollar[1].str, exprDollar[3].bytes) } - case 133: + case 129: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:374 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterNotEqual, exprDollar[1].str, exprDollar[3].bytes) } - case 134: + case 130: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:375 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].bytes) } - case 135: + case 131: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:376 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].bytes) } - case 136: + case 132: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:380 { exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterGreaterThan, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) } - case 137: + case 133: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:381 { exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterGreaterThanOrEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) } - case 138: + case 134: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:382 { exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterLesserThan, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) } - case 139: + case 135: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:383 { exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterLesserThanOrEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) } - case 140: + case 136: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:384 { exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterNotEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) } - case 141: + case 137: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:385 { exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) } - case 142: + case 138: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:386 { exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) } - case 143: + case 139: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:390 { exprVAL.DropLabel = log.NewDropLabel(nil, exprDollar[1].str) } - case 144: + case 140: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:391 { exprVAL.DropLabel = log.NewDropLabel(exprDollar[1].Matcher, "") } - case 145: + case 141: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:394 { exprVAL.DropLabels = []log.DropLabel{exprDollar[1].DropLabel} } - case 146: + case 142: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:395 { exprVAL.DropLabels = append(exprDollar[1].DropLabels, exprDollar[3].DropLabel) } - case 147: + case 143: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:398 { exprVAL.DropLabelsExpr = newDropLabelsExpr(exprDollar[2].DropLabels) } - case 148: + case 144: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:402 { exprVAL.BinOpExpr = mustNewBinOpExpr("or", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 149: + case 145: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:403 { exprVAL.BinOpExpr = mustNewBinOpExpr("and", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 150: + case 146: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:404 { exprVAL.BinOpExpr = mustNewBinOpExpr("unless", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 151: + case 147: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:405 { exprVAL.BinOpExpr = mustNewBinOpExpr("+", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 152: + case 148: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:406 { exprVAL.BinOpExpr = mustNewBinOpExpr("-", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 153: + case 149: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:407 { exprVAL.BinOpExpr = mustNewBinOpExpr("*", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 154: + case 150: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:408 { exprVAL.BinOpExpr = mustNewBinOpExpr("/", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 155: + case 151: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:409 { exprVAL.BinOpExpr = mustNewBinOpExpr("%", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 156: + case 152: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:410 { exprVAL.BinOpExpr = mustNewBinOpExpr("^", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 157: + case 153: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:411 { exprVAL.BinOpExpr = mustNewBinOpExpr("==", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 158: + case 154: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:412 { exprVAL.BinOpExpr = mustNewBinOpExpr("!=", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 159: + case 155: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:413 { exprVAL.BinOpExpr = mustNewBinOpExpr(">", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 160: + case 156: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:414 { exprVAL.BinOpExpr = mustNewBinOpExpr(">=", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 161: + case 157: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:415 { exprVAL.BinOpExpr = mustNewBinOpExpr("<", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 162: + case 158: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:416 { exprVAL.BinOpExpr = mustNewBinOpExpr("<=", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } - case 163: + case 159: exprDollar = exprS[exprpt-0 : exprpt+1] -//line expr.y:420 { exprVAL.BoolModifier = &BinOpOptions{VectorMatching: &VectorMatching{Card: CardOneToOne}} } - case 164: + case 160: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:424 { exprVAL.BoolModifier = &BinOpOptions{VectorMatching: &VectorMatching{Card: CardOneToOne}, ReturnBool: true} } - case 165: + case 161: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:431 { exprVAL.OnOrIgnoringModifier = exprDollar[1].BoolModifier exprVAL.OnOrIgnoringModifier.VectorMatching.On = true exprVAL.OnOrIgnoringModifier.VectorMatching.MatchingLabels = exprDollar[4].Labels } - case 166: + case 162: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:437 { exprVAL.OnOrIgnoringModifier = exprDollar[1].BoolModifier exprVAL.OnOrIgnoringModifier.VectorMatching.On = true } - case 167: + case 163: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:442 { exprVAL.OnOrIgnoringModifier = exprDollar[1].BoolModifier exprVAL.OnOrIgnoringModifier.VectorMatching.MatchingLabels = exprDollar[4].Labels } - case 168: + case 164: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:447 { exprVAL.OnOrIgnoringModifier = exprDollar[1].BoolModifier } - case 169: + case 165: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:453 { exprVAL.BinOpModifier = exprDollar[1].BoolModifier } - case 170: + case 166: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:454 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier } - case 171: + case 167: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:456 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardManyToOne } - case 172: + case 168: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:461 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardManyToOne } - case 173: + case 169: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:466 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardManyToOne exprVAL.BinOpModifier.VectorMatching.Include = exprDollar[4].Labels } - case 174: + case 170: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:472 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardOneToMany } - case 175: + case 171: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:477 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardOneToMany } - case 176: + case 172: exprDollar = exprS[exprpt-5 : exprpt+1] -//line expr.y:482 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardOneToMany exprVAL.BinOpModifier.VectorMatching.Include = exprDollar[4].Labels } - case 177: + case 173: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:490 { exprVAL.LiteralExpr = mustNewLiteralExpr(exprDollar[1].str, false) } - case 178: + case 174: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:491 { exprVAL.LiteralExpr = mustNewLiteralExpr(exprDollar[2].str, false) } - case 179: + case 175: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:492 { exprVAL.LiteralExpr = mustNewLiteralExpr(exprDollar[2].str, true) } - case 180: + case 176: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:496 { exprVAL.VectorExpr = NewVectorExpr(exprDollar[3].str) } - case 181: + case 177: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:499 { exprVAL.Vector = OpTypeVector } - case 182: + case 178: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:503 { exprVAL.VectorOp = OpTypeSum } - case 183: + case 179: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:504 { exprVAL.VectorOp = OpTypeAvg } - case 184: + case 180: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:505 { exprVAL.VectorOp = OpTypeCount } - case 185: + case 181: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:506 { exprVAL.VectorOp = OpTypeMax } - case 186: + case 182: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:507 { exprVAL.VectorOp = OpTypeMin } - case 187: + case 183: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:508 { exprVAL.VectorOp = OpTypeStddev } - case 188: + case 184: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:509 { exprVAL.VectorOp = OpTypeStdvar } - case 189: + case 185: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:510 { exprVAL.VectorOp = OpTypeBottomK } - case 190: + case 186: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:511 { exprVAL.VectorOp = OpTypeTopK } - case 191: + case 187: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:512 { exprVAL.VectorOp = OpTypeSort } - case 192: + case 188: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:513 { exprVAL.VectorOp = OpTypeSortDesc } - case 193: + case 189: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:517 { exprVAL.RangeOp = OpRangeTypeCount } - case 194: + case 190: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:518 { exprVAL.RangeOp = OpRangeTypeRate } - case 195: + case 191: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:519 { exprVAL.RangeOp = OpRangeTypeRateCounter } - case 196: + case 192: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:520 { exprVAL.RangeOp = OpRangeTypeBytes } - case 197: + case 193: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:521 { exprVAL.RangeOp = OpRangeTypeBytesRate } - case 198: + case 194: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:522 { exprVAL.RangeOp = OpRangeTypeAvg } - case 199: + case 195: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:523 { exprVAL.RangeOp = OpRangeTypeSum } - case 200: + case 196: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:524 { exprVAL.RangeOp = OpRangeTypeMin } - case 201: + case 197: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:525 { exprVAL.RangeOp = OpRangeTypeMax } - case 202: + case 198: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:526 { exprVAL.RangeOp = OpRangeTypeStdvar } - case 203: + case 199: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:527 { exprVAL.RangeOp = OpRangeTypeStddev } - case 204: + case 200: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:528 { exprVAL.RangeOp = OpRangeTypeQuantile } - case 205: + case 201: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:529 { exprVAL.RangeOp = OpRangeTypeFirst } - case 206: + case 202: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:530 { exprVAL.RangeOp = OpRangeTypeLast } - case 207: + case 203: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:531 { exprVAL.RangeOp = OpRangeTypeAbsent } - case 208: + case 204: exprDollar = exprS[exprpt-2 : exprpt+1] -//line expr.y:535 { exprVAL.OffsetExpr = newOffsetExpr(exprDollar[2].duration) } - case 209: + case 205: exprDollar = exprS[exprpt-1 : exprpt+1] -//line expr.y:538 { exprVAL.Labels = []string{exprDollar[1].str} } - case 210: + case 206: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:539 { exprVAL.Labels = append(exprDollar[1].Labels, exprDollar[3].str) } - case 211: + case 207: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:543 { exprVAL.Grouping = &Grouping{Without: false, Groups: exprDollar[3].Labels} } - case 212: + case 208: exprDollar = exprS[exprpt-4 : exprpt+1] -//line expr.y:544 { exprVAL.Grouping = &Grouping{Without: true, Groups: exprDollar[3].Labels} } - case 213: + case 209: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:545 { exprVAL.Grouping = &Grouping{Without: false, Groups: nil} } - case 214: + case 210: exprDollar = exprS[exprpt-3 : exprpt+1] -//line expr.y:546 { exprVAL.Grouping = &Grouping{Without: true, Groups: nil} } diff --git a/pkg/logql/syntax/parser_test.go b/pkg/logql/syntax/parser_test.go index 80a124b8e1..37fe5ea436 100644 --- a/pkg/logql/syntax/parser_test.go +++ b/pkg/logql/syntax/parser_test.go @@ -2954,8 +2954,8 @@ func TestParse(t *testing.T) { exp: &PipelineExpr{ Left: newMatcherExpr([]*labels.Matcher{{Type: labels.MatchEqual, Name: "app", Value: "foo"}}), MultiStages: MultiStageExpr{ - newJSONExpressionParser([]log.XExpression{ - log.NewXExpr("bob", `top.sub["index"]`), + newJSONExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("bob", `top.sub["index"]`), }), }, }, @@ -2965,8 +2965,8 @@ func TestParse(t *testing.T) { exp: &PipelineExpr{ Left: newMatcherExpr([]*labels.Matcher{{Type: labels.MatchEqual, Name: "app", Value: "foo"}}), MultiStages: MultiStageExpr{ - newJSONExpressionParser([]log.XExpression{ - log.NewXExpr("bob", `top.params[0]`), + newJSONExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("bob", `top.params[0]`), }), }, }, @@ -2976,9 +2976,9 @@ func TestParse(t *testing.T) { exp: &PipelineExpr{ Left: newMatcherExpr([]*labels.Matcher{{Type: labels.MatchEqual, Name: "app", Value: "foo"}}), MultiStages: MultiStageExpr{ - newJSONExpressionParser([]log.XExpression{ - log.NewXExpr("response_code", `response.code`), - log.NewXExpr("api_key", `request.headers["X-API-KEY"]`), + newJSONExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("response_code", `response.code`), + log.NewLabelExtractionExpr("api_key", `request.headers["X-API-KEY"]`), }), }, }, @@ -2988,10 +2988,10 @@ func TestParse(t *testing.T) { exp: &PipelineExpr{ Left: newMatcherExpr([]*labels.Matcher{{Type: labels.MatchEqual, Name: "app", Value: "foo"}}), MultiStages: MultiStageExpr{ - newJSONExpressionParser([]log.XExpression{ - log.NewXExpr("response_code", `response_code`), - log.NewXExpr("api_key", `request.headers["X-API-KEY"]`), - log.NewXExpr("layer7_something_specific", `layer7_something_specific`), + newJSONExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("response_code", `response_code`), + log.NewLabelExtractionExpr("api_key", `request.headers["X-API-KEY"]`), + log.NewLabelExtractionExpr("layer7_something_specific", `layer7_something_specific`), }), }, }, @@ -3002,8 +3002,8 @@ func TestParse(t *testing.T) { Left: &LogRange{ Left: &PipelineExpr{ MultiStages: MultiStageExpr{ - newJSONExpressionParser([]log.XExpression{ - log.NewXExpr("layer7_something_specific", `layer7_something_specific`), + newJSONExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("layer7_something_specific", `layer7_something_specific`), }), }, Left: &MatchersExpr{Mts: []*labels.Matcher{mustNewMatcher(labels.MatchEqual, "foo", "bar")}}, @@ -3045,8 +3045,8 @@ func TestParse(t *testing.T) { exp: &PipelineExpr{ Left: newMatcherExpr([]*labels.Matcher{{Type: labels.MatchEqual, Name: "app", Value: "foo"}}), MultiStages: MultiStageExpr{ - newLogfmtExpressionParser([]log.XExpression{ - log.NewXExpr("message", `msg`), + newLogfmtExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("message", `msg`), }), }, }, @@ -3056,8 +3056,8 @@ func TestParse(t *testing.T) { exp: &PipelineExpr{ Left: newMatcherExpr([]*labels.Matcher{{Type: labels.MatchEqual, Name: "app", Value: "foo"}}), MultiStages: MultiStageExpr{ - newLogfmtExpressionParser([]log.XExpression{ - log.NewXExpr("msg", `msg`), + newLogfmtExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("msg", `msg`), }), }, }, @@ -3067,9 +3067,9 @@ func TestParse(t *testing.T) { exp: &PipelineExpr{ Left: newMatcherExpr([]*labels.Matcher{{Type: labels.MatchEqual, Name: "app", Value: "foo"}}), MultiStages: MultiStageExpr{ - newLogfmtExpressionParser([]log.XExpression{ - log.NewXExpr("msg", `msg`), - log.NewXExpr("err", `err`), + newLogfmtExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("msg", `msg`), + log.NewLabelExtractionExpr("err", `err`), }), }, }, @@ -3079,9 +3079,9 @@ func TestParse(t *testing.T) { exp: &PipelineExpr{ Left: newMatcherExpr([]*labels.Matcher{{Type: labels.MatchEqual, Name: "app", Value: "foo"}}), MultiStages: MultiStageExpr{ - newLogfmtExpressionParser([]log.XExpression{ - log.NewXExpr("msg", `msg`), - log.NewXExpr("err", `error`), + newLogfmtExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("msg", `msg`), + log.NewLabelExtractionExpr("err", `error`), }), }, }, @@ -3091,9 +3091,9 @@ func TestParse(t *testing.T) { exp: &PipelineExpr{ Left: newMatcherExpr([]*labels.Matcher{{Type: labels.MatchEqual, Name: "app", Value: "foo"}}), MultiStages: MultiStageExpr{ - newLogfmtExpressionParser([]log.XExpression{ - log.NewXExpr("msg", `message`), - log.NewXExpr("apiKey", `api_key`), + newLogfmtExpressionParser([]log.LabelExtractionExpr{ + log.NewLabelExtractionExpr("msg", `message`), + log.NewLabelExtractionExpr("apiKey", `api_key`), }), }, },