Merge branch 'master' of https://github.com/pascalabcnet/pascalabcnet …

…into test
spectatorBH · Feb 20, 2025 · 92c0d68 · 92c0d68
2 parents 9b3cbb2 + 80b7182
commit 92c0d68
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Compiler/Compiler.cs b/Compiler/Compiler.cs
@@ -3311,7 +3311,7 @@ private void CalculatePascalProgramHealth(SyntaxTree.compilation_unit unitSyntax
             // Это только для локального компилятора?
             var stat = new SyntaxVisitors.ABCStatisticsVisitor();
             stat.ProcessNode(unitSyntaxTree);
-            pABCCodeHealth = stat.CalcHealth(out int _, out int _);
+            pABCCodeHealth = stat.CalcHealth(out int aaa, out int bbb);
         }
 
         private SyntaxTree.compilation_unit InternalParseText(ILanguage language, string fileName, string text, List<Error> errorList, List<CompilerWarning> warnings, List<string> definesList = null, bool calculateHealth = true)

diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
@@ -12942,7 +12942,7 @@ private void make_attributes_for_declaration(SyntaxTree.unit_module un, common_u
                                     if (context.top_function.return_value_type == null || context.top_function.return_value_type == SystemLibrary.SystemLibrary.void_type)
                                         AddError(get_location(attr), "EXPECTED_RETURN_VALUE_FOR_ATTRIBUTE");
                                     throw new NotSupportedError(get_location(attr.qualifier));
-                                    qualifier = SemanticTree.attribute_qualifier_kind.return_kind;
+                                    // qualifier = SemanticTree.attribute_qualifier_kind.return_kind;
                                 }
                                 else
                                     throw new NotSupportedError(get_location(attr.qualifier));
@@ -15437,10 +15437,11 @@ private constant_node convert_strong_to_constant_node(expression_node expr, type
                 constant = new common_namespace_function_call_as_constant(cnfc1, loc);
                 return constant;
             }
-            else if (expr is common_namespace_function_call cnfc2
-                && cnfc2.function_node.name.StartsWith("__NewSetCreatorInternal")
+            else if (expr is common_namespace_function_call
+                && (expr as common_namespace_function_call).function_node.name.StartsWith("__NewSetCreatorInternal")
                 )
             {
+                var cnfc2 = expr as common_namespace_function_call;
                 convertion_data_and_alghoritms.check_convert_type(cnfc2, tn, loc);
                 var values = (cnfc2.parameters[0] as array_initializer).element_values;
                 // Надо компоненты проверять на константность