* fix result type of constset+[]

git-svn-id: trunk@10311 -

.gitattributes

@@ -6720,6 +6720,7 @@ tests/tbs/tb0541.pp svneol=native#text/plain
 tests/tbs/tb0542.pp svneol=native#text/plain
 tests/tbs/tb0543.pp svneol=native#text/plain
 tests/tbs/tb205.pp svneol=native#text/plain
+tests/tbs/tbs0544.pp svneol=native#text/plain
 tests/tbs/ub0060.pp svneol=native#text/plain
 tests/tbs/ub0069.pp svneol=native#text/plain
 tests/tbs/ub0119.pp svneol=native#text/plain

compiler/nadd.pas

@@ -681,8 +681,9 @@ implementation
              if (tsetdef(right.resultdef).settype=smallset) and
                 (tsetdef(left.resultdef).settype<>smallset) then
                right.resultdef:=tsetdef.create(tsetdef(right.resultdef).elementdef,0,255);
-             { check base types }
-             inserttypeconv(left,right.resultdef);
+             { check base types, keep the original type if right was an empty set }
+             if assigned(tsetdef(right.resultdef).elementdef) then
+               inserttypeconv(left,right.resultdef);
 
              if codegenerror then
               begin

tests/tbs/tbs0544.pp

@@ -0,0 +1,15 @@
+
+type SomeType = ( SomeElem );
+
+const ElemSet = [ SomeElem ];
+
+var
+  b  : boolean;
+begin
+   b:=(SomeElem in ElemSet);
+   writeln(b);
+   b:=(SomeElem in (ElemSet + []));
+   writeln(b);
+   if not b then
+     halt(1);
+end.