Merge pull request #228 from nvergez/fix-type-expression-parser

Fix type expression parser
multiversx · Aug 1, 2022 · fcd30aa · fcd30aa
2 parents 2d0a737 + 4170c97
commit fcd30aa
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 33 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/smartcontracts/typesystem/typeExpressionParser.spec.ts b/src/smartcontracts/typesystem/typeExpressionParser.spec.ts
@@ -102,33 +102,31 @@ describe("test parser", () => {
             ],
         });
 
-        // TODO: In a future PR, replace the JSON-based parsing logic with a better one and enable this test,
-        // which currently fails.
-
-        // type = parser.parse("MultiArg<Option<u8>, List<u16>>");
-        // assert.deepEqual(type.toJSON(), {
-        //     "name": "MultiArg",
-        //     "typeParameters": [
-        //         {
-        //             "name": "Option",
-        //             "typeParameters": [
-        //                 {
-        //                     "name": "u8",
-        //                     "typeParameters": []
-        //                 }
-        //             ]
-        //         },
-        //         {
-        //             "name": "List",
-        //             "typeParameters": [
-        //                 {
-        //                     "name": "u16",
-        //                     "typeParameters": []
-        //                 }
-        //             ]
-        //         }
-        //     ]
-        // });
+
+        type = parser.parse("MultiArg<Option<u8>, List<u16>>");
+        assert.deepEqual(type.toJSON(), {
+            "name": "MultiArg",
+            "typeParameters": [
+                {
+                    "name": "Option",
+                    "typeParameters": [
+                        {
+                            "name": "u8",
+                            "typeParameters": []
+                        }
+                    ]
+                },
+                {
+                    "name": "List",
+                    "typeParameters": [
+                        {
+                            "name": "u16",
+                            "typeParameters": []
+                        }
+                    ]
+                }
+            ]
+        });
     });
 
     it("should parse expression: tuples", () => {
@@ -189,6 +187,31 @@ describe("test parser", () => {
                 },
             ],
         });
+
+        type = parser.parse("tuple<List<u64>,List<u64>>");
+        assert.deepEqual(type.toJSON(), {
+            name: "tuple",
+            typeParameters: [
+                {
+                    name: "List",
+                    typeParameters: [
+                        {
+                            name: "u64",
+                            typeParameters: [],
+                        }
+                    ],
+                },
+                {
+                    name: "List",
+                    typeParameters: [
+                        {
+                            name: "u64",
+                            typeParameters: [],
+                        }
+                    ],
+                },
+            ],
+        });
     });
 
     it("should handle utf-8 string types which contain spaces", () => {

diff --git a/src/smartcontracts/typesystem/typeExpressionParser.ts b/src/smartcontracts/typesystem/typeExpressionParser.ts
@@ -57,6 +57,8 @@ export class TypeExpressionParser {
             } else if (char == ",") {
                 if (nextChar == ">") {
                     // Skip superfluous comma
+                } else if (previousChar == ">") {
+                    jsoned += ",";
                 } else {
                     jsoned += ": {},";
                 }