+ Patch from peter to support initial values for local variables

compiler/pdecvar.pas

@@ -317,14 +317,26 @@ implementation
                     Message(parser_e_initialized_only_one_var);
                   if is_threadvar then
                     Message(parser_e_initialized_not_for_threadvar);
-                  tconstsym:=ttypedconstsym.createtype(vs.realname,tt,true);
-                  tconstsym.fileinfo:=vs.fileinfo;
-                  symtablestack.replace(vs,tconstsym);
-                  vs.free;
-                  symtablestack.insertconstdata(tconstsym);
-                  consume(_EQUAL);
-                  readtypedconst(tt,tconstsym,true);
-                  symdone:=true;
+                  if symtablestack.symtabletype=localsymtable then
+                   begin
+                     consume(_EQUAL);
+                     tconstsym:=ttypedconstsym.createtype('default'+vs.realname,tt,false);
+                     vs.defaultconstsym:=tconstsym;
+                     symtablestack.insert(tconstsym);
+                     symtablestack.insertconstdata(tconstsym);
+                     readtypedconst(tt,tconstsym,false);
+                   end
+                  else
+                   begin
+                     tconstsym:=ttypedconstsym.createtype(vs.realname,tt,true);
+                     tconstsym.fileinfo:=vs.fileinfo;
+                     symtablestack.replace(vs,tconstsym);
+                     vs.free;
+                     symtablestack.insertconstdata(tconstsym);
+                     consume(_EQUAL);
+                     readtypedconst(tt,tconstsym,true);
+                     symdone:=true;
+                   end; 
                end;
              { if the symbol is not completely handled, then try to parse the
                hint directives }
@@ -597,7 +609,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.43  2002-12-27 15:22:20  peter
+  Revision 1.44  2003-01-02 11:14:02  michael
+  + Patch from peter to support initial values for local variables
+
+  Revision 1.43  2002/12/27 15:22:20  peter
     * don't allow initialized threadvars
 
   Revision 1.42  2002/12/07 14:04:59  carl

compiler/psub.pas

@@ -51,7 +51,7 @@ implementation
        ppu,fmodule,
        { pass 1 }
        node,
-       nbas,
+       nbas,nld,
        pass_1,
     {$ifdef state_tracking}
        nstate,
@@ -80,6 +80,27 @@ implementation
                       PROCEDURE/FUNCTION BODY PARSING
 ****************************************************************************}
 
+    procedure initializevars(p:tnamedindexitem;arg:pointer);
+      var
+        b : tblocknode;
+      begin
+        if tsym(p).typ<>varsym then
+         exit;
+        with tvarsym(p) do
+         begin
+           if assigned(defaultconstsym) then
+            begin
+              b:=tblocknode(arg);
+              b.left:=cstatementnode.create(
+                        cassignmentnode.create(
+                            cloadnode.create(tsym(p),tsym(p).owner),
+                            cloadnode.create(defaultconstsym,defaultconstsym.owner)),
+                        b.left);
+            end;
+         end;
+      end;
+
+
     function block(islibrary : boolean) : tnode;
       var
          storepos : tfileposinfo;
@@ -168,7 +189,11 @@ implementation
                 end;
             end
          else
-            block:=statement_block(_BEGIN);
+            begin
+               block:=statement_block(_BEGIN);
+               if symtablestack.symtabletype=localsymtable then
+                 symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}initializevars,block);
+            end;   
       end;
 
 
@@ -818,7 +843,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.85  2002-12-29 18:59:34  peter
+  Revision 1.86  2003-01-02 11:14:02  michael
+  + Patch from peter to support initial values for local variables
+
+  Revision 1.85  2002/12/29 18:59:34  peter
     * fixed parsing of declarations before asm statement
 
   Revision 1.84  2002/12/29 18:25:18  peter

compiler/symsym.pas

@@ -175,6 +175,7 @@ interface
           address       : longint;
           localvarsym   : tvarsym;
           highvarsym    : tvarsym;
+          defaultconstsym : tsym;
           vartype       : ttype;
           varoptions    : tvaroptions;
           reg           : tregister; { if reg<>R_NO, then the variable is an register variable }
@@ -1598,6 +1599,7 @@ implementation
          address:=0;
          localvarsym:=nil;
          highvarsym:=nil;
+         defaultconstsym:=nil;
          refs:=0;
          varstate:=vs_used;
          varoptions:=[];
@@ -1641,6 +1643,7 @@ implementation
          address:=ppufile.getlongint;
          localvarsym:=nil;
          highvarsym:=nil;
+         defaultconstsym:=nil;
          ppufile.gettype(vartype);
          ppufile.getsmallset(varoptions);
          if (vo_is_C_var in varoptions) then
@@ -2566,7 +2569,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.88  2003-01-01 22:51:03  peter
+  Revision 1.89  2003-01-02 11:14:02  michael
+  + Patch from peter to support initial values for local variables
+
+  Revision 1.88  2003/01/01 22:51:03  peter
     * high value insertion changed so it works also when 2 parameters
       are passed