1.1 --- a/test/Tools/isac/Interpret/ctree.sml Mon Apr 20 10:33:55 2015 +0200
1.2 +++ b/test/Tools/isac/Interpret/ctree.sml Mon Apr 20 14:18:40 2015 +0200
1.3 @@ -209,7 +209,7 @@
1.4 "-------------- cut_level (from ptree above)----------------------";
1.5 show_pt pt;
1.6 show_pt pt';
1.7 -print_depth 99; cuts; print_depth 3;
1.8 +default_print_depth 99; cuts; default_print_depth 3;
1.9
1.10 (*if cuts = [([2], Res),
1.11 ([3], Frm),
1.12 @@ -375,8 +375,8 @@
1.13
1.14 show_pt pt;
1.15 show_pt pt';
1.16 -print_depth 99;cuts;print_depth 3;
1.17 -print_depth 99;map fst (get_interval ([],Frm) ([],Res) 9999 pt');print_depth 3;
1.18 +default_print_depth 99;cuts;default_print_depth 3;
1.19 +default_print_depth 99;map fst (get_interval ([],Frm) ([],Res) 9999 pt');default_print_depth 3;
1.20 ####################################################################*)
1.21
1.22
1.23 @@ -1037,9 +1037,9 @@
1.24 "-------------- get_allpos' new ----------------------------------";
1.25 "-------------- get_allpos' new ----------------------------------";
1.26 "--- whole ctree";
1.27 -print_depth 99;
1.28 +default_print_depth 99;
1.29 val cuts = get_allp [] ([], ([],Frm)) pt;
1.30 -print_depth 3;
1.31 +default_print_depth 3;
1.32 if cuts =
1.33 [(*never returns the first pos'*)
1.34 ([1], Frm),
1.35 @@ -1056,9 +1056,9 @@
1.36 ([], Res)] then () else
1.37 error "ctree.sml diff.behav. get_allp new []";
1.38
1.39 -print_depth 99;
1.40 +default_print_depth 99;
1.41 val cuts2 = get_allps [] [1] (children pt);
1.42 -print_depth 3;
1.43 +default_print_depth 3;
1.44 if cuts = cuts2 @ [([], Res)] then () else
1.45 error "ctree.sml diff.behav. get_allps new []";
1.46
1.47 @@ -1128,9 +1128,9 @@
1.48
1.49 "---(2) on S(606)..S(608)--------";
1.50 val (pt', cuts) = cut_tree pt ([1],Res);
1.51 -print_depth 99;
1.52 +default_print_depth 99;
1.53 cuts;
1.54 -print_depth 3;
1.55 +default_print_depth 3;
1.56 if cuts = [([2, 1], Frm), ([2, 1], Res), ([2, 2], Res), ([2, 3], Res),
1.57 ([2, 4], Res), ([2, 5], Res), ([2, 6], Res), ([2], Res), ([3], Pbl),
1.58 ([3, 1], Frm), ([3, 1], Res), ([3, 2, 1], Frm), ([3, 2, 1], Res),
1.59 @@ -1141,9 +1141,9 @@
1.60
1.61 "---(3) on S(606)..S(608)--------";
1.62 val (pt', cuts) = cut_tree pt ([2],Res);
1.63 -print_depth 99;
1.64 +default_print_depth 99;
1.65 cuts;
1.66 -print_depth 3;
1.67 +default_print_depth 3;
1.68 if cuts = [(*preceding step on WS was ([1]),Res*)
1.69 ([2, 1], Frm), ([2, 1], Res), ([2, 2], Res), ([2, 3], Res),
1.70 ([2, 4], Res), ([2, 5], Res), ([2, 6], Res),
1.71 @@ -1160,9 +1160,9 @@
1.72
1.73 "---(4) on S(606)..S(608)--------";
1.74 val (pt', cuts) = cut_tree pt ([3],Pbl);
1.75 -print_depth 99;
1.76 +default_print_depth 99;
1.77 cuts;
1.78 -print_depth 3;
1.79 +default_print_depth 3;
1.80 if cuts = [([3], Pbl),
1.81 ([3, 1], Frm), ([3, 1], Res),
1.82 ([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
1.83 @@ -1174,9 +1174,9 @@
1.84
1.85 "---(5a) on S(606)..S(608) cut_tree --------";
1.86 val (pt', cuts) = cut_tree pt ([3,2,1],Res);
1.87 -print_depth 99;
1.88 +default_print_depth 99;
1.89 cuts;
1.90 -print_depth 1;
1.91 +default_print_depth 1;
1.92 if cuts = [([3, 2, 2], Res), ([3, 2], Res),
1.93 (*WN060727 added after replacing cutlevup by test_trans:*)
1.94 ([3], Res), ([4], Res),([],Res)] then ()
1.95 @@ -1195,9 +1195,9 @@
1.96 val (pt', cuts) = cappend_atomic pt [1] e_istate (str2term "Inform[1]")
1.97 (Tac "test") (str2term "Inres[1]",[]) Complete;
1.98
1.99 -print_depth 99;
1.100 +default_print_depth 99;
1.101 cuts;
1.102 -print_depth 3;
1.103 +default_print_depth 3;
1.104 if cuts = [([2, 1], Frm), ([2, 1], Res), ([2, 2], Res), ([2, 3], Res),
1.105 ([2, 4], Res), ([2, 5], Res), ([2, 6], Res), ([2], Res), ([3], Pbl),
1.106 ([3, 1], Frm), ([3, 1], Res), ([3, 2, 1], Frm), ([3, 2, 1], Res),
1.107 @@ -1206,9 +1206,9 @@
1.108 else error "ctree.sml: diff:behav. in complete pt:append_atomic[1] cuts";
1.109
1.110 val afterins = get_allp [] ([], ([],Frm)) pt';
1.111 -print_depth 99;
1.112 +default_print_depth 99;
1.113 afterins;
1.114 -print_depth 3;
1.115 +default_print_depth 3;
1.116 if afterins = [([1], Frm), ([1], Res)
1.117 (*, WN060727 removed after replacing cutlevup by test_trans:([], Res)*)] then()
1.118 else error "ctree.sml: diff:behav. in complete pt: append_atomic[1] afterins";
1.119 @@ -1217,9 +1217,9 @@
1.120 show_pt pt;
1.121 val (pt', cuts) = cappend_atomic pt [2] e_istate (str2term "Inform[2]")
1.122 (Tac "test") (str2term "Inres[2]",[]) Complete;
1.123 -print_depth 99;
1.124 +default_print_depth 99;
1.125 cuts;
1.126 -print_depth 3;
1.127 +default_print_depth 3;
1.128
1.129 if cuts = [([2, 1], Frm), ([2, 1], Res), ([2, 2], Res), ([2, 3], Res),
1.130 ([2, 4], Res), ([2, 5], Res), ([2, 6], Res), ([2], Res), ([3], Pbl),
1.131 @@ -1230,9 +1230,9 @@
1.132
1.133
1.134 val afterins = get_allp [] ([], ([],Frm)) pt';
1.135 -print_depth 99;
1.136 +default_print_depth 99;
1.137 afterins;
1.138 -print_depth 3;
1.139 +default_print_depth 3;
1.140
1.141 if afterins = [([1], Frm), ([1], Res), ([2], Frm), ([2], Res)
1.142 (*, WN060727 removed after replacing cutlevup by test_trans:([], Res)*)]
1.143 @@ -1255,9 +1255,9 @@
1.144 "---(4) on S(606)..S(608)--------";
1.145 val (pt', cuts) = cappend_problem pt [3] e_istate ([],e_spec)
1.146 ([],e_spec, str2term "Inhead[3]");
1.147 -print_depth 99;
1.148 +default_print_depth 99;
1.149 cuts;
1.150 -print_depth 3;
1.151 +default_print_depth 3;
1.152 if cuts = [([3], Pbl),
1.153 ([3, 1], Frm), ([3, 1], Res),
1.154 ([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
1.155 @@ -1266,9 +1266,9 @@
1.156 (*WN060727 added after replacing cutlevup by test_trans*)([], Res)] then ()else
1.157 error "ctree.sml: diff:behav. in ccomplete pt: append_problem[3] cuts";
1.158 val afterins = get_allp [] ([], ([],Frm)) pt';
1.159 -print_depth 99;
1.160 +default_print_depth 99;
1.161 afterins;
1.162 -print_depth 3;
1.163 +default_print_depth 3;
1.164 if afterins =
1.165 [([1], Frm), ([1], Res),([2, 1], Frm), ([2, 1], Res), ([2, 2], Res),
1.166 ([2, 3], Res), ([2, 4], Res), ([2, 5], Res), ([2, 6], Res), ([2], Res),
1.167 @@ -1281,18 +1281,18 @@
1.168 "---(6-1) on S(606)..S(608)--------";
1.169 val (pt', cuts) = cappend_atomic pt [3,1] e_istate (str2term "Inform[3,1]")
1.170 (Tac "test") (str2term "Inres[3,1]",[]) Complete;
1.171 -print_depth 99;
1.172 +default_print_depth 99;
1.173 cuts;
1.174 -print_depth 3;
1.175 +default_print_depth 3;
1.176 if cuts = [([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res),
1.177 ([3, 2], Res),
1.178 (*WN060727 added*)([3], Res), ([4], Res), ([], Res)] then () else
1.179 error "ctree.sml: diff:behav. in complete pt: append_atomic[3,1] cuts";
1.180
1.181 val afterins = get_allp [] ([], ([],Frm)) pt';
1.182 -print_depth 99;
1.183 +default_print_depth 99;
1.184 afterins;
1.185 -print_depth 3;
1.186 +default_print_depth 3;
1.187 (*WN060727 replaced after overwriting cutlevup by test_trans
1.188 if afterins = [([1], Frm), ([1], Res),
1.189 ([2, 1], Frm), ([2, 1], Res), ([2, 2], Res),
1.190 @@ -1319,17 +1319,17 @@
1.191 "---(6) on S(606)..S(608)--------";
1.192 val (pt', cuts) = cappend_atomic pt [3,2] e_istate (str2term "Inform[3,2]")
1.193 (Tac "test") (str2term "Inres[3,2]",[]) Complete;
1.194 -print_depth 99;
1.195 +default_print_depth 99;
1.196 cuts;
1.197 -print_depth 3;
1.198 +default_print_depth 3;
1.199 if cuts = [(*just after is: cutlevup=false in [3]*)
1.200 (*WN060727 after test_trans instead cutlevup added:*)
1.201 ([3], Res), ([4], Res), ([], Res)] then () else
1.202 error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2] cuts";
1.203 val afterins = get_allp [] ([], ([],Frm)) pt';
1.204 -print_depth 99;
1.205 +default_print_depth 99;
1.206 afterins;
1.207 -print_depth 3;
1.208 +default_print_depth 3;
1.209 (*WN060727 replaced after overwriting cutlevup by test_trans
1.210 if afterins = [([1], Frm), ([1], Res),
1.211 ([2, 1], Frm), ([2, 1], Res), ([2, 2], Res),
1.212 @@ -1357,17 +1357,17 @@
1.213 (**)
1.214 val (pt', cuts) = cappend_atomic pt [3,2,1] e_istate (str2term "Inform[3,2,1]")
1.215 (Tac "test") (str2term "Inres[3,2,1]",[]) Complete;
1.216 -print_depth 99;
1.217 +default_print_depth 99;
1.218 cuts;
1.219 -print_depth 1;
1.220 +default_print_depth 1;
1.221 if cuts = [([3, 2, 2], Res), ([3, 2], Res),
1.222 (*WN060727 {cutlevup->test_trans} added:*)([3], Res), ([4], Res), ([], Res)]
1.223 then () else
1.224 error "ctree.sml: diff:behav. in complete pt: append_atomic[3,2,1] cuts";
1.225 val afterins = get_allp [] ([], ([],Frm)) pt';
1.226 -print_depth 99;
1.227 +default_print_depth 99;
1.228 afterins;
1.229 -print_depth 3;
1.230 +default_print_depth 3;
1.231 if afterins = [([1], Frm), ([1], Res),
1.232 ([2, 1], Frm), ([2, 1], Res), ([2, 2], Res),
1.233 ([2, 3], Res), ([2, 4], Res), ([2, 5], Res), ([2, 6], Res),