Merge pull request #11 from facetoe/will-bump-parser-version

Makefile,parser: bump to latest version
facetoe · Jun 13, 2023 · b9cdbdd · b9cdbdd
2 parents ffeac27 + 00ee12f
commit b9cdbdd
Show file tree

Hide file tree

Showing 11 changed files with 11,391 additions and 1,584 deletions.
diff --git a/Makefile b/Makefile
@@ -2,12 +2,9 @@ WORKDIR=build
 ANTLR_VERSION=4.10
 ANTLR_JAR=antlr-$(ANTLR_VERSION)-complete.jar
 
-
-# When https://github.com/antlr/grammars-v4/pull/2651 is merged can use grammar from official project
-#[email protected]:antlr/$(PROJECT).git
 PROJECT=grammars-v4
 GITHUB_URL[email protected]:facetoe/$(PROJECT).git
-GRAMMAR_COMMIT=6826e5860e05c61877e0142d4c464b4cd30140a9
+GRAMMAR_COMMIT=4a9bb0a5dc9cedbfafac688791ad0245a8d9d539
 
 $(WORKDIR)/$(ANTLR_JAR):
 	mkdir -p $(WORKDIR)

diff --git a/promval/parser/PromQLLexer.interp b/promval/parser/PromQLLexer.interp
diff --git a/promval/parser/PromQLLexer.py b/promval/parser/PromQLLexer.py
diff --git a/promval/parser/PromQLLexer.tokens b/promval/parser/PromQLLexer.tokens
@@ -35,12 +35,14 @@ RIGHT_PAREN=34
 LEFT_BRACKET=35
 RIGHT_BRACKET=36
 COMMA=37
-SUBQUERY_RANGE=38
-TIME_RANGE=39
-DURATION=40
-METRIC_NAME=41
-LABEL_NAME=42
-WS=43
+AT=38
+SUBQUERY_RANGE=39
+TIME_RANGE=40
+DURATION=41
+METRIC_NAME=42
+LABEL_NAME=43
+WS=44
+SL_COMMENT=45
 '+'=3
 '-'=4
 '*'=5
@@ -74,3 +76,4 @@ WS=43
 '['=35
 ']'=36
 ','=37
+'@'=38
diff --git a/promval/parser/PromQLParser.interp b/promval/parser/PromQLParser.interp