make blimp compile with Nim version 0.11.2

Andreas Rumpf
1 parent 06b0bbf2
Showing 2 changed files with 65 additions and 65 deletions
blimp.nim
lapp.nim
@@ -12,7 +12,7 @@ import md5, os, osproc, parseopt2, strutils, parsecfg, streams, lapp, subexes, t
 #
 # Just run blimp --help for detailed help.
-const 
+const
   versionMajor* = 0
   versionMinor* = 4
   versionPatch* = 0
@@ -88,7 +88,7 @@ proc cmd(cmd: string): string =
     when defined(windows):
       let tup = execCmdEx("cmd /c \"" & cmd & "\"")
     else:
-      let tup = execCmdEx(cmd) 
+      let tup = execCmdEx(cmd)
     #echo "cmd: " & $cmd & "err:" & $tup[1]
     if tup[1] == 0:
       result = strip(tup[0])
@@ -124,7 +124,7 @@ proc expandDirs(templ: string): string =
   result = templ.replace("%home%", homeDir)
   result = result.replace("%cwd%", currentDir)
   if result.contains("%gitroot%"):
-    if gitRootDir.isNil: quit("Not in a git clone, can not expand %gitroot% in '" & templ & "'") 
+    if gitRootDir.isNil: quit("Not in a git clone, can not expand %gitroot% in '" & templ & "'")
     result = result.replace("%gitroot%", gitRootDir)
 # Copy of readAllBuffer from sysio.nim - we need to call it
@@ -147,14 +147,14 @@ proc parseConfFile(filename: string) =
   var f = newFileStream(filename, fmRead)
   if f != nil:
     if verbose: echo "Reading config: " & filename
-    var p: CfgParser  
+    var p: CfgParser
     open(p, f, filename)
     var section: string
     var area: RemoteArea
     while true:
       var e = next(p)
       case e.kind
-      of cfgEof: 
+      of cfgEof:
         break
       of cfgSectionStart:
         section = e.section
@@ -163,7 +163,7 @@ proc parseConfFile(filename: string) =
         of "blimp":
           case e.key
           of "blimpstore":
-            if blimpStore.isNil: blimpStore = expandDirs(e.value)                
+            if blimpStore.isNil: blimpStore = expandDirs(e.value)
           of "version":
             if blimpVersion.isNil: blimpVersion = e.value
           else:
@@ -215,7 +215,7 @@ proc uploadFile(filename, fromDir: string) =
   let errorCode = run(format(remoteArea.upload, filename, remoteArea.url, toUnixyPath(fromDir)))
   if errorCode != 0:
     quit("Something went wrong uploading " & filename & " to " & remoteArea.url, 2)
-  
+
 # Download a file to the remote area
 proc downloadFile(filename, toDir: string) =
   if remoteArea.isNil:
@@ -243,7 +243,7 @@ proc copyToBlimpStore(filename, blimpFilename: string) =
     else:
       copyFile(filename, blimpStore / blimpFilename)
     uploadFile(blimpFilename, blimpStore)
-  
+
 # Copy content from blimpStore, and downloading first if needed
 proc copyFromBlimpStore(blimpFilename, filename: string) =
@@ -279,7 +279,7 @@ proc blimpFileName(filename: string): string =
     var hashfile: File
     if not open(hashfile, filename):
       quit("Failed opening file: " & filename, 4)
-    blimpFileNameFromString(string(readLine(hashfile)))  
+    blimpFileNameFromString(string(readLine(hashfile)))
 # Get hash and compute blimpFilename
 proc computeBlimpFilename(filename: string): string =
@@ -290,7 +290,7 @@ proc computeBlimpFilename(filename: string): string =
     quit("Failed opening file: " & filename, 1)
   let hash = getMD5(content)
   result = extractFilename(filename) & "-" & hash
- 
+
 # Copy original file to blimpStore and replace with hash stub in git.
 proc deflate(filename: string) =
   if verbose: echo "Deflating " & filename
@@ -312,7 +312,7 @@ iterator allDeflated() =
   for fn in filenames:
     if not blimpFilename(fn).isNil:
       yield fn
-      
+
 # Iterator over all files matching the blimp filter in the git clone
 iterator allFiltered() =
   let lines = cmd("git ls-files | git check-attr --stdin filter").split({'\l', '\c'})
@@ -360,7 +360,7 @@ proc upload(filename: string) =
   if verbose: echo "Uploading " & filename
   uploadFile(filename, currentDir)
   if verbose: echo("\t" & filename & " uploaded.")
-    
+
 # Download a file from a remote area.
 proc download(filename: string) =
   if verbose: echo "Downloading " & filename
@@ -421,17 +421,17 @@ let help = &quot;&quot;&quot;
   Use "blimp i mybigfile" to inflate it back to original content.
   When deflated the file only has this content:
-  
+
     "blimphash:" <filename> "-" <md5sum>
   Deflate also copies the real content to your local blimpstore:
-  
+
     <blimpstore>/<filename>-<md5sum>
   ...and if configured also uploads it to "remote", using rsync.
   Configuration is in these locations in order:
- 
+
     ./.blimp.conf
     <gitroot>/.blimp.conf
     ~/<blimpstore>/.blimp.conf
@@ -458,19 +458,19 @@ let help = &quot;&quot;&quot;
   both from the local blimpstore and from the remote. This only removes
   the current content version, not older versions. The file itself is first
   inflated, if needed, and not deleted. This only "unblimps" the file.
-  
+
   The push command (no single character shortcut) will force upload the given file
   from the local blimpstore to the remote. This is normally done automatically,
   but this way you can make sure they are synced onto the remote.
-  
+
   The upload and download commands are used to distribute artifacts typically in a
   build script. If no --area is given, they use the standard "remote" area.
-  
+
   In order to have blimp work automatically you can:
-  
+
   * Create a .gitattributes file with lines like:
     *.png filter=blimp binary
-    
+
   * Configure blimp as a filter by running:
     git config filter.blimp.clean "blimp -s d %f"
     git config filter.blimp.smudge "blimp -s i %f"
@@ -479,13 +479,13 @@ let help = &quot;&quot;&quot;
   When the above is done (per clone) git will automatically run blimp deflate
   just before committing and blimp inflate when operations are done.
-  
+
   This means that if you clone a git repository that already has a .gitattributes
   file in it that uses the blimp filter, then you should do:
-  
+
     blimp init
     blimp inflate --filter
-  
+
   This will configure the blimp filter and then find and inflate all deflated
   files throughout the clone.
 """
@@ -493,7 +493,7 @@ let help = &quot;&quot;&quot;
 ################################ main #####################################
 # Set some dirs
 homeDir = getHomeDir()
-homeDir = homeDir[0.. -2] # Not sure why it keeps a trailing "/" on Linux
+homeDir = homeDir[0..^2] # Not sure why it keeps a trailing "/" on Linux
 currentDir = getCurrentDir()
 gitRootDir = gitRoot()
@@ -545,7 +545,7 @@ if not blimpVersion.isNil and blimpVersion != versionAsString:
   quit("Wrong version of blimp, configuration wants: " & blimpVersion)
-# Ok, let's see 
+# Ok, let's see
 var filenames = initSet[string]()
 # Add upp all files to operate on in a Set
@@ -25,7 +25,7 @@ proc next(L: PLexer) = L.idx += 1
 proc skipws(L: PLexer) =
   while thisChar(L) in Whitespace: next(L)
-    
+
 proc get(L: PLexer; t: var TLexType): string =
   skipws(L)
   let c = thisChar(L)
@@ -33,7 +33,7 @@ proc get(L: PLexer; t: var TLexType): string =
   if c == '\0': return nil
   result = ""
   result.add(c)
-  next(L) 
+  next(L)
   t = tchar
   case c
   of '-':  # '-", "--"
@@ -43,7 +43,7 @@ proc get(L: PLexer; t: var TLexType): string =
       next(L)
       if thisChar(L) == '-': # "---..."
         t = tdivider
-        result.add('-') 
+        result.add('-')
         while thisChar(L) == '-':
           next(L)
   of Letters: # word
@@ -73,11 +73,11 @@ proc get(L: PLexer; t: var TLexType): string =
         result.add('.')
         next(L)
   else: discard
-    
-proc get(L: PLexer): string = 
+
+proc get(L: PLexer): string =
   var t: TLexType
   get(L,t)
-    
+
 proc reset(L: PLexer, s: string) =
   L.str  = s
   L.idx = 0
@@ -85,9 +85,9 @@ proc reset(L: PLexer, s: string) =
 proc newLexer(s: string): PLexer =
   new(result)
   result.reset(s)
-    
+
 ### a container for values ###
-    
+
 type
   TValueKind = enum
     vInt,
@@ -110,17 +110,17 @@ type
       of vSeq: asSeq*: seq[PValue]
 proc boolValue(c: bool): PValue =  PValue(kind: vBool, asBool: c)
-    
+
 proc fileValue(f: File, name: string): PValue =  PValue(kind: vFile, asFile: f, fileName: name)
-    
-proc strValue(s: string): PValue =  PValue(kind: vString, asString: s) 
-    
+
+proc strValue(s: string): PValue =  PValue(kind: vString, asString: s)
+
 proc intValue(v: int): PValue =   PValue(kind: vInt, asInt: v)
-    
+
 proc floatValue(v: float): PValue = PValue(kind: vFloat, asFloat: v)
-    
+
 proc seqValue(v: seq[PValue]): PValue = PValue(kind: vSeq, asSeq: v)
-    
+
 type
   PSpec = ref TSpec
   TSpec = object
@@ -137,18 +137,18 @@ proc fail(msg: string)  =
   stderr.writeln(progname & ": " & msg)
   quit(usage)
-proc parseSpec(u: string) =    
+proc parseSpec(u: string) =
   var
     L: PLexer
     tok: string
     groupCounter: int
     k = 1
-      
+
   let lines = u.splitLines
   L = newLexer(lines[0])
   progname = L.get
   usage = u
-  for line in lines[1..(-1)]:
+  for line in lines[1 .. ^1]:
     var
       isarg = false
       multiple = false
@@ -188,7 +188,7 @@ proc parseSpec(u: string) =
       tok = L.get
     if tok == nil: continue
     # default types for flags and arguments
-    var 
+    var
       ftype = if isarg: "string" else: "bool"
       defValue = ""
     if tok == "(": # typed flag/argument
@@ -212,16 +212,16 @@ proc parseSpec(u: string) =
       multiple = t == telipsis
     elif ftype == "bool": # no type or default
       defValue = "false"
-            
+
     if name != nil:
       #echo("Param: " & name & " type: " & $ftype & " group: " & $groupCounter & " needsvalue: " & $(ftype != "bool") & " default: " & $defValue & " multiple: " & $multiple)
       let spec = PSpec(defVal:defValue, ptype: ftype, group: groupCounter, needsValue: ftype != "bool",multiple:multiple)
-      aliases[alias] = name        
+      aliases[alias] = name
       parm_spec[name] = spec
-proc tail(s: string): string = s[1..(-1)]
+proc tail(s: string): string = s[1..^1]
-var 
+var
   files = newSeq[File]()
 proc closeFiles() {.noconv.} =
@@ -234,16 +234,16 @@ proc parseArguments*(usage: string, args: seq[string]): Table[string,PValue] =
     n = len(args) - 1
     i = 1
     k = 1
-    flag,value, arg: string        
+    flag,value, arg: string
     info: PSpec
     short: bool
     flagvalues: seq[seq[string]]
-      
+
   proc next(): string =
     if i > n: fail("an option required a value!")
     result = args[i]
     i += 1
-      
+
   proc get_alias(c: char): string =
     result = aliases[c]
     if result == nil:
@@ -252,7 +252,7 @@ proc parseArguments*(usage: string, args: seq[string]): Table[string,PValue] =
         fail("no such argument: " & $n)
       else:
         fail("no such option: " & c)
-      
+
   proc get_spec(name: string): PSpec =
     result = parm_spec[name]
     if result == nil:
@@ -264,7 +264,7 @@ proc parseArguments*(usage: string, args: seq[string]): Table[string,PValue] =
   # Collect failures
   var failures = newSeq[string]()
-  
+
   # parse the flags and arguments
   while i <= n:
     arg = next()
@@ -299,26 +299,26 @@ proc parseArguments*(usage: string, args: seq[string]): Table[string,PValue] =
       if not info.multiple:  k += 1
     flagvalues.add(@[flag,value])
     info.used = true
-  
+
   # Some options disables checking
   var enableChecks = true
   for flag,info in parm_spec:
     if info.used:
       if flag == "help" or flag == "version":
         enableChecks = false
-        
+
   # Check maximum group used
   var maxGroup = 0
   for item in flagvalues:
     info = get_spec(item[0])
     if maxGroup < info.group:
       maxGroup = info.group
-    
+
   # any flags not mentioned?
   for flag,info in parm_spec:
     if not info.used:
       # Is there no default and we have used options in this group?
-      if info.defVal == "" and info.group <= maxGroup: 
+      if info.defVal == "" and info.group <= maxGroup:
         failures.add("required option or argument missing: " & flag)
       else:
         flagvalues.add(@[flag,info.defVal])
@@ -373,7 +373,7 @@ proc parseArguments*(usage: string, args: seq[string]): Table[string,PValue] =
         fail("cannot open " & value)
       pval = fileValue(f,value)
     else: discard
-    
+
     var oval = vars[flag]
     if info.multiple: # multiple flags are sequence values
       if oval == nil: # first value!
@@ -388,13 +388,13 @@ proc parseArguments*(usage: string, args: seq[string]): Table[string,PValue] =
   return vars
 proc parse*(usage: string): Table[string,PValue] =
-  var 
+  var
     args: seq[string]
     n = paramCount()
   newSeq(args,n+1)
   for i in 0..n:
     args[i] = paramStr(i)
-  return parseArguments(usage,args)    
+  return parseArguments(usage,args)
 # Helper proc for verbosity level.
 proc verbosityLevel*(args: Table[string,PValue]): int =
@@ -432,19 +432,19 @@ when isMainModule:
   # These two are special, they short out
   if args.showHelp: quit(help)
   if args.showVersion: quit("Version: 1.99")
-  
+
   # Ok, so what did we get...
   let n = args["n"].asInt
-  
+
   # This one is a helper
   let v = verbosityLevel(args)
-  
+
   echo "Lines to show: " & $n
   echo "Verbosity level: " & $verbosityLevel(args)
-  
+
   let myfiles = args["files"].asSeq
   var outFile = args["out"].asFile
-  
+
   for f in myfiles:
     for i in 1..n:
       writeln(outFile, string(f.asFile.readLine()))