* widestring conversions added to allowed operator check

This commit is contained in:
peter 2004-02-20 21:55:19 +00:00
parent f967fa5f74
commit a4732d1009

View File

@ -184,14 +184,17 @@ implementation
allowed:=false; allowed:=false;
exit; exit;
end; end;
{ not chararray+[char,string,chararray] } { not chararray+[(wide)char,(wide)string,(wide)chararray] }
if is_chararray(ld) and if is_chararray(ld) and
(treetyp in [addn,equaln,unequaln,gtn,gten,ltn,lten]) and (treetyp in [addn,equaln,unequaln,gtn,gten,ltn,lten]) and
(is_char(rd) or (is_char(rd) or
is_widechar(rd) or
is_pchar(rd) or is_pchar(rd) or
is_pwidechar(rd) or
is_integer(rd) or is_integer(rd) or
(rd.deftype=stringdef) or (rd.deftype=stringdef) or
is_chararray(rd) or is_chararray(rd) or
is_widechararray(rd) or
(rt=niln)) then (rt=niln)) then
begin begin
allowed:=false; allowed:=false;
@ -222,8 +225,11 @@ implementation
begin begin
if ((rd.deftype=stringdef) or if ((rd.deftype=stringdef) or
is_char(rd) or is_char(rd) or
is_widechar(rd) or
is_pchar(rd) or is_pchar(rd) or
is_chararray(rd)) and is_pwidechar(rd) or
is_chararray(rd) or
is_widechararray(rd)) and
(treetyp in [addn,equaln,unequaln,gtn,gten,ltn,lten]) then (treetyp in [addn,equaln,unequaln,gtn,gten,ltn,lten]) then
begin begin
allowed:=false; allowed:=false;
@ -938,7 +944,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.79 2004-02-13 15:42:21 peter Revision 1.80 2004-02-20 21:55:19 peter
* widestring conversions added to allowed operator check
Revision 1.79 2004/02/13 15:42:21 peter
* compare_defs_ext has now a options argument * compare_defs_ext has now a options argument
* fixes for variants * fixes for variants