Skip to content

Search parent packages to resolve entity. #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
highfly22 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Search parent packages to resolve entity. #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions hprotoc/Text/ProtocolBuffers/ProtoCompile/Resolve.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,8 @@ resolvePredEnv userMessage accept nameU envIn = do
<|>
(matchPrefix (top'Package tl) xs >>= filteredLookup (top'mVals tl))
<|>
(testPrefix main (top'Package tl) >> filteredLookup (top'mVals tl) xs)
(if matchesParent main (top'Package tl) (init xs) then filteredLookup (top'mVals tl) [last xs] else Nothing)

where matchesMain (PackageID {_getPackageID=a}) (PackageID {_getPackageID=b}) = a==b
matchesMain (NoPackageID {}) (PackageID {}) = False -- XXX XXX XXX 2012-09-19 suspicious
matchesMain (PackageID {}) (NoPackageID {}) = True
Expand All @@ -479,8 +480,14 @@ resolvePredEnv userMessage accept nameU envIn = do
matchPrefix (NoPackageID {}) _ = Nothing
matchPrefix (PackageID {_getPackageID=a}) ys = stripPrefix a ys

testPrefix (PackageID {_getPackageID=child}) (PackageID {_getPackageID=parent}) = stripPrefix parent child
testPrefix _ _ = Nothing
matchesParent (PackageID {_getPackageID=a}) (PackageID {_getPackageID=b}) child = ((commonPrefix a b) ++ child) == b
matchesParent (NoPackageID {}) (PackageID {}) _ = False
matchesParent (PackageID {}) (NoPackageID {}) _ = True
matchesParent (NoPackageID {}) (NoPackageID {}) _ = True

commonPrefix _ [] = []
commonPrefix [] _ = []
commonPrefix (a:as) (b:bs) = if a==b then a:(commonPrefix as bs) else []

filteredLookup valsIn namesIn =
let lookupVals :: EMap -> [IName String] -> Maybe E'Entity
Expand Down