stabilize 'gd2py' and 'gdradon'

Author: Scony

gdtoolkit/gd2py/__init__.py

@@ -34,44 +34,44 @@ def _convert_block(statements: List[Tree], context: Context) -> List[str]:
 def _convert_statement(statement: Tree, context: Context) -> List[str]:
     handlers = {
         # class statements:
-        "tool_stmt": _ignore,
+        "annotation": _ignore,
         "pass_stmt": lambda s, c: [f"{c.indent_string}pass"],
         "class_var_stmt": _convert_first_child_as_statement,
-        "var_empty": lambda s, c: [f"{c.indent_string}{s.children[0].value} = None"],
-        "var_assigned": _convert_var_statement_with_expression,
-        "var_typed": lambda s, c: [f"{c.indent_string}{s.children[0].value} = None"],
-        "var_typed_assgnd": _convert_var_statement_with_expression,
-        "var_inf": _convert_var_statement_with_expression,
-        "extends_stmt": _ignore,
+        "class_var_empty": lambda s, c: [
+            f"{c.indent_string}{s.children[0].value} = None"
+        ],
+        "class_var_assigned": _convert_var_statement_with_expression,
+        "class_var_typed": lambda s, c: [
+            f"{c.indent_string}{s.children[0].value} = None"
+        ],
+        "class_var_typed_assgnd": _convert_var_statement_with_expression,
+        "class_var_inf": _convert_var_statement_with_expression,
+        "extends_stmt": _pass,
         "class_def": _convert_class_def,
         "func_def": _convert_func_def,
-        "enum_def": _ignore,  # TODO: implement
-        "classname_stmt": _ignore,
-        "classname_extends_stmt": _ignore,
-        "signal_stmt": _ignore,
-        "docstr_stmt": lambda s, c: [
-            f"{c.indent_string}{s.children[0].children[0].value}"
-        ],
+        "enum_stmt": _pass,  # TODO: implement
+        "classname_stmt": _pass,
+        "classname_extends_stmt": _pass,
+        "signal_stmt": _pass,
         "const_stmt": lambda s, c: [
             "{}{} = {}".format(
                 c.indent_string,
                 s.children[1].value,
                 _convert_expression_to_str(s.children[-1]),
             )
         ],
-        "export_stmt": _convert_export_statement,
-        "onready_stmt": lambda s, c: _convert_statement(s.children[-1], c),
-        "puppet_var_stmt": _convert_first_child_as_statement,
         "static_func_def": _convert_first_child_as_statement,
-        "remote_func_def": _convert_first_child_as_statement,
-        "remotesync_func_def": _convert_first_child_as_statement,
-        "master_func_def": _convert_first_child_as_statement,
-        "mastersync_func_def": _convert_first_child_as_statement,
-        "puppet_func_def": _convert_first_child_as_statement,
-        "puppetsync_func_def": _convert_first_child_as_statement,
-        "sync_func_def": _convert_first_child_as_statement,
         # func statements:
         "func_var_stmt": _convert_first_child_as_statement,
+        "func_var_empty": lambda s, c: [
+            f"{c.indent_string}{s.children[0].value} = None"
+        ],
+        "func_var_assigned": _convert_var_statement_with_expression,
+        "func_var_typed": lambda s, c: [
+            f"{c.indent_string}{s.children[0].value} = None"
+        ],
+        "func_var_typed_assgnd": _convert_var_statement_with_expression,
+        "func_var_inf": _convert_var_statement_with_expression,
         "expr_stmt": _convert_first_child_as_statement,
         "expr": lambda s, c: [
             f"{c.indent_string}{_convert_expression_to_str(s.children[0])}"
@@ -106,7 +106,11 @@ def _convert_statement(statement: Tree, context: Context) -> List[str]:
     return handlers[statement.data](statement, context)
 
 
-def _ignore(_statement: Node, context: Context) -> List[str]:
+def _ignore(_statement: Node, _context: Context) -> List[str]:
+    return []
+
+
+def _pass(_statement: Node, context: Context) -> List[str]:
     return [f"{context.indent_string}pass"]
 
 

tests/gd2py/input-output-pairs/class-level-statements.in.gd

@@ -1,5 +1,5 @@
 # misc
-tool
+@tool
 extends Node
 class_name ClassName
 signal signal_name
@@ -11,19 +11,15 @@ var b = 1
 var c: int
 var d: int = 1
 var e := 1
-puppet var f = 1
-export(float) var aa
-onready var aaa
+var f = 1						# TODO: puppet
+@export(float) var aa
+@onready var aaa
 
 # constants
 const A = 1
 const B: int = 1
 const C := 1
 
-# docstrings
-"""asd"""
-
-
 # compounds
 class D:
 	pass

tests/gd2py/input-output-pairs/class-level-statements.out.py

@@ -2,7 +2,6 @@
 pass
 pass
 pass
-pass
 a = None
 b = 1
 c = None
@@ -14,7 +13,6 @@
 A = 1
 B = 1
 C = 1
-"""asd"""
 class D:
 	pass
 pass

tests/gd2py/test_input_output_pairs.py

@@ -1,7 +1,6 @@
 import os
 
 import difflib
-import pytest
 
 from gdtoolkit.gd2py import convert_code
 
@@ -18,7 +17,6 @@ def pytest_generate_tests(metafunc):
         )
 
 
-@pytest.mark.skip(reason="not supported yet")
 def test_input_output_pair(test_name):
     this_dir = os.path.dirname(os.path.abspath(__file__))
     input_file_path = os.path.join(this_dir, DATA_DIR, "{}.in.gd".format(test_name))

tests/gdradon/test_executable.py

@@ -1,7 +1,5 @@
 import subprocess
 
-import pytest
-
 from ..common import write_file
 
 
@@ -15,9 +13,8 @@ def test_cc_on_empty_file_succeeds(tmp_path):
     assert len(outcome.stderr.decode().splitlines()) == 0
 
 
-@pytest.mark.skip(reason="not supported yet")
 def test_cc_on_file_with_single_function_succeeds(tmp_path):
-    dummy_file = write_file(tmp_path, "script.gd", "func foo(): pass")
+    dummy_file = write_file(tmp_path, "script.gd", "func foo(): pass\n")
     outcome = subprocess.run(
         ["gdradon", "cc", dummy_file], check=False, capture_output=True
     )