paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-17 09:59:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

* let is_conststringnode() and is_constwidestringnode() also recognise string

Browse Source 
constants that have a stringdef as resultdef

git-svn-id: trunk@32969 -
This commit is contained in:
Jonas Maebe 2016-01-20 21:11:22 +00:00
parent 53052f26a0
commit 9ace5ad038
1 changed files with 7 additions and 2 deletions

9
compiler/node.pas
View File

@ -711,13 +711,18 @@ implementation
function is_conststringnode(p : tnode) : boolean;
begin
is_conststringnode :=
(p.nodetype = stringconstn) and is_chararray(p.resultdef);
(p.nodetype = stringconstn) and
(is_chararray(p.resultdef) or
is_shortstring(p.resultdef) or
is_ansistring(p.resultdef));
end;
function is_constwidestringnode(p : tnode) : boolean;
begin
is_constwidestringnode :=
(p.nodetype = stringconstn) and is_widechararray(p.resultdef);
(p.nodetype = stringconstn) and
(is_widechararray(p.resultdef) or
is_wide_or_unicode_string(p.resultdef));
end;
function is_conststring_or_constcharnode(p : tnode) : boolean;