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

tests for #1328

Browse source
This commit is contained in:
Ivan Bondarev 2021-07-04 10:49:17 +02:00
parent 2c10c83401
commit fcfab573a3
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
NETGenerator/NETGenerator.cs
View file

@ -9608,6 +9608,9 @@ namespace PascalABCCompiler.NETGenerator
Label false_lbl = il.DefineLabel();
if (copy_string)
{
/*var mcall = new TreeRealization.compiled_static_method_call(TreeRealization.compiled_function_node.get_compiled_method(TypeFactory.StringCopyMethod), null);
mcall.parameters.AddElement(value.array as TreeRealization.expression_node);
ConvertAssignExpr(value.array, mcall);*/
if (value.array is ILocalBlockVariableReferenceNode || value.array is ILocalVariableReferenceNode || value.array is INamespaceVariableReferenceNode)
{
il.Emit(OpCodes.Call, TypeFactory.StringCopyMethod);
@ -9625,9 +9628,14 @@ namespace PascalABCCompiler.NETGenerator
}
else if (value.array is INamespaceVariableReferenceNode)
{
var vi = helper.GetVariable((value.array as ILocalBlockVariableReferenceNode).Variable);
il.Emit(OpCodes.Stloc, vi.lb);
il.Emit(OpCodes.Ldloc, vi.lb);
VarInfo vi = helper.GetVariable((value.array as INamespaceVariableReferenceNode).Variable);
if (vi == null)
{
ConvertGlobalVariable((value.array as INamespaceVariableReferenceNode).variable);
vi = helper.GetVariable((value.array as INamespaceVariableReferenceNode).Variable);
}
il.Emit(OpCodes.Stsfld, vi.fb);
il.Emit(OpCodes.Ldsfld, vi.fb);
}
}

1
TestSuite/stringelem3.pas
View file

@ -8,4 +8,5 @@ begin
p1(s1[2]);
Assert(s<>s1);
Assert(s2<>s1);
assert(s1='1_3');
end.