diff options
| -rw-r--r-- | compiler/dfa.nim | 3 | ||||
| -rw-r--r-- | compiler/vmgen.nim | 2 | ||||
| -rw-r--r-- | lib/std/private/asciitables.nim (renamed from compiler/asciitables.nim) | 8 | ||||
| -rw-r--r-- | tests/compiler/tasciitables.nim | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/compiler/dfa.nim b/compiler/dfa.nim index d07122552..efd826594 100644 --- a/compiler/dfa.nim +++ b/compiler/dfa.nim @@ -29,7 +29,8 @@ ## "A Graph–Free Approach to Data–Flow Analysis" by Markus Mohnen. ## https://link.springer.com/content/pdf/10.1007/3-540-45937-5_6.pdf -import ast, types, intsets, lineinfos, renderer, asciitables +import ast, types, intsets, lineinfos, renderer +import std/private/asciitables from patterns import sameTrees diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim index 9f36fc736..efb657d17 100644 --- a/compiler/vmgen.nim +++ b/compiler/vmgen.nim @@ -35,7 +35,7 @@ const debugEchoCode* = defined(nimVMDebug) when debugEchoCode: - import asciitables + import std/private/asciitables when hasFFI: import evalffi diff --git a/compiler/asciitables.nim b/lib/std/private/asciitables.nim index 39bb26a5c..cbc595651 100644 --- a/compiler/asciitables.nim +++ b/lib/std/private/asciitables.nim @@ -1,6 +1,6 @@ #[ -move to std/asciitables.nim once stable, or to a nimble paackage -once compiler can depend on nimble +move to std/asciitables.nim once stable, or to a fusion package +once compiler can depend on fusion ]# type Cell* = object @@ -8,7 +8,7 @@ type Cell* = object width*, row*, col*, ncols*, nrows*: int iterator parseTableCells*(s: string, delim = '\t'): Cell = - ## iterates over all cells in a `delim`-delimited `s`, after a 1st + ## Iterates over all cells in a `delim`-delimited `s`, after a 1st ## pass that computes number of rows, columns, and width of each column. var widths: seq[int] var cell: Cell @@ -69,7 +69,7 @@ iterator parseTableCells*(s: string, delim = '\t'): Cell = finishRow() proc alignTable*(s: string, delim = '\t', fill = ' ', sep = " "): string = - ## formats a `delim`-delimited `s` representing a table; each cell is aligned + ## Formats a `delim`-delimited `s` representing a table; each cell is aligned ## to a width that's computed for each column; consecutive columns are ## delimited by `sep`, and alignment space is filled using `fill`. ## More customized formatting can be done by calling `parseTableCells` directly. diff --git a/tests/compiler/tasciitables.nim b/tests/compiler/tasciitables.nim index 80d648508..2f3b7bf2f 100644 --- a/tests/compiler/tasciitables.nim +++ b/tests/compiler/tasciitables.nim @@ -1,5 +1,5 @@ import stdtest/unittest_light -import compiler/asciitables +import std/private/asciitables import strformat |