Skip to content

Commit

Permalink
Merge new hash array mapped trie implementation
Browse files Browse the repository at this point in the history
This essentially wipes out the old implementation.

Conflicts:
	Data/HashMap/Array.hs
	Data/HashMap/Internal.hs
	Data/HashMap/PopCount.hs
	Data/HashMap/UnsafeShift.hs
	cbits/popc.c
  • Loading branch information
tibbe committed Mar 7, 2012
2 parents 1af9621 + 6107e1b commit 7eb6998
Show file tree
Hide file tree
Showing 16 changed files with 2,431 additions and 503 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
*.prof
*.tix
.hpc/
/benchmarks/bench
/benchmarks/dist/*
/dist/*
/tests/tests
Loading

0 comments on commit 7eb6998

Please sign in to comment.