aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2025-04-17 22:23:59 +0200
committerbptato <nincsnevem662@gmail.com>2025-04-17 22:26:24 +0200
commitb01220178576ee4454334c25f57963350eb11e2c (patch)
tree6741087745922d64f6b6fc406f87c9a1848079b0 /src
parent63d3a395ffee7ecd4ecda4625da54301182db702 (diff)
downloadchawan-b01220178576ee4454334c25f57963350eb11e2c.tar.gz
toml: fix underscores in integer literals
while at it, prefer seek to discarding consume
Diffstat (limited to 'src')
-rw-r--r--src/config/toml.nim17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/config/toml.nim b/src/config/toml.nim
index 9b68f2f3..1866a036 100644
--- a/src/config/toml.nim
+++ b/src/config/toml.nim
@@ -165,7 +165,7 @@ proc consumeEscape(state: var TomlParser; buf: openArray[char]; c: char):
let c = state.peek(buf, 0)
if hexValue(c) == -1:
break
- discard state.consume(buf)
+ state.seek(1)
num *= 0x10
num += hexValue(c)
inc i
@@ -192,7 +192,7 @@ proc consumeString(state: var TomlParser; buf: openArray[char]; first: char):
state.seek(2)
if multiline and state.peek(buf, 0) == '\n':
inc state.line
- discard state.consume(buf)
+ state.seek(1)
var escape = false
var ml_trim = false
var res = ""
@@ -206,8 +206,7 @@ proc consumeString(state: var TomlParser; buf: openArray[char]; first: char):
let c2 = state.peek(buf, 0)
let c3 = state.peek(buf, 1)
if c2 == first and c3 == first:
- discard state.consume(buf)
- discard state.consume(buf)
+ state.seek(2)
break
res &= c
else:
@@ -336,14 +335,14 @@ proc consumeTable(state: var TomlParser; buf: openArray[char]):
while state.has(buf):
let c = state.peek(buf, 0)
case c
- of ' ', '\t': discard state.consume(buf)
+ of ' ', '\t': state.seek(1)
of '\n':
if tarray:
return state.err("missing ] at table array key's end")
return ok(res)
of ']':
if tarray:
- discard state.consume(buf)
+ state.seek(1)
let s = res.key.join('.')
inc state.arraySeen.mgetOrPut(s, 0)
res.key.add($state.arraySeen.getOrDefault(s))
@@ -352,7 +351,7 @@ proc consumeTable(state: var TomlParser; buf: openArray[char]):
return state.err("redundant ] character after key")
of '[':
tarray = true
- discard state.consume(buf)
+ state.seek(1)
of '"', '\'':
res.key = ?state.consumeKey(buf)
elif c in ValidBare:
@@ -369,7 +368,7 @@ proc consumeNoState(state: var TomlParser; buf: openArray[char]):
return ok(false)
of ' ', '\t': discard
of '[':
- discard state.consume(buf)
+ state.seek(1)
let table = ?state.consumeTable(buf)
state.currkey = table.key
state.node = table
@@ -410,7 +409,7 @@ proc consumeNumber(state: var TomlParser; buf: openArray[char]; c: char):
wasNum = true
elif wasNum and state.peek(buf, 0) == '_':
wasNum = false
- repr &= '_'
+ state.seek(1)
else:
break
if state.has(buf, 1) and state.peek(buf, 0) == '.' and