Merge pull request prometheus#27 from promlabs/feature/signed-number

support signed number in StepInvariantExpr
sfc-gh-pkommini · Mar 22, 2021 · 3f5ab5e · 3f5ab5e
2 parents 5796b4f + 7ae5567
commit 3f5ab5e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/src/promql.grammar b/src/promql.grammar
@@ -239,14 +239,16 @@ MetricIdentifier {
 }
 
 StepInvariantExpr {
-  Expr At ( NumberLiteral | AtModifierPreprocessors "(" ")" )
+  Expr At ( NumberLiteral | SignedNumber | AtModifierPreprocessors "(" ")" )
 }
 
 AtModifierPreprocessors {
-    Start | End
+  Start | End
 }
 
-
+SignedNumber{
+  ("+" | "-" ) NumberLiteral
+}
 
 @skip { whitespace | LineComment }
 

diff --git a/test/expression.txt b/test/expression.txt
@@ -666,6 +666,48 @@ PromQL(
   )
 )
 
+# At modifier with negative number
+
+foo @ - 1234
+
+==>
+PromQL(
+  Expr(
+    StepInvariantExpr(
+      Expr(
+        VectorSelector(
+          MetricIdentifier(
+            Identifier
+          )
+        )
+      )
+      At,
+      SignedNumber(NumberLiteral)
+    )
+  )
+)
+
+# At modifier with explicit positive number
+
+foo @ + 1234
+
+==>
+PromQL(
+  Expr(
+    StepInvariantExpr(
+      Expr(
+        VectorSelector(
+          MetricIdentifier(
+            Identifier
+          )
+        )
+      )
+      At,
+      SignedNumber(NumberLiteral)
+    )
+  )
+)
+
 # Mixed-case NaN.
 
 NaN