Refactor and simplify parser code

Created by: rvantonder

Merge the parser.go andliteral_parser.go files. Then there's some duplication of these scanner/parser functions to simplify.