From f63fa06e0fb6754cb2904e1242713d792341a336 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Tue, 11 Jan 2011 12:06:27 +0100 Subject: [PATCH] add versions of search which provide default --- .../antlr3/src/cs2j/Utils/DirectoryHT.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/CSharpTranslator/antlr3/src/cs2j/Utils/DirectoryHT.cs b/CSharpTranslator/antlr3/src/cs2j/Utils/DirectoryHT.cs index bf9f72b..d4df034 100644 --- a/CSharpTranslator/antlr3/src/cs2j/Utils/DirectoryHT.cs +++ b/CSharpTranslator/antlr3/src/cs2j/Utils/DirectoryHT.cs @@ -173,8 +173,8 @@ namespace RusticiSoftware.Translator.Utils // search for name, given searchPath // searchPath is searched in reverse order - public TValue Search(List searchPath, string name) { - TValue ret = default(TValue); + public TValue Search(IList searchPath, string name, TValue def) { + TValue ret = def; bool found = false; for (int i = searchPath.Count-1; i >= 0; i--) { String ns = searchPath[i]; @@ -194,10 +194,20 @@ namespace RusticiSoftware.Translator.Utils return ret; } + // search for name, given searchPath + // searchPath is searched in reverse order + public TValue Search(IList searchPath, string name) { + return Search(searchPath, name, default(TValue)); + } + public TValue Search(string name) { return Search(new List(), name); } + public TValue Search(string name, TValue def) { + return Search(new List(), name, def); + } + public void Add(KeyValuePair item) { this.Add(item.Key, item.Value);