diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/commands.nim | 8 | ||||
| -rw-r--r-- | compiler/lists.nim | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/compiler/commands.nim b/compiler/commands.nim index 38c8dd294..7219c168a 100644 --- a/compiler/commands.nim +++ b/compiler/commands.nim @@ -291,8 +291,12 @@ proc processSwitch(switch, arg: string, pass: TCmdLinePass, info: TLineInfo) = of "excludepath": expectArg(switch, arg, pass, info) let path = processPath(arg) - lists.excludeStr(options.searchPaths, path) - lists.excludeStr(options.lazyPaths, path) + lists.excludePath(options.searchPaths, 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": expectArg(switch, arg, pass, info) options.nimcacheDir = processPath(arg) diff --git a/compiler/lists.nim b/compiler/lists.nim index dd4f5d6be..efffe60fe 100644 --- a/compiler/lists.nim +++ b/compiler/lists.nim @@ -8,7 +8,8 @@ # # This module implements a generic doubled linked list. - +# TODO Remove this and replace it with something sensible +import os type PListEntry* = ref TListEntry TListEntry* = object of TObject @@ -103,11 +104,12 @@ proc bringToFront*(list: var TLinkedList, entry: PListEntry) = entry.next = list.head list.head = entry -proc excludeStr*(list: var TLinkedList, data: string) = +proc excludePath*(list: var TLinkedList, data: string) = var it = list.head while it != nil: let nxt = it.next - if PStrEntry(it).data == data: remove(list, it) + if cmpPaths(PStrEntry(it).data, data) == 0: + remove(list, it) it = nxt proc find*(list: TLinkedList, fn: TCompareProc, closure: pointer): PListEntry = |