paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-16 04:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge r19075 from cpstrnew branch by paul:

Browse Source 
compiler: partly revert r17434 because of a test regression. Also this is delphi compatible (although delphi does not know a {$codepage} directive)

git-svn-id: trunk@19127 -
This commit is contained in:
paul 2011-09-17 14:26:30 +00:00
parent 1e3239915f
commit f3ebaab222
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/scanner.pas
View File

@ -4171,19 +4171,6 @@ In case not, the value returned can be arbitrary.
break;
end;
until false;
//------------------
{ convert existing string to an utf-8 string }
if (not iswidestring) and
(current_settings.sourcecodepage<>default_settings.sourcecodepage) then
begin
if len>0 then
ascii2unicode(@cstringpattern[1],len,patternw)
else
ascii2unicode(nil,len,patternw);
iswidestring:=true;
len:=0;
end;
//-------------------
{ strings with length 1 become const chars }
if iswidestring then
begin