| 9 | | Index: Compiler/Template/ExpressionDumpTpl.mo |
| 10 | | =================================================================== |
| 11 | | --- Compiler/Template/ExpressionDumpTpl.mo (revision 16189) |
| 12 | | +++ Compiler/Template/ExpressionDumpTpl.mo (working copy) |
| 13 | | @@ -1133,6 +1133,49 @@ |
| 14 | | out_txt := Tpl.popIter(out_txt); |
| 15 | | end dumpExpListCrefs; |
| 16 | | |
| 17 | | +protected function fun_33 |
| 18 | | + input Tpl.Text in_txt; |
| 19 | | + input Boolean in_mArg; |
| 20 | | + input Tpl.Text in_a_cref__str; |
| 21 | | + input Tpl.Text in_a_sub__str; |
| 22 | | + input DAE.Ident in_a_ident; |
| 23 | | + |
| 24 | | + output Tpl.Text out_txt; |
| 25 | | +algorithm |
| 26 | | + out_txt := |
| 27 | | + match(in_txt, in_mArg, in_a_cref__str, in_a_sub__str, in_a_ident) |
| 28 | | + local |
| 29 | | + Tpl.Text txt; |
| 30 | | + Tpl.Text a_cref__str; |
| 31 | | + Tpl.Text a_sub__str; |
| 32 | | + DAE.Ident a_ident; |
| 33 | | + |
| 34 | | + case ( txt, |
| 35 | | + false, |
| 36 | | + a_cref__str, |
| 37 | | + a_sub__str, |
| 38 | | + a_ident ) |
| 39 | | + equation |
| 40 | | + txt = Tpl.writeStr(txt, a_ident); |
| 41 | | + txt = Tpl.writeText(txt, a_sub__str); |
| 42 | | + txt = Tpl.writeTok(txt, Tpl.ST_STRING(".")); |
| 43 | | + txt = Tpl.writeText(txt, a_cref__str); |
| 44 | | + then txt; |
| 45 | | + |
| 46 | | + case ( txt, |
| 47 | | + _, |
| 48 | | + a_cref__str, |
| 49 | | + a_sub__str, |
| 50 | | + a_ident ) |
| 51 | | + equation |
| 52 | | + txt = Tpl.writeStr(txt, a_ident); |
| 53 | | + txt = Tpl.writeText(txt, a_sub__str); |
| 54 | | + txt = Tpl.writeTok(txt, Tpl.ST_STRING("__")); |
| 55 | | + txt = Tpl.writeText(txt, a_cref__str); |
| 56 | | + then txt; |
| 57 | | + end match; |
| 58 | | +end fun_33; |
| 59 | | + |
| 60 | | public function dumpCref |
| 61 | | input Tpl.Text in_txt; |
| 62 | | input DAE.ComponentRef in_a_cref; |
| 63 | | @@ -1147,6 +1190,7 @@ |
| 64 | | Integer i_index; |
| 65 | | DAE.Ident i_ident; |
| 66 | | list<DAE.Subscript> i_subscriptLst; |
| 67 | | + Boolean ret_2; |
| 68 | | Tpl.Text l_cref__str; |
| 69 | | Tpl.Text l_sub__str; |
| 70 | | |
| 71 | | @@ -1174,10 +1218,8 @@ |
| 72 | | equation |
| 73 | | l_sub__str = dumpSubscripts(Tpl.emptyTxt, i_subscriptLst); |
| 74 | | l_cref__str = dumpCref(Tpl.emptyTxt, i_componentRef); |
| 75 | | - txt = Tpl.writeStr(txt, i_ident); |
| 76 | | - txt = Tpl.writeText(txt, l_sub__str); |
| 77 | | - txt = Tpl.writeTok(txt, Tpl.ST_STRING(".")); |
| 78 | | - txt = Tpl.writeText(txt, l_cref__str); |
| 79 | | + ret_2 = Config.modelicaOutput(); |
| 80 | | + txt = fun_33(txt, ret_2, l_cref__str, l_sub__str, i_ident); |
| 81 | | then txt; |
| 82 | | |
| 83 | | case ( txt, |
| 84 | | @@ -1194,7 +1236,7 @@ |
| 85 | | end match; |
| 86 | | end dumpCref; |
| 87 | | |
| 88 | | -protected function lm_34 |
| 89 | | +protected function lm_35 |
| 90 | | input Tpl.Text in_txt; |
| 91 | | input list<DAE.Subscript> in_items; |
| 92 | | |
| 93 | | @@ -1216,10 +1258,10 @@ |
| 94 | | equation |
| 95 | | txt = dumpSubscript(txt, i_sub); |
| 96 | | txt = Tpl.nextIter(txt); |
| 97 | | - txt = lm_34(txt, rest); |
| 98 | | + txt = lm_35(txt, rest); |
| 99 | | then txt; |
| 100 | | end match; |
| 101 | | -end lm_34; |
| 102 | | +end lm_35; |
| 103 | | |
| 104 | | public function dumpSubscripts |
| 105 | | input Tpl.Text in_txt; |
| 106 | | @@ -1242,7 +1284,7 @@ |
| 107 | | i_subscripts ) |
| 108 | | equation |
| 109 | | l_sub__str = Tpl.pushIter(Tpl.emptyTxt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_STRING(",")), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 110 | | - l_sub__str = lm_34(l_sub__str, i_subscripts); |
| 111 | | + l_sub__str = lm_35(l_sub__str, i_subscripts); |
| 112 | | l_sub__str = Tpl.popIter(l_sub__str); |
| 113 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("[")); |
| 114 | | txt = Tpl.writeText(txt, l_sub__str); |
| 115 | | @@ -1341,7 +1383,7 @@ |
| 116 | | end match; |
| 117 | | end dumpReductionIterator; |
| 118 | | |
| 119 | | -protected function fun_38 |
| 120 | | +protected function fun_39 |
| 121 | | input Tpl.Text in_txt; |
| 122 | | input Boolean in_mArg; |
| 123 | | input Tpl.Text in_a_op__str; |
| 124 | | @@ -1370,9 +1412,9 @@ |
| 125 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING(")")); |
| 126 | | then txt; |
| 127 | | end match; |
| 128 | | -end fun_38; |
| 129 | | +end fun_39; |
| 130 | | |
| 131 | | -protected function fun_39 |
| 132 | | +protected function fun_40 |
| 133 | | input Tpl.Text in_txt; |
| 134 | | input DAE.Exp in_a_operand; |
| 135 | | input Boolean in_a_lhs; |
| 136 | | @@ -1413,10 +1455,10 @@ |
| 137 | | ret_0 = Expression.priority(a_operation, a_lhs); |
| 138 | | ret_1 = Expression.priority(i_operand, a_lhs); |
| 139 | | ret_2 = intLt(ret_0, ret_1); |
| 140 | | - txt = fun_38(txt, ret_2, a_op__str); |
| 141 | | + txt = fun_39(txt, ret_2, a_op__str); |
| 142 | | then txt; |
| 143 | | end match; |
| 144 | | -end fun_39; |
| 145 | | +end fun_40; |
| 146 | | |
| 147 | | public function dumpOperand |
| 148 | | input Tpl.Text txt; |
| 149 | | @@ -1429,10 +1471,10 @@ |
| 150 | | Tpl.Text l_op__str; |
| 151 | | algorithm |
| 152 | | l_op__str := dumpExp(Tpl.emptyTxt, a_operand, "\""); |
| 153 | | - out_txt := fun_39(txt, a_operand, a_lhs, a_operation, l_op__str); |
| 154 | | + out_txt := fun_40(txt, a_operand, a_lhs, a_operation, l_op__str); |
| 155 | | end dumpOperand; |
| 156 | | |
| 157 | | -protected function fun_41 |
| 158 | | +protected function fun_42 |
| 159 | | input Tpl.Text in_txt; |
| 160 | | input DAE.Operator in_a_op; |
| 161 | | |
| 162 | | @@ -1569,9 +1611,9 @@ |
| 163 | | txt = errorMsg(txt, "ExpressionDumpTpl.dumpBinOp: Unknown operator."); |
| 164 | | then txt; |
| 165 | | end match; |
| 166 | | -end fun_41; |
| 167 | | +end fun_42; |
| 168 | | |
| 169 | | -protected function fun_42 |
| 170 | | +protected function fun_43 |
| 171 | | input Tpl.Text in_txt; |
| 172 | | input DAE.Operator in_a_op; |
| 173 | | |
| 174 | | @@ -1708,9 +1750,9 @@ |
| 175 | | txt = errorMsg(txt, "ExpressionDumpTpl.dumpBinOp: Unknown operator."); |
| 176 | | then txt; |
| 177 | | end match; |
| 178 | | -end fun_42; |
| 179 | | +end fun_43; |
| 180 | | |
| 181 | | -protected function fun_43 |
| 182 | | +protected function fun_44 |
| 183 | | input Tpl.Text in_txt; |
| 184 | | input Boolean in_mArg; |
| 185 | | input DAE.Operator in_a_op; |
| 186 | | @@ -1727,17 +1769,17 @@ |
| 187 | | false, |
| 188 | | a_op ) |
| 189 | | equation |
| 190 | | - txt = fun_41(txt, a_op); |
| 191 | | + txt = fun_42(txt, a_op); |
| 192 | | then txt; |
| 193 | | |
| 194 | | case ( txt, |
| 195 | | _, |
| 196 | | a_op ) |
| 197 | | equation |
| 198 | | - txt = fun_42(txt, a_op); |
| 199 | | + txt = fun_43(txt, a_op); |
| 200 | | then txt; |
| 201 | | end match; |
| 202 | | -end fun_43; |
| 203 | | +end fun_44; |
| 204 | | |
| 205 | | public function dumpBinOp |
| 206 | | input Tpl.Text txt; |
| 207 | | @@ -1748,7 +1790,7 @@ |
| 208 | | Boolean ret_0; |
| 209 | | algorithm |
| 210 | | ret_0 := Config.typeinfo(); |
| 211 | | - out_txt := fun_43(txt, ret_0, a_op); |
| 212 | | + out_txt := fun_44(txt, ret_0, a_op); |
| 213 | | end dumpBinOp; |
| 214 | | |
| 215 | | public function dumpUnaryOp |
| 216 | | @@ -1905,7 +1947,7 @@ |
| 217 | | end match; |
| 218 | | end dumpRelationOp; |
| 219 | | |
| 220 | | -protected function lm_49 |
| 221 | | +protected function lm_50 |
| 222 | | input Tpl.Text in_txt; |
| 223 | | input list<DAE.FuncArg> in_items; |
| 224 | | |
| 225 | | @@ -1927,12 +1969,12 @@ |
| 226 | | equation |
| 227 | | txt = dumpFuncArg(txt, i_arg); |
| 228 | | txt = Tpl.nextIter(txt); |
| 229 | | - txt = lm_49(txt, rest); |
| 230 | | + txt = lm_50(txt, rest); |
| 231 | | then txt; |
| 232 | | end match; |
| 233 | | -end lm_49; |
| 234 | | +end lm_50; |
| 235 | | |
| 236 | | -protected function lm_50 |
| 237 | | +protected function lm_51 |
| 238 | | input Tpl.Text in_txt; |
| 239 | | input list<DAE.Type> in_items; |
| 240 | | |
| 241 | | @@ -1954,12 +1996,12 @@ |
| 242 | | equation |
| 243 | | txt = dumpType(txt, i_ty); |
| 244 | | txt = Tpl.nextIter(txt); |
| 245 | | - txt = lm_50(txt, rest); |
| 246 | | + txt = lm_51(txt, rest); |
| 247 | | then txt; |
| 248 | | end match; |
| 249 | | -end lm_50; |
| 250 | | +end lm_51; |
| 251 | | |
| 252 | | -protected function lm_51 |
| 253 | | +protected function lm_52 |
| 254 | | input Tpl.Text in_txt; |
| 255 | | input list<DAE.Type> in_items; |
| 256 | | |
| 257 | | @@ -1981,10 +2023,10 @@ |
| 258 | | equation |
| 259 | | txt = dumpType(txt, i_ty); |
| 260 | | txt = Tpl.nextIter(txt); |
| 261 | | - txt = lm_51(txt, rest); |
| 262 | | + txt = lm_52(txt, rest); |
| 263 | | then txt; |
| 264 | | end match; |
| 265 | | -end lm_51; |
| 266 | | +end lm_52; |
| 267 | | |
| 268 | | public function dumpType |
| 269 | | input Tpl.Text in_txt; |
| 270 | | @@ -2071,7 +2113,7 @@ |
| 271 | | DAE.T_FUNCTION(funcArg = i_funcArg, funcResultType = i_funcResultType) ) |
| 272 | | equation |
| 273 | | l_arg__str = Tpl.pushIter(Tpl.emptyTxt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_STRING(", ")), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 274 | | - l_arg__str = lm_49(l_arg__str, i_funcArg); |
| 275 | | + l_arg__str = lm_50(l_arg__str, i_funcArg); |
| 276 | | l_arg__str = Tpl.popIter(l_arg__str); |
| 277 | | l_ret__str = dumpType(Tpl.emptyTxt, i_funcResultType); |
| 278 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("<function>(")); |
| 279 | | @@ -2096,7 +2138,7 @@ |
| 280 | | DAE.T_TUPLE(tupleType = i_tupleType) ) |
| 281 | | equation |
| 282 | | l_ty__str = Tpl.pushIter(Tpl.emptyTxt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_STRING(", ")), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 283 | | - l_ty__str = lm_50(l_ty__str, i_tupleType); |
| 284 | | + l_ty__str = lm_51(l_ty__str, i_tupleType); |
| 285 | | l_ty__str = Tpl.popIter(l_ty__str); |
| 286 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("(")); |
| 287 | | txt = Tpl.writeText(txt, l_ty__str); |
| 288 | | @@ -2121,7 +2163,7 @@ |
| 289 | | DAE.T_METATUPLE(types = i_types) ) |
| 290 | | equation |
| 291 | | l_ty__str = Tpl.pushIter(Tpl.emptyTxt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_STRING(", ")), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 292 | | - l_ty__str = lm_51(l_ty__str, i_types); |
| 293 | | + l_ty__str = lm_52(l_ty__str, i_types); |
| 294 | | l_ty__str = Tpl.popIter(l_ty__str); |
| 295 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("tuple<")); |
| 296 | | txt = Tpl.writeText(txt, l_ty__str); |
| 297 | | @@ -2222,7 +2264,7 @@ |
| 298 | | end match; |
| 299 | | end dumpFuncArg; |
| 300 | | |
| 301 | | -protected function lm_54 |
| 302 | | +protected function lm_55 |
| 303 | | input Tpl.Text in_txt; |
| 304 | | input DAE.Dimensions in_items; |
| 305 | | |
| 306 | | @@ -2244,10 +2286,10 @@ |
| 307 | | equation |
| 308 | | txt = dumpDimension(txt, i_dim); |
| 309 | | txt = Tpl.nextIter(txt); |
| 310 | | - txt = lm_54(txt, rest); |
| 311 | | + txt = lm_55(txt, rest); |
| 312 | | then txt; |
| 313 | | end match; |
| 314 | | -end lm_54; |
| 315 | | +end lm_55; |
| 316 | | |
| 317 | | public function dumpDimensions |
| 318 | | input Tpl.Text txt; |
| 319 | | @@ -2256,7 +2298,7 @@ |
| 320 | | output Tpl.Text out_txt; |
| 321 | | algorithm |
| 322 | | out_txt := Tpl.pushIter(txt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_STRING(", ")), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 323 | | - out_txt := lm_54(out_txt, a_dims); |
| 324 | | + out_txt := lm_55(out_txt, a_dims); |
| 325 | | out_txt := Tpl.popIter(out_txt); |
| 326 | | end dumpDimensions; |
| 327 | | |
| 328 | | @@ -2442,7 +2484,7 @@ |
| 329 | | end match; |
| 330 | | end dumpMatchCase; |
| 331 | | |
| 332 | | -protected function lm_60 |
| 333 | | +protected function lm_61 |
| 334 | | input Tpl.Text in_txt; |
| 335 | | input list<DAE.Pattern> in_items; |
| 336 | | |
| 337 | | @@ -2464,10 +2506,10 @@ |
| 338 | | equation |
| 339 | | txt = dumpPattern(txt, i_pat); |
| 340 | | txt = Tpl.nextIter(txt); |
| 341 | | - txt = lm_60(txt, rest); |
| 342 | | + txt = lm_61(txt, rest); |
| 343 | | then txt; |
| 344 | | end match; |
| 345 | | -end lm_60; |
| 346 | | +end lm_61; |
| 347 | | |
| 348 | | public function dumpPatterns |
| 349 | | input Tpl.Text txt; |
| 350 | | @@ -2476,11 +2518,11 @@ |
| 351 | | output Tpl.Text out_txt; |
| 352 | | algorithm |
| 353 | | out_txt := Tpl.pushIter(txt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_STRING(", ")), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 354 | | - out_txt := lm_60(out_txt, a_patterns); |
| 355 | | + out_txt := lm_61(out_txt, a_patterns); |
| 356 | | out_txt := Tpl.popIter(out_txt); |
| 357 | | end dumpPatterns; |
| 358 | | |
| 359 | | -protected function lm_62 |
| 360 | | +protected function lm_63 |
| 361 | | input Tpl.Text in_txt; |
| 362 | | input list<tuple<DAE.Pattern, String, DAE.Type>> in_items; |
| 363 | | |
| 364 | | @@ -2502,10 +2544,10 @@ |
| 365 | | equation |
| 366 | | txt = dumpNamedPattern(txt, i_pat); |
| 367 | | txt = Tpl.nextIter(txt); |
| 368 | | - txt = lm_62(txt, rest); |
| 369 | | + txt = lm_63(txt, rest); |
| 370 | | then txt; |
| 371 | | end match; |
| 372 | | -end lm_62; |
| 373 | | +end lm_63; |
| 374 | | |
| 375 | | public function dumpPattern |
| 376 | | input Tpl.Text in_txt; |
| 377 | | @@ -2586,7 +2628,7 @@ |
| 378 | | equation |
| 379 | | l_name__str = AbsynDumpTpl.dumpPath(Tpl.emptyTxt, i_name); |
| 380 | | l_pat__str = Tpl.pushIter(Tpl.emptyTxt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_STRING(", ")), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 381 | | - l_pat__str = lm_62(l_pat__str, i_patterns_1); |
| 382 | | + l_pat__str = lm_63(l_pat__str, i_patterns_1); |
| 383 | | l_pat__str = Tpl.popIter(l_pat__str); |
| 384 | | txt = Tpl.writeText(txt, l_name__str); |
| 385 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("(")); |
| 386 | | @@ -2655,7 +2697,7 @@ |
| 387 | | end match; |
| 388 | | end dumpNamedPattern; |
| 389 | | |
| 390 | | -protected function fun_65 |
| 391 | | +protected function fun_66 |
| 392 | | input Tpl.Text in_txt; |
| 393 | | input Boolean in_a_scalar; |
| 394 | | |
| 395 | | @@ -2678,9 +2720,9 @@ |
| 396 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("/* scalar */ ")); |
| 397 | | then txt; |
| 398 | | end match; |
| 399 | | -end fun_65; |
| 400 | | +end fun_66; |
| 401 | | |
| 402 | | -protected function fun_66 |
| 403 | | +protected function fun_67 |
| 404 | | input Tpl.Text in_txt; |
| 405 | | input Boolean in_mArg; |
| 406 | | input Boolean in_a_scalar; |
| 407 | | @@ -2702,12 +2744,12 @@ |
| 408 | | _, |
| 409 | | a_scalar ) |
| 410 | | equation |
| 411 | | - txt = fun_65(txt, a_scalar); |
| 412 | | + txt = fun_66(txt, a_scalar); |
| 413 | | then txt; |
| 414 | | end match; |
| 415 | | -end fun_66; |
| 416 | | +end fun_67; |
| 417 | | |
| 418 | | -protected function lm_67 |
| 419 | | +protected function lm_68 |
| 420 | | input Tpl.Text in_txt; |
| 421 | | input list<list<DAE.Exp>> in_items; |
| 422 | | input String in_a_stringDelimiter; |
| 423 | | @@ -2733,12 +2775,12 @@ |
| 424 | | equation |
| 425 | | txt = dumpExpList(txt, i_row, a_stringDelimiter, ", "); |
| 426 | | txt = Tpl.nextIter(txt); |
| 427 | | - txt = lm_67(txt, rest, a_stringDelimiter); |
| 428 | | + txt = lm_68(txt, rest, a_stringDelimiter); |
| 429 | | then txt; |
| 430 | | end match; |
| 431 | | -end lm_67; |
| 432 | | +end lm_68; |
| 433 | | |
| 434 | | -protected function fun_68 |
| 435 | | +protected function fun_69 |
| 436 | | input Tpl.Text in_txt; |
| 437 | | input Boolean in_mArg; |
| 438 | | input DAE.Type in_a_ty; |
| 439 | | @@ -2767,9 +2809,9 @@ |
| 440 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING(" */ ")); |
| 441 | | then txt; |
| 442 | | end match; |
| 443 | | -end fun_68; |
| 444 | | +end fun_69; |
| 445 | | |
| 446 | | -protected function fun_69 |
| 447 | | +protected function fun_70 |
| 448 | | input Tpl.Text in_txt; |
| 449 | | input Option<DAE.Exp> in_a_step; |
| 450 | | input DAE.Exp in_a_e; |
| 451 | | @@ -2796,9 +2838,9 @@ |
| 452 | | _ ) |
| 453 | | then txt; |
| 454 | | end match; |
| 455 | | -end fun_69; |
| 456 | | +end fun_70; |
| 457 | | |
| 458 | | -protected function fun_70 |
| 459 | | +protected function fun_71 |
| 460 | | input Tpl.Text in_txt; |
| 461 | | input Tpl.Text in_a_needs__paren; |
| 462 | | |
| 463 | | @@ -2819,9 +2861,9 @@ |
| 464 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("(")); |
| 465 | | then txt; |
| 466 | | end match; |
| 467 | | -end fun_70; |
| 468 | | +end fun_71; |
| 469 | | |
| 470 | | -protected function fun_71 |
| 471 | | +protected function fun_72 |
| 472 | | input Tpl.Text in_txt; |
| 473 | | input Tpl.Text in_a_needs__paren; |
| 474 | | |
| 475 | | @@ -2842,9 +2884,9 @@ |
| 476 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING(")")); |
| 477 | | then txt; |
| 478 | | end match; |
| 479 | | -end fun_71; |
| 480 | | +end fun_72; |
| 481 | | |
| 482 | | -protected function fun_72 |
| 483 | | +protected function fun_73 |
| 484 | | input Tpl.Text in_txt; |
| 485 | | input Tpl.Text in_a_needs__paren; |
| 486 | | |
| 487 | | @@ -2865,9 +2907,9 @@ |
| 488 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("(")); |
| 489 | | then txt; |
| 490 | | end match; |
| 491 | | -end fun_72; |
| 492 | | +end fun_73; |
| 493 | | |
| 494 | | -protected function fun_73 |
| 495 | | +protected function fun_74 |
| 496 | | input Tpl.Text in_txt; |
| 497 | | input Tpl.Text in_a_needs__paren; |
| 498 | | |
| 499 | | @@ -2888,9 +2930,9 @@ |
| 500 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING(")")); |
| 501 | | then txt; |
| 502 | | end match; |
| 503 | | -end fun_73; |
| 504 | | +end fun_74; |
| 505 | | |
| 506 | | -protected function fun_74 |
| 507 | | +protected function fun_75 |
| 508 | | input Tpl.Text in_txt; |
| 509 | | input Option<DAE.Exp> in_a_sz; |
| 510 | | input String in_a_stringDelimiter; |
| 511 | | @@ -2917,9 +2959,9 @@ |
| 512 | | _ ) |
| 513 | | then txt; |
| 514 | | end match; |
| 515 | | -end fun_74; |
| 516 | | +end fun_75; |
| 517 | | |
| 518 | | -protected function lm_75 |
| 519 | | +protected function lm_76 |
| 520 | | input Tpl.Text in_txt; |
| 521 | | input DAE.ReductionIterators in_items; |
| 522 | | input String in_a_stringDelimiter; |
| 523 | | @@ -2945,12 +2987,12 @@ |
| 524 | | equation |
| 525 | | txt = dumpReductionIterator(txt, i_it, a_stringDelimiter); |
| 526 | | txt = Tpl.nextIter(txt); |
| 527 | | - txt = lm_75(txt, rest, a_stringDelimiter); |
| 528 | | + txt = lm_76(txt, rest, a_stringDelimiter); |
| 529 | | then txt; |
| 530 | | end match; |
| 531 | | -end lm_75; |
| 532 | | +end lm_76; |
| 533 | | |
| 534 | | -protected function lm_76 |
| 535 | | +protected function lm_77 |
| 536 | | input Tpl.Text in_txt; |
| 537 | | input list<DAE.MatchCase> in_items; |
| 538 | | |
| 539 | | @@ -2972,10 +3014,10 @@ |
| 540 | | equation |
| 541 | | txt = dumpMatchCase(txt, i_c); |
| 542 | | txt = Tpl.nextIter(txt); |
| 543 | | - txt = lm_76(txt, rest); |
| 544 | | + txt = lm_77(txt, rest); |
| 545 | | then txt; |
| 546 | | end match; |
| 547 | | -end lm_76; |
| 548 | | +end lm_77; |
| 549 | | |
| 550 | | public function dumpExpCrefs |
| 551 | | input Tpl.Text in_txt; |
| 552 | | @@ -3198,7 +3240,7 @@ |
| 553 | | equation |
| 554 | | l_expl = dumpExpList(Tpl.emptyTxt, i_array, a_stringDelimiter, ", "); |
| 555 | | ret_10 = Config.typeinfo(); |
| 556 | | - txt = fun_66(txt, ret_10, i_scalar); |
| 557 | | + txt = fun_67(txt, ret_10, i_scalar); |
| 558 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("{")); |
| 559 | | txt = Tpl.writeText(txt, l_expl); |
| 560 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("}")); |
| 561 | | @@ -3209,10 +3251,10 @@ |
| 562 | | a_stringDelimiter ) |
| 563 | | equation |
| 564 | | l_mat__str = Tpl.pushIter(Tpl.emptyTxt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_STRING("}, {")), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 565 | | - l_mat__str = lm_67(l_mat__str, i_matrix, a_stringDelimiter); |
| 566 | | + l_mat__str = lm_68(l_mat__str, i_matrix, a_stringDelimiter); |
| 567 | | l_mat__str = Tpl.popIter(l_mat__str); |
| 568 | | ret_12 = Config.typeinfo(); |
| 569 | | - txt = fun_68(txt, ret_12, i_ty); |
| 570 | | + txt = fun_69(txt, ret_12, i_ty); |
| 571 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("{{")); |
| 572 | | txt = Tpl.writeText(txt, l_mat__str); |
| 573 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("}}")); |
| 574 | | @@ -3223,7 +3265,7 @@ |
| 575 | | _ ) |
| 576 | | equation |
| 577 | | l_start__str = dumpOperand(Tpl.emptyTxt, i_start, i_e, false); |
| 578 | | - l_step__str = fun_69(Tpl.emptyTxt, i_step, i_e); |
| 579 | | + l_step__str = fun_70(Tpl.emptyTxt, i_step, i_e); |
| 580 | | l_stop__str = dumpOperand(Tpl.emptyTxt, i_stop, i_e, false); |
| 581 | | txt = Tpl.writeText(txt, l_start__str); |
| 582 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING(":")); |
| 583 | | @@ -3256,8 +3298,8 @@ |
| 584 | | a_stringDelimiter ) |
| 585 | | equation |
| 586 | | l_needs__paren = parenthesizeSubExp(Tpl.emptyTxt, i_exp); |
| 587 | | - l_lparen = fun_70(Tpl.emptyTxt, l_needs__paren); |
| 588 | | - l_rparen = fun_71(Tpl.emptyTxt, l_needs__paren); |
| 589 | | + l_lparen = fun_71(Tpl.emptyTxt, l_needs__paren); |
| 590 | | + l_rparen = fun_72(Tpl.emptyTxt, l_needs__paren); |
| 591 | | l_exp__str = dumpExp(Tpl.emptyTxt, i_exp, a_stringDelimiter); |
| 592 | | l_sub__str = dumpExpList(Tpl.emptyTxt, i_sub, a_stringDelimiter, ", "); |
| 593 | | txt = Tpl.writeText(txt, l_lparen); |
| 594 | | @@ -3273,8 +3315,8 @@ |
| 595 | | a_stringDelimiter ) |
| 596 | | equation |
| 597 | | l_needs__paren = parenthesizeSubExp(Tpl.emptyTxt, i_exp); |
| 598 | | - l_lparen = fun_72(Tpl.emptyTxt, l_needs__paren); |
| 599 | | - l_rparen = fun_73(Tpl.emptyTxt, l_needs__paren); |
| 600 | | + l_lparen = fun_73(Tpl.emptyTxt, l_needs__paren); |
| 601 | | + l_rparen = fun_74(Tpl.emptyTxt, l_needs__paren); |
| 602 | | l_exp__str = dumpExp(Tpl.emptyTxt, i_exp, a_stringDelimiter); |
| 603 | | txt = Tpl.writeText(txt, l_lparen); |
| 604 | | txt = Tpl.writeText(txt, l_exp__str); |
| 605 | | @@ -3289,7 +3331,7 @@ |
| 606 | | a_stringDelimiter ) |
| 607 | | equation |
| 608 | | l_exp__str = dumpExp(Tpl.emptyTxt, i_exp, a_stringDelimiter); |
| 609 | | - l_dim__str = fun_74(Tpl.emptyTxt, i_sz, a_stringDelimiter); |
| 610 | | + l_dim__str = fun_75(Tpl.emptyTxt, i_sz, a_stringDelimiter); |
| 611 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("size(")); |
| 612 | | txt = Tpl.writeText(txt, l_exp__str); |
| 613 | | txt = Tpl.writeText(txt, l_dim__str); |
| 614 | | @@ -3328,7 +3370,7 @@ |
| 615 | | l_name__str = AbsynDumpTpl.dumpPathNoQual(Tpl.emptyTxt, i_name); |
| 616 | | l_exp__str = dumpExp(Tpl.emptyTxt, i_expr, a_stringDelimiter); |
| 617 | | l_iter__str = Tpl.pushIter(Tpl.emptyTxt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_STRING(", ")), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 618 | | - l_iter__str = lm_75(l_iter__str, i_iterators, a_stringDelimiter); |
| 619 | | + l_iter__str = lm_76(l_iter__str, i_iterators, a_stringDelimiter); |
| 620 | | l_iter__str = Tpl.popIter(l_iter__str); |
| 621 | | txt = Tpl.writeText(txt, l_name__str); |
| 622 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING("(")); |
| 623 | | @@ -3406,7 +3448,7 @@ |
| 624 | | l_match__ty = dumpMatchType(Tpl.emptyTxt, i_matchType); |
| 625 | | l_inputs__str = dumpExpList(Tpl.emptyTxt, i_inputs, a_stringDelimiter, ", "); |
| 626 | | l_case__str = Tpl.pushIter(Tpl.emptyTxt, Tpl.ITER_OPTIONS(0, NONE(), SOME(Tpl.ST_NEW_LINE()), 0, 0, Tpl.ST_NEW_LINE(), 0, Tpl.ST_NEW_LINE())); |
| 627 | | - l_case__str = lm_76(l_case__str, i_cases); |
| 628 | | + l_case__str = lm_77(l_case__str, i_cases); |
| 629 | | l_case__str = Tpl.popIter(l_case__str); |
| 630 | | txt = Tpl.writeText(txt, l_match__ty); |
| 631 | | txt = Tpl.writeTok(txt, Tpl.ST_STRING(" (")); |
