From bcbace78d20d4772ff20e4ef05a58f50705e8933 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sat, 19 May 2001 12:53:52 +0000
Subject: [PATCH]   * check set types when doing constant set evaluation

---
 compiler/nadd.pas | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/compiler/nadd.pas b/compiler/nadd.pas
index 1d8626275c..98edda4157 100644
--- a/compiler/nadd.pas
+++ b/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