Merge pull request #52 from Chia-Network/20220803-fix-inline-at-capture-modern

20220803 fix inline at capture in modern

Author: prozacchiwawa

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "clvm_tools_rs"
-version = "0.1.22"
+version = "0.1.23"
 edition = "2018"
 authors = ["Art Yerkes <[email protected]>"]
 description = "tools for working with chialisp language; compiler, repl, python and wasm bindings"

Cargo.toml

@@ -368,8 +368,6 @@ pub fn process_macro_call(
     let args_to_macro = list_to_cons(l.clone(), &converted_args);
     build_swap_table_mut(&mut swap_table, &args_to_macro);
 
-    let arg_strs: Vec<String> = args.iter().map(|x| x.to_sexp().to_string()).collect();
-
     run(
         allocator,
         runner.clone(),

src/compiler/codegen.rs

@@ -8,6 +8,7 @@ use crate::classic::clvm::__type_compatibility__::bi_one;
 use crate::classic::clvm_tools::stages::stage_0::TRunProgram;
 
 use crate::compiler::codegen::{generate_expr_code, get_call_name, get_callable};
+use crate::compiler::compiler::is_at_capture;
 use crate::compiler::comptypes::{
     BodyForm, Callable, CompileErr, CompiledCode, CompilerOpts, InlineFunction, PrimaryCodegen,
 };
@@ -81,6 +82,13 @@ fn pick_value_from_arg_element(
 ) -> Option<Rc<BodyForm>> {
     match match_args.borrow() {
         SExp::Cons(l, a, b) => {
+            if let Some((capture, children)) = is_at_capture(a.clone(), b.clone()) {
+                if capture == name {
+                    return Some(apply(provided));
+                }
+
+                return pick_value_from_arg_element(children, provided.clone(), apply, name);
+            }
             let matched_a = pick_value_from_arg_element(
                 a.clone(),
                 provided.clone(),
@@ -161,8 +169,6 @@ fn replace_inline_body(
     args: &Vec<Rc<BodyForm>>,
     expr: Rc<BodyForm>,
 ) -> Result<Rc<BodyForm>, CompileErr> {
-    let arg_str_vec: Vec<String> = args.iter().map(|x| x.to_sexp().to_string()).collect();
-
     match expr.borrow() {
         BodyForm::Let(_l, _, _, _) => Err(CompileErr(
             loc.clone(),
@@ -215,9 +221,12 @@ fn replace_inline_body(
                 }
             }
         }
-        BodyForm::Value(SExp::Atom(_, a)) => arg_lookup(inline.args.clone(), 0, args, a.clone())
-            .map(|x| Ok(x.clone()))
-            .unwrap_or_else(|| Ok(expr.clone())),
+        BodyForm::Value(SExp::Atom(_, a)) => {
+            let alookup = arg_lookup(inline.args.clone(), 0, args, a.clone())
+                .map(|x| Ok(x.clone()))
+                .unwrap_or_else(|| Ok(expr.clone()))?;
+            Ok(alookup)
+        }
         _ => Ok(expr.clone()),
     }
 }
@@ -231,7 +240,6 @@ pub fn replace_in_inline(
     inline: &InlineFunction,
     args: &Vec<Rc<BodyForm>>,
 ) -> Result<CompiledCode, CompileErr> {
-    let arg_str_vec: Vec<String> = args.iter().map(|x| x.to_sexp().to_string()).collect();
     replace_inline_body(
         allocator,
         runner.clone(),

src/compiler/inline.rs

@@ -1026,3 +1026,32 @@ fn sebastian_hash_test_2() {
 
     assert_eq!(result.to_string(), "((0xf22ada22a0ed015000ea157013ee62dc6ce337a649ec01054fc62ed6caac7eaf 36364122602940516403027890844760998025315693007634105146514094828976803085567) (51 -54330418644829767769717664495663952010367061369724157609947295940464695774007 1))");
 }
+
+#[test]
+fn test_modern_inline_at_capture() {
+    let result = run_string(
+        &indoc! {"
+(mod (Z)
+  (include *standard-cl-21*)
+  (defun-inline check_lineage_proof
+    (
+      THIS_MOD_HASH
+      TYPES
+      (@ lineage_proof (foo bar))
+      conditions
+    )
+    (if TYPES
+        (x lineage_proof)
+        conditions
+    )
+  )
+
+  (check_lineage_proof 1 2 Z 4)
+  )"}
+        .to_string(),
+        &"(99)".to_string(),
+    )
+    .unwrap_err();
+
+    assert_eq!(result.1, "clvm raise in (8 5) (() 99)");
+}