paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-15 17:19:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* make sure that the real name of enums is not replaced by the alias

Browse Source 
typesyms we create

git-svn-id: branches/jvmbackend@18647 -
This commit is contained in:
Jonas Maebe 2011-08-20 08:21:05 +00:00
parent cfe125198c
commit b65422cd59
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/pjvm.pas
View File

@ -212,6 +212,7 @@ implementation
fsym: tfieldvarsym;
sstate: tscannerstate;
sl: tpropaccesslist;
temptypesym: ttypesym;
begin
{ if it's a subrange type, don't create a new class }
if assigned(tenumdef(def).basedef) then
@ -226,10 +227,18 @@ implementation
name that can be used in generated Pascal code without risking an
identifier conflict (since it is local to this class; the global name
is unique because it's an identifier that contains $-signs) }
enumclass.symtable.insert(ttypesym.create('__FPC_TEnumClassAlias',enumclass));
temptypesym:=ttypesym.create('__FPC_TEnumClassAlias',nil);
{ don't pass enumclass to the ttypesym constructor, because then it
will replace the current (real) typesym of that def with the alias }
temptypesym.typedef:=enumclass;
enumclass.symtable.insert(temptypesym);
{ also create an alias for the enum type so that we can iterate over
all enum values when creating the body of the class constructor }
enumclass.symtable.insert(ttypesym.create('__FPC_TEnumAlias',def));
temptypesym:=ttypesym.create('__FPC_TEnumAlias',nil);
temptypesym.typedef:=def;
enumclass.symtable.insert(temptypesym);
{ but the name of the class as far as the JVM is concerned will match
the enum's original name (the enum type itself won't be output in
any class file, so no conflict there) }