Browse Source

* Removed unused get_code_block_func param from str_parse_method_impl

git-svn-id: branches/joost/classattributes@25360 -
joost 12 years ago
parent
commit
2cf9e6dc7d
1 changed files with 11 additions and 11 deletions
  1. 11 11
      compiler/symcreat.pas

+ 11 - 11
compiler/symcreat.pas

@@ -64,7 +64,7 @@ interface
         * save the scanner state before calling this routine, and restore when done.
         * save the scanner state before calling this routine, and restore when done.
         * the code *must* be written in objfpc style
         * the code *must* be written in objfpc style
   }
   }
-  function str_parse_method_impl(str: ansistring; get_code_block_func: tcggetcodeblockfunc; usefwpd: tprocdef; is_classdef: boolean):boolean;
+  function str_parse_method_impl(str: ansistring; usefwpd: tprocdef; is_classdef: boolean):boolean;
 
 
   { parses a typed constant assignment to ssym
   { parses a typed constant assignment to ssym
 
 
@@ -218,7 +218,7 @@ implementation
     end;
     end;
 
 
 
 
-  function str_parse_method_impl(str: ansistring; get_code_block_func: tcggetcodeblockfunc; usefwpd: tprocdef; is_classdef: boolean):boolean;
+  function str_parse_method_impl(str: ansistring; usefwpd: tprocdef; is_classdef: boolean):boolean;
      var
      var
        oldparse_only: boolean;
        oldparse_only: boolean;
        tmpstr: ansistring;
        tmpstr: ansistring;
@@ -244,7 +244,7 @@ implementation
       current_scanner.substitutemacro('meth_impl_macro',@str[1],length(str),current_scanner.line_no,current_scanner.inputfile.ref_index);
       current_scanner.substitutemacro('meth_impl_macro',@str[1],length(str),current_scanner.line_no,current_scanner.inputfile.ref_index);
       current_scanner.readtoken(false);
       current_scanner.readtoken(false);
       { and parse it... }
       { and parse it... }
-      read_proc(is_classdef,usefwpd,get_code_block_func);
+      read_proc(is_classdef,usefwpd,nil);
       parse_only:=oldparse_only;
       parse_only:=oldparse_only;
       { remove the temporary macro input file again }
       { remove the temporary macro input file again }
       current_scanner.closeinputfile;
       current_scanner.closeinputfile;
@@ -357,7 +357,7 @@ implementation
          not is_void(pd.returndef) then
          not is_void(pd.returndef) then
         str:=str+'result:=';
         str:=str+'result:=';
       str:=str+'inherited end;';
       str:=str+'inherited end;';
-      str_parse_method_impl(str,nil,pd,isclassmethod);
+      str_parse_method_impl(str,pd,isclassmethod);
     end;
     end;
 
 
 
 
@@ -401,7 +401,7 @@ implementation
             end;
             end;
         end;
         end;
       str:=str+'end;';
       str:=str+'end;';
-      str_parse_method_impl(str,nil,pd,false);
+      str_parse_method_impl(str,pd,false);
     end;
     end;
 
 
 
 
@@ -433,7 +433,7 @@ implementation
             end;
             end;
         end;
         end;
       str:=str+'end;';
       str:=str+'end;';
-      str_parse_method_impl(str,nil,pd,false);
+      str_parse_method_impl(str,pd,false);
     end;
     end;
 
 
 
 
@@ -466,7 +466,7 @@ implementation
             end;
             end;
         end;
         end;
       str:=str+'end;';
       str:=str+'end;';
-      str_parse_method_impl(str,nil,pd,false);
+      str_parse_method_impl(str,pd,false);
     end;
     end;
 
 
   procedure implement_empty(pd: tprocdef);
   procedure implement_empty(pd: tprocdef);
@@ -478,7 +478,7 @@ implementation
         (po_classmethod in pd.procoptions) and
         (po_classmethod in pd.procoptions) and
         not(pd.proctypeoption in [potype_constructor,potype_destructor]);
         not(pd.proctypeoption in [potype_constructor,potype_destructor]);
       str:='begin end;';
       str:='begin end;';
-      str_parse_method_impl(str,nil,pd,isclassmethod);
+      str_parse_method_impl(str,pd,isclassmethod);
     end;
     end;
 
 
 
 
@@ -520,7 +520,7 @@ implementation
       str:=str+callpd.procsym.realname+'(';
       str:=str+callpd.procsym.realname+'(';
       addvisibibleparameters(str,pd);
       addvisibibleparameters(str,pd);
       str:=str+') end;';
       str:=str+') end;';
-      str_parse_method_impl(str,nil,pd,isclassmethod);
+      str_parse_method_impl(str,pd,isclassmethod);
     end;
     end;
 
 
 
 
@@ -839,7 +839,7 @@ implementation
     begin
     begin
       callthroughprop:=tpropertysym(pd.skpara);
       callthroughprop:=tpropertysym(pd.skpara);
       str:='begin result:='+callthroughprop.realname+'; end;';
       str:='begin result:='+callthroughprop.realname+'; end;';
-      str_parse_method_impl(str,nil,pd,po_classmethod in pd.procoptions)
+      str_parse_method_impl(str,pd,po_classmethod in pd.procoptions)
     end;
     end;
 
 
 
 
@@ -850,7 +850,7 @@ implementation
     begin
     begin
       callthroughprop:=tpropertysym(pd.skpara);
       callthroughprop:=tpropertysym(pd.skpara);
       str:='begin '+callthroughprop.realname+':=__fpc_newval__; end;';
       str:='begin '+callthroughprop.realname+':=__fpc_newval__; end;';
-      str_parse_method_impl(str,nil,pd,po_classmethod in pd.procoptions)
+      str_parse_method_impl(str,pd,po_classmethod in pd.procoptions)
     end;
     end;
 
 
   function get_attribute_code_block(pd: tprocdef) : tnode;
   function get_attribute_code_block(pd: tprocdef) : tnode;