Fix failure with Windows newlines

Fixes #16
docopt · Oct 2, 2016 · 20a4971 · 20a4971
1 parent a9d6b6f
commit 20a4971
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/docopt.nim b/src/docopt.nim
@@ -568,6 +568,7 @@ proc extras(help: bool, version: string, options: seq[Pattern], doc: string) =
 
 proc docopt_exc(doc: string, argv: seq[string], help: bool, version: string,
                 options_first = false): Table[string, Value] =
+    var doc = doc.replace("\r\l", "\l")
 
     var argv = (if argv.is_nil: command_line_params() else: argv)
 

diff --git a/test/test.nim b/test/test.nim
@@ -46,10 +46,11 @@ for each_line in (tests & "\n\n").split_lines():
         doc = ""
         line = line.substr(4)
     if in_doc:
-        doc &= line & "\n"
+        doc &= line
         if line.ends_with("\"\"\""):
-            doc = doc[0 .. doc.len-5]
+            doc = doc[0 .. doc.len-4]
             in_doc = false
+        doc &= "\n"
     elif line.starts_with("$ prog"):
         assert args == nil and expected == nil
         args = line.substr(7)