Support / # and , in identifiers

Author: nystrom

meta/src/meta/grammar.y

@@ -40,7 +40,7 @@
 %token INT Int64 r'[-]?\d+'
 %token INT128 logic.Int128Value r'[-]?\d+i128'
 %token STRING String r'"(?:[^"\\]|\\.)*"'
-%token SYMBOL String r'[a-zA-Z_][a-zA-Z0-9_.-]*'
+%token SYMBOL String r'[a-zA-Z_][a-zA-Z0-9_./#,-]*'
 %token UINT128 logic.UInt128Value r'0x[0-9a-fA-F]+'
 
 # Type declarations for rules

sdks/go/src/parser.go

@@ -145,7 +145,7 @@ var (
 		{"INT", regexp.MustCompile(`^[-]?\d+`), func(s string) TokenValue { return TokenValue{kind: kindInt64, i64: scanInt(s)} }},
 		{"INT128", regexp.MustCompile(`^[-]?\d+i128`), func(s string) TokenValue { return TokenValue{kind: kindInt128, int128: scanInt128(s)} }},
 		{"STRING", regexp.MustCompile(`^"(?:[^"\\]|\\.)*"`), func(s string) TokenValue { return TokenValue{kind: kindString, str: scanString(s)} }},
-		{"SYMBOL", regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_.-]*`), func(s string) TokenValue { return TokenValue{kind: kindString, str: scanSymbol(s)} }},
+		{"SYMBOL", regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_./#,-]*`), func(s string) TokenValue { return TokenValue{kind: kindString, str: scanSymbol(s)} }},
 		{"UINT128", regexp.MustCompile(`^0x[0-9a-fA-F]+`), func(s string) TokenValue { return TokenValue{kind: kindUint128, uint128: scanUint128(s)} }},
 	}
 )

sdks/julia/LogicalQueryProtocol.jl/src/parser.jl

@@ -153,7 +153,7 @@ const _TOKEN_SPECS = [
     ("INT", r"[-]?\d+", scan_int),
     ("INT128", r"[-]?\d+i128", scan_int128),
     ("STRING", r"\"(?:[^\"\\]|\\.)*\"", scan_string),
-    ("SYMBOL", r"[a-zA-Z_][a-zA-Z0-9_.-]*", scan_symbol),
+    ("SYMBOL", r"[a-zA-Z_][a-zA-Z0-9_./#,-]*", scan_symbol),
     ("UINT128", r"0x[0-9a-fA-F]+", scan_uint128),
 ]
 

sdks/python/src/lqp/gen/parser.py

@@ -113,7 +113,11 @@ def __repr__(self) -> str:
     ("INT", re.compile(r"[-]?\d+"), lambda x: Lexer.scan_int(x)),
     ("INT128", re.compile(r"[-]?\d+i128"), lambda x: Lexer.scan_int128(x)),
     ("STRING", re.compile(r'"(?:[^"\\]|\\.)*"'), lambda x: Lexer.scan_string(x)),
-    ("SYMBOL", re.compile(r"[a-zA-Z_][a-zA-Z0-9_.-]*"), lambda x: Lexer.scan_symbol(x)),
+    (
+        "SYMBOL",
+        re.compile(r"[a-zA-Z_][a-zA-Z0-9_./#,-]*"),
+        lambda x: Lexer.scan_symbol(x),
+    ),
     ("UINT128", re.compile(r"0x[0-9a-fA-F]+"), lambda x: Lexer.scan_uint128(x)),
 ]
 

tests/bin/special_chars_in_ids.bin

@@ -0,0 +1,23 @@
+;; Test that identifiers can contain / # and , characters
+(transaction
+  (epoch
+    (writes
+      (define
+        (fragment :f1
+          (def :my/relation
+            ([x::INT]
+              (and
+                (= x 1)
+                (atom :other/rel x x))))
+          (def :my#relation
+            ([x::INT y::INT]
+              (and
+                (atom :my/relation x)
+                (= y x))))
+          (def :my,relation
+            ([x::INT]
+              (atom :my/relation x))))))
+    (reads
+      (output :my/relation :my/relation)
+      (output :my#relation :my#relation)
+      (output :my,relation :my,relation))))

tests/lqp/special_chars_in_ids.lqp

@@ -0,0 +1,14 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (def :my/relation ([x::INT] (and (= x 1) (atom :other/rel x x))))
+          (def :my#relation ([x::INT y::INT] (and (atom :my/relation x) (= y x))))
+          (def :my,relation ([x::INT] (atom :my/relation x))))))
+    (reads
+      (output :my/relation :my/relation)
+      (output :my#relation :my#relation)
+      (output :my,relation :my,relation))))

tests/pretty/special_chars_in_ids.lqp

@@ -0,0 +1,28 @@
+(transaction
+  (configure { :ivm.maintenance_level "off" :semantics_version 0})
+  (epoch
+    (writes
+      (define
+        (fragment
+          :f1
+          (def
+            0x15c3d261e9b87ddca0f3e13e054457bd
+            ([x::INT] (and (= x 1) (atom 0x91b51012f825fc7c589f890a3b18cfd4 x x))))
+          (def
+            0x1e9de369d8c3c11ff417a9c0c86e7ebe
+            ([x::INT y::INT] (and (atom 0x15c3d261e9b87ddca0f3e13e054457bd x) (= y x))))
+          (def
+            0xcdd1079222948b600fa246777af00460
+            ([x::INT] (atom 0x15c3d261e9b87ddca0f3e13e054457bd x))))))
+    (reads
+      (output :my/relation 0x15c3d261e9b87ddca0f3e13e054457bd)
+      (output :my#relation 0x1e9de369d8c3c11ff417a9c0c86e7ebe)
+      (output :my,relation 0xcdd1079222948b600fa246777af00460))))
+
+;; Debug information
+;; -----------------------
+;; Original names
+;; 	 ID `0x1e9de369d8c3c11ff417a9c0c86e7ebe` -> `my#relation`
+;; 	 ID `0xcdd1079222948b600fa246777af00460` -> `my,relation`
+;; 	 ID `0x15c3d261e9b87ddca0f3e13e054457bd` -> `my/relation`
+;; 	 ID `0x91b51012f825fc7c589f890a3b18cfd4` -> `other/rel`