fix: tl-b grammar constructor name may contain a comma

Author: ilyar

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 - Fix tl-b grammar to support math expressions [issues #121](https://github.com/ton-community/tlb-parser/issues/121)
 - Fix tl-b grammar use a Nat field in an expression [issues #120](https://github.com/ton-community/tlb-parser/issues/120)
 - Fix tl-b grammar can use ref in expression
+- Fix tl-b grammar constructor name may contain a comma
 
 ### Chore
 

src/grammar/tlb.ts

@@ -37,7 +37,7 @@ TLB {
   // Identifiers
   identifier = identifierStart identifierPart*
   identifierStart = "_" | letter
-  identifierPart = identifierStart | digit
+  identifierPart = identifierStart | digit | ","
 
   // Primitives
   number = digit+

src/parsing.ts

@@ -25,7 +25,7 @@ export const rootNodes = {
 export const constructorNodes = {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     Constructor(name: TerminalNode, tag: Node): any {
-        const nameValue = name.sourceString;
+        const nameValue = name.sourceString.replace(/,/g, '_');
         let tagValue = null;
 
         if (tag.numChildren !== 0) {

tests/edge-cases.spec.ts

@@ -23,19 +23,22 @@ import { isNatField } from '../src/validation';
 
 describe('edge cases', () => {
     test.each([
-        ['_ n:(## 2) c:(n * Cell) = X;', null],
-        ['_ n:(## 2) c:(n * ^Cell) = X;', null],
-        ['_ x:# = X;', null],
-        ['test$10 = Test;', 'binary' as const],
-        ['test#0a = Test;', 'hex' as const],
-        ['test = Test;', null],
-        ['_ {n:#} = X (n + 1 + 2);', null],
-        ['_ {n:#} l:(## (n * 2 * 4)) = X;', null],
-    ])('parse & ast: %s', (schema: string, tagType: 'binary' | 'hex' | null) => {
+        ['a,b#00000001 = Ab;', 'hex', 'a_b'],
+        ['_ n:(## 2) c:(n * Cell) = X;', null, '_'],
+        ['_ n:(## 2) c:(n * ^Cell) = X;', null, '_'],
+        ['_ x:# = X;', null, '_'],
+        ['test$10 = Test;', 'binary', 'test'],
+        ['test#0a = Test;', 'hex', 'test'],
+        ['test = Test;', null, 'test'],
+        ['_ {n:#} = X (n + 1 + 2);', null, '_'],
+        ['_ {n:#} l:(## (n * 2 * 4)) = X;', null, '_'],
+    ])('parse & ast: %s', (schema: string, tagType: string | null, constName: string) => {
         expect(parse(schema).succeeded()).toBe(true);
         const tree = ast(schema);
         expect(tree).toBeInstanceOf(Program);
-        expect(tree.declarations[0]!.constructorDef.getTagType()).toBe(tagType);
+        const declaration = tree.declarations[0]!;
+        expect(declaration.constructorDef.name).toBe(constName);
+        expect(declaration.constructorDef.getTagType()).toBe(tagType);
     });
 
     test('withParents handles all cases', () => {