more Pascal to Java comment conversion in JavaScanner and JavaTokenType