Fix bad indentation and additional breaks in multiline matrices (#13)

grammar/Modelica.g4

@@ -287,16 +287,15 @@ equation
         | for_equation
         | connect_equation
         | when_equation
-        | function_call
+        | component_reference function_call_args
     )
     description
     ;
 
 statement
     : (
-        component_reference ASSIGN expression
-        | function_call
-        | LPAREN output_expression_list RPAREN ASSIGN function_call
+        component_reference (ASSIGN expression | function_call_args)
+        | LPAREN output_expression_list RPAREN ASSIGN component_reference function_call_args
         | BREAK
         | RETURN
         | if_statement
@@ -361,13 +360,13 @@ conditional_statements
     ;
 
 for_equation
-    : for_initializer LOOP
+    : FOR for_indices LOOP
       conditional_equations
       END FOR
     ;
 
 for_statement
-    : for_initializer LOOP
+    : FOR for_indices LOOP
       conditional_statements
       END FOR
     ;
@@ -535,11 +534,11 @@ primary
     | STRING
     | BOOL
     | unary_expression
-    | function_call
+    | (component_reference | DER | INITIAL | PURE) function_call_args
     | component_reference
     | LPAREN output_expression_list RPAREN
-    | matrix
-    | array
+    | LBRACK expression_list (SEMICOLON expression_list)* RBRACK
+    | LCURLY array_arguments RCURLY
     | END
     ;
 
@@ -550,37 +549,6 @@ name
     : IDENT (DOT IDENT)*
     ;
 
-// not present in spec
-matrix
-    : LBRACK matrix_arguments RBRACK
-    ;
-
-// not present in spec
-matrix_arguments
-    : matrix_row (SEMICOLON matrix_row)*
-    ;
-
-// not present in spec
-matrix_row
-    : expression_list
-    ;
-
-// not present in spec
-array
-    : LCURLY array_arguments RCURLY
-    ;
-
-// not present in spec
-function_call
-    : (
-        component_reference
-        | DER
-        | INITIAL
-        | PURE
-    )
-    function_call_args
-    ;
-
 component_reference
     : DOT? IDENT array_subscripts? (DOT IDENT array_subscripts?)*
     ;
@@ -590,8 +558,17 @@ function_call_args
     ;
 
 function_arguments
-    : (function_argument | named_argument)
-      ((COMMA (function_argument | named_argument))* | for_initializer)
+    : expression FOR for_indices
+    | function_argument (COMMA function_argument)* named_arguments?
+    | named_arguments
+    ;
+
+named_arguments
+    : named_argument (COMMA named_argument)*
+    ;
+
+named_argument
+    : IDENT EQUAL function_argument
     ;
 
 function_argument
@@ -603,48 +580,20 @@ function_partial_application
     : FUNCTION type_specifier LPAREN named_arguments? RPAREN
     ;
 
-named_arguments
-    : named_argument (COMMA named_argument)*
-    ;
-
-named_argument
-    : IDENT EQUAL (function_partial_application | expression)
-    ;
-
 output_expression_list
     : expression? (COMMA expression?)*
     ;
 
 expression_list
-    : expression_list_member (COMMA expression_list_member)*
-    ;
-
-// not present in spec
-expression_list_member
-    : expression
+    : expression (COMMA expression)*
     ;
 
 array_arguments
-    : array_argument ((COMMA array_argument)* | for_initializer)
-    ;
-
-// not present in spec
-for_initializer
-    : FOR for_indices
-    ;
-
-// not present in spec
-array_argument
-    : expression
+    : expression ((COMMA expression)* | FOR for_indices)
     ;
 
 array_subscripts
-    : LBRACK subscript_list RBRACK
-    ;
-
-// not present in spec
-subscript_list
-    : subscript (COMMA subscript)*
+    : LBRACK subscript (COMMA subscript)* RBRACK
     ;
 
 subscript

mofmt/collecting/collector.py

@@ -25,9 +25,8 @@ class Marker:
     DEDENT = 4
     IGNORE = 5
     BLANK = 6
-    HARDBREAK = 7
-    SOFTBREAK = 8
-    WRAPPOINT = 9
+    BREAK = 7
+    WRAPPOINT = 8
 
     __slots__ = ("typ", "val", "rep")
 
@@ -50,7 +49,6 @@ class Collector:
 
     def __init__(self) -> None:
         self.markers: list[Marker] = []
-        self.wrapped: bool = False
 
     def add_marker(self, marker: Marker) -> None:
         """Add marker"""
@@ -86,6 +84,8 @@ def add_space(self) -> None:
             return
         if self.markers[-1].typ >= Marker.IGNORE:
             return
+        if self.markers[-1].typ == Marker.SPACE:
+            return
         if (
             self.markers[-1].typ in {Marker.INDENT, Marker.DEDENT}
             and self.markers[-2].typ >= Marker.BLANK
@@ -101,31 +101,16 @@ def add_blank(self) -> None:
         """Add a blank marker"""
         if self.markers[-1].typ >= Marker.BLANK:
             self.markers.pop()
-        if self.wrapped:
-            self.add_dedent()
-            self.wrapped = False
         self.add_marker(Marker(Marker.BLANK, "\n\n", "BLANK"))
 
-    def add_softbreak(self) -> None:
-        """Add a soft break marker"""
-        if self.markers[-1].typ >= Marker.BLANK:
-            return
-        self.add_marker(Marker(Marker.SOFTBREAK, "\n", "SBREAK"))
-
-    def add_hardbreak(self) -> None:
+    def add_break(self) -> None:
         """Add a hard break marker"""
         if self.markers[-1].typ >= Marker.BLANK:
             return
-        if self.wrapped:
-            self.add_dedent()
-            self.wrapped = False
-        self.add_marker(Marker(Marker.HARDBREAK, "\n", "HBREAK"))
+        self.add_marker(Marker(Marker.BREAK, "\n", "BREAK"))
 
     def add_wrappoint(self) -> None:
         """Add a soft break marker"""
-        if not self.wrapped:
-            self.add_indent()
-            self.wrapped = True
         self.add_marker(Marker(Marker.WRAPPOINT, "\n", "WRAP"))
 
     def add_indent(self) -> None: