From 0ef9cbf53505ed9c86ff1b719ddf644509fa0a9c Mon Sep 17 00:00:00 2001 From: Felix Krause Date: Mon, 6 Feb 2017 20:39:04 +0100 Subject: [PATCH] Moved private sources to yaml/private --- test/tlex.nim | 2 +- yaml/dom.nim | 2 +- yaml/hints.nim | 2 +- yaml/parser.nim | 2 +- yaml/presenter.nim | 2 +- {private => yaml/private}/internal.nim | 0 {private => yaml/private}/lex.nim | 0 yaml/serialization.nim | 2 +- yaml/stream.nim | 2 +- yaml/tojson.nim | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) rename {private => yaml/private}/internal.nim (100%) rename {private => yaml/private}/lex.nim (100%) diff --git a/test/tlex.nim b/test/tlex.nim index d6da0f1..a014167 100644 --- a/test/tlex.nim +++ b/test/tlex.nim @@ -1,4 +1,4 @@ -import ../private/lex +import ../yaml/private/lex import unittest, strutils diff --git a/yaml/dom.nim b/yaml/dom.nim index 2b5a563..e1ebf3d 100644 --- a/yaml/dom.nim +++ b/yaml/dom.nim @@ -20,7 +20,7 @@ ## objects of Nim's `json module `_. import tables, streams, hashes, sets, strutils -import stream, taglib, serialization, ../private/internal, parser, +import stream, taglib, serialization, private/internal, parser, presenter type diff --git a/yaml/hints.nim b/yaml/hints.nim index 82c1804..c977d7d 100644 --- a/yaml/hints.nim +++ b/yaml/hints.nim @@ -11,7 +11,7 @@ ## The hints API enables you to guess the type of YAML scalars. import macros -import ../private/internal +import private/internal type TypeHint* = enum diff --git a/yaml/parser.nim b/yaml/parser.nim index 819188f..2129a0a 100644 --- a/yaml/parser.nim +++ b/yaml/parser.nim @@ -12,7 +12,7 @@ ## non-nil string or Stream object as YAML character stream. import tables, strutils, macros, streams -import taglib, stream, ../private/lex, ../private/internal +import taglib, stream, private/lex, private/internal type WarningCallback* = proc(line, column: int, lineContent: string, diff --git a/yaml/presenter.nim b/yaml/presenter.nim index 80879da..1f5d138 100644 --- a/yaml/presenter.nim +++ b/yaml/presenter.nim @@ -11,7 +11,7 @@ ## This is the presenter API, used for generating YAML character streams. import streams, queues, strutils -import taglib, stream, ../private/internal, hints, parser, stream +import taglib, stream, private/internal, hints, parser, stream type PresentationStyle* = enum diff --git a/private/internal.nim b/yaml/private/internal.nim similarity index 100% rename from private/internal.nim rename to yaml/private/internal.nim diff --git a/private/lex.nim b/yaml/private/lex.nim similarity index 100% rename from private/lex.nim rename to yaml/private/lex.nim diff --git a/yaml/serialization.nim b/yaml/serialization.nim index 03944c3..86902bb 100644 --- a/yaml/serialization.nim +++ b/yaml/serialization.nim @@ -17,7 +17,7 @@ ## information. import tables, typetraits, strutils, macros, streams, times, parseutils -import parser, taglib, presenter, stream, ../private/internal, hints +import parser, taglib, presenter, stream, private/internal, hints export stream # *something* in here needs externally visible `==`(x,y: AnchorId), # but I cannot figure out what. binding it would be the better option. diff --git a/yaml/stream.nim b/yaml/stream.nim index 9cc2e0b..ec2441f 100644 --- a/yaml/stream.nim +++ b/yaml/stream.nim @@ -13,7 +13,7 @@ ## stdlib with that name. import hashes -import ../private/internal, taglib +import private/internal, taglib type AnchorId* = distinct int ## \ diff --git a/yaml/tojson.nim b/yaml/tojson.nim index 9c6350f..8a4617e 100644 --- a/yaml/tojson.nim +++ b/yaml/tojson.nim @@ -12,7 +12,7 @@ ## structures provided by Nim's stdlib. import json, streams, strutils, tables -import taglib, hints, serialization, stream, ../private/internal, parser +import taglib, hints, serialization, stream, private/internal, parser type Level = tuple[node: JsonNode, key: string]