* some realname updates for messages

compiler/parser.pas

@@ -266,7 +266,7 @@ implementation
 {$ifndef Delphi}
          recoverpos    : jmp_buf;
          oldrecoverpos : pjmp_buf;
-{$endif Delphi}         
+{$endif Delphi}
 {$endif useexcept}
 {$ifdef newcg}
          oldcg         : pcg;
@@ -557,7 +557,7 @@ implementation
 {$endif BrowserLog}
 
                  { Write Browser Collections }
-                 do_extractsymbolinfo;
+                 do_extractsymbolinfo{$ifdef FPC}(){$endif};
               end;
 
          if current_module^.in_second_compile then
@@ -593,7 +593,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.9  2000-11-04 14:25:20  florian
+  Revision 1.10  2000-11-12 22:17:46  peter
+    * some realname updates for messages
+
+  Revision 1.9  2000/11/04 14:25:20  florian
     + merged Attila's changes for interfaces, not tested yet
 
   Revision 1.8  2000/10/31 22:02:49  peter
@@ -618,4 +621,4 @@ end.
   Revision 1.2  2000/07/13 11:32:44  michael
   + removed logs
 
-}
+}

compiler/pdecl.pas

@@ -335,7 +335,7 @@ implementation
                      end
                     else
                      begin
-                       MessagePos1(psym(p)^.fileinfo,sym_e_forward_type_not_resolved,p^.name);
+                       MessagePos1(psym(p)^.fileinfo,sym_e_forward_type_not_resolved,psym(p)^.realname);
                        { try to recover }
                        ppointerdef(pd)^.pointertype.def:=generrordef;
                      end;
@@ -350,7 +350,7 @@ implementation
                   begin
                     { only give an error as the implementation may follow in an
                       other type block which is allowed by FPC modes }
-                    MessagePos1(psym(p)^.fileinfo,sym_e_forward_type_not_resolved,p^.name);
+                    MessagePos1(psym(p)^.fileinfo,sym_e_forward_type_not_resolved,psym(p)^.realname);
                   end
                  else
                   begin
@@ -545,7 +545,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.20  2000-11-11 16:19:11  peter
+  Revision 1.21  2000-11-12 22:17:46  peter
+    * some realname updates for messages
+
+  Revision 1.20  2000/11/11 16:19:11  peter
     * allow far directive for pointer type declarations
 
   Revision 1.19  2000/11/04 14:25:20  florian

compiler/pdecobj.pas

@@ -1156,7 +1156,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.9  2000-11-06 23:05:52  florian
+  Revision 1.10  2000-11-12 22:17:47  peter
+    * some realname updates for messages
+
+  Revision 1.9  2000/11/06 23:05:52  florian
     * more fixes
 
   Revision 1.8  2000/11/06 20:30:55  peter
@@ -1187,4 +1190,4 @@ end.
   Revision 1.1  2000/10/14 10:14:51  peter
     * moehrendorf oct 2000 rewrite
 
-}
+}

compiler/scandir.inc

@@ -1158,9 +1158,9 @@ const
              current_scanner^.skipspace;
              hs:=current_scanner^.readid;
              if hs='GUI' then
-               apptype:=at_gui
+               apptype:=app_gui
              else if hs='CONSOLE' then
-               apptype:=at_cui
+               apptype:=app_cui
              else
                Message1(scan_w_unsupported_app_type,hs);
           end;
@@ -1455,7 +1455,10 @@ const
 
 {
   $Log$
-  Revision 1.11  2000-11-04 14:25:21  florian
+  Revision 1.12  2000-11-12 22:17:47  peter
+    * some realname updates for messages
+
+  Revision 1.11  2000/11/04 14:25:21  florian
     + merged Attila's changes for interfaces, not tested yet
 
   Revision 1.10  2000/10/31 22:02:51  peter
@@ -1489,4 +1492,4 @@ const
   Revision 1.2  2000/07/13 11:32:49  michael
   + removed logs
 
-}
+}

compiler/symtable.pas

@@ -262,9 +262,9 @@ implementation
            not(plabelsym(p)^.defined) then
          begin
            if plabelsym(p)^.used then
-            Message1(sym_e_label_used_and_not_defined,p^.name)
+            Message1(sym_e_label_used_and_not_defined,plabelsym(p)^.realname)
            else
-            Message1(sym_w_label_not_defined,p^.name);
+            Message1(sym_w_label_not_defined,plabelsym(p)^.realname);
          end;
       end;
 
@@ -297,30 +297,30 @@ implementation
              begin
                 if (psym(p)^.owner^.symtabletype=parasymtable) or (vo_is_local_copy in pvarsym(p)^.varoptions) then
                   begin
-                    MessagePos1(psym(p)^.fileinfo,sym_h_para_identifier_not_used,p^.name);
+                    MessagePos1(psym(p)^.fileinfo,sym_h_para_identifier_not_used,psym(p)^.realname);
                   end
                 else if (psym(p)^.owner^.symtabletype=objectsymtable) then
-                  MessagePos2(psym(p)^.fileinfo,sym_n_private_identifier_not_used,psym(p)^.owner^.name^,p^.name)
+                  MessagePos2(psym(p)^.fileinfo,sym_n_private_identifier_not_used,psym(p)^.owner^.name^,psym(p)^.realname)
                 else
-                  MessagePos1(psym(p)^.fileinfo,sym_n_local_identifier_not_used,p^.name);
+                  MessagePos1(psym(p)^.fileinfo,sym_n_local_identifier_not_used,psym(p)^.realname);
              end
            else if pvarsym(p)^.varstate=vs_assigned then
              begin
                 if (psym(p)^.owner^.symtabletype=parasymtable) then
                   begin
                     if not(pvarsym(p)^.varspez in [vs_var,vs_out])  then
-                      MessagePos1(psym(p)^.fileinfo,sym_h_para_identifier_only_set,p^.name)
+                      MessagePos1(psym(p)^.fileinfo,sym_h_para_identifier_only_set,psym(p)^.realname)
                   end
                 else if (vo_is_local_copy in pvarsym(p)^.varoptions) then
                   begin
                     if not(pvarsym(p)^.varspez in [vs_var,vs_out]) then
-                      MessagePos1(psym(p)^.fileinfo,sym_h_para_identifier_only_set,p^.name);
+                      MessagePos1(psym(p)^.fileinfo,sym_h_para_identifier_only_set,psym(p)^.realname);
                   end
                 else if (psym(p)^.owner^.symtabletype=objectsymtable) then
-                  MessagePos2(psym(p)^.fileinfo,sym_n_private_identifier_only_set,psym(p)^.owner^.name^,p^.name)
+                  MessagePos2(psym(p)^.fileinfo,sym_n_private_identifier_only_set,psym(p)^.owner^.name^,psym(p)^.realname)
                 else if (psym(p)^.owner^.symtabletype<>parasymtable) then
                   if not (vo_is_exported in pvarsym(p)^.varoptions) then
-                    MessagePos1(psym(p)^.fileinfo,sym_n_local_identifier_only_set,p^.name);
+                    MessagePos1(psym(p)^.fileinfo,sym_n_local_identifier_only_set,psym(p)^.realname);
              end;
          end
       else if ((psym(p)^.owner^.symtabletype in
@@ -330,7 +330,7 @@ implementation
              exit;
            { do not claim for inherited private fields !! }
            if (pstoredsym(p)^.refs=0) and (psym(p)^.owner^.symtabletype=objectsymtable) then
-             MessagePos2(psym(p)^.fileinfo,sym_n_private_method_not_used,psym(p)^.owner^.name^,p^.name)
+             MessagePos2(psym(p)^.fileinfo,sym_n_private_method_not_used,psym(p)^.owner^.name^,psym(p)^.realname)
            { units references are problematic }
            else if (pstoredsym(p)^.refs=0) and not(psym(p)^.typ in [funcretsym,enumsym,unitsym]) then
              if (psym(p)^.typ<>procsym) or not (pprocsym(p)^.is_global) or
@@ -338,7 +338,7 @@ implementation
                but unused should still be signaled PM }
                 ((psym(p)^.owner^.symtabletype=staticsymtable) and
                 not current_module^.is_unit) then
-             MessagePos2(psym(p)^.fileinfo,sym_h_local_symbol_not_used,SymTypeName[psym(p)^.typ],p^.name);
+             MessagePos2(psym(p)^.fileinfo,sym_h_local_symbol_not_used,SymTypeName[psym(p)^.typ],psym(p)^.realname);
           end;
       end;
 
@@ -2007,7 +2007,7 @@ implementation
        var
          st : psymtable;
        begin
-         Message1(sym_e_duplicate_id,sym^.name);
+         Message1(sym_e_duplicate_id,sym^.realname);
          st:=findunitsymtable(sym^.owner);
          with sym^.fileinfo do
            begin
@@ -2352,7 +2352,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.15  2000-11-06 15:54:15  florian
+  Revision 1.16  2000-11-12 22:17:47  peter
+    * some realname updates for messages
+
+  Revision 1.15  2000/11/06 15:54:15  florian
     * fixed two bugs to get make cycle work, but it's not enough
 
   Revision 1.14  2000/11/04 14:25:22  florian
@@ -2398,4 +2401,4 @@ end.
 
   Revision 1.2  2000/07/13 11:32:50  michael
   + removed logs
-}
+}