paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 16:29:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: fixed resolve string lit on non utf-8 system

Browse Source 
git-svn-id: trunk@47872 -
This commit is contained in:
Mattias Gaertner 2020-12-28 18:19:35 +00:00
parent ea55c5f7e3
commit 1d1dce1f60
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/fcl-passrc/src/pasresolveeval.pas
View File

@ -4203,6 +4203,7 @@ var
{$ENDIF} {$ENDIF}
begin begin
if h='' then exit; if h='' then exit;
//writeln('AddSrc ',length(h),' ',ord(h[1]),' ',stringcodepage(h),' ',defaultsystemcodepage);
{$ifdef FPC_HAS_CPSTRING} {$ifdef FPC_HAS_CPSTRING}
OnlyASCII:=true; OnlyASCII:=true;
for i:=1 to length(h) do for i:=1 to length(h) do
@ -4238,9 +4239,14 @@ var
RaiseNotYetImplemented(20201220222608,Expr); RaiseNotYetImplemented(20201220222608,Expr);
else else
begin begin
if Value.OnlyASCII and (Value.S<>'') then if Value.S<>'' then
SetCodePage(Value.S,TargetCP,false); begin
Value.S:=Value.S+h; if Value.OnlyASCII then
SetCodePage(Value.S,TargetCP,false);
Value.S:=Value.S+h;
end else begin
Value.S:=h;
end;
end; end;
end; end;

3
packages/fcl-passrc/tests/tcresolver.pas
View File

@ -2181,6 +2181,7 @@ begin
Result.OnFindUnit:=@OnPasResolverFindUnit; Result.OnFindUnit:=@OnPasResolverFindUnit;
Result.OnLog:=@OnPasResolverLog; Result.OnLog:=@OnPasResolverLog;
Result.Hub:=Hub; Result.Hub:=Hub;
Result.ExprEvaluator.DefaultStringCodePage:=CP_UTF8;
Result.ExprEvaluator.DefaultSourceCodePage:=CP_UTF8; Result.ExprEvaluator.DefaultSourceCodePage:=CP_UTF8;
FModules.Add(Result); FModules.Add(Result);
end; end;
@ -14308,7 +14309,6 @@ end;
procedure TTestResolver.TestStaticArrayOfChar; procedure TTestResolver.TestStaticArrayOfChar;
begin begin
ResolverEngine.ExprEvaluator.DefaultStringCodePage:=CP_UTF8;
StartProgram(false); StartProgram(false);
Add([ Add([
'type', 'type',
@ -14330,7 +14330,6 @@ end;
procedure TTestResolver.TestStaticArrayOfCharDelphi; procedure TTestResolver.TestStaticArrayOfCharDelphi;
begin begin
ResolverEngine.ExprEvaluator.DefaultStringCodePage:=CP_UTF8;
StartProgram(false); StartProgram(false);
Add([ Add([
'{$mode delphi}', '{$mode delphi}',