diff options
Diffstat (limited to 'compiler/ccgmerge.nim')
-rw-r--r-- | compiler/ccgmerge.nim | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/compiler/ccgmerge.nim b/compiler/ccgmerge.nim index ccb5a7635..56b17440e 100644 --- a/compiler/ccgmerge.nim +++ b/compiler/ccgmerge.nim @@ -145,38 +145,34 @@ proc atEndMark(buf: cstring, pos: int): bool = proc readVerbatimSection(L: var TBaseLexer): Rope = var pos = L.bufpos - var buf = L.buf var r = newStringOfCap(30_000) while true: - case buf[pos] + case L.buf[pos] of CR: pos = nimlexbase.handleCR(L, pos) - buf = L.buf r.add('\L') of LF: pos = nimlexbase.handleLF(L, pos) - buf = L.buf r.add('\L') of '\0': doAssert(false, "ccgmerge: expected: " & NimMergeEndMark) break else: - if atEndMark(buf, pos): + if atEndMark(L.buf, pos): inc pos, NimMergeEndMark.len break - r.add(buf[pos]) + r.add(L.buf[pos]) inc pos L.bufpos = pos result = r.rope proc readKey(L: var TBaseLexer, result: var string) = var pos = L.bufpos - var buf = L.buf setLen(result, 0) - while buf[pos] in IdentChars: - result.add(buf[pos]) + while L.buf[pos] in IdentChars: + result.add(L.buf[pos]) inc pos - if buf[pos] != ':': doAssert(false, "ccgmerge: ':' expected") + if L.buf[pos] != ':': doAssert(false, "ccgmerge: ':' expected") L.bufpos = pos + 1 # skip ':' proc newFakeType(id: int): PType = |