extract general part of CNF core
Merge branch 'master' of github.com:BNFC/bnfc