diff -r b49723351533 -r a37a3ab989f4 src/Tools/isac/Interpret/calchead.sml --- a/src/Tools/isac/Interpret/calchead.sml Tue Sep 14 12:12:42 2010 +0200 +++ b/src/Tools/isac/Interpret/calchead.sml Tue Sep 14 15:46:56 2010 +0200 @@ -931,37 +931,23 @@ of a SubProblem ? see ME/ptyps.sml 'type met '.*) fun is_copy_named_idstr str = case (rev o explode) str of - (*"_"::_ ::"_"::_ => true*) - "'"::"'"::"'"::_ => true - | _ => false; -(*> is_copy_named_idstr "v_i'''"; -val it = true : bool - > is_copy_named_idstr "e_"; -val it = false : bool - > is_copy_named_idstr "L___"; -val it = true : bool -*) + (*"_":: _ ::"_"::_ => true*) + "'":: _ ::"'"::_ => (tracing ((strs2str o (rev o explode)) str ^ " T"); + true) + | _ => (tracing ((strs2str o (rev o explode)) str ^ " F"); false); +fun is_copy_named (_, (_, t)) = (is_copy_named_idstr o free2str) t; + (*.should this formal argument (of a model-pattern) create a new identifier?.*) fun is_copy_named_generating_idstr str = if is_copy_named_idstr str then case (rev o explode) str of - "_"::"_"::"_"::_ => false + (*"_"::"_"::"_"::_ => false*) + "'"::"'"::"'"::_ => false | _ => true else false; -(*> is_copy_named_generating_idstr "v_i'''"; -val it = true : bool - > is_copy_named_generating_idstr "L___"; -val it = false : bool -*) - -(*.can this formal argument (of a model-pattern) be omitted in the arg-list - of a SubProblem ? see ME/ptyps.sml 'type met '.*) -fun is_copy_named (_,(_,t)) = (is_copy_named_idstr o free2str) t; -(*.should this formal argument (of a model-pattern) create a new identifier?.*) -fun is_copy_named_generating (_,(_,t)) = +fun is_copy_named_generating (_, (_, t)) = (is_copy_named_generating_idstr o free2str) t; - (*.split type-wrapper from scr-arg and build part of an ori; an type-error is reported immediately, raises an exn, subsequent handling of exn provides 2nd part of error message.*)