In Parser.jj, Method ConsumePureType is updated. The do while loop will be enforced to quit after checking 500 tokens because this will not be a generic type and it may be something like credit < 0; In Class FileEnvironment method searchImportedPackages, a else if branch is added to take care of a case that a class has the same name as the package name