* fixed arrayconstruct->set conversion which didn't work for enum sets

compiler/htypechk.pas

@@ -333,7 +333,7 @@ implementation
            setdef :
              begin
                { automatic arrayconstructor -> set conversion }
-               if (def_from^.deftype=arraydef) and (parraydef(def_from)^.IsConstructor) then
+               if is_array_constructor(def_from) then
                 begin
                   doconv:=tc_arrayconstructor_2_set;
                   b:=1;
@@ -649,7 +649,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.25  1999-05-19 20:40:12  florian
+  Revision 1.26  1999-05-20 14:58:26  peter
+    * fixed arrayconstruct->set conversion which didn't work for enum sets
+
+  Revision 1.25  1999/05/19 20:40:12  florian
     * fixed a couple of array related bugs:
       - var a : array[0..1] of char;   p : pchar;  p:=a+123; works now
       - open arrays with an odd size doesn't work: movsb wasn't generated

compiler/tccal.pas

@@ -170,6 +170,13 @@ implementation
          { conversions are inserted                              }
          else
            begin
+              { Do we need arrayconstructor -> set conversion, then insert
+                it here before the arrayconstructor node breaks the tree
+                with its conversions of enum->ord }
+              if (p^.left^.treetype=arrayconstructn) and
+                 (defcoll^.data^.deftype=setdef) then
+                p^.left:=gentypeconvnode(p^.left,defcoll^.data);
+
               if count_ref then
                begin
                  { not completly proper, but avoids some warnings }
@@ -260,11 +267,6 @@ implementation
                     begin
                       p^.left:=gentypeconvnode(p^.left,defcoll^.data);
                       firstpass(p^.left);
-                      { this is necessary if an arrayconstruct -> set is done
-                        first, then the set generation tree needs to be passed
-                        to get the end resulttype (PFV) }
-                      if not assigned(p^.left^.resulttype) then
-                       firstpass(p^.left);
                     end;
                    if codegenerror then
                      begin
@@ -1164,7 +1166,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.45  1999-05-19 10:31:54  florian
+  Revision 1.46  1999-05-20 14:58:27  peter
+    * fixed arrayconstruct->set conversion which didn't work for enum sets
+
+  Revision 1.45  1999/05/19 10:31:54  florian
     * two bugs reported by Romio (bugs 13) are fixed:
         - empty array constructors are now handled correctly (e.g. for sysutils.format)
         - comparsion of ansistrings was sometimes coded wrong

compiler/tccnv.pas

@@ -533,6 +533,8 @@ implementation
         putnode(hp);
       { create a set constructor tree }
         arrayconstructor_to_set(p);
+      { now firstpass the set }
+        firstpass(p);
       end;
 
 
@@ -929,7 +931,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.31  1999-05-13 21:59:52  peter
+  Revision 1.32  1999-05-20 14:58:28  peter
+    * fixed arrayconstruct->set conversion which didn't work for enum sets
+
+  Revision 1.31  1999/05/13 21:59:52  peter
     * removed oldppu code
     * warning if objpas is loaded from uses
     * first things for new deref writing