* removed some erros after other errors (introduced by useexcept)

 * stabs works again correctly (for how long !)

compiler/cg386add.pas

@@ -677,6 +677,7 @@ implementation
                                    { bts requires both elements to be registers }
                                      if p^.left^.location.loc in [LOC_MEM,LOC_REFERENCE] then
                                       begin
+                                        ungetiftemp(p^.left^.location.reference);
                                         del_reference(p^.left^.location.reference);
                                         hregister:=getregister32;
                                         exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,opsize,
@@ -688,6 +689,7 @@ implementation
                                       end;
                                      if p^.right^.location.loc in [LOC_MEM,LOC_REFERENCE] then
                                       begin
+                                        ungetiftemp(p^.right^.location.reference);
                                         del_reference(p^.right^.location.reference);
                                         hregister:=getregister32;
                                         exprasmlist^.concat(new(pai386,op_ref_reg(A_MOV,opsize,
@@ -1396,7 +1398,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.21  1998-10-25 23:32:48  peter
+  Revision 1.22  1998-10-28 18:26:12  pierre
+   * removed some erros after other errors (introduced by useexcept)
+   * stabs works again correctly (for how long !)
+
+  Revision 1.21  1998/10/25 23:32:48  peter
     * fixed unsigned mul
 
   Revision 1.20  1998/10/21 08:39:56  florian

compiler/parser.pas

@@ -290,7 +290,10 @@ unit parser;
        recoverpospointer:=oldrecoverpos;
      end
      else
-       recoverpospointer:=oldrecoverpos;
+       begin
+          recoverpospointer:=oldrecoverpos;
+          longjump_used:=true;
+       end;
 {$endif USEEXCEPT}
          { clear memory }
 {$ifdef Splitheap}
@@ -327,7 +330,8 @@ unit parser;
          if (compile_level>1) then
            begin
               { reset ranges/stabs in exported definitions }
-              reset_global_defs;
+              { reset_global_defs;
+                moved to pmodules (PM) }
 
               { restore scanner }
               c:=oldc;
@@ -409,12 +413,20 @@ unit parser;
           end;
 
          dec(compile_level);
+{$ifdef USEEXCEPT}
+         if longjump_used then
+           longjmp(recoverpospointer^,1);
+{$endif USEEXCEPT}
       end;
 
 end.
 {
   $Log$
-  Revision 1.59  1998-10-26 17:15:18  pierre
+  Revision 1.60  1998-10-28 18:26:14  pierre
+   * removed some erros after other errors (introduced by useexcept)
+   * stabs works again correctly (for how long !)
+
+  Revision 1.59  1998/10/26 17:15:18  pierre
     + added two level of longjump to
       allow clean freeing of used memory on errors
 

compiler/pmodules.pas

@@ -749,20 +749,10 @@ unit pmodules;
          current_module^.globalsymtable:=current_module^.localsymtable;
          current_module^.localsymtable:=nil;
 
+         reset_global_defs;
          { ... parse the declarations }
          read_interface_declarations;
 
-{$ifdef GDB}
-         { add all used definitions}
-         if (cs_debuginfo in aktmoduleswitches) then
-           begin
-              { all types }
-              punitsymtable(refsymtable)^.concattypestabto(debuglist);
-              { and all local symbols}
-              refsymtable^.concatstabto(debuglist);
-           end;
-{$endif GDB}
-
          { leave when we got an error }
          if (status.errorcount>0) and not status.skip_error then
           begin
@@ -888,6 +878,13 @@ unit pmodules;
          { add all used definitions even for implementation}
          if (cs_debuginfo in aktmoduleswitches) then
           begin
+            if assigned(current_module^.globalsymtable) then
+              begin
+                 { all types }
+                 punitsymtable(current_module^.globalsymtable)^.concattypestabto(debuglist);
+                 { and all local symbols}
+                 punitsymtable(current_module^.globalsymtable)^.concatstabto(debuglist);
+              end;
             { all types }
             punitsymtable(st)^.concattypestabto(debuglist);
             { and all local symbols}
@@ -895,6 +892,9 @@ unit pmodules;
           end;
 {$endif GDB}
 
+
+         reset_global_defs;
+
          { tests, if all (interface) forwards are resolved }
          if (status.errorcount=0) then
            symtablestack^.check_forwards;
@@ -1020,6 +1020,9 @@ unit pmodules;
          if token=_USES then
            loadunits;
 
+
+         reset_global_defs;
+
          {Insert the name of the main program into the symbol table.}
          if current_module^.modulename^<>'' then
            st^.insert(new(pprogramsym,init(current_module^.modulename^)));
@@ -1098,7 +1101,11 @@ unit pmodules;
 end.
 {
   $Log$
-  Revision 1.75  1998-10-27 13:45:35  pierre
+  Revision 1.76  1998-10-28 18:26:15  pierre
+   * removed some erros after other errors (introduced by useexcept)
+   * stabs works again correctly (for how long !)
+
+  Revision 1.75  1998/10/27 13:45:35  pierre
     * classes get a vmt allways
     * better error info (tried to remove
       several error strings introduced by the tpexcept handling)

compiler/symsym.inc

@@ -415,6 +415,9 @@
          pd : pprocdef;
          oldaktfilepos : tfileposinfo;
       begin
+         { don't check if errors !! }
+         if status.errorcount>0 then
+           exit;
          pd:=definition;
          while assigned(pd) do
            begin
@@ -1715,7 +1718,11 @@
 
 {
   $Log$
-  Revision 1.55  1998-10-20 08:07:00  pierre
+  Revision 1.56  1998-10-28 18:26:18  pierre
+   * removed some erros after other errors (introduced by useexcept)
+   * stabs works again correctly (for how long !)
+
+  Revision 1.55  1998/10/20 08:07:00  pierre
     * several memory corruptions due to double freemem solved
       => never use p^.loc.location:=p^.left^.loc.location;
     + finally I added now by default

compiler/tccal.pas

@@ -221,11 +221,15 @@ implementation
          hp,procs,hp2 : pprocdefcoll;
          pd : pprocdef;
          actprocsym : pprocsym;
+         nextprocsym : pprocsym;
          def_from,def_to,conv_to : pdef;
          pt,inlinecode : ptree;
          exactmatch,inlined : boolean;
          paralength,l : longint;
          pdc : pdefcoll;
+{$ifdef TEST_PROCSYMS}
+         symt : psymtable;
+{$endif TEST_PROCSYMS}
 
          { only Dummy }
          hcvt : tconverttype;
@@ -368,6 +372,33 @@ implementation
               if not(assigned(p^.procdefinition)) then
                 begin
                    actprocsym:=pprocsym(p^.symtableprocentry);
+{$ifdef TEST_PROCSYMS}
+                 if (p^.unit_specific) or
+                    assigned(p^.methodpointer) then
+                   nextprocsym:=nil
+                 else while not assigned(procs) do
+                  begin
+                     symt:=p^.symtableproc;
+                     srsym:=nil;
+                     while assigned(symt^.next) and not assigned(srsym) do
+                       begin
+                          symt:=symt^.next;
+                          getsymonlyin(symt,actprocsym^.name);
+                          if assigned(srsym) then
+                            if srsym^.typ<>procsym then
+                              begin
+                                 { reject all that is not a procedure }
+                                 srsym:=nil;
+                                 { don't search elsewhere }
+                                 while assigned(symt^.next) do
+                                   symt:=symt^.next;
+                              end;
+                       end;
+                     nextprocsym:=srsym;
+                  end;
+{$else TEST_PROCSYMS}
+                nextprocsym:=nil;
+{$endif TEST_PROCSYMS}
                    { determine length of parameter list }
                    pt:=p^.left;
                    paralength:=0;
@@ -414,20 +445,13 @@ implementation
                                end;
                           end;
                         pd:=pd^.nextoverloaded;
-{$ifdef CHAINPROCSYMS}
-                        if (pd=nil) and not (p^.unit_specific) then
-                          begin
-                             actprocsym:=actprocsym^.nextprocsym;
-                             if assigned(actprocsym) then
-                               pd:=actprocsym^.definition;
-                          end;
-{$endif CHAINPROCSYMS}
                      end;
 
                    { no procedures found? then there is something wrong
                      with the parameter size }
                    if not assigned(procs) and
-                      ((parsing_para_level=0) or assigned(p^.left)) then
+                      ((parsing_para_level=0) or assigned(p^.left)) and
+                      (nextprocsym=nil) then
                     begin
                        CGMessage(parser_e_wrong_parameter_size);
                        actprocsym^.write_parameter_lists;
@@ -526,7 +550,8 @@ implementation
                     begin
                       { there is an error, must be wrong type, because
                         wrong size is already checked (PFV) }
-                      if (parsing_para_level=0) or (p^.left<>nil) then
+                      if ((parsing_para_level=0) or (p^.left<>nil)) and
+                         (nextprocsym=nil) then
                        begin
                           CGMessage(parser_e_wrong_parameter_type);
                           actprocsym^.write_parameter_lists;
@@ -553,7 +578,7 @@ implementation
                    { rather than to words                              }
                    { conversion of byte to integer or longint          }
                    {would still not be solved                          }
-                   if assigned(procs^.next) then
+                   if assigned(procs) and assigned(procs^.next) then
                      begin
                         hp:=procs;
                         while assigned(hp) do
@@ -652,43 +677,19 @@ implementation
                           end;
                      end; }
 
-{$ifndef CHAINPROCSYMS}
                    if assigned(procs^.next) then
                      begin
                         CGMessage(cg_e_cant_choose_overload_function);
                         actprocsym^.write_parameter_lists;
                      end;
-{$else CHAINPROCSYMS}
-                   if assigned(procs^.next) then
-                     { if the last retained is the only one }
-                     { from a unit it is OK              PM  }
-                     { the last is the one coming from the first symtable }
-                     { as the diff defcoll are inserted in front }
+{$ifdef TEST_PROCSYMS}
+                   if (procs=nil) and assigned(nextprocsym) then
                      begin
-                        hp2:=procs;
-                        while assigned(hp2^.next) and assigned(hp2^.next^.next) do
-                          hp2:=hp2^.next;
-                        if (hp2^.data^.owner<>hp2^.next^.data^.owner) then
-                          begin
-                             hp:=procs^.next;
-                             {hp2 is the correct one }
-                             hp2:=hp2^.next;
-                             while hp<>hp2 do
-                               begin
-                                 dispose(procs);
-                                 procs:=hp;
-                                 hp:=procs^.next;
-                               end;
-                             procs:=hp2;
-                          end
-                        else
-                           begin
-                              CGMessage(cg_e_cant_choose_overload_function);
-                              actprocsym^.write_parameter_lists;
-                              error(too_much_matches);
-                           end;
+                        p^.symtableprocentry:=nextprocsym;
+                        p^.symtableproc:=symt;
                      end;
-{$endif CHAINPROCSYMS}
+                 end ; { of while assigned(p^.symtableprocentry) do }
+{$endif TEST_PROCSYMS}
      {$ifdef UseBrowser}
                    if make_ref then
                      begin
@@ -923,7 +924,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.8  1998-10-09 16:36:09  pierre
+  Revision 1.9  1998-10-28 18:26:22  pierre
+   * removed some erros after other errors (introduced by useexcept)
+   * stabs works again correctly (for how long !)
+
+  Revision 1.8  1998/10/09 16:36:09  pierre
     * some memory leaks specific to usebrowser define fixed
     * removed tmodule.implsymtable (was like tmodule.localsymtable)
 

compiler/tpexcept.pas

@@ -51,7 +51,8 @@ type
 
   const
      recoverpospointer : pjmp_buf = nil;
-
+     longjump_used : boolean = false;
+     
 implementation
 
 
@@ -335,7 +336,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.4  1998-10-26 22:58:24  florian
+  Revision 1.5  1998-10-28 18:26:23  pierre
+   * removed some erros after other errors (introduced by useexcept)
+   * stabs works again correctly (for how long !)
+
+  Revision 1.4  1998/10/26 22:58:24  florian
     * new introduded problem with classes fix, the parent class wasn't set
       correct, if the class was defined forward before
 

compiler/verbose.pas

@@ -290,6 +290,7 @@ end;
 procedure internalerror(i : longint);
 begin
   do_internalerror(i);
+  inc(status.errorcount);
   stop;
 end;
 
@@ -427,7 +428,11 @@ end.
 
 {
   $Log$
-  Revision 1.26  1998-10-27 13:45:38  pierre
+  Revision 1.27  1998-10-28 18:26:24  pierre
+   * removed some erros after other errors (introduced by useexcept)
+   * stabs works again correctly (for how long !)
+
+  Revision 1.26  1998/10/27 13:45:38  pierre
     * classes get a vmt allways
     * better error info (tried to remove
       several error strings introduced by the tpexcept handling)