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

bug fix #122, #134, #137

Browse source
This commit is contained in:
Бондарев Иван 2016-04-14 20:16:31 +02:00
parent 4c2166451b
commit 6c9aed039a
9 changed files with 88 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ParserTools/ParserTools/DefaultLanguageInformation.cs
View file

@ -1638,7 +1638,8 @@ namespace PascalABCCompiler.Parsers
Type[] class_generic_args = pis[i].ParameterType.GetGenericArguments();
for (int j = 0; j < class_generic_args.Length; j++)
{
class_generic_table.Add(class_generic_args[i].Name, j);
if (!class_generic_table.ContainsKey(class_generic_args[i].Name))
class_generic_table.Add(class_generic_args[i].Name, j);
}
break;
}

4
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -8975,7 +8975,7 @@ end;
// -------------------------------------------
// Дополнения февраль 2016
{// Добавляет поле к кортежу
// Добавляет поле к кортежу
function Add<T1, T2, T3> (Self: (T1,T2); v: T3): (T1,T2,T3); extensionmethod;
begin
Result := (Self[0],Self[1],v);
@ -9003,7 +9003,7 @@ end;
function Add<T1, T2, T3, T4, T5, T6, T7> (Self: (T1,T2,T3,T4,T5,T6); v: T7): (T1,T2,T3,T4,T5,T6,T7); extensionmethod;
begin
Result := (Self[0],Self[1],Self[2],Self[3],Self[4],Self[5],v);
end;}
end;
{// Определяет, есть ли указанный элемент в массиве
function Contains<T>(self: array of T; x: T): boolean; extensionmethod;

2
TestSuite/set9.pas
View file

@ -6,4 +6,6 @@ begin
hs.Println;
var set1: set of integer := hs;
assert(2 in set1);
var h: HashSet<integer> := [1,3,5];
assert(3 in h);
end.

2
TreeConverter/NetWrappers/NetHelper.cs
View file

@ -1519,7 +1519,7 @@ namespace PascalABCCompiler.NetHelper
{
SymbolInfo temp = new SymbolInfo(compiled_type_node.get_type_node(nested_t));
temp.Next = si;
si = temp;
si = temp;
}
return si;
}

2
TreeConverter/SymbolTable/DSST/SymbolTable.cs
View file

@ -943,7 +943,7 @@ namespace SymbolTable
return si;
}
else
if (AreaNodes != null)
if (AreaNodes != null && sc != null)
{
p = AreaNodes.IndexOf(sc.ScopeNum);
if (p >= 0)

7
TreeConverter/TreeConversion/compilation_context.cs
View file

@ -41,7 +41,6 @@ namespace PascalABCCompiler.TreeConverter
public Stack<common_type_node> type_stack; // Для вложенных типов
public statement_list_stack stlist_stack;
public semantic_node ret_value; // Возвращаемое значение класса returner
//LambdaHelper.Reset(); // Пока не знаю, что с этим делать
}
@ -286,6 +285,7 @@ namespace PascalABCCompiler.TreeConverter
ShortStringTypes.Clear();
TypedSets.Clear();
_compiled_tn = null;
_explicit_interface_type = null;
_ctt = null;
allow_inherited_ctor_call = false;
_types_predefined.Clear();
@ -297,6 +297,11 @@ namespace PascalABCCompiler.TreeConverter
SavedContext = null;
SavedContextStack.Clear();
compiled_tc_cache.Clear();
extension_method = false;
_last_created_function = null;
in_parameters_block = false;
is_order_independed_method_description = false;
}
public bool inStaticArea()

20
TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs
View file

@ -44,6 +44,12 @@ namespace PascalABCCompiler.TreeConverter
return default(T);
}
private T AddError<T>(location loc, string ErrString, params string[] values)
{
syntax_tree_visitor.AddError(loc, ErrString, values);
return default(T);
}
private void AddError(location loc, string ErrString, params string[] values)
{
syntax_tree_visitor.AddError(loc, ErrString, values);
@ -586,6 +592,18 @@ namespace PascalABCCompiler.TreeConverter
if (pct.first == null)
throw new CanNotConvertTypes(en, en.type, to, loc);
}
public bool can_convert_type(expression_node en, type_node to)
{
if (en.type == to)
return true;
possible_type_convertions pct = type_table.get_convertions(en.type, to);
if (pct.second != null)
return false;
if (pct.first == null)
return false;
return true;
}
public void check_convert_type_with_inheritance(type_node from, type_node to, location loc)
{
@ -1890,7 +1908,7 @@ namespace PascalABCCompiler.TreeConverter
if (set_of_possible_functions.Count == 0 && indefinits.Count == 0)
{
AddError(loc, "CAN_NOT_CALL_ANY_GENERIC_FUNCTION_{0}_WITH_THESE_PARAMETERS", first_function.name);
return AddError<function_node>(loc, "CAN_NOT_CALL_ANY_GENERIC_FUNCTION_{0}_WITH_THESE_PARAMETERS", first_function.name);
}
possible_type_convertions_list_list tcll = new possible_type_convertions_list_list();

59
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -569,6 +569,8 @@ namespace PascalABCCompiler.TreeConverter
WaitedRefTypes.Clear();
set_intls.Clear();
NetHelper.NetHelper.reset();
if (ErrorsList != null)
ErrorsList.Clear();
from_pabc_dll = false;
in_interface_part = false;
compiled_type_node[] ctns = new compiled_type_node[compiled_type_node.compiled_types.Values.Count];
@ -1244,20 +1246,30 @@ namespace PascalABCCompiler.TreeConverter
}
}
}
if (si == null)
//if (si == null)
{
if (si2 == null && left_type.semantic_node_type == semantic_node_type.delegated_method && right_type.semantic_node_type == semantic_node_type.delegated_method)
if (/*si2 == null && */left_type.semantic_node_type == semantic_node_type.delegated_method && right_type.semantic_node_type == semantic_node_type.delegated_method)
{
SymbolInfo saved_si = si;
SymbolInfo saved_si2 = si2;
base_function_call bfc = ((left as typed_expression).type as delegated_methods).proper_methods[0];
left = convertion_data_and_alghoritms.explicit_convert_type(left, CreateDelegate(bfc.simple_function_node));
si = left.type.find_in_type(name);
bfc = ((right as typed_expression).type as delegated_methods).proper_methods[0];
right = convertion_data_and_alghoritms.explicit_convert_type(right, CreateDelegate(bfc.simple_function_node));
si2 = right.type.find_in_type(name);
if (si == null)
if (saved_si != null)
si.Next = saved_si;
else
saved_si = si;
if (saved_si2 != null)
si2.Next = saved_si2;
else
saved_si2 = si2;
if (saved_si == null)
AddError(new OperatorCanNotBeAppliedToThisTypes(name, left, right, loc));
}
else
else if (si == null)
AddError(new OperatorCanNotBeAppliedToThisTypes(name, left, right, loc));
}
@ -4903,6 +4915,14 @@ namespace PascalABCCompiler.TreeConverter
if (cfn.polymorphic_state != SemanticTree.polymorphic_state.ps_static && cfn.ConnectedToType == null)
has_obj_methods = true;
}
else if (si.sym_info is common_method_node)
{
common_method_node cfn = si.sym_info as common_method_node;
if (cfn.polymorphic_state != SemanticTree.polymorphic_state.ps_static)
si_list.Add(si);
if (cfn.polymorphic_state != SemanticTree.polymorphic_state.ps_static)
has_obj_methods = true;
}
si = si.Next;
}
for (int i = 0; i < si_list.Count; i++)
@ -4962,7 +4982,34 @@ namespace PascalABCCompiler.TreeConverter
function_node_list spf = null;
try
{
ThrowCompilationError = false;
function_node ffn = convertion_data_and_alghoritms.select_function(exprs, si, subloc, syntax_nodes_parameters);
if (ffn == null)
{
if (skip_first_parameter)
{
expressions_list ex_list = new expressions_list();
ex_list.AddRange(exprs);
ex_list.remove_at(0);
ffn = convertion_data_and_alghoritms.select_function(ex_list, si, subloc, syntax_nodes_parameters);
if (ffn == null)
{
ThrowCompilationError = true;
throw LastError();
}
RemoveLastError();
skip_first_parameter = false;
exprs = ex_list;
ThrowCompilationError = true;
}
else
{
ThrowCompilationError = true;
throw LastError();
}
}
ThrowCompilationError = true;
int exprCounter = 0;
if (skip_first_parameter)
{
@ -12626,7 +12673,7 @@ namespace PascalABCCompiler.TreeConverter
}
else if (exp is compiled_static_method_call && (exp.type.type_special_kind == SemanticTree.type_special_kind.set_type || exp.type.type_special_kind == SemanticTree.type_special_kind.base_set_type))
{
if (!(tn == exp.type) && !type_table.is_derived(tn, exp.type))
if (!(tn == exp.type) && !type_table.is_derived(tn, exp.type) && !(convertion_data_and_alghoritms.can_convert_type(exp, tn)))
{
AddError(new CanNotConvertTypes(exp, exp.type, tn, exp.location));
}
@ -12655,7 +12702,7 @@ namespace PascalABCCompiler.TreeConverter
}
else if (exp is common_namespace_function_call && (exp.type.type_special_kind == SemanticTree.type_special_kind.set_type || exp.type.type_special_kind == SemanticTree.type_special_kind.base_set_type))
{
if (!(tn == exp.type) && !type_table.is_derived(tn, exp.type))
if (!(tn == exp.type) && !type_table.is_derived(tn, exp.type) && !(convertion_data_and_alghoritms.can_convert_type(exp, tn)))
{
AddError(new CanNotConvertTypes(exp, exp.type, tn, exp.location));
}

4
bin/Lib/PABCSystem.pas
View file

@ -8975,7 +8975,7 @@ end;
// -------------------------------------------
// Дополнения февраль 2016
{// Добавляет поле к кортежу
// Добавляет поле к кортежу
function Add<T1, T2, T3> (Self: (T1,T2); v: T3): (T1,T2,T3); extensionmethod;
begin
Result := (Self[0],Self[1],v);
@ -9003,7 +9003,7 @@ end;
function Add<T1, T2, T3, T4, T5, T6, T7> (Self: (T1,T2,T3,T4,T5,T6); v: T7): (T1,T2,T3,T4,T5,T6,T7); extensionmethod;
begin
Result := (Self[0],Self[1],Self[2],Self[3],Self[4],Self[5],v);
end;}
end;
{// Определяет, есть ли указанный элемент в массиве
function Contains<T>(self: array of T; x: T): boolean; extensionmethod;