fixed collision due to new pre_parser method: this method was used internally by jison generators. The internal method has been renamed to `__pre_parse()`
Merge branch 'master' of /media/sf_D_DRIVE/h/prj/1original/visyond/visyond/util/jison/modules/lex-parser