recursively process generic args

redbadger · Oct 28, 2024 · 4f104e2 · 4f104e2
1 parent b4aff89
commit 4f104e2
Showing 1 changed file with 27 additions and 17 deletions.
diff --git a/crux_cli/src/codegen/parser.rs b/crux_cli/src/codegen/parser.rs
@@ -128,24 +128,8 @@ pub fn parse(crate_: &Crate) -> Result<String> {
                     prog.edge
                         .push((source.clone(), dest.clone(), Edge::ForType));
 
-                    // TODO: make recursive
                     if let Some(args) = &path.args {
-                        if let GenericArgs::AngleBracketed { args, .. } = args.as_ref() {
-                            for arg in args {
-                                if let GenericArg::Type(t) = arg {
-                                    if let Type::ResolvedPath(path) = t {
-                                        let Some(dest) = node_by_id(&path.id) else {
-                                            continue;
-                                        };
-                                        prog.edge.push((
-                                            source.clone(),
-                                            dest.clone(),
-                                            Edge::ForType,
-                                        ));
-                                    };
-                                }
-                            }
-                        }
+                        process_args(source, args.as_ref(), &node_by_id, &mut prog);
                     }
                 }
                 _ => (),
@@ -282,6 +266,32 @@ pub fn parse(crate_: &Crate) -> Result<String> {
     Ok(format!(""))
 }
 
+fn process_args<'a>(
+    source: &Node,
+    args: &GenericArgs,
+    node_by_id: &impl Fn(&Id) -> Option<&'a Node>,
+    prog: &mut AscentProgram,
+) {
+    if let GenericArgs::AngleBracketed { args, .. } = args {
+        for arg in args {
+            if let GenericArg::Type(t) = arg {
+                if let Type::ResolvedPath(path) = t {
+                    let Some(dest) = node_by_id(&path.id) else {
+                        continue;
+                    };
+                    prog.edge
+                        .push((source.clone(), dest.clone(), Edge::ForType));
+
+                    if let Some(args) = &path.args {
+                        let generic_args = args.as_ref();
+                        process_args(source, generic_args, node_by_id, prog);
+                    }
+                };
+            }
+        }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 struct Node {
     id: Id,