diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-11-02 10:46:30 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-11-02 10:46:30 +0100 |
| commit | 1eaeccc15d15d15d2f62ea1648f7dd64722dbd37 (patch) | |
| tree | b922cdabc780fa3a8837a6804d2df31793d9e2ca /lib/pure/lexbase.nim | |
| parent | e9243a16167b24899d4fcf051f3252b3a5804811 (diff) | |
| parent | bd19b5f4d36bb40b4af93d7e15fdfa582e9fe3b7 (diff) | |
| download | Nim-1eaeccc15d15d15d2f62ea1648f7dd64722dbd37.tar.gz | |
Merge branch 'devel' into araq
Diffstat (limited to 'lib/pure/lexbase.nim')
| -rw-r--r-- | lib/pure/lexbase.nim | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pure/lexbase.nim b/lib/pure/lexbase.nim index cf2e8bb89..15a390f0b 100644 --- a/lib/pure/lexbase.nim +++ b/lib/pure/lexbase.nim @@ -37,6 +37,7 @@ type lineNumber*: int ## the current line number sentinel: int lineStart: int # index of last line start in buffer + offsetBase*: int # use ``offsetBase + bufpos`` to get the offset refillChars: set[char] {.deprecated: [TBaseLexer: BaseLexer].} @@ -107,7 +108,8 @@ proc fillBaseLexer(L: var BaseLexer, pos: int): int = result = pos + 1 # nothing to do else: fillBuffer(L) - L.bufpos = 0 # XXX: is this really correct? + L.offsetBase += pos + L.bufpos = 0 result = 0 proc handleCR*(L: var BaseLexer, pos: int): int = @@ -147,6 +149,7 @@ proc open*(L: var BaseLexer, input: Stream, bufLen: int = 8192; assert(input != nil) L.input = input L.bufpos = 0 + L.offsetBase = 0 L.bufLen = bufLen L.refillChars = refillChars when defined(js): |