From f0def28d9aeeb7f1f9b3d8880a34a05ec59d80ed Mon Sep 17 00:00:00 2001 From: lemon Date: Sun, 14 Aug 2022 07:25:40 +0200 Subject: multiline comment and stuff --- bootstrap/parse.c | 12 ++++++++++++ bootstrap/types.c | 2 +- misc/cff.vim | 5 ++++- src/map.hff | 34 +++++----------------------------- src/set.hff | 40 +++++++++++++++++++++++----------------- src/vec.hff | 4 ++++ vgcore.175407 | Bin 6742016 -> 0 bytes vgcore.175479 | Bin 6746112 -> 0 bytes vgcore.175493 | Bin 6746112 -> 0 bytes vgcore.4466 | Bin 0 -> 6606848 bytes vgcore.4599 | Bin 0 -> 6606848 bytes 11 files changed, 49 insertions(+), 48 deletions(-) delete mode 100644 vgcore.175407 delete mode 100644 vgcore.175479 delete mode 100644 vgcore.175493 create mode 100644 vgcore.4466 create mode 100644 vgcore.4599 diff --git a/bootstrap/parse.c b/bootstrap/parse.c index be32985..8707709 100644 --- a/bootstrap/parse.c +++ b/bootstrap/parse.c @@ -394,6 +394,18 @@ lex(struct parser *P) { tok.t = '#FIL'; } else if (!strcmp(s, "#LINE")) { tok.t = '#LIN'; + } else if (!strcmp(s, "#!")) { + if (chr(P) != '{') fatal(P, P->tokspan, "expected '{' after '#!'"); + int bal = 1; + while (bal != 0) { + switch (lex(P).t) { + case '{': ++bal; break; + case '}': --bal; break; + case TKeof: fatal(P, tok.span, "unterminated comment"); + } + } + return lex(P); + } else { fatal(P, P->tokspan, "invalid #keyword"); } diff --git a/bootstrap/types.c b/bootstrap/types.c index 289f69f..0be365f 100644 --- a/bootstrap/types.c +++ b/bootstrap/types.c @@ -10,7 +10,7 @@ static struct { } **buckets; char *tags; } types; -static vec_t(const struct type *) typesvec; +static vec_t(const struct type *) typesvec; // insertion order void inittypes() { diff --git a/misc/cff.vim b/misc/cff.vim index e6e59f9..64e0914 100644 --- a/misc/cff.vim +++ b/misc/cff.vim @@ -28,6 +28,9 @@ syn match cNumber display contained "\d\+\%(\vu|u8|i8|u16|i32|u32|i64|u64|z|zs| syn match cNumber display contained "0x\x\+\%(\vu|u8|i8|u16|i32|u32|i64|u64|z|zs|p|ps\V\)\?\>" syn match cFloat display contained "\d\+\.\d*\%(f\|f32\|f64\)\?\>" -syn region Comment start="//" end="$" syn region String start=+"+ skip=+\\\\\|\\"+ end=+"+ extend syn region Character start=+'+ skip=+\\\\\|\\'+ end=+'+ extend +syn region Comment start="//" end="$" +syn region mComment start="#!{" end="}" contains=mComment,mCommentBraces,String,Character +syn region mCommentBraces contained start=+[^'"!]{+ end="}" contains=mCommentBraces,String + diff --git a/src/map.hff b/src/map.hff index d8bbf52..6900878 100644 --- a/src/map.hff +++ b/src/map.hff @@ -31,35 +31,6 @@ struct Map { assert(#f, "unreachable"); } - fn put(self *Map, key K, val V) void { - if self.keys == #null { - assert(self.vals == #null and self.bitmap == #null and self.N == 0 and self.count == 0, - "?"); - self.keys = xcalloc(self.N = 16, sizeof K); - self.vals = xcalloc(self.N, sizeof V); - self.bitmap = xcalloc(self.N / 8, 1); - } - - if self.count == self.N / 2 { - // rehash - } - let i0 u32 = KTraits:hash(key); - let i = i0 & (self.N - 1); - do { - if self->_iempty(i) { - self.bitmap[i/8] |= (1 << (i%8)); - ++self.count; - self.vals[i] = val; - return; - } else if KTraits:eq(self.keys[i], key) { - self.vals[i] = val; - return; - } - i = (i + 1) & (self.N - 1); - } while i != i0; - assert(#f, "unreachable"); - } - fn get_slot(self *Map, key K) *V { if self.keys == #null { assert(self.vals == #null and self.bitmap == #null and self.N == 0 and self.count == 0, @@ -88,4 +59,9 @@ struct Map { assert(#f, "unreachable"); } + + fn put(self *Map, key K, val V) void { + *self->get_slot(key) = val; + } + } diff --git a/src/set.hff b/src/set.hff index 28e67be..396d63c 100644 --- a/src/set.hff +++ b/src/set.hff @@ -1,32 +1,34 @@ import "vec.hff"; import "all.hff"; -// KTraits: -// :hash(K) u32 -// :eq(T, T) bool -// :dup(T) T + + +#!{ KTraits: + :hash(K) u32 + :eq(T, T) bool + :dup(T) T } struct Set { buf Vec, - set **const T, + set *int, N int, count int, fn intern(self *Set, x T) *const T { if self.set == #null { - self.set = xcalloc(self.N = 16, sizeof *T); + self.set = xcalloc(self.N = 16, sizeof int); } if self.count == self.N / 2 { free(self.set); - self.set = xcalloc(self.N *= 2, sizeof *T); + self.set = xcalloc(self.N *= 2, sizeof int); vec_each(p, i, self.buf, - let i = Traits:hash(p) & (self.N - 1); + let j = Traits:hash(p) & (self.N - 1); for ;; { - if self.set[i] == #null { - self.set[i] = &self.buf.dat[i]; + if self.set[j] == 0 { + self.set[j] = i + 1; break; } - i = (i + 1) & (self.N - 1); + j = (j + 1) & (self.N - 1); } ) } @@ -34,12 +36,16 @@ struct Set { let i0 u32 = Traits:hash(x) & (self.N - 1); let i int = i0; do { - if self.set[i] == #null { + if self.set[i] == 0 { ++self.count; self.buf->push(Traits:dup(x)); - return self.set[i] = &self.buf.dat[self.buf.len - 1]; - } else if Traits:eq(*self.set[i], x) { - return self.set[i]; + self.set[i] = self.buf.len; + return self.buf->lastp(); + } else { + let x2 = &self.buf.dat[self.set[i] - 1]; + if Traits:eq(*x2, x) { + return x2; + } } i = (i + 1) & (self.N - 1); } while i != i0; @@ -50,9 +56,9 @@ struct Set { let i0 u32 = Traits:hash(x) & (self.N - 1); let i int = i0; do { - if self.set[i] == #null { + if self.set[i] == 0 { return #f; - } else if Traits:eq(*self.set[i], x) { + } else if Traits:eq(self.buf.dat[self.set[i] - 1], x) { return #t; } i = (i + 1) & (self.N - 1); diff --git a/src/vec.hff b/src/vec.hff index 9099b85..be29fec 100644 --- a/src/vec.hff +++ b/src/vec.hff @@ -33,6 +33,10 @@ struct Vec { } return vec.dat[0::vec.len]; } + + fn last(vec *const Vec) T { return vec.dat[vec.len - 1]; } + + fn lastp(vec *Vec) *T { return &vec.dat[vec.len - 1]; } } defmacro vec_each(x, i, v, ...body) [ diff --git a/vgcore.175407 b/vgcore.175407 deleted file mode 100644 index a8392d9..0000000 Binary files a/vgcore.175407 and /dev/null differ diff --git a/vgcore.175479 b/vgcore.175479 deleted file mode 100644 index 45a85d8..0000000 Binary files a/vgcore.175479 and /dev/null differ diff --git a/vgcore.175493 b/vgcore.175493 deleted file mode 100644 index 99dd454..0000000 Binary files a/vgcore.175493 and /dev/null differ diff --git a/vgcore.4466 b/vgcore.4466 new file mode 100644 index 0000000..84ab589 Binary files /dev/null and b/vgcore.4466 differ diff --git a/vgcore.4599 b/vgcore.4599 new file mode 100644 index 0000000..67325e9 Binary files /dev/null and b/vgcore.4599 differ -- cgit v1.2.3