Semicolons mandatory again (and probably forever now...)

This commit is contained in:
Ginger Bill
2016-12-16 11:31:08 +00:00
parent ad84314143
commit f567983260
19 changed files with 2601 additions and 3173 deletions
+94 -94
View File
@@ -1,18 +1,18 @@
RUNE_ERROR :: '\ufffd'
RUNE_SELF :: 0x80
RUNE_BOM :: 0xfeff
RUNE_EOF :: ~(0 as rune)
MAX_RUNE :: '\U0010ffff'
UTF_MAX :: 4
RUNE_ERROR :: '\ufffd';
RUNE_SELF :: 0x80;
RUNE_BOM :: 0xfeff;
RUNE_EOF :: ~(0 as rune);
MAX_RUNE :: '\U0010ffff';
UTF_MAX :: 4;
SURROGATE_MIN :: 0xd800
SURROGATE_MAX :: 0xdfff
SURROGATE_MIN :: 0xd800;
SURROGATE_MAX :: 0xdfff;
Accept_Range :: struct {
lo, hi: u8
}
lo, hi: u8;
};
accept_ranges := [5]Accept_Range{
{0x80, 0xbf},
@@ -20,7 +20,7 @@ accept_ranges := [5]Accept_Range{
{0x80, 0x9f},
{0x90, 0xbf},
{0x80, 0x8f},
}
};
accept_sizes := [256]byte{
0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, // 0x00-0x0f
@@ -40,177 +40,177 @@ accept_sizes := [256]byte{
0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, // 0xd0-0xdf
0x13, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x23, 0x03, 0x03, // 0xe0-0xef
0x34, 0x04, 0x04, 0x04, 0x44, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, 0xf1, // 0xf0-0xff
}
};
encode_rune :: proc(r_: rune) -> ([4]byte, int) {
r := r_
buf: [4]byte
i := r as u32
mask :: 0x3f as byte
r := r_;
buf: [4]byte;
i := r as u32;
mask :: 0x3f as byte;
if i <= 1<<7-1 {
buf[0] = r as byte
return buf, 1
buf[0] = r as byte;
return buf, 1;
}
if i <= 1<<11-1 {
buf[0] = 0xc0 | (r>>6) as byte
buf[1] = 0x80 | (r) as byte & mask
return buf, 2
buf[0] = 0xc0 | (r>>6) as byte;
buf[1] = 0x80 | (r) as byte & mask;
return buf, 2;
}
// Invalid or Surrogate range
if i > 0x0010ffff ||
(0xd800 <= i && i <= 0xdfff) {
r = 0xfffd
r = 0xfffd;
}
if i <= 1<<16-1 {
buf[0] = 0xe0 | (r>>12) as byte
buf[1] = 0x80 | (r>>6) as byte & mask
buf[2] = 0x80 | (r) as byte & mask
return buf, 3
buf[0] = 0xe0 | (r>>12) as byte;
buf[1] = 0x80 | (r>>6) as byte & mask;
buf[2] = 0x80 | (r) as byte & mask;
return buf, 3;
}
buf[0] = 0xf0 | (r>>18) as byte
buf[1] = 0x80 | (r>>12) as byte & mask
buf[2] = 0x80 | (r>>6) as byte & mask
buf[3] = 0x80 | (r) as byte & mask
return buf, 4
buf[0] = 0xf0 | (r>>18) as byte;
buf[1] = 0x80 | (r>>12) as byte & mask;
buf[2] = 0x80 | (r>>6) as byte & mask;
buf[3] = 0x80 | (r) as byte & mask;
return buf, 4;
}
decode_rune :: proc(s: string) -> (rune, int) {
n := s.count
n := s.count;
if n < 1 {
return RUNE_ERROR, 0
return RUNE_ERROR, 0;
}
b0 := s[0]
x := accept_sizes[b0]
b0 := s[0];
x := accept_sizes[b0];
if x >= 0xf0 {
mask := (x as rune << 31) >> 31; // all zeros or all ones
return (b0 as rune) &~ mask | RUNE_ERROR&mask, 1
return (b0 as rune) &~ mask | RUNE_ERROR&mask, 1;
}
size := x & 7
ar := accept_ranges[x>>4]
size := x & 7;
ar := accept_ranges[x>>4];
if n < size as int {
return RUNE_ERROR, 1
return RUNE_ERROR, 1;
}
b1 := s[1]
b1 := s[1];
if b1 < ar.lo || ar.hi < b1 {
return RUNE_ERROR, 1
return RUNE_ERROR, 1;
}
MASK_X :: 0b00111111
MASK_2 :: 0b00011111
MASK_3 :: 0b00001111
MASK_4 :: 0b00000111
MASK_X :: 0b00111111;
MASK_2 :: 0b00011111;
MASK_3 :: 0b00001111;
MASK_4 :: 0b00000111;
if size == 2 {
return (b0&MASK_2) as rune <<6 | (b1&MASK_X) as rune, 2
return (b0&MASK_2) as rune <<6 | (b1&MASK_X) as rune, 2;
}
b2 := s[2]
b2 := s[2];
if b2 < 0x80 || 0xbf < b2 {
return RUNE_ERROR, 1
return RUNE_ERROR, 1;
}
if size == 3 {
return (b0&MASK_3) as rune <<12 | (b1&MASK_X) as rune <<6 | (b2&MASK_X) as rune, 3
return (b0&MASK_3) as rune <<12 | (b1&MASK_X) as rune <<6 | (b2&MASK_X) as rune, 3;
}
b3 := s[3]
b3 := s[3];
if b3 < 0x80 || 0xbf < b3 {
return RUNE_ERROR, 1
return RUNE_ERROR, 1;
}
return (b0&MASK_4) as rune <<18 | (b1&MASK_X) as rune <<12 | (b3&MASK_X) as rune <<6 | (b3&MASK_X) as rune, 4
return (b0&MASK_4) as rune <<18 | (b1&MASK_X) as rune <<12 | (b3&MASK_X) as rune <<6 | (b3&MASK_X) as rune, 4;
}
valid_rune :: proc(r: rune) -> bool {
if r < 0 {
return false
return false;
} else if SURROGATE_MIN <= r && r <= SURROGATE_MAX {
return false
return false;
} else if r > MAX_RUNE {
return false
return false;
}
return true
return true;
}
valid_string :: proc(s: string) -> bool {
n := s.count
n := s.count;
for i := 0; i < n; {
si := s[i]
si := s[i];
if si < RUNE_SELF { // ascii
i++
continue
i++;
continue;
}
x := accept_sizes[si]
x := accept_sizes[si];
if x == 0xf1 {
return false
return false;
}
size := (x & 7) as int
size := (x & 7) as int;
if i+size > n {
return false
return false;
}
ar := accept_ranges[x>>4]
ar := accept_ranges[x>>4];
if b := s[i+1]; b < ar.lo || ar.hi < b {
return false
return false;
} else if size == 2 {
// Okay
} else if b := s[i+2]; b < 0x80 || 0xbf < b {
return false
return false;
} else if size == 3 {
// Okay
} else if b := s[i+3]; b < 0x80 || 0xbf < b {
return false
return false;
}
i += size
i += size;
}
return true
return true;
}
rune_count :: proc(s: string) -> int {
count := 0
n := s.count
count := 0;
n := s.count;
for i := 0; i < n; count++ {
si := s[i]
si := s[i];
if si < RUNE_SELF { // ascii
i++
continue
i++;
continue;
}
x := accept_sizes[si]
x := accept_sizes[si];
if x == 0xf1 {
i++
continue
i++;
continue;
}
size := (x & 7) as int
size := (x & 7) as int;
if i+size > n {
i++
continue
i++;
continue;
}
ar := accept_ranges[x>>4]
ar := accept_ranges[x>>4];
if b := s[i+1]; b < ar.lo || ar.hi < b {
size = 1
size = 1;
} else if size == 2 {
// Okay
} else if b := s[i+2]; b < 0x80 || 0xbf < b {
size = 1
size = 1;
} else if size == 3 {
// Okay
} else if b := s[i+3]; b < 0x80 || 0xbf < b {
size = 1
size = 1;
}
i += size
i += size;
}
return count
return count;
}
rune_size :: proc(r: rune) -> int {
match {
case r < 0: return -1
case r <= 1<<7 - 1: return 1
case r <= 1<<11 - 1: return 2
case SURROGATE_MIN <= r && r <= SURROGATE_MAX: return -1
case r <= 1<<16 - 1: return 3
case r <= MAX_RUNE: return 4
case r < 0: return -1;
case r <= 1<<7 - 1: return 1;
case r <= 1<<11 - 1: return 2;
case SURROGATE_MIN <= r && r <= SURROGATE_MAX: return -1;
case r <= 1<<16 - 1: return 3;
case r <= MAX_RUNE: return 4;
}
return -1
return -1;
}