jaclang 0.2.5__py3-none-any.whl → 0.3.1__py3-none-any.whl

jaclang/jac/passes/tool/jac_formatter_pass.py

@@ -16,7 +16,6 @@ class JacFormatPass(Pass):
         self.comments: list[ast.CommentToken] = []
         self.indent_size = 4
         self.indent_level = 0
-        self.prev_brac = False
 
     def indent_str(self) -> str:
         """Return string for indent."""
@@ -75,9 +74,19 @@ class JacFormatPass(Pass):
         body: Sequence[ElementStmt],
         is_imported: bool,
         """
-        if node.doc:
-            self.emit_ln(node, node.doc.value)
-            self.emit_ln(node, "")
+        for i in node.kid:
+            if isinstance(i, ast.String):
+                self.emit_ln(node, f" {i.gen.jac}")
+            elif isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Token):
+                self.emit(node, i.value.strip("") + " ")
+            elif isinstance(i, ast.SubTag):
+                for j in i.kid:
+                    self.emit(node, j.gen.jac)
         for i in node.body:
             self.emit_ln(node, i.gen.jac)
             self.emit_ln(node, "")
@@ -90,11 +99,14 @@ class JacFormatPass(Pass):
         is_frozen: bool,
         doc: Optional[String] = None,
         """
-        if node.doc:
-            self.emit_ln(node, node.doc.value)
         for i in node.kid:
             if isinstance(i, ast.String):
-                continue
+                self.emit_ln(node, f" {i.gen.jac}")
+            elif isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, i.gen.jac)
             elif isinstance(i, ast.Token):
                 if i.name == "SEMI":
                     self.emit_ln(node, i.value + " ")
@@ -111,12 +123,10 @@ class JacFormatPass(Pass):
         body: SubNodeList[CodeBlockStmt],
         doc: Optional[Constant] = None,
         """
-        if node.doc:
-            self.emit_ln(node, node.doc.value)
         for i in node.kid:
             if isinstance(i, ast.String):
-                continue
-            if isinstance(i, ast.Token):
+                self.emit_ln(node, f"{i.gen.jac}")
+            elif isinstance(i, ast.Token):
                 self.emit(node, i.value.strip("") + " ")
             elif isinstance(i, ast.SubTag):
                 for j in i.kid:
@@ -129,58 +139,62 @@ class JacFormatPass(Pass):
 
         items: list[T],
         """
-        count = 0
-        for stmt in node.kid:
+        prev_token = None
+        for i, stmt in enumerate(node.kid):
+            if isinstance(node.parent, (ast.EnumDef, ast.Enum)) and stmt.gen.jac == ",":
+                self.indent_level -= 1
+                self.emit_ln(node, f"{stmt.gen.jac}")
+                self.indent_level += 1
+                continue
             if isinstance(stmt, ast.Token):
                 if stmt.name == "LBRACE":
                     if (
-                        count + 1 < len(node.kid)
-                        and isinstance(node.kid[count + 1], ast.CommentToken)
-                        and node.kid[count + 1].is_inline
+                        isinstance(node.kid[i + 1], ast.CommentToken)
+                        and node.kid[i + 1].is_inline
                     ):
-                        self.emit(node, f"{stmt.value}")
+                        self.emit(node, f" {stmt.value}")
                     else:
-                        self.emit_ln(node, f" {stmt.value}")
+                        self.emit_ln(node, f" {stmt.value} ")
                     self.indent_level += 1
-                    count += 1
                 elif stmt.name == "RBRACE":
                     self.indent_level -= 1
-                    if (
-                        isinstance(stmt.parent.parent, (ast.ElseIf, ast.IfStmt))
-                        and not self.prev_brac
-                    ):
+                    if isinstance(stmt.parent.parent, (ast.ElseIf, ast.IfStmt)):
                         self.emit(node, f"{stmt.value}")
-                        self.prev_brac = True
 
                     else:
-                        if (
-                            count + 1 < len(node.kid)
-                            and isinstance(node.kid[count + 1], ast.CommentToken)
-                            and node.kid[count + 1].is_inline
+                        if i < (len(node.kid) - 1) and (
+                            isinstance(node.kid[i + 1], ast.CommentToken)
+                            and node.kid[i + 1].is_inline
                         ):
-                            self.emit(node, f"{stmt.value.lstrip()}")
-                            self.prev_brac = True
+                            self.emit(node, f" {stmt.value}")
+                        elif not (node.gen.jac).endswith("\n"):
+                            self.emit_ln(node, "")
+                            self.emit_ln(node, f"{stmt.value}")
                         else:
                             self.emit_ln(node, f"{stmt.value}")
-                            self.prev_brac = False
-                    count += 1
                 elif isinstance(stmt, ast.CommentToken):
-                    self.emit_ln(node, f" {stmt.value}")
+                    if stmt.is_inline:
+                        if isinstance(prev_token, ast.Semi) or prev_token.name in [
+                            "LBRACE",
+                            "RBRACE",
+                        ]:
+                            self.indent_level -= 1
+                            self.emit(node, f" {stmt.gen.jac}")
+                            self.emit_ln(node, "")
+                            self.indent_level += 1
+                        else:
+                            self.emit(node, f"{stmt.gen.jac}")
+                    else:
+                        self.emit_ln(node, "")
+                        self.emit_ln(node, stmt.gen.jac)
                 else:
                     self.emit(node, f"{stmt.value}")
-                    count += 1
                     continue
-            elif isinstance(stmt, ast.Assignment):
-                self.emit(node, f"{stmt.gen.jac}")
-                count += 1
+            elif isinstance(stmt, (ast.Assignment, ast.Semi)):
+                self.emit(node, f"{stmt.gen.jac} ")
             else:
-                if isinstance(stmt, ast.ExprStmt):
-                    self.emit(node, f"{stmt.gen.jac}")
-                    count += 1
-                else:
-                    self.emit(node, f"{stmt.gen.jac}")
-                    count += 1
-                    continue
+                self.emit(node, f"{stmt.gen.jac}")
+            prev_token = stmt
 
     def exit_sub_tag(self, node: ast.SubTag) -> None:
         """Sub objects.
@@ -196,12 +210,12 @@ class JacFormatPass(Pass):
         target: AtomType,
         params: Optional[ParamList],
         """
-        # node.print()
         for i in node.kid:
             if isinstance(i, ast.CommentToken):
                 if i.is_inline:
                     self.emit(node, f" {i.gen.jac}")
                 else:
+                    self.emit_ln(node, "")
                     self.emit_ln(node, i.gen.jac)
             else:
                 self.emit(node, i.gen.jac)
@@ -302,7 +316,7 @@ class JacFormatPass(Pass):
                 else:
                     self.emit_ln(node, i.gen.jac)
             elif isinstance(i, ast.Semi):
-                self.emit(node, f"{i.gen.jac}")
+                self.emit(node, f"{i.gen.jac} ")
             else:
                 if start:
                     self.emit(node, f"{i.gen.jac}")
@@ -323,24 +337,30 @@ class JacFormatPass(Pass):
         doc: Optional[Constant] = None,
         sub_module: Optional[Module] = None,
         """
-        if node.items:
-            self.emit(
-                node,
-                f"import:{node.lang.tag.value} from {node.path.gen.jac}, {node.items.gen.jac};",  # noqa
-            )
-            self.emit_ln(node, "")
-        else:
-            if node.is_absorb:
-                self.emit_ln(
-                    node,
-                    f"include:{node.lang.tag.value} {node.path.gen.jac};",
-                )
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                elif not node.gen.jac.endswith("\n"):
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+                else:
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac} ")
+            elif i.gen.jac.startswith(":"):
+                self.emit(node, f"{i.gen.jac}")
             else:
-                self.emit(
-                    node,
-                    f"import:{node.lang.tag.value} {node.path.gen.jac};",
-                )
-        self.emit_ln(node, "")
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                elif i.gen.jac == ",":
+                    self.emit(node, f"{i.gen.jac} ")
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi)) and not node.gen.jac.endswith("\n"):
+            self.emit_ln(node, "")
 
     def exit_arch_def(self, node: ast.ArchDef) -> None:
         """Sub objects.
@@ -370,17 +390,20 @@ class JacFormatPass(Pass):
         doc: Optional[Constant] = None,
         decorators: Optional[SubNodeList[ExprType]] = None,
         """
-        if node.doc:
-            self.emit_ln(node, node.doc.gen.jac)
         start = True
+        prev_token = None
         for i in node.kid:
-            if isinstance(i, ast.CommentToken):
+            if isinstance(i, ast.String):
+                self.emit_ln(node, f"{i.gen.jac}")
+            elif isinstance(i, ast.CommentToken):
                 if i.is_inline:
                     self.emit(node, f" {i.gen.jac}")
+                    if isinstance(prev_token, ast.Semi):
+                        self.emit_ln(node, "")
                 else:
                     self.emit_ln(node, i.gen.jac)
             elif isinstance(i, ast.Semi):
-                self.emit(node, f"{i.gen.jac}")
+                self.emit(node, f"{i.gen.jac} ")
             elif isinstance(i, ast.SubNodeList) and i.gen.jac.startswith("@"):
                 self.emit_ln(node, i.gen.jac)
             else:
@@ -389,7 +412,8 @@ class JacFormatPass(Pass):
                     start = False
                 else:
                     self.emit(node, f" {i.gen.jac}")
-        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            prev_token = i
+        if isinstance(node.kid[-1], (ast.Semi)):
             self.emit_ln(node, "")
 
     def exit_func_signature(self, node: ast.FuncSignature) -> None:
@@ -457,36 +481,26 @@ class JacFormatPass(Pass):
         base_classes: BaseClasses,
         body: Optional[EnumBlock],
         """
-        if node.doc:
-            self.emit_ln(node, node.doc.value)
-        if node.decorators:
-            self.emit_ln(node, node.decorators.gen.jac)
-        if node.base_classes:
-            self.emit(
-                node,
-                f"enum {node.name.gen.jac}({node.base_classes.gen.jac})",  # noqa
-            )
-        else:
-            self.emit(node, f"enum {node.name.value}")
-        if node.body:
-            for stmt in node.body.kid:
-                if isinstance(stmt, ast.Token):
-                    if stmt.name == "LBRACE":
-                        self.emit_ln(node, f" {stmt.value}")
-                        self.indent_level += 1
-                    elif stmt.name == "RBRACE":
-                        self.emit_ln(node, "")
-                        self.indent_level -= 1
-                        self.emit_ln(node, f"{stmt.value}")
-                        # self.emit_ln(node, "")
-                    else:
-                        self.indent_level -= 1
-                        self.emit_ln(node, f"{stmt.value}")
-                        self.indent_level += 1
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.String):
+                self.emit(node, f"{i.gen.jac}")
+            elif isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
                 else:
-                    self.emit(node, f"{stmt.gen.jac}")
-        else:
-            self.emit(node, ";")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac} ")
+            elif isinstance(i, ast.SubNodeList) and i.gen.jac.startswith("@"):
+                self.emit_ln(node, i.gen.jac)
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
             self.emit_ln(node, "")
 
     def exit_enum_def(self, node: ast.EnumDef) -> None:
@@ -620,7 +634,7 @@ class JacFormatPass(Pass):
                 else:
                     self.emit_ln(node, i.gen.jac)
             elif isinstance(i, ast.Semi):
-                self.emit(node, f"{i.gen.jac}")
+                self.emit(node, f"{i.gen.jac} ")
             else:
                 if start:
                     self.emit(node, f"{i.gen.jac}")
@@ -635,11 +649,21 @@ class JacFormatPass(Pass):
 
         elseifs: list[IfStmt],
         """
-        self.emit(node, f" elif {node.condition.gen.jac} ")
-        self.emit(node, node.body.gen.jac)
-
-        if node.else_body:
-            self.emit(node, node.else_body.gen.jac)
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac} ")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
 
     def exit_disengage_stmt(self, node: ast.DisengageStmt) -> None:
         """Sub objects."""
@@ -652,8 +676,21 @@ class JacFormatPass(Pass):
 
         body: CodeBlock,
         """
-        self.emit(node, " else ")
-        self.emit(node, node.body.gen.jac)
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
 
     def exit_expr_stmt(self, node: ast.ExprStmt) -> None:
         """Sub objects.
@@ -666,6 +703,7 @@ class JacFormatPass(Pass):
                 if i.is_inline:
                     self.emit(node, f" {i.gen.jac}")
                 else:
+                    self.emit_ln(node, "")
                     self.emit_ln(node, i.gen.jac)
             elif isinstance(i, ast.Semi):
                 self.emit(node, f"{i.gen.jac}")
@@ -769,9 +807,18 @@ class JacFormatPass(Pass):
 
         target: SubNodeList[NameType],
         """
-        self.emit(node, ":g:")
-        self.comma_sep_node_list(node.target)
-        self.emit_ln(node, f"{node.target.gen.jac}")
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit_ln(node, i.gen.jac)
+            else:
+                self.emit(node, i.gen.jac)
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_non_local_stmt(self, node: ast.GlobalStmt) -> None:
         """Sub objects.
@@ -815,28 +862,27 @@ class JacFormatPass(Pass):
         doc: Optional[Constant] = None,
         decorators: Optional[SubNodeList[ExprType]] = None,
         """
-        self.emit_ln(node, "")
-        if node.doc:
-            self.emit_ln(node, node.doc.value)
-        if node.decorators:
-            self.emit_ln(node, node.decorators.gen.jac)
-        if not node.base_classes:
-            self.emit(
-                node,
-                f"{node.arch_type.value} {node.name.gen.jac} ",
-            )
-        else:
-            self.sep_node_list(node.base_classes, delim=":")
-            self.emit(
-                node,
-                f"{node.arch_type.value} {node.name.gen.jac}:{node.base_classes.gen.jac}: ",  # noqa
-            )
-        body = node.body.body if isinstance(node.body, ast.ArchDef) else node.body
-        if body:
-            self.emit(node, body.gen.jac)
-        else:
-            self.decl_def_missing(node.name.gen.jac)
-        self.emit_ln(node, "")
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.String):
+                self.emit_ln(node, f"{i.gen.jac}")
+            elif isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac} ")
+            elif isinstance(i, ast.SubNodeList) and i.gen.jac.startswith("@"):
+                self.emit_ln(node, i.gen.jac)
+            else:
+                if start or i.gen.jac.startswith(":"):
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_f_string(self, node: ast.FString) -> None:
         """Sub objects.
@@ -911,10 +957,23 @@ class JacFormatPass(Pass):
 
         cause: Optional[ExprType],
         """
-        if node.cause:
-            node.gen.jac = f"raise {node.cause.gen.jac};"
-        else:
-            node.gen.jac = "raise;"
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_edge_op_ref(self, node: ast.EdgeOpRef) -> None:
         """Sub objects.
@@ -1145,16 +1204,23 @@ class JacFormatPass(Pass):
         condition: ExprType,
         error_msg: Optional[ExprType],
         """
-        if node.error_msg:
-            self.emit(
-                node,
-                f"assert {node.condition.gen.jac}, {node.error_msg.gen.jac}",  # noqa
-            )
-        else:
-            self.emit(node, f"assert {node.condition.gen.jac}")
-
-        if isinstance(node.kid[-1], ast.Token) and node.kid[-1].name == "SEMI":
-            self.emit_ln(node, node.kid[-1].value + " ")
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_ctrl_stmt(self, node: ast.CtrlStmt) -> None:
         """Sub objects.
@@ -1254,16 +1320,27 @@ class JacFormatPass(Pass):
         doc: Optional[Token],
         body: CodeBlock,
         """
-        test_name = node.name.value
-        if test_name.startswith("test", 0, 4):
-            test_name = ""
-        if node.doc:
-            self.emit_ln(node, node.doc.gen.jac)
-        if test_name:
-            self.emit(node, f"test {test_name}")
-        else:
-            self.emit(node, "test")
-        self.emit(node, f"{node.body.gen.jac}")
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            elif isinstance(i, ast.Name):
+                if not i.value.startswith("test"):
+                    self.emit(node, f" {i.value} ")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_py_inline_code(self, node: ast.PyInlineCode) -> None:
         """Sub objects.
@@ -1277,14 +1354,21 @@ class JacFormatPass(Pass):
 
         archs: list[ArchRef],
         """
+        start = True
         for i in node.kid:
             if isinstance(i, ast.CommentToken):
                 if i.is_inline:
                     self.emit(node, f" {i.gen.jac}")
                 else:
                     self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
             else:
-                self.emit(node, i.gen.jac)
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
         if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
             self.emit_ln(node, "")
 
@@ -1301,12 +1385,24 @@ class JacFormatPass(Pass):
         target: ExprType
         cases: list[MatchCase],
         """
-        self.emit_ln(node, f"match {node.target.gen.jac} {{")
-        self.indent_level += 1
-        for case in node.cases:
-            self.emit_ln(node, case.gen.jac)
-        self.indent_level -= 1
-        self.emit_ln(node, "}")
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_match_case(self, node: ast.MatchCase) -> None:
         """Sub objects.
@@ -1315,24 +1411,53 @@ class JacFormatPass(Pass):
         guard: Optional[ExprType],
         body: SubNodeList[CodeBlockStmt],
         """
-        if node.guard:
-            self.emit_ln(
-                node,
-                f"case {node.pattern.gen.jac} if {node.guard.gen.jac}:",  # noqa
-            )
-        else:
-            self.emit(node, f"case {node.pattern.gen.jac}:")
-        self.indent_level += 1
-        self.nl_sep_node_list(node.body)
-        self.emit_ln(node, node.body.gen.jac)
-        self.indent_level -= 1
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            elif isinstance(i, ast.Token) and i.value == ":":
+                self.emit_ln(node, f"{i.gen.jac}")
+            elif isinstance(i, ast.SubNodeList):
+                self.indent_level += 1
+                self.emit_ln(node, f"{i.gen.jac}")
+                self.indent_level -= 1
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_match_or(self, node: ast.MatchOr) -> None:
         """Sub objects.
 
         list[MatchPattern],
         """
-        self.emit(node, " | ".join([i.gen.jac for i in node.patterns]))
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_match_as(self, node: ast.MatchAs) -> None:
         """Sub objects.
@@ -1340,21 +1465,69 @@ class JacFormatPass(Pass):
         name: NameType,
         pattern: MatchPattern,
         """
-        if node.pattern:
-            self.emit(node, f"{node.name.gen.jac} as {node.pattern.gen.jac}")
-        else:
-            self.emit(node, f"{node.name.gen.jac}")
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_match_wild(self, node: ast.MatchWild) -> None:
         """Sub objects."""
-        self.emit(node, "_")
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_match_value(self, node: ast.MatchValue) -> None:
         """Sub objects.
 
         value: ExprType,
         """
-        self.emit(node, node.value.gen.jac)
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_match_singleton(self, node: ast.MatchSingleton) -> None:
         """Sub objects.
@@ -1368,14 +1541,44 @@ class JacFormatPass(Pass):
 
         values: list[MatchPattern],
         """
-        self.emit(node, f"[{', '.join([i.gen.jac for i in node.values])}]")
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if i.gen.jac == ",":
+                    self.emit(node, f"{i.gen.jac} ")
+                else:
+                    self.emit(node, f"{i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_match_mapping(self, node: ast.MatchMapping) -> None:
         """Sub objects.
 
         values: list[MatchKVPair | MatchStar],
         """
-        self.emit(node, f"{{{', '.join([i.gen.jac for i in node.values])}}}")
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if i.gen.jac == ",":
+                    self.emit(node, f"{i.gen.jac} ")
+                else:
+                    self.emit(node, f"{i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_match_k_v_pair(self, node: ast.MatchKVPair) -> None:
         """Sub objects.
@@ -1383,7 +1586,24 @@ class JacFormatPass(Pass):
         key: MatchPattern | NameType,
         value: MatchPattern,
         """
-        self.emit(node, f"{node.key.gen.jac}: {node.value.gen.jac}")
+        start = True
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if start:
+                    self.emit(node, f"{i.gen.jac}")
+                    start = False
+                else:
+                    self.emit(node, f" {i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_match_star(self, node: ast.MatchStar) -> None:
         """Sub objects.
@@ -1400,16 +1620,22 @@ class JacFormatPass(Pass):
         arg_patterns: Optional[SubNodeList[MatchPattern]],
         kw_patterns: Optional[SubNodeList[MatchKVPair]],
         """
-        self.emit(node, node.name.gen.jac)
-        params = "("
-        if node.arg_patterns:
-            self.comma_sep_node_list(node.arg_patterns)
-            params += node.arg_patterns.gen.jac
-        if node.kw_patterns:
-            self.comma_sep_node_list(node.kw_patterns)
-            params += node.kw_patterns.gen.jac
-        params += ")"
-        self.emit(node, params)
+        for i in node.kid:
+            if isinstance(i, ast.CommentToken):
+                if i.is_inline:
+                    self.emit(node, f" {i.gen.jac}")
+                else:
+                    self.emit_ln(node, "")
+                    self.emit_ln(node, i.gen.jac)
+            elif isinstance(i, ast.Semi):
+                self.emit(node, f"{i.gen.jac}")
+            else:
+                if i.gen.jac == ",":
+                    self.emit(node, f"{i.gen.jac} ")
+                else:
+                    self.emit(node, f"{i.gen.jac}")
+        if isinstance(node.kid[-1], (ast.Semi, ast.CommentToken)):
+            self.emit_ln(node, "")
 
     def exit_token(self, node: ast.Token) -> None:
         """Sub objects.
@@ -1517,4 +1743,5 @@ class JacFormatPass(Pass):
 
     def exit_comment_token(self, node: ast.CommentToken) -> None:
         """Sub objects."""
+        # print(node.is_inline)
         self.emit(node, f"{node.value}")