Browse Source

* merged from 0-99-12 branch

pierre 26 years ago
parent
commit
7a913109ff
1 changed files with 15 additions and 3 deletions
  1. 15 3
      compiler/tcadd.pas

+ 15 - 3
compiler/tcadd.pas

@@ -109,7 +109,10 @@ implementation
          { overloaded operator ? }
          { overloaded operator ? }
          if (p^.treetype=starstarn) or
          if (p^.treetype=starstarn) or
             (ld^.deftype=recorddef) or
             (ld^.deftype=recorddef) or
-            (ld^.deftype=arraydef) or
+            ((ld^.deftype=arraydef) and
+             (rd^.deftype<>orddef) and
+             ((parraydef(ld)^.definition^.deftype<>orddef) or
+              (porddef(parraydef(ld)^.definition)^.typ<>uchar))) or
             { <> and = are defined for classes }
             { <> and = are defined for classes }
             ((ld^.deftype=objectdef) and
             ((ld^.deftype=objectdef) and
              (not(pobjectdef(ld)^.isclass) or
              (not(pobjectdef(ld)^.isclass) or
@@ -117,7 +120,10 @@ implementation
              )
              )
             ) or
             ) or
             (rd^.deftype=recorddef) or
             (rd^.deftype=recorddef) or
-            (rd^.deftype=arraydef) or
+            ((rd^.deftype=arraydef) and
+             (ld^.deftype<>orddef) and
+             ((parraydef(rd)^.definition^.deftype<>orddef) or
+              (porddef(parraydef(rd)^.definition)^.typ<>uchar))) or
             { <> and = are defined for classes }
             { <> and = are defined for classes }
             ((rd^.deftype=objectdef) and
             ((rd^.deftype=objectdef) and
              (not(pobjectdef(rd)^.isclass) or
              (not(pobjectdef(rd)^.isclass) or
@@ -1096,7 +1102,13 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.35  1999-06-17 13:19:57  pierre
+  Revision 1.36  1999-06-17 15:32:48  pierre
+   * merged from 0-99-12 branch
+
+  Revision 1.34.2.2  1999/06/17 15:25:07  pierre
+   * for arrays of char operators can not be overloaded
+
+  Revision 1.35  1999/06/17 13:19:57  pierre
    * merged from 0_99_12 branch
    * merged from 0_99_12 branch
 
 
   Revision 1.34.2.1  1999/06/17 12:35:23  pierre
   Revision 1.34.2.1  1999/06/17 12:35:23  pierre