Fixed grammar for re. Added tokens so values returned from the lexer have tokens associated with them. The function declared by a deflexer takes an optional source path which will be part of any token created.