Przeglądaj źródła

* message crash fixed
* no error if self is used with non-string message

peter 26 lat temu
rodzic
commit
051f8a408b
2 zmienionych plików z 14 dodań i 5 usunięć
  1. 7 3
      compiler/hcgdata.pas
  2. 7 2
      compiler/psub.pas

+ 7 - 3
compiler/hcgdata.pas

@@ -129,9 +129,9 @@ implementation
          else
            begin
               if p^.p^.messageinf.i<at^.p^.messageinf.i then
-                insertstr(p,at^.l)
+                insertint(p,at^.l)
               else if p^.p^.messageinf.i>at^.p^.messageinf.i then
-                insertstr(p,at^.r)
+                insertint(p,at^.r)
               else
                 Message1(parser_e_duplicate_message_label,tostr(p^.p^.messageinf.i));
            end;
@@ -554,7 +554,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.10.2.1  1999-07-08 10:38:32  peter
+  Revision 1.10.2.2  1999-07-11 20:07:38  peter
+    * message crash fixed
+    * no error if self is used with non-string message
+
+  Revision 1.10.2.1  1999/07/08 10:38:32  peter
     * fixed insertint
 
   Revision 1.10  1999/06/02 22:44:07  pierre

+ 7 - 2
compiler/psub.pas

@@ -1654,7 +1654,8 @@ begin
   dec(lexlevel);
   dispose(anames,done);
   if ((aktprocsym^.definition^.options and pocontainsself)<>0) and
-    ((aktprocsym^.definition^.options and pomsgstr)=0) then
+    ((aktprocsym^.definition^.options and pomsgstr)=0) and
+    ((aktprocsym^.definition^.options and pomsgint)=0) then
     message(parser_e_self_in_non_message_handler);
 end;
 
@@ -1835,7 +1836,11 @@ end.
 
 {
   $Log$
-  Revision 1.1.2.3  1999-07-11 20:04:05  pierre
+  Revision 1.1.2.4  1999-07-11 20:07:39  peter
+    * message crash fixed
+    * no error if self is used with non-string message
+
+  Revision 1.1.2.3  1999/07/11 20:04:05  pierre
    * fix for problem with external without parameters in Delphi mode
 
   Revision 1.1.2.2  1999/07/02 12:59:52  peter