First step of the "stop feeling like C" pass. Bitwise ops were functions (`band(x, MASK)`, `shl(a, 3)`); they are now real operators: band -> & bor -> | bxor -> ^ shl -> << shr -> >> bnot -> ~ Precedence is Go-style so the C footgun is gone: `<<`/`>>`/`&` bind like `*`, `|`/`^` like `+`, both tighter than comparison — `flags & MASK == 0` parses as `(flags & MASK) == 0`. `>>` is logical (lshr), matching the old `shr`. Mechanics: lexer tokenizes `<< >> & | ^ ~`; p_mul takes `<< >> &`, p_add takes `| ^`, p_unary takes `~`; emit_bin routes them through the existing int arith path (arith_code gains and/or/xor/shl/lshr) and E_UN handles `~`. The six intrinsics are deleted. Delivered as two reseeds: (A) add the operators keeping the intrinsics, (B) migrate every call site to operator form (85 lines across compiler + runtime, via a balanced-paren call->operator script; two multi-line big-endian reads in image/truetype done by hand) and delete the intrinsics. Vocabulary drops the six from LUDIC_INTRINSICS (ludic_syntax.h, grammar, LudicTokens.kt) and the grammar gains a bitwise-operator rule. LANGUAGE.md precedence table rewritten. Reseeded (21724 lines); C-free fixpoint holds; goldens byte-identical (the PNG and TrueType decoders lean on these ops); 17/17; vocab + doc-fences clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
141 lines
5.7 KiB
Text
141 lines
5.7 KiB
Text
# lex.ludic — source text -> a token slice. Mirrors compiler/front/lex.c.
|
|
# Tokens carry their kind, their text (identifiers, strings, operators),
|
|
# an integer value (numbers, char literals) and a line for diagnostics.
|
|
|
|
const TK_ID: int = 0
|
|
const TK_INT: int = 1
|
|
const TK_STR: int = 2
|
|
const TK_OP: int = 3
|
|
const TK_NL: int = 4
|
|
const TK_EOF: int = 5
|
|
const TK_FLOAT: int = 6
|
|
|
|
property Tok { kind: int = 0, text: ptr = ptr_null(), ival: int = 0, line: int = 0 }
|
|
|
|
var toks: []Tok
|
|
|
|
fn tok_push(kind: int, text: ptr, ival: int, line: int) -> void {
|
|
let t = new Tok
|
|
t.kind = kind; t.text = text; t.ival = ival; t.line = line
|
|
push(toks, t)
|
|
}
|
|
|
|
# does src match the 2-char operator op at position i?
|
|
fn two_at(src: ptr, i: int, a: int, b: int) -> bool {
|
|
return peek8(src, i) == a and peek8(src, i + 1) == b
|
|
}
|
|
|
|
fn is_op1(c: int) -> bool {
|
|
# + - * / % < > = ( ) { } [ ] , : . ! @
|
|
if c == 43 or c == 45 or c == 42 or c == 47 or c == 37 { return true }
|
|
if c == 60 or c == 62 or c == 61 { return true }
|
|
if c == 40 or c == 41 or c == 123 or c == 125 { return true }
|
|
if c == 91 or c == 93 or c == 44 or c == 58 or c == 46 { return true }
|
|
if c == 33 or c == 64 { return true }
|
|
if c == 38 or c == 124 or c == 94 or c == 126 { return true } # & | ^ ~
|
|
return false
|
|
}
|
|
|
|
fn lex(src: ptr) -> void {
|
|
toks = new []Tok
|
|
var i = 0
|
|
var line = 1
|
|
let n = slen(src)
|
|
while i < n {
|
|
let c = peek8(src, i)
|
|
if c == 10 { tok_push(TK_NL, ptr_null(), 0, line); line = line + 1; i = i + 1; continue }
|
|
if c == 32 or c == 9 or c == 13 { i = i + 1; continue }
|
|
if c == 35 { # '#' comment to end of line
|
|
while i < n and peek8(src, i) != 10 { i = i + 1 }
|
|
continue
|
|
}
|
|
if c == 34 { # "string"
|
|
i = i + 1
|
|
let start = i
|
|
let out = mem_alloc(n)
|
|
var j = 0
|
|
while i < n and peek8(src, i) != 34 {
|
|
if peek8(src, i) == 92 { # backslash escape
|
|
let e = peek8(src, i + 1)
|
|
var r = e
|
|
if e == 110 { r = 10 }
|
|
if e == 116 { r = 9 }
|
|
if e == 48 { r = 0 }
|
|
poke8(out, j, r); j = j + 1; i = i + 2
|
|
} else { poke8(out, j, peek8(src, i)); j = j + 1; i = i + 1 }
|
|
}
|
|
i = i + 1
|
|
poke8(out, j, 0)
|
|
tok_push(TK_STR, out, 0, line)
|
|
continue
|
|
}
|
|
if c == 39 { # 'c' char literal -> int
|
|
i = i + 1
|
|
var v = 0
|
|
if peek8(src, i) == 92 {
|
|
let e = peek8(src, i + 1)
|
|
if e == 110 { v = 10 }
|
|
if e == 116 { v = 9 }
|
|
if e == 48 { v = 0 }
|
|
i = i + 2
|
|
} else { v = peek8(src, i); i = i + 1 }
|
|
if peek8(src, i) == 39 { i = i + 1 }
|
|
tok_push(TK_INT, ptr_null(), v, line)
|
|
continue
|
|
}
|
|
if char_is_digit(c) {
|
|
if c == 48 and peek8(src, i + 1) == 120 { # 0x hex
|
|
var v = 0
|
|
i = i + 2
|
|
while i < n {
|
|
let h = peek8(src, i)
|
|
var d = 0
|
|
if char_is_digit(h) { d = h - 48 }
|
|
else { if h >= 97 and h <= 102 { d = h - 87 }
|
|
else { if h >= 65 and h <= 70 { d = h - 55 } else { break } } }
|
|
v = v * 16 + d
|
|
i = i + 1
|
|
}
|
|
tok_push(TK_INT, ptr_null(), v, line)
|
|
continue
|
|
}
|
|
var v = 0
|
|
while i < n and char_is_digit(peek8(src, i)) { v = v * 10 + (peek8(src, i) - 48); i = i + 1 }
|
|
# a fractional part makes it a Q16.16 fixed literal
|
|
if i < n and peek8(src, i) == 46 and char_is_digit(peek8(src, i + 1)) {
|
|
i = i + 1
|
|
var fnum = 0; var fden = 1
|
|
while i < n and char_is_digit(peek8(src, i)) { fnum = fnum * 10 + (peek8(src, i) - 48); fden = fden * 10; i = i + 1 }
|
|
let bits = (v << 16) + (fnum << 16) / fden
|
|
tok_push(TK_FLOAT, ptr_null(), bits, line)
|
|
continue
|
|
}
|
|
tok_push(TK_INT, ptr_null(), v, line)
|
|
continue
|
|
}
|
|
if char_is_alpha(c) {
|
|
let start = i
|
|
while i < n and char_is_alnum(peek8(src, i)) { i = i + 1 }
|
|
tok_push(TK_ID, substr(src, start, i - start), 0, line)
|
|
continue
|
|
}
|
|
if c == 59 { tok_push(TK_NL, ptr_null(), 0, line); i = i + 1; continue } # ';'
|
|
# two-character operators
|
|
if two_at(src, i, 45, 62) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # ->
|
|
if two_at(src, i, 61, 62) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # =>
|
|
if two_at(src, i, 61, 61) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # ==
|
|
if two_at(src, i, 33, 61) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # !=
|
|
if two_at(src, i, 60, 61) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # <=
|
|
if two_at(src, i, 62, 61) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # >=
|
|
if two_at(src, i, 43, 61) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # +=
|
|
if two_at(src, i, 45, 61) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # -=
|
|
if two_at(src, i, 42, 61) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # *=
|
|
if two_at(src, i, 47, 61) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # /=
|
|
if two_at(src, i, 46, 46) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # ..
|
|
if two_at(src, i, 60, 60) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # <<
|
|
if two_at(src, i, 62, 62) { tok_push(TK_OP, substr(src, i, 2), 0, line); i = i + 2; continue } # >>
|
|
if is_op1(c) { tok_push(TK_OP, substr(src, i, 1), 0, line); i = i + 1; continue }
|
|
i = i + 1 # skip anything unrecognised
|
|
}
|
|
tok_push(TK_EOF, ptr_null(), 0, line)
|
|
}
|