From 4542f459f165502ed9537bb570de44640cdc4228 Mon Sep 17 00:00:00 2001 From: VoR0220 Date: Wed, 11 Jan 2017 11:45:14 -0600 Subject: added fix and a test for order independence of nested prefixing Signed-off-by: VoR0220 --- libsolidity/interface/CompilerStack.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libsolidity/interface/CompilerStack.cpp') diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index 1e571cae..e4c351ff 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -523,7 +523,7 @@ string CompilerStack::applyRemapping(string const& _path, string const& _context if (!isPrefixOf(context, _context)) continue; // Skip if we already have a closer prefix match. - if (prefix.length() < longestPrefix) + if (prefix.length() < longestPrefix && context.length() == longestContext) continue; // Skip if the prefix does not match. if (!isPrefixOf(prefix, _path)) @@ -534,7 +534,7 @@ string CompilerStack::applyRemapping(string const& _path, string const& _context bestMatchTarget = redir.target; } - string path = longestPrefixTarget; + string path = bestMatchTarget; path.append(_path.begin() + longestPrefix, _path.end()); return path; } -- cgit v1.2.3