paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 22:28:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Do not insert widechar -> ansichar conversion node in const declaration

Browse Source 
* Allow array constructor to contain widechars in mode unicodestring.
This commit is contained in:
Michaël Van Canneyt 2022-12-29 10:25:02 +01:00 committed by Michael Van Canneyt
parent 56006aa002
commit 4e959de2c7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/ncnv.pas
View File

@ -557,8 +557,10 @@ implementation
{ widechars are not yet supported }
if is_widechar(p2.resultdef) then
begin
inserttypeconv(p2,cansichartype);
if (p2.nodetype<>ordconstn) then
if block_type<>bt_const then
inserttypeconv(p2,cansichartype);
if (p2.nodetype<>ordconstn) and not (m_default_unicodestring in current_settings.modeswitches) then
incompatibletypes(cwidechartype,cansichartype);
end;
@ -567,8 +569,9 @@ implementation
begin
if is_widechar(p3.resultdef) then
begin
inserttypeconv(p3,cansichartype);
if (p3.nodetype<>ordconstn) then
if block_type<>bt_const then
inserttypeconv(p3,cansichartype);
if (p3.nodetype<>ordconstn) and not (m_default_unicodestring in current_settings.modeswitches) then
begin
current_filepos:=p3.fileinfo;
incompatibletypes(cwidechartype,cansichartype);
@ -741,7 +744,7 @@ implementation
begin
if p1.nodetype<>ordconstn then
exit
else if tordconstnode(p1).value.uvalue>high(byte) then
else if (tordconstnode(p1).value.uvalue>high(byte)) and not (m_default_unicodestring in current_settings.modeswitches) then
exit;
end;
@ -751,7 +754,7 @@ implementation
begin
if p2.nodetype<>ordconstn then
exit
else if tordconstnode(p2).value.uvalue>high(byte) then
else if (tordconstnode(p2).value.uvalue>high(byte)) and not (m_default_unicodestring in current_settings.modeswitches) then
exit;
end;