Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-25 04:55:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Justin Ethier 2017-08-14 13:44:17 +00:00
parent d69acb1148
commit d699e1e846
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
read.scm
View file

@ -698,7 +698,8 @@
" Cyc_io_read_token(data, k, port);") " Cyc_io_read_token(data, k, port);")
(write (write
(read-token (open-input-file "test.scm"))) (parse2 (open-input-file "test.scm")))
;(read-token (open-input-file "test.scm")))
;; Notes on writing a fast parser: ;; Notes on writing a fast parser:
; - Interface to the user is (read). This needs to be fast ; - Interface to the user is (read). This needs to be fast
@ -729,8 +730,19 @@
(define (parse2 fp) (define (parse2 fp)
(let ((token (read-token fp))) ;; TODO: this will be a C call (let ((token (read-token fp))) ;; TODO: this will be a C call
;(write `(token ,token))
(cond (cond
;; Open paren, start read loop ;; Open paren, start read loop
((eq? token #\()
(let loop ((lis '())
(t (parse2 fp)))
(cond
;; TODO: EOF
((eq? t #\))
(reverse lis))
(else
(loop (cons t lis) (parse2 fp)))))
)
;; Close parent, stop current read loop ;; Close parent, stop current read loop
;; Quote ;; Quote
;; , - could be unquote or unquote-splicing ;; , - could be unquote or unquote-splicing

5
runtime.c
View file

@ -5719,12 +5719,13 @@ void _read_whitespace(port_type *p)
break; // Return if buf is empty break; // Return if buf is empty
} }
} }
p->buf_idx++;
if (p->mem_buf[p->buf_idx] == '\n') { if (p->mem_buf[p->buf_idx] == '\n') {
p->buf_idx++;
p->line_num++; // Ignore col_num since we are just skipping over chars p->line_num++; // Ignore col_num since we are just skipping over chars
p->col_num = 0; p->col_num = 0;
break; break;
} else if (isspace(p->mem_buf[p->buf_idx])) { } else if (isspace(p->mem_buf[p->buf_idx])) {
p->buf_idx++;
p->col_num++; p->col_num++;
} else { } else {
break; // Terminate on non-whitespace char break; // Terminate on non-whitespace char
@ -5747,7 +5748,7 @@ void _read_return_atom(void *data, object cont, port_type *p)
p->buf_idx--; p->buf_idx--;
p->col_num--; p->col_num--;
p->tok_buf[p->tok_end + 1] = '\0'; // TODO: what if buffer is full? p->tok_buf[p->tok_end] = '\0'; // TODO: what if buffer is full?
p->tok_end = 0; // Reset for next atom p->tok_end = 0; // Reset for next atom
printf("TODO: return atom from %s\n", p->tok_buf); printf("TODO: return atom from %s\n", p->tok_buf);
return_closcall1(data, cont, boolean_f); return_closcall1(data, cont, boolean_f);