From 2c212fbcf72a5bf9f916a09e8b8e8a2101cda93a Mon Sep 17 00:00:00 2001 From: JeffBezanson Date: Fri, 8 May 2009 02:52:25 +0000 Subject: [PATCH] adding random function fixing bug in integer? sorting environment in make-system-image for more stable diffs --- femtolisp/builtins.c | 3 +- femtolisp/flisp.boot | 202 ++++++++++++++++++++++--------------------- femtolisp/system.lsp | 14 ++- 3 files changed, 118 insertions(+), 101 deletions(-) diff --git a/femtolisp/builtins.c b/femtolisp/builtins.c index 87590ce..caa5e99 100644 --- a/femtolisp/builtins.c +++ b/femtolisp/builtins.c @@ -227,7 +227,8 @@ static value_t fl_integerp(value_t *args, u_int32_t nargs) argcount("integer?", nargs, 1); value_t v = args[0]; return (isfixnum(v) || - (iscprim(v) && cp_numtype((cprim_t*)ptr(v)) < T_FLOAT)); + (iscprim(v) && cp_numtype((cprim_t*)ptr(v)) < T_FLOAT)) ? + FL_T : FL_F; } static value_t fl_fixnum(value_t *args, u_int32_t nargs) diff --git a/femtolisp/flisp.boot b/femtolisp/flisp.boot index 5960f49..69e4574 100644 --- a/femtolisp/flisp.boot +++ b/femtolisp/flisp.boot @@ -12,6 +12,8 @@ trace #function("n1b0d1e031p322b2;" [#function("qb0d1e031p42;" [#function("qb0d1e031p42;" [#function("qf10Mb0<@6\x920d1f20b0f00d2b3L1b4b5L2L1b6b7f20L2L2L1d8d9b:le03231b4b;L2L1d2b7f10L2L1d8e03132L136L342;];" [trace-lambda set-top-level-value! nconc begin princ "(" print quote copy-list map #function("n1b0b1b2L2b3e0L2L3;" [begin princ " " print]) ")\n"]) to-proper]) cadr]) top-level-value ok]) to-proper #function("n1e0A6;0e0;e0?6F0e0L1;e0Md0e0N31K;" [to-proper]) +table.values +#function("n1d0b1l^e043;" [table.foldl #function("n3e1e2K;" [])]) table.pairs #function("n1d0b1l^e043;" [table.foldl #function("n3e0e1Ke2K;" [])]) table.keys @@ -20,46 +22,48 @@ table.invert #function("n1b0d130p42;" [#function("qd0b1l^f00332e0;" [table.foldl #function("n3d0f00e1e043;" [put!])]) table]) table.foreach #function("n2d0b1l^e143;" [table.foldl #function("n3f00e0e1322\\;" [])]) -table.values -#function("n1d0b1l^e043;" [table.foldl #function("n3e1e2K;" [])]) table.clone #function("n1b0d130p42;" [#function("qd0b1l^f00332e0;" [table.foldl #function("n3d0f00e0e143;" [put!])]) table]) symbol-syntax #function("n1d0d1e0]43;" [get *syntax-environment*]) -string.tail -#function("n2d0e0d1e0_e13342;" [string.sub string.inc]) string.trim #function("n3b0]]p43;" [#function("qb0li02b1li12b2d3f0031p42;" [#function("n4e2e3W16J02d0e1d1e0e232326a0f00e0e1d2e0e232e344;e2;" [string.find string.char string.inc]) #function("n3d0e2_3216R02d1e1d2e0d3e0e23232326g0f01e0e1d3e0e23243;e2;" [> string.find string.char string.dec]) #function("qd0f10f00f10f11_e034f01f10f12e03343;" [string.sub]) length])]) +string.tail +#function("n2d0e0d1e0_e13342;" [string.sub string.inc]) string.rpad #function("n3d0e0d1e2e1d2e031u3242;" [string string.rep length]) +string.rep +#function("n2e1a4W6q0d0e1_326G0b1;e1`V6U0d2e041;e1a2V6f0d2e0e042;d2e0e0e043;d3e1316\x8b0d2e0d4e0e1`u3242;d4d2e0e032e1a2U242;" [<= "" string odd? string.rep]) string.map #function("n2b0d130d2e131p43;" [#function("qb0_p322d1e041;" [#function("q]e0f01W6`02d0f00f10d1f11e03231322d2f11e032i0520;" [io.putc string.char string.inc]) io.tostring!]) buffer length]) string.lpad #function("n3d0d1e2e1d2e031u32e042;" [string string.rep length]) string.join #function("n2e0A6;0b0;b1d230p42;" ["" #function("qd0e0f00M322d1b2lf00N322d3e041;" [io.write for-each #function("n1d0f00f11322d0f00e042;" [io.write]) io.tostring!]) buffer]) -string.rep -#function("n2e1a4W6q0d0e1_326G0b1;e1`V6U0d2e041;e1a2V6f0d2e0e042;d2e0e0e043;d3e1316\x8b0d2e0d4e0e1`u3242;d4d2e0e032e1a2U242;" [<= "" string odd? string.rep]) splice-form? #function("n1e0F16K02e0Mb0<17K02e0Mb1<17U02e0b2<;" [*comma-at* *comma-dot* *comma*]) +simple-sort +#function("n1e0A17>02e0NA6D0e0;b0e0Mp42;" [#function("qb0d1b2lf00N32p42;" [#function("qd0d1e0M31f00L1d1e0N3143;" [nconc simple-sort]) separate #function("n1e0f00W;" [])])]) set-syntax! #function("n2d0d1e0e143;" [put! *syntax-environment*]) separate #function("n2f00e0e1^^44;" [] #0=[#function("n4e1A6>0e2e3K;e0e1M316[0f00e0e1Ne1Me2Ke344;f00e0e1Ne2e1Me3K44;" [] #0#) ()]) +self-evaluating? +#function("n1e0?16>02e0C@17_02d0e03116_02e0C16_02e0d1e031<;" [constant? top-level-value]) reverse #function("n1d0d1^e043;" [foldl cons]) revappend #function("n2d0d1e031e142;" [nconc reverse]) +repl +#function("n0b0]]p43;" [#function("qb0li02b1li12e1302d240;" [#function("n0d0b1312d2d3312b4b5lb6lmp42;" [princ "> " io.flush *output-stream* #function("qd0d131@16H02b2d3e031p42;" [io.eof? *input-stream* #function("qd0e0312e0h12\\;" [print that]) load-process]) #function("n0d040;" [read]) #function("n1d0d1312d2e041;" [io.discardbuffer *input-stream* raise])]) #function("n0b0lb1lm6G0d2302f0140;];" [#function("n0f003016@02d040;" [newline]) #function("n1d0e041;" [print-exception]) newline]) newline])]) remainder #function("n2e0e0e1U2e1T2u;" []) ref-uint32-LE #function("n2d0e0e1_tZ_32d0e0e1`tZa832d0e0e1a2tZa@32d0e0e1a3tZaH32R4;" [ash]) ref-uint16-LE #function("n2d0e0e1_tZ_32d0e0e1`tZa832t;" [ash]) -repl -#function("n0b0]]p43;" [#function("qb0li02b1li12e1302d240;" [#function("n0d0b1312d2d3312b4b5lb6lmp42;" [princ "> " io.flush *output-stream* #function("qd0d131@16H02b2d3e031p42;" [io.eof? *input-stream* #function("qd0e0312e0h12\\;" [print that]) load-process]) #function("n0d040;" [read]) #function("n1d0d1312d2e041;" [io.discardbuffer *input-stream* raise])]) #function("n0b0lb1lm6G0d2302f0140;];" [#function("n0f003016@02d040;" [newline]) #function("n1d0e041;" [print-exception]) newline]) newline])]) -self-evaluating? -#function("n1e0?16>02e0C@17_02d0e03116_02e0C16_02e0d1e031<;" [constant? top-level-value]) +random +#function("n1d0e0316F0d1d230e042;d330e0T2;" [integer? remainder rand rand.double]) quote-value #function("n1d0e0316>0e0;b1e0L2;" [self-evaluating? quote]) println @@ -70,10 +74,10 @@ print-exception #function("n1b0]]p43;" [#function("qb0li02b1li12f00F16[02f00Mb2<16[02d3f00a4326\x850e0b4d5f0031b6d7f0031b8352e1d9f0031315G1f00F16\x9f02f00Mb:<16\x9f02f00NF6\xb40e0b;d5f0031b<335G1f00F16\xc402f00Mb=<6\xd80e0b>312e0f00NQ5G1f00F16\xe802f00Mb?<6\x070d@d7f0031312e0bAd5f0031325G1dBf003116\x1c02d3f00a232691e0f00MbC322bDd5f0031p325G1e0bE312e1f00312e0dF312\\;" [#function("o0d0d1e0Ks;" [io.princ *error-stream*]) #function("o0d0d1e0Ks;" [io.print *error-stream*]) type-error length= "type-error: " cadr ": expected " caddr ", got " cadddr unbound-error "unbound-error: eval: variable " " has no value" error "error: " load-error print-exception "in file " list? ": " #function("qd0e03117?02e0C6H0f005K0f01e041;" [string?]) "*** Unhandled exception: " *linefeed*])]) print #function("o0d0d1e0Ks;" [io.print *output-stream*]) -positive? -#function("n1d0e0_42;" [>]) princ #function("o0d0d1e0Ks;" [io.princ *output-stream*]) +positive? +#function("n1d0e0_42;" [>]) peephole #function("n1e0;" []) odd? @@ -84,64 +88,64 @@ nreconc #function("n2d0d1e031e142;" [nconc nreverse]) nlist* #function("o0e0N?6=0e0M;e0d0e0NQP;" [nlist*]) -negative? -#function("n1e0_W;" []) -nestlist -#function("n3d0e2_326>0^;e1d1e0e0e131e2`u33K;" [<= nestlist]) newline #function("n0d0d1312\\;" [princ *linefeed*]) -memv -#function("n2e1?6:0];e1Me0=6F0e1;d0e0e1N42;" [memv]) +nestlist +#function("n3d0e2_326>0^;e1d1e0e0e131e2`u33K;" [<= nestlist]) +negative? +#function("n1e0_W;" []) mod #function("n2e0e0e1U2e1T2u;" []) +memv +#function("n2e1?6:0];e1Me0=6F0e1;d0e0e1N42;" [memv]) member #function("n2e1?6:0];e1Me0>6F0e1;d0e0e1N42;" [member]) mark-label #function("n2d0e0d1e143;" [emit :label]) -map! -#function("n2e1]e1F6O02e1e0e1M31O2e1Ni15502;" []) -map-int -#function("n2d0e1_326>0^;b1e0_31^K^p43;" [<= #function("qe0i12`f01`ub0lr2e0;" [#function("n1f01f10e031^KP2f01Nj01;" [])])]) mapcar #function("o1f00e0e142;" [] #0=[#function("n2e1A6=0e040;e1M?6H0e1M;e0d0d1e132Qf00e0d0d2e13232K;" [map car cdr] #0#) ()]) +map-int +#function("n2d0e1_326>0^;b1e0_31^K^p43;" [<= #function("qe0i12`f01`ub0lr2e0;" [#function("n1f01f10e031^KP2f01Nj01;" [])])]) +map! +#function("n2e1]e1F6O02e1e0e1M31O2e1Ni15502;" []) +map +#function("n2e1?6;0e1;e0e1M31d0e0e1N32K;" [map]) make-system-image -#function("n1b0d1e0d2d3d434b5d6p44;" [#function("q]h02b1b2lp42;" [*print-pretty* #function("qb0lb1lme0302;" [#function("n0d0b1ld23042;" [for-each #function("n1e0E16m02d0e031@16m02d1e031G@16m02d2e0f1132@16m02d3d1e03131@6\x9c0d4f10e0322d5f10b6322d4f10d1e031322d5f10b642;];" [constant? top-level-value memq iostream? io.print io.write "\n"]) environment]) #function("n1f00302d0e041;" [raise])]) #function("n0d0f00312f02h1;" [io.close *print-pretty*])]) file :write :create :truncate (*linefeed* *directory-separator* *argv* that *print-pretty* *print-width* *print-readably*) *print-pretty*]) +#function("n1b0d1e0d2d3d434b5d6p44;" [#function("q]h02b1b2lp42;" [*print-pretty* #function("qb0lb1lme0302;" [#function("n0d0b1ld2d3d430313142;" [for-each #function("n1e0E16m02d0e031@16m02d1e031G@16m02d2e0f1132@16m02d3d1e03131@6\x9c0d4f10e0322d5f10b6322d4f10d1e031322d5f10b642;];" [constant? top-level-value memq iostream? io.print io.write "\n"]) nreverse simple-sort environment]) #function("n1f00302d0e041;" [raise])]) #function("n0d0f00312f02h1;" [io.close *print-pretty*])]) file :write :create :truncate (*linefeed* *directory-separator* *argv* that *print-pretty* *print-width* *print-readably*) *print-pretty*]) +make-label +#function("n1d040;" [gensym]) make-enum-table #function("n2b0d130p42;" [#function("q_d0d1f013131b2lr;" [1- length #function("n1d0f00f11e0Zf10e0t43;" [put!])]) table]) +make-code-emitter +#function("n0^d030_Y3;" [table]) +macroexpand-in +#function("n2e0?6;0e0;b0d1e0Me132p42;" [#function("qe06L0d0d1e031f00NQd2e03142;b3d4f0031p42;" [macroexpand-in cadr caddr #function("qe06E0d0e0f10NQf1142;f10Mb1<6S0f10;f10Mb2<6\x800d3b2d4f1031d0d5f1031f1132d6f103144;f10Mb7<6\xa20b8d4f1031d9d:f103131p43;d;b0e0f00Ns;f00;" []) macrocall?]) macroexpand #function("n1d0e0^42;" [macroexpand-in]) -lookup-sym -#function("n4e1A6;0b0;b1e1Mp42;" [(global) #function("qb0d1f00e0_33p42;" [#function("qe06M0f136C0b0e0L2;b1f12e0L3;d2f10f11Nf1317b02f00A6k0f125p0f12`t]44;" [arg closed lookup-sym]) index-of])]) macrocall? #function("n1e0MC16E02d0d1e0M]43;" [get *syntax-environment*]) -macroexpand-in -#function("n2e0?6;0e0;b0d1e0Me132p42;" [#function("qe06L0d0d1e031f00NQd2e03142;b3d4f0031p42;" [macroexpand-in cadr caddr #function("qe06E0d0e0f10NQf1142;f10Mb1<6S0f10;f10Mb2<6\x800d3b2d4f1031d0d5f1031f1132d6f103144;f10Mb7<6\xa20b8d4f1031d9d:f103131p43;d;b0^;e0Md1e0Ne1`u32K;" [<= list-head]) -list* -#function("o0e0N?6=0e0M;e0Md0e0NQK;" [list*]) -list->vector -#function("n1d0e0s;" [vector]) list-partition #function("n2b0]p42;" [#function("qb0li02d1f01_326I0d2b341;d4e0f00f01_^^3541;" [#function("n5e0?6O0d0e2_326L0d1e331e4K;e4;d2e2e1326o0f00e0e1_^d1e331e4K45;f00e0Ne1`e2te0Me3Ke445;" [> nreverse >=]) <= error "list-partition: invalid count" nreverse])]) -list? -#function("n1e0A17I02e0F16I02d0e0N41;" [list?]) -load-process -#function("n1d0e041;" [eval]) +list-head +#function("n2d0e1_326>0^;e0Md1e0Ne1`u32K;" [<= list-head]) +list->vector +#function("n1d0e0s;" [vector]) +list* +#function("o0e0N?6=0e0M;e0Md0e0NQK;" [list*]) length> #function("n2e1_W6<0e0;e1_V6N0e0F16M02e0;e0A6Y0e1_W;d0e0Ne1`u42;" [length>]) length= @@ -150,20 +154,20 @@ lastcdr #function("n1e0?6;0e0;d0e0N41;" [lastcdr]) last-pair #function("n1e0?6;0e0;e0N?6E0e0;d0e0N41;" [last-pair]) -iota -#function("n1d0d1e042;" [map-int identity]) just-compile-args #function("n3d0b1le142;" [for-each #function("n1d0f00f02]e044;" [compile-in])]) +iota +#function("n1d0d1e042;" [map-int identity]) io.readline #function("n1d0e0b142;" [io.readuntil #\x000a]) -in-env? -#function("n2d0b1le142;" [any #function("n1d0f00e042;" [memq])]) -hex5 -#function("n1d0d1e0a@32a5b243;" [string.lpad number->string #\0]) -identity -#function("n1e0;" []) index-of #function("n3e1A6:0];e0e1M<6F0e2;d0e0e1Ne2`t43;" [index-of]) +in-env? +#function("n2d0b1le142;" [any #function("n1d0f00e042;" [memq])]) +identity +#function("n1e0;" []) +hex5 +#function("n1d0d1e0a@32a5b243;" [string.lpad number->string #\0]) get-defined-vars #function("n1d0f00e03141;" [delete-duplicates] #0=[#function("n1e0?6:0^;e0Mb0<16I02e0NF6\x8c0d1e031C16`02d1e031L117\x8b02d1e031F16\x8502d2e031C16\x8502d2e031L117\x8b02^;e0Mb3<6\xa30d4d5f00e0N32s;^;" [define cadr caadr begin append map] #0#) ()]) for-each @@ -172,10 +176,10 @@ foldr #function("n3e2A6;0e1;e0e2Md0e0e1e2N3342;" [foldr]) foldl #function("n3e2A6;0e1;d0e0e0e2Me132e2N43;" [foldl]) -filter -#function("n2f00e0e1^43;" [] #0=[#function("n3e1A6;0e2;e0e1M316V0f00e0e1Ne1Me2K43;f00e0e1Ne243;" [] #0#) ()]) fits-i8 #function("n1e0I16O02d0e0a\xb03216O02d1e0a\xaf42;" [>= <=]) +filter +#function("n2f00e0e1^43;" [] #0=[#function("n3e1A6;0e2;e0e1M316V0f00e0e1Ne1Me2K43;f00e0e1Ne243;" [] #0#) ()]) f-body #function("n1b0f00e031p42;" [#function("qb0d1e031p42;" [#function("qe0A6;0f00;b0e0f00L3d1b2le032K;" [lambda map #function("n1];" [])]) get-defined-vars])] [#function("n1e0?6:0];e0N^<6F0e0M;b0e0K;" [begin]) ()]) expand @@ -200,86 +204,86 @@ disassemble #function("o1e1A6J0d0e0_322d1302\\;5K0]2b2d3e031e1Mp43;" [disassemble newline #function("qb0e0_Ze0`Zp43;" [#function("qb0]p42;" [#function("qb0li02b1_d2f0031p43;" [#function("n1e0J16>02e0G@6T0d0b1312d2e0f21`t42;d3e041;" [princ "\n" disassemble print]) #function("q]e0e1W6M02b0d1b2l]d333p32520;" [#function("qd0f00_326C0d1305D0]2_f31`ub2lr2d3d4f0031b5d6d7e031`32b8342f00`tj002b9e0p42;" [> newline #function("n1d0b141;" [princ "\t"]) princ hex5 ": " string.tail string "\t" #function("qd0e0b1326Z0f20f31d2f30f1032Z312f10a4tj10;d0e0b3326\x7f0f20f31f30f10ZZ312f10`tj10;d0e0b4326\xa30d5d6f30f10Z31312f10`tj10;d0e0b7326\xe20d5d6f30f10Z31b8322f10`tj102d5d6f30f10Z31312f10`tj10;d0e0b9326\x0c0d5b:d;dstring (:loadc :setc) " " (:jmp :brf :brt) "@" hex5 ref-uint16-LE (:jmp.l :brf.l :brt.l)])]) table.foldl #function("n3e217J02e1f20f00Z<16J02e0;" []) Instructions]) length])])]) function->vector]) delete-duplicates #function("n1e0?6;0e0;b0e0Me0Np43;" [#function("qd0e0e1326C0d1e141;e0d1e131K;" [member delete-duplicates])]) -copy-tree -#function("n1e0?6;0e0;d0e0M31d0e0N31K;" [copy-tree]) count #function("n2b0]p42;" [#function("qb0li02e0f00f01_43;" [#function("n3e1A6;0e2;f00e0e1Ne0e1M316T0e2`t5V0e243;" [])])]) +copy-tree +#function("n1e0?6;0e0;d0e0M31d0e0N31K;" [copy-tree]) copy-list #function("n1e0?6;0e0;e0Md0e0N31K;" [copy-list]) const-to-idx-vec #function("n1b0d1e0a2Z31p42;" [#function("qd0b1lf00`Z322e0;" [table.foreach #function("n2f00e1e0[;" [])]) vector.alloc]) cond-clauses->if #function("n1e0?6:0];b0e0Mp42;" [#function("qe0Mb0<17A02e0M\\<6K0b1e0NK;b2e0Mb1e0NKd3f00N31L4;" [else begin if cond-clauses->if])]) -compile-while -#function("n4b0d1e031d1e031p43;" [#function("qd0f00f01]]342d1f00e0322d0f00f01]f02342d2f00d3e1332d2f00d4322d0f00f01]f03342d2f00d5e0332d1f00e142;" [compile-in mark-label emit :brf :pop :jmp]) make-label]) cond->if #function("n1d0e0N41;" [cond-clauses->if]) +compile-while +#function("n4b0d1e031d1e031p43;" [#function("qd0f00f01]]342d1f00e0322d0f00f01]f02342d2f00d3e1332d2f00d4322d0f00f01]f03342d2f00d5e0332d1f00e142;" [compile-in mark-label emit :brf :pop :jmp]) make-label]) +compile-thunk +#function("n1d0b1^e0L341;" [compile lambda]) compile-sym #function("n4b0d1e2e1_\\34p42;" [#function("qb0e0Mp42;" [#function("qe0b0=6M0d1f10f13_Zd2f003143;e0b3=6p0d1f10f13`Zd2f0031d4f003144;d1f10f13a2Zf1243;" [arg emit cadr closed caddr])]) lookup-sym]) +compile-short-circuit +#function("n6e3?6E0d0e0e1e2e444;e3N?6Z0d0e0e1e2e3M44;b1d2e031p42;" [compile-in #function("qd0f00f01]f03M342d1f00d2322d1f00f05e0332d1f00d3322d4f00f01f02f03Nf04f05362d5f00e042;" [compile-in emit :dup :pop compile-short-circuit mark-label]) make-label]) compile-prog1 #function("n3d0e0e1]d1e231342d2e231F6e0d3e0e1]d2e231342d4e0d542;];" [compile-in cadr cddr compile-begin emit :pop]) compile-or #function("n4d0e0e1e2e3]d146;" [compile-short-circuit :brt]) compile-let #function("n4b0e3Me3Np43;" [#function("qd0e1d1d2e03131326H0]5T0d3d4b5e032312d6f00d7d8f01e0\\33332b9d:f00f01e133p42;" [length= length cadr error string "apply: incorrect number of arguments to " emit :loadv compile-f #function("qd0f10d1322d0f10f126K0d25M0d3`e0t43;" [emit :copyenv :tcall :call]) compile-arglist])]) -compile-short-circuit -#function("n6e3?6E0d0e0e1e2e444;e3N?6Z0d0e0e1e2e3M44;b1d2e031p42;" [compile-in #function("qd0f00f01]f03M342d1f00d2322d1f00f05e0332d1f00d3322d4f00f01f02f03Nf04f05362d5f00e042;" [compile-in emit :dup :pop compile-short-circuit mark-label]) make-label]) -compile-thunk -#function("n1d0b1^e0L341;" [compile lambda]) +compile-in +#function("n4e3C6E0d0e0e1e3b144;e3?6\xba0e3_<6[0d2e0d342;e3`<6k0d2e0d442;e3\\<6{0d2e0d542;e3]<6\x8b0d2e0d642;e3^<6\x9b0d2e0d742;d8e3316\xaf0d2e0d9e343;d2e0d:e343;b;e3Mp42;" [compile-sym [:loada :loadc :loadg] emit :load0 :load1 :loadt :loadf :loadnil fits-i8 :loadi8 :loadv #function("qe0b0=6J0d1f00d2d3f033143;e0b4=6g0d5f00f01f02d6f033144;e0b7=6\x800d8f00f01f02f0344;e0b9=6\x9a0d:f00f01f02f03N44;e0b;=6\xb00df01f0332332d1f00d?42;e0b@=6\xf00dAf00f01f02f03N44;e0bB=6\x0a0dCf00f01f02f03N44;e0bD=6.0dEf00f01d3f0331b9dFf0331K44;e0bG=6V1dHf00f01d3f0331dIf0331dJf033145;e0bK=6{1d5f00f01\\d3f0331342d1f00dL42;e0bM=6\xaa1d5f00f01]dIf0331342dNf00f01d3f0331bO44;e0bP=6\x001d5f00f01]b=^d3f0331L3342dQdIf0331316\xdc1]5\xe21dRbS312d5f00f01]dIf0331342d1f00dT42;dUf00f01f02f0344;" [quote emit :loadv cadr cond compile-in cond->if if compile-if begin compile-begin prog1 compile-prog1 lambda compile-f :closure and compile-and or compile-or while compile-while cddr for compile-for caddr cadddr return :ret set! compile-sym [:seta :setc :setg] trycatch 1arg-lambda? error "trycatch: second form must be a 1-argument lambda" :trycatch compile-app])]) compile-if #function("n4b0d1e031d1e031p43;" [#function("qd0f00f01]d1f0331342d2f00d3e0332d0f00f01f02d4f0331342f026w0d2f00d5325\x820d2f00d6e1332d7f00e0322d0f00f01f02d8f0331F6\xad0d9f03315\xae0]342d7f00e142;" [compile-in cadr emit :brf caddr :ret :jmp mark-label cdddr cadddr]) make-label]) compile-for #function("n5d0e4316h0d1e0e1]e2342d1e0e1]e3342d1e0e1]e4342d2e0d342;d4b541;" [1arg-lambda? compile-in emit :for error "for: third form must be a 1-argument lambda"]) +compile-f +#function("o2b0d130d2e131p43;" [#function("qf02A@6D0d0e0d1325w0d2e131A6_0d0e0d3d4e131335w0d0e0d5e1?6o0_5u0d4e131332d6e0d7e131f00K\\d8f0131342d0e0d9322d:d;e0_Z31db?43;d1f50f20f1043;d1f50f5216l12f20d@<6t1dA5w1f2042;" [:list emit :loadnil :+ :load0 :add2 :- argc-error :neg :sub2 :* :load1 :/ :vector :loadv [] :apply :tapply])]) get arg-counts emit :tcall :call]) compile-arglist]) builtin->instruction]) in-env? constant? top-level-value])]) compile-begin #function("n4e3?6D0d0e0e1e2]44;e3N?6Y0d0e0e1e2e3M44;d0e0e1]e3M342d1e0d2322d3e0e1e2e3N44;" [compile-in emit :pop compile-begin]) +compile-arglist +#function("n3b0d1e2d232p42;" [#function("qe06g0d0f00d1f02d232f01332b3d4d5b6ld7e0d23232Kp322d2`t;d0f00f02f01332d8f0241;" [just-compile-args list-head MAX_ARGS #function("qd0f10f11]e044;" [compile-in]) nconc map #function("n1d0e0K;" [list]) list-partition length]) length> MAX_ARGS]) +compile-app +#function("n4b0e3Mp42;" [#function("qe0F16N02e0Mb0<16N02d1d2e031316b0d3f00f01f02f0344;d4f00f01f02f0344;" [lambda list? cadr compile-let compile-call])]) compile-and #function("n4d0e0e1e2e3\\d146;" [compile-short-circuit :brf]) compile #function("n1d0^e042;" [compile-f]) -compile-app -#function("n4b0e3Mp42;" [#function("qe0F16N02e0Mb0<16N02d1d2e031316b0d3f00f01f02f0344;d4f00f01f02f0344;" [lambda list? cadr compile-let compile-call])]) -compile-arglist -#function("n3b0d1e2d232p42;" [#function("qe06g0d0f00d1f02d232f01332b3d4d5b6ld7e0d23232Kp322d2`t;d0f00f02f01332d8f0241;" [just-compile-args list-head MAX_ARGS #function("qd0f10f11]e044;" [compile-in]) nconc map #function("n1d0e0K;" [list]) list-partition length]) length> MAX_ARGS]) -compile-f -#function("o2b0d130d2e131p43;" [#function("qf02A@6D0d0e0d1325w0d2e131A6_0d0e0d3d4e131335w0d0e0d5e1?6o0_5u0d4e131332d6e0d7e131f00K\\d8f0131342d0e0d9322d:d;e0_Z31df01f0332332d1f00d?42;e0b@=6\xf00dAf00f01f02f03N44;e0bB=6\x0a0dCf00f01f02f03N44;e0bD=6.0dEf00f01d3f0331b9dFf0331K44;e0bG=6V1dHf00f01d3f0331dIf0331dJf033145;e0bK=6{1d5f00f01\\d3f0331342d1f00dL42;e0bM=6\xaa1d5f00f01]dIf0331342dNf00f01d3f0331bO44;e0bP=6\x001d5f00f01]b=^d3f0331L3342dQdIf0331316\xdc1]5\xe21dRbS312d5f00f01]dIf0331342d1f00dT42;dUf00f01f02f0344;" [quote emit :loadv cadr cond compile-in cond->if if compile-if begin compile-begin prog1 compile-prog1 lambda compile-f :closure and compile-and or compile-or while compile-while cddr for compile-for caddr cadddr return :ret set! compile-sym [:seta :setc :setg] trycatch 1arg-lambda? error "trycatch: second form must be a 1-argument lambda" :trycatch compile-app])]) char? #function("n1d0e031b1<;" [typeof wchar]) cddr #function("n1e0NN;" []) -cdar -#function("n1e0MN;" []) -cdaar -#function("n1e0MMN;" []) -cdadr -#function("n1e0NMN;" []) -cddar -#function("n1e0MNN;" []) cdddr #function("n1e0NNN;" []) -cadar -#function("n1e0MNM;" []) -cadddr -#function("n1e0NNNM;" []) -caddr -#function("n1e0NNM;" []) -caaar -#function("n1e0MMM;" []) -caadr -#function("n1e0NMM;" []) -caar -#function("n1e0MM;" []) +cddar +#function("n1e0MNN;" []) +cdar +#function("n1e0MN;" []) +cdadr +#function("n1e0NMN;" []) +cdaar +#function("n1e0MMN;" []) cadr #function("n1e0NM;" []) +caddr +#function("n1e0NNM;" []) +cadddr +#function("n1e0NNNM;" []) +cadar +#function("n1e0MNM;" []) +caar +#function("n1e0MM;" []) +caadr +#function("n1e0NMM;" []) +caaar +#function("n1e0MMM;" []) builtin->instruction #function("n1b0d1d2b3e03231p42;" [#function("qd0d1e03216@02e0;" [has? Instructions]) intern string #\:]) -bq-bracket1 -#function("n1e0F16@02e0Mb0<6J0d1e041;d2e041;" [*comma* cadr bq-process]) bq-process #function("n1d0e0316T0e0H6Q0b1d2d3e03131p42;e0;e0?6a0b4e0L2;e0Mb5<6y0d2d2d6e0313141;e0Mb7<6\x890d6e041;d8d9e032@6\xa90b:d;e031de0^p43;" [self-evaluating? #function("qe0Mb0<6A0d1e0NK;d2d1e0L3;" [list vector apply]) bq-process vector->list quote backquote cadr *comma* any splice-form? #function("qe0A6=0b0e1K;d1b2e1Kd3e031L142;" [list nconc nlist* bq-process]) lastcdr map bq-bracket1 #function("q]e0F16A02e0Mb0<@6Z02d1e0M31e1Ki12e0Ni05202b2e0F6t0d3e1d4e031L1325\x910e0A6\x830d5e1315\x910d3e1d6e031L132p42;" [*comma* bq-bracket #function("qe0NA6<0e0M;b0e0K;" [nconc]) nreconc cadr nreverse bq-process])]) +bq-bracket1 +#function("n1e0F16@02e0Mb0<6J0d1e041;d2e041;" [*comma* cadr bq-process]) bq-bracket #function("n1e0?6C0d0d1e031L2;e0Mb2<6W0d0d3e031L2;e0Mb4<6k0b5d3e031L2;e0Mb6<6{0d3e041;d0d1e031L2;" [list bq-process *comma* cadr *comma-at* copy-list *comma-dot*]) assv @@ -294,16 +298,16 @@ append2 #function("n2e0A6;0e1;e0Md0e0Ne132K;" [append2]) append #function("o0e0A6:0^;e0NA6E0e0M;d0e0Md1e0NQ42;" [append2 append]) +any +#function("n2e1F16O02e0e1M3117O02d0e0e1N42;" [any]) abs #function("n1e0_W6=0e0v;e0;" []) +__start +#function("n1d0302e0NF6Q0e0Nh12d2d3e031315a0e0h12d4d5312d6302d7_41;" [__init_globals *argv* __script cadr princ *banner* repl exit]) __script #function("n1b0lb1lm;" [#function("n0d0f0041;" [load]) #function("n1d0e0312d1`41;" [print-exception exit])]) __init_globals #function("n0d0b1<17K02d0b2<17K02d0b3<6Z0b4h52b6h75c0b8h52b9h72d:h;2dh?;" [*os-name* win32 win64 windows "\\" *directory-separator* "\r\n" *linefeed* "/" "\n" *stdout* *output-stream* *stdin* *input-stream* *stderr* *error-stream*]) -__start -#function("n1d0302e0NF6Q0e0Nh12d2d3e031315a0e0h12d4d5312d6302d7_41;" [__init_globals *argv* __script cadr princ *banner* repl exit]) -any -#function("n2e1F16O02e0e1M3117O02d0e0e1N42;" [any]) MAX_ARGS 127 Instructions @@ -316,12 +320,12 @@ Instructions #function("n2e0e1W17A02e0e1V;" []) 1arg-lambda? #function("n1e0F16e02e0Mb0<16e02e0NF16e02d1e031F16e02d2d1e031`42;" [lambda cadr length=]) -/= -#function("n2e0e1V@;" []) -1+ -#function("n1e0`t;" []) 1- #function("n1e0`u;" []) +1+ +#function("n1e0`t;" []) +/= +#function("n2e0e1V@;" []) *whitespace* "\t\n\v\f\r \u0085  ᠎           \u2028\u2029  　" *syntax-environment* diff --git a/femtolisp/system.lsp b/femtolisp/system.lsp index 488b7a3..56e13d5 100644 --- a/femtolisp/system.lsp +++ b/femtolisp/system.lsp @@ -104,6 +104,10 @@ (define (1- n) (- n 1)) (define (mod x y) (- x (* (/ x y) y))) (define remainder mod) +(define (random n) + (if (integer? n) + (remainder (rand) n) + (* (rand.double) n))) (define (abs x) (if (< x 0) (- x) x)) (define (identity x) x) (define (char? x) (eq? (typeof x) 'wchar)) @@ -725,6 +729,14 @@ (eprinc *linefeed*) #t) +(define (simple-sort l) + (if (or (null? l) (null? (cdr l))) l + (let* ((piv (car l)) + (halves (separate (lambda (x) (< x piv)) (cdr l)))) + (nconc (simple-sort (car halves)) + (list piv) + (simple-sort (cdr halves)))))) + (define (make-system-image fname) (let ((f (file fname :write :create :truncate)) (excludes '(*linefeed* *directory-separator* *argv* that @@ -741,7 +753,7 @@ (begin (io.print f s) (io.write f "\n") (io.print f (top-level-value s)) (io.write f "\n")))) - (environment)) + (simple-sort (environment))) (begin (io.close f) (set! *print-pretty* pp)))))