create token checker function
catch a missed token check
Merge branch 'typecheck'
stick spaces to operators, not literals and names

for #22