瀏覽代碼

* set correct conversion for subranges

peter 22 年之前
父節點
當前提交
1a71e7e02b
共有 1 個文件被更改,包括 10 次插入3 次删除
  1. 10 3
      compiler/defcmp.pas

+ 10 - 3
compiler/defcmp.pas

@@ -200,6 +200,7 @@ implementation
                      if (torddef(def_from).typ=torddef(def_to).typ) then
                      if (torddef(def_from).typ=torddef(def_to).typ) then
                       begin
                       begin
                         case torddef(def_from).typ of
                         case torddef(def_from).typ of
+                          uchar,uwidechar,
                           u8bit,u16bit,u32bit,u64bit,
                           u8bit,u16bit,u32bit,u64bit,
                           s8bit,s16bit,s32bit,s64bit:
                           s8bit,s16bit,s32bit,s64bit:
                             begin
                             begin
@@ -207,9 +208,12 @@ implementation
                                  (torddef(def_from).high=torddef(def_to).high) then
                                  (torddef(def_from).high=torddef(def_to).high) then
                                 eq:=te_equal
                                 eq:=te_equal
                               else
                               else
-                                eq:=te_convert_l1;
+                                begin
+                                  doconv:=tc_int_2_int;
+                                  eq:=te_convert_l1;
+                                end;
                             end;
                             end;
-                          uvoid,uchar,uwidechar,
+                          uvoid,
                           bool8bit,bool16bit,bool32bit:
                           bool8bit,bool16bit,bool32bit:
                             eq:=te_equal;
                             eq:=te_equal;
                           else
                           else
@@ -1210,7 +1214,10 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.28  2003-09-09 21:03:17  peter
+  Revision 1.29  2003-10-05 12:57:11  peter
+    * set correct conversion for subranges
+
+  Revision 1.28  2003/09/09 21:03:17  peter
     * basics for x86 register calling
     * basics for x86 register calling
 
 
   Revision 1.27  2003/06/03 21:02:08  peter
   Revision 1.27  2003/06/03 21:02:08  peter