paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-27 05:50:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ tobjectdef.jvm_full_typename() which returns the fully mangled type

Browse Source 
name of a Java class (package/procname), extracted from jvmdef
  * several fixes to jvmmangledname (po_has_importdll only applies to
    unit-level procedures, replace incomplete mangling of class type names
    with call to jvm_full_typename()

git-svn-id: branches/jvmbackend@18326 -
This commit is contained in:
Jonas Maebe 2011-08-20 07:46:27 +00:00
parent 9a9ea1f257
commit 1ace6ec201
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/jvmdef.pas
View File

@ -181,12 +181,7 @@ implementation
case tobjectdef(def).objecttype of case tobjectdef(def).objecttype of
odt_javaclass, odt_javaclass,
odt_interfacejava: odt_interfacejava:
begin encodedstr:=encodedstr+'L'+tobjectdef(def).jvm_full_typename+';'
encodedstr:=encodedstr+'L';
if assigned(tobjectdef(def).import_lib) then
encodedstr:=encodedstr+tobjectdef(def).import_lib^+'/';
encodedstr:=encodedstr+tobjectdef(def).objextname^+';';
end
else else
result:=false; result:=false;
end; end;

39
compiler/symdef.pas
View File

@ -336,6 +336,8 @@ interface
function check_objc_types: boolean; function check_objc_types: boolean;
{ C++ } { C++ }
procedure finish_cpp_data; procedure finish_cpp_data;
{ JVM }
function jvm_full_typename: string;
end; end;
tclassrefdef = class(tabstractpointerdef) tclassrefdef = class(tabstractpointerdef)
@ -4203,8 +4205,8 @@ implementation
procedure tprocdef.adornmangledname(var name: string; fordefinition: boolean); procedure tprocdef.adornmangledname(var name: string; fordefinition: boolean);
{$ifdef jvm} {$ifdef jvm}
var var
owningunit:tsymtable; owningunit: tsymtable;
tmpresult:string; tmpresult: string;
{$endif jvm} {$endif jvm}
begin begin
{$ifdef jvm} {$ifdef jvm}
@ -4237,31 +4239,33 @@ implementation
staticsymtable, staticsymtable,
localsymtable: localsymtable:
begin begin
if po_has_importdll in procoptions then
begin
tmpresult:='';
{ import_dll comes from "external 'import_dll_name' name 'external_name'" }
if assigned(import_dll) then
tmpresult:=import_dll^+'/'
else
internalerror(2010122607);
end;
owningunit:=procsym.owner; owningunit:=procsym.owner;
while (owningunit.symtabletype in [localsymtable,objectsymtable,recordsymtable]) do while (owningunit.symtabletype in [localsymtable,objectsymtable,recordsymtable]) do
owningunit:=owner.defowner.owner; owningunit:=owner.defowner.owner;
{ TODO: add package name !!! } tmpresult:=tmpresult+owningunit.realname^+'/';
tmpresult:=owningunit.realname^+'/';
end; end;
objectsymtable: objectsymtable:
case tobjectdef(procsym.owner.defowner).objecttype of case tobjectdef(procsym.owner.defowner).objecttype of
odt_javaclass, odt_javaclass,
odt_interfacejava: odt_interfacejava:
tmpresult:=tobjectdef(procsym.owner.defowner).objextname^+'/'; begin
tmpresult:=tobjectdef(procsym.owner.defowner).jvm_full_typename+'/'
end
else else
internalerror(2010122606); internalerror(2010122606);
end end
else else
internalerror(2010122605); internalerror(2010122605);
end; end;
if po_has_importdll in procoptions then
begin
{ import_dll comes from "external 'import_dll_name' name 'external_name'" }
if assigned(import_dll) then
tmpresult:=tmpresult+import_dll^+'/'
else
internalerror(2010122607);
end;
end; end;
name:=tmpresult+name; name:=tmpresult+name;
{$endif} {$endif}
@ -5568,6 +5572,15 @@ implementation
self.symtable.DefList.ForEachCall(@do_cpp_import_info,nil); self.symtable.DefList.ForEachCall(@do_cpp_import_info,nil);
end; end;
function tobjectdef.jvm_full_typename: string;
begin
result:='';
if assigned(import_lib) then
result:=import_lib^+'/';
result:=result+objextname^;
end;
{**************************************************************************** {****************************************************************************
TImplementedInterface TImplementedInterface
****************************************************************************} ****************************************************************************}