harden compiler parsing, recovery, and deep-expression handling

This commit is contained in:
2026-06-12 00:28:45 +02:00
parent a5ceb727c1
commit 99ba907f59
13 changed files with 1159 additions and 503 deletions
+62 -15
View File
@@ -10,9 +10,10 @@ Span :: struct {
}
Source :: struct {
id: int,
path: string,
text: string,
id: int,
path: string,
text: string,
line_starts: []int,
}
Store :: struct {
@@ -29,9 +30,15 @@ Diagnostics :: struct {
source: ^Source,
store: ^Store,
items: [dynamic]Diagnostic,
index: map[Diagnostic_Key]int,
allocator: mem.Allocator,
}
Diagnostic_Key :: struct {
span: Span,
message: string,
}
init_store :: proc(allocator := context.allocator) -> Store {
result: Store
result.allocator = allocator
@@ -43,25 +50,47 @@ destroy_store :: proc(store: ^Store) {
for item in store.items {
delete(item.path, store.allocator)
delete(item.text, store.allocator)
delete(item.line_starts, store.allocator)
}
delete(store.items)
}
add_source :: proc(store: ^Store, path, text: string) -> int {
make_line_starts :: proc(text: string, allocator: mem.Allocator) -> []int {
result: [dynamic]int
result.allocator = allocator
append(&result, 0)
for value, offset in transmute([]byte)text {
if value == '\n' {
append(&result, offset+1)
}
}
return result[:]
}
add_source_owned :: proc(store: ^Store, path: string, text: []byte) -> int {
id := len(store.items)
owned_text := string(text)
append(&store.items, Source{
id=id,
path=fmt.aprintf("%s", path, allocator=store.allocator),
text=fmt.aprintf("%s", text, allocator=store.allocator),
text=owned_text,
line_starts=make_line_starts(owned_text, store.allocator),
})
return id
}
add_source :: proc(store: ^Store, path, text: string) -> int {
owned := make([]byte, len(text), store.allocator)
copy(owned, transmute([]byte)text)
return add_source_owned(store, path, owned)
}
init_diagnostics :: proc(source_file: ^Source, allocator := context.allocator) -> Diagnostics {
result: Diagnostics
result.source = source_file
result.allocator = allocator
result.items.allocator = allocator
result.index.allocator = allocator
return result
}
@@ -70,10 +99,12 @@ init_store_diagnostics :: proc(store: ^Store, allocator := context.allocator) ->
result.store = store
result.allocator = allocator
result.items.allocator = allocator
result.index.allocator = allocator
return result
}
destroy_diagnostics :: proc(diagnostics: ^Diagnostics) {
delete(diagnostics.index)
for diagnostic in diagnostics.items {
delete(diagnostic.message, diagnostics.allocator)
}
@@ -81,34 +112,50 @@ destroy_diagnostics :: proc(diagnostics: ^Diagnostics) {
}
add :: proc(diagnostics: ^Diagnostics, span: Span, message: string) -> int {
for diagnostic, id in diagnostics.items {
if diagnostic.span == span && diagnostic.message == message {
return id
}
key := Diagnostic_Key{span=span, message=message}
if id, ok := diagnostics.index[key]; ok {
return id
}
id := len(diagnostics.items)
cloned := fmt.aprintf("%s", message, allocator=diagnostics.allocator)
append(&diagnostics.items, Diagnostic{span=span, message=cloned})
diagnostics.index[Diagnostic_Key{span=span, message=cloned}] = id
return id
}
addf :: proc(diagnostics: ^Diagnostics, span: Span, format: string, args: ..any) -> int {
message := fmt.aprintf(format, ..args, allocator=diagnostics.allocator)
for diagnostic, id in diagnostics.items {
if diagnostic.span == span && diagnostic.message == message {
delete(message, diagnostics.allocator)
return id
}
key := Diagnostic_Key{span=span, message=message}
if id, ok := diagnostics.index[key]; ok {
delete(message, diagnostics.allocator)
return id
}
id := len(diagnostics.items)
append(&diagnostics.items, Diagnostic{span=span, message=message})
diagnostics.index[Diagnostic_Key{span=span, message=message}] = id
return id
}
line_and_column :: proc(source_file: ^Source, offset: int) -> (line, column: int) {
if len(source_file.line_starts) > 0 {
limit := min(max(offset, 0), len(source_file.text))
low := 0
high := len(source_file.line_starts)
for low < high {
middle := low + (high-low)/2
if source_file.line_starts[middle] <= limit {
low = middle+1
} else {
high = middle
}
}
line = max(low, 1)
column = limit-source_file.line_starts[line-1]+1
return
}
line = 1
column = 1
limit := min(offset, len(source_file.text))
limit := min(max(offset, 0), len(source_file.text))
for byte_value in transmute([]byte)source_file.text[:limit] {
if byte_value == '\n' {
line += 1