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

bug fix #1128

Browse source
This commit is contained in:
miks1965 2018-09-29 12:38:28 +03:00
parent aa453fb155
commit eab0f36b15
8 changed files with 40 additions and 12 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 Major = "3";
public const string Minor = "4"; public const string Minor = "4";
public const string Build = "2"; public const string Build = "2";
public const string Revision = "1803"; public const string Revision = "1804";
public const string MainVersion = Major + "." + Minor; public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=2
%REVISION%=1803
%MINOR%=4 %MINOR%=4
%REVISION%=1804
%COREVERSION%=2
%MAJOR%=3 %MAJOR%=3

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.4.2.1803' !define VERSION '3.4.2.1804'

2
SyntaxTree/tree/TreeHelper.cs
View file

@ -750,6 +750,8 @@ namespace PascalABCCompiler.SyntaxTree
if (parameters != null) if (parameters != null)
sb.Append("(" + parameters.ToString() + ")"); sb.Append("(" + parameters.ToString() + ")");
sb.Append(";"); sb.Append(";");
foreach (var pa in this.proc_attributes.proc_attributes)
sb.Append(" " + pa.ToString() + " ");
return sb.ToString(); return sb.ToString();
} }
} }

6
SyntaxTreeConverters/StandardSyntaxConverter.cs
View file

@ -73,14 +73,14 @@ namespace PascalABCCompiler.SyntaxTreeConverters
cv.ProcessNode(root); cv.ProcessNode(root);
cv.Output(@"Light1.txt");*/ cv.Output(@"Light1.txt");*/
/*try try
{ {
//root.visit(new SimplePrettyPrinterVisitor(@"d:\\zzz4.txt")); root.visit(new SimplePrettyPrinterVisitor(@"d:\\zzz4.txt"));
} }
catch catch
{ {
}*/ }
#endif #endif
return root; return root;

7
SyntaxVisitors/YieldVisitors/ProcessYieldsCapturedVars.cs
View file

@ -223,6 +223,7 @@ namespace SyntaxVisitors
//function_header nfh = ObjectCopier.Clone(fh); //function_header nfh = ObjectCopier.Clone(fh);
function_header nfh = fh.TypedClone(); function_header nfh = fh.TypedClone();
nfh.proc_attributes.proc_attributes.RemoveAll(pat => pat.attribute_type == proc_attribute.attr_override);
//function_header nfh = new function_header(); //function_header nfh = new function_header();
//nfh.name = new method_name(fh.name.meth_name.name); //nfh.name = new method_name(fh.name.meth_name.name);
@ -614,6 +615,8 @@ namespace SyntaxVisitors
//var pdCloned = ObjectCopier.Clone(pd); //var pdCloned = ObjectCopier.Clone(pd);
var pdCloned = (procedure_definition)pd.Clone(); var pdCloned = (procedure_definition)pd.Clone();
pdCloned.proc_header.proc_attributes.proc_attributes.RemoveAll(pat => pat.attribute_type == proc_attribute.attr_override);
pdCloned.has_yield = false; pdCloned.has_yield = false;
@ -658,6 +661,8 @@ namespace SyntaxVisitors
// frninja 05/06/16 - фиксим source_context // frninja 05/06/16 - фиксим source_context
pd.proc_header.name.meth_name.source_context); // = new method_name("<yield_helper_locals_type_detector>" + pd.proc_header.className.meth_name.className); pd.proc_header.name.meth_name.source_context); // = new method_name("<yield_helper_locals_type_detector>" + pd.proc_header.className.meth_name.className);
//pdCloned.proc_header.proc_attributes.proc_attributes.RemoveAll(pat => pat.attribute_type == proc_attribute.attr_override);
InsertHelperMethod(pd, pdCloned); // SSM 13.07.16 - вызов этого метода можно не добавлять InsertHelperMethod(pd, pdCloned); // SSM 13.07.16 - вызов этого метода можно не добавлять
} }
@ -915,7 +920,7 @@ namespace SyntaxVisitors
public override void visit(procedure_definition pd) public override void visit(procedure_definition pd)
{ {
// frninja 14/06/16 - проверяем наличие yield у вложенных методов (и запрещаем ) // frninja 14/06/16 - проверяем наличие yield у вложенных методов (и запрещаем)
CheckInnerMethodsWithYield(pd); CheckInnerMethodsWithYield(pd);
if (!pd.has_yield) if (!pd.has_yield)

17
TestSuite/yield_override.pas Normal file
View file

@ -0,0 +1,17 @@
type
t1=abstract class
public
//i: integer := 1;
function f1:sequence of t1; abstract;
end;
t2=class(t1)
public
function f1:sequence of t1; override;
begin
yield nil;
end;
end;
begin
Assert(t2.Create.f1.First = nil);
end.

12
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -13228,7 +13228,8 @@ namespace PascalABCCompiler.TreeConverter
} }
case SyntaxTree.proc_attribute.attr_forward: case SyntaxTree.proc_attribute.attr_forward:
{ {
if (with_class_name) AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "DIRECTIVE_{0}_NOT_ALLOWED", _procedure_attributes_list.proc_attributes[i].name); if (with_class_name)
AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "DIRECTIVE_{0}_NOT_ALLOWED", _procedure_attributes_list.proc_attributes[i].name);
//(ssyy) В интерфейсах аттрибуты недопустимы //(ssyy) В интерфейсах аттрибуты недопустимы
if (context.converted_type != null && context.converted_type.IsInterface) if (context.converted_type != null && context.converted_type.IsInterface)
{ {
@ -13246,7 +13247,8 @@ namespace PascalABCCompiler.TreeConverter
case SyntaxTree.proc_attribute.attr_virtual: case SyntaxTree.proc_attribute.attr_virtual:
{ {
if (with_class_name) AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "DIRECTIVE_{0}_NOT_ALLOWED", _procedure_attributes_list.proc_attributes[i].name); if (with_class_name)
AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "DIRECTIVE_{0}_NOT_ALLOWED", _procedure_attributes_list.proc_attributes[i].name);
//(ssyy) В интерфейсах аттрибуты недопустимы //(ssyy) В интерфейсах аттрибуты недопустимы
if (context.converted_type != null && context.converted_type.IsInterface) if (context.converted_type != null && context.converted_type.IsInterface)
{ {
@ -13286,7 +13288,8 @@ namespace PascalABCCompiler.TreeConverter
case SyntaxTree.proc_attribute.attr_override: case SyntaxTree.proc_attribute.attr_override:
case SyntaxTree.proc_attribute.attr_reintroduce: case SyntaxTree.proc_attribute.attr_reintroduce:
{ {
if (with_class_name) AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "DIRECTIVE_{0}_NOT_ALLOWED", _procedure_attributes_list.proc_attributes[i].name); if (with_class_name)
AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "DIRECTIVE_{0}_NOT_ALLOWED", _procedure_attributes_list.proc_attributes[i].name);
//(ssyy) В интерфейсах аттрибуты недопустимы //(ssyy) В интерфейсах аттрибуты недопустимы
if (context.converted_type != null && context.converted_type.IsInterface) if (context.converted_type != null && context.converted_type.IsInterface)
{ {
@ -13365,7 +13368,8 @@ namespace PascalABCCompiler.TreeConverter
} }
case SyntaxTree.proc_attribute.attr_abstract: case SyntaxTree.proc_attribute.attr_abstract:
{ {
if (with_class_name) AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "DIRECTIVE_{0}_NOT_ALLOWED", _procedure_attributes_list.proc_attributes[i].name); if (with_class_name)
AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "DIRECTIVE_{0}_NOT_ALLOWED", _procedure_attributes_list.proc_attributes[i].name);
if (context.converted_type != null && context.converted_type.IsInterface) if (context.converted_type != null && context.converted_type.IsInterface)
{ {
AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "ATTRIBUTES_IN_INTERFACE_MEMBER"); AddError(get_location(_procedure_attributes_list.proc_attributes[i]), "ATTRIBUTES_IN_INTERFACE_MEMBER");