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

Merged revisions 594 via svnmerge from

Browse Source 
/trunk

git-svn-id: branches/fixes_2_0@680 -
This commit is contained in:
peter 2005-07-19 07:34:23 +00:00
parent 7fd1e886c2
commit f61ed941c6
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -5969,6 +5969,7 @@ tests/webtbs/tw4150.pp svneol=native#text/plain
tests/webtbs/tw4151.pp svneol=native#text/plain
tests/webtbs/tw4152.pp svneol=native#text/plain
tests/webtbs/tw4155.pp svneol=native#text/plain
tests/webtbs/tw4162.pp svneol=native#text/plain
tests/webtbs/tw4188.pp svneol=native#text/plain
tests/webtbs/ub1873.pp svneol=native#text/plain
tests/webtbs/ub1883.pp svneol=native#text/plain

21
compiler/defcmp.pas
View File

@ -304,12 +304,23 @@ implementation
else
begin
doconv:=tc_string_2_string;
{ Prefer conversions to shortstring over other
conversions. This is compatible with Delphi (PFV) }
if tstringdef(def_to).string_typ=st_shortstring then
eq:=te_convert_l2
if tstringdef(def_from).string_typ=st_widestring then
begin
{ Prefer conversions to shortstring over other
conversions. This is compatible with Delphi (PFV) }
if tstringdef(def_to).string_typ=st_shortstring then
eq:=te_convert_l3
else
eq:=te_convert_l2;
end
else
eq:=te_convert_l3;
{ Prefer shortstrings of different length or conversions
from shortstring to ansistring }
if (tstringdef(def_from).string_typ=st_shortstring) and
(tstringdef(def_to).string_typ in [st_shortstring,st_ansistring]) then
eq:=te_convert_l1
else
eq:=te_convert_l2;
end;
end;
orddef :

12
tests/webtbs/tw4162.pp Normal file
View File

@ -0,0 +1,12 @@
Var
S: ansistring;
SS: shortstring;
Begin
SS := 'find';
SetLength(S, 300);
S := S + SS;
Writeln(Pos(SS, S)); // This will not find the occurance of 'find'
if pos(ss,s)<>301 then
halt(1);
End.