浏览代码

+ support "reintroduce" for Java classes. Although in most cases this won't
work because you cannot start new inheritance trees, it can work under some
circumstances if the parameters are not exact. In case there is a problem,
this will be detected later by TVMTBuilder.is_new_vmt_entry().

git-svn-id: branches/jvmbackend@18711 -

Jonas Maebe 14 年之前
父节点
当前提交
ddf6591f7f
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      compiler/pdecsub.pas

+ 3 - 2
compiler/pdecsub.pas

@@ -1575,7 +1575,8 @@ begin
     end
   else
     if not(is_class_or_interface_or_object(tprocdef(pd).struct)) and
-       not(is_objccategory(tprocdef(pd).struct)) then
+       not(is_objccategory(tprocdef(pd).struct)) and
+       not(is_javaclass(tprocdef(pd).struct)) then
       Message(parser_e_no_object_reintroduce);
 end;
 
@@ -2142,7 +2143,7 @@ const
       mutexclpo     : [po_external]
     ),(
       idtok:_REINTRODUCE;
-      pd_flags : [pd_interface,pd_object,pd_notobjintf,pd_objcclass,pd_notrecord];
+      pd_flags : [pd_interface,pd_object,pd_notobjintf,pd_objcclass,pd_notrecord,pd_javaclass];
       handler  : @pd_reintroduce;
       pocall   : pocall_none;
       pooption : [po_reintroduce];