Skip to content

Commit 05c6eff

Browse files
committed
Minor tweaks in debug output
1 parent 0594793 commit 05c6eff

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/ntangle.nim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ proc parseTangleHeaderProperties(file: string, lnum: int, haObj: LangAndArgs) =
113113
let
114114
(dir, basename, _) = splitFile(file)
115115
dbg "Org file = {file}, dir={dir}, base name={basename}", dvHigh
116-
dbg("", prefix=" ") # blank line
117116
dbg "Line {lnum}, Lang {haObj.lang} - hdrArgs: {haObj.args}"
118117
var
119118
hArgs: HeaderArgs
@@ -148,7 +147,7 @@ proc parseTangleHeaderProperties(file: string, lnum: int, haObj: LangAndArgs) =
148147
hdrArgParts = hdrArg.strip.split(" ", maxsplit=1)
149148
argkey = hdrArgParts[0]
150149
argval = hdrArgParts[1]
151-
dbg "argkey={argkey}, argval={argval}, onBeginSrc={onBeginSrc}, outfile={outfile}"
150+
dbg "argkey={argkey}, argval={argval}, onBeginSrc={haObj.argType == haBeginSrc}, outfile={outfile}"
152151
case argkey
153152
of "tangle":
154153
hArgs.tangle = argval
@@ -243,7 +242,7 @@ proc parseTangleHeaderProperties(file: string, lnum: int, haObj: LangAndArgs) =
243242
# value.
244243
outFileName = outfile
245244

246-
dbg "line={lnum}, onBeginSrc={onBeginSrc}, hArgs.tangle={hArgs.tangle} outfile={outfile} | outFileName={outFileName}"
245+
dbg "line={lnum}, onBeginSrc={haObj.argType == haBeginSrc}, hArgs.tangle={hArgs.tangle}, outFileName={outFileName}"
247246
if haObj.argType == haBeginSrc:
248247
if hArgs.tangle != "no":
249248
doAssert outFileName != ""
@@ -438,6 +437,7 @@ proc parseLine(file: string, line: string, lnum: int) =
438437
dbg " first line of src block"
439438
dbg "line {lnum}: bufEnabled: {bufEnabled} linePartsLower: {linePartsLower}", dvHigh
440439
if bufEnabled:
440+
assert outFileName != ""
441441
if (linePartsLower[0] == "#+end_src"):
442442
bufEnabled = false
443443
dbg "line {lnum}: buffering disabled for `{outFileName}'"
@@ -450,7 +450,6 @@ proc parseLine(file: string, line: string, lnum: int) =
450450
blockIndent = (line.len - line.strip(trailing=false).len)
451451

452452
try:
453-
assert outFileName != ""
454453
if firstLineSrcBlock and fileHeaderArgs[outFileName].padline:
455454
fileData[outFileName].add("\n")
456455
fileData[outFileName].add(lineAdjust(line, blockIndent))
@@ -502,6 +501,7 @@ proc doOrgTangle(file: string) =
502501
styledEcho("Parsing ", styleBright, file, resetStyle, " ..")
503502
var lnum = 1
504503
for line in lines(file):
504+
dbg("", prefix=" ") # blank line
505505
dbg "{lnum}: {line}", dvHigh
506506
parseLine(file, line, lnum)
507507
inc lnum

0 commit comments

Comments
 (0)