diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 6c10f07cb..5fac34288 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 = "1"; public const string Build = "0"; - public const string Revision = "1305"; + public const string Revision = "1306"; 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 780be2fde..8fc06792c 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=1305 %MINOR%=1 +%REVISION%=1306 +%COREVERSION%=0 %MAJOR%=3 diff --git a/PascalABCNET.axml b/PascalABCNET.axml index b98d933dd..dd94af723 100644 --- a/PascalABCNET.axml +++ b/PascalABCNET.axml @@ -1326,6 +1326,28 @@ + + \TreeConverter\TreeConversion\syntax_tree_visitor.cs + public override void visit(SyntaxTree.dot_node _dot_node) + + public override void visit ( SyntaxTree . dot_node _dot_node ) + public class syntax_tree_visitor : SyntaxTree . AbstractVisitor + namespace PascalABCCompiler . TreeConverter + + + + + + \TreeConverter\TreeConversion\syntax_tree_visitor.cs + public override void visit(SyntaxTree.indexer _indexer) + + public override void visit ( SyntaxTree . indexer _indexer ) + public class syntax_tree_visitor : SyntaxTree . AbstractVisitor + namespace PascalABCCompiler . TreeConverter + + + + \ No newline at end of file diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 3d69a3a3a..68285ad4c 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.1.0.1305' +!define VERSION '3.1.0.1306' diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs index 9e506aba4..6b9f5d33c 100644 --- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs +++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs @@ -14454,6 +14454,17 @@ namespace PascalABCCompiler.TreeConverter }*/ //end SSM 11/02/16 + // SSM 18.08.16 - пробуем обработать захват enn[i] в yieldах где enn - поле класса и нуждается в переименовании + // Так же ниже делает lroman + if (_indexer.dereferencing_value is yield_unknown_ident) + { + var yui = (yield_unknown_ident)_indexer.dereferencing_value; + var av = ProcessUnknownIdent(yui); + var nodeToVisit = new indexer(av,_indexer.indexes); + visit(nodeToVisit); + return; + } + //lroman if (_indexer.dereferencing_value is closure_substituting_node) { diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll index 47bda1e82..6bc0ea2b4 100644 Binary files a/bin/Lib/PABCRtl.dll and b/bin/Lib/PABCRtl.dll differ