core: Fix and test empty variadic directives in declarative assembly …

…format. (#2069)
xdslproject · Feb 1, 2024 · 9a4b28c · 9a4b28c
1 parent 9864f8d
commit 9a4b28c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/tests/test_declarative_assembly_format.py b/tests/test_declarative_assembly_format.py
@@ -527,6 +527,11 @@ class TwoOperandsOp(IRDLOperation):
 @pytest.mark.parametrize(
     "format, program, generic_program",
     [
+        (
+            "$args type($args) attr-dict",
+            '%0 = "test.op"() : () -> i32\n' "test.variadic_operand  ",
+            '%0 = "test.op"() : () -> i32\n' '"test.variadic_operand"() : () -> ()',
+        ),
         (
             "$args type($args) attr-dict",
             '%0 = "test.op"() : () -> i32\n' "test.variadic_operand %0 i32",
@@ -718,6 +723,11 @@ class TwoResultOp(IRDLOperation):
 @pytest.mark.parametrize(
     "format, program, generic_program",
     [
+        (
+            "`:` type($res) attr-dict",
+            "test.variadic_result : ",
+            '"test.variadic_result"() : () -> ()',
+        ),
         (
             "`:` type($res) attr-dict",
             "%0 = test.variadic_result : i32",

diff --git a/xdsl/irdl/declarative_assembly_format.py b/xdsl/irdl/declarative_assembly_format.py
@@ -364,9 +364,11 @@ class VariadicOperandVariable(OperandVariable):
     """
 
     def parse(self, parser: Parser, state: ParsingState) -> None:
-        operands = parser.parse_comma_separated_list(
-            parser.Delimiter.NONE, parser.parse_unresolved_operand
+        operands = parser.parse_optional_undelimited_comma_separated_list(
+            parser.parse_optional_unresolved_operand, parser.parse_unresolved_operand
         )
+        if operands is None:
+            operands = []
         state.operands[self.index] = cast(list[UnresolvedOperand | None], operands)
 
     def print(self, printer: Printer, state: PrintingState, op: IRDLOperation) -> None:
@@ -411,9 +413,11 @@ class VariadicOperandTypeDirective(OperandTypeDirective):
     """
 
     def parse(self, parser: Parser, state: ParsingState) -> None:
-        operand_types = parser.parse_comma_separated_list(
-            parser.Delimiter.NONE, parser.parse_type
+        operand_types = parser.parse_optional_undelimited_comma_separated_list(
+            parser.parse_optional_type, parser.parse_type
         )
+        if operand_types is None:
+            operand_types = []
         state.operand_types[self.index] = cast(list[Attribute | None], operand_types)
 
     def print(self, printer: Printer, state: PrintingState, op: IRDLOperation) -> None:
@@ -540,9 +544,11 @@ class VariadicResultTypeDirective(ResultTypeDirective):
     """
 
     def parse(self, parser: Parser, state: ParsingState) -> None:
-        result_types = parser.parse_comma_separated_list(
-            parser.Delimiter.NONE, parser.parse_type
+        result_types = parser.parse_optional_undelimited_comma_separated_list(
+            parser.parse_optional_type, parser.parse_type
         )
+        if result_types is None:
+            result_types = []
         state.result_types[self.index] = cast(list[Attribute | None], result_types)
 
     def print(self, printer: Printer, state: PrintingState, op: IRDLOperation) -> None: