Modify outer lexer to admit dots in attribute keys (#864)

Related: #3953 --------- Co-authored-by: devops <devops@runtimeverification.com>
runtimeverification · Feb 6, 2024 · 71819ec · 71819ec
1 parent f78b717
commit 71819ec
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/pyk/docs/conf.py b/pyk/docs/conf.py
@@ -9,8 +9,8 @@
 project = 'pyk'
 author = 'Runtime Verification, Inc'
 copyright = '2024, Runtime Verification, Inc'
-version = '0.1.614'
-release = '0.1.614'
+version = '0.1.615'
+release = '0.1.615'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

diff --git a/pyk/package/version b/pyk/package/version
@@ -1 +1 @@
-0.1.614
+0.1.615
diff --git a/pyk/pyproject.toml b/pyk/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pyk"
-version = "0.1.614"
+version = "0.1.615"
 description = ""
 authors = [
     "Runtime Verification, Inc. <contact@runtimeverification.com>",

diff --git a/pyk/src/pyk/kast/outer_lexer.py b/pyk/src/pyk/kast/outer_lexer.py
@@ -723,7 +723,7 @@ def _attr(la: str, it: Iterator[str]) -> Generator[Token, None, str]:
 
 
 def _attr_key(la: str, it: Iterator[str]) -> tuple[Token, str]:
-    # ["a"-"z","1"-"9"](["A"-"Z", "a"-"z", "-", "0"-"9"])*("<" (["A"-"Z", "a"-"z", "-", "0"-"9"])+ ">")?
+    # ["a"-"z","1"-"9"](["A"-"Z", "a"-"z", "-", "0"-"9", "."])*("<" (["A"-"Z", "a"-"z", "-", "0"-"9"])+ ">")?
 
     consumed: list[str] = []
     if la not in _LOWER and la not in _DIGIT:
@@ -732,21 +732,21 @@ def _attr_key(la: str, it: Iterator[str]) -> tuple[Token, str]:
     consumed.append(la)
     la = next(it, '')
 
-    while la in _ALNUM or la == '-':
+    while la in _ALNUM or la == '-' or la == '.':
         consumed.append(la)
         la = next(it, '')
 
     if la == '<':
         consumed.append(la)
         la = next(it, '')
 
-        if not la in _ALNUM and la != '-':
+        if not la in _ALNUM and la != '-' and la != '.':
             raise _unexpected_character(la)
 
         consumed.append(la)
         la = next(it, '')
 
-        while la in _ALNUM or la == '-':
+        while la in _ALNUM or la == '-' or la == '.':
             consumed.append(la)
             la = next(it, '')
 

diff --git a/pyk/src/tests/unit/test-data/outer-lexer/attr-key-with-dots.test b/pyk/src/tests/unit/test-data/outer-lexer/attr-key-with-dots.test
@@ -0,0 +1,22 @@
+[org.kframework.attributes.Location(Location(50,10,50,120))]
+===
+LBRACK
+[
+
+ATTR_KEY
+org.kframework.attributes.Location
+
+LPAREN
+(
+
+ATTR_CONTENT
+Location(50,10,50,120)
+
+RPAREN
+)
+
+RBRACK
+]
+
+EOF
+