Browse Source

* check set types when doing constant set evaluation

peter 24 years ago
parent
commit
bcbace78d2
1 changed files with 13 additions and 1 deletions
  1. 13 1
      compiler/nadd.pas

+ 13 - 1
compiler/nadd.pas

@@ -355,6 +355,15 @@ implementation
             (left.nodetype=setconstn) and
             not assigned(tsetconstnode(left).left) then
            begin
+              { check types }
+              inserttypeconv(left,right.resulttype);
+              if codegenerror then
+               begin
+                 { recover by only returning the left part }
+                 result:=left;
+                 left:=nil;
+                 exit;
+               end;
               new(resultset);
               case nodetype of
                  addn :
@@ -1208,7 +1217,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.25  2001-04-13 01:22:08  peter
+  Revision 1.26  2001-05-19 12:53:52  peter
+    * check set types when doing constant set evaluation
+
+  Revision 1.25  2001/04/13 01:22:08  peter
     * symtable change to classes
     * range check generation and errors fixed, make cycle DEBUG=1 works
     * memory leaks fixed