Improved cpp rules extraction from y files