administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

work

Browse source
This commit is contained in:
Ivan Bondarev 2021-09-26 10:41:53 +02:00
parent a33d2cdcf1
commit eabd6ce66b
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
CodeCompletion/DomSyntaxTreeVisitor.cs
View file

@ -133,9 +133,16 @@ namespace CodeCompletion
}
}
private TypeScope GetCorrectedType(ElementScope es, type_node tn)
private TypeScope GetCorrectedType(TypeScope ts, type_node tn, SymScope topScope)
{
if (tn is compiled_type_node)
if (ts is TypeSynonim)
{
var corrected_type = GetCorrectedType((ts as TypeSynonim).actType, tn, topScope);
if (corrected_type != (ts as TypeSynonim).actType)
return corrected_type;
return ts;
}
else if (tn is compiled_type_node)
{
var ctn = tn as compiled_type_node;
if (ctn.compiled_type.IsArray)
@ -155,14 +162,14 @@ namespace CodeCompletion
else
{
if (tn.full_name.IndexOf("$") != -1 || tn.full_name.IndexOf("#") != -1)
return es.sc as TypeScope;
return ts;
var ntr = BuildSyntaxNodeForTypeReference(tn);
cur_scope = es.topScope;
cur_scope = topScope;
ntr.visit(this);
if (returned_scope != null && returned_scope is TypeScope)
return returned_scope as TypeScope;
return es.sc as TypeScope;
return ts;
}
}
@ -186,7 +193,7 @@ namespace CodeCompletion
var es = FindScopeByLocation(loc.begin_line_num,loc.begin_column_num) as ElementScope;
if (es != null)
{
es.sc = GetCorrectedType(es, vdn.type);
es.sc = GetCorrectedType(es.sc as TypeScope, vdn.type, es.topScope);
es.MakeDescription();
}
}

7
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -69,7 +69,9 @@ namespace PascalABCCompiler.TreeConverter
internal document current_document;
public compilation_context context;
public ContextChanger contextChanger;
private bool var_def_statement_converting;
public ContextChanger contextChanger;
internal using_namespace_list using_list = new using_namespace_list();
internal using_namespace_list interface_using_list = new using_namespace_list();
@ -16652,6 +16654,7 @@ namespace PascalABCCompiler.TreeConverter
public override void visit(SyntaxTree.var_def_statement _var_def_statement)
{
var_def_statement_converting = true;
if (_var_def_statement.vars_type != null && _var_def_statement.vars_type is procedure_header)
{
var ph = _var_def_statement.vars_type as procedure_header;
@ -16839,6 +16842,7 @@ namespace PascalABCCompiler.TreeConverter
}
if (context.converted_type != null && context.converting_block() == block_type.type_block && context.converted_type.IsStatic && _var_def_statement.var_attr != definition_attribute.Static)
AddError(get_location(_var_def_statement), "STATIC_CLASSES_CANNOT_NON_STATIC_MEMBERS");
var_def_statement_converting = false;
if (is_event) return;
context.save_var_definitions();
@ -16846,6 +16850,7 @@ namespace PascalABCCompiler.TreeConverter
context.close_var_definition_list(tn, inital_value);
if (!SemanticRules.ManyVariablesOneInitializator && _var_def_statement.inital_value != null && _var_def_statement.vars.idents.Count > 1)
AddError(get_location(_var_def_statement.inital_value), "ONE_VARIABLE_ONE_INITIALIZATOR");
}
private void CheckForCircularityInPointers(ref_type_node left, type_node right, location loc)