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

FIX #1518

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2018-11-24 12:52:36 +03:00
parent 1a1d08dab9
commit 9a43b18c27
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Compiler/Compiler.cs
View file

@ -2852,7 +2852,7 @@ namespace PascalABCCompiler
SyntaxTree.compilation_unit SyntaxTree = InternalParseText(FileName, SourceText, errorsList, warnings, DefinesList);
if (errorsList.Count > 0)
throw errorsList[0];
SyntaxTree = syntaxTreeConvertersController.Convert(SyntaxTree, errorsList) as SyntaxTree.compilation_unit;
SyntaxTree = syntaxTreeConvertersController.Convert(SyntaxTree) as SyntaxTree.compilation_unit;
return SyntaxTree;
}
@ -3160,7 +3160,7 @@ namespace PascalABCCompiler
if (errorsList.Count == 0) // SSM 2/05/16 - для преобразования синтаксических деревьев извне
{
CurrentUnit.SyntaxTree = syntaxTreeConvertersController.Convert(CurrentUnit.SyntaxTree, errorsList) as SyntaxTree.compilation_unit;
CurrentUnit.SyntaxTree = syntaxTreeConvertersController.Convert(CurrentUnit.SyntaxTree) as SyntaxTree.compilation_unit;
}

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "4";
public const string Build = "2";
public const string Revision = "1881";
public const string Revision = "1882";
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%=1881
%MINOR%=4
%REVISION%=1882
%COREVERSION%=2
%MAJOR%=3

5
ICSharpCode.TextEditor/Src/Document/LineManager/LineSegmentTree.cs
View file

@ -100,8 +100,9 @@ namespace ICSharpCode.TextEditor.Document
RedBlackTreeNode<RBNode> GetNode(int index)
{
if (index < 0 || index >= tree.Count)
throw new ArgumentOutOfRangeException("index", index, "index should be between 0 and " + (tree.Count-1));
RedBlackTreeNode<RBNode> node = tree.root;
return tree.root;
//throw new ArgumentOutOfRangeException("index", index, "index should be between 0 and " + (tree.Count-1));
RedBlackTreeNode<RBNode> node = tree.root;
while (true) {
if (node.left != null && index < node.left.val.count) {
node = node.left;

BIN
Libraries/ICSharpCode.TextEditor.dll
View file

Binary file not shown.

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.4.2.1881'
!define VERSION '3.4.2.1882'