|
@@ -893,7 +893,8 @@ implementation
|
|
begin
|
|
begin
|
|
result:=nil;
|
|
result:=nil;
|
|
if (left.nodetype=stringconstn) and
|
|
if (left.nodetype=stringconstn) and
|
|
- ((tstringdef(left.resultdef).stringtype<>st_widestring) or
|
|
|
|
|
|
+ ((not is_widechararray(left.resultdef) and
|
|
|
|
+ not is_widestring(left.resultdef)) or
|
|
(tstringdef(resultdef).stringtype=st_widestring) or
|
|
(tstringdef(resultdef).stringtype=st_widestring) or
|
|
{ non-ascii chars would be replaced with '?' -> loses info }
|
|
{ non-ascii chars would be replaced with '?' -> loses info }
|
|
not hasnonasciichars(pcompilerwidestring(tstringconstnode(left).value_str))) then
|
|
not hasnonasciichars(pcompilerwidestring(tstringconstnode(left).value_str))) then
|