WIP, temporarily reverted set params

This commit is contained in:
Justin Ethier 2017-03-15 11:32:43 +00:00
parent 8efb714097
commit b4a9d4ae42

View file

@ -957,9 +957,9 @@
"(void *data, int argc, closure _, object k, object obj)" "(void *data, int argc, closure _, object k, object obj)"
" make_pair(p, obj, NULL); " make_pair(p, obj, NULL);
gc_thread_data *thd = (gc_thread_data *)data; gc_thread_data *thd = (gc_thread_data *)data;
//Cyc_global_set(thd, thd->param_objs, &p); // TODO: needed?? seems to be segfauling, though
cdr(&p) = thd->param_objs; cdr(&p) = thd->param_objs;
thd->param_objs = (object)(&p); global_set((thd->param_objs), &p);
//thd->param_objs = (object)(&p);
return_closcall1(data, k, thd->param_objs); ") return_closcall1(data, k, thd->param_objs); ")
(define *parameter-id* 0) (define *parameter-id* 0)
(define (make-parameter init . o) (define (make-parameter init . o)
@ -976,19 +976,19 @@
(lambda args (lambda args
(cond (cond
((null? args) ((null? args)
(cdr (assoc key (get-param-objs)))) ;(cdr (assoc key (get-param-objs))))
;value) value)
((eq? (car args) '<param-set!>) ((eq? (car args) '<param-set!>)
(let ((cell (assoc key (get-param-objs)))) ;(let ((cell (assoc key (get-param-objs))))
(set-cdr! cell (cadr args)))) ; (set-cdr! cell (cadr args))))
;(set! value (cadr args))) (set! value (cadr args)))
((eq? (car args) '<param-convert>) ((eq? (car args) '<param-convert>)
converter) converter)
(else (else
;(error "bad parameter syntax" args) ;(error "bad parameter syntax" args)
(let ((cell (assoc key (get-param-objs)))) ;(let ((cell (assoc key (get-param-objs))))
(set-cdr! cell (converter (car args)))) ; (set-cdr! cell (converter (car args))))
;(set! value (converter (car args))) (set! value (converter (car args)))
))))) )))))
(define current-output-port (define current-output-port
(make-parameter (Cyc-stdout))) (make-parameter (Cyc-stdout)))