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

UIntPtr добавил к #2168

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2020-03-13 21:47:56 +03:00
parent d31977a285
commit 50e8705a7a
7 changed files with 12 additions and 8 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 = "6"; public const string Minor = "6";
public const string Build = "2"; public const string Build = "2";
public const string Revision = "2383"; public const string Revision = "2385";
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;

2
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=6 %MINOR%=6
%REVISION%=2383 %REVISION%=2385
%COREVERSION%=2 %COREVERSION%=2
%MAJOR%=3 %MAJOR%=3

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.6.2.2383 3.6.2.2385

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.6.2.2383' !define VERSION '3.6.2.2385'

8
SyntaxVisitors/YieldVisitors/CollectClassFieldsVisitor.cs
View file

@ -43,14 +43,14 @@ namespace SyntaxVisitors
if (cd.body == null) if (cd.body == null)
return; return;
var fields = cd.body.class_def_blocks.SelectMany(cm => cm.members.Where(decl => decl is var_def_statement) /*var fields = cd.body.class_def_blocks.SelectMany(cm => cm.members.Where(decl => decl is var_def_statement)
.Select(decl1 => (decl1 as var_def_statement).vars.idents) .Select(decl1 => (decl1 as var_def_statement).vars.idents)
.SelectMany(ids => ids.Select(id => id))); .SelectMany(ids => ids.Select(id => id)));
CollectedFields.UnionWith(fields); CollectedFields.UnionWith(fields);*/
/*foreach (var defs in cd.body.class_def_blocks) foreach (var defs in cd.body.class_def_blocks)
{ {
// Class members // Class members
foreach (var decl in defs.members) foreach (var decl in defs.members)
@ -67,7 +67,7 @@ namespace SyntaxVisitors
} }
} }
} }
}*/ }
} }
} }

2
TestSuite/IntPtrAsLambdaParam.pas
View file

@ -1,4 +1,6 @@
begin begin
var cb: System.Action<System.IntPtr>; var cb: System.Action<System.IntPtr>;
cb := i->exit(); cb := i->exit();
var cb1: System.Action<System.UIntPtr>;
cb1 := i->exit();
end. end.

2
TreeConverter/OpenMP/OpenMP.cs
View file

@ -1264,6 +1264,8 @@ namespace PascalABCCompiler.TreeConverter
return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string(sem_type.name, sem_type.location), sem_type.location); return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string(sem_type.name, sem_type.location), sem_type.location);
else if (sem_type is compiled_type_node ctn1 && ctn1.compiled_type == typeof(System.IntPtr)) else if (sem_type is compiled_type_node ctn1 && ctn1.compiled_type == typeof(System.IntPtr))
return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string("System.IntPtr", sem_type.location), sem_type.location); return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string("System.IntPtr", sem_type.location), sem_type.location);
else if (sem_type is compiled_type_node ctn2 && ctn2.compiled_type == typeof(System.UIntPtr))
return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string("System.UIntPtr", sem_type.location), sem_type.location);
else else
return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string(sem_type.PrintableName, sem_type.location), sem_type.location); return new PascalABCCompiler.SyntaxTree.named_type_reference(get_idents_from_dot_string(sem_type.PrintableName, sem_type.location), sem_type.location);
} }