mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-28 21:20:29 +02:00
* Fix compilation on non-windows
git-svn-id: trunk@46941 -
This commit is contained in:
parent
f44ce539a3
commit
81bc4d9fec
@ -4188,6 +4188,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
function TPascalScanner.DoFetchToken: TToken;
|
function TPascalScanner.DoFetchToken: TToken;
|
||||||
|
|
||||||
var
|
var
|
||||||
TokenStart: {$ifdef UsePChar}PChar{$else}integer{$endif};
|
TokenStart: {$ifdef UsePChar}PChar{$else}integer{$endif};
|
||||||
i: TToken;
|
i: TToken;
|
||||||
@ -4199,6 +4200,7 @@ var
|
|||||||
s: string;
|
s: string;
|
||||||
l: integer;
|
l: integer;
|
||||||
{$endif}
|
{$endif}
|
||||||
|
LE : String[2];
|
||||||
|
|
||||||
procedure FetchCurTokenString; inline;
|
procedure FetchCurTokenString; inline;
|
||||||
begin
|
begin
|
||||||
@ -4334,6 +4336,7 @@ begin
|
|||||||
Result := tkBraceOpen
|
Result := tkBraceOpen
|
||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
|
LE:=LineEnding;
|
||||||
// Old-style multi-line comment
|
// Old-style multi-line comment
|
||||||
Inc(FTokenPos);
|
Inc(FTokenPos);
|
||||||
TokenStart := FTokenPos;
|
TokenStart := FTokenPos;
|
||||||
@ -4353,7 +4356,7 @@ begin
|
|||||||
|
|
||||||
// Corrected JC: Append the correct lineending
|
// Corrected JC: Append the correct lineending
|
||||||
Inc(OldLength, SectionLength);
|
Inc(OldLength, SectionLength);
|
||||||
for Ch in LineEnding do
|
for Ch in LE do
|
||||||
begin
|
begin
|
||||||
Inc(OldLength);
|
Inc(OldLength);
|
||||||
FCurTokenString[OldLength] := Ch;
|
FCurTokenString[OldLength] := Ch;
|
||||||
@ -4651,6 +4654,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
'{': // Multi-line comment
|
'{': // Multi-line comment
|
||||||
begin
|
begin
|
||||||
|
LE:=LineEnding;
|
||||||
Inc(FTokenPos);
|
Inc(FTokenPos);
|
||||||
TokenStart := FTokenPos;
|
TokenStart := FTokenPos;
|
||||||
FCurTokenString := '';
|
FCurTokenString := '';
|
||||||
@ -4669,7 +4673,7 @@ begin
|
|||||||
|
|
||||||
// Corrected JC: Append the correct lineending
|
// Corrected JC: Append the correct lineending
|
||||||
Inc(OldLength, SectionLength);
|
Inc(OldLength, SectionLength);
|
||||||
for Ch in LineEnding do
|
for Ch in LE do
|
||||||
begin
|
begin
|
||||||
Inc(OldLength);
|
Inc(OldLength);
|
||||||
FCurTokenString[OldLength] := Ch;
|
FCurTokenString[OldLength] := Ch;
|
||||||
|
Loading…
Reference in New Issue
Block a user