diff --git a/scheme/cyclone/primitives.sld b/scheme/cyclone/primitives.sld index 83f3a41c..99261a8f 100644 --- a/scheme/cyclone/primitives.sld +++ b/scheme/cyclone/primitives.sld @@ -116,10 +116,10 @@ Cyc-default-exception-handler Cyc-current-exception-handler cons - ;Cyc-fast-list-1 - ;Cyc-fast-list-2 - ;Cyc-fast-list-3 - ;Cyc-fast-list-4 + Cyc-fast-list-1 + Cyc-fast-list-2 + Cyc-fast-list-3 + Cyc-fast-list-4 cell-get set-global! set-cell! @@ -256,10 +256,10 @@ (Cyc-default-exception-handler 1 1) (Cyc-current-exception-handler 0 0) (cons 2 2) - ;(Cyc-fast-list-1 1 1) - ;(Cyc-fast-list-2 2 2) - ;(Cyc-fast-list-3 3 3) - ;(Cyc-fast-list-4 4 4) + (Cyc-fast-list-1 1 1) + (Cyc-fast-list-2 2 2) + (Cyc-fast-list-3 3 3) + (Cyc-fast-list-4 4 4) (cell-get 1 1) (set-global! 2 2) (set-cell! 2 2) @@ -641,14 +641,11 @@ ((eq? p 'string?) "Cyc_is_string") ((eq? p 'eof-object?) "Cyc_is_eof_object") ((eq? p 'symbol?) "Cyc_is_symbol") - ;((eq? p 'cons) "make_pair") ((eq? p 'cons) "set_pair_as_expr") - ;((eq? p 'Cyc-fast-list-1) "make_list_1") - ;((eq? p 'Cyc-fast-list-2) "set_list_2_as_expr") - ;;((eq? p 'Cyc-fast-list-2) "make_list_2") - ;((eq? p 'Cyc-fast-list-3) "make_list_3") - ;((eq? p 'Cyc-fast-list-4) "make_list_4") - ;((eq? p 'cell) "make_cell") + ((eq? p 'Cyc-fast-list-1) "set_cell_as_expr") + ((eq? p 'Cyc-fast-list-2) "Cyc_fast_list_2") + ((eq? p 'Cyc-fast-list-3) "Cyc_fast_list_3") + ((eq? p 'Cyc-fast-list-4) "Cyc_fast_list_4") ((eq? p 'cell) "set_cell_as_expr") ((eq? p 'cell-get) "car") ;; Unsafe as cell gets added by compiler ((eq? p 'set-cell!) "Cyc_set_cell") @@ -758,7 +755,10 @@ (cond ((eq? p 'cons) "pair_type") ((eq? p 'cell) "pair_type") - ;((eq? p 'Cyc-fast-list-2) "list_2_type") + ((eq? p 'Cyc-fast-list-1) "pair_type") + ((eq? p 'Cyc-fast-list-2) "list_2_type") + ((eq? p 'Cyc-fast-list-3) "list_3_type") + ((eq? p 'Cyc-fast-list-4) "list_4_type") ((eq? p 'Cyc-fast-plus) "complex_num_type") ((eq? p 'Cyc-fast-sub) "complex_num_type") ((eq? p 'Cyc-fast-mul) "complex_num_type") diff --git a/scheme/cyclone/transforms.sld b/scheme/cyclone/transforms.sld index edde9bdf..f69449b4 100644 --- a/scheme/cyclone/transforms.sld +++ b/scheme/cyclone/transforms.sld @@ -1024,14 +1024,14 @@ (cons 'Cyc-fast-member (map (lambda (a) (convert a renamed)) (cdr ast)))) ((and (eq? (car ast) 'assoc) (= (length ast) 3)) (cons 'Cyc-fast-assoc (map (lambda (a) (convert a renamed)) (cdr ast)))) - ;;((and (eq? (car ast) 'list) (= (length ast) 2)) - ;; (cons 'Cyc-fast-list-1 (map (lambda (a) (convert a renamed)) (cdr ast)))) - ;;((and (eq? (car ast) 'list) (= (length ast) 3)) - ;; (cons 'Cyc-fast-list-2 (map (lambda (a) (convert a renamed)) (cdr ast)))) - ;;((and (eq? (car ast) 'list) (= (length ast) 4)) - ;; (cons 'Cyc-fast-list-3 (map (lambda (a) (convert a renamed)) (cdr ast)))) - ;;((and (eq? (car ast) 'list) (= (length ast) 5)) - ;; (cons 'Cyc-fast-list-4 (map (lambda (a) (convert a renamed)) (cdr ast)))) + ((and (eq? (car ast) 'list) (= (length ast) 2)) + (cons 'Cyc-fast-list-1 (map (lambda (a) (convert a renamed)) (cdr ast)))) + ((and (eq? (car ast) 'list) (= (length ast) 3)) + (cons 'Cyc-fast-list-2 (map (lambda (a) (convert a renamed)) (cdr ast)))) + ((and (eq? (car ast) 'list) (= (length ast) 4)) + (cons 'Cyc-fast-list-3 (map (lambda (a) (convert a renamed)) (cdr ast)))) + ((and (eq? (car ast) 'list) (= (length ast) 5)) + (cons 'Cyc-fast-list-4 (map (lambda (a) (convert a renamed)) (cdr ast)))) ((and (eq? (car ast) 'for-each) (= (length ast) 3)) (cons 'Cyc-for-each-loop-1 (map (lambda (a) (convert a renamed)) (cdr ast)))) ((and (eq? (car ast) 'map) (= (length ast) 3))