* disallow widechar sets (Delphi 7 compatible, and were handled wrongly

    by FPC previously)
  * tbs/tb0474 now fails -> renamed to tbf/tb0201 (+ new test tbf/tb0202)

git-svn-id: trunk@8284 -

.gitattributes

@@ -5820,6 +5820,8 @@ tests/tbf/tb0198.pp svneol=native#text/plain
 tests/tbf/tb0199.pp -text
 tests/tbf/tb0199a.pp -text
 tests/tbf/tb0200.pp svneol=native#text/x-pascal
+tests/tbf/tb0201.pp svneol=native#text/plain
+tests/tbf/tb0202.pp svneol=native#text/plain
 tests/tbf/ub0115.pp svneol=native#text/plain
 tests/tbf/ub0149.pp svneol=native#text/plain
 tests/tbf/ub0158a.pp svneol=native#text/plain
@@ -6286,7 +6288,6 @@ tests/tbs/tb0470.pp svneol=native#text/plain
 tests/tbs/tb0471.pp svneol=native#text/plain
 tests/tbs/tb0472.pp svneol=native#text/plain
 tests/tbs/tb0473.pp svneol=native#text/plain
-tests/tbs/tb0474.pp svneol=native#text/plain
 tests/tbs/tb0475.pp svneol=native#text/plain
 tests/tbs/tb0476.pp svneol=native#text/plain
 tests/tbs/tb0477.pp svneol=native#text/plain

compiler/ncnv.pas

@@ -386,13 +386,31 @@ implementation
                 end;
               if codegenerror then
                break;
+              current_filepos:=p2.fileinfo;
               case p2.resultdef.typ of
                  enumdef,
                  orddef:
                    begin
+                      { widechars are not yet supported }
+                      if is_widechar(p2.resultdef) then
+                        begin
+                          inserttypeconv(p2,cchartype);
+                          if (p2.nodetype<>ordconstn) then
+                            incompatibletypes(cwidechartype,cchartype);
+                        end;
+
                       getrange(p2.resultdef,lr,hr);
                       if assigned(p3) then
                        begin
+                         if is_widechar(p3.resultdef) then
+                           begin
+                             inserttypeconv(p3,cchartype);
+                             if (p3.nodetype<>ordconstn) then
+                               begin
+                                 current_filepos:=p3.fileinfo;
+                                 incompatibletypes(cwidechartype,cchartype);
+                               end;
+                           end;
                          { this isn't good, you'll get problems with
                            type t010 = 0..10;
                                 ts = set of t010;
@@ -405,8 +423,7 @@ implementation
                          }
                          if assigned(hdef) and not(equal_defs(hdef,p3.resultdef)) then
                            begin
-                              current_filepos:=p3.fileinfo;
-                              CGMessage(type_e_typeconflict_in_set);
+                              CGMessagePos(p3.fileinfo,type_e_typeconflict_in_set);
                            end
                          else
                            begin

compiler/ptype.pas

@@ -450,6 +450,7 @@ implementation
                orddef :
                  begin
                    if (torddef(tt2).ordtype<>uvoid) and
+                      (torddef(tt2).ordtype<>uwidechar) and
                       (torddef(tt2).low>=0) then
                      // !! def:=tsetdef.create(tt2,torddef(tt2.def).low,torddef(tt2.def).high))
                      if Torddef(tt2).high>int64(high(longint)) then

tests/tbs/tb0474.pp → tests/tbf/tb0201.pp

@@ -1,4 +1,6 @@
-{ $mode objfpc}
+{ %fail }
+
+{$mode delphi}
 const
   WideNull = widechar(#0);
   WideSpace = widechar(#32);

tests/tbf/tb0202.pp

@@ -0,0 +1,8 @@
+{ %fail }
+
+{$mode delphi}
+
+var
+  s: set of widechar;
+begin
+end.