fix #3086
CompilerOptions.StandardModules.ContainsKey(currentCompilationUnit.languageName) - проверка convert_semantic_strong - раскомментировал try чтобы лучше перехватывать параметры Exception
This commit is contained in:
parent
4609a6dfd2
commit
9f9c2a85bd
|
|
@ -3038,6 +3038,8 @@ namespace PascalABCCompiler
|
|||
|
||||
public void AddStandardUnitsToInterfaceUsesSection(SyntaxTree.compilation_unit unitSyntaxTree)
|
||||
{
|
||||
if (!(CompilerOptions.StandardModules.ContainsKey(currentCompilationUnit.languageName)))
|
||||
return;
|
||||
if (CompilerOptions.StandardModules[currentCompilationUnit.languageName].Count == 0)
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ internal static class RevisionClass
|
|||
public const string Major = "3";
|
||||
public const string Minor = "9";
|
||||
public const string Build = "0";
|
||||
public const string Revision = "3458";
|
||||
public const string Revision = "3460";
|
||||
|
||||
public const string MainVersion = Major + "." + Minor;
|
||||
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%COREVERSION%=0
|
||||
%REVISION%=3458
|
||||
%REVISION%=3460
|
||||
%MINOR%=9
|
||||
%MAJOR%=3
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3.9.0.3458
|
||||
3.9.0.3460
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
!define VERSION '3.9.0.3458'
|
||||
!define VERSION '3.9.0.3460'
|
||||
|
|
|
|||
|
|
@ -850,6 +850,11 @@ namespace PascalABCCompiler.TreeConverter
|
|||
for (int i = 1; i < names.names.Count - 1; i++)
|
||||
{
|
||||
List<SymbolInfo> sil = null;
|
||||
if (di is common_unit_node)
|
||||
{
|
||||
sil = (di as common_unit_node).find_only_in_namespace(names.names[i].name); // SSM 23.04.24 fix #3086
|
||||
}
|
||||
else
|
||||
if (di is namespace_node)
|
||||
{
|
||||
sil = (di as namespace_node).find(names.names[i].name);
|
||||
|
|
|
|||
|
|
@ -805,7 +805,7 @@ namespace PascalABCCompiler.TreeConverter
|
|||
|
||||
//st = prepare_statement(st);
|
||||
statement_node sn = null;
|
||||
//try
|
||||
try
|
||||
{
|
||||
sn = ret.visit(st);
|
||||
// SSM 19/01/17 закомментировал две следующие строчки
|
||||
|
|
@ -821,14 +821,16 @@ namespace PascalABCCompiler.TreeConverter
|
|||
ErrorsList.Add(e);
|
||||
return new empty_statement(null);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
catch (Exception e)
|
||||
{
|
||||
if (ThrowCompilationError)
|
||||
var s = e.StackTrace;
|
||||
var runMethodInfo = e.TargetSite;
|
||||
//if (ThrowCompilationError)
|
||||
throw e;
|
||||
else
|
||||
return new empty_statement(null);
|
||||
}*/
|
||||
//else
|
||||
// return new empty_statement(null);
|
||||
}
|
||||
//sn.loc=get_location(st);
|
||||
|
||||
#region MikhailoMMX, обработка критических секций OpenMP
|
||||
|
|
|
|||
|
|
@ -1141,19 +1141,19 @@
|
|||
<member name="M:TypedFileRead(PABCSystem.TypedFile)">
|
||||
<summary>--</summary>
|
||||
</member>
|
||||
<member name="M:FilePos(PABCSystem.BinaryFile)">
|
||||
<member name="M:FilePos(@file)">
|
||||
<summary>--</summary>
|
||||
</member>
|
||||
<member name="M:FileSize(PABCSystem.BinaryFile)">
|
||||
<member name="M:FileSize(@file)">
|
||||
<summary>--</summary>
|
||||
</member>
|
||||
<member name="M:Seek(PABCSystem.BinaryFile,System.Int64)">
|
||||
<member name="M:Seek(@file,System.Int64)">
|
||||
<summary>--</summary>
|
||||
</member>
|
||||
<member name="M:BinaryFileInit(PABCSystem.BinaryFile@)">
|
||||
<member name="M:BinaryFileInit(@file@)">
|
||||
<summary>--</summary>
|
||||
</member>
|
||||
<member name="M:BinaryFileRead(PABCSystem.BinaryFile@,System.Type)">
|
||||
<member name="M:BinaryFileRead(@file@,System.Type)">
|
||||
<summary>--</summary>
|
||||
</member>
|
||||
<member name="M:PascalABCVersion">
|
||||
|
|
|
|||
Loading…
Reference in a new issue