| @@ -37,25 +37,80 @@ · 36 unmodified lines |
| 37 | 37 | res = aa_bool(ctx, NUMBER(va).r op NUMBER(vb).r); \ |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | | −typedef struct { |
| 41 | | − char *p; |
| 42 | | − int n; |
| 43 | | −}CharPtrInt; |
| 44 | | − |
| 45 | 40 | enum { |
| 46 | | − P_LET, P_DEFINE, P_IF, P_LAMBDA, P_MAC, P_WHILE, P_QUOTE, P_AND, P_OR, P_BEGIN, P_CONS, |
| 47 | | − P_CAR, P_CDR, P_SETCAR, P_SETCDR, P_LIST, P_NOT, P_EQ, P_DISPLAY, |
| 48 | | − P_ATOM, P_NUMBER, P_BOOLEAN, P_DEFINED, P_STRING, |
| 49 | | − P_EQN, P_LT, P_GT, P_LTE, P_GTE, P_ADD, P_SUB, P_MUL, P_DIV, |
| 41 | + P_LET, |
| 42 | + P_DEFINE, |
| 43 | + P_IF, |
| 44 | + P_LAMBDA, |
| 45 | + P_MAC, |
| 46 | + P_WHILE, |
| 47 | + P_QUOTE, |
| 48 | + P_AND, |
| 49 | + P_OR, |
| 50 | + P_BEGIN, |
| 51 | + P_CONS, |
| 52 | + P_CAR, |
| 53 | + P_CDR, |
| 54 | + P_SETCAR, |
| 55 | + P_SETCDR, |
| 56 | + P_LIST, |
| 57 | + P_NOT, |
| 58 | + P_DISPLAY, |
| 59 | + P_EQ_HUH, |
| 60 | + P_ATOM_HUH, |
| 61 | + P_NUMBER_HUH, |
| 62 | + P_BOOLEAN_HUH, |
| 63 | + P_DEFINED_HUH, |
| 64 | + P_STRING_HUH, |
| 65 | + P_NAN_HUH, |
| 66 | + P_EQN, |
| 67 | + P_LT, |
| 68 | + P_GT, |
| 69 | + P_LTE, |
| 70 | + P_GTE, |
| 71 | + P_ADD, |
| 72 | + P_SUB, |
| 73 | + P_MUL, |
| 74 | + P_DIV, |
| 50 | 75 | |
| 51 | 76 | P_MAX |
| 52 | 77 | }; |
| 53 | 78 | |
| 54 | 79 | static const char *primnames[P_MAX] = { |
| 55 | | − "let", "define", "if", "lambda", "mac", "while", "quote", "and", "or", "begin", "cons", |
| 56 | | − "car", "cdr", "setcar", "setcdr", "list", "not", "eq?", "display", |
| 57 | | − "atom?", "number?", "boolean?", "defined?", "string?", |
| 58 | | − "=", "<", ">", "<=", ">=", "+", "-", "*", "/", |
| 80 | + "let", |
| 81 | + "define", |
| 82 | + "if", |
| 83 | + "lambda", |
| 84 | + "mac", |
| 85 | + "while", |
| 86 | + "quote", |
| 87 | + "and", |
| 88 | + "or", |
| 89 | + "begin", |
| 90 | + "cons", |
| 91 | + "car", |
| 92 | + "cdr", |
| 93 | + "setcar", |
| 94 | + "setcdr", |
| 95 | + "list", |
| 96 | + "not", |
| 97 | + "display", |
| 98 | + "eq?", |
| 99 | + "atom?", |
| 100 | + "number?", |
| 101 | + "boolean?", |
| 102 | + "defined?", |
| 103 | + "string?", |
| 104 | + "nan?", |
| 105 | + "=", |
| 106 | + "<", |
| 107 | + ">", |
| 108 | + "<=", |
| 109 | + ">=", |
| 110 | + "+", |
| 111 | + "-", |
| 112 | + "*", |
| 113 | + "/", |
| 59 | 114 | }; |
| 60 | 115 | |
| 61 | 116 | static const char *typenames[AA_TMAX] = { |
| @@ -691,7 +746,8 @@ eval(aaContext *ctx, aaObject *obj, aaObject *env, aaObject **newenv) · 629 unmodified lines |
| 691 | 746 | { |
| 692 | 747 | aaObject *fn, *arg, *res; |
| 693 | 748 | aaObject cl, *va, *vb; |
| 694 | | − int n, gc; |
| 749 | + aaNumber n; |
| 750 | + int i, gc; |
| 695 | 751 | |
| 696 | 752 | if(TYPE(obj) == AA_TSYMBOL){ |
| 697 | 753 | arg = getbound(obj, env); |
| @@ -749,10 +805,10 @@ eval(aaContext *ctx, aaObject *obj, aaObject *env, aaObject **newenv) · 51 unmodified lines |
| 749 | 805 | |
| 750 | 806 | case P_WHILE: |
| 751 | 807 | va = aa_nextarg(ctx, &arg, 0); |
| 752 | | − n = aa_savegc(ctx); |
| 808 | + i = aa_savegc(ctx); |
| 753 | 809 | while(!ISNIL(eval(ctx, va, env, nil))){ |
| 754 | 810 | runlist(ctx, arg, env); |
| 755 | | − aa_restoregc(ctx, n); |
| 811 | + aa_restoregc(ctx, i); |
| 756 | 812 | } |
| 757 | 813 | break; |
| 758 | 814 | |
| @@ -804,33 +860,38 @@ eval(aaContext *ctx, aaObject *obj, aaObject *env, aaObject **newenv) · 45 unmodified lines |
| 804 | 860 | res = aa_bool(ctx, !ISTRUE(va)); |
| 805 | 861 | break; |
| 806 | 862 | |
| 807 | | − case P_EQ: |
| 863 | + case P_EQ_HUH: |
| 808 | 864 | va = evalarg(); |
| 809 | 865 | vb = evalarg(); |
| 810 | 866 | res = aa_bool(ctx, va == vb); |
| 811 | 867 | break; |
| 812 | 868 | |
| 813 | | − case P_ATOM: |
| 869 | + case P_ATOM_HUH: |
| 814 | 870 | res = aa_bool(ctx, aa_type(ctx, evalarg()) != AA_TPAIR); |
| 815 | 871 | break; |
| 816 | 872 | |
| 817 | | − case P_NUMBER: |
| 873 | + case P_NUMBER_HUH: |
| 818 | 874 | res = aa_bool(ctx, aa_type(ctx, evalarg()) == AA_TNUMBER); |
| 819 | 875 | break; |
| 820 | 876 | |
| 821 | | − case P_BOOLEAN: |
| 877 | + case P_BOOLEAN_HUH: |
| 822 | 878 | res = aa_bool(ctx, aa_type(ctx, evalarg()) == AA_TBOOL); |
| 823 | 879 | break; |
| 824 | 880 | |
| 825 | | − case P_DEFINED: |
| 881 | + case P_DEFINED_HUH: |
| 826 | 882 | va = checktype(ctx, evalarg(), AA_TSYMBOL); |
| 827 | 883 | res = aa_bool(ctx, !ISUNBOUND(CDR(CDR(va)))); |
| 828 | 884 | break; |
| 829 | 885 | |
| 830 | | − case P_STRING: |
| 886 | + case P_STRING_HUH: |
| 831 | 887 | res = aa_bool(ctx, aa_type(ctx, evalarg()) == AA_TSTRING); |
| 832 | 888 | break; |
| 833 | 889 | |
| 890 | + case P_NAN_HUH: |
| 891 | + n = aa_tonumber(ctx, evalarg()); |
| 892 | + res = aa_bool(ctx, isNaN(n.r)); |
| 893 | + break; |
| 894 | + |
| 834 | 895 | case P_DISPLAY: |
| 835 | 896 | while(!ISNIL(arg)) |
| 836 | 897 | Bprint(&ctx->fd[1], "%ß%c", evalarg(), ISNIL(arg) ? 0 : ' '); |