jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1426 from Varriount/fix-813

Browse source 
Fix #813
This commit is contained in:
Andreas Rumpf 2014-08-02 09:35:36 +02:00
commit b66444800a
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/commands.nim
View file

@ -291,8 +291,12 @@ proc processSwitch(switch, arg: string, pass: TCmdLinePass, info: TLineInfo) =
of "excludepath": of "excludepath":
expectArg(switch, arg, pass, info) expectArg(switch, arg, pass, info)
let path = processPath(arg) let path = processPath(arg)
lists.excludeStr(options.searchPaths, path) lists.excludePath(options.searchPaths, path)
lists.excludeStr(options.lazyPaths, path) lists.excludePath(options.lazyPaths, path)
if (len(path) > 0) and (path[len(path) - 1] == DirSep):
let strippedPath = path[0 .. (len(path) - 2)]
lists.excludePath(options.searchPaths, strippedPath)
lists.excludePath(options.lazyPaths, strippedPath)
of "nimcache": of "nimcache":
expectArg(switch, arg, pass, info) expectArg(switch, arg, pass, info)
options.nimcacheDir = processPath(arg) options.nimcacheDir = processPath(arg)

8
compiler/lists.nim
View file

@ -8,7 +8,8 @@
# #
# This module implements a generic doubled linked list. # This module implements a generic doubled linked list.
# TODO Remove this and replace it with something sensible
import os
type type
PListEntry* = ref TListEntry PListEntry* = ref TListEntry
TListEntry* = object of TObject TListEntry* = object of TObject
@ -103,11 +104,12 @@ proc bringToFront*(list: var TLinkedList, entry: PListEntry) =
entry.next = list.head entry.next = list.head
list.head = entry list.head = entry
proc excludeStr*(list: var TLinkedList, data: string) = proc excludePath*(list: var TLinkedList, data: string) =
var it = list.head var it = list.head
while it != nil: while it != nil:
let nxt = it.next let nxt = it.next
if PStrEntry(it).data == data: remove(list, it) if cmpPaths(PStrEntry(it).data, data) == 0:
remove(list, it)
it = nxt it = nxt
proc find*(list: TLinkedList, fn: TCompareProc, closure: pointer): PListEntry = proc find*(list: TLinkedList, fn: TCompareProc, closure: pointer): PListEntry =