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

Add instance declaration translation

Browse source
This commit is contained in:
Bogdan Voloshin 2018-04-17 19:07:59 +03:00
parent c4e3ad1b21
commit f4bc14e035
2 changed files with 61 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CodeExamples/TypeclassTranslation.pas
View file

@ -18,7 +18,7 @@
function sum(v1, v2: T): T;
end;
(*
SumTC_Integer = class(SumTC<integer>)
public
constructor();
@ -29,6 +29,12 @@
begin
Result := v1 + v2;
end;
end;*)
SumTC[integer] = instance
function sum(v1, v2: integer): integer;
begin
Result := v1 + v2;
end;
end;
(*
ConceptSingleton<T> = class where T: constructor;
@ -54,7 +60,7 @@ begin
end;
begin
write(Sum3&<integer, SumTC_Integer>(1, 2, 3));
write(Sum3&<integer, SumTC_integer>(1, 2, 3));
end.

78
SyntaxVisitors/TypeclassVisitors/ReplaceTypeclassVisitor.cs
View file

@ -33,17 +33,49 @@ namespace SyntaxVisitors.TypeclassVisitors
}
var instanceName = instanceDeclaration.type_name as typeclass_restriction;
/*
var instances = typeclassInstanceDeclarations[instanceName.name];
var restrictedType = instanceName.restriction_args.params_list[0].ToString();
if (!instances.ContainsKey(restrictedType))
var parents = new named_type_reference_list(new template_type_reference(
instanceName.name, instanceName.restriction_args));
var instanceDefTranslated =
SyntaxTreeBuilder.BuildClassDefinition(
parents,
null, instanceDefinition.body.class_def_blocks.ToArray());
for (int i = 0; i < instanceDefTranslated.body.class_def_blocks.Count; i++)
{
instances.Add(restrictedType, new List<declaration>());
var cm = instanceDefTranslated.body.class_def_blocks[i].members;
for (int j = 0; j < cm.Count; j++)
{
// TODO: or override if implementation exists
(cm[j] as procedure_header)?.proc_attributes.Add(new procedure_attribute("override", proc_attribute.attr_override));
(cm[j] as procedure_definition)?.proc_header.proc_attributes.Add(new procedure_attribute("override", proc_attribute.attr_override));
}
}
foreach (var defBlock in instanceDefinition.body.class_def_blocks)
{
instances[restrictedType].AddRange(defBlock.members);
}*/
// Add constructor
var cm = instanceDefTranslated.body.class_def_blocks[0];
var def = new procedure_definition(
new constructor(),
new statement_list(new empty_statement()));
def.proc_body.Parent = def;
def.proc_header.proc_attributes = new procedure_attributes_list();
cm.Add(def);
}
string typeName = instanceName.name;
for (int i = 0; i < instanceName.restriction_args.Count; i++)
{
typeName += "_" + (instanceName.restriction_args.params_list[i] as named_type_reference).names[0];
}
var typeclassNameTanslated = new ident(typeName);
var instanceDeclTranslated = new type_declaration(typeclassNameTanslated, instanceDefTranslated, instanceDeclaration.source_context);
Replace(instanceDeclaration, instanceDeclTranslated);
visit(instanceDeclTranslated);
return true;
}
@ -79,7 +111,7 @@ namespace SyntaxVisitors.TypeclassVisitors
}
{
// TODO: add constructor
// Add constructor
var cm = typeclassDefTranslated.body.class_def_blocks[0];
var def = new procedure_definition(
new constructor(),
@ -90,8 +122,19 @@ namespace SyntaxVisitors.TypeclassVisitors
cm.Add(def);
}
ident_list templates = RestrictionsToIdentList(typeclassName);
var typeclassNameTanslated = new template_type_name(typeclassName.name, templates, typeclassName.source_context);
var typeclassDeclTranslated = new type_declaration(typeclassNameTanslated, typeclassDefTranslated, typeclassDeclaration.source_context);
Replace(typeclassDeclaration, typeclassDeclTranslated);
visit(typeclassDeclTranslated);
return true;
}
private static ident_list RestrictionsToIdentList(typeclass_restriction typeclassName)
{
var templates = new ident_list();
templates.source_context = typeclassName.restriction_args.source_context;
for (int i = 0; i < typeclassName.restriction_args.Count; i++)
@ -99,24 +142,9 @@ namespace SyntaxVisitors.TypeclassVisitors
templates.Add((typeclassName.restriction_args.params_list[i] as named_type_reference).names[0]);
}
var typeclassNameTanslated = new template_type_name(typeclassName.name, templates, typeclassName.source_context);
Replace(typeclassDeclaration, new type_declaration(typeclassNameTanslated, typeclassDefTranslated, typeclassDeclaration.source_context));
/*
if (typeclassInstanceDeclarations.ContainsKey(typeclassName.name))
{
// AddError
}
else
{
typeclassInstanceDeclarations.Add(typeclassName.name, new Dictionary<string, List<declaration>>());
}*/
return true;
return templates;
}
public override void visit(type_declaration _type_declaration)
{
if (VisitInstanceDeclaration(_type_declaration))