Updated automatons for the lexical analyser

Signed-off-by: Alan Rodriguez <alanrodriguezromero@gmail.com>
Fixed merge changes