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

WIP

Browse source
This commit is contained in:
Justin Ethier 2017-08-12 18:15:02 -04:00
parent a0782973b1
commit 24bfd89774
3 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gc.c
View file

@ -489,6 +489,10 @@ char *gc_copy_obj(object dest, char *obj, gc_thread_data * thd)
hp->line_num = ((port_type *) obj)->line_num;
hp->col_num = ((port_type *) obj)->col_num;
hp->buf_idx = ((port_type *) obj)->buf_idx;
hp->tok_start = ((port_type *) obj)->tok_start;
hp->tok_end = ((port_type *) obj)->tok_end;
hp->tok_buf = ((port_type *) obj)->tok_buf;
hp->tok_buf_len = ((port_type *) obj)->tok_buf_len;
hp->mem_buf = ((port_type *)obj)->mem_buf;
hp->mem_buf_len = ((port_type *)obj)->mem_buf_len;
return (char *)hp;

12
include/cyclone/types.h
View file

@ -782,6 +782,10 @@ typedef struct {
unsigned int line_num;
unsigned int col_num;
unsigned int buf_idx;
unsigned int tok_start; // Start of token in mem_buf (end is unknown yet)
unsigned int tok_end; // End of token in tok_buf (start is tok_buf[0])
char *tok_buf; // Alternative buffer for tokens
size_t tok_buf_len;
char *mem_buf;
size_t mem_buf_len;
} port_type;
@ -800,6 +804,10 @@ typedef struct {
p.line_num = 0; \
p.col_num = 0; \
p.buf_idx = 0; \
p.tok_start = 0; \
p.tok_end = 0; \
p.tok_buf = NULL; \
p.tok_buf_len = 0; \
p.mem_buf = NULL; \
p.mem_buf_len = 0;
@ -814,6 +822,10 @@ typedef struct {
p.line_num = 0; \
p.col_num = 0; \
p.buf_idx = 0; \
p.tok_start = 0; \
p.tok_end = 0; \
p.tok_buf = NULL; \
p.tok_buf_len = 0; \
p.mem_buf = malloc(CYC_IO_BUF_LEN); \
p.mem_buf_len = 0;

12
runtime.c
View file

@ -3442,6 +3442,11 @@ object Cyc_io_close_port(void *data, object port)
((port_type *)port)->mem_buf = NULL;
((port_type *)port)->mem_buf_len = 0;
}
if (((port_type *)port)->tok_buf != NULL){
free( ((port_type *)port)->tok_buf );
((port_type *)port)->tok_buf = NULL;
((port_type *)port)->tok_buf_len = 0;
}
}
return port;
}
@ -5759,9 +5764,10 @@ void Cyc_io_read_token(void *data, object cont, object port)
// TODO: if buffer is not empty, return that instead, otherwise return this:
return_closcall1(data, cont, obj_char2obj(c));
// TODO: " (string)
// TODO: #
// TODO: | (literal identifier)
} else if (c == '"') {
Cyc_rt_raise_msg(data, "TODO: parsing for strings");
} else if (c == '#') {
Cyc_rt_raise_msg(data, "TODO: parsing for #");
} else {
// TODO: no, need to read chars into a new buffer. can be part of mem_buf with a
// starting idx, except: