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

Merge pull request #3117 from SunSerega/ldnull-ldc0

Browse source 
Замена `Ldnull` на `Ldc_I4_0`
This commit is contained in:
Ivan Bondarev 2024-05-11 16:55:58 +02:00 committed by GitHub
parent a6a25d955d 54514ab9cc
commit 61e5aed5d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NETGenerator/NETGenegratorTools.cs
View file

@ -1,4 +1,4 @@
// Copyright (c) Ivan Bondarev, Stanislav Mikhalkovich (for details please see \doc\copyright.txt)
// Copyright (c) Ivan Bondarev, Stanislav Mikhalkovich (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Collections.Generic;

12
NETGenerator/NETGenerator.cs
View file

@ -1,4 +1,4 @@
// Copyright (c) Ivan Bondarev, Stanislav Mikhalkovich (for details please see \doc\copyright.txt)
// Copyright (c) Ivan Bondarev, Stanislav Mikhalkovich (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
@ -1420,7 +1420,7 @@ namespace PascalABCCompiler.NETGenerator
else if (cnst is IEnumConstNode)
PushIntConst((cnst as IEnumConstNode).constant_value);
else if (cnst is INullConstantNode)
il.Emit(OpCodes.Ldnull);
il.Emit(cnst.type is IRefTypeNode ? OpCodes.Ldc_I4_0 : OpCodes.Ldnull);
}
private void ConvertConstantDefWithInitCall(IConstantDefinitionNode cnst, string name, ITypeNode type, IConstantNode constant_value)
@ -7950,7 +7950,7 @@ namespace PascalABCCompiler.NETGenerator
il.Emit(OpCodes.Ldind_I);
il.Emit(OpCodes.Call, typeof(Marshal).GetMethod("FreeHGlobal", new Type[1] { typeof(IntPtr) }));
il.Emit(OpCodes.Ldarg_0);
il.Emit(OpCodes.Ldnull);
il.Emit(OpCodes.Ldc_I4_0);
il.Emit(OpCodes.Stind_I);
il.Emit(OpCodes.Ret);
mi = helper.AddMethod(func, methodb);
@ -9546,13 +9546,13 @@ namespace PascalABCCompiler.NETGenerator
{
real_parameters[0].visit(this);
il.Emit(OpCodes.Box, helper.GetTypeReference(real_parameters[0].type).tp);
il.Emit(OpCodes.Ldnull);
il.Emit(real_parameters[1].type is IRefTypeNode ? OpCodes.Ldc_I4_0 : OpCodes.Ldnull);
EmitOperator(value);
return;
}
else if (real_parameters[1].type.is_generic_parameter && real_parameters[0] is INullConstantNode)
{
il.Emit(OpCodes.Ldnull);
il.Emit(real_parameters[0].type is IRefTypeNode ? OpCodes.Ldc_I4_0 : OpCodes.Ldnull);
real_parameters[1].visit(this);
il.Emit(OpCodes.Box, helper.GetTypeReference(real_parameters[1].type).tp);
EmitOperator(value);
@ -10934,7 +10934,7 @@ namespace PascalABCCompiler.NETGenerator
//перевод конструкции null
public override void visit(INullConstantNode value)
{
il.Emit(OpCodes.Ldnull);
il.Emit(value.type is IRefTypeNode ? OpCodes.Ldc_I4_0 : OpCodes.Ldnull);
}
struct TmpForCase