1.1 --- a/src/Tools/isac/Frontend/interface.sml Sun May 31 10:24:16 2015 +0200
1.2 +++ b/src/Tools/isac/Frontend/interface.sml Sun May 31 10:31:53 2015 +0200
1.3 @@ -98,7 +98,7 @@
1.4 TODO: adapt Iterator, add_user(= add_iterator!),etc. accordingly .*)
1.5 fun Iterator (cI:calcID) = (*returned ID unnecessary after WN.0411*)
1.6 (adduserOK2xml cI (add_user (cI:calcID)))
1.7 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.8 + handle _ => sysERROR2xml cI "error in kernel";
1.9 fun IteratorTEST (cI:calcID) = add_user (cI:calcID);
1.10 (*fun DEconstructIterator (cI:calcID) (uI:iterID) =
1.11 deluserOK2xml (del_user cI uI);*)
1.12 @@ -110,7 +110,7 @@
1.13 (*FIXME.WN.8.03: error-handling missing*)
1.14 val cI = add_calc cs
1.15 in calctreeOK2xml cI end)
1.16 - handle _ => sysERROR2xmlTODO 0 "error in kernel";
1.17 + handle _ => sysERROR2xml 0 "error in kernel";
1.18
1.19 fun DEconstrCalcTree (cI:calcID) =
1.20 deconstructcalctreeOK2xml (del_calc cI);
1.21 @@ -121,7 +121,7 @@
1.22 fun moveActiveFormula (cI:calcID) (p:pos') =
1.23 let val ((pt,_),_) = get_calc cI
1.24 in if existpt' p pt then (upd_ipos cI 1 p; iteratorOK2xml cI p)
1.25 - else sysERROR2xmlTODO cI "frontend sends a non-existing pos" end;
1.26 + else sysERROR2xml cI "frontend sends a non-existing pos" end;
1.27
1.28 (*. set the next tactic to be applied: dont't change the calc-tree,
1.29 but remember the envisaged changes for fun autoCalculate;
1.30 @@ -149,7 +149,7 @@
1.31 | ("not-applicable",_) => setnexttactic2xml cI "not-applicable"
1.32 | ("end-of-calculation",_) =>
1.33 setnexttactic2xml cI "end-of-calculation"
1.34 - | ("failure",_) => sysERROR2xmlTODO cI "failure"
1.35 + | ("failure",_) => sysERROR2xml cI "failure"
1.36 end;
1.37
1.38 (*. apply a tactic at a position and update the calc-tree if applicable .*)
1.39 @@ -185,7 +185,7 @@
1.40 | ("no-fmz-spec",_) => fetchproposedtacticERROR2xml cI "no-fmz-spec"
1.41 | ("end-of-calculation",_) =>
1.42 fetchproposedtacticERROR2xml cI "end-of-calculation")
1.43 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.44 + handle _ => sysERROR2xml cI "error in kernel";
1.45
1.46 (*original see ~~/src/Tools/isac/Interpret/solve.sml:
1.47 datatype auto = FIXXXME040624: does NOT match interfaces/ITOCalc.java
1.48 @@ -213,7 +213,7 @@
1.49 autocalculateOK2xml cI pold (if null c then pold else last_elem c) p)
1.50 | (str, _, _) => autocalculateERROR2xml cI str
1.51 end (* ) *)
1.52 - handle ERROR msg => sysERROR2xmlTODO cI ("error in kernel: " ^ msg)(* )) *);
1.53 + handle ERROR msg => sysERROR2xml cI ("error in kernel: " ^ msg)(* )) *);
1.54
1.55
1.56 (* val (cI:calcID, ichd as ((p,_),_,_,_,_):icalhd) =
1.57 @@ -242,7 +242,7 @@
1.58 SOME ta => gettacticOK2xml cI ta
1.59 | NONE => gettacticERROR2xml cI ("no tactic at position " ^ pos'2str p)
1.60 end)
1.61 - handle _ => sysERROR2xmlTODO cI "syserror in getTactic";
1.62 + handle _ => sysERROR2xml cI "syserror in getTactic";
1.63
1.64 (*. see ICalcIterator#fetchApplicableTactics
1.65 @see #TACTICS_ALL
1.66 @@ -264,15 +264,15 @@
1.67 fun fetchApplicableTactics cI (scope:int) (p:pos') = (*---^^^*)
1.68 (let val ((pt, _), _) = get_calc cI
1.69 in (applicabletacticsOK cI (sel_rules pt p))
1.70 - handle PTREE str => sysERROR2xmlTODO cI str
1.71 + handle PTREE str => sysERROR2xml cI str
1.72 end)
1.73 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.74 + handle _ => sysERROR2xml cI "error in kernel";
1.75
1.76 fun getAssumptions cI (p:pos') =
1.77 (let val ((pt,_),_) = get_calc cI
1.78 val (_, _, asms) = pt_extract (pt, p)
1.79 in getasmsOK2xml cI asms end)
1.80 - handle _ => sysERROR2xmlTODO cI "syserror in getAssumptions";
1.81 + handle _ => sysERROR2xml cI "syserror in getAssumptions";
1.82
1.83 (*WN0502 @see ME/ctree: type asms: illdesigned, thus no positions returned*)
1.84 fun getAccumulatedAsms cI (p:pos') =
1.85 @@ -280,7 +280,7 @@
1.86 val ass = get_assumptions_ pt p
1.87 in (*getaccuasmsOK2xml cI (get_assumptions_ pt p)*)
1.88 getasmsOK2xml cI ass end)
1.89 - handle _ => sysERROR2xmlTODO cI "syserror in getAccumulatedAsms";
1.90 + handle _ => sysERROR2xml cI "syserror in getAccumulatedAsms";
1.91
1.92
1.93 (*since moveActive* does NOT transfer pos java --> sml (only sml --> java)
1.94 @@ -291,7 +291,7 @@
1.95 (let val ((pt,_),_) = get_calc cI
1.96 val (form, tac, asms) = pt_extract (pt, p)
1.97 in refformulaOK2xml cI p form end)
1.98 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.99 + handle _ => sysERROR2xml cI "error in kernel";
1.100
1.101 (*.get formulae 'from' 'to' w.r.t. ordering in Position#compareTo(Position p);
1.102 in case of CalcHeads only the headline is taken
1.103 @@ -305,14 +305,14 @@
1.104 val ((pt,_),_) = get_calc cI
1.105 val (ModSpec (_,_,headline,_,_,_),_,_) = pt_extract (pt, to)
1.106 in getintervalOK cI [(to, headline)] end)
1.107 - handle _ => sysERROR2xmlTODO cI "error in kernel")
1.108 + handle _ => sysERROR2xml cI "error in kernel")
1.109 | getFormulaeFromTo cI (from as ([],Pbl):pos') (to as ([],Met):pos')_ false =
1.110 getFormulaeFromTo cI ([],Pbl) ([],Pbl) (~00000) false
1.111 | getFormulaeFromTo cI (from:pos') (to:pos') level false =
1.112 - (if from = to then sysERROR2xmlTODO cI "getFormulaeFromTo: From = To"
1.113 + (if from = to then sysERROR2xml cI "getFormulaeFromTo: From = To"
1.114 else
1.115 (case from of
1.116 - ([],Res) => sysERROR2xmlTODO cI ("getFormulaeFromTo does: moveDown " ^
1.117 + ([],Res) => sysERROR2xml cI ("getFormulaeFromTo does: moveDown " ^
1.118 "from=([],Res) .. goes beyond result")
1.119 | _ =>
1.120 let val ((pt,_),_) = get_calc cI
1.121 @@ -321,9 +321,9 @@
1.122 (*must reach margins ...*)
1.123 val lev = max (level, max (lev_of from, lev_of to))
1.124 in getintervalOK cI (get_interval f to lev pt) end)
1.125 - handle _ => sysERROR2xmlTODO cI "error in getFormulaeFromTo")
1.126 + handle _ => sysERROR2xml cI "error in getFormulaeFromTo")
1.127 | getFormulaeFromTo cI from to level true =
1.128 - sysERROR2xmlTODO cI ("getFormulaeFromTo impl.for formulae only, " ^
1.129 + sysERROR2xml cI ("getFormulaeFromTo impl.for formulae only, " ^
1.130 "i.e. last arg only impl. for false, _NOT_ true");
1.131
1.132 fun interSteps cI ip =
1.133 @@ -337,18 +337,18 @@
1.134 in case detailstep pt ip of
1.135 ("detailrls", pt, lastpos) => (upd_calc cI ((pt, p), tacis);
1.136 interStepsOK cI ip' ip' lastpos)
1.137 - | ("no-Rewrite_Set...", _, _) => sysERROR2xmlTODO cI "no Rewrite_Set..."
1.138 + | ("no-Rewrite_Set...", _, _) => sysERROR2xml cI "no Rewrite_Set..."
1.139 | (_, _, lastpos) => interStepsOK cI ip' ip' lastpos
1.140 end
1.141 end)
1.142 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.143 + handle _ => sysERROR2xml cI "error in kernel";
1.144
1.145 fun modifyCalcHead (cI:calcID) (ichd as ((p,_),_,_,_,_):icalhd) =
1.146 (let val ((pt,_),_) = get_calc cI
1.147 val (pt, chd as (_,p_,_,_,_,_)) = input_icalhd pt ichd
1.148 in (upd_calc cI ((pt, (p,p_)), []);
1.149 modifycalcheadOK2xml cI chd) end)
1.150 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.151 + handle _ => sysERROR2xml cI "error in kernel";
1.152
1.153 (*.at the activeFormula set the Model, the Guard and the Specification
1.154 to empty and return a CalcHead;
1.155 @@ -358,7 +358,7 @@
1.156 val ptp = reset_calchead ptp
1.157 in (upd_calc cI (ptp, []);
1.158 modifycalcheadOK2xml cI (get_ocalhd ptp)) end)
1.159 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.160 + handle _ => sysERROR2xml cI "error in kernel";
1.161
1.162 (*.at the activeFormula insert all the Descriptions in the Model
1.163 (_not_ in the Guard) and return a CalcHead;
1.164 @@ -371,7 +371,7 @@
1.165 val (_, _, ptp) = nxt_specif Model_Problem ptp
1.166 in (upd_calc cI (ptp, []);
1.167 modifycalcheadOK2xml cI (get_ocalhd ptp)) end)
1.168 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.169 + handle _ => sysERROR2xml cI "error in kernel";
1.170
1.171
1.172 (* set the UContext determined on a knowledgebrowser to the current calc *)
1.173 @@ -397,7 +397,7 @@
1.174 (upd_calc cI ((pt,p), []);
1.175 autocalculateOK2xml cI pold (if null c then pold else last_elem c) p)
1.176 | ("end-of-calculation",_) => message2xmlTODO cI "end-of-calculation"
1.177 - | ("failure",_) => sysERROR2xmlTODO cI "failure"
1.178 + | ("failure",_) => sysERROR2xml cI "failure"
1.179 | ("not-applicable",_) => (*the rule comes from anywhere..*)
1.180 (case applicable_in ip pt tac of
1.181 Notappl e => message2xmlTODO cI ("'" ^ tac2str tac ^ "' not-applicable")
1.182 @@ -410,7 +410,7 @@
1.183 autocalculateOK2xml cI pold (if null c then pold else last_elem c) p
1.184 end)
1.185 end
1.186 - ) handle _ => sysERROR2xmlTODO cI "setContext: thy_ ???")
1.187 + ) handle _ => sysERROR2xml cI "setContext: thy_ ???")
1.188 | "pbl_" =>
1.189 ((let
1.190 val pI = guh2kestoreID guh
1.191 @@ -420,9 +420,9 @@
1.192 then
1.193 let val (pt, chd) = set_problem pI (pt, ip)
1.194 in (upd_calc cI ((pt, ip), []); modifycalcheadOK2xml cI chd) end
1.195 - else sysERROR2xmlTODO cI "setContext for pbl requires ActiveFormula on CalcHead"
1.196 + else sysERROR2xml cI "setContext for pbl requires ActiveFormula on CalcHead"
1.197 end
1.198 - )handle _ => sysERROR2xmlTODO cI "setContext: pbl_ ???")
1.199 + )handle _ => sysERROR2xml cI "setContext: pbl_ ???")
1.200 | "met_" =>
1.201 ((let
1.202 val mI = guh2kestoreID guh
1.203 @@ -432,9 +432,9 @@
1.204 then
1.205 let val (pt, chd) = set_method mI (pt, ip)
1.206 in (upd_calc cI ((pt, ip), []); modifycalcheadOK2xml cI chd) end
1.207 - else sysERROR2xmlTODO cI "setContext for met requires ActiveFormula on CalcHead"
1.208 + else sysERROR2xml cI "setContext for met requires ActiveFormula on CalcHead"
1.209 end
1.210 - )handle _ => sysERROR2xmlTODO cI "setContext: met_ ???")
1.211 + )handle _ => sysERROR2xml cI "setContext: met_ ???")
1.212
1.213
1.214 (*.specify the Method at the activeFormula and return a CalcHead
1.215 @@ -449,9 +449,9 @@
1.216 then
1.217 let val (pt, chd) = set_method mI (pt, ip)
1.218 in (upd_calc cI ((pt, ip), []); modifycalcheadOK2xml cI chd) end
1.219 - else sysERROR2xmlTODO cI "setMethod requires ActiveFormula on CalcHead"
1.220 + else sysERROR2xml cI "setMethod requires ActiveFormula on CalcHead"
1.221 end
1.222 - ) handle _ => sysERROR2xmlTODO cI "error in kernel";
1.223 + ) handle _ => sysERROR2xml cI "error in kernel";
1.224
1.225 (*.specify the Problem at the activeFormula and return a CalcHead
1.226 containing the Model; special case of checkContext;
1.227 @@ -465,9 +465,9 @@
1.228 then
1.229 let val (pt, chd) = set_problem pI (pt, ip)
1.230 in (upd_calc cI ((pt, ip), []); modifycalcheadOK2xml cI chd) end
1.231 - else sysERROR2xmlTODO cI "setProblem requires ActiveFormula on CalcHead"
1.232 + else sysERROR2xml cI "setProblem requires ActiveFormula on CalcHead"
1.233 end
1.234 - ) handle _ => sysERROR2xmlTODO cI "error in kernel";
1.235 + ) handle _ => sysERROR2xml cI "error in kernel";
1.236
1.237 (*.specify the Theory at the activeFormula and return a CalcHead;
1.238 special case of checkContext;
1.239 @@ -481,9 +481,9 @@
1.240 then
1.241 let val (pt, chd) = set_theory tI (pt, ip)
1.242 in (upd_calc cI ((pt, ip), []); modifycalcheadOK2xml cI chd) end
1.243 - else sysERROR2xmlTODO cI "setProblem requires ActiveFormula on CalcHead"
1.244 + else sysERROR2xml cI "setProblem requires ActiveFormula on CalcHead"
1.245 end
1.246 - ) handle _ => sysERROR2xmlTODO cI "error in kernel";
1.247 + ) handle _ => sysERROR2xml cI "error in kernel";
1.248
1.249
1.250 (**. without update of CalcTree .**)
1.251 @@ -506,7 +506,7 @@
1.252 val pp = par_pblobj pt p
1.253 val chd = tryrefine pblID pt (pp, p_)
1.254 in xml_of_matchpbl cI chd end)
1.255 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.256 + handle _ => sysERROR2xml cI "error in kernel";
1.257
1.258 (* append a formula to the calculation *)
1.259 fun appendFormula' cI (ifo:cterm') =
1.260 @@ -526,7 +526,7 @@
1.261 | (msg, _) => appendformulaERROR2xml cI msg)
1.262 | (msg, cs') => appendformulaERROR2xml cI msg
1.263 end)
1.264 - handle ERROR msg => sysERROR2xmlTODO cI ("error in kernel: " ^ msg);
1.265 + handle ERROR msg => sysERROR2xml cI ("error in kernel: " ^ msg);
1.266
1.267 fun appendFormula cI ifo = (*Future.fork (fn () => *)appendFormula' cI ifo(* ) *);
1.268
1.269 @@ -547,7 +547,7 @@
1.270 | ("same-formula", _) => replaceformulaERROR2xml cI "formula not changed"
1.271 | (msg, _) => replaceformulaERROR2xml cI msg
1.272 end)
1.273 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.274 + handle _ => sysERROR2xml cI "error in kernel";
1.275
1.276
1.277
1.278 @@ -561,14 +561,14 @@
1.279 fun moveActiveRoot cI =
1.280 (let val _ = upd_ipos cI 1 ([],Pbl)
1.281 in iteratorOK2xml cI ([],Pbl) end)
1.282 - handle e => sysERROR2xmlTODO cI "error in kernel";
1.283 + handle e => sysERROR2xml cI "error in kernel";
1.284 fun moveRoot cI =
1.285 (iteratorOK2xml cI ([],Pbl))
1.286 - handle e => sysERROR2xmlTODO cI "";
1.287 + handle e => sysERROR2xml cI "";
1.288 fun moveActiveRootTEST cI =
1.289 (let val _ = upd_ipos cI 1 ([],Pbl)
1.290 in iteratorOK2xml cI ([],Pbl) end)
1.291 - handle e => sysERROR2xmlTODO cI "error in kernel";
1.292 + handle e => sysERROR2xml cI "error in kernel";
1.293
1.294 (* val (cI, uI) = (1,1);
1.295 val (cI, uI) = (1,2);
1.296 @@ -584,7 +584,7 @@
1.297 val _ = upd_ipos cI 1 ip'
1.298 in iteratorOK2xml cI ip' end)
1.299 handle (PTREE e) => iteratorERROR2xml cI)
1.300 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.301 + handle _ => sysERROR2xml cI "error in kernel";
1.302 fun moveDown cI (p:pos') =
1.303 ((let val ((pt,_),_) = get_calc cI
1.304 (* val (P, (Nd (_, ns)), (p::(ps as (_::_)), p_)) =([]:pos, pt, get_pos cI uI);
1.305 @@ -595,7 +595,7 @@
1.306 val ip' = move_dn [] pt p
1.307 in iteratorOK2xml cI ip' end)
1.308 handle (PTREE e) => iteratorERROR2xml cI)
1.309 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.310 + handle _ => sysERROR2xml cI "error in kernel";
1.311
1.312 fun moveActiveLevelDown cI =
1.313 ((let val ((pt,_),_) = get_calc cI
1.314 @@ -603,13 +603,13 @@
1.315 val _ = upd_ipos cI 1 ip'
1.316 in iteratorOK2xml cI ip' end)
1.317 handle (PTREE e) => iteratorERROR2xml cI)
1.318 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.319 + handle _ => sysERROR2xml cI "error in kernel";
1.320 fun moveLevelDown cI (p:pos') =
1.321 ((let val ((pt,_),_) = get_calc cI
1.322 val ip' = movelevel_dn [] pt p
1.323 in iteratorOK2xml cI ip' end)
1.324 handle (PTREE e) => iteratorERROR2xml cI)
1.325 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.326 + handle _ => sysERROR2xml cI "error in kernel";
1.327
1.328 fun moveActiveUp cI =
1.329 ((let val ((pt,_),_) = get_calc cI
1.330 @@ -617,13 +617,13 @@
1.331 val _ = upd_ipos cI 1 ip'
1.332 in iteratorOK2xml cI ip' end)
1.333 handle PTREE e => iteratorERROR2xml cI)
1.334 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.335 + handle _ => sysERROR2xml cI "error in kernel";
1.336 fun moveUp cI (p:pos') =
1.337 ((let val ((pt,_),_) = get_calc cI
1.338 val ip' = move_up [] pt p
1.339 in iteratorOK2xml cI ip' end)
1.340 handle PTREE e => iteratorERROR2xml cI)
1.341 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.342 + handle _ => sysERROR2xml cI "error in kernel";
1.343
1.344 fun moveActiveLevelUp cI =
1.345 ((let val ((pt,_),_) = get_calc cI
1.346 @@ -631,13 +631,13 @@
1.347 val _ = upd_ipos cI 1 ip'
1.348 in iteratorOK2xml cI ip' end)
1.349 handle PTREE e => iteratorERROR2xml cI)
1.350 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.351 + handle _ => sysERROR2xml cI "error in kernel";
1.352 fun moveLevelUp cI (p:pos') =
1.353 ((let val ((pt,_),_) = get_calc cI
1.354 val ip' = movelevel_up [] pt p
1.355 in iteratorOK2xml cI ip' end)
1.356 handle PTREE e => iteratorERROR2xml cI)
1.357 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.358 + handle _ => sysERROR2xml cI "error in kernel";
1.359
1.360 fun moveActiveCalcHead cI =
1.361 ((let val ((pt,_),_) = get_calc cI
1.362 @@ -645,13 +645,13 @@
1.363 val _ = upd_ipos cI 1 ip'
1.364 in iteratorOK2xml cI ip' end)
1.365 handle PTREE e => iteratorERROR2xml cI)
1.366 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.367 + handle _ => sysERROR2xml cI "error in kernel";
1.368 fun moveCalcHead cI (p:pos') =
1.369 ((let val ((pt,_),_) = get_calc cI
1.370 val ip' = movecalchd_up pt p
1.371 in iteratorOK2xml cI ip' end)
1.372 handle PTREE e => iteratorERROR2xml cI)
1.373 - handle _ => sysERROR2xmlTODO cI "error in kernel";
1.374 + handle _ => sysERROR2xml cI "error in kernel";
1.375
1.376
1.377 (*.initContext Thy_ is conceptually impossible at [Pbl,Met]
1.378 @@ -687,21 +687,21 @@
1.379 | (msg, _) => message2xmlTODO cI msg
1.380 else message2xmlTODO cI "no thy-context at this position"
1.381 end)
1.382 - handle _ => sysERROR2xmlTODO cI "error in kernel")
1.383 + handle _ => sysERROR2xml cI "error in kernel")
1.384
1.385 | initContext cI Pbl_ (pos as (p,p_):pos') =
1.386 ((let val ((pt,_),_) = get_calc cI
1.387 val pp = par_pblobj pt p
1.388 val chd = initcontext_pbl pt (pp,p_)
1.389 in xml_of_matchpbl cI chd end)
1.390 - handle _ => sysERROR2xmlTODO cI "error in kernel")
1.391 + handle _ => sysERROR2xml cI "error in kernel")
1.392
1.393 | initContext cI Met_ (pos as (p,p_):pos') =
1.394 ((let val ((pt,_),_) = get_calc cI
1.395 val pp = par_pblobj pt p
1.396 val chd = initcontext_met pt (pp,p_)
1.397 in xml_of_matchmet cI chd end)
1.398 - handle _ => sysERROR2xmlTODO cI "error in kernel");
1.399 + handle _ => sysERROR2xml cI "error in kernel");
1.400
1.401 (* match a theorem, a ruleset (etc., selected in the knowledge-browser)
1.402 with the formula in the focus on the worksheet;
1.403 @@ -721,7 +721,7 @@
1.404 val subs = subs_from is "dummy" guh
1.405 val tac = guh2rewtac guh subs
1.406 in contextthyOK2xml cI (context_thy (pt, pos) tac) end
1.407 - ) handle _ => sysERROR2xmlTODO cI "error in kernel")
1.408 + ) handle _ => sysERROR2xml cI "error in kernel")
1.409 (*.match the model of a problem at pos p
1.410 with the model-pattern of the problem with pblID.*)
1.411 | "pbl_" =>
1.412 @@ -731,7 +731,7 @@
1.413 val keID = guh2kestoreID guh
1.414 val chd = context_pbl keID pt pp
1.415 in xml_of_matchpbl cI chd end
1.416 - ) handle _ => sysERROR2xmlTODO cI "error in kernel")
1.417 + ) handle _ => sysERROR2xml cI "error in kernel")
1.418 | "met_" =>
1.419 ((let
1.420 val ((pt,_),_) = get_calc cI
1.421 @@ -739,8 +739,8 @@
1.422 val keID = guh2kestoreID guh
1.423 val chd = context_met keID pt pp
1.424 in xml_of_matchmet cI chd end
1.425 - ) handle _ => sysERROR2xmlTODO cI "error in kernel")
1.426 - | str => sysERROR2xmlTODO cI ("checkContext: str = " ^ str)
1.427 + ) handle _ => sysERROR2xml cI "error in kernel")
1.428 + | str => sysERROR2xml cI ("checkContext: str = " ^ str)
1.429
1.430 (* for an errpatID find "(fillpatID, fillform)" list
1.431 which dedicated to this errpat and which is applicable at current formula*)
2.1 --- a/src/Tools/isac/xmlsrc/interface-xml.sml Sun May 31 10:24:16 2015 +0200
2.2 +++ b/src/Tools/isac/xmlsrc/interface-xml.sml Sun May 31 10:31:53 2015 +0200
2.3 @@ -97,7 +97,7 @@
2.4 " <ERROR> "^str^" </ERROR>\n" ^
2.5 "</SYSERROR>\n" ^
2.6 "@@@@@end@@@@@");
2.7 -fun sysERROR2xmlTODO (calcid : calcID) str =
2.8 +fun sysERROR2xml (calcid : calcID) str =
2.9 XML.Elem (("SYSERROR", []),
2.10 [XML.Elem (("CALCID", []), [XML.Text (string_of_int calcid)]),
2.11 XML.Elem (("ERROR", []), [XML.Text (if str = "" then " ERROR in kernel " else str)])])