feat: rust enum variants including decorators

Author: bionicles

.github/workflows/unix.yml

@@ -86,7 +86,7 @@ jobs:
           git commit -m "cd: increment version.py; update readme [skip ci]"
           git push https://github.com/bionicles/tree_plus.git
       - name: Publish to PyPI
-        uses: pypa/[email protected].2
+        uses: pypa/[email protected].4
         # with:
         #   user: __token__
         #   password: ${{ secrets.PYPI_API_TOKEN }}

Makefile

@@ -32,7 +32,7 @@ absurdly-huge-jsonl:
 	python tests/build_absurdly_huge_jsonl.py
 
 # TESTS
-test: test-sequential test-tp-dotdot test-e2e test-cli test-programs test-deploy
+test: test-more-languages test-sequential test-tp-dotdot test-e2e test-cli test-programs test-deploy
 
 N_WORKERS=12
 # parallel unit tests (for dev rig)

tests/more_languages/group4/rust_test.rs

@@ -3,14 +3,20 @@ fn at_beginning<'a>(&'a str) {
 }
 
 // rust_test.rs
-enum Days {
+#[derive(Default)]
+pub enum Days<E: EdgeCase> {
+    #[default]
     Sun,
     Mon,
+    #[error("edge case {idx}, expected at least {} and at most {}", .limits.lo, .limits.hi)]
     Tue,
     Wed,
-    Thu,
-    Fri,
-    Sat,
+    Thu(i16, bool),
+    Fri { day: u8 },
+    Sat {
+        urday: String,
+        edge_case: E,
+    },
 }
 
 struct Point {

tests/test_more_language_units.py

@@ -1222,7 +1222,20 @@ def test_more_languages_group3(file: str, expected: List[str]):
             "tests/more_languages/group4/rust_test.rs",
             [
                 "fn at_beginning<'a>(&'a str)",
-                "enum Days",
+                """pub enum Days<E: EdgeCase> {
+    #[default]
+    Sun,
+    Mon,
+    #[error("edge case {idx}, expected at least {} and at most {}", .limits.lo, .limits.hi)]
+    Tue,
+    Wed,
+    Thu(i16, bool),
+    Fri { day: u8 },
+    Sat {
+        urday: String,
+        edge_case: E,
+    },
+}""",
                 "struct Point",
                 "impl Point",
                 "    fn get_origin() -> Point",

tree_plus_src/parse_file.py

@@ -1047,8 +1047,10 @@ def parse_rs(content: str, *, timeout: float = DEFAULT_REGEX_TIMEOUT) -> List[st
         r"^(?P<function>\s*(?P<maybe_pub>pub\s+?)?(?P<maybe_async_or_const>(?:async|const)\s+)?(?P<fn>fn)\s+(?P<fn_name>\w+)(?P<generics><[^>]*?>)?(?P<argument_start>\()(?P<arguments>[&\w,':()<>${}\/\s]+?)?(?P<argument_end>\))[\s\S]*?)(?P<end>(?:;\s)|(?:{))|"
         # structs and impls with generics
         r"\n(?P<struct_impl>(?: *((?:pub\s+)?struct)|impl)[^{;]*?) ?[{;]|"
-        # trait, enum, or mod
-        r"\n(?P<trait_enum_mod> *(?:pub\s+)?(trait|enum|mod)\s+\w*(<[^{]*>)?)|"
+        # enum with variants
+        r"^\s*(?P<enum>(?P<visibility>pub\s+?)?enum (?P<enum_name>\w+)(?P<maybe_generics><[^>]*?>)? {(?P<variant>(?P<maybe_decorator>\s+#\[.*\]+?)?\s+(?P<variant_name>\w+)(?P<maybe_data>(?P<tuple_variant>\([\s\S]+?\))|(?P<struct_variant> \{[^}]+\}))?,)*\s\})\s|"
+        # trait, or mod
+        r"\n(?P<trait_mod> *(?:pub\s+)?(trait|mod)\s+\w*(<[^{]*>)?)|"
         # macro
         r"\n(?P<macro>((#\[macro_export\]\n)?macro_rules!\s+[a-z_][a-z_0-9]*))",
         regex.MULTILINE,
@@ -1066,8 +1068,10 @@ def parse_rs(content: str, *, timeout: float = DEFAULT_REGEX_TIMEOUT) -> List[st
         elif groups.get("struct_impl"):
             component = groups["struct_impl"].rstrip()
         # trait, enum, mod
-        elif groups.get("trait_enum_mod"):
-            component = groups["trait_enum_mod"]
+        elif groups.get("enum"):
+            component = groups["enum"]
+        elif groups.get("trait_mod"):
+            component = groups["trait_mod"]
         # macro
         elif groups.get("macro"):
             component = groups["macro"]