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

fix #861

Browse source
This commit is contained in:
Бондарев Иван 2018-07-01 14:16:51 +02:00
parent 4dd84e4c8e
commit 7177fbe9d3
4 changed files with 2401 additions and 1601 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
CodeCompletion/DomSyntaxTreeVisitor.cs
View file

@ -38,8 +38,9 @@ namespace CodeCompletion
private bool search_all = false;//flag, iskat vse peregruzki ili tolko odnu. sdelal dlja effektivnosti. true zadaetsja tolko v visit(method_call) private bool search_all = false;//flag, iskat vse peregruzki ili tolko odnu. sdelal dlja effektivnosti. true zadaetsja tolko v visit(method_call)
internal bool parse_only_interface = false; internal bool parse_only_interface = false;
private template_type_reference converted_template_type = null; private template_type_reference converted_template_type = null;
private List<var_def_statement> pending_is_pattern_vars = new List<var_def_statement>();
public SemanticOptions semantic_options = new SemanticOptions(); public SemanticOptions semantic_options = new SemanticOptions();
public DomSyntaxTreeVisitor(DomConverter converter) public DomSyntaxTreeVisitor(DomConverter converter)
{ {
@ -165,7 +166,7 @@ namespace CodeCompletion
cur_scope.AddName("$block_scope",stmt_scope); cur_scope.AddName("$block_scope",stmt_scope);
stmt_scope.loc = get_location(_statement_list); stmt_scope.loc = get_location(_statement_list);
cur_scope = stmt_scope; cur_scope = stmt_scope;
} }
//try //try
{ {
foreach (statement stmt in _statement_list.subnodes) foreach (statement stmt in _statement_list.subnodes)
@ -688,59 +689,131 @@ namespace CodeCompletion
SymScope tmp = cur_scope; SymScope tmp = cur_scope;
//if (_for_node.type_name != null) //if (_for_node.type_name != null)
{ {
SymScope stmt_scope = new BlockScope(cur_scope); SymScope stmt_scope = new BlockScope(cur_scope);
cur_scope.AddName("$block_scope",stmt_scope); cur_scope.AddName("$block_scope", stmt_scope);
stmt_scope.loc = get_location(_for_node); stmt_scope.loc = get_location(_for_node);
returned_scope = null; returned_scope = null;
if (_for_node.type_name != null) if (_for_node.type_name != null)
_for_node.type_name.visit(this); _for_node.type_name.visit(this);
if (returned_scope != null) if (returned_scope != null)
{ {
cur_scope = stmt_scope; cur_scope = stmt_scope;
ElementScope es = new ElementScope(new SymInfo(_for_node.loop_variable.name, SymbolKind.Variable,_for_node.loop_variable.name),returned_scope,cur_scope); ElementScope es = new ElementScope(new SymInfo(_for_node.loop_variable.name, SymbolKind.Variable, _for_node.loop_variable.name), returned_scope, cur_scope);
stmt_scope.AddName(_for_node.loop_variable.name,es); stmt_scope.AddName(_for_node.loop_variable.name, es);
es.loc = get_location(_for_node.loop_variable); es.loc = get_location(_for_node.loop_variable);
returned_scope = null; returned_scope = null;
} }
else else
{ {
_for_node.initial_value.visit(this); _for_node.initial_value.visit(this);
if (returned_scope != null) if (returned_scope != null)
{ {
cur_scope = stmt_scope; cur_scope = stmt_scope;
if (_for_node.create_loop_variable) if (_for_node.create_loop_variable)
{ {
ElementScope es = new ElementScope(new SymInfo(_for_node.loop_variable.name, SymbolKind.Variable,_for_node.loop_variable.name),returned_scope,cur_scope); ElementScope es = new ElementScope(new SymInfo(_for_node.loop_variable.name, SymbolKind.Variable, _for_node.loop_variable.name), returned_scope, cur_scope);
stmt_scope.AddName(_for_node.loop_variable.name,es); stmt_scope.AddName(_for_node.loop_variable.name, es);
es.loc = get_location(_for_node.loop_variable); es.loc = get_location(_for_node.loop_variable);
} }
returned_scope = null; returned_scope = null;
} }
} }
} }
if (_for_node.statements != null) if (_for_node.statements != null)
_for_node.statements.visit(this); _for_node.statements.visit(this);
cur_scope = tmp; cur_scope = tmp;
} }
public override void visit(PascalABCCompiler.SyntaxTree.repeat_node _repeat_node) public override void visit(PascalABCCompiler.SyntaxTree.repeat_node _repeat_node)
{ {
if (_repeat_node.statements != null) if (_repeat_node.statements != null)
_repeat_node.statements.visit(this); _repeat_node.statements.visit(this);
} }
public override void visit(PascalABCCompiler.SyntaxTree.while_node _while_node) public override void visit(PascalABCCompiler.SyntaxTree.while_node _while_node)
{ {
if (_while_node.statements != null) if (_while_node.statements != null)
_while_node.statements.visit(this); _while_node.statements.visit(this);
}
public override void visit(is_pattern_expr _is_pattern_expr)
{
_is_pattern_expr.right.visit(this);
}
public override void visit(deconstructor_pattern _deconstructor_pattern)
{
_deconstructor_pattern.type.visit(this);
foreach (pattern_deconstructor_parameter pdp in _deconstructor_pattern.parameters)
{
if (pdp is var_deconstructor_parameter)
{
var_deconstructor_parameter vdp = pdp as var_deconstructor_parameter;
pending_is_pattern_vars.Add(new var_def_statement(vdp.identifier, _deconstructor_pattern.type, _deconstructor_pattern.source_context));
}
}
}
public override void visit(match_with _match_with)
{
if (_match_with.case_list != null)
{
foreach (pattern_case pc in _match_with.case_list.elements)
pc.visit(this);
}
}
public override void visit(pattern_case _pattern_case)
{
_pattern_case.pattern.visit(this);
statement stmt = merge_with_is_variables(_pattern_case.case_action);
stmt.visit(this);
}
public void visit_is_patterns(expression expr)
{
if (expr is bin_expr)
{
bin_expr bexpr = expr as bin_expr;
visit_is_patterns(bexpr.left);
visit_is_patterns(bexpr.right);
}
else if (expr is is_pattern_expr)
expr.visit(this);
}
public statement merge_with_is_variables(statement stmt)
{
if (pending_is_pattern_vars.Count > 0)
{
if (stmt is statement_list)
{
foreach (var_def_statement vds in pending_is_pattern_vars)
(stmt as statement_list).Insert(0, new var_statement(vds, vds.source_context));
}
else
{
statement_list slist = new statement_list();
slist.source_context = stmt.source_context;
foreach (var_def_statement vds in pending_is_pattern_vars)
slist.Insert(0, new var_statement(vds, vds.source_context));
slist.Add(stmt);
stmt = slist;
}
pending_is_pattern_vars.Clear();
}
return stmt;
} }
public override void visit(PascalABCCompiler.SyntaxTree.if_node _if_node) public override void visit(PascalABCCompiler.SyntaxTree.if_node _if_node)
{ {
if (_if_node.then_body != null) visit_is_patterns(_if_node.condition);
_if_node.then_body.visit(this); statement then_stmt = merge_with_is_variables(_if_node.then_body);
if (then_stmt != null)
then_stmt.visit(this);
if (_if_node.else_body != null) if (_if_node.else_body != null)
_if_node.else_body.visit(this); _if_node.else_body.visit(this);
} }
public override void visit(ref_type _ref_type) public override void visit(ref_type _ref_type)

3817
TestSuite/intellisense_tests/PABCSystem.pas
View file

File diff suppressed because it is too large Load diff

14
TestSuite/intellisense_tests/ispattern1.pas Normal file
View file

@ -0,0 +1,14 @@
type
t1=class end;
begin
var o:object;
if o is t1(var o_t1) then
writeln(o_t1{@var o_t1: t1;@});
if o is t1(var o_t1) then
begin
writeln(o_t1{@var o_t1: t1;@});
end;
writeln(o_t1{@@});
end.

22
TestSuite/intellisense_tests/match1.pas Normal file
View file

@ -0,0 +1,22 @@
type
Line = class
end;
Rectangle = auto class
X,Y,Width,Height: real;
end;
Circle = auto class
X,Y,Radius: real;
end;
begin
var l := new List<Object>;
l.Add(new Line);
l.Add(new Circle(10,10,5));
l.Add(new Rectangle(10,10,20,10));
foreach var x in l do
match x with
Line(var ll): Println('Line S =',0);
Circle(var c): Println('Circle S =',c{@var c: Circle;@}.Radius*c.Radius*Pi);
Rectangle(var r{@var r: Rectangle;@}): Println('Rectangle S =',r.Width*r.Height);
end;
end.