Align parsing of constants to variables, closes #197

Author: Scony

gdtoolkit/formatter/const_statement.py

@@ -7,15 +7,42 @@
 
 
 def format_const_statement(statement: Tree, context: Context) -> Outcome:
-    if len(statement.children) == 4:
-        prefix = f"const {statement.children[1].value} = "
-    elif len(statement.children) == 5:
-        prefix = f"const {statement.children[1].value} := "
-    elif len(statement.children) == 6:
-        prefix = (
-            f"const {statement.children[1].value}: {statement.children[3].value} = "
-        )
+    concrete_const_stmt = statement.children[0]
+    handlers = {
+        "const_assigned": _format_const_assigned_statement,
+        "const_typed_assigned": _format_const_typed_assigned_statement,
+        "const_inf": _format_const_inferred_statement,
+    }
+    return handlers[concrete_const_stmt.data](concrete_const_stmt, context)
+
+
+def _format_const_assigned_statement(statement: Tree, context: Context) -> Outcome:
+    expression_context = ExpressionContext(
+        f"const {statement.children[0].value} = ",
+        get_line(statement),
+        "",
+        get_end_line(statement),
+    )
+    return format_expression(statement.children[-1], expression_context, context)
+
+
+def _format_const_typed_assigned_statement(
+    statement: Tree, context: Context
+) -> Outcome:
+    expression_context = ExpressionContext(
+        f"const {statement.children[0].value}: {statement.children[1].value} = ",
+        get_line(statement),
+        "",
+        get_end_line(statement),
+    )
+    return format_expression(statement.children[-1], expression_context, context)
+
+
+def _format_const_inferred_statement(statement: Tree, context: Context) -> Outcome:
     expression_context = ExpressionContext(
-        prefix, get_line(statement), "", get_end_line(statement)
+        f"const {statement.children[0].value} := ",
+        get_line(statement),
+        "",
+        get_end_line(statement),
     )
     return format_expression(statement.children[-1], expression_context, context)

gdtoolkit/gd2py/__init__.py

@@ -56,7 +56,7 @@ def _convert_statement(statement: Tree, context: Context) -> List[str]:
         "const_stmt": lambda s, c: [
             "{}{} = {}".format(
                 c.indent_string,
-                s.children[1].value,
+                s.children[0].children[0].value,
                 _convert_expression_to_str(s.children[-1]),
             )
         ],

gdtoolkit/parser/gdscript.lark

@@ -47,7 +47,12 @@ class_var_typed_assgnd: _var_typed "=" expr [inline_property_body]
 class_var_inf: "var" NAME ":" "=" expr [inline_property_body]
 inline_property_body: ":" [property_delegate_set ["," property_delegate_get]]
                     | ":" [property_delegate_get ["," property_delegate_set]]
-!const_stmt: "const" NAME [":" [TYPE_HINT]] "=" expr
+const_stmt: const_assigned
+          | const_typed_assigned
+          | const_inf
+const_assigned: "const" NAME "=" expr
+const_typed_assigned: "const" NAME ":" TYPE_HINT "=" expr
+const_inf: "const" NAME ":" "=" expr
 docstr_stmt: string
 
 class_def: "class" NAME [extends_stmt] ":" (_class_body | _class_stmt)