CParser.m4.y: restore the pre-'func-declarator' parser

tests/parser/badf[1-4].c are passing now
CParser.m4.y: adding declarator-func, but with 2 R/R conflicts