diff --git a/Compiler/Compiler.cs b/Compiler/Compiler.cs index 0b6da5c51..6070ebd1b 100644 --- a/Compiler/Compiler.cs +++ b/Compiler/Compiler.cs @@ -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; } diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index d8f8333f6..3e13a303d 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -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; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index 80c1fecbf..2ae5a2394 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=2 -%REVISION%=1881 %MINOR%=4 +%REVISION%=1882 +%COREVERSION%=2 %MAJOR%=3 diff --git a/ICSharpCode.TextEditor/Src/Document/LineManager/LineSegmentTree.cs b/ICSharpCode.TextEditor/Src/Document/LineManager/LineSegmentTree.cs index 7d30f243d..122bf6e69 100644 --- a/ICSharpCode.TextEditor/Src/Document/LineManager/LineSegmentTree.cs +++ b/ICSharpCode.TextEditor/Src/Document/LineManager/LineSegmentTree.cs @@ -100,8 +100,9 @@ namespace ICSharpCode.TextEditor.Document RedBlackTreeNode GetNode(int index) { if (index < 0 || index >= tree.Count) - throw new ArgumentOutOfRangeException("index", index, "index should be between 0 and " + (tree.Count-1)); - RedBlackTreeNode node = tree.root; + return tree.root; + //throw new ArgumentOutOfRangeException("index", index, "index should be between 0 and " + (tree.Count-1)); + RedBlackTreeNode node = tree.root; while (true) { if (node.left != null && index < node.left.val.count) { node = node.left; diff --git a/Libraries/ICSharpCode.TextEditor.dll b/Libraries/ICSharpCode.TextEditor.dll index 258a4f9fd..168215936 100644 Binary files a/Libraries/ICSharpCode.TextEditor.dll and b/Libraries/ICSharpCode.TextEditor.dll differ diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index bf38d1129..c3cb784d6 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.1881' +!define VERSION '3.4.2.1882'