Add match method to lexer
use "match" method to match comment token
clean up
consumeIfMatch method, fix match rollback.