diff options
author | Jeremie Laval <jeremie.laval@gmail.com> | 2012-11-29 19:13:57 +0400 |
---|---|---|
committer | Jeremie Laval <jeremie.laval@gmail.com> | 2012-11-29 19:21:05 +0400 |
commit | 43f36c19ba49214349eb745d6a5559a294e7b7bf (patch) | |
tree | b1835be4c6ad94175a00911b0639e09f29db81d5 | |
parent | 783bcfb735b17b48eee7670a896a29dfd6023174 (diff) |
[monkeydoc] Avoid variable name clash
-rw-r--r-- | mcs/tools/monkeydoc/Monkeydoc/HelpSource.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mcs/tools/monkeydoc/Monkeydoc/HelpSource.cs b/mcs/tools/monkeydoc/Monkeydoc/HelpSource.cs index 807913705f8..b22742b35e3 100644 --- a/mcs/tools/monkeydoc/Monkeydoc/HelpSource.cs +++ b/mcs/tools/monkeydoc/Monkeydoc/HelpSource.cs @@ -226,8 +226,8 @@ namespace MonkeyDoc { Node current = null; - var cache = LRUCache<string, Node>.Default; - if ((current = cache.Get (url)) != null) + var matchCache = LRUCache<string, Node>.Default; + if ((current = matchCache.Get (url)) != null) return current; current = Tree.RootNode; @@ -239,14 +239,14 @@ namespace MonkeyDoc if (index >= 0) { Node n = current.Nodes[index]; //Console.WriteLine ("Binarysearch success for {0} which fell on {1}", strippedUrl, n.Element); - cache.Put (url, n); + matchCache.Put (url, n); return n; } index = ~index; if (index == current.Nodes.Count) { //Console.WriteLine ("Match fail for {0}", strippedUrl); //Console.WriteLine (current.Nodes.Select (n => n.Element).Aggregate ((e1, e2) => e1 + ", " + e2)); - return SlowMatchNode (Tree.RootNode, cache, strippedUrl); + return SlowMatchNode (Tree.RootNode, matchCache, strippedUrl); } current = current.Nodes [index - 1]; //Console.WriteLine ("Binarysearch failed for {0}, next node check is {1}", strippedUrl, current.Element); @@ -260,7 +260,7 @@ namespace MonkeyDoc * parts but then it would be quite specific. Since in the case of ecmaspec the tree is well-formed enough * the "Slow" match should still be fast enough */ - Node SlowMatchNode (Node current, LRUCache<string, Node> cache, string url) + Node SlowMatchNode (Node current, LRUCache<string, Node> matchCache, string url) { //Console.WriteLine ("Entering slow path for {0} starting from {1}", url, current.Element); while (current != null) { @@ -268,7 +268,7 @@ namespace MonkeyDoc foreach (Node n in current.Nodes) { var element = n.Element.StartsWith (UriPrefix, StringComparison.OrdinalIgnoreCase) ? n.Element.Substring (UriPrefix.Length) : n.Element; if (url == element) { - cache.Put (url, n); + matchCache.Put (url, n); return n; } else if (url.StartsWith (element + ".", StringComparison.OrdinalIgnoreCase) && !n.IsLeaf) { current = n; |