فهرست منبع

* removed no longer used allow_only_static global variable

git-svn-id: trunk@6265 -
Jonas Maebe 18 سال پیش
والد
کامیت
d6a4fbea47
3فایلهای تغییر یافته به همراه0 افزوده شده و 16 حذف شده
  1. 0 3
      compiler/globals.pas
  2. 0 4
      compiler/pexpr.pas
  3. 0 9
      compiler/psub.pas

+ 0 - 3
compiler/globals.pas

@@ -283,9 +283,6 @@ interface
          recompilations needed PM }
          recompilations needed PM }
        simplify_ppu : boolean = true;
        simplify_ppu : boolean = true;
 
 
-       { should we allow non static members ? }
-       allow_only_static : boolean = false;
-
        Inside_asm_statement : boolean = false;
        Inside_asm_statement : boolean = false;
 
 
        global_unit_count : word = 0;
        global_unit_count : word = 0;

+ 0 - 4
compiler/pexpr.pas

@@ -1885,7 +1885,6 @@ implementation
           end;
           end;
 
 
         var
         var
-          store_static : boolean;
           protsym  : tpropertysym;
           protsym  : tpropertysym;
           p2,p3  : tnode;
           p2,p3  : tnode;
           srsym  : tsym;
           srsym  : tsym;
@@ -2125,11 +2124,8 @@ implementation
                          begin
                          begin
                            if token=_ID then
                            if token=_ID then
                              begin
                              begin
-                               store_static:=allow_only_static;
-                               allow_only_static:=false;
                                classh:=tobjectdef(p1.resultdef);
                                classh:=tobjectdef(p1.resultdef);
                                searchsym_in_class(classh,classh,pattern,srsym,srsymtable);
                                searchsym_in_class(classh,classh,pattern,srsym,srsymtable);
-                               allow_only_static:=store_static;
                                if assigned(srsym) then
                                if assigned(srsym) then
                                  begin
                                  begin
                                     check_hints(srsym,srsym.symoptions);
                                     check_hints(srsym,srsym.symoptions);

+ 0 - 9
compiler/psub.pas

@@ -1173,12 +1173,6 @@ implementation
          if procdef.parast.symtablelevel>maxnesting then
          if procdef.parast.symtablelevel>maxnesting then
            Message(parser_e_too_much_lexlevel);
            Message(parser_e_too_much_lexlevel);
 
 
-         { static is also important for local procedures !! }
-         if (po_staticmethod in procdef.procoptions) then
-           allow_only_static:=true
-         else if (procdef.parast.symtablelevel=normal_function_level) then
-           allow_only_static:=false;
-
     {$ifdef state_tracking}
     {$ifdef state_tracking}
 {    aktstate:=Tstate_storage.create;}
 {    aktstate:=Tstate_storage.create;}
     {$endif state_tracking}
     {$endif state_tracking}
@@ -1280,9 +1274,6 @@ implementation
 {    aktstate.destroy;}
 {    aktstate.destroy;}
     {$endif state_tracking}
     {$endif state_tracking}
 
 
-         { reset to normal non static function }
-         if (procdef.parast.symtablelevel=normal_function_level) then
-           allow_only_static:=false;
          current_procinfo:=oldprocinfo;
          current_procinfo:=oldprocinfo;
 
 
          { Restore old state }
          { Restore old state }