administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix #2412

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2021-01-18 05:51:12 +03:00
parent e330c2cf97
commit cc2078cc96
6 changed files with 19 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "7";
public const string Build = "2";
public const string Revision = "2806";
public const string Revision = "2807";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=2
%REVISION%=2806
%MINOR%=7
%REVISION%=2807
%COREVERSION%=2
%MAJOR%=3

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.7.2.2806
3.7.2.2807

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.7.2.2806'
!define VERSION '3.7.2.2807'

30
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -5235,27 +5235,6 @@ begin
res := self;
end;
// -----------------------------------------------------------------------------
// ReadLexem
// -----------------------------------------------------------------------------
{function ReadLexem: string;
begin
var c: char;
repeat
c := CurrentIOSystem.read_symbol;
until not char.IsWhiteSpace(c);
var sb := new System.Text.StringBuilder;
repeat
sb.Append(c);
c := char(CurrentIOSystem.peek);
if char.IsWhiteSpace(c) or (c = char(-1)) then // char(-1) - Ctrl-Z во входном потоке
break;
c := CurrentIOSystem.read_symbol;
until False; // accumulate nonspaces
Result := sb.ToString;
end;}
// -----------------------------------------------------
// IOStandardSystem: implementation
// -----------------------------------------------------
@ -5449,9 +5428,9 @@ end;
function ReadLexem: string;
begin
if input.sr <> nil then
{if input.sr <> nil then
Result := ReadLexem(input)
else Result := CurrentIOSystem.ReadLexem;
else} Result := CurrentIOSystem.ReadLexem;
end;
function IOStandardSystem.ReadLexem: string;
@ -6486,6 +6465,11 @@ end;
function ReadLexem(f: Text): string;
begin
if f = input then
begin
Result := ReadLexem;
exit
end;
if f.fi = nil then
raise new System.IO.IOException(GetTranslation(FILE_NOT_ASSIGNED));
if f.sr = nil then

30
bin/Lib/PABCSystem.pas
View file

@ -5235,27 +5235,6 @@ begin
res := self;
end;
// -----------------------------------------------------------------------------
// ReadLexem
// -----------------------------------------------------------------------------
{function ReadLexem: string;
begin
var c: char;
repeat
c := CurrentIOSystem.read_symbol;
until not char.IsWhiteSpace(c);
var sb := new System.Text.StringBuilder;
repeat
sb.Append(c);
c := char(CurrentIOSystem.peek);
if char.IsWhiteSpace(c) or (c = char(-1)) then // char(-1) - Ctrl-Z во входном потоке
break;
c := CurrentIOSystem.read_symbol;
until False; // accumulate nonspaces
Result := sb.ToString;
end;}
// -----------------------------------------------------
// IOStandardSystem: implementation
// -----------------------------------------------------
@ -5449,9 +5428,9 @@ end;
function ReadLexem: string;
begin
if input.sr <> nil then
{if input.sr <> nil then
Result := ReadLexem(input)
else Result := CurrentIOSystem.ReadLexem;
else} Result := CurrentIOSystem.ReadLexem;
end;
function IOStandardSystem.ReadLexem: string;
@ -6486,6 +6465,11 @@ end;
function ReadLexem(f: Text): string;
begin
if f = input then
begin
Result := ReadLexem;
exit
end;
if f.fi = nil then
raise new System.IO.IOException(GetTranslation(FILE_NOT_ASSIGNED));
if f.sr = nil then