diff -r a474900d5bd2 -r 255c853ea2f0 test/Tools/isac/Interpret/inform.sml --- a/test/Tools/isac/Interpret/inform.sml Thu Dec 22 11:12:18 2016 +0100 +++ b/test/Tools/isac/Interpret/inform.sml Thu Dec 22 11:36:20 2016 +0100 @@ -63,7 +63,7 @@ appendFormula 1 "-2 * 1 + (1 + x) = 0" (*|> Future.join*); refFormula 1 (get_pos 1 1); val ((pt,_),_) = get_calc 1; - val str = pr_ptree pr_short pt; + val str = pr_ctree pr_short pt; if str = (". ----- pblobj -----\n" ^ "1. x + 1 = 2\n" ^ @@ -183,7 +183,7 @@ appendFormula 1 "x = 2" (*|> Future.join*); val ((pt,p),_) = get_calc 1; - val str = pr_ptree pr_short pt; + val str = pr_ctree pr_short pt; writeln str; if str = ". ----- pblobj -----\n1. x + 1 = 2\n" andalso p = ([1], Res) then () @@ -213,7 +213,7 @@ appendFormula 1 "x = 1" (*|> Future.join*); val ((pt,p),_) = get_calc 1; - val str = pr_ptree pr_short pt; + val str = pr_ctree pr_short pt; writeln str; if str = ". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n3. ----- pblobj -----\n3.1. -1 + x = 0\n3.2. x = 0 + -1 * -1\n3.2.1. x = 0 + -1 * -1\n3.2.2. x = 0 + 1\n" andalso p = ([3,2], Res) then () (*finds 1 step too early: ([3,2], Res) "x = 1" also by script !!!*) @@ -242,7 +242,7 @@ autoCalculate 1 (Step 1); refFormula 1 (get_pos 1 1);(*x + 1 + -1 * 2 = 0*); appendFormula 1 "[x = 3 + -2*1]" (*|> Future.join*); val ((pt,p),_) = get_calc 1; - val str = pr_ptree pr_short pt; + val str = pr_ctree pr_short pt; writeln str; if str=". ----- pblobj -----\n1. x + 1 = 2\n2. x + 1 + -1 * 2 = 0\n3. ----- pblobj -----\n3.1. -1 + x = 0\n3.2. x = 0 + -1 * -1\n4. [x = 1]\n4.1. [x = 1]\n4.2. [x = -2 + 3]\n4.3. [x = 3 + -2]\n" then () else error "inform.sml: diff.behav.appendFormula: Res + latEE 1"; @@ -268,7 +268,7 @@ replaceFormula 1 "-2 * 1 + (1 + x) = 0"; refFormula 1 (get_pos 1 1); val ((pt,_),_) = get_calc 1; - val str = pr_ptree pr_short pt; + val str = pr_ctree pr_short pt; (* before AK110725 this was ". ----- pblobj -----\n @@ -313,7 +313,7 @@ replaceFormula 1 "x + 1 = 4 + -2"; refFormula 1 (get_pos 1 1); val ((pt,_),_) = get_calc 1; - val str = pr_ptree pr_short pt; + val str = pr_ctree pr_short pt; writeln str; if str= ". ----- pblobj -----\n1. x + 1 = 2\n1.1. x + 1 = 2\n1.2. 1 + x = 2\n1.3. 1 + x = -2 + 4\n1.4. x + 1 = -2 + 4\n" then () else error "inform.sml: diff.behav.replaceFormula: on Res 1 + = 1"; @@ -336,7 +336,7 @@ replaceFormula 1 "x + 1 = 4 + -2"; refFormula 1 (get_pos 1 1); val ((pt,_),_) = get_calc 1; - val str = pr_ptree pr_short pt; + val str = pr_ctree pr_short pt; writeln str; if str= ". ----- pblobj -----\n1. x + 1 = 2\n1.1. x + 1 = 2\n1.2. 1 + x = 2\n1.3. 1 + x = -2 + 4\n1.4. x + 1 = -2 + 4\n" then () else error "inform.sml: diff.behav.replaceFormula: on Frm 1 + = 1"; @@ -361,7 +361,7 @@ replaceFormula 1 "x + 1 = 4 + -2"; refFormula 1 (get_pos 1 1); val ((pt,p),_) = get_calc 1; - val str = pr_ptree pr_short pt; + val str = pr_ctree pr_short pt; writeln str; if p = ([1], Res) then () else error "inform.sml: diff.behav. cut calculation 2"; @@ -457,7 +457,7 @@ appendFormula 1 " x - "; (* syntax error in ' x - ' *) val ((pt,_),_) = get_calc 1; - val str = pr_ptree pr_short pt; + val str = pr_ctree pr_short pt; writeln str; if str = ". ----- pblobj -----\n1. x + 1 = 2\n" then () else error "inform.sml: diff.behav.appendFormula: syntax error";