altos/scheme: Add vectors
authorKeith Packard <keithp@keithp.com>
Sun, 10 Dec 2017 08:02:00 +0000 (00:02 -0800)
committerKeith Packard <keithp@keithp.com>
Sun, 10 Dec 2017 08:02:00 +0000 (00:02 -0800)
Constant time and smaller can be a feature.

Signed-off-by: Keith Packard <keithp@keithp.com>
src/scheme/Makefile-inc
src/scheme/README
src/scheme/ao_scheme.h
src/scheme/ao_scheme_builtin.c
src/scheme/ao_scheme_builtin.txt
src/scheme/ao_scheme_const.lisp [deleted file]
src/scheme/ao_scheme_eval.c
src/scheme/ao_scheme_mem.c
src/scheme/ao_scheme_poly.c
src/scheme/ao_scheme_read.c
src/scheme/ao_scheme_read.h

index d23ee3d7a675a12b7b0ee76f0f7b7ff4085aafe5..1a080a4ee068024cdaf32fbe00d183cee4332d70 100644 (file)
@@ -15,7 +15,8 @@ SCHEME_SRCS=\
        ao_scheme_rep.c \
        ao_scheme_save.c \
        ao_scheme_stack.c \
-       ao_scheme_error.c 
+       ao_scheme_error.c \
+       ao_scheme_vector.c
 
 SCHEME_HDRS=\
        ao_scheme.h \
index 98932b44a964f93469b7a0243ccb4e2fbc24070b..a18457fd940cac57a9ede7ce9a5498c16323c6df 100644 (file)
@@ -5,6 +5,6 @@ This follows the R7RS with the following known exceptions:
 * No dynamic-wind or exceptions
 * No environments
 * No ports
-* No syntax-rules; (have classic macros)
+* No syntax-rules
 * No record types
 * No libraries
index 10518716940b9c7bb388c1798f2bdd419c61d7ba..896166174e691036d9b1b7c07ebb4c769ee68fd4 100644 (file)
@@ -104,7 +104,8 @@ extern uint8_t              ao_scheme_pool[AO_SCHEME_POOL + AO_SCHEME_POOL_EXTRA] __attribut
 #define AO_SCHEME_BOOL         10
 #define AO_SCHEME_BIGINT       11
 #define AO_SCHEME_FLOAT                12
-#define AO_SCHEME_NUM_TYPE     13
+#define AO_SCHEME_VECTOR       13
+#define AO_SCHEME_NUM_TYPE     14
 
 /* Leave two bits for types to use as they please */
 #define AO_SCHEME_OTHER_TYPE_MASK      0x3f
@@ -192,6 +193,13 @@ struct ao_scheme_float {
        float                   value;
 };
 
+struct ao_scheme_vector {
+       uint8_t                 type;
+       uint8_t                 pad1;
+       uint16_t                length;
+       ao_poly                 vals[];
+};
+
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 static inline uint32_t
 ao_scheme_int_bigint(int32_t i) {
@@ -500,6 +508,18 @@ ao_scheme_poly_float(ao_poly poly)
 float
 ao_scheme_poly_number(ao_poly p);
 
+static inline ao_poly
+ao_scheme_vector_poly(struct ao_scheme_vector *v)
+{
+       return ao_scheme_poly(v, AO_SCHEME_OTHER);
+}
+
+static inline struct ao_scheme_vector *
+ao_scheme_poly_vector(ao_poly poly)
+{
+       return ao_scheme_ref(poly);
+}
+
 /* memory functions */
 
 extern int ao_scheme_collects[2];
@@ -680,6 +700,32 @@ void
 ao_scheme_bigint_write(ao_poly i);
 
 extern const struct ao_scheme_type     ao_scheme_bigint_type;
+
+/* vector */
+
+void
+ao_scheme_vector_write(ao_poly v);
+
+void
+ao_scheme_vector_display(ao_poly v);
+
+struct ao_scheme_vector *
+ao_scheme_vector_alloc(uint16_t length, ao_poly fill);
+
+ao_poly
+ao_scheme_vector_get(ao_poly v, ao_poly i);
+
+ao_poly
+ao_scheme_vector_set(ao_poly v, ao_poly i, ao_poly p);
+
+struct ao_scheme_vector *
+ao_scheme_list_to_vector(struct ao_scheme_cons *cons);
+
+struct ao_scheme_cons *
+ao_scheme_vector_to_list(struct ao_scheme_vector *vector);
+
+extern const struct ao_scheme_type     ao_scheme_vector_type;
+
 /* prim */
 void
 ao_scheme_poly_write(ao_poly p);
index aa8186463ef6e9ff800db683f7bf883e5591ab57..ae96df7f188690bbd30a6e15ebb1f77e9d09fc97 100644 (file)
@@ -267,7 +267,6 @@ ao_scheme_do_write(struct ao_scheme_cons *cons)
                if (cons)
                        printf(" ");
        }
-       printf("\n");
        return _ao_scheme_bool_true;
 }
 
@@ -751,7 +750,7 @@ ao_poly
 ao_scheme_do_listp(struct ao_scheme_cons *cons)
 {
        ao_poly v;
-       if (!ao_scheme_check_argc(_ao_scheme_atom_led, cons, 1, 1))
+       if (!ao_scheme_check_argc(_ao_scheme_atom_list3f, cons, 1, 1))
                return AO_SCHEME_NIL;
        v = ao_scheme_arg(cons, 0);
        for (;;) {
@@ -864,5 +863,67 @@ ao_scheme_do_jiffies_per_second(struct ao_scheme_cons *cons)
        return (ao_scheme_int_poly(AO_SCHEME_JIFFIES_PER_SECOND));
 }
 
+ao_poly
+ao_scheme_do_vector(struct ao_scheme_cons *cons)
+{
+       return ao_scheme_vector_poly(ao_scheme_list_to_vector(cons));
+}
+
+ao_poly
+ao_scheme_do_vector_ref(struct ao_scheme_cons *cons)
+{
+       if (!ao_scheme_check_argc(_ao_scheme_atom_vector2dref, cons, 2, 2))
+               return AO_SCHEME_NIL;
+       if (!ao_scheme_check_argt(_ao_scheme_atom_vector2dref, cons, 0, AO_SCHEME_VECTOR, 0))
+               return AO_SCHEME_NIL;
+       return ao_scheme_vector_get(ao_scheme_arg(cons, 0), ao_scheme_arg(cons, 1));
+}
+
+ao_poly
+ao_scheme_do_vector_set(struct ao_scheme_cons *cons)
+{
+       if (!ao_scheme_check_argc(_ao_scheme_atom_vector2dset21, cons, 3, 3))
+               return AO_SCHEME_NIL;
+       if (!ao_scheme_check_argt(_ao_scheme_atom_vector2dset21, cons, 0, AO_SCHEME_VECTOR, 0))
+               return AO_SCHEME_NIL;
+       return ao_scheme_vector_set(ao_scheme_arg(cons, 0), ao_scheme_arg(cons, 1), ao_scheme_arg(cons, 2));
+}
+
+ao_poly
+ao_scheme_do_list_to_vector(struct ao_scheme_cons *cons)
+{
+       if (!ao_scheme_check_argc(_ao_scheme_atom_list2d3evector, cons, 1, 1))
+               return AO_SCHEME_NIL;
+       if (!ao_scheme_check_argt(_ao_scheme_atom_list2d3evector, cons, 0, AO_SCHEME_CONS, 0))
+               return AO_SCHEME_NIL;
+       return ao_scheme_vector_poly(ao_scheme_list_to_vector(ao_scheme_poly_cons(ao_scheme_arg(cons, 0))));
+}
+
+ao_poly
+ao_scheme_do_vector_to_list(struct ao_scheme_cons *cons)
+{
+       if (!ao_scheme_check_argc(_ao_scheme_atom_vector2d3elist, cons, 1, 1))
+               return AO_SCHEME_NIL;
+       if (!ao_scheme_check_argt(_ao_scheme_atom_vector2d3elist, cons, 0, AO_SCHEME_VECTOR, 0))
+               return AO_SCHEME_NIL;
+       return ao_scheme_cons_poly(ao_scheme_vector_to_list(ao_scheme_poly_vector(ao_scheme_arg(cons, 0))));
+}
+
+ao_poly
+ao_scheme_do_vector_length(struct ao_scheme_cons *cons)
+{
+       if (!ao_scheme_check_argc(_ao_scheme_atom_vector2d3elist, cons, 1, 1))
+               return AO_SCHEME_NIL;
+       if (!ao_scheme_check_argt(_ao_scheme_atom_vector2d3elist, cons, 0, AO_SCHEME_VECTOR, 0))
+               return AO_SCHEME_NIL;
+       return ao_scheme_integer_poly(ao_scheme_poly_vector(ao_scheme_arg(cons, 0))->length);
+}
+
+ao_poly
+ao_scheme_do_vectorp(struct ao_scheme_cons *cons)
+{
+       return ao_scheme_do_typep(AO_SCHEME_VECTOR, cons);
+}
+
 #define AO_SCHEME_BUILTIN_FUNCS
 #include "ao_scheme_builtin.h"
index cb65e252ce27030b4d973943664185d0121ecbe9..e7b3d75cdb8fe97bf751c325ef760e4fce275055 100644 (file)
@@ -66,3 +66,10 @@ f_lambda     finitep         finite?
 f_lambda       infinitep       infinite?
 f_lambda       inexactp        inexact?
 f_lambda       sqrt
+f_lambda       vector_ref      vector-ref
+f_lambda       vector_set      vector-set!
+f_lambda       vector
+f_lambda       list_to_vector  list->vector
+f_lambda       vector_to_list  vector->list
+f_lambda       vector_length   vector-length
+f_lambda       vectorp         vector?
diff --git a/src/scheme/ao_scheme_const.lisp b/src/scheme/ao_scheme_const.lisp
deleted file mode 100644 (file)
index 422bdd6..0000000
+++ /dev/null
@@ -1,813 +0,0 @@
-;
-; Copyright © 2016 Keith Packard <keithp@keithp.com>
-;
-; This program is free software; you can redistribute it and/or modify
-; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation, either version 2 of the License, or
-; (at your option) any later version.
-;
-; This program is distributed in the hope that it will be useful, but
-; WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-; General Public License for more details.
-;
-; Lisp code placed in ROM
-
-                                       ; return a list containing all of the arguments
-(def (quote list) (lambda l l))
-
-(def (quote def!)
-     (macro (name value)
-           (list
-            def
-            (list quote name)
-            value)
-           )
-     )
-
-(begin
- (def! append
-   (lambda args
-         (def! append-list
-           (lambda (a b)
-             (cond ((null? a) b)
-                   (else (cons (car a) (append-list (cdr a) b)))
-                   )
-             )
-           )
-           
-         (def! append-lists
-           (lambda (lists)
-             (cond ((null? lists) lists)
-                   ((null? (cdr lists)) (car lists))
-                   (else (append-list (car lists) (append-lists (cdr lists))))
-                   )
-             )
-           )
-         (append-lists args)
-         )
-   )
- 'append)
-
-(append '(a b c) '(d e f) '(g h i))
-
-                                       ; boolean operators
-
-(begin
- (def! or
-   (macro l
-         (def! _or
-           (lambda (l)
-             (cond ((null? l) #f)
-                   ((null? (cdr l))
-                    (car l))
-                   (else
-                    (list
-                     cond
-                     (list
-                      (car l))
-                     (list
-                      'else
-                      (_or (cdr l))
-                      )
-                     )
-                    )
-                   )
-             )
-           )
-         (_or l)))
- 'or)
-
-                                       ; execute to resolve macros
-
-(or #f #t)
-
-(begin
- (def! and
-   (macro l
-         (def! _and
-           (lambda (l)
-             (cond ((null? l) #t)
-                   ((null? (cdr l))
-                    (car l))
-                   (else
-                    (list
-                     cond
-                     (list
-                      (car l)
-                      (_and (cdr l))
-                      )
-                     )
-                    )
-                   )
-             )
-           )
-         (_and l)
-         )
-   )
- 'and)
-
-                                       ; execute to resolve macros
-
-(and #t #f)
-
-(begin
- (def! quasiquote
-   (macro (x)
-         (def! constant?
-                                       ; A constant value is either a pair starting with quote,
-                                       ; or anything which is neither a pair nor a symbol
-
-           (lambda (exp)
-             (cond ((pair? exp)
-                    (eq? (car exp) 'quote)
-                    )
-                   (else
-                    (not (symbol? exp))
-                    )
-                   )
-             )
-           )
-         (def! combine-skeletons
-           (lambda (left right exp)
-             (cond
-              ((and (constant? left) (constant? right)) 
-               (cond ((and (eqv? (eval left) (car exp))
-                           (eqv? (eval right) (cdr exp)))
-                      (list 'quote exp)
-                      )
-                     (else
-                      (list 'quote (cons (eval left) (eval right)))
-                      )
-                     )
-               )
-              ((null? right)
-               (list 'list left)
-               )
-              ((and (pair? right) (eq? (car right) 'list))
-               (cons 'list (cons left (cdr right)))
-               )
-              (else
-               (list 'cons left right)
-               )
-              )
-             )
-           )
-
-         (def! expand-quasiquote
-           (lambda (exp nesting)
-             (cond
-
-                                       ; non cons -- constants
-                                       ; themselves, others are
-                                       ; quoted
-
-              ((not (pair? exp)) 
-               (cond ((constant? exp)
-                      exp
-                      )
-                     (else
-                      (list 'quote exp)
-                      )
-                     )
-               )
-
-                                       ; check for an unquote exp and
-                                       ; add the param unquoted
-
-              ((and (eq? (car exp) 'unquote) (= (length exp) 2))
-               (cond ((= nesting 0)
-                      (car (cdr exp))
-                      )
-                     (else
-                      (combine-skeletons ''unquote 
-                                         (expand-quasiquote (cdr exp) (- nesting 1))
-                                         exp))
-                     )
-               )
-
-                                       ; nested quasi-quote --
-                                       ; construct the right
-                                       ; expression
-
-              ((and (eq? (car exp) 'quasiquote) (= (length exp) 2))
-               (combine-skeletons ''quasiquote 
-                                  (expand-quasiquote (cdr exp) (+ nesting 1))
-                                  exp))
-
-                                       ; check for an
-                                       ; unquote-splicing member,
-                                       ; compute the expansion of the
-                                       ; value and append the rest of
-                                       ; the quasiquote result to it
-
-              ((and (pair? (car exp))
-                    (eq? (car (car exp)) 'unquote-splicing)
-                    (= (length (car exp)) 2))
-               (cond ((= nesting 0)
-                      (list 'append (car (cdr (car exp)))
-                            (expand-quasiquote (cdr exp) nesting))
-                      )
-                     (else
-                      (combine-skeletons (expand-quasiquote (car exp) (- nesting 1))
-                                         (expand-quasiquote (cdr exp) nesting)
-                                         exp))
-                     )
-               )
-
-                                       ; for other lists, just glue
-                                       ; the expansion of the first
-                                       ; element to the expansion of
-                                       ; the rest of the list
-
-              (else (combine-skeletons (expand-quasiquote (car exp) nesting)
-                                       (expand-quasiquote (cdr exp) nesting)
-                                       exp)
-                    )
-              )
-             )
-           )
-         (def! result (expand-quasiquote x 0))
-         result
-         )
-   )
- 'quasiquote)
-
-                                       ;
-                                       ; Define a variable without returning the value
-                                       ; Useful when defining functions to avoid
-                                       ; having lots of output generated.
-                                       ;
-                                       ; Also accepts the alternate
-                                       ; form for defining lambdas of
-                                       ; (define (name x y z) sexprs ...) 
-                                       ;
-
-(begin
- (def! define
-   (macro (first . rest)
-                                       ; check for alternate lambda definition form
-
-         (cond ((list? first)
-                (set! rest
-                      (append
-                       (list
-                        'lambda
-                        (cdr first))
-                       rest))
-                (set! first (car first))
-                )
-               (else
-                (set! rest (car rest))
-                )
-               )
-         (def! result `(,begin
-                        (,def (,quote ,first) ,rest)
-                        (,quote ,first))
-           )
-         result
-         )
-   )
- 'define
- )
-
-                                       ; basic list accessors
-
-(define (caar l) (car (car l)))
-
-(define (cadr l) (car (cdr l)))
-
-(define (cdar l) (cdr (car l)))
-
-(define (caddr l) (car (cdr (cdr l))))
-
-                                       ; (if <condition> <if-true>)
-                                       ; (if <condition> <if-true> <if-false)
-
-(define if
-  (macro (test . args)
-        (cond ((null? (cdr args))
-               `(cond (,test ,(car args)))
-               )
-              (else
-               `(cond (,test ,(car args))
-                      (else ,(cadr args)))
-               )
-              )
-        )
-  )
-
-(if (> 3 2) 'yes)
-(if (> 3 2) 'yes 'no)
-(if (> 2 3) 'no 'yes)
-(if (> 2 3) 'no)
-
-                                       ; simple math operators
-
-(define zero? (macro (value) `(eq? ,value 0)))
-
-(zero? 1)
-(zero? 0)
-(zero? "hello")
-
-(define positive? (macro (value) `(> ,value 0)))
-
-(positive? 12)
-(positive? -12)
-
-(define negative? (macro (value) `(< ,value 0)))
-
-(negative? 12)
-(negative? -12)
-
-(define (abs x) (if (>= x 0) x (- x)))
-
-(abs 12)
-(abs -12)
-
-(define max (lambda (first . rest)
-                  (while (not (null? rest))
-                    (cond ((< first (car rest))
-                           (set! first (car rest)))
-                          )
-                    (set! rest (cdr rest))
-                    )
-                  first)
-  )
-
-(max 1 2 3)
-(max 3 2 1)
-
-(define min (lambda (first . rest)
-                  (while (not (null? rest))
-                    (cond ((> first (car rest))
-                           (set! first (car rest)))
-                          )
-                    (set! rest (cdr rest))
-                    )
-                  first)
-  )
-
-(min 1 2 3)
-(min 3 2 1)
-
-(define (even? x) (zero? (% x 2)))
-
-(even? 2)
-(even? -2)
-(even? 3)
-(even? -1)
-
-(define (odd? x) (not (even? x)))
-
-(odd? 2)
-(odd? -2)
-(odd? 3)
-(odd? -1)
-
-
-(define (list-tail x k)
-  (if (zero? k)
-      x
-    (list-tail (cdr x (- k 1)))
-    )
-  )
-
-(define (list-ref x k)
-  (car (list-tail x k))
-  )
-
-                                       ; define a set of local
-                                       ; variables all at once and
-                                       ; then evaluate a list of
-                                       ; sexprs
-                                       ;
-                                       ; (let (var-defines) sexprs)
-                                       ;
-                                       ; where var-defines are either
-                                       ;
-                                       ; (name value)
-                                       ;
-                                       ; or
-                                       ;
-                                       ; (name)
-                                       ;
-                                       ; e.g.
-                                       ;
-                                       ; (let ((x 1) (y)) (set! y (+ x 1)) y)
-
-(define let
-  (macro (vars . exprs)
-        (define (make-names vars)
-          (cond ((not (null? vars))
-                 (cons (car (car vars))
-                       (make-names (cdr vars))))
-                (else ())
-                )
-          )
-
-                                       ; the parameters to the lambda is a list
-                                       ; of nils of the right length
-
-        (define (make-vals vars)
-          (cond ((not (null? vars))
-                 (cons (cond ((null? (cdr (car vars))) ())
-                             (else
-                              (car (cdr (car vars))))
-                             )
-                       (make-vals (cdr vars))))
-                (else ())
-                )
-          )
-                                       ; prepend the set operations
-                                       ; to the expressions
-
-                                       ; build the lambda.
-
-        `((lambda ,(make-names vars) ,@exprs) ,@(make-vals vars))
-        )
-     )
-                  
-
-(let ((x 1) (y)) (set! y 2) (+ x y))
-
-                                       ; define a set of local
-                                       ; variables one at a time and
-                                       ; then evaluate a list of
-                                       ; sexprs
-                                       ;
-                                       ; (let* (var-defines) sexprs)
-                                       ;
-                                       ; where var-defines are either
-                                       ;
-                                       ; (name value)
-                                       ;
-                                       ; or
-                                       ;
-                                       ; (name)
-                                       ;
-                                       ; e.g.
-                                       ;
-                                       ; (let* ((x 1) (y)) (set! y (+ x 1)) y)
-
-(define let*
-  (macro (vars . exprs)
-
-                                       ;
-                                       ; make the list of names in the let
-                                       ;
-
-        (define (make-names vars)
-          (cond ((not (null? vars))
-                 (cons (car (car vars))
-                       (make-names (cdr vars))))
-                (else ())
-                )
-          )
-
-                                       ; the set of expressions is
-                                       ; the list of set expressions
-                                       ; pre-pended to the
-                                       ; expressions to evaluate
-
-        (define (make-exprs vars exprs)
-          (cond ((null? vars) exprs)
-                (else
-                 (cons
-                  (list set
-                        (list quote
-                              (car (car vars))
-                              )
-                        (cond ((null? (cdr (car vars))) ())
-                              (else (cadr (car vars))))
-                        )
-                  (make-exprs (cdr vars) exprs)
-                  )
-                 )
-                )
-          )
-
-                                       ; the parameters to the lambda is a list
-                                       ; of nils of the right length
-
-        (define (make-nils vars)
-          (cond ((null? vars) ())
-                (else (cons () (make-nils (cdr vars))))
-                )
-          )
-                                       ; build the lambda.
-
-        `((lambda ,(make-names vars) ,@(make-exprs vars exprs)) ,@(make-nils vars))
-        )
-     )
-
-(let* ((x 1) (y x)) (+ x y))
-
-(define when (macro (test . l) `(cond (,test ,@l))))
-
-(when #t (write 'when))
-
-(define unless (macro (test . l) `(cond ((not ,test) ,@l))))
-
-(unless #f (write 'unless))
-
-(define (reverse list)
-  (let ((result ()))
-    (while (not (null? list))
-      (set! result (cons (car list) result))
-      (set! list (cdr list))
-      )
-    result)
-  )
-
-(reverse '(1 2 3))
-
-(define (list-tail x k)
-  (if (zero? k)
-      x
-    (list-tail (cdr x) (- k 1))))
-
-(list-tail '(1 2 3) 2)
-
-(define (list-ref x k) (car (list-tail x k)))
-
-(list-ref '(1 2 3) 2)
-    
-                                       ; recursive equality
-
-(define (equal? a b)
-  (cond ((eq? a b) #t)
-       ((and (pair? a) (pair? b))
-        (and (equal? (car a) (car b))
-             (equal? (cdr a) (cdr b)))
-        )
-       (else #f)
-       )
-  )
-
-(equal? '(a b c) '(a b c))
-(equal? '(a b c) '(a b b))
-
-(define member (lambda (obj list . test?)
-                     (cond ((null? list)
-                            #f
-                            )
-                           (else
-                            (if (null? test?) (set! test? equal?) (set! test? (car test?)))
-                            (if (test? obj (car list))
-                                list
-                              (member obj (cdr list) test?))
-                            )
-                           )
-                     )
-  )
-
-(member '(2) '((1) (2) (3)))
-
-(member '(4) '((1) (2) (3)))
-
-(define (memq obj list) (member obj list eq?))
-
-(memq 2 '(1 2 3))
-
-(memq 4 '(1 2 3))
-
-(memq '(2) '((1) (2) (3)))
-
-(define (memv obj list) (member obj list eqv?))
-
-(memv 2 '(1 2 3))
-
-(memv 4 '(1 2 3))
-
-(memv '(2) '((1) (2) (3)))
-
-(define (_assoc obj list test?)
-  (if (null? list)
-      #f
-    (if (test? obj (caar list))
-       (car list)
-      (_assoc obj (cdr list) test?)
-      )
-    )
-  )
-
-(define (assq obj list) (_assoc obj list eq?))
-(define (assv obj list) (_assoc obj list eqv?))
-(define (assoc obj list) (_assoc obj list equal?))
-
-(assq 'a '((a 1) (b 2) (c 3)))
-(assv 'b '((a 1) (b 2) (c 3)))
-(assoc '(c) '((a 1) (b 2) ((c) 3)))
-
-(define char? integer?)
-
-(char? #\q)
-(char? "h")
-
-(define (char-upper-case? c) (<= #\A c #\Z))
-
-(char-upper-case? #\a)
-(char-upper-case? #\B)
-(char-upper-case? #\0)
-(char-upper-case? #\space)
-
-(define (char-lower-case? c) (<= #\a c #\a))
-
-(char-lower-case? #\a)
-(char-lower-case? #\B)
-(char-lower-case? #\0)
-(char-lower-case? #\space)
-
-(define (char-alphabetic? c) (or (char-upper-case? c) (char-lower-case? c)))
-
-(char-alphabetic? #\a)
-(char-alphabetic? #\B)
-(char-alphabetic? #\0)
-(char-alphabetic? #\space)
-
-(define (char-numeric? c) (<= #\0 c #\9))
-
-(char-numeric? #\a)
-(char-numeric? #\B)
-(char-numeric? #\0)
-(char-numeric? #\space)
-
-(define (char-whitespace? c) (or (<= #\tab c #\return) (= #\space c)))
-
-(char-whitespace? #\a)
-(char-whitespace? #\B)
-(char-whitespace? #\0)
-(char-whitespace? #\space)
-
-(define (char->integer c) c)
-(define (integer->char c) char-integer)
-
-(define (char-upcase c) (if (char-lower-case? c) (+ c (- #\A #\a)) c))
-
-(char-upcase #\a)
-(char-upcase #\B)
-(char-upcase #\0)
-(char-upcase #\space)
-
-(define (char-downcase c) (if (char-upper-case? c) (+ c (- #\a #\A)) c))
-
-(char-downcase #\a)
-(char-downcase #\B)
-(char-downcase #\0)
-(char-downcase #\space)
-
-(define string (lambda chars (list->string chars)))
-
-(display "apply\n")
-(apply cons '(a b))
-
-(define map
-  (lambda (proc . lists)
-        (define (args lists)
-          (cond ((null? lists) ())
-                (else
-                 (cons (caar lists) (args (cdr lists)))
-                 )
-                )
-          )
-        (define (next lists)
-          (cond ((null? lists) ())
-                (else
-                 (cons (cdr (car lists)) (next (cdr lists)))
-                 )
-                )
-          )
-        (define (domap lists)
-          (cond ((null? (car lists)) ())
-                (else
-                 (cons (apply proc (args lists)) (domap (next lists)))
-                 )
-                )
-          )
-        (domap lists)
-        )
-  )
-
-(map cadr '((a b) (d e) (g h)))
-
-(define for-each (lambda (proc . lists)
-                       (apply map proc lists)
-                       #t))
-
-(for-each display '("hello" " " "world" "\n"))
-
-(define (_string-ml strings)
-  (if (null? strings) ()
-    (cons (string->list (car strings)) (_string-ml (cdr strings)))
-    )
-  )
-
-(define string-map (lambda (proc . strings)
-                         (list->string (apply map proc (_string-ml strings))))))
-
-(string-map (lambda (x) (+ 1 x)) "HAL")
-
-(define string-for-each (lambda (proc . strings)
-                              (apply for-each proc (_string-ml strings))))
-
-(string-for-each write-char "IBM\n")
-
-(define (newline) (write-char #\newline))
-
-(newline)
-
-(call-with-current-continuation
- (lambda (exit)
-   (for-each (lambda (x)
-              (write "test" x)
-              (if (negative? x)
-                  (exit x)))
-            '(54 0 37 -3 245 19))
-   #t))
-
-
-                                       ; `q -> (quote q)
-                                       ; `(q) -> (append (quote (q)))
-                                       ; `(a ,(+ 1 2)) -> (append (quote (a)) (list (+ 1 2)))
-                                       ; `(a ,@(list 1 2 3) -> (append (quote (a)) (list 1 2 3))
-
-
-
-`(hello ,(+ 1 2) ,@(list 1 2 3) `foo)
-
-
-(define repeat
-  (macro (count . rest)
-        (define counter '__count__)
-        (cond ((pair? count)
-               (set! counter (car count))
-               (set! count (cadr count))
-               )
-              )
-        `(let ((,counter 0)
-               (__max__ ,count)
-               )
-           (while (< ,counter __max__)
-             ,@rest
-             (set! ,counter (+ ,counter 1))
-             )
-           )
-        )
-  )
-
-(repeat 2 (write 'hello))
-(repeat (x 3) (write 'goodbye x))
-
-(define case
-  (macro (test . l)
-                                       ; construct the body of the
-                                       ; case, dealing with the
-                                       ; lambda version ( => lambda)
-
-        (define (_unarrow l)
-          (cond ((null? l) l)
-                ((eq? (car l) '=>) `(( ,(cadr l) __key__)))
-                (else l))
-          )
-
-                                       ; Build the case elements, which is
-                                       ; simply a list of cond clauses
-
-        (define (_case l)
-
-          (cond ((null? l) ())
-
-                                       ; else case
-
-                ((eq? (caar l) 'else)
-                 `((else ,@(_unarrow (cdr (car l))))))
-
-                                       ; regular case
-                
-                (else
-                 (cons
-                  `((eqv? ,(caar l) __key__)
-                    ,@(_unarrow (cdr (car l))))
-                  (_case (cdr l)))
-                 )
-                )
-          )
-
-                                       ; now construct the overall
-                                       ; expression, using a lambda
-                                       ; to hold the computed value
-                                       ; of the test expression
-
-        `((lambda (__key__)
-            (cond ,@(_case l))) ,test)
-        )
-  )
-
-(case 12 (1 "one") (2 "two") (3 => (lambda (x) (write "the value is" x))) (12 "twelve") (else "else"))
-
-;(define number->string (lambda (arg . opt)
-;                            (let ((base (if (null? opt) 10 (car opt)))
-                                       ;
-;
-                               
index 9b3cf63e3d4cbe8a3104e70b3524a0f12b94ea72..907ecf0bacf3c593e3c7094af921df46a65dada6 100644 (file)
@@ -108,13 +108,7 @@ ao_scheme_eval_sexpr(void)
                DBGI("..frame "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");
                ao_scheme_v = ao_scheme_atom_get(ao_scheme_v);
                /* fall through */
-       case AO_SCHEME_BOOL:
-       case AO_SCHEME_INT:
-       case AO_SCHEME_BIGINT:
-       case AO_SCHEME_FLOAT:
-       case AO_SCHEME_STRING:
-       case AO_SCHEME_BUILTIN:
-       case AO_SCHEME_LAMBDA:
+       default:
                ao_scheme_stack->state = eval_val;
                break;
        }
index acc726c8a8fea8b0f834c48a63a084c0ff8b1576..fe4bc4f548bba562cf2340636f1e67e3933ff240 100644 (file)
@@ -467,6 +467,7 @@ static const struct ao_scheme_type * const ao_scheme_types[AO_SCHEME_NUM_TYPE] =
        [AO_SCHEME_BOOL] = &ao_scheme_bool_type,
        [AO_SCHEME_BIGINT] = &ao_scheme_bigint_type,
        [AO_SCHEME_FLOAT] = &ao_scheme_float_type,
+       [AO_SCHEME_VECTOR] = &ao_scheme_vector_type,
 };
 
 static int
index d726321ce2f9e0ddafd95ceec0a14b1b5f15200a..553585db33f80ab9884e642be4eff68c1b5a84ff 100644 (file)
@@ -68,6 +68,10 @@ static const struct ao_scheme_funcs ao_scheme_funcs[AO_SCHEME_NUM_TYPE] = {
                .write = ao_scheme_float_write,
                .display = ao_scheme_float_write,
        },
+       [AO_SCHEME_VECTOR] = {
+               .write = ao_scheme_vector_write,
+               .display = ao_scheme_vector_display
+       },
 };
 
 static const struct ao_scheme_funcs *
index 30e29441ff29aa0ccdf41a52e6e143bba3ef37b5..9ed54b9ffc28be9e36384726c2e6281fd5e8c28e 100644 (file)
@@ -340,6 +340,8 @@ _lex(void)
                                add_token(c);
                                end_token();
                                return BOOL;
+                       case '(':
+                               return OPEN_VECTOR;
                        case '\\':
                                for (;;) {
                                        int alphabetic;
@@ -474,10 +476,12 @@ int                       ao_scheme_read_list;
 struct ao_scheme_cons  *ao_scheme_read_cons;
 struct ao_scheme_cons  *ao_scheme_read_cons_tail;
 struct ao_scheme_cons  *ao_scheme_read_stack;
+static int             ao_scheme_read_state;
 
 #define READ_IN_QUOTE  0x01
 #define READ_SAW_DOT   0x02
 #define READ_DONE_DOT  0x04
+#define READ_SAW_VECTOR        0x08
 
 static int
 push_read_stack(int read_state)
@@ -490,7 +494,8 @@ push_read_stack(int read_state)
                                                                     ao_scheme_cons_poly(ao_scheme_read_stack)));
                if (!ao_scheme_read_stack)
                        return 0;
-       }
+       } else
+               ao_scheme_read_state = read_state;
        ao_scheme_read_cons = NULL;
        ao_scheme_read_cons_tail = NULL;
        return 1;
@@ -513,6 +518,7 @@ pop_read_stack(void)
                ao_scheme_read_cons = 0;
                ao_scheme_read_cons_tail = 0;
                ao_scheme_read_stack = 0;
+               read_state = ao_scheme_read_state;
        }
        RDBG_OUT();
        RDBGI("pop read stack %p %d\n", ao_scheme_read_cons, read_state);
@@ -532,7 +538,9 @@ ao_scheme_read(void)
        ao_scheme_read_cons = ao_scheme_read_cons_tail = ao_scheme_read_stack = 0;
        for (;;) {
                parse_token = lex();
-               while (parse_token == OPEN) {
+               while (parse_token == OPEN || parse_token == OPEN_VECTOR) {
+                       if (parse_token == OPEN_VECTOR)
+                               read_state |= READ_SAW_VECTOR;
                        if (!push_read_stack(read_state))
                                return AO_SCHEME_NIL;
                        ao_scheme_read_list++;
@@ -604,6 +612,8 @@ ao_scheme_read(void)
                        v = ao_scheme_cons_poly(ao_scheme_read_cons);
                        --ao_scheme_read_list;
                        read_state = pop_read_stack();
+                       if (read_state & READ_SAW_VECTOR)
+                               v = ao_scheme_vector_poly(ao_scheme_list_to_vector(ao_scheme_poly_cons(v)));
                        break;
                case DOT:
                        if (!ao_scheme_read_list) {
index e9508835139e32c6008957288b54dd7c89ddea42..e10a7d05bb516b8ad57abe3640bb0c763c20d3f6 100644 (file)
@@ -32,6 +32,7 @@
 # define FLOAT                 10
 # define DOT                   11
 # define BOOL                  12
+# define OPEN_VECTOR           13
 
 /*
  * character classes