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

fix #1941

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2019-05-18 00:40:21 +03:00
parent 4d547d9af3
commit 333f76cd68
8 changed files with 18 additions and 17 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 = "2055"; public const string Revision = "2062";
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 @@
%MINOR%=4
%REVISION%=2055
%COREVERSION%=2 %COREVERSION%=2
%REVISION%=2062
%MINOR%=4
%MAJOR%=3 %MAJOR%=3

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.4.2.2055' !define VERSION '3.4.2.2062'

6
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -7968,8 +7968,8 @@ function StrToReal(s: string) := Convert.ToDouble(s, nfi);
function StrToFloat(s: string) := StrToReal(s); function StrToFloat(s: string) := StrToReal(s);
function TryStrToInt64(s: string; var value: int64) := int64.TryParse(s, value); function TryStrToInt64(s: string; var value: int64) := int64.TryParse(s, value);
function TryStrToReal(s: string; var value: real) := real.TryParse(s,System.Globalization.NumberStyles.Float,new Globalization.NumberFormatInfo,value); function TryStrToReal(s: string; var value: real) := real.TryParse(s,System.Globalization.NumberStyles.Float,new System.Globalization.NumberFormatInfo,value);
function TryStrToSingle(s: string; var value: single) := single.TryParse(s,System.Globalization.NumberStyles.Float,new Globalization.NumberFormatInfo,value); function TryStrToSingle(s: string; var value: single) := single.TryParse(s,System.Globalization.NumberStyles.Float,new System.Globalization.NumberFormatInfo,value);
function TryStrToFloat(s: string; var value: real) := TryStrToReal(s, value); function TryStrToFloat(s: string; var value: real) := TryStrToReal(s, value);
function TryStrToFloat(s: string; var value: single) := TryStrToSingle(s, value); function TryStrToFloat(s: string; var value: single) := TryStrToSingle(s, value);
@ -11562,7 +11562,7 @@ var
function ExecuteAssemlyIsDll: boolean; function ExecuteAssemlyIsDll: boolean;
begin begin
Result := not __from_dll and (IO.Path.GetExtension(System.Reflection.Assembly.GetExecutingAssembly.ManifestModule.FullyQualifiedName).ToLower = '.dll'); Result := not __from_dll and (System.IO.Path.GetExtension(System.Reflection.Assembly.GetExecutingAssembly.ManifestModule.FullyQualifiedName).ToLower = '.dll');
end; end;
function IsUnix: boolean; function IsUnix: boolean;

6
TestSuite/symbol_table_test.pas
View file

@ -1,4 +1,4 @@
//winonly //winonly
{$reference 'PresentationFramework.dll'} {$reference 'PresentationFramework.dll'}
{$reference 'WindowsBase.dll'} {$reference 'WindowsBase.dll'}
{$reference 'PresentationCore.dll'} {$reference 'PresentationCore.dll'}
@ -6,9 +6,9 @@
uses System, System.Windows, System.Collections, System.Collections.Generic; uses System, System.Windows, System.Collections, System.Collections.Generic;
begin begin
var lst: Generic.List<integer> := new System.Collections.Generic.List<integer>(); var lst: System.Collections.Generic.List<integer> := new System.Collections.Generic.List<integer>();
Convert.ToInt32('23'); Convert.ToInt32('23');
var ic: System.Windows.Input.ICommand; var ic: System.Windows.Input.ICommand;
var ic2: Input.ICommand; var ic2: System.Windows.Input.ICommand;
end. end.

4
TestSuite/with2.pas
View file

@ -7,11 +7,11 @@
begin begin
assert(CurrentDirectory = System.Environment.CurrentDirectory); assert(CurrentDirectory = System.Environment.CurrentDirectory);
end; end;
with System.Runtime.InteropServices do with System.Runtime.InteropServices, System.Runtime.InteropServices.Expando do
begin begin
var hnd: GCHandle; var hnd: GCHandle;
var hnd2: System.Runtime.InteropServices.GCHandle; var hnd2: System.Runtime.InteropServices.GCHandle;
var o: Expando.IExpando; var o: IExpando;
assert(hnd.GetType = hnd2.GetType); assert(hnd.GetType = hnd2.GetType);
end; end;
end. end.

5
TreeConverter/NetWrappers/NetHelper.cs
View file

@ -447,7 +447,8 @@ namespace PascalABCCompiler.NetHelper
//if (namespaces[s] == null) ns_ht.Add(s,s); //if (namespaces[s] == null) ns_ht.Add(s,s);
ns_ht[s] = s; ns_ht[s] = s;
namespaces[s] = t; namespaces[s] = t;
if (pos != -1) // SSM 17.05.19 Пробую запретить uses Reflection: https://github.com/pascalabcnet/pascalabcnet/issues/1941
/*if (pos != -1)
{ {
string[] sub_ns_arr = s.Split('.'); string[] sub_ns_arr = s.Split('.');
string sub_ns_str = sub_ns_arr[sub_ns_arr.Length - 1]; string sub_ns_str = sub_ns_arr[sub_ns_arr.Length - 1];
@ -459,7 +460,7 @@ namespace PascalABCCompiler.NetHelper
sub_ns_str = sub_ns_arr[ind] + "." + sub_ns_str; sub_ns_str = sub_ns_arr[ind] + "." + sub_ns_str;
ind--; ind--;
} }
} }*/
while (pos != -1) while (pos != -1)
{ {
s = s.Substring(0, pos); s = s.Substring(0, pos);

6
bin/Lib/PABCSystem.pas
View file

@ -7968,8 +7968,8 @@ function StrToReal(s: string) := Convert.ToDouble(s, nfi);
function StrToFloat(s: string) := StrToReal(s); function StrToFloat(s: string) := StrToReal(s);
function TryStrToInt64(s: string; var value: int64) := int64.TryParse(s, value); function TryStrToInt64(s: string; var value: int64) := int64.TryParse(s, value);
function TryStrToReal(s: string; var value: real) := real.TryParse(s,System.Globalization.NumberStyles.Float,new Globalization.NumberFormatInfo,value); function TryStrToReal(s: string; var value: real) := real.TryParse(s,System.Globalization.NumberStyles.Float,new System.Globalization.NumberFormatInfo,value);
function TryStrToSingle(s: string; var value: single) := single.TryParse(s,System.Globalization.NumberStyles.Float,new Globalization.NumberFormatInfo,value); function TryStrToSingle(s: string; var value: single) := single.TryParse(s,System.Globalization.NumberStyles.Float,new System.Globalization.NumberFormatInfo,value);
function TryStrToFloat(s: string; var value: real) := TryStrToReal(s, value); function TryStrToFloat(s: string; var value: real) := TryStrToReal(s, value);
function TryStrToFloat(s: string; var value: single) := TryStrToSingle(s, value); function TryStrToFloat(s: string; var value: single) := TryStrToSingle(s, value);
@ -11562,7 +11562,7 @@ var
function ExecuteAssemlyIsDll: boolean; function ExecuteAssemlyIsDll: boolean;
begin begin
Result := not __from_dll and (IO.Path.GetExtension(System.Reflection.Assembly.GetExecutingAssembly.ManifestModule.FullyQualifiedName).ToLower = '.dll'); Result := not __from_dll and (System.IO.Path.GetExtension(System.Reflection.Assembly.GetExecutingAssembly.ManifestModule.FullyQualifiedName).ToLower = '.dll');
end; end;
function IsUnix: boolean; function IsUnix: boolean;