Some bugfixes in token parsing

Fix use of octal literals from java, goto instead of break outer