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

Merge branch 'master' into refactoring/sytax_tree_visitor

Browse source
This commit is contained in:
Voloshin Bogdan 2018-01-30 19:28:05 +03:00
parent d118eccd17 07e102cd91
commit 9059f8e1a8
5 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
TestSuite/extensionmethods26.pas Normal file
View file

@ -0,0 +1,13 @@
begin
var a:array of char;
a := Arr('A','B','C');
var b := a + 'D';//'D' is char
assert(b.First = 'A');
assert(b is IEnumerable<char>);
var c := a + 'DE';//'DE' is string
assert(c is IEnumerable<char>);
assert(c.Last = 'E');
var e := 'D' + a;
assert(e is IEnumerable<char>);
assert(e.Last = 'C');
end.

32
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -1088,6 +1088,8 @@ namespace PascalABCCompiler.TreeConverter
}
}
}
if (name == "+" && right_type == SystemLibrary.SystemLibrary.char_type && left_type != SystemLibrary.SystemLibrary.string_type)
no_search_in_extension_methods = false;
SymbolInfoList sil = left_type.find_in_type(name, left_type.Scope, no_search_in_extension_methods);
int added_symbols = -1;
SymbolInfoList sil2 = null;
@ -1096,6 +1098,8 @@ namespace PascalABCCompiler.TreeConverter
//SymbolInfo si2 = right_type.find(name, context.CurrentScope);
if (sil != null)
sil = sil.copy();
if (name == "+" && right_type != SystemLibrary.SystemLibrary.string_type && left_type == SystemLibrary.SystemLibrary.char_type)
no_search_in_extension_methods = false;
sil2 = right_type.find_in_type(name, right_type.Scope, no_search_in_extension_methods);
if ((sil != null) && (sil2 != null))
{
@ -3575,6 +3579,22 @@ namespace PascalABCCompiler.TreeConverter
if (tn.IsPointer)
AddError(get_location(types[i]), "AUTO_CLASS_MUST_NOT_HAVE_POINTERS");
}
if (_class_definition.body != null)
foreach (class_members cl_mem in _class_definition.body.class_def_blocks)
{
foreach (declaration decl in cl_mem.members)
{
if (decl is var_def_statement)
{
type_definition type = (decl as var_def_statement).vars_type;
SyntaxTree.array_type arr = type as SyntaxTree.array_type;
if (type is SyntaxTree.class_definition || (arr != null && arr.indexers != null && arr.indexers.indexers.Count > 0 && arr.indexers.indexers[0] != null))
{
AddError(get_location(type), "STRUCT_TYPE_DEFINITION_IN_AUTO_CLASS");
}
}
}
}
}
//if (!SemanticRules.OrderIndependedNames)
@ -10012,7 +10032,7 @@ namespace PascalABCCompiler.TreeConverter
AddError(cn.location, "CASE_CONSTANT_VARIANT_COINCIDE_WITH_ANOTHER");
basic_function_call eq_call = new basic_function_call(int64_eq_meth, cn.location);
eq_call.parameters.AddElement(en);
eq_call.parameters.AddElement(cn);
eq_call.parameters.AddElement(scn);
eq_calls.Add(eq_call);
}
else
@ -10029,10 +10049,10 @@ namespace PascalABCCompiler.TreeConverter
basic_function_node int64_leq_meth = SystemLibrary.SystemLibrary.int64_type.find_first_in_type("<=", true).sym_info as basic_function_node;
basic_function_call greq_call = new basic_function_call(int64_greq_meth, left_cn.location);
greq_call.parameters.AddElement(en);
greq_call.parameters.AddElement(left_cn);
greq_call.parameters.AddElement(left_scn);
basic_function_call leq_call = new basic_function_call(int64_leq_meth, right_cn.location);
leq_call.parameters.AddElement(en);
leq_call.parameters.AddElement(right_cn);
leq_call.parameters.AddElement(right_scn);
basic_function_node in_diap_meth = SystemLibrary.SystemLibrary.bool_type.find_first_in_type("and", true).sym_info as basic_function_node;
basic_function_call in_diap_call = new basic_function_call(in_diap_meth, left_cn.location);
in_diap_call.parameters.AddElement(greq_call);
@ -10098,7 +10118,7 @@ namespace PascalABCCompiler.TreeConverter
AddError(cn.location, "CASE_CONSTANT_VARIANT_COINCIDE_WITH_ANOTHER");
basic_function_call eq_call = new basic_function_call(uint64_eq_meth, cn.location);
eq_call.parameters.AddElement(en);
eq_call.parameters.AddElement(cn);
eq_call.parameters.AddElement(scn);
eq_calls.Add(eq_call);
}
else
@ -10115,10 +10135,10 @@ namespace PascalABCCompiler.TreeConverter
basic_function_node uint64_leq_meth = SystemLibrary.SystemLibrary.uint64_type.find_first_in_type("<=", true).sym_info as basic_function_node;
basic_function_call greq_call = new basic_function_call(uint64_greq_meth, left_cn.location);
greq_call.parameters.AddElement(en);
greq_call.parameters.AddElement(left_cn);
greq_call.parameters.AddElement(left_scn);
basic_function_call leq_call = new basic_function_call(uint64_leq_meth, right_cn.location);
leq_call.parameters.AddElement(en);
leq_call.parameters.AddElement(right_cn);
leq_call.parameters.AddElement(right_scn);
basic_function_node in_diap_meth = SystemLibrary.SystemLibrary.bool_type.find_first_in_type("and", true).sym_info as basic_function_node;
basic_function_call in_diap_call = new basic_function_call(in_diap_meth, left_cn.location);
in_diap_call.parameters.AddElement(greq_call);

1
bin/Lng/Eng/SemanticErrors_ib.dat
View file

@ -135,6 +135,7 @@ OVERRIDE_NOT_ALLOWED_FOR_SHORT_FUNCTIONS=Can not use override in short functions
RETURN_VALUE_IMPLICIT_EXPLICIT_EXPECTED=Can not declare implicit and explicit operators without explicitly defined return type
RETURN_TYPE_UNDEFINED_{0}=Return type of function {0} is not defined and cannot be deduced. Declare the return type explicitly.
OPERATOR_RETURN_TYPE_UNDEFINED_{0}=Return type of operator {0} is not defined and cannot be deduced. Declare the return type explicitly.
STRUCT_TYPE_DEFINITION_IN_AUTO_CLASS=Field types in auto classes cannot be record or array definition
%PREFIX%=COMPILATIONERROR_
UNIT_MODULE_EXPECTED_LIBRARY_FOUND=Unit expected, library found
ASSEMBLY_{0}_READING_ERROR=Error by reading assembly '{0}'

1
bin/Lng/Rus/SemanticErrors_ib.dat
View file

@ -130,6 +130,7 @@ OVERRIDE_NOT_ALLOWED_FOR_SHORT_FUNCTIONS=Нельзя использовать o
RETURN_VALUE_IMPLICIT_EXPLICIT_EXPECTED=Тип возвращаемого значения в операторах implicit и explicit должен указываться явно
RETURN_TYPE_UNDEFINED_{0}=Тип возвращаемого значения функции {0} не определен и не может быть выведен в данный момент. Укажите тип явно.
OPERATOR_RETURN_TYPE_UNDEFINED_{0}=Тип возвращаемого значения оператора {0} не определен и не может быть выведен в данный момент. Укажите тип явно.
STRUCT_TYPE_DEFINITION_IN_AUTO_CLASS=Типы полей авто-класса не могут быть описанием записи или описанием массива с границами
%PREFIX%=COMPILATIONERROR_
UNIT_MODULE_EXPECTED_LIBRARY_FOUND=Ожидался модуль, а встречена библиотека
ASSEMBLY_{0}_READING_ERROR=Ошибка при чтении сборки '{0}'

1
bin/Lng/Ukr/SemanticErrors_ib.dat
View file

@ -128,6 +128,7 @@ NAMESPACE_SHOULD_CONTAINS_ONLY_TYPES=В пространство имен мож
RETURN_VALUE_IMPLICIT_EXPLICIT_EXPECTED=Тип возвращаемого значения в операторах implicit и explicit должен указываться явно
RETURN_TYPE_UNDEFINED_{0}=Тип возвращаемого значения функции {0} не определен и не может быть выведен в данный момент. Укажите тип явно.
OPERATOR_RETURN_TYPE_UNDEFINED_{0}=Тип возвращаемого значения оператора {0} не определен и не может быть выведен в данный момент. Укажите тип явно.
STRUCT_TYPE_DEFINITION_IN_AUTO_CLASS=Типы полей авто-класса не могут быть описанием записи или описанием массива с границами
%PREFIX%=COMPILATIONERROR_
UNIT_MODULE_EXPECTED_LIBRARY_FOUND=Очікувався модуль, а зустріли бібліотеку
ASSEMBLY_{0}_READING_ERROR=Помилка при читанні збірки '{0}'