diff --git a/benchmarks/results.Ikarus-Scheme-r6rs b/benchmarks/results.Ikarus-Scheme-r6rs index ab1de40..8ad1c04 100644 --- a/benchmarks/results.Ikarus-Scheme-r6rs +++ b/benchmarks/results.Ikarus-Scheme-r6rs @@ -1,6 +1,6 @@ **************************** -Benchmarking Ikarus-Scheme-r6rs on Sat Jan 20 00:42:10 EST 2007 under Darwin adsl-75-19-180-26.dsl.bltnin.sbcglobal.net 8.8.3 Darwin Kernel Version 8.8.3: Wed Oct 18 21:57:10 PDT 2006; root:xnu-792.15.4.obj~4/RELEASE_I386 i386 i386 +Benchmarking Ikarus-Scheme-r6rs on Sat Jan 20 16:21:46 EST 2007 under Darwin 10-231-80-30.dhcp-bl.indiana.edu 8.8.3 Darwin Kernel Version 8.8.3: Wed Oct 18 21:57:10 PDT 2006; root:xnu-792.15.4.obj~4/RELEASE_I386 i386 i386 Testing boyer under Ikarus-Scheme-r6rs Compiling... @@ -11,9 +11,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 17 collections - 1.001s user time - 0.007s system time - 1.009s real time + 1.019s real 1.010s user 0.007s sys 72832056 bytes allocated Testing browse under Ikarus-Scheme-r6rs @@ -25,9 +23,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 151 collections - 2.512s user time - 0.030s system time - 2.544s real time + 2.551s real 2.519s user 0.031s sys 633609656 bytes allocated Testing cpstak under Ikarus-Scheme-r6rs @@ -39,9 +35,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 243 collections - 2.584s user time - 0.038s system time - 2.623s real time + 2.575s real 2.528s user 0.042s sys 1017728056 bytes allocated Testing ctak under Ikarus-Scheme-r6rs @@ -53,9 +47,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 127 collections - 1.097s user time - 0.212s system time - 1.310s real time + 1.329s real 1.109s user 0.219s sys 534317320 bytes allocated Testing dderiv under Ikarus-Scheme-r6rs @@ -67,9 +59,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 248 collections - 1.440s user time - 0.012s system time - 1.453s real time + 1.488s real 1.469s user 0.013s sys 1040000056 bytes allocated Testing deriv under Ikarus-Scheme-r6rs @@ -81,9 +71,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 187 collections - 0.961s user time - 0.012s system time - 0.974s real time + 0.991s real 0.979s user 0.012s sys 784000056 bytes allocated Testing destruc under Ikarus-Scheme-r6rs @@ -95,9 +83,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 61 collections - 3.251s user time - 0.015s system time - 3.267s real time + 3.282s real 3.258s user 0.017s sys 257444056 bytes allocated Testing diviter under Ikarus-Scheme-r6rs @@ -109,9 +95,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 191 collections - 1.935s user time - 0.011s system time - 1.947s real time + 1.948s real 1.935s user 0.012s sys 800000056 bytes allocated Testing divrec under Ikarus-Scheme-r6rs @@ -123,9 +107,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 191 collections - 1.969s user time - 0.017s system time - 1.992s real time + 1.975s real 1.962s user 0.012s sys 800000056 bytes allocated Testing puzzle under Ikarus-Scheme-r6rs @@ -137,9 +119,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 17 collections - 4.314s user time - 0.011s system time - 4.330s real time + 4.370s real 4.357s user 0.011s sys 70742488 bytes allocated Testing takl under Ikarus-Scheme-r6rs @@ -151,9 +131,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): no collections - 1.515s user time - 0.000s system time - 1.520s real time + 1.519s real 1.518s user 0.000s sys 48 bytes allocated Testing triangl under Ikarus-Scheme-r6rs @@ -165,9 +143,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): no collections - 5.125s user time - 0.002s system time - 5.132s real time + 5.333s real 5.332s user 0.001s sys 930048 bytes allocated Testing fft under Ikarus-Scheme-r6rs @@ -188,9 +164,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): no collections - 6.944s user time - 0.001s system time - 6.946s real time + 6.741s real 6.732s user 0.002s sys 48 bytes allocated Testing fibfp under Ikarus-Scheme-r6rs @@ -229,9 +203,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): no collections - 4.625s user time - 0.005s system time - 4.633s real time + 4.222s real 4.215s user 0.001s sys 80048 bytes allocated Testing sumfp under Ikarus-Scheme-r6rs @@ -252,9 +224,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): no collections - 3.766s user time - 0.001s system time - 3.773s real time + 3.696s real 3.694s user 0.000s sys 48 bytes allocated Testing ack under Ikarus-Scheme-r6rs @@ -266,9 +236,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): no collections - 0.499s user time - 0.000s system time - 0.499s real time + 0.522s real 0.522s user 0.000s sys 48 bytes allocated Testing array1 under Ikarus-Scheme-r6rs @@ -280,9 +248,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 40 collections - 2.020s user time - 0.035s system time - 2.056s real time + 2.071s real 2.035s user 0.035s sys 160005672 bytes allocated Testing cat under Ikarus-Scheme-r6rs @@ -294,9 +260,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): no collections - 0.175s user time - 0.039s system time - 0.214s real time + 0.211s real 0.174s user 0.036s sys 34520 bytes allocated Testing string under Ikarus-Scheme-r6rs @@ -308,9 +272,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 10 collections - 0.292s user time - 0.010s system time - 0.303s real time + 0.303s real 0.292s user 0.010s sys 31464952 bytes allocated Testing sum1 under Ikarus-Scheme-r6rs @@ -331,9 +293,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): no collections - 5.242s user time - 0.001s system time - 5.244s real time + 5.562s real 5.560s user 0.001s sys 64 bytes allocated Testing tail under Ikarus-Scheme-r6rs @@ -345,9 +305,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 18 collections - 0.478s user time - 0.082s system time - 0.560s real time + 0.578s real 0.499s user 0.078s sys 77128368 bytes allocated Testing wc under Ikarus-Scheme-r6rs @@ -359,9 +317,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): no collections - 0.432s user time - 0.005s system time - 0.438s real time + 0.341s real 0.335s user 0.005s sys 12960 bytes allocated Testing conform under Ikarus-Scheme-r6rs @@ -373,12 +329,8 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 38 collections - 1.360s user time - 0.015s system time - 1.376s real time + 1.387s real 1.371s user 0.015s sys 162415416 bytes allocated -Error in top-level-value: char-downcase is unbound. -> Testing dynamic under Ikarus-Scheme-r6rs Compiling... @@ -389,9 +341,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 11 collections - 0.508s user time - 0.012s system time - 0.520s real time + 0.525s real 0.512s user 0.012s sys 44168776 bytes allocated Testing earley under Ikarus-Scheme-r6rs @@ -412,9 +362,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 79 collections - 1.333s user time - 0.136s system time - 1.470s real time + 1.440s real 1.301s user 0.138s sys 334408904 bytes allocated Testing graphs under Ikarus-Scheme-r6rs @@ -426,9 +374,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 189 collections - 2.249s user time - 0.045s system time - 2.295s real time + 2.294s real 2.248s user 0.045s sys 790269656 bytes allocated Testing lattice under Ikarus-Scheme-r6rs @@ -440,9 +386,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 91 collections - 1.670s user time - 0.023s system time - 1.697s real time + 1.633s real 1.609s user 0.023s sys 381967088 bytes allocated Testing matrix under Ikarus-Scheme-r6rs @@ -462,7 +406,7 @@ Ikarus Scheme (Build 2007-01-20) Copyright (c) 2006-2007 Abdulaziz Ghuloum > -Error in top-level-value: exact? is unbound. +Error in top-level-value: modulo is unbound. > Testing mazefun under Ikarus-Scheme-r6rs @@ -484,9 +428,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 65 collections - 3.472s user time - 0.011s system time - 3.484s real time + 3.347s real 3.335s user 0.012s sys 274320056 bytes allocated Testing paraffins under Ikarus-Scheme-r6rs @@ -496,8 +438,10 @@ Ikarus Scheme (Build 2007-01-20) Copyright (c) 2006-2007 Abdulaziz Ghuloum > -Error in top-level-value: max is unbound. -> +running stats for (run-bench name count ok? run): + 198 collections + 1.447s real 1.194s user 0.252s sys + 831232056 bytes allocated Testing peval under Ikarus-Scheme-r6rs Compiling... @@ -508,9 +452,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 36 collections - 1.007s user time - 0.013s system time - 1.022s real time + 1.028s real 1.016s user 0.012s sys 151770008 bytes allocated Testing primes under Ikarus-Scheme-r6rs @@ -538,7 +480,7 @@ Running... Ikarus Scheme (Build 2007-01-20) Copyright (c) 2006-2007 Abdulaziz Ghuloum -> Error in top-level-value: complex? is unbound. +> Error in top-level-value: / is unbound. > Testing simplex under Ikarus-Scheme-r6rs @@ -557,8 +499,10 @@ Ikarus Scheme (Build 2007-01-20) Copyright (c) 2006-2007 Abdulaziz Ghuloum > -Error in top-level-value: char-alphabetic? is unbound. -> +running stats for (run-bench name count ok? run): + 9 collections + 2.424s real 0.504s user 0.991s sys + 36086008 bytes allocated Testing perm9 under Ikarus-Scheme-r6rs Compiling... @@ -569,9 +513,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 40 collections - 2.363s user time - 0.164s system time - 2.528s real time + 2.613s real 2.425s user 0.172s sys 170498936 bytes allocated Testing nboyer under Ikarus-Scheme-r6rs @@ -583,9 +525,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 49 collections - 1.491s user time - 0.008s system time - 1.501s real time + 1.530s real 1.513s user 0.010s sys 203661656 bytes allocated Testing sboyer under Ikarus-Scheme-r6rs @@ -597,9 +537,7 @@ Copyright (c) 2006-2007 Abdulaziz Ghuloum > running stats for (run-bench name count ok? run): 16 collections - 1.528s user time - 0.007s system time - 1.536s real time + 1.530s real 1.509s user 0.010s sys 66159256 bytes allocated Testing gcbench under Ikarus-Scheme-r6rs @@ -618,8 +556,10 @@ Ikarus Scheme (Build 2007-01-20) Copyright (c) 2006-2007 Abdulaziz Ghuloum > -Error in top-level-value: char-whitespace? is unbound. -> +running stats for (run-bench name count ok? run): + 41 collections + 5.054s real 5.011s user 0.023s sys + 171456072 bytes allocated Testing gcold under Ikarus-Scheme-r6rs Compiling... diff --git a/benchmarks/results.Larceny-r6rs b/benchmarks/results.Larceny-r6rs index bf3b7c2..25c5798 100644 --- a/benchmarks/results.Larceny-r6rs +++ b/benchmarks/results.Larceny-r6rs @@ -1,6 +1,6 @@ **************************** -Benchmarking Larceny-r6rs on Sat Jan 20 00:46:42 EST 2007 under Darwin adsl-75-19-180-26.dsl.bltnin.sbcglobal.net 8.8.3 Darwin Kernel Version 8.8.3: Wed Oct 18 21:57:10 PDT 2006; root:xnu-792.15.4.obj~4/RELEASE_I386 i386 i386 +Benchmarking Larceny-r6rs on Sat Jan 20 16:26:37 EST 2007 under Darwin 10-231-80-30.dhcp-bl.indiana.edu 8.8.3 Darwin Kernel Version 8.8.3: Wed Oct 18 21:57:10 PDT 2006; root:xnu-792.15.4.obj~4/RELEASE_I386 i386 i386 Testing boyer under Larceny-r6rs Compiling... @@ -17,7 +17,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified Words allocated: 9174986 Words reclaimed: 0 Elapsed time...: 604 ms (User: 589 ms; System: 15 ms) -Elapsed GC time: 84 ms (CPU: 81 in 35 collections.) +Elapsed GC time: 81 ms (CPU: 82 in 35 collections.) Testing browse under Larceny-r6rs Compiling... @@ -34,7 +34,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified Words allocated: 120585534 Words reclaimed: 0 Elapsed time...: 2857 ms (User: 2848 ms; System: 8 ms) -Elapsed GC time: 176 ms (CPU: 172 in 460 collections.) +Elapsed GC time: 166 ms (CPU: 169 in 460 collections.) Testing cpstak under Larceny-r6rs Compiling... @@ -50,8 +50,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 318239878 Words reclaimed: 0 -Elapsed time...: 1479 ms (User: 1473 ms; System: 6 ms) -Elapsed GC time: 440 ms (CPU: 440 in 1214 collections.) +Elapsed time...: 1478 ms (User: 1472 ms; System: 6 ms) +Elapsed GC time: 436 ms (CPU: 438 in 1214 collections.) Testing ctak under Larceny-r6rs Compiling... @@ -67,8 +67,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 265286660 Words reclaimed: 0 -Elapsed time...: 4785 ms (User: 4756 ms; System: 9 ms) -Elapsed GC time: 383 ms (CPU: 379 in 1012 collections.) +Elapsed time...: 4772 ms (User: 4756 ms; System: 9 ms) +Elapsed GC time: 378 ms (CPU: 374 in 1012 collections.) Testing dderiv under Larceny-r6rs Compiling... @@ -84,8 +84,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 244055776 Words reclaimed: 0 -Elapsed time...: 1892 ms (User: 1881 ms; System: 10 ms) -Elapsed GC time: 328 ms (CPU: 332 in 931 collections.) +Elapsed time...: 1891 ms (User: 1882 ms; System: 9 ms) +Elapsed GC time: 306 ms (CPU: 301 in 931 collections.) Testing deriv under Larceny-r6rs Compiling... @@ -101,8 +101,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 244055778 Words reclaimed: 0 -Elapsed time...: 1476 ms (User: 1464 ms; System: 11 ms) -Elapsed GC time: 336 ms (CPU: 335 in 931 collections.) +Elapsed time...: 1473 ms (User: 1463 ms; System: 9 ms) +Elapsed GC time: 336 ms (CPU: 333 in 931 collections.) Testing destruc under Larceny-r6rs Compiling... @@ -118,8 +118,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 43253750 Words reclaimed: 0 -Elapsed time...: 1039 ms (User: 1034 ms; System: 3 ms) -Elapsed GC time: 67 ms (CPU: 67 in 165 collections.) +Elapsed time...: 1042 ms (User: 1034 ms; System: 4 ms) +Elapsed GC time: 69 ms (CPU: 62 in 165 collections.) Testing diviter under Larceny-r6rs Compiling... @@ -135,8 +135,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 200015872 Words reclaimed: 0 -Elapsed time...: 1156 ms (User: 1150 ms; System: 6 ms) -Elapsed GC time: 281 ms (CPU: 277 in 763 collections.) +Elapsed time...: 1158 ms (User: 1151 ms; System: 7 ms) +Elapsed GC time: 270 ms (CPU: 272 in 763 collections.) Testing divrec under Larceny-r6rs Compiling... @@ -152,8 +152,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 200537100 Words reclaimed: 0 -Elapsed time...: 1515 ms (User: 1414 ms; System: 101 ms) -Elapsed GC time: 289 ms (CPU: 286 in 765 collections.) +Elapsed time...: 1516 ms (User: 1414 ms; System: 101 ms) +Elapsed GC time: 289 ms (CPU: 287 in 765 collections.) Testing puzzle under Larceny-r6rs Compiling... @@ -169,8 +169,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 8126378 Words reclaimed: 0 -Elapsed time...: 1949 ms (User: 1806 ms; System: 144 ms) -Elapsed GC time: 14 ms (CPU: 14 in 31 collections.) +Elapsed time...: 1948 ms (User: 1804 ms; System: 143 ms) +Elapsed GC time: 12 ms (CPU: 13 in 31 collections.) Testing takl under Larceny-r6rs Compiling... @@ -186,7 +186,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 0 Words reclaimed: 0 -Elapsed time...: 908 ms (User: 907 ms; System: 0 ms) +Elapsed time...: 908 ms (User: 907 ms; System: 1 ms) Elapsed GC time: 0 ms (CPU: 0 in 0 collections.) Testing triangl under Larceny-r6rs @@ -203,7 +203,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 262144 Words reclaimed: 0 -Elapsed time...: 2103 ms (User: 2100 ms; System: 1 ms) +Elapsed time...: 2102 ms (User: 2101 ms; System: 2 ms) Elapsed GC time: 1 ms (CPU: 1 in 1 collections.) Testing fft under Larceny-r6rs @@ -220,8 +220,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 217579520 Words reclaimed: 0 -Elapsed time...: 1651 ms (User: 1622 ms; System: 29 ms) -Elapsed GC time: 536 ms (CPU: 429 in 830 collections.) +Elapsed time...: 1650 ms (User: 1621 ms; System: 29 ms) +Elapsed GC time: 470 ms (CPU: 533 in 830 collections.) Testing fib under Larceny-r6rs Compiling... @@ -237,7 +237,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 0 Words reclaimed: 0 -Elapsed time...: 1804 ms (User: 1802 ms; System: 1 ms) +Elapsed time...: 1788 ms (User: 1786 ms; System: 1 ms) Elapsed GC time: 0 ms (CPU: 0 in 0 collections.) Testing fibfp under Larceny-r6rs @@ -254,8 +254,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 358610902 Words reclaimed: 0 -Elapsed time...: 3192 ms (User: 3145 ms; System: 38 ms) -Elapsed GC time: 498 ms (CPU: 489 in 1368 collections.) +Elapsed time...: 3190 ms (User: 3145 ms; System: 39 ms) +Elapsed GC time: 500 ms (CPU: 493 in 1368 collections.) Testing mbrot under Larceny-r6rs Compiling... @@ -271,8 +271,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 551809449 Words reclaimed: 0 -Elapsed time...: 2238 ms (User: 2223 ms; System: 14 ms) -Elapsed GC time: 755 ms (CPU: 771 in 2105 collections.) +Elapsed time...: 2241 ms (User: 2223 ms; System: 14 ms) +Elapsed GC time: 756 ms (CPU: 770 in 2105 collections.) Testing pnpoly under Larceny-r6rs Compiling... @@ -288,8 +288,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 72351712 Words reclaimed: 0 -Elapsed time...: 1463 ms (User: 1450 ms; System: 5 ms) -Elapsed GC time: 100 ms (CPU: 103 in 276 collections.) +Elapsed time...: 1450 ms (User: 1448 ms; System: 3 ms) +Elapsed GC time: 102 ms (CPU: 101 in 276 collections.) Testing sum under Larceny-r6rs Compiling... @@ -305,7 +305,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 0 Words reclaimed: 0 -Elapsed time...: 554 ms (User: 553 ms; System: 1 ms) +Elapsed time...: 553 ms (User: 553 ms; System: 0 ms) Elapsed GC time: 0 ms (CPU: 0 in 0 collections.) Testing sumfp under Larceny-r6rs @@ -322,8 +322,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 400031744 Words reclaimed: 0 -Elapsed time...: 1805 ms (User: 1799 ms; System: 6 ms) -Elapsed GC time: 539 ms (CPU: 538 in 1526 collections.) +Elapsed time...: 1805 ms (User: 1798 ms; System: 6 ms) +Elapsed GC time: 548 ms (CPU: 544 in 1526 collections.) Testing tak under Larceny-r6rs Compiling... @@ -339,7 +339,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 0 Words reclaimed: 0 -Elapsed time...: 1207 ms (User: 1202 ms; System: 1 ms) +Elapsed time...: 1201 ms (User: 1201 ms; System: 0 ms) Elapsed GC time: 0 ms (CPU: 0 in 0 collections.) Testing ack under Larceny-r6rs @@ -356,7 +356,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 0 Words reclaimed: 0 -Elapsed time...: 85 ms (User: 84 ms; System: 0 ms) +Elapsed time...: 84 ms (User: 84 ms; System: 0 ms) Elapsed GC time: 0 ms (CPU: 0 in 0 collections.) Testing array1 under Larceny-r6rs @@ -373,8 +373,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 39870054 Words reclaimed: 0 -Elapsed time...: 517 ms (User: 437 ms; System: 80 ms) -Elapsed GC time: 45 ms (CPU: 48 in 100 collections.) +Elapsed time...: 511 ms (User: 434 ms; System: 76 ms) +Elapsed GC time: 47 ms (CPU: 45 in 100 collections.) Testing cat under Larceny-r6rs Compiling... @@ -390,7 +390,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 0 Words reclaimed: 0 -Elapsed time...: 499 ms (User: 373 ms; System: 126 ms) +Elapsed time...: 496 ms (User: 372 ms; System: 124 ms) Elapsed GC time: 0 ms (CPU: 0 in 0 collections.) Testing string under Larceny-r6rs @@ -407,8 +407,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 7834358 Words reclaimed: 0 -Elapsed time...: 417 ms (User: 396 ms; System: 21 ms) -Elapsed GC time: 41 ms (CPU: 37 in 30 collections.) +Elapsed time...: 425 ms (User: 397 ms; System: 23 ms) +Elapsed GC time: 40 ms (CPU: 39 in 30 collections.) Testing sum1 under Larceny-r6rs Compiling... @@ -424,8 +424,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 6553374 Words reclaimed: 0 -Elapsed time...: 3490 ms (User: 2051 ms; System: 1438 ms) -Elapsed GC time: 8 ms (CPU: 11 in 25 collections.) +Elapsed time...: 3490 ms (User: 2055 ms; System: 1421 ms) +Elapsed GC time: 8 ms (CPU: 10 in 25 collections.) Testing sumloop under Larceny-r6rs Compiling... @@ -458,8 +458,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 19136354 Words reclaimed: 0 -Elapsed time...: 703 ms (User: 573 ms; System: 130 ms) -Elapsed GC time: 46 ms (CPU: 44 in 73 collections.) +Elapsed time...: 700 ms (User: 573 ms; System: 127 ms) +Elapsed GC time: 45 ms (CPU: 41 in 73 collections.) Testing wc under Larceny-r6rs Compiling... @@ -475,7 +475,7 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 0 Words reclaimed: 0 -Elapsed time...: 293 ms (User: 249 ms; System: 44 ms) +Elapsed time...: 293 ms (User: 248 ms; System: 44 ms) Elapsed GC time: 0 ms (CPU: 0 in 0 collections.) Testing conform under Larceny-r6rs @@ -492,8 +492,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 22544148 Words reclaimed: 0 -Elapsed time...: 1441 ms (User: 1432 ms; System: 9 ms) -Elapsed GC time: 65 ms (CPU: 71 in 86 collections.) +Elapsed time...: 1442 ms (User: 1433 ms; System: 9 ms) +Elapsed GC time: 76 ms (CPU: 74 in 86 collections.) Testing dynamic under Larceny-r6rs Compiling... @@ -509,8 +509,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 14942078 Words reclaimed: 0 -Elapsed time...: 773 ms (User: 711 ms; System: 61 ms) -Elapsed GC time: 193 ms (CPU: 195 in 57 collections.) +Elapsed time...: 773 ms (User: 712 ms; System: 62 ms) +Elapsed GC time: 188 ms (CPU: 188 in 57 collections.) Testing earley under Larceny-r6rs Compiling... @@ -526,8 +526,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 123206268 Words reclaimed: 0 -Elapsed time...: 2025 ms (User: 1934 ms; System: 91 ms) -Elapsed GC time: 582 ms (CPU: 579 in 470 collections.) +Elapsed time...: 2021 ms (User: 1933 ms; System: 89 ms) +Elapsed GC time: 573 ms (CPU: 575 in 470 collections.) Testing fibc under Larceny-r6rs Compiling... @@ -543,8 +543,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 192411392 Words reclaimed: 0 -Elapsed time...: 4123 ms (User: 4114 ms; System: 8 ms) -Elapsed GC time: 270 ms (CPU: 276 in 734 collections.) +Elapsed time...: 4121 ms (User: 4114 ms; System: 8 ms) +Elapsed GC time: 275 ms (CPU: 276 in 734 collections.) Testing graphs under Larceny-r6rs Compiling... @@ -560,8 +560,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 157021446 Words reclaimed: 0 -Elapsed time...: 1658 ms (User: 1627 ms; System: 22 ms) -Elapsed GC time: 267 ms (CPU: 273 in 599 collections.) +Elapsed time...: 1647 ms (User: 1625 ms; System: 21 ms) +Elapsed GC time: 262 ms (CPU: 271 in 599 collections.) Testing lattice under Larceny-r6rs Compiling... @@ -577,8 +577,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 19398398 Words reclaimed: 0 -Elapsed time...: 1681 ms (User: 1677 ms; System: 4 ms) -Elapsed GC time: 32 ms (CPU: 27 in 74 collections.) +Elapsed time...: 1678 ms (User: 1674 ms; System: 3 ms) +Elapsed GC time: 27 ms (CPU: 26 in 74 collections.) Testing matrix under Larceny-r6rs Compiling... @@ -594,8 +594,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 87555006 Words reclaimed: 0 -Elapsed time...: 1862 ms (User: 1849 ms; System: 12 ms) -Elapsed GC time: 126 ms (CPU: 122 in 334 collections.) +Elapsed time...: 1860 ms (User: 1849 ms; System: 9 ms) +Elapsed GC time: 130 ms (CPU: 136 in 334 collections.) Testing maze under Larceny-r6rs Compiling... @@ -611,8 +611,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 36170288 Words reclaimed: 0 -Elapsed time...: 5834 ms (User: 5798 ms; System: 29 ms) -Elapsed GC time: 88 ms (CPU: 79 in 138 collections.) +Elapsed time...: 5846 ms (User: 5801 ms; System: 31 ms) +Elapsed GC time: 85 ms (CPU: 79 in 138 collections.) Testing mazefun under Larceny-r6rs Compiling... @@ -628,8 +628,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 47447672 Words reclaimed: 0 -Elapsed time...: 1293 ms (User: 1285 ms; System: 8 ms) -Elapsed GC time: 75 ms (CPU: 72 in 181 collections.) +Elapsed time...: 1294 ms (User: 1285 ms; System: 8 ms) +Elapsed GC time: 71 ms (CPU: 71 in 181 collections.) Testing nqueens under Larceny-r6rs Compiling... @@ -645,8 +645,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 71302772 Words reclaimed: 0 -Elapsed time...: 1594 ms (User: 1583 ms; System: 11 ms) -Elapsed GC time: 99 ms (CPU: 105 in 272 collections.) +Elapsed time...: 1612 ms (User: 1587 ms; System: 13 ms) +Elapsed GC time: 112 ms (CPU: 101 in 272 collections.) Testing paraffins under Larceny-r6rs Compiling... @@ -662,8 +662,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 201324942 Words reclaimed: 0 -Elapsed time...: 4293 ms (User: 3757 ms; System: 534 ms) -Elapsed GC time: 2462 ms (CPU: 2465 in 768 collections.) +Elapsed time...: 4312 ms (User: 3766 ms; System: 528 ms) +Elapsed GC time: 2457 ms (CPU: 2460 in 768 collections.) Testing peval under Larceny-r6rs Compiling... @@ -679,8 +679,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 34340444 Words reclaimed: 0 -Elapsed time...: 1256 ms (User: 1248 ms; System: 6 ms) -Elapsed GC time: 62 ms (CPU: 59 in 131 collections.) +Elapsed time...: 1268 ms (User: 1255 ms; System: 8 ms) +Elapsed GC time: 57 ms (CPU: 65 in 131 collections.) Testing primes under Larceny-r6rs Compiling... @@ -696,8 +696,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 92273280 Words reclaimed: 0 -Elapsed time...: 7606 ms (User: 7568 ms; System: 33 ms) -Elapsed GC time: 127 ms (CPU: 123 in 352 collections.) +Elapsed time...: 7656 ms (User: 7573 ms; System: 39 ms) +Elapsed GC time: 134 ms (CPU: 130 in 352 collections.) Testing ray under Larceny-r6rs Compiling... @@ -713,8 +713,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 218093224 Words reclaimed: 0 -Elapsed time...: 23048 ms (User: 13115 ms; System: 9906 ms) -Elapsed GC time: 317 ms (CPU: 301 in 832 collections.) +Elapsed time...: 23522 ms (User: 13167 ms; System: 9989 ms) +Elapsed GC time: 290 ms (CPU: 291 in 832 collections.) Testing scheme under Larceny-r6rs Compiling... @@ -730,8 +730,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 29621860 Words reclaimed: 0 -Elapsed time...: 1194 ms (User: 1190 ms; System: 3 ms) -Elapsed GC time: 41 ms (CPU: 45 in 113 collections.) +Elapsed time...: 1202 ms (User: 1192 ms; System: 5 ms) +Elapsed GC time: 46 ms (CPU: 43 in 113 collections.) Testing simplex under Larceny-r6rs Compiling... @@ -747,8 +747,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 126088192 Words reclaimed: 0 -Elapsed time...: 42463 ms (User: 22981 ms; System: 19433 ms) -Elapsed GC time: 191 ms (CPU: 224 in 481 collections.) +Elapsed time...: 42660 ms (User: 22959 ms; System: 19546 ms) +Elapsed GC time: 175 ms (CPU: 171 in 481 collections.) Testing slatex under Larceny-r6rs Compiling... @@ -764,8 +764,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 4194150 Words reclaimed: 0 -Elapsed time...: 1883 ms (User: 550 ms; System: 825 ms) -Elapsed GC time: 12 ms (CPU: 13 in 16 collections.) +Elapsed time...: 2096 ms (User: 553 ms; System: 775 ms) +Elapsed GC time: 12 ms (CPU: 14 in 16 collections.) Testing perm9 under Larceny-r6rs Compiling... @@ -781,8 +781,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 27000532 Words reclaimed: 0 -Elapsed time...: 1552 ms (User: 1333 ms; System: 217 ms) -Elapsed GC time: 1028 ms (CPU: 1027 in 103 collections.) +Elapsed time...: 1550 ms (User: 1335 ms; System: 213 ms) +Elapsed GC time: 1010 ms (CPU: 1022 in 103 collections.) Testing nboyer under Larceny-r6rs Compiling... @@ -798,8 +798,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 50855620 Words reclaimed: 0 -Elapsed time...: 1686 ms (User: 1603 ms; System: 82 ms) -Elapsed GC time: 413 ms (CPU: 425 in 194 collections.) +Elapsed time...: 1687 ms (User: 1603 ms; System: 81 ms) +Elapsed GC time: 433 ms (CPU: 426 in 194 collections.) Testing sboyer under Larceny-r6rs Compiling... @@ -815,8 +815,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 16514958 Words reclaimed: 0 -Elapsed time...: 1321 ms (User: 1310 ms; System: 8 ms) -Elapsed GC time: 45 ms (CPU: 46 in 63 collections.) +Elapsed time...: 1324 ms (User: 1310 ms; System: 9 ms) +Elapsed GC time: 43 ms (CPU: 43 in 63 collections.) Testing gcbench under Larceny-r6rs Compiling... @@ -863,8 +863,8 @@ GCBench: Bottom up construction Total memory available= ???????? bytes Free memory= ???????? bytes Words allocated: 94867544 Words reclaimed: 0 -Elapsed time...: 1855 ms (User: 1589 ms; System: 260 ms) -Elapsed GC time: 1144 ms (CPU: 1151 in 360 collections.) +Elapsed time...: 1844 ms (User: 1587 ms; System: 253 ms) +Elapsed GC time: 1137 ms (CPU: 1124 in 360 collections.) Testing parsing under Larceny-r6rs Compiling... @@ -880,8 +880,8 @@ Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD Unix:unified > Words allocated: 100923902 Words reclaimed: 0 -Elapsed time...: 6581 ms (User: 6507 ms; System: 70 ms) -Elapsed GC time: 289 ms (CPU: 280 in 385 collections.) +Elapsed time...: 6582 ms (User: 6506 ms; System: 70 ms) +Elapsed GC time: 289 ms (CPU: 281 in 385 collections.) Testing gcold under Larceny-r6rs Compiling... @@ -906,5 +906,5 @@ Initialization complete... Words allocated: 2754230651 Words reclaimed: 0 -Elapsed time...: 24962 ms (User: 20787 ms; System: 4153 ms) -Elapsed GC time: 13536 ms (CPU: 13544 in 10508 collections.) +Elapsed time...: 24878 ms (User: 20763 ms; System: 4107 ms) +Elapsed GC time: 13446 ms (CPU: 13424 in 10508 collections.) diff --git a/benchmarks/summarize b/benchmarks/summarize index 9c44722..3fc7133 100755 --- a/benchmarks/summarize +++ b/benchmarks/summarize @@ -95,11 +95,12 @@ runtime == 1 && /^[ ]*([0-9.]+) real [ ]*([0-9.]+) user [ ]*([0-9.]+) sys$/ { real = $1 * 1000; } -runtime == 1 && /[ ]*([0-9.]+)s user [ ]*([0-9.]+)s system [ ]*([0-9.]+)s real/ { - cpu = ($1 + $3) * 1000; - real = $5 * 1000; +runtime == 1 && /[ ]*([0-9.]+)s real [ ]*([0-9.]+)s user [ ]*([0-9.]+)s sys/ { + real = $1 * 1000; + cpu = ($3 + $5) * 1000; } + runtime == 1 && /^Elapsed time\.\.\.: ([0-9]+) ms/{ real = $3; } diff --git a/bin/ikarus b/bin/ikarus index 0e6abae..b07b1fd 100755 Binary files a/bin/ikarus and b/bin/ikarus differ diff --git a/bin/ikarus-runtime.c b/bin/ikarus-runtime.c index 7fb50d8..cf0a429 100644 --- a/bin/ikarus-runtime.c +++ b/bin/ikarus-runtime.c @@ -821,7 +821,7 @@ ikrt_open_output_file(ikp fname, ikp flagptr, ikpcb* pcb){ unlink(string_data(fname)); flags = O_WRONLY | O_CREAT; } else if(f == 2){ - flags = O_WRONLY | O_TRUNC; + flags = O_WRONLY | O_TRUNC | O_CREAT; } else if(f == 3){ flags = O_WRONLY | O_APPEND; } else { diff --git a/src/ikarus.boot b/src/ikarus.boot index 4598eb6..7109030 100644 Binary files a/src/ikarus.boot and b/src/ikarus.boot differ diff --git a/src/libcore.ss b/src/libcore.ss index 2cd97cc..c1e75c1 100644 --- a/src/libcore.ss +++ b/src/libcore.ss @@ -704,6 +704,34 @@ reference-implementation: [else (error 'char-whitespace? "~s is not a character" c)]))) +(primitive-set! 'char-alphabetic? + (lambda (c) + (cond + [(char? c) + (cond + [($char<= #\a c) ($char<= c #\z)] + [($char<= #\A c) ($char<= c #\Z)] + [else #f])] + [else + (error 'char-alphabetic? "~s is not a character" c)]))) + +(primitive-set! 'char-downcase + (lambda (c) + (cond + [(char? c) + (cond + [(and ($char<= #\A c) ($char<= c #\Z)) + ($fixnum->char + ($fx+ ($char->fixnum c) + ($fx- ($char->fixnum #\a) + ($char->fixnum #\A))))] + [else c])] + [else + (error 'char-downcase "~s is not a character" c)]))) + + + + (primitive-set! 'cons (lambda (x y) (cons x y))) (primitive-set! 'eq? (lambda (x y) (eq? x y))) @@ -1704,3 +1732,48 @@ reference-implementation: x (error 'command-list "invalid command-line-arguments ~s\n" x))))) +(primitive-set! 'string->number + (lambda (x) + (define (convert-data str len pos? idx ac) + (cond + [($fx= idx len) (if pos? ac (- 0 ac))] + [else + (let ([c ($string-ref str idx)]) + (cond + [(and ($char<= #\0 c) ($char<= c #\9)) + (convert-data str len pos? ($fxadd1 idx) + (+ (* ac 10) + ($fx- ($char->fixnum c) ($char->fixnum #\0))))] + [else #f]))])) + (define (convert-data-init str len pos? idx c) + (cond + [($char= c #\0) + (if ($fx= idx len) + 0 + (convert-data-init str len pos? + ($fxadd1 idx) + ($string-ref str idx)))] + [(and ($char<= #\1 c) ($char<= c #\9)) + (convert-data str len pos? idx + ($fx- ($char->fixnum c) ($char->fixnum #\0)))] + [else #f])) + (define (convert-num str len pos?) + (cond + [($fx> len 1) + (convert-data-init str len pos? 2 ($string-ref str 1))] + [else #f])) + (define (convert-sign str len) + (cond + [($fx> len 0) + (let ([c ($string-ref str 0)]) + (case c + [(#\+) (convert-num str len #t)] + [(#\-) (convert-num str len #f)] + [else + (convert-data-init str len #t 1 c)]))] + [else #f])) + (cond + [(string? x) + (convert-sign x ($string-length x))] + [else (error 'string->number "~s is not a string" x)]))) + diff --git a/src/libnumerics.ss b/src/libnumerics.ss index 67d9520..6299fcc 100644 --- a/src/libnumerics.ss +++ b/src/libnumerics.ss @@ -163,12 +163,90 @@ [else (binary* n (expt (binary* n n) (#%$fxsra m 1)))]))) + (define max + (case-lambda + [(x y) + (cond + [(fixnum? x) + (cond + [(fixnum? y) + (if ($fx> x y) x y)] + [(bignum? y) + (if (positive-bignum? y) y x)] + [else (error 'max "~s is not a number" y)])] + [(bignum? x) + (cond + [(fixnum? y) + (if (positive-bignum? x) x y)] + [(bignum? y) + (if (bnbn> x y) x y)] + [else (error 'max "~s is not a number" y)])] + [else (error 'max "~s is not a number" x)])] + [(x y z . rest) + (let f ([a (max x y)] [b z] [ls rest]) + (cond + [(null? ls) (max a b)] + [else + (f (max a b) (car ls) (cdr ls))]))] + [(x) + (if (number? x) + x + (error 'max "~s is not a number" x))])) + +(define min + (case-lambda + [(x y) + (cond + [(fixnum? x) + (cond + [(fixnum? y) + (if ($fx> x y) y x)] + [(bignum? y) + (if (positive-bignum? y) x y)] + [else (error 'min "~s is not a number" y)])] + [(bignum? x) + (cond + [(fixnum? y) + (if (positive-bignum? x) y x)] + [(bignum? y) + (if (bnbn> x y) y x)] + [else (error 'min "~s is not a number" y)])] + [else (error 'min "~s is not a number" x)])] + [(x y z . rest) + (let f ([a (min x y)] [b z] [ls rest]) + (cond + [(null? ls) (min a b)] + [else + (f (min a b) (car ls) (cdr ls))]))] + [(x) + (if (number? x) + x + (error 'min "~s is not a number" x))])) (define number? (lambda (x) (or (fixnum? x) (bignum? x)))) + (define complex? + (lambda (x) (number? x))) + (define real? + (lambda (x) (number? x))) + (define rational? + (lambda (x) (number? x))) + (define integer? + (lambda (x) (number? x))) + (define exact? + (lambda (x) + (or (number? x) + (error 'exact? "~s is not a number" x)))) + + (define inexact? + (lambda (x) + (if (number? x) + #f + (error 'inexact? "~s is not a number" x)))) + (define positive-bignum? (lambda (x) (foreign-call "ikrt_positive_bn" x))) @@ -315,6 +393,7 @@ + (primitive-set! '+ +) (primitive-set! '- -) (primitive-set! '* *) @@ -430,4 +509,12 @@ (primitive-set! 'even? even?) (primitive-set! 'odd? odd?) + (primitive-set! 'max max) + (primitive-set! 'min min) + (primitive-set! 'complex? complex?) + (primitive-set! 'real? real?) + (primitive-set! 'rational? rational?) + (primitive-set! 'exact? exact?) + (primitive-set! 'inexact? inexact?) + (primitive-set! 'integer? integer?) ) diff --git a/src/libtimers.ss b/src/libtimers.ss index 2bcda8d..4a69417 100644 --- a/src/libtimers.ss +++ b/src/libtimers.ss @@ -14,7 +14,7 @@ (define (print-time msg secs usecs) (if (fx< usecs 0) (print-time msg (fx- secs 1) (fx+ usecs 1000000)) - (printf " ~a.~a~a~as ~a time\n" + (printf " ~a.~a~a~as ~a" secs (fxremainder (fxquotient usecs 100000) 10) (fxremainder (fxquotient usecs 10000) 10) @@ -30,15 +30,15 @@ [(1) (display " 1 collection\n")] [else (printf " ~a collections\n" collections)])) - (print-time "user" - (fx- (stats-user-secs t1) (stats-user-secs t0)) - (fx- (stats-user-usecs t1) (stats-user-usecs t0))) - (print-time "system" - (fx- (stats-sys-secs t1) (stats-sys-secs t0)) - (fx- (stats-sys-usecs t1) (stats-sys-usecs t0))) (print-time "real" (fx- (stats-real-secs t1) (stats-real-secs t0)) (fx- (stats-real-usecs t1) (stats-real-usecs t0))) + (print-time "user" + (fx- (stats-user-secs t1) (stats-user-secs t0)) + (fx- (stats-user-usecs t1) (stats-user-usecs t0))) + (print-time "sys\n" + (fx- (stats-sys-secs t1) (stats-sys-secs t0)) + (fx- (stats-sys-usecs t1) (stats-sys-usecs t0))) (printf " ~a bytes allocated\n" bytes)) (define time-it diff --git a/src/libwriter.ss b/src/libwriter.ss index 31d7530..3a1a59b 100644 --- a/src/libwriter.ss +++ b/src/libwriter.ss @@ -24,7 +24,8 @@ (write-char #\\ p) (write-char* "del" p)] [else - (write-char #\+ p) + (write-char #\\ p) + (write-char #\x p) (write-fixnum i p)])) (write-char x p)))) (define write-list diff --git a/src/makefile.ss b/src/makefile.ss index ab15c70..a01af5d 100755 --- a/src/makefile.ss +++ b/src/makefile.ss @@ -88,7 +88,10 @@ time-it posix-fork fork waitpid env environ pretty-print - even? odd? member char-whitespace? + even? odd? member char-whitespace? char-alphabetic? + char-downcase max min complex? real? rational? + exact? inexact? integer? + string->number )) (define system-primitives