From 036eaf26ac972b050c76267c10ceeb7bf5a40e82 Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Fri, 27 Feb 2009 16:49:46 -0500 Subject: [PATCH] Various cleanup. --- dispatch.c | 10 ++++------ encoding.scm | 16 ++++++++-------- env.scm | 8 ++++---- library.scm | 4 ++-- primitives.c | 8 ++++---- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dispatch.c b/dispatch.c index 3a394be..0f32a2f 100644 --- a/dispatch.c +++ b/dispatch.c @@ -484,11 +484,11 @@ void interpreter (void) { case 8: arg2 = POP(); arg1 = POP(); prim_lt (); PUSH_ARG1(); break; case 9: - arg2 = POP(); arg1 = POP(); prim_ior (); PUSH_ARG1(); break; // TODO swap these 2 and geq, leq ? + arg2 = POP(); arg1 = POP(); prim_leq (); PUSH_ARG1(); break; case 10: arg2 = POP(); arg1 = POP(); prim_gt (); PUSH_ARG1(); break; case 11: - arg2 = POP(); arg1 = POP(); prim_xor (); PUSH_ARG1(); break; + arg2 = POP(); arg1 = POP(); prim_geq (); PUSH_ARG1(); break; case 12: arg1 = POP(); prim_pairp (); PUSH_ARG1(); break; case 13: @@ -684,12 +684,10 @@ void interpreter (void) { arg2 = POP(); arg1 = POP(); prim_send_packet_from_u8vector (); PUSH_ARG1(); break; case 5: - /* prim #% <= */ - arg2 = POP(); arg1 = POP(); prim_leq (); PUSH_ARG1(); break; + arg2 = POP(); arg1 = POP(); prim_ior (); PUSH_ARG1(); break; break; case 6: - /* prim #% >= */ - arg2 = POP(); arg1 = POP(); prim_geq (); PUSH_ARG1(); break; + arg2 = POP(); arg1 = POP(); prim_xor (); PUSH_ARG1(); break; break; #if 0 case 7: diff --git a/encoding.scm b/encoding.scm index 00d9d1f..3ed9919 100644 --- a/encoding.scm +++ b/encoding.scm @@ -297,9 +297,9 @@ (define (prim.neg) (prim 6)) (define (prim.=) (prim 7)) (define (prim.<) (prim 8)) - (define (prim.ior) (prim 9)) + (define (prim.<=) (prim 9)) (define (prim.>) (prim 10)) - (define (prim.xor) (prim 11)) + (define (prim.>=) (prim 11)) (define (prim.pair?) (prim 12)) (define (prim.cons) (prim 13)) (define (prim.car) (prim 14)) @@ -341,8 +341,8 @@ (define (prim.network-cleanup) (prim 50)) (define (prim.receive-packet-to-u8vector) (prim 51)) (define (prim.send-packet-from-u8vector) (prim 52)) - (define (prim.<=) (prim 53)) - (define (prim.>=) (prim 54)) + (define (prim.ior) (prim 53)) + (define (prim.xor) (prim 54)) (define big-endian? #f) @@ -482,9 +482,9 @@ ((#%neg) (prim.neg)) ((#%=) (prim.=)) ((#%<) (prim.<)) - ((#%ior) (prim.ior)) + ((#%<=) (prim.<=)) ((#%>) (prim.>)) - ((#%xor) (prim.xor)) + ((#%>=) (prim.>=)) ((#%pair?) (prim.pair?)) ((#%cons) (prim.cons)) ((#%car) (prim.car)) @@ -523,8 +523,8 @@ ((#%network-cleanup) (prim.network-cleanup)) ((#%receive-packet-to-u8vector) (prim.receive-packet-to-u8vector)) ((#%send-packet-from-u8vector) (prim.send-packet-from-u8vector)) - ((#%<=) (prim.<=)) - ((#%>=) (prim.>=)) + ((#%ior) (prim.ior)) + ((#%xor) (prim.xor)) (else (compiler-error "unknown primitive" (cadr instr))))) diff --git a/env.scm b/env.scm index 983a89c..a15eabc 100644 --- a/env.scm +++ b/env.scm @@ -37,9 +37,9 @@ (make-var '#%neg #t '() '() '() #f (make-primitive 1 #f #f)) (make-var '#%= #t '() '() '() #f (make-primitive 2 #f #f)) (make-var '#%< #t '() '() '() #f (make-primitive 2 #f #f)) - (make-var '#%ior #t '() '() '() #f (make-primitive 2 #f #f)) + (make-var '#%<= #t '() '() '() #f (make-primitive 2 #f #f)) (make-var '#%> #t '() '() '() #f (make-primitive 2 #f #f)) - (make-var '#%xor #t '() '() '() #f (make-primitive 2 #f #f)) + (make-var '#%>= #t '() '() '() #f (make-primitive 2 #f #f)) (make-var '#%pair? #t '() '() '() #f (make-primitive 1 #f #f)) (make-var '#%cons #t '() '() '() #f (make-primitive 2 #f #f)) (make-var '#%car #t '() '() '() #f (make-primitive 1 #f #f)) @@ -78,8 +78,8 @@ (make-var '#%network-cleanup #t '() '() '() #f (make-primitive 0 #f #t)) (make-var '#%receive-packet-to-u8vector #t '() '() '() #f (make-primitive 1 #f #f)) (make-var '#%send-packet-from-u8vector #t '() '() '() #f (make-primitive 2 #f #f)) - (make-var '#%<= #t '() '() '() #f (make-primitive 2 #f #f)) - (make-var '#%>= #t '() '() '() #f (make-primitive 2 #f #f)) + (make-var '#%ior #t '() '() '() #f (make-primitive 2 #f #f)) + (make-var '#%xor #t '() '() '() #f (make-primitive 2 #f #f)) (make-var '#%readyq #t '() '() '() #f #f) ;; TODO put in a meaningful order diff --git a/library.scm b/library.scm index c52e9a6..6c4056b 100644 --- a/library.scm +++ b/library.scm @@ -75,7 +75,7 @@ (define <= (lambda (x y) - (or (#%< x y) (#%= x y)))) + (#%<= x y))) (define > (lambda (x y) @@ -83,7 +83,7 @@ (define >= (lambda (x y) - (or (#%> x y) (#%= x y)))) + (#%>= x y))) (define pair? (lambda (x) diff --git a/primitives.c b/primitives.c index 8efb243..69e50e2 100644 --- a/primitives.c +++ b/primitives.c @@ -21,9 +21,9 @@ char *prim_name[64] = "prim #%neg", "prim #%=", "prim #%<", - "prim #%ior", + "prim #%<=", "prim #%>", - "prim #%xor", + "prim #%>=", "prim #%pair?", "prim #%cons", "prim #%car", @@ -65,8 +65,8 @@ char *prim_name[64] = "prim #%network-cleanup", "prim #%receive-packet-to-u8vector", "prim #%send-packet-from-u8vector", - "prim #%<=", - "prim #%>=", + "prim #%ior", + "prim #%xor", "prim 55", "prim 56", "prim 57", -- 2.11.4.GIT