From 2eb32cd5c0288675b1d67bf3a00465364cff6418 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Wed, 27 Nov 2013 00:40:48 +0000 Subject: store y pos in box to make calculation easier to read --- (limited to 'samples') diff --git a/samples/math-prime-factors.ta b/samples/math-prime-factors.ta index 38b2674..b13ae53 100644 --- a/samples/math-prime-factors.ta +++ b/samples/math-prime-factors.ta @@ -1,7 +1,7 @@ -[[0, ["start", 2.0], 120, 180, [null, 469]], +[[0, ["start", 2.0], 200, 72, [null, 468]], [1, ["while", 0], 223, 532, [4, 5, 11, 151]], -[2, ["storein", 0], 139, 714, [261, 3, 268, 272]], -[3, ["string", "nn"], 207, 714, [2, null]], +[2, ["storein", 0], 219, 606, [261, 3, 268, 272]], +[3, ["string", "nn"], 287, 606, [2, null]], [4, ["vspace", 0], 223, 490, [149, 1]], [5, ["greater2", 0], 279, 498, [1, 6, 8, null]], [6, "box", 335, 498, [5, 7, null]], @@ -11,15 +11,15 @@ [10, ["string", "get next prime factor"], 398, 192, [9, null]], [11, "stack", 241, 598, [1, 12, null]], [12, ["string", "get next prime factor"], 299, 598, [11, null]], -[13, "box", 546, 1058, [87, 14, null]], -[14, ["string", "factor"], 601, 1058, [13, null]], -[15, "box", 616, 1142, [19, 16, null]], -[16, ["string", "nn"], 671, 1142, [15, null]], -[17, ["storein", 0], 478, 1100, [87, 18, 19, null]], -[18, ["string", "nn"], 546, 1100, [17, null]], -[19, ["division2", 0], 546, 1142, [17, 15, 20]], -[20, "box", 640, 1184, [19, 21, null]], -[21, ["string", "factor"], 695, 1184, [20, null]], +[13, "box", 511, 1034, [87, 14, null]], +[14, ["string", "factor"], 566, 1034, [13, null]], +[15, "box", 581, 1118, [19, 16, null]], +[16, ["string", "nn"], 636, 1118, [15, null]], +[17, ["storein", 0], 443, 1076, [87, 18, 19, null]], +[18, ["string", "nn"], 511, 1076, [17, null]], +[19, ["division2", 0], 511, 1118, [17, 15, 20]], +[20, "box", 605, 1160, [19, 21, null]], +[21, ["string", "factor"], 660, 1160, [20, null]], [22, ["storein", 0], 341, 310, [141, 23, 24, null]], [23, ["string", "factor"], 409, 310, [22, null]], [24, ["number", 2], 409, 352, [22, null]], @@ -71,9 +71,9 @@ [70, ["vspace", 20], 341, 832, [31, 42]], [71, ["vspace", 0], 323, 724, [76, 31]], [72, ["greater2", 0], 397, 1340, [65, 67, 66, null]], -[73, ["storein", 0], 478, 932, [351, 74, 75, 87]], -[74, ["string", "new factor"], 546, 932, [73, null]], -[75, ["number", 1], 546, 974, [73, null]], +[73, ["storein", 0], 443, 908, [351, 74, 75, 87]], +[74, ["string", "new factor"], 511, 908, [73, null]], +[75, ["number", 1], 511, 950, [73, null]], [76, ["storein", 0], 323, 640, [36, 77, 78, 71]], [77, ["string", "new factor"], 391, 640, [76, null]], [78, ["number", 0], 391, 682, [76, null]], @@ -85,19 +85,19 @@ [84, ["vspace", 20], 323, 1184, [31, 79]], [85, "sandwichclampcollapsed", 340, 234, [9, 141, null]], [86, "sandwichclampcollapsed", 460, 294, [59, 227, null]], -[87, ["storein", 0], 478, 1016, [73, 96, 13, 17]], -[88, ["number", 1], 600, 496, [89, null]], -[89, ["plus2", 0], 546, 454, [98, 94, 88]], -[90, ["vspace", 20], 478, 496, [98, 345]], +[87, ["storein", 0], 443, 992, [73, 96, 13, 17]], +[88, ["number", 1], 565, 472, [89, null]], +[89, ["plus2", 0], 511, 430, [98, 94, 88]], +[90, ["vspace", 20], 443, 472, [98, 345]], [91, ["storein", 0], 223, 364, [286, 92, 93, 149]], [92, ["string", "count"], 291, 364, [91, null]], [93, ["number", 0], 291, 406, [91, null]], -[94, "box", 600, 454, [89, 95, null]], -[95, ["string", "count"], 655, 454, [94, null]], -[96, "box", 546, 1016, [87, 97, null]], -[97, ["string", "count"], 601, 1016, [96, null]], -[98, ["storein", 0], 478, 412, [232, 99, 89, 90]], -[99, ["string", "count"], 546, 412, [98, null]], +[94, "box", 565, 430, [89, 95, null]], +[95, ["string", "count"], 620, 430, [94, null]], +[96, "box", 511, 992, [87, 97, null]], +[97, ["string", "count"], 566, 992, [96, null]], +[98, ["storein", 0], 443, 388, [232, 99, 89, 90]], +[99, ["string", "count"], 511, 388, [98, null]], [100, ["storein", 0], 223, 784, [153, 101, 102, 385]], [101, ["string", "radius"], 291, 784, [100, null]], [102, ["number", 400], 291, 826, [100, null]], @@ -227,12 +227,12 @@ [224, "box", 1064, 686, [217, 225, null]], [225, ["string", "level"], 1119, 686, [224, null]], [226, ["vspace", 0], 923, 728, [220, 160]], -[227, "comment", 478, 328, [86, 228, 232]], -[228, ["plus2", 0], 561, 328, [227, 229, 230]], -[229, ["string", "factor "], 615, 328, [228, null]], -[230, "box", 615, 370, [228, 231, null]], -[231, ["string", "factor"], 670, 370, [230, null]], -[232, ["vspace", 0], 478, 370, [227, 98]], +[227, "comment", 443, 304, [86, 228, 232]], +[228, ["plus2", 0], 526, 304, [227, 229, 230]], +[229, ["string", "factor "], 580, 304, [228, null]], +[230, "box", 580, 346, [228, 231, null]], +[231, ["string", "factor"], 635, 346, [230, null]], +[232, ["vspace", 0], 443, 346, [227, 98]], [233, ["number", 1], 603, 900, [236, null]], [234, "box", 712, 984, [187, 235, null]], [235, ["string", "level"], 767, 984, [234, null]], @@ -252,108 +252,108 @@ [249, "back", 703, 770, [108, 250, 117]], [250, ["number", 1], 761, 770, [249, null]], [251, "setpensize", 223, 1118, [397, 396, 293]], -[252, ["division2", 0], 345, 994, [470, 283, 281]], +[252, ["division2", 0], 345, 994, [469, 283, 281]], [253, "sandwichclampcollapsed", 320, 634, [243, 372, null]], [254, "sandwichclampcollapsed", 180, 574, [239, 204, null]], -[255, ["while", 168], 121, 522, [265, 259, 261, null]], -[256, ["storein", 0], 121, 396, [285, 257, 258, 265]], -[257, ["string", "number"], 189, 396, [256, null]], -[258, ["number", 2], 189, 438, [256, null]], -[259, ["less2", 0], 177, 488, [255, 266, 260, null]], -[260, ["number", 101], 257, 530, [259, null]], -[261, "fillscreen2", 139, 588, [255, 262, 264, 263, 2]], -[262, ["number", 60], 221, 588, [261, null]], -[263, ["number", 100], 221, 672, [261, null]], -[264, "black", 221, 630, [261, null]], -[265, ["vspace", 0], 121, 480, [256, 255]], -[266, "box", 233, 488, [259, 267, null]], -[267, ["string", "number"], 288, 488, [266, null]], -[268, "box", 207, 756, [2, 269, null]], -[269, ["string", "number"], 262, 756, [268, null]], +[255, ["while", 168], 201, 414, [265, 259, 261, null]], +[256, ["storein", 0], 201, 288, [285, 257, 258, 265]], +[257, ["string", "number"], 269, 288, [256, null]], +[258, ["number", 2], 269, 330, [256, null]], +[259, ["less2", 0], 257, 380, [255, 266, 260, null]], +[260, ["number", 101], 337, 422, [259, null]], +[261, "fillscreen2", 219, 480, [255, 262, 264, 263, 2]], +[262, ["number", 60], 301, 480, [261, null]], +[263, ["number", 100], 301, 564, [261, null]], +[264, "black", 301, 522, [261, null]], +[265, ["vspace", 0], 201, 372, [256, 255]], +[266, "box", 313, 380, [259, 267, null]], +[267, ["string", "number"], 368, 380, [266, null]], +[268, "box", 287, 648, [2, 269, null]], +[269, ["string", "number"], 342, 648, [268, null]], [270, "hat", 240, 300, [null, 271, 286]], [271, ["string", "action"], 298, 312, [270, null]], -[272, "stack", 139, 798, [2, 273, 461]], -[273, ["string", "action"], 197, 798, [272, null]], -[274, "wait", 981, 286, [463, 465, null]], -[275, ["storein", 0], 139, 882, [461, 276, 280, null]], -[276, ["string", "number"], 207, 882, [275, null]], -[277, ["number", 1], 261, 966, [280, null]], -[278, "box", 261, 924, [280, 279, null]], -[279, ["string", "number"], 316, 924, [278, null]], -[280, ["plus2", 0], 207, 924, [275, 278, 277]], +[272, "stack", 219, 690, [2, 273, 461]], +[273, ["string", "action"], 277, 690, [272, null]], +[274, "wait", 1064, 422, [479, 465, null]], +[275, ["storein", 0], 219, 774, [461, 276, 280, null]], +[276, ["string", "number"], 287, 774, [275, null]], +[277, ["number", 1], 341, 858, [280, null]], +[278, "box", 341, 816, [280, 279, null]], +[279, ["string", "number"], 396, 816, [278, null]], +[280, ["plus2", 0], 287, 816, [275, 278, 277]], [281, "box", 439, 1036, [252, 282, null]], [282, ["string", "number"], 494, 1036, [281, null]], [283, "box", 415, 994, [252, 284, null]], [284, ["string", "radius"], 470, 994, [283, null]], -[285, ["forever", 273], 103, 362, [381, 256, null]], +[285, ["forever", 273], 183, 254, [381, 256, null]], [286, "sandwichclampcollapsed", 240, 354, [270, 91, null]], -[287, "penup", 678, 352, [290, 298]], -[288, "pendown", 678, 478, [298, 305]], -[289, "leftpos", 736, 394, [298, null]], -[290, "setcolor", 678, 310, [379, 291, 287]], -[291, "white", 755, 310, [290, null]], +[287, "penup", 643, 328, [290, 298]], +[288, "pendown", 643, 454, [298, 305]], +[289, "leftpos", 701, 370, [298, null]], +[290, "setcolor", 643, 286, [379, 291, 287]], +[291, "white", 720, 286, [290, null]], [292, "red", 300, 1160, [293, null]], [293, "setcolor", 223, 1160, [251, 292, 407]], [294, "hat", 660, 180, [null, 295, 318]], [295, ["string", "display factors"], 718, 192, [294, null]], [296, "stack", 223, 1286, [137, 297, 456]], [297, ["string", "display factors"], 281, 1286, [296, null]], -[298, ["setxy2", 0], 678, 394, [287, 289, 384, 288]], -[299, ["number", 100], 833, 478, [384, null]], -[300, "show", 696, 628, [304, 309, 327]], -[301, ["string", " prime"], 862, 712, [308, null]], -[302, ["equal2", 0], 734, 528, [304, 306, 303, null]], -[303, ["number", 1], 790, 570, [302, null]], +[298, ["setxy2", 0], 643, 370, [287, 289, 384, 288]], +[299, ["number", 100], 798, 454, [384, null]], +[300, "show", 661, 604, [304, 309, 327]], +[301, ["string", " prime"], 827, 688, [308, null]], +[302, ["equal2", 0], 699, 504, [304, 306, 303, null]], +[303, ["number", 1], 755, 546, [302, null]], [304, ["ifelse", [41, 0]], -678, 562, [305, 302, 300, 326, null]], -[305, ["vspace", 0], 678, 520, [288, 304]], -[306, "box", 790, 528, [302, 307, null]], -[307, ["string", "count"], 845, 528, [306, null]], -[308, ["plus2", 0], 808, 670, [309, 472, 301]], -[309, ["plus2", 0], 754, 628, [300, 310, 308]], -[310, ["string", " "], 808, 628, [309, null]], -[311, "box", 916, 670, [472, 312, null]], -[312, ["string", "number"], 971, 670, [311, null]], +643, 538, [305, 302, 300, 326, null]], +[305, ["vspace", 0], 643, 496, [288, 304]], +[306, "box", 755, 504, [302, 307, null]], +[307, ["string", "count"], 810, 504, [306, null]], +[308, ["plus2", 0], 773, 646, [309, 471, 301]], +[309, ["plus2", 0], 719, 604, [300, 310, 308]], +[310, ["string", " "], 773, 604, [309, null]], +[311, "box", 881, 646, [471, 312, null]], +[312, ["string", "number"], 936, 646, [311, null]], [313, ["setxy2", 0], 763, 846, [316, 314, 315, 317]], [314, ["number", 0], 821, 846, [313, null]], [315, ["number", 0], 821, 888, [313, null]], [316, "penup", 763, 804, [437, 313]], [317, "pendown", 763, 930, [313, null]], [318, "sandwichclampcollapsed", 660, 234, [294, 379, null]], -[319, ["plus2", 0], 754, 770, [326, 320, 321]], -[320, ["string", " "], 808, 770, [319, null]], -[321, ["plus2", 0], 808, 812, [319, 473, 325]], -[322, "box", 916, 812, [473, 323, null]], -[323, ["string", "number"], 971, 812, [322, null]], -[324, ["string", " = "], 916, 854, [325, null]], -[325, ["plus2", 0], 862, 854, [321, 324, 330]], -[326, "show", 696, 770, [304, 319, null]], -[327, ["vspace", 20], 696, 670, [300, null]], -[328, ["storein", 0], 496, 644, [345, 329, 334, 350]], -[329, ["string", "factor string"], 564, 644, [328, null]], -[330, "box", 916, 896, [325, 331, null]], -[331, ["string", "factor string"], 971, 896, [330, null]], -[332, "box", 618, 830, [342, 333, null]], -[333, ["string", "factor string"], 673, 830, [332, null]], -[334, ["plus2", 0], 564, 686, [328, 335, 474]], -[335, ["string", ""], 618, 686, [334, null]], -[336, ["string", " x "], 672, 872, [337, null]], -[337, ["plus2", 0], 618, 872, [342, 336, 475]], -[338, "box", 672, 728, [474, 339, null]], -[339, ["string", "factor"], 727, 728, [338, null]], -[340, "box", 726, 914, [475, 341, null]], -[341, ["string", "factor"], 781, 914, [340, null]], -[342, ["plus2", 0], 564, 830, [343, 332, 337]], -[343, ["storein", 0], 496, 788, [345, 344, 342, null]], -[344, ["string", "factor string"], 564, 788, [343, null]], +[319, ["plus2", 0], 719, 746, [326, 320, 321]], +[320, ["string", " "], 773, 746, [319, null]], +[321, ["plus2", 0], 773, 788, [319, 472, 325]], +[322, "box", 881, 788, [472, 323, null]], +[323, ["string", "number"], 936, 788, [322, null]], +[324, ["string", " = "], 881, 830, [325, null]], +[325, ["plus2", 0], 827, 830, [321, 324, 330]], +[326, "show", 661, 746, [304, 319, null]], +[327, ["vspace", 20], 661, 646, [300, null]], +[328, ["storein", 0], 461, 620, [345, 329, 334, 350]], +[329, ["string", "factor string"], 529, 620, [328, null]], +[330, "box", 881, 872, [325, 331, null]], +[331, ["string", "factor string"], 936, 872, [330, null]], +[332, "box", 583, 806, [342, 333, null]], +[333, ["string", "factor string"], 638, 806, [332, null]], +[334, ["plus2", 0], 529, 662, [328, 335, 473]], +[335, ["string", ""], 583, 662, [334, null]], +[336, ["string", " x "], 637, 848, [337, null]], +[337, ["plus2", 0], 583, 848, [342, 336, 474]], +[338, "box", 637, 704, [473, 339, null]], +[339, ["string", "factor"], 692, 704, [338, null]], +[340, "box", 691, 890, [474, 341, null]], +[341, ["string", "factor"], 746, 890, [340, null]], +[342, ["plus2", 0], 529, 806, [343, 332, 337]], +[343, ["storein", 0], 461, 764, [345, 344, 342, null]], +[344, ["string", "factor string"], 529, 764, [343, null]], [345, ["ifelse", [42, 21]], -478, 578, [90, 349, 328, 343, 351]], -[346, "box", 590, 544, [349, 347, null]], -[347, ["string", "count"], 645, 544, [346, null]], -[348, ["number", 1], 590, 586, [349, null]], -[349, ["equal2", 0], 534, 544, [345, 346, 348, null]], -[350, ["vspace", 0], 496, 728, [328, null]], -[351, ["vspace", 0], 478, 890, [345, 73]], +443, 554, [90, 349, 328, 343, 351]], +[346, "box", 555, 520, [349, 347, null]], +[347, ["string", "count"], 610, 520, [346, null]], +[348, ["number", 1], 555, 562, [349, null]], +[349, ["equal2", 0], 499, 520, [345, 346, 348, null]], +[350, ["vspace", 0], 461, 704, [328, null]], +[351, ["vspace", 0], 443, 866, [345, 73]], [352, "seth", 343, 424, [215, 358, 360]], [353, ["number", 45], 455, 466, [358, null]], [354, "heading", 455, 424, [358, null]], @@ -363,7 +363,7 @@ [358, ["plus2", 0], 401, 424, [352, 354, 353]], [359, ["minus2", 0], 401, 634, [355, 357, 356]], [360, ["vspace", 0], 343, 466, [352, 241]], -[361, "sandwichclampcollapsed", 120, 268, [469, 409, null]], +[361, "sandwichclampcollapsed", 200, 160, [468, 409, null]], [362, ["storein", 20], 163, 708, [204, 367, 377, 165]], [363, ["string", "radius"], 285, 708, [367, null]], [364, "box", 371, 686, [372, 368, null]], @@ -381,18 +381,18 @@ [376, ["less2", 0], 219, 964, [375, 170, 394, null]], [377, "box", 231, 790, [362, 378, null]], [378, ["string", "radius"], 286, 790, [377, null]], -[379, "seth", 678, 268, [318, 380, 290]], -[380, ["number", 0], 736, 268, [379, null]], -[381, "setscale", 103, 320, [409, 382, 285]], -[382, ["number", 75], 180, 320, [381, null]], -[383, "toppos", 809, 436, [384, null]], -[384, ["minus2", 0], 736, 436, [298, 383, 299]], +[379, "seth", 643, 244, [318, 380, 290]], +[380, ["number", 0], 701, 244, [379, null]], +[381, "setscale", 183, 212, [409, 382, 285]], +[382, ["number", 75], 260, 212, [381, null]], +[383, "toppos", 774, 412, [384, null]], +[384, ["minus2", 0], 701, 412, [298, 383, 299]], [385, "seth", 223, 868, [100, 386, 389]], [386, ["random", 0], 281, 868, [385, 387, 388, null]], [387, ["number", 0], 367, 868, [386, null]], [388, ["number", 180], 367, 910, [386, null]], [389, ["vspace", 0], 223, 910, [385, 390]], -[390, ["storein", 0], 223, 952, [389, 391, 470, 397]], +[390, ["storein", 0], 223, 952, [389, 391, 469, 397]], [391, ["string", "pensize"], 291, 952, [390, null]], [392, "box", 805, 644, [398, 393, null]], [393, ["string", "pensize"], 860, 644, [392, null]], @@ -411,14 +411,14 @@ [406, ["number", 100], 776, 686, [405, null]], [407, "setgray", 223, 1202, [293, 408, 137]], [408, ["number", 0], 296, 1202, [407, null]], -[409, "clean", 103, 278, [361, 381]], -[410, "mousey", 1391, 328, [414, null]], -[411, "height", 1461, 370, [412, null]], -[412, ["division2", 0], 1391, 370, [414, 411, 413]], -[413, ["number", 2], 1485, 412, [412, null]], -[414, ["plus2", 0], 1337, 328, [415, 410, 412]], -[415, ["division2", 0], 1243, 286, [467, 416, 414]], -[416, "height", 1313, 286, [415, null]], +[409, "clean", 183, 170, [361, 381]], +[410, "mousey", 1186, 298, [414, null]], +[411, "height", 1256, 340, [412, null]], +[412, ["division2", 0], 1186, 340, [414, 411, 413]], +[413, ["number", 2], 1280, 382, [412, null]], +[414, ["plus2", 0], 1132, 298, [475, 410, 412]], +[415, ["division2", 0], 1192, 422, [465, 416, 477]], +[416, "height", 1262, 422, [415, null]], [417, "toppos", 894, 428, [427, null]], [418, "bottompos", 875, 678, [438, null]], [419, "rightpos", 894, 346, [426, null]], @@ -461,20 +461,25 @@ [456, "stack", 223, 1328, [296, 457, 247]], [457, ["string", "display scale"], 281, 1328, [456, null]], [458, "sandwichclampcollapsed", 780, 294, [454, 428, null]], -[459, "hat", 980, 180, [null, 460, 468]], -[460, ["string", "pause"], 1038, 192, [459, null]], -[461, "stack", 139, 840, [272, 462, 275]], -[462, ["string", "pause"], 197, 840, [461, null]], -[463, ["repeat", 0], 963, 244, [468, 464, 274, null]], -[464, ["number", 10], 1022, 244, [463, null]], -[465, ["division2", 0], 1039, 286, [274, 467, 466]], -[466, ["number", 10], 1133, 328, [465, null]], -[467, ["identity2", 40], 1109, 286, [465, 415]], -[468, "sandwichclampcollapsed", 980, 234, [459, 463, null]], -[469, "fullscreen", 120, 226, [0, 361]], -[470, ["product2", 20], 291, 994, [390, 252, 471]], -[471, ["number", 2], 345, 1076, [470, null]], -[472, "int", 862, 670, [308, 311]], -[473, "int", 862, 812, [321, 322]], -[474, "int", 618, 728, [334, 338]], -[475, "int", 672, 914, [337, 340]]] +[459, "hat", 1028, 126, [null, 460, 467]], +[460, ["string", "pause"], 1086, 138, [459, null]], +[461, "stack", 219, 732, [272, 462, 275]], +[462, ["string", "pause"], 277, 732, [461, null]], +[463, ["repeat", 83], 1046, 214, [467, 464, 475, null]], +[464, ["number", 10], 1105, 214, [463, null]], +[465, ["division2", 20], 1122, 422, [274, 415, 466]], +[466, ["number", 10], 1216, 504, [465, null]], +[467, "sandwichclampcollapsed", 1028, 180, [459, 463, null]], +[468, "fullscreen", 200, 118, [0, 361]], +[469, ["product2", 20], 291, 994, [390, 252, 470]], +[470, ["number", 2], 345, 1076, [469, null]], +[471, "int", 827, 646, [308, 311]], +[472, "int", 827, 788, [321, 322]], +[473, "int", 583, 704, [334, 338]], +[474, "int", 637, 890, [337, 340]], +[475, ["storein", 0], 1064, 256, [463, 476, 414, 479]], +[476, ["string", "yy"], 1132, 256, [475, null]], +[477, "box", 1286, 464, [415, 478, null]], +[478, ["string", "yy"], 1341, 464, [477, null]], +[479, ["vspace", 20], 1064, 340, [475, 274]], +[-1, ["turtle", "Yertle"], 0.0, 0.0, 0.0, 0, 50, 5]] \ No newline at end of file -- cgit v0.9.1