Преглед изворни кода

- removed po_java procoption, since it wasn't really used for anything

git-svn-id: branches/jvmbackend@18694 -
Jonas Maebe пре 14 година
родитељ
комит
4074bf412b
4 измењених фајлова са 3 додато и 7 уклоњено
  1. 0 1
      compiler/pdecobj.pas
  2. 1 1
      compiler/pjvm.pas
  3. 1 3
      compiler/symconst.pas
  4. 1 2
      compiler/utils/ppudump.pp

+ 0 - 1
compiler/pdecobj.pas

@@ -782,7 +782,6 @@ implementation
         begin
         begin
           if is_java_class_or_interface(pd.struct) then
           if is_java_class_or_interface(pd.struct) then
             begin
             begin
-              include(pd.procoptions,po_java);
             end;
             end;
         end;
         end;
 
 

+ 1 - 1
compiler/pjvm.pas

@@ -608,7 +608,7 @@ implementation
         { in case the referred method is from an external class }
         { in case the referred method is from an external class }
         exclude(result.procoptions,po_external);
         exclude(result.procoptions,po_external);
         { not virtual/override/abstract/... }
         { not virtual/override/abstract/... }
-        result.procoptions:=result.procoptions*[po_classmethod,po_staticmethod,po_java,po_varargs,po_public];
+        result.procoptions:=result.procoptions*[po_classmethod,po_staticmethod,po_varargs,po_public];
         result.synthetickind:=tsk_callthrough;
         result.synthetickind:=tsk_callthrough;
         { so we know the name of the routine to call through to }
         { so we know the name of the routine to call through to }
         result.skpara:=pd;
         result.skpara:=pd;

+ 1 - 3
compiler/symconst.pas

@@ -315,9 +315,7 @@ type
       (when calling a regular procedure using the above convention, it will
       (when calling a regular procedure using the above convention, it will
        simply not see the frame pointer parameter, and since the caller cleans
        simply not see the frame pointer parameter, and since the caller cleans
        up the stack will also remain balanced) }
        up the stack will also remain balanced) }
-    po_delphi_nested_cc,
-    { Java method }
-    po_java
+    po_delphi_nested_cc
   );
   );
   tprocoptions=set of tprocoption;
   tprocoptions=set of tprocoption;
 
 

+ 1 - 2
compiler/utils/ppudump.pp

@@ -1148,8 +1148,7 @@ const
      (mask:po_objc;            str:'ObjC'),
      (mask:po_objc;            str:'ObjC'),
      (mask:po_enumerator_movenext; str:'EnumeratorMoveNext'),
      (mask:po_enumerator_movenext; str:'EnumeratorMoveNext'),
      (mask:po_optional;        str: 'Optional'),
      (mask:po_optional;        str: 'Optional'),
-     (mask:po_delphi_nested_cc;str: 'Delphi-style nested frameptr'),
-     (mask:po_java            ;str: 'Java method')
+     (mask:po_delphi_nested_cc;str: 'Delphi-style nested frameptr')
   );
   );
 var
 var
   proctypeoption  : tproctypeoption;
   proctypeoption  : tproctypeoption;