mirror of
https://github.com/odin-lang/Odin.git
synced 2026-02-18 17:08:21 +00:00
Merge branch 'master' of https://github.com/odin-lang/Odin
This commit is contained in:
@@ -189,6 +189,23 @@ write_escaped_rune :: proc(w: Writer, r: rune, quote: byte, html_safe := false,
|
||||
write_encoded_rune(w, r, false, &n) or_return
|
||||
return
|
||||
}
|
||||
if r < 32 && for_json {
|
||||
switch r {
|
||||
case '\b': write_string(w, `\b`, &n) or_return
|
||||
case '\f': write_string(w, `\f`, &n) or_return
|
||||
case '\n': write_string(w, `\n`, &n) or_return
|
||||
case '\r': write_string(w, `\r`, &n) or_return
|
||||
case '\t': write_string(w, `\t`, &n) or_return
|
||||
case:
|
||||
write_byte(w, '\\', &n) or_return
|
||||
write_byte(w, 'u', &n) or_return
|
||||
write_byte(w, '0', &n) or_return
|
||||
write_byte(w, '0', &n) or_return
|
||||
write_byte(w, DIGITS_LOWER[r>>4 & 0xf], &n) or_return
|
||||
write_byte(w, DIGITS_LOWER[r & 0xf], &n) or_return
|
||||
}
|
||||
return
|
||||
}
|
||||
switch r {
|
||||
case '\a': write_string(w, `\a`, &n) or_return
|
||||
case '\b': write_string(w, `\b`, &n) or_return
|
||||
|
||||
@@ -2485,7 +2485,7 @@ parse_operand :: proc(p: ^Parser, lhs: bool) -> ^ast.Expr {
|
||||
allow_token(p, .Comma) or_break
|
||||
}
|
||||
|
||||
close := expect_token(p, .Close_Brace)
|
||||
close := expect_closing_brace_of_field_list(p)
|
||||
|
||||
if len(args) == 0 {
|
||||
error(p, tok.pos, "expected at least 1 argument in procedure group")
|
||||
|
||||
Reference in New Issue
Block a user