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

fix #2151

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2019-11-23 19:23:04 +03:00
parent 5b03b8939e
commit f183403a08
7 changed files with 11 additions and 7 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 Major = "3";
public const string Minor = "5"; public const string Minor = "5";
public const string Build = "1"; public const string Build = "1";
public const string Revision = "2271"; public const string Revision = "2274";
public const string MainVersion = Major + "." + Minor; public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=5
%REVISION%=2271
%COREVERSION%=1 %COREVERSION%=1
%REVISION%=2274
%MINOR%=5
%MAJOR%=3 %MAJOR%=3

2
Parsers/PascalABCParserNewSaushkin/SemanticRules.cs
View file

@ -438,7 +438,7 @@ namespace GPPGParserScanner
int sqbracked_pos = s.LastIndexOf(']'); int sqbracked_pos = s.LastIndexOf(']');
if (comma_pos != -1 && comma_pos > bracket_pos && comma_pos > sqbracked_pos) if (comma_pos != -1 && comma_pos > bracket_pos && comma_pos > sqbracked_pos)
colon_pos = comma_pos; colon_pos = comma_pos;
if (colon_pos != -1 && s.IndexOf('?') == -1) if (colon_pos != -1 && s.IndexOf('?') == -1 && s.Substring(colon_pos).IndexOf(']') == -1)
{ {
var_formats.Add(ind, s.Substring(colon_pos)); var_formats.Add(ind, s.Substring(colon_pos));
s = s.Substring(0, colon_pos); s = s.Substring(0, colon_pos);

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.5.1.2271 3.5.1.2274

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.5.1.2271' !define VERSION '3.5.1.2274'

4
TestSuite/InterpSlice.pas Normal file
View file

@ -0,0 +1,4 @@
begin
var s := 'sfgjsfj';
Assert($'{s[2:4]}'='fg');
end.

2
_GenerateAllSetups.bat
View file

@ -56,7 +56,7 @@ cd ReleaseGenerators
call PascalABCNETWithDotNet40.bat call PascalABCNETWithDotNet40.bat
cd .. cd ..
%call Studio.bat /t:rebuild "/property:Configuration=Release" PascalABCNET.sln call Studio.bat /t:rebuild "/property:Configuration=Release" PascalABCNET.sln
GOTO EXIT GOTO EXIT