[Wisp-cvs] wisp/src/builtin builtin.wisp,1.210,1.211 codegen.wisp,1.66,1.67 dictbase.wisp,1.238,1.23
Status: Alpha
Brought to you by:
digg
Update of /cvsroot/wisp/wisp/src/builtin In directory usw-pr-cvs1:/tmp/cvs-serv4780/src/builtin Modified Files: builtin.wisp codegen.wisp dictbase.wisp lists.wisp objects.wisp stdenv.wisp Log Message: Dropped |vector-ref|. Index: builtin.wisp =================================================================== RCS file: /cvsroot/wisp/wisp/src/builtin/builtin.wisp,v retrieving revision 1.210 retrieving revision 1.211 diff -u -d -r1.210 -r1.211 --- builtin.wisp 4 Sep 2002 14:33:34 -0000 1.210 +++ builtin.wisp 7 Sep 2002 21:55:58 -0000 1.211 @@ -387,7 +387,7 @@ (define (binary-vector-contents-equal? a b start stop) (or (>= start stop) (and - (binary-equal? (vector-ref a start) (vector-ref b start)) + (binary-equal? a[start] b[start]) (binary-vector-contents-equal? a b (+ start 1) stop)))) (define (equal? first . rest) Index: codegen.wisp =================================================================== RCS file: /cvsroot/wisp/wisp/src/builtin/codegen.wisp,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- codegen.wisp 4 Sep 2002 14:40:13 -0000 1.66 +++ codegen.wisp 7 Sep 2002 21:55:58 -0000 1.67 @@ -405,7 +405,7 @@ (v (class->vector class))) (my vl (vector-length v) (while (< i vl) - (let ((s (vector-ref v i))) + (my s v[i] (cond ((not s)) ((cons? s) Index: dictbase.wisp =================================================================== RCS file: /cvsroot/wisp/wisp/src/builtin/dictbase.wisp,v retrieving revision 1.238 retrieving revision 1.239 diff -u -d -r1.238 -r1.239 --- dictbase.wisp 7 Sep 2002 21:54:05 -0000 1.238 +++ dictbase.wisp 7 Sep 2002 21:55:58 -0000 1.239 @@ -162,7 +162,6 @@ (local vector-fill! (asm NN_vector_fill)) (local vector-length (asm NN_vector_length)) (local vector-move! (asm NN_vector_move)) -(local vector-ref (asm NN_vector_ref)) (local vector? (asm NN_vector_huh)) (local wisp-string-hash (asm NN_wisp_string_hash)) Index: lists.wisp =================================================================== RCS file: /cvsroot/wisp/wisp/src/builtin/lists.wisp,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- lists.wisp 7 Sep 2002 21:54:55 -0000 1.104 +++ lists.wisp 7 Sep 2002 21:55:58 -0000 1.105 @@ -277,7 +277,7 @@ ; {{{ |vector->list| (define (vector->list vec) (do ((i (- (vector-length vec) 1) (- i 1)) - (l '() (cons (vector-ref vec i) l))) + (l '() (cons vec[i] l))) ((< i 0) l))) ; }}} Index: objects.wisp =================================================================== RCS file: /cvsroot/wisp/wisp/src/builtin/objects.wisp,v retrieving revision 1.156 retrieving revision 1.157 diff -u -d -r1.156 -r1.157 --- objects.wisp 26 Aug 2002 16:18:24 -0000 1.156 +++ objects.wisp 7 Sep 2002 21:55:58 -0000 1.157 @@ -26,7 +26,7 @@ (and (not (zero? i)) (begin (decr! i) - (my slot (vector-ref slots i) + (my slot slots[i] (if (eq? (if (cons? slot) (car slot) slot) @@ -38,9 +38,8 @@ (i (vector-length slots))) (while (not (zero? i)) (decr! i) - (let ((s (vector-ref slots i))) - (if s - (cons! sl (car s))))) + (and slots[i] -> s + (cons! sl (car s)))) sl)) (friend (class->vector c) (vector-copy slots)) @@ -49,20 +48,19 @@ (raise 'frozen c)) (for-each (lambda (x) - (set! (vector-ref slots (or (lookup-slot c x) - (raise 'unknown x))) #f)) + (set! slots[(or (lookup-slot c x) + (raise 'unknown x))] #f)) sl)) (friend (protect-slots c sl) (if frozen? (raise 'frozen c)) (for-each (lambda (x) - (set! (cadr (vector-ref slots - (or (lookup-slot c x) - (raise 'unknown x)))) #f)) + (set! (cadr slots[(or (lookup-slot c x) + (raise 'unknown x))]) #f)) sl)) (friend (make-instance c) - (let ((in (valloc (asm slots (l . 1) mat (tn . 2) addat mta)))) + (my in (valloc (asm slots (l . 1) mat (tn . 2) addat mta)) (asm (in . c) pt (s . 1) (tn . 10) s0) in))) @@ -87,7 +85,7 @@ (my i (vector-length slots) (while (not (zero? i)) (decr! i) - (type symbol (vector-ref slots i)))) + (type symbol slots[i]))) (set! slots (if superclass (vector-append (class->vector superclass) slots) @@ -96,7 +94,7 @@ (i (vector-length slots))) (while (not (zero? i)) (decr! i) - (let* ((sl (vector-ref slots i)) + (let* ((sl slots[i]) (sn (if (cons? sl) (car sl) sl))) @@ -104,7 +102,7 @@ (raise 'duplicate-slot-name sl) (begin (if (symbol? sl) - (set! (vector-ref slots i) (list sl #t))) + (set! slots[i] (list sl #t))) (set! (dict-ref d sn) #t)))))) (if superclass (type class superclass)) Index: stdenv.wisp =================================================================== RCS file: /cvsroot/wisp/wisp/src/builtin/stdenv.wisp,v retrieving revision 1.360 retrieving revision 1.361 diff -u -d -r1.360 -r1.361 --- stdenv.wisp 7 Sep 2002 21:54:05 -0000 1.360 +++ stdenv.wisp 7 Sep 2002 21:55:58 -0000 1.361 @@ -94,8 +94,8 @@ unsure-collect use utf-8->c16string utf-8-first-byte->length uwyde? vector vector->list vector-append vector-copy vector-fill! vector-length - vector-move! vector-ref vector? void? wisp-string-hash - write write-char write-string writeln zero?))))) + vector-move! vector? void? wisp-string-hash write + write-char write-string writeln zero?))))) ((*origin obj) ; => (original-name source-data ...) | #f (cond ; check for the regular environment |