From 4fee4503248efb6658f2636e52fddef00b864b75 Mon Sep 17 00:00:00 2001 From: Florian Schroedl Date: Wed, 4 May 2022 17:00:00 +0200 Subject: [PATCH] Extract common block pprint functionality --- src/org/org_types.nim | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/org/org_types.nim b/src/org/org_types.nim index 90f6347..97c67ab 100644 --- a/src/org/org_types.nim +++ b/src/org/org_types.nim @@ -103,7 +103,6 @@ type headlineChildrenText*: string func pprint*(x: OrgBlock, indent = 0): string = - let fieldIndent = indent + INDENT_SIZE let fields = @[ ("kind", $x.kind, true), ("level", $x.level, true), @@ -114,12 +113,11 @@ func pprint*(x: OrgBlock, indent = 0): string = ] .stringifyFields() - @[ - "OrgBlock(", - fields.indent(fieldIndent), - ")", - ] - .join("\n") + stringifyBlock( + "OrgBlock", + indent, + fields, + ) func `$`*(x: OrgBlock): string = pprint(x) @@ -136,6 +134,7 @@ func pprint*(xs: seq[OrgBlock], indent = 0): string = .join("\n") func `$`*(xs: seq[OrgBlock]): string = pprint(xs) + ## OrgDocuemnt ## ----------- @@ -145,19 +144,16 @@ type children*: seq[OrgBlock] func pprint*(x: OrgDocument, indent = 0): string = - let fieldIndent = indent + INDENT_SIZE - let fields = @[ ("children", $x.children, true), ] .stringifyFields() - @[ - "OrgDocument(", - fields.indent(fieldIndent), - ")", - ] - .join("\n") + stringifyBlock( + "OrgDocument", + indent, + fields, + ) func `$`*(xs: OrgDocument): string = pprint(xs)