summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorGrzegorz Adam Hankiewicz <gradha@imap.cc>2013-11-19 22:33:02 +0100
committerGrzegorz Adam Hankiewicz <gradha@imap.cc>2013-11-19 22:33:02 +0100
commitc3e7a970c6f331e730243cc9234b83faa9c7b611 (patch)
tree2a5f4ade3458b0aaa5eca746c612020b66fa0fb1
parent38eb67de835db986105a7340def055cad704f697 (diff)
downloadNim-c3e7a970c6f331e730243cc9234b83faa9c7b611.tar.gz
Modifies example to use splitLines.
-rw-r--r--doc/tut2.txt16
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/tut2.txt b/doc/tut2.txt
index 4d8d0be15..3e10d172c 100644
--- a/doc/tut2.txt
+++ b/doc/tut2.txt
@@ -820,11 +820,12 @@ use the following snippet of code as the starting point:
     let
       inputString = readFile(cfgFilename)
     var
-      rawLines = split(inputString, {char(0x0a), char(0x0d)})
       source = ""
 
     result = initTable[string, string]()
-    for line in rawLines:
+    for line in inputString.splitLines:
+      # Ignore empty lines
+      if line.len < 1: continue
       var chunks = split(line, ',')
       if chunks.len != 2:
         quit("Input needs comma split values, got: " & line)
@@ -882,10 +883,11 @@ modified source code implementing the macro:
     let
       inputString = slurp(cfgFilename.strVal)
     var
-      rawLines = split(inputString, {char(0x0a), char(0x0d)})
       source = ""
 
-    for line in rawLines:
+    for line in inputString.splitLines:
+      # Ignore empty lines
+      if line.len < 1: continue
       var chunks = split(line, ',')
       if chunks.len != 2:
         error("Input needs comma split values, got: " & line)
@@ -1001,11 +1003,11 @@ macro:
   macro readCfgAndBuildAST(cfgFilename: string): stmt =
     let
       inputString = slurp(cfgFilename.strVal)
-    var
-      rawLines = split(inputString, {char(0x0a), char(0x0d)})
 
     result = newNimNode(nnkStmtList)
-    for line in rawLines:
+    for line in inputString.splitLines:
+      # Ignore empty lines
+      if line.len < 1: continue
       var chunks = split(line, ',')
       if chunks.len != 2:
         error("Input needs comma split values, got: " & line)