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

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

Browse source 
Conflicts:
	SyntaxTree/tree/tree.nin
This commit is contained in:
miks1965 2016-03-11 01:25:16 +03:00
parent 01c82f5863 1c34d92a61
commit 789ae132c5
18 changed files with 3661 additions and 580 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "1";
public const string Build = "0";
public const string Revision = "1196";
public const string Revision = "1198";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

2
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=1
%REVISION%=1196
%REVISION%=1198
%COREVERSION%=0
%MAJOR%=3

BIN
Localization/DefaultLang.resources
View file

Binary file not shown.

BIN
ReleaseGenerators/PT4/Lib/PT4ExamBegin_ru.dll
View file

Binary file not shown.

BIN
ReleaseGenerators/PT4/Lib/PT4ExamCheck_ru.dll
View file

Binary file not shown.

BIN
ReleaseGenerators/PT4/Lib/PT4ExamTaskC_ru.dll
View file

Binary file not shown.

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.1.0.1196'
!define VERSION '3.1.0.1198'

BIN
SyntaxTree/tree/NodesGenerator.exe
View file

Binary file not shown.

3319
SyntaxTree/tree/Tree.cs
View file

File diff suppressed because it is too large Load diff

593
SyntaxTree/tree/TreeHelper.cs
View file

@ -67,80 +67,23 @@ namespace PascalABCCompiler.SyntaxTree
public partial class statement_list
{
public statement_list(statement st, SourceContext sc)
{
Add(st, sc);
}
public statement_list(params statement[] sts)
{
AddMany(sts);
}
public statement_list Add(statement st, SourceContext sc = null)
{
subnodes.Add(st);
if (sc != null)
source_context = sc;
return this;
}
//-- List members begin
public List<statement> list
{
get { return subnodes; }
}
public void AddMany(params statement[] els)
{
list.AddRange(els);
}
public void AddMany(IEnumerable<statement> els)
{
list.AddRange(els);
}
public bool Remove(statement el)
{
return list.Remove(el);
}
private int FindIndex(statement el)
{
var ind = list.FindIndex(x => x == el);
if (ind == -1)
throw new Exception(string.Format("У списка {0} не найден элемент {1} среди дочерних\n", this, el));
return ind;
}
public void Replace(statement el, statement newel)
{
list[FindIndex(el)] = newel;
}
public void Replace(statement el, IEnumerable<statement> newels)
{
var ind = FindIndex(el);
list.RemoveAt(ind);
list.InsertRange(ind,newels);
}
public void InsertAfter(statement el, statement newel)
{
list.Insert(FindIndex(el) + 1, newel);
}
public void InsertBefore(statement el, statement newel)
{
list.Insert(FindIndex(el), newel);
}
public void InsertAfter(statement el, IEnumerable<statement> newels)
{
list.InsertRange(FindIndex(el) + 1, newels);
}
public void InsertBefore(statement el, IEnumerable<statement> newels)
{
list.InsertRange(FindIndex(el), newels);
}
public void AddFirst(statement el)
{
list.Insert(0, el);
}
public void AddFirst(IEnumerable<statement> els)
{
list.InsertRange(0, els);
}
public static statement_list Empty
{
get { return new statement_list(); }
@ -251,17 +194,7 @@ namespace PascalABCCompiler.SyntaxTree
{
this.names = name.Split('.').Select(s => new ident(s)).ToList();
}
public named_type_reference(ident id, SourceContext sc = null)
{
Add(id, sc);
}
public named_type_reference Add(ident id, SourceContext sc = null)
{
names.Add(id);
if (sc != null)
source_context = sc;
return this;
}
public override string ToString()
{
var sb = new System.Text.StringBuilder();
@ -297,74 +230,22 @@ namespace PascalABCCompiler.SyntaxTree
public partial class variable_definitions
{
public variable_definitions(var_def_statement _var_def_statement, SourceContext sc = null)
{
Add(_var_def_statement, sc);
}
public variable_definitions Add(var_def_statement _var_def_statement, SourceContext sc = null)
{
var_definitions.Add(_var_def_statement);
if (sc != null)
source_context = sc;
return this;
}
//-- List members begin
public List<var_def_statement> list
{
get { return var_definitions; }
}
public void AddMany(params var_def_statement[] sts)
{
list.AddRange(sts);
}
public bool Remove(var_def_statement st)
{
return list.Remove(st);
}
private int FindIndex(var_def_statement st)
{
var ind = list.FindIndex(x => x == st);
if (ind == -1)
throw new Exception(string.Format("У списка {0} не найден элемент {1} среди дочерних\n", this, st));
return ind;
}
public void Replace(var_def_statement st, var_def_statement newst)
{
list[FindIndex(st)] = newst;
}
public void InsertAfter(var_def_statement st, var_def_statement newst)
{
list.Insert(FindIndex(st) + 1, newst);
}
public void InsertBefore(var_def_statement st, var_def_statement newst)
{
list.Insert(FindIndex(st), newst);
}
public void AddFirst(var_def_statement st)
{
list.Insert(0, st);
}
//-- List members end
}
public partial class ident_list
{
public ident_list(ident id, SourceContext sc)
public ident_list(params ident[] idents)
{
Add(id, sc);
}
public ident_list(params ident[] ids)
{
AddMany(ids);
}
public ident_list Add(ident id, SourceContext sc = null)
{
idents.Add(id);
if (sc != null)
source_context = sc;
return this;
this.idents = idents.ToList();
}
public override string ToString()
{
var sb = new System.Text.StringBuilder();
@ -379,37 +260,6 @@ namespace PascalABCCompiler.SyntaxTree
get { return idents; }
}
public void AddMany(params ident[] els)
{
list.AddRange(els);
}
public bool Remove(ident el)
{
return list.Remove(el);
}
private int FindIndex(ident el)
{
var ind = list.FindIndex(x => x == el);
if (ind == -1)
throw new Exception(string.Format("У списка {0} не найден элемент {1} среди дочерних\n", this, el));
return ind;
}
public void Replace(ident el, ident newel)
{
list[FindIndex(el)] = newel;
}
public void InsertAfter(ident el, ident newel)
{
list.Insert(FindIndex(el) + 1, newel);
}
public void InsertBefore(ident el, ident newel)
{
list.Insert(FindIndex(el), newel);
}
public void AddFirst(ident el)
{
list.Insert(0, el);
}
//-- List members end
}
@ -451,72 +301,13 @@ namespace PascalABCCompiler.SyntaxTree
public partial class declarations
{
public declarations(declaration _declaration, SourceContext sc = null)
{
Add(_declaration, sc);
}
public declarations Add(declaration _declaration, SourceContext sc = null)
{
defs.Add(_declaration);
if (sc != null)
source_context = sc;
return this;
}
//-- List members begin
public List<declaration> list
{
get { return defs; }
}
public void AddMany(params declaration[] els)
{
list.AddRange(els);
}
public bool Remove(declaration el)
{
return list.Remove(el);
}
private int FindIndex(declaration el)
{
var ind = list.FindIndex(x => x == el);
if (ind == -1)
throw new Exception(string.Format("У списка {0} не найден элемент {1} среди дочерних\n", this, el));
return ind;
}
public void Replace(declaration el, declaration newel)
{
list[FindIndex(el)] = newel;
}
public void Replace(declaration el, IEnumerable<declaration> newels)
{
var ind = FindIndex(el);
list.RemoveAt(ind);
list.InsertRange(ind, newels);
}
public void InsertAfter(declaration el, declaration newel)
{
list.Insert(FindIndex(el) + 1, newel);
}
public void InsertBefore(declaration el, declaration newel)
{
list.Insert(FindIndex(el), newel);
}
public void InsertAfter(declaration el, IEnumerable<declaration> newels)
{
list.InsertRange(FindIndex(el) + 1, newels);
}
public void InsertBefore(declaration el, IEnumerable<declaration> newels)
{
list.InsertRange(FindIndex(el), newels);
}
public void AddFirst(declaration el)
{
list.Insert(0, el);
}
public void AddFirst(IEnumerable<declaration> els)
{
list.InsertRange(0, els);
}
public static statement_list Empty
{
get { return new statement_list(); }
@ -526,17 +317,7 @@ namespace PascalABCCompiler.SyntaxTree
public partial class program_tree
{
public program_tree(compilation_unit cu, SourceContext sc = null)
{
Add(cu, sc);
}
public program_tree Add(compilation_unit cu, SourceContext sc = null)
{
compilation_units.Add(cu);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class program_name
@ -557,17 +338,6 @@ namespace PascalABCCompiler.SyntaxTree
public partial class expression_list
{
public expression_list(expression _expression, SourceContext sc = null)
{
Add(_expression, sc);
}
public expression_list Add(expression _expression, SourceContext sc = null)
{
expressions.Add(_expression);
if (sc != null)
source_context = sc;
return this;
}
public static expression_list Empty
{
get { return new expression_list(); }
@ -605,17 +375,7 @@ namespace PascalABCCompiler.SyntaxTree
public partial class indexers_types
{
public indexers_types(type_definition _type_definition, SourceContext sc = null)
{
Add(_type_definition, sc);
}
public indexers_types Add(type_definition _type_definition, SourceContext sc = null)
{
indexers.Add(_type_definition);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class label_definitions
@ -654,17 +414,6 @@ namespace PascalABCCompiler.SyntaxTree
public partial class formal_parameters
{
public formal_parameters(typed_parameters _typed_parameters, SourceContext sc = null)
{
Add(_typed_parameters, sc);
}
public formal_parameters Add(typed_parameters _typed_parameters, SourceContext sc = null)
{
params_list.Add(_typed_parameters);
if (sc != null)
source_context = sc;
return this;
}
public override string ToString()
{
return string.Join(",", params_list.Select(p => p.ToString()));
@ -677,19 +426,8 @@ namespace PascalABCCompiler.SyntaxTree
///
public partial class procedure_attributes_list
{
public procedure_attributes_list(procedure_attribute _procedure_attribute, SourceContext sc = null)
{
Add(_procedure_attribute, sc);
}
public procedure_attributes_list(proc_attribute attr, SourceContext sc = null) : this(new procedure_attribute(attr), sc)
{ }
public procedure_attributes_list Add(procedure_attribute _procedure_attribute, SourceContext sc = null)
{
proc_attributes.Add(_procedure_attribute);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class procedure_header
@ -862,32 +600,12 @@ namespace PascalABCCompiler.SyntaxTree
public partial class type_declarations
{
public type_declarations(type_declaration _type_declaration, SourceContext sc = null)
{
Add(_type_declaration, sc);
}
public type_declarations Add(type_declaration _type_declaration, SourceContext sc = null)
{
types_decl.Add(_type_declaration);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class consts_definitions_list
{
public consts_definitions_list(const_definition _const_definition, SourceContext sc = null)
{
Add(_const_definition, sc);
}
public consts_definitions_list Add(const_definition _const_definition, SourceContext sc = null)
{
const_defs.Add(_const_definition);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class unit_or_namespace
@ -904,18 +622,7 @@ namespace PascalABCCompiler.SyntaxTree
{
Add(new unit_or_namespace(name), sc);
}
public uses_list(unit_or_namespace un, SourceContext sc = null)
{
Add(un, sc);
}
public uses_list Add(unit_or_namespace un, SourceContext sc = null)
{
units.Add(un);
if (sc != null)
source_context = sc;
return this;
}
public uses_list AddUsesList(uses_list ul, SourceContext sc = null)
{
foreach (var un in ul.units)
@ -1058,21 +765,12 @@ namespace PascalABCCompiler.SyntaxTree
{
get { return new class_members(access_modifer.private_modifer); }
}
public class_members(declaration _declaration, SourceContext sc = null)
{
Add(_declaration, sc);
}
public class_members(access_modifer access)
{
access_mod = new access_modifer_node(access);
}
public class_members Add(declaration _declaration, SourceContext sc)
{
members.Add(_declaration);
if (sc != null)
source_context = sc;
return this;
}
public class_members Add(params declaration[] decls)
{
foreach (var d in decls)
@ -1083,17 +781,7 @@ namespace PascalABCCompiler.SyntaxTree
public partial class class_body
{
public class_body(class_members _class_members, SourceContext sc = null)
{
Add(_class_members, sc);
}
public class_body Add(class_members _class_members, SourceContext sc = null)
{
class_def_blocks.Add(_class_members);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class class_definition
@ -1107,62 +795,22 @@ namespace PascalABCCompiler.SyntaxTree
public partial class record_const
{
public record_const(record_const_definition _record_const_definition, SourceContext sc = null)
{
Add(_record_const_definition, sc);
}
public record_const Add(record_const_definition _record_const_definition, SourceContext sc = null)
{
rec_consts.Add(_record_const_definition);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class literal_const_line
{
public literal_const_line(literal _literal, SourceContext sc = null)
{
Add(_literal, sc);
}
public literal_const_line Add(literal _literal, SourceContext sc = null)
{
literals.Add(_literal);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class variant_list
{
public variant_list(variant _variant, SourceContext sc = null)
{
Add(_variant, sc);
}
public variant_list Add(variant _variant, SourceContext sc = null)
{
vars.Add(_variant);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class variant_types
{
public variant_types(variant_type _variant_type, SourceContext sc = null)
{
Add(_variant_type, sc);
}
public variant_types Add(variant_type _variant_type, SourceContext sc = null)
{
vars.Add(_variant_type);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class procedure_call
@ -1208,47 +856,17 @@ namespace PascalABCCompiler.SyntaxTree
public partial class case_variants
{
public case_variants(case_variant _case_variant, SourceContext sc = null)
{
Add(_case_variant, sc);
}
public case_variants Add(case_variant _case_variant, SourceContext sc = null)
{
variants.Add(_case_variant);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class var_def_list_for_record
{
public var_def_list_for_record(var_def_statement _var_def_statement, SourceContext sc = null)
{
Add(_var_def_statement, sc);
}
public var_def_list_for_record Add(var_def_statement _var_def_statement, SourceContext sc = null)
{
vars.Add(_var_def_statement);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class property_parameter_list
{
public property_parameter_list(property_parameter _property_parameter, SourceContext sc = null)
{
Add(_property_parameter, sc);
}
public property_parameter_list Add(property_parameter _property_parameter, SourceContext sc = null)
{
parameters.Add(_property_parameter);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class initfinal_part
@ -1278,25 +896,11 @@ namespace PascalABCCompiler.SyntaxTree
public partial class exception_handler_list
{
public exception_handler_list(exception_handler _exception_handler, SourceContext sc = null)
{
Add(_exception_handler, sc);
}
public exception_handler_list Add(exception_handler _exception_handler, SourceContext sc = null)
{
handlers.Add(_exception_handler);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class named_type_reference_list
{
public named_type_reference_list(named_type_reference _named_type_reference, SourceContext sc = null)
{
Add(_named_type_reference, sc);
}
public named_type_reference_list(string name)
{
Add(new named_type_reference(name));
@ -1306,13 +910,7 @@ namespace PascalABCCompiler.SyntaxTree
Add(new named_type_reference(name1));
Add(new named_type_reference(name2));
}
public named_type_reference_list Add(named_type_reference _named_type_reference, SourceContext sc = null)
{
types.Add(_named_type_reference);
if (sc != null)
source_context = sc;
return this;
}
public override string ToString()
{
return string.Join(",", this.types.Select(x => x.ToString()).ToArray());
@ -1326,19 +924,6 @@ namespace PascalABCCompiler.SyntaxTree
foreach (var ntr in names.Split(',').Select(s => new named_type_reference(s)))
Add(ntr);
}
public template_param_list(type_definition _type_definition, SourceContext sc = null)
{
Add(_type_definition, sc);
}
public template_param_list Add(type_definition _type_definition, SourceContext sc = null)
{
params_list.Add(_type_definition);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class int64_const
@ -1373,32 +958,12 @@ namespace PascalABCCompiler.SyntaxTree
public partial class where_type_specificator_list
{
public where_type_specificator_list(type_definition _type_definition, SourceContext sc = null)
{
Add(_type_definition, sc);
}
public where_type_specificator_list Add(type_definition _type_definition, SourceContext sc = null)
{
defs.Add(_type_definition);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class where_definition_list
{
public where_definition_list(where_definition _where_definition, SourceContext sc = null)
{
Add(_where_definition, sc);
}
public where_definition_list Add(where_definition _where_definition, SourceContext sc = null)
{
defs.Add(_where_definition);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class var_statement
@ -1441,77 +1006,27 @@ namespace PascalABCCompiler.SyntaxTree
public partial class enumerator_list
{
public enumerator_list(enumerator _enumerator, SourceContext sc = null)
{
Add(_enumerator, sc);
}
public enumerator_list Add(enumerator _enumerator, SourceContext sc = null)
{
enumerators.Add(_enumerator);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class type_definition_attr_list
{
public type_definition_attr_list(type_definition_attr _type_definition_attr, SourceContext sc = null)
{
Add(_type_definition_attr, sc);
}
public type_definition_attr_list Add(type_definition_attr _type_definition_attr, SourceContext sc = null)
{
attributes.Add(_type_definition_attr);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class compiler_directive_list
{
public compiler_directive_list(compiler_directive _compiler_directive, SourceContext sc = null)
{
Add(_compiler_directive, sc);
}
public compiler_directive_list Add(compiler_directive _compiler_directive, SourceContext sc = null)
{
directives.Add(_compiler_directive);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class documentation_comment_list
{
public documentation_comment_list(documentation_comment_section _documentation_comment_section, SourceContext sc = null)
{
Add(_documentation_comment_section, sc);
}
public documentation_comment_list Add(documentation_comment_section _documentation_comment_section, SourceContext sc = null)
{
sections.Add(_documentation_comment_section);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class documentation_comment_section
{
public documentation_comment_section(documentation_comment_tag _documentation_comment_tag, SourceContext sc = null)
{
Add(_documentation_comment_tag, sc);
}
public documentation_comment_section Add(documentation_comment_tag _documentation_comment_tag, SourceContext sc = null)
{
tags.Add(_documentation_comment_tag);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class bracket_expr
@ -1524,32 +1039,12 @@ namespace PascalABCCompiler.SyntaxTree
public partial class simple_attribute_list
{
public simple_attribute_list(attribute _attribute, SourceContext sc = null)
{
Add(_attribute, sc);
}
public simple_attribute_list Add(attribute _attribute, SourceContext sc = null)
{
attributes.Add(_attribute);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class attribute_list
{
public attribute_list(simple_attribute_list _simple_attribute_list, SourceContext sc = null)
{
Add(_simple_attribute_list, sc);
}
public attribute_list Add(simple_attribute_list _simple_attribute_list, SourceContext sc = null)
{
attributes.Add(_simple_attribute_list);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class function_lambda_definition
@ -1597,13 +1092,7 @@ namespace PascalABCCompiler.SyntaxTree
public partial class name_assign_expr_list
{
public name_assign_expr_list Add(name_assign_expr ne, SourceContext sc = null)
{
name_expr.Add(ne);
if (sc != null)
source_context = sc;
return this;
}
}
public partial class unnamed_type_object
@ -1679,17 +1168,7 @@ namespace PascalABCCompiler.SyntaxTree
public partial class uses_closure
{
public uses_closure(uses_list st, SourceContext sc)
{
Add(st, sc);
}
public uses_closure Add(uses_list ul, SourceContext sc = null)
{
listunitsections.Add(ul);
if (sc != null)
source_context = sc;
return this;
}
}

BIN
SyntaxTree/tree/tree.nin
View file

Binary file not shown.

44
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -1868,6 +1868,7 @@ const
BAD_TYPE_IN_RUNTIMESIZEOF = 'Bad Type in RunTimeSizeOf';
PARAMETER_COUNT_MUST_BE_GREATER_0 = 'Параметр count должен быть > 0!!Parameter count must be > 0';
PARAMETER_COUNT_MUST_BE_GREATER_1 = 'Параметр count должен быть > 1!!Parameter count must be > 1';
PARAMETER_COUNT_MUST_BE_NOT_EQUAL_0 = 'Параметр step не может быть равен 0!!The step parameter must be not equal to 0';
// -----------------------------------------------------
// WINAPI
@ -8046,13 +8047,52 @@ end;
/// Возвращает срез последовательности от номера from с шагом step
function Slice<T>(Self: sequence of T; from,step: integer): sequence of T; extensionmethod;
begin
Result := Self.Skip(from).Where((x,i)->i mod step = 0);
if step=0 then
raise new ArgumentException(GetTranslation(PARAMETER_COUNT_MUST_BE_NOT_EQUAL_0));
if step<0 then
begin
if from<0 then
Result := Self.Take(0)
else
begin
step := -step;
var bb := from mod step;
Result := Self.Skip(bb).Where((x,i)->(i mod step = 0) and (i<=from-bb)).Reverse;
end;
end
else
if from<=0 then
Result := Self.Where((x,i)->(i-from) mod step = 0)
else Result := Self.Skip(from).Where((x,i)->i mod step = 0);
end;
/// Возвращает срез последовательности от номера from с шагом step длины не более count
function Slice<T>(Self: sequence of T; from,step,count: integer): sequence of T; extensionmethod;
begin
Result := Self.Skip(from).Where((x,i)->i mod step = 0).Take(count);
if step=0 then
raise new ArgumentException(GetTranslation(PARAMETER_COUNT_MUST_BE_NOT_EQUAL_0));
if step<0 then
begin
if from<0 then
Result := Self.Take(0)
else
begin
step := -step;
var bb := from - (count - 1)*step;
if bb<0 then
bb := bb mod step;
if bb < 0 then
bb += step;
Result := Self.Skip(bb).Where((x,i)->(i mod step = 0) and (i<=from-bb)).Reverse;
end;
end
else
if from<0 then
begin
count -= abs(from+1) div step + 1;
Result := Self.Where((x,i)->(i-from) mod step = 0).Take(count)
end
else Result := Self.Skip(from).Where((x,i)->i mod step = 0).Take(count);
end;
// -----------------------------------------------------

4
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -11608,6 +11608,8 @@ namespace PascalABCCompiler.TreeConverter
{
if (cnfn.parameters.Count != 1)
AddError(new SimpleSemanticError(cnfn.loc,"EXTENSION_METHODS_MUST_HAVE_LEAST_ONE_PARAMETER"));
if (cnfn.ConnectedToType == null)
AddError(new SimpleSemanticError(cnfn.loc, "OPERATOR_SHOULD_BE_EXTENSION_METHOD"));
if (!convertion_data_and_alghoritms.eq_type_nodes(tn, cnfn.ConnectedToType) && !convertion_data_and_alghoritms.eq_type_nodes(cnfn.ConnectedToType as type_node, cnfn.parameters[0].type))
{
AddError(get_location(_function_header.return_type), "RETURN_VALUE_SHOULD_HAVE_TYPE_{0}", (cnfn.ConnectedToType as type_node).PrintableName);
@ -18924,7 +18926,7 @@ namespace PascalABCCompiler.TreeConverter
var synto = new SyntaxTree.semantic_addr_value(semto);
// count = (abs(to-from)-1) div abs(step) + 1 - нет
// count = (to-from+step-1) div step
// count = (to-from+step-sign(step)) div step
SyntaxTree.expression ex = new bin_expr(synto, synfrom, Operators.Minus);
//ex = new method_call(new ident("abs"), new expression_list(ex));
//ex = new bin_expr(ex, absstep, Operators.IntegerDivision);

275
Utils/NodesGeneratorNew/NodeGenerator.cs
View file

@ -241,7 +241,144 @@ namespace NodeGenerator
}
";
public static string change_word(string where,string from,string to)
// Шаблоны кода для узлов, содержащих список
// Методы
// переменные шаблона:
// list_name имя поля, типа List
// list_element_type тип элементов списка
// node_name название узла
public static readonly string list_add_many_method =
@" public void AddMany(params list_element_type[] els)
{
list_name.AddRange(els);
}
";
public static readonly string list_remove_method =
@" public bool Remove(list_element_type el)
{
return list_name.Remove(el);
}
";
public static readonly string list_find_index_method =
@" private int FindIndex(list_element_type el)
{
var ind = list_name.FindIndex(x => x == el);
if (ind == -1)
throw new Exception(string.Format(""У списка {0} не найден элемент {1} среди дочерних\n"", this, el));
return ind;
}
";
public static readonly string list_replace_method =
@" public void Replace(list_element_type el, list_element_type newel)
{
list_name[FindIndex(el)] = newel;
}
";
public static readonly string list_replace_many_method =
@" public void Replace(list_element_type el, IEnumerable<list_element_type> newels)
{
var ind = FindIndex(el);
list_name.RemoveAt(ind);
list_name.InsertRange(ind, newels);
}
";
public static readonly string list_insert_after_method =
@" public void InsertAfter(list_element_type el, list_element_type newel)
{
list_name.Insert(FindIndex(el) + 1, newel);
}
";
public static readonly string list_insert_before_method =
@" public void InsertBefore(list_element_type el, list_element_type newel)
{
list_name.Insert(FindIndex(el), newel);
}
";
public static readonly string list_insert_after_many_method =
@" public void InsertAfter(list_element_type el, IEnumerable<list_element_type> newels)
{
list_name.InsertRange(FindIndex(el) + 1, newels);
}
";
public static readonly string list_insert_before_many_method =
@" public void InsertBefore(list_element_type el, IEnumerable<list_element_type> newels)
{
list_name.InsertRange(FindIndex(el), newels);
}
";
public static readonly string list_add_first_method =
@" public void AddFirst(list_element_type el)
{
list_name.Insert(0, el);
}
";
public static readonly string list_add_first_many_method =
@" public void AddFirst(IEnumerable<list_element_type> els)
{
list_name.InsertRange(0, els);
}
";
public static readonly string list_add_method =
@" public node_name Add(list_element_type elem, SourceContext sc = null)
{
list_name.Add(elem);
if (sc != null)
source_context = sc;
return this;
}
";
public static readonly string[] list_methods =
{
list_add_method,
list_add_first_method,
list_add_first_many_method,
list_add_many_method,
list_find_index_method,
list_insert_after_method,
list_insert_after_many_method,
list_insert_before_method,
list_insert_before_many_method,
list_remove_method,
list_replace_method,
list_replace_many_method
};
// !Методы
// Конструкторы
// переменные шаблона:
// list_name имя поля, типа List
// list_element_type тип элементов списка
// node_name имя узла
public static readonly string list_one_element_constructor =
@" public node_name(list_element_type elem, SourceContext sc = null)
{
Add(elem, sc);
}
";
public static readonly string[] list_constructors =
{
list_one_element_constructor
};
// !Конструкторы
// Свойства
public static readonly string[] list_properties;
// !Свойства
// !Шаблоны кода для узлов, содержащих список
public static string change_word(string where,string from,string to)
{
Regex rg=new Regex(from);
return rg.Replace(where,to);
@ -259,9 +396,26 @@ namespace NodeGenerator
where=change_word(where,sr);
}
return where;
}
}
public static string create_property(string property_type,string property_name,string field_name,string help_context)
/// <summary>
/// Производит замены в списке строк
/// </summary>
/// <param name="list">Список строк, в которых необходимо произвести замену</param>
/// <param name="replacements">Список замен</param>
/// <returns>Результат замен</returns>
public static string[] change_words_in_list(string[] list, params string_repl[] replacements)
{
string[] result = new string[list.Count()];
for (int i = 0; i < list.Count(); ++i)
result[i] = change_words(list[i], replacements);
return result;
}
public static string create_property(string property_type,string property_name,string field_name,string help_context)
{
return change_words(prop_template,new string_repl("property_type",property_type),
new string_repl("property_name",property_name),new string_repl("field_name",field_name),
@ -283,9 +437,53 @@ namespace NodeGenerator
public static string create_simple_constructor(string class_name)
{
return change_words(simple_constructor_template,new string_repl("class_name",class_name));
}
}
}
/// <summary>
/// Генерирует конструкторы для списков, используя <see cref="list_constructors"/>
/// </summary>
/// <param name="list_field_name">Название поля-списка</param>
/// <param name="list_elem_type">Тип элементов списка</param>
/// <param name="node_name">Название синтаксического узла</param>
/// <returns>Код конструкторов</returns>
public static string generate_list_constructors(string list_field_name, string list_elem_type, string node_name)
{
// Для всех шаблонов конструкторов подставляем значения переменных шаблона
string[] constructors = change_words_in_list(list_constructors,
new string_repl("list_name", list_field_name),
new string_repl("list_element_type", list_elem_type),
new string_repl("node_name", node_name));
return string.Join(Environment.NewLine, constructors);
}
/// <summary>
/// Генерирует методы для списков, используя <see cref="list_methods"/>
/// </summary>
/// <param name="list_field_name">Название поля-списка</param>
/// <param name="list_elem_type">Тип элементов списка</param>
/// <param name="node_name">Название синтаксического узла</param>
/// <returns>Код методов</returns>
public static string generate_list_methods(string list_field_name, string list_elem_type, string node_name)
{
string[] methods = change_words_in_list(list_methods,
new string_repl("list_name", list_field_name),
new string_repl("list_element_type", list_elem_type),
new string_repl("node_name", node_name));
return string.Join(Environment.NewLine, methods);
}
/// <summary>
/// Генерирует свойства для списков, используя <see cref="list_properties"/>
/// </summary>
/// <returns>Код свойств</returns>
public static string generate_list_properties()
{
throw new NotImplementedException();
}
}
[Serializable]
public class HelpContext
@ -2921,7 +3119,66 @@ namespace NodeGenerator
}
//\ssyy
public void generate_code(StreamWriter sw,HelpStorage hst)
// !Генерация кода для узлов, содержащих список
/// <summary>
/// Генерация методов для узлов, содержащих список наследников syntax_tree_node (если такой список есть)
/// </summary>
/// <param name="sw">Writer потока, в который добавляется сгенерированный код</param>
private void generate_list_methods(StreamWriter sw)
{
// Генерируем методы только для одного поля-списка
// Получаем первый список узлов-наследников syntax_tree_node
var list_fields = subnodes.OfType<simple_element>().Where(field => field.val_field_type_name.StartsWith("List<"));
simple_element list_field = null;
if (list_fields.Count() > 0)
list_field = list_fields.First();
// Записываем код методов, если узел найден
if (list_field != null)
{
sw.WriteLine(text_consts.tab2 + "// Методы списка");
sw.WriteLine(text_consts.generate_list_methods(list_field.field_name, list_field.list_type, this.node_name));
sw.WriteLine(text_consts.tab2 + "// Окончание методов списка");
}
}
/// <summary>
/// Генерация конструкторов для узлов, содержащих список наследников syntax_tree_node (если такой список есть)
/// </summary>
/// <param name="sw">Writer потока, в который добавляется сгенерированный код</param>
private void generate_list_constructors(StreamWriter sw)
{
// Генерируем конструкторы только для одного поля-списка
// Получаем первый список узлов-наследников syntax_tree_node
var list_fields = subnodes.OfType<simple_element>().Where(field => field.val_field_type_name.StartsWith("List<"));
simple_element list_field = null;
if (list_fields.Count() > 0)
list_field = list_fields.First();
// Записываем код методов, если узел найден
if (list_field != null)
{
sw.WriteLine(text_consts.tab2 + "// Конструкторы списка");
sw.WriteLine(text_consts.generate_list_constructors(list_field.field_name, list_field.list_type, this.node_name));
sw.WriteLine(text_consts.tab2 + "// Окончание конструкторов списка");
}
}
/// <summary>
/// Генерация конструкторов для узлов, содержащих список наследников syntax_tree_node (если такой список есть)
/// </summary>
/// <param name="sw">Writer потока, в который добавляется сгенерированный код</param>
private void generate_list_properties(StreamWriter sw)
{
// TODO: реализовать генерацию свойств
//sw.WriteLine(text_consts.generate_list_properties());
}
// !Генерация кода для узлов, содержащих список
public void generate_code(StreamWriter sw,HelpStorage hst)
{
//sw.WriteLine();
@ -2962,6 +3219,8 @@ namespace NodeGenerator
generate_big_constructor_code(sw, true, true);
}
generate_list_constructors(sw);
sw.WriteLine();
foreach (node_field_info nfi in _subnodes)
{
@ -2979,6 +3238,8 @@ namespace NodeGenerator
if (_subnodes.Count>0)
sw.WriteLine();
generate_list_properties(sw);
foreach (method_info mi in _methods)
{
mi.generate_code(sw, this, hst);
@ -2987,6 +3248,8 @@ namespace NodeGenerator
if (_methods.Count > 0)
sw.WriteLine();
generate_list_methods(sw);
generate_subnodes_number_property(sw);
generate_indexer(sw);

BIN
bin/Lib/PABCRtl.dll
View file

Binary file not shown.

BIN
bin/PT4/Lib/PT4ExamBegin_ru.dll
View file

Binary file not shown.

BIN
bin/PT4/Lib/PT4ExamCheck_ru.dll
View file

Binary file not shown.

BIN
bin/PT4/Lib/PT4ExamTaskC_ru.dll
View file

Binary file not shown.