diff -r 95d956108461 -r 460c24a6a6ba src/Tools/isac/xmlsrc/datatypes.sml
--- a/src/Tools/isac/xmlsrc/datatypes.sml Tue Sep 28 08:58:06 2010 +0200
+++ b/src/Tools/isac/xmlsrc/datatypes.sml Tue Sep 28 09:06:56 2010 +0200
@@ -80,8 +80,8 @@
autx (j + i) auts ^
indt j ^ ""^str^">\n" : xml
end;
-(* tracing(authors2xml 2 "MATHAUTHORS" []);
- tracing(authors2xml 2 "MATHAUTHORS"
+(* writeln(authors2xml 2 "MATHAUTHORS" []);
+ writeln(authors2xml 2 "MATHAUTHORS"
["isac-team 2001", "Richard Lang 2003"]);
*)
@@ -92,7 +92,7 @@
in (indt j) ^ "\n" ^
(id2x (j + indentation) ids) ^
(indt j) ^ "\n" end;
-(* tracing(id2xml 8 ["linear","univariate","equation"]);
+(* writeln(id2xml 8 ["linear","univariate","equation"]);
linear
univariate
@@ -106,7 +106,7 @@
in (indt j) ^ "\n" ^
(int2x (j + i) ids) ^
(indt j) ^ "\n" end;
-(* tracing(ints2xml 3 [1,2,3]);
+(* writeln(ints2xml 3 [1,2,3]);
*)
@@ -122,18 +122,18 @@
ints2xml (j+i) pos ^
pos_2xml (j+i) pos_ ^
indt (j) ^ "" ^ tag ^ ">\n";
-(* tracing(pos'2xml 3 ("POSITION", ([1,2,3], Pbl)));
+(* writeln(pos'2xml 3 ("POSITION", ([1,2,3], Pbl)));
*)
fun formula2xml j term = (*TODO.WN050211: use for _all_ *)
indt j ^ "\n"^
term2xml j term ^"\n"^
indt j ^ "\n" : xml;
-(* tracing(formula2xml 6 (str2term "1+1=2"));
+(* writeln(formula2xml 6 (str2term "1+1=2"));
*)
fun formulae2xml j [] = ("":xml)
| formulae2xml j (r::rs) = formula2xml j r ^ formulae2xml j rs;
-(* tracing(formulae2xml 6 [str2term "1+1=2", str2term "1+1+1=3"]);
+(* writeln(formulae2xml 6 [str2term "1+1=2", str2term "1+1+1=3"]);
*)
(*WN0502 @see ME/ctree: type asms: illdesigned, thus not used*)
@@ -144,11 +144,11 @@
term2xml (j+i) term ^"\n"^
indt (j+i) ^ "\n"^
indt j ^ "\n" : xml;
-(* tracing(posform2xml 6 (([1,2],Frm), str2term "1+1=2"));
+(* writeln(posform2xml 6 (([1,2],Frm), str2term "1+1=2"));
*)
fun posforms2xml j [] = ("":xml)
| posforms2xml j (r::rs) = posform2xml j r ^ posforms2xml j rs;
-(* tracing(posforms2xml 6 [(([1],Res), str2term "1+1=2"),(([2],Res), str2term "1+1+1=3")]);
+(* writeln(posforms2xml 6 [(([1],Res), str2term "1+1=2"),(([2],Res), str2term "1+1+1=3")]);
*)
fun calcref2xml j (thyID:thyID, (scrop, (rewop, _)):calc) =
@@ -172,7 +172,7 @@
(*.for creating a href for a rule within an rls's rule list;
the guh points to the thy of definition of the rule, NOT of use in rls.*)
fun rule2xml j (thyID:thyID) Erule =
- raise error "rule2xml called with 'Erule'"
+ error "rule2xml called with 'Erule'"
(* val (j, thyID, Thm (thmID, thm)) = (j+i, thyID, nth 1 rules);
val (j, thyID, Thm (thmID, thm)) = (j, thyID,r);
*)
@@ -217,7 +217,7 @@
in filt end;
(*FIXME.WN040831 model2xml <--?--> pattern2xml*)
-(*WN.25.8.03: pattern2xml different output with TextIO | tracing !!!
+(*WN.25.8.03: pattern2xml different output with TextIO | writeln !!!
the version below is for TextIO: terms2xml makes \n !*)
(* val (j, p, where_) = (i, ppc, where_);
*)
@@ -244,7 +244,7 @@
| res => (indt j) ^ "\n" ^ terms2xml' j res ^
(indt j) ^ "\n");
(*
-tracing(pattern2xml 3 ((#ppc o get_pbt)
+writeln(pattern2xml 3 ((#ppc o get_pbt)
["squareroot","univariate","equation","test"]) []);
*)
@@ -318,7 +318,7 @@
(indt (j+i)) ^ "\n")^
indt j ^"\n"):xml
end;
-(* tracing(model2xml 3 itms []);
+(* writeln(model2xml 3 itms []);
*)
fun spec2xml j ((dI,pI,mI):spec) =
@@ -344,7 +344,7 @@
| _ => "Und")^" \n"^
spec2xml (j+i) spec ^
indt j ^"\n"):xml;
-(* tracing (modspec2xml 2 e_ocalhd);
+(* writeln (modspec2xml 2 e_ocalhd);
*)
fun pos'calchead2xml j (p:pos', (b, p_, head, gfr, pre, spec): ocalhd) =
(indt j ^"\n"):xml;
(* val subs = [(str2term "bdv", str2term "x")];
val subs = ["(bdv, x)"];
- tracing(subs2xml 0 subs);
+ writeln(subs2xml 0 subs);
*)
fun subst2xml j (subst:subst) =
(indt j ^"\n"^
foldl op^ ("", map (sub2xml (j+i)) subst) ^
indt j ^"\n"):xml;
(* val subst = [(str2term "bdv", str2term "x")];
- tracing(subst2xml 0 subst);
+ writeln(subst2xml 0 subst);
*)
(* val (j, str) = ((j+i), form);
@@ -568,7 +568,7 @@
(indt j ^"\n"^
thm'2xml (j+i) thm'^
indt j ^"\n"):xml
-(* tracing (tac2xml 2 (Rewrite ("all_left",
+(* writeln (tac2xml 2 (Rewrite ("all_left",
"~ ?b =!= 0 ==> (?a = ?b) = (?a - ?b = 0)")));
val (j, (Rewrite_Inst (subs, thm'))) = (i, tac);
*)
@@ -577,7 +577,7 @@
subs2xml (j+i) subs^
thm'2xml (j+i) thm'^
indt j ^"\n"):xml
-(* tracing (tac2xml 2 (Rewrite_Inst
+(* writeln (tac2xml 2 (Rewrite_Inst
(["(bdv,x)"],
("all_left",
"~ ?b =!= 0 ==> (?a = ?b) = (?a - ?b = 0)"))));
@@ -609,7 +609,7 @@
id2xml (j+i) pI^
indt j ^"\n"):xml
- | tac2xml j tac = raise error ("tac2xml: not impl. for "^tac2str tac);
+ | tac2xml j tac = error ("tac2xml: not impl. for "^tac2str tac);
fun tacs2xml j [] = "":xml
| tacs2xml j (t::ts) = tac2xml j t ^ tacs2xml j ts;
@@ -698,10 +698,10 @@
(* val (ContThmInst{thyID, thm, bdvs, thminst, applto, applat, reword,
asms, lhs, rhs, result, resasms, asmrls}) =
(context_thy (pt,pos) tac);
-tracing (contthy2xml 2 (context_thy (pt,pos) tac));
+writeln (contthy2xml 2 (context_thy (pt,pos) tac));
*)
fun contthy2xml j EContThy =
- raise error "contthy2xml called with EContThy"
+ error "contthy2xml called with EContThy"
| contthy2xml j (ContThm {thyID, thm, applto, applat, reword,
asms,lhs, rhs, result, resasms, asmrls}) =
indt j ^ " " ^ thm ^ " \n" ^