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

fix #1050

Browse source
This commit is contained in:
miks1965 2018-08-19 10:55:01 +03:00
parent 6b66e564ed
commit 0fc55fdee5
6 changed files with 11 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 Minor = "4";
public const string Build = "0";
public const string Revision = "1747";
public const string Revision = "1749";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

2
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=0
%REVISION%=1747
%REVISION%=1749
%MINOR%=4
%MAJOR%=3

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.4.0.1747'
!define VERSION '3.4.0.1749'

5
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -6304,7 +6304,10 @@ begin
else
if t = typeof(string) then
begin
Result := f.br.ReadString();
var len := f.br.ReadByte();
var chh := f.br.ReadChars(len);
Result := new string(chh);
if (f is TypedFile) and ((f as TypedFile).offsets <> nil) and ((f as TypedFile).offsets.Length > 0) then
begin
f.br.BaseStream.Seek((f as TypedFile).offsets[ind] - (Result as string).Length, SeekOrigin.Current);

2
TreeConverter/SymbolTable/DSST/SymbolTable.cs
View file

@ -900,7 +900,7 @@ namespace SymbolTable
((to.symbol_kind == symbol_kind.sk_overload_function) && (add.symbol_kind == symbol_kind.sk_overload_function))
||
((to.symbol_kind == symbol_kind.sk_overload_procedure) && (add.symbol_kind == symbol_kind.sk_overload_procedure))
|| to.sym_info != add.sym_info && to.sym_info is PascalABCCompiler.TreeRealization.function_node && add.sym_info is PascalABCCompiler.TreeRealization.function_node && (to.sym_info as PascalABCCompiler.TreeRealization.function_node).is_extension_method && (add.sym_info as PascalABCCompiler.TreeRealization.function_node).is_extension_method
|| to.sym_info != add.sym_info && to.sym_info is PascalABCCompiler.TreeRealization.function_node && add.sym_info is PascalABCCompiler.TreeRealization.function_node /*&& (to.sym_info as PascalABCCompiler.TreeRealization.function_node).is_extension_method*/ && (add.sym_info as PascalABCCompiler.TreeRealization.function_node).is_extension_method
);
}

6
bin/Lib/PABCSystem.pas
View file

@ -6297,7 +6297,7 @@ begin
elem := Activator.CreateInstance(t);
fa := t.GetFields;
for var i := 0 to fa.Length - 1 do
if not fa[i].IsStatic then
if not fa[i].IsStatic and not fa[i].IsLiteral then
fa[i].SetValue(elem, AbstractBinaryFileReadT(f, fa[i].FieldType, ind, in_arr));
Result := elem;
end
@ -6390,7 +6390,7 @@ begin
fa := t.GetFields;
for var i := 0 to fa.Length - 1 do
begin
if not fa[i].IsStatic then
if not fa[i].IsStatic and not fa[i].IsLiteral then
Write(f, fa[i].GetValue(val), true, ind, in_arr);
end;
end
@ -10820,7 +10820,7 @@ begin
fa := t.GetFields;
Result := 0;
for var i := 0 to fa.Length - 1 do
if not fa[i].IsStatic then
if not fa[i].IsStatic and not fa[i].IsLiteral then
Result := Result + RunTimeSizeOf(fa[i].FieldType)
end
else if t = typeof(string) then