✨ [+feature] Added parsing support for tuples

davidbrownell · May 14, 2024 · 9713dc7 · 9713dc7
1 parent 14b670b
commit 9713dc7
Show file tree

Hide file tree

Showing 4 changed files with 408 additions and 15 deletions.
diff --git a/src/SimpleSchemaGenerator/SampleSchemas/Tuples.SimpleSchema b/src/SimpleSchemaGenerator/SampleSchemas/Tuples.SimpleSchema
@@ -0,0 +1,20 @@
+Tuples ->
+    single: (String, )
+    multiple: (String, Integer, Number)
+
+    container: (String, Integer, Number, )*
+
+    with_metadata: (
+        String { min_length: 5 },
+        Integer { min: 10 },
+        Number { min: 20.0 },
+    )
+
+    nested: (
+        String,
+        (String*, Integer)+,
+        Number,
+        (String, (Number { max: 1.23 }, ), ),
+    )
+
+tuples: Tuples?
diff --git a/src/SimpleSchemaGenerator/Schema/Parse/ANTLR/Parse.py b/src/SimpleSchemaGenerator/Schema/Parse/ANTLR/Parse.py
@@ -1130,18 +1130,18 @@ def visitParse_identifier_type_global(
     # TODO:         ),
     # TODO:     )
 
-    # TODO: # ----------------------------------------------------------------------
-    # TODO: def visitParse_tuple_type(self, ctx: SimpleSchemaParser.Parse_tuple_typeContext):
-    # TODO:     children = self._GetChildren(ctx)
-    # TODO:
-    # TODO:     assert children
-    # TODO:     assert all(isinstance(child, ParseType) for child in children), children
-    # TODO:
-    # TODO:     self._stack.append(
-    # TODO:         lambda region, cardinality, metadata: ParseTupleType(
-    # TODO:             region,
-    # TODO:             cardinality,
-    # TODO:             metadata,
-    # TODO:             cast(list[ParseType], children),
-    # TODO:         ),
-    # TODO:     )
+    # ----------------------------------------------------------------------
+    def visitParse_tuple_type(self, ctx: SimpleSchemaParser.Parse_tuple_typeContext):
+        children = self._GetChildren(ctx)
+
+        assert children
+        assert all(isinstance(child, ParseType) for child in children), children
+
+        self._stack.append(
+            lambda region, cardinality, metadata: ParseTupleType(
+                region,
+                cardinality,
+                metadata,
+                cast(list[ParseType], children),
+            ),
+        )
diff --git a/tests/Schema/Parse/ANTLR/Parse_UnitTest.py b/tests/Schema/Parse/ANTLR/Parse_UnitTest.py
@@ -111,6 +111,10 @@ def test_Extensions(self):
     def test_Structures(self):
         self.Execute(PathEx.EnsureFile(sample_schemas / "Structures.SimpleSchema"))
 
+    # ----------------------------------------------------------------------
+    def test_Tuples(self):
+        self.Execute(PathEx.EnsureFile(sample_schemas / "Tuples.SimpleSchema"))
+
 
 # ----------------------------------------------------------------------
 class TestParsing:
@@ -146,6 +150,10 @@ def test_Extensions(self, snapshot):
     def test_Structures(self, snapshot):
         self.Execute(PathEx.EnsureFile(sample_schemas / "Structures.SimpleSchema"), snapshot)
 
+    # ----------------------------------------------------------------------
+    def test_Tuples(self, snapshot):
+        self.Execute(PathEx.EnsureFile(sample_schemas / "Tuples.SimpleSchema"), snapshot)
+
 
 # ----------------------------------------------------------------------
 # |