need for fish_riddle

Author: TeamSPoon

prolog/metta_lang/metta_compiler.pl

@@ -947,7 +947,14 @@
 
 % If Convert is a number or an atom, it is considered as already converted.
 f2p(_HeadIs, _LazyVars, Convert, Convert, x(noeval,eager,[]), Convert, [], []) :-
-    once(number(Convert); atom(Convert);atomic(Convert);self_eval(Convert); data_term(Convert)),!.  % Check if Convert is a number or an atom
+    once(number(Convert); atom(Convert);atomic(Convert)),!.  % Check if Convert is a number or an atom
+
+f2p(_HeadIs, _LazyVars, Convert, Convert, x(noeval,eager,[]), Convert, [], []) :- fail,
+    once(self_eval(Convert)),!.
+
+f2p(_HeadIs, _LazyVars, Convert, Convert, x(noeval,eager,[]), Convert, [], []) :- fail,
+    once(data_term(Convert)),!.
+
 
 f2p(_HeadIs, _LazyVars, AsIsNoConvert, AsIsNoConvert, x(doeval,eager,[]), AsIsNoConvert, [], []) :-
      as_is_data_term(AsIsNoConvert),!. % Check if Convert is kept AsIs

prolog/metta_lang/metta_compiler_lib.pl

@@ -836,7 +836,7 @@
 %metta_body_macro_pass(bu,[eval,Next], Next).
 
 % metta_body_macro_pass(td,[eval,Eval], Eval).
-%metta_body_macro_pass(td1,['capture',Eval], Eval).
+metta_body_macro_pass(td1,['capture',Eval], Eval).
 
 metta_body_macro_pass(td2,['unique',Eval],
    ['let',Var,['call-fn!','no_repeats_var'],