Not worse

Author: TeamSPoon

prolog/metta_lang/metta_compiler.pl

@@ -74,8 +74,12 @@
 :- ensure_loaded(metta_space).
 :- ensure_loaded(metta_compiler_print).
 :- dynamic(transpiler_clause_store/9).
+:- multifile(transpiler_predicate_store/7).
 :- dynamic(transpiler_predicate_store/7).
+:- dynamic(transpiler_predicate_nary_store/9).
+:- discontiguous transpiler_predicate_nary_store/9.
 :- discontiguous(compile_flow_control/8).
+:- multifile(compile_flow_control/8).
 :- ensure_loaded(metta_compiler_lib).
 :- ensure_loaded(metta_compiler_lib_stdlib).
 

prolog/metta_lang/metta_eval.pl

@@ -556,7 +556,7 @@
   maplist(as_prolog_x(Depth,Self), [Sym|Args] , [ASym|Adjusted]),
   eval_20(Eq,RetType,Depth,Self, [ASym|Adjusted], Y),sanity_check_eval(eval_20_not_atom,Y).
 
-eval_20(_Eq,_RetType,Depth,_Self,X,YO):- Depth<0,bt,trace,!,X=YO.
+eval_20(_Eq,_RetType,Depth,_Self,X,YO):- overflow_depth(Depth),bt,trace,!,X=YO.
 eval_20(Eq,RetType,_Dpth,_Slf,Name,Y):-
     atom(Name), !,
       (Name=='NotReducible'->throw(metta_NotReducible);

prolog/metta_lang/metta_printer.pl

@@ -1857,14 +1857,20 @@
 last_item([Item],Item).
 
 write_start(Type):- current_printer_override(P1),call(P1,'$write_start'(Type)),!.
-write_start(Char):- atom_length(Char, 1),write(Char),!.
-write_start(Type):- compound_type_s_m_e(Type,L,_,_),write(L),!.
+write_start(Char):- is_str_char(Char),write_ch(Char),!.
+write_start(Type):- compound_type_s_m_e(Type,L,_,_),write_ch(L),!.
 write_middle(Type):- current_printer_override(P1),call(P1,'$write_middle'(Type)),!.
-write_middle(Char):- atom_length(Char, 1),write(Char),!.
-write_middle(Type):- compound_type_s_m_e(Type,_,M,_),write(M),!.
+write_middle(Char):- is_str_char(Char),write_ch(Char),!.
+write_middle(Type):- compound_type_s_m_e(Type,_,M,_), write_ch(M),!.
 write_end(Type):- current_printer_override(P1),call(P1,'$write_end'(Type)),!.
-write_end(Char):- atom_length(Char, 1),write(Char),!.
-write_end(Type):- compound_type_s_m_e(Type,_,_,R),write(R),!.
+write_end(Char):- is_str_char(Char),write_ch(Char),!.
+write_end(Type):- compound_type_s_m_e(Type,_,_,R),write_ch(R),!.
+
+is_str_char( L ):- compound(L),arg(1,L,C),!,is_str_char(C).
+is_str_char(Char):- atomic(Char), atom_length(Char, 1),!.
+
+write_ch(L):- compound(L),arg(1,L,C),!,write_ch(C).
+write_ch(L):- assertion(L\==cmpd),write(L).
 
 print_compound_type(Indent, Type, [H|T] ):-
     last_item([H|T],Last),
@@ -1880,7 +1886,7 @@
 
 
 compound_type_s_m_e(list,'(','.',')').
-compound_type_s_m_e(cmpd,S,E,M):- prolog_term_start(S),compound_type_s_m_e(ocmpd,S,E,M),!.
+compound_type_s_m_e(cmpd,S,E,M):- !, prolog_term_start(S),compound_type_s_m_e(ocmpd,S,E,M),!.
 compound_type_s_m_e(ocmpd,'#(','.',')').
 compound_type_s_m_e(ocmpd,'[','|',']').
 compound_type_s_m_e(ocmpd,'{','|','}').
@@ -1895,12 +1901,12 @@
 
 % Print the rest of the elements in the list, ensuring spacing
 print_rest_elements(_,T, _) :- T==[], !.
-print_rest_elements(M, T, Indent) :- \+ is_lcons(T), !, write(' '), write(M), write(' '), print_sexpr(T, Indent).
-print_rest_elements(M, [H|T], Indent) :-
+print_rest_elements(Type, T, Indent) :- \+ is_lcons(T), !, write(' '), write_middle(Type), write(' '), print_sexpr(T, Indent).
+print_rest_elements(Type, [H|T], Indent) :-
     write(' '),  % Space before each element after the first
     print_sexpr(H, Indent),
     (is_lcons(H) -> NextIndent is Indent + 0 ; NextIndent is Indent + 0),
-    print_rest_elements(M, T, NextIndent).
+    print_rest_elements(Type, T, NextIndent).
 
 % Helper predicate to print indentation spaces