|
3852 | 3852 | is_plain_list0(L):- \+ is_list(L),!,fail. |
3853 | 3853 | is_plain_list0([]):- !. |
3854 | 3854 | is_plain_list0([QUOTE,_]):- QUOTE=='quote',!. |
| 3855 | +is_plain_list0([Colon,_,_]):- Colon==':',!. |
3855 | 3856 | is_plain_list0([R|L]):- is_plain_obj(R),!,maplist(is_value_obj,L). |
3856 | 3857 |
|
3857 | 3858 | is_value_obj(L):- notrace(quietly(is_value_obj0(L))). |
|
3950 | 3951 | add_types_into(OpN,Nth,Var, List, MightF, Args), |
3951 | 3952 | ignore(maybe_cond(OpN,Nth,[MightF|Args])), |
3952 | 3953 | append(CodeL,[Call],LLL), |
3953 | | - (((is_list(VarL),VarL=[V],var(V))) -> (VarP=V,Var=VarP) ; VarP=..['S'|VarL]), |
3954 | | - Call = ( =(VarP,Var) ), |
| 3954 | + (((is_list(VarL),VarL=[V],var(V))) -> (VarP=V,Var=VarP,Call=true) ; (VarP=VarL,Call='S'(VarP,Var))), |
| 3955 | + |
3955 | 3956 | if_t(has_returnType(MightF),add_type_to(Var,arg(MightF,0))), |
3956 | 3957 | list_to_conjuncts(LLL,Code))). |
3957 | 3958 | into_equality(OpN,Nth,_Var,Comp, Code):- compound_name_arguments(Comp,F,Args),maplist_nth(arg_equality([F,arg(Nth)|OpN]),1,Args,DFArgs),compound_name_arguments(Code,F,DFArgs). |
|
3962 | 3963 | walk_src_for_constraints(_,_,Out):- ground(Out),!. |
3963 | 3964 | walk_src_for_constraints(_,_,assign_now(BodyVar,Var)):- !, add_type_to(Var,val(BodyVar)). |
3964 | 3965 |
|
3965 | | -walk_src_for_constraints(_,_,Comp=Var):- var(Var),compound(Comp),compound_name_arguments(Comp,'S',[MightF|Args]),!, |
| 3966 | +walk_src_for_constraints(_,_,'S'(),Comp=Var):- var(Var),compound(Comp),compound_name_arguments(Comp,'S',[MightF|Args]),!, |
3966 | 3967 | if_t(callable(MightF),maplist_nth(walk_src_for_constraints(MightF),1,Args)). |
3967 | 3968 |
|
3968 | 3969 |
|
|
0 commit comments