Merge pull request #567 from prometheus/floats

Support scientific notation and special float values.

rules/lexer.l

@@ -55,6 +55,11 @@ L                       [a-zA-Z_]
 M                       [a-zA-Z_:]
 U                       [smhdwy]
 
+FLOAT                   [-+]?({D}*\.?{D}+|{D}+\.?{D}*){EXPONENT}?|[+-]?[iI][nN][fF]|[nN][aA][nN]
+EXPONENT                [eE][-+]?[0-9]+
+
+STR                     \"(\\.|[^\\"])*\"|\'(\\.|[^\\'])*\'
+
 %x S_COMMENTS
 
 %yyc c
@@ -88,19 +93,18 @@ avg|sum|max|min|count    lval.str = strings.ToUpper(lexer.token()); return AGGR_
 [+\-]                    lval.str = lexer.token(); return ADDITIVE_OP
 [*/%]                    lval.str = lexer.token(); return MULT_OP
 
-{D}+{U}                  lval.str = lexer.token(); return DURATION
+{FLOAT}                  num, err := strconv.ParseFloat(lexer.token(), 64);
-{L}({L}|{D})*            lval.str = lexer.token(); return IDENTIFIER
-{M}({M}|{D})*            lval.str = lexer.token(); return METRICNAME
-
-\-?{D}+(\.{D}*)?         num, err := strconv.ParseFloat(lexer.token(), 64);
                          if (err != nil && err.(*strconv.NumError).Err == strconv.ErrSyntax) {
                            panic("Invalid float")
                          }
                          lval.num = clientmodel.SampleValue(num)
                          return NUMBER
 
-\"(\\.|[^\\"])*\"        lval.str = lexer.token()[1:len(lexer.token()) - 1]; return STRING
+{D}+{U}                  lval.str = lexer.token(); return DURATION
-\'(\\.|[^\\'])*\'        lval.str = lexer.token()[1:len(lexer.token()) - 1]; return STRING
+{L}({L}|{D})*            lval.str = lexer.token(); return IDENTIFIER
+{M}({M}|{D})*            lval.str = lexer.token(); return METRICNAME
+
+{STR}                    lval.str = lexer.token()[1:len(lexer.token()) - 1]; return STRING
 
 [{}\[\]()=,]             return int(lexer.buf[0])
 [\t\n\r ]                /* gobble up any whitespace */

rules/rules_test.go

@@ -36,7 +36,7 @@ var (
 	testEvalTime = testStartTime.Add(testSampleInterval * 10)
 	fixturesPath = "fixtures"
 
-	reSample  = regexp.MustCompile(`^(.*) \=\> (\-?\d+\.?\d*e?\d*|[+-]Inf|NaN) \@\[(\d+)\]$`)
+	reSample  = regexp.MustCompile(`^(.*)(?: \=\>|:) (\-?\d+\.?\d*e?\d*|[+-]Inf|NaN) \@\[(\d+)\]$`)
 	minNormal = math.Float64frombits(0x0010000000000000) // The smallest positive normal value of type float64.
 )
 
@@ -902,6 +902,58 @@ func TestExpressions(t *testing.T) {
 				`{instance="ins2", job="job2"} => 0.11666666666666667 @[%v]`,
 			},
 		},
+		{
+			expr:   `12.34e6`,
+			output: []string{`scalar: 12340000 @[%v]`},
+		},
+		{
+			expr:   `12.34e+6`,
+			output: []string{`scalar: 12340000 @[%v]`},
+		},
+		{
+			expr:   `12.34e-6`,
+			output: []string{`scalar: 0.00001234 @[%v]`},
+		},
+		{
+			expr:   `.2`,
+			output: []string{`scalar: 0.2 @[%v]`},
+		},
+		{
+			expr:   `+0.2`,
+			output: []string{`scalar: 0.2 @[%v]`},
+		},
+		{
+			expr:   `-0.2e-6`,
+			output: []string{`scalar: -0.0000002 @[%v]`},
+		},
+		{
+			expr:   `+Inf`,
+			output: []string{`scalar: +Inf @[%v]`},
+		},
+		{
+			expr:   `inF`,
+			output: []string{`scalar: +Inf @[%v]`},
+		},
+		{
+			expr:   `-inf`,
+			output: []string{`scalar: -Inf @[%v]`},
+		},
+		{
+			expr:   `NaN`,
+			output: []string{`scalar: NaN @[%v]`},
+		},
+		{
+			expr:   `nan`,
+			output: []string{`scalar: NaN @[%v]`},
+		},
+		{
+			expr:   `2.`,
+			output: []string{`scalar: 2 @[%v]`},
+		},
+		{
+			expr:   `999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999`,
+			output: []string{`scalar: +Inf @[%v]`},
+		},
 	}
 
 	storage, closer := newTestStorage(t)