diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index fd9f90c0a..bce2877b8 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 = "8";
public const string Build = "0";
- public const string Revision = "2863";
+ public const string Revision = "2864";
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 db0a46f19..9278bf192 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%MINOR%=8
-%REVISION%=2863
%COREVERSION%=0
+%REVISION%=2864
+%MINOR%=8
%MAJOR%=3
diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources
index 9a6f8f671..9b0e7ddc5 100644
Binary files a/Localization/DefaultLang.resources and b/Localization/DefaultLang.resources differ
diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt
index fdad3b115..316ce6731 100644
--- a/Release/pabcversion.txt
+++ b/Release/pabcversion.txt
@@ -1 +1 @@
-3.8.0.2863
+3.8.0.2864
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index f375cb7d2..51e067e60 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.8.0.2863'
+!define VERSION '3.8.0.2864'
diff --git a/SyntaxTree/tree/Tree.cs b/SyntaxTree/tree/Tree.cs
index c2cb28d1f..ac64ccd3f 100644
--- a/SyntaxTree/tree/Tree.cs
+++ b/SyntaxTree/tree/Tree.cs
@@ -11288,9 +11288,6 @@ namespace PascalABCCompiler.SyntaxTree
}
}
- // имя модуля в случае обычного uses
- // или путь к модулю в случае uses-in
- public virtual string UsesPath() => name.idents[0].name;
/// Создает копию узла
public override syntax_tree_node Clone()
@@ -11461,7 +11458,6 @@ namespace PascalABCCompiler.SyntaxTree
}
}
- public override string UsesPath() => in_file.Value;
/// Создает копию узла
public override syntax_tree_node Clone()
diff --git a/SyntaxTree/tree/TreeHelper.cs b/SyntaxTree/tree/TreeHelper.cs
index ba916e070..e1a5c6448 100644
--- a/SyntaxTree/tree/TreeHelper.cs
+++ b/SyntaxTree/tree/TreeHelper.cs
@@ -941,6 +941,9 @@ namespace PascalABCCompiler.SyntaxTree
{
this.name = new ident_list(name, sc);
}
+ // имя модуля в случае обычного uses
+ // или путь к модулю в случае uses-in
+ public virtual string UsesPath() => name.idents[0].name;
}
public partial class uses_list
@@ -2033,6 +2036,11 @@ namespace PascalABCCompiler.SyntaxTree
public object ext = null;
}
+ public partial class uses_unit_in
+ {
+ public override string UsesPath() => in_file.Value;
+ }
+
public class ident_or_list // Это для распаковки параметров в лямбдах \(x,y)
{
// только одно поле - ненулевое!
@@ -2048,4 +2056,6 @@ namespace PascalABCCompiler.SyntaxTree
}
}
+
+
}