Fixed a LALR(2) problem while scanning usertype resources which had
identifiers for both name and type.

6 files changed