Skip to content

Commit 292badc

Browse files
committed
Update: Rename LocalField -> LocalVariable
1 parent 007e338 commit 292badc

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Resolvers/DynamicObjectResolver.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ private static void BuildDeserialize(Type type, ObjectSerializationInfo info, IL
930930
return new DeserializeInfo
931931
{
932932
MemberInfo = member,
933-
LocalField = canOverwrite ? default : il.DeclareLocal(member.Type),
933+
LocalVariable = canOverwrite ? default : il.DeclareLocal(member.Type),
934934
SwitchLabel = il.DefineLabel(),
935935
};
936936
}
@@ -945,7 +945,7 @@ private static void BuildDeserialize(Type type, ObjectSerializationInfo info, IL
945945
return new DeserializeInfo
946946
{
947947
MemberInfo = null,
948-
LocalField = null,
948+
LocalVariable = null,
949949
SwitchLabel = gotoDefault.Value,
950950
};
951951
}
@@ -958,8 +958,8 @@ private static void BuildDeserialize(Type type, ObjectSerializationInfo info, IL
958958
.Select(item => new DeserializeInfo
959959
{
960960
MemberInfo = item,
961-
LocalField = canOverwrite ? default : il.DeclareLocal(item.Type),
962-
LocalIsInitializedField = canOverwrite ? default : il.DeclareLocal(typeof(bool)),
961+
LocalVariable = canOverwrite ? default : il.DeclareLocal(item.Type),
962+
IsInitializedLocalVariable = canOverwrite ? default : il.DeclareLocal(typeof(bool)),
963963
//// SwitchLabel = il.DefineLabel()
964964
})
965965
.ToArray();
@@ -1142,10 +1142,10 @@ private static void EmitDeserializeValue(ILGenerator il, DeserializeInfo info, i
11421142
il.EmitLdloca(localResult);
11431143
}
11441144
}
1145-
else if (info.LocalIsInitializedField != null)
1145+
else if (info.IsInitializedLocalVariable != null)
11461146
{
11471147
il.EmitLdc_I4(1);
1148-
il.EmitStloc(info.LocalIsInitializedField);
1148+
il.EmitStloc(info.IsInitializedLocalVariable);
11491149
}
11501150

11511151
if (emitter != null)
@@ -1208,7 +1208,7 @@ private static void EmitDeserializeValue(ILGenerator il, DeserializeInfo info, i
12081208
}
12091209
else
12101210
{
1211-
il.EmitStloc(info.LocalField);
1211+
il.EmitStloc(info.LocalVariable);
12121212
}
12131213
}
12141214

@@ -1224,7 +1224,7 @@ private static void EmitNewObject(ILGenerator il, Type type, ObjectSerialization
12241224
foreach (var item in members.Where(x => x.MemberInfo != null && x.MemberInfo.IsWritable))
12251225
{
12261226
var skipLabel = il.DefineLabel();
1227-
il.EmitLdloc(item.LocalIsInitializedField);
1227+
il.EmitLdloc(item.IsInitializedLocalVariable);
12281228
il.Emit(OpCodes.Brfalse_S, skipLabel);
12291229

12301230
if (info.IsClass)
@@ -1236,7 +1236,7 @@ private static void EmitNewObject(ILGenerator il, Type type, ObjectSerialization
12361236
il.EmitLdloca(localResult);
12371237
}
12381238

1239-
il.EmitLdloc(item.LocalField);
1239+
il.EmitLdloc(item.LocalVariable);
12401240
item.MemberInfo.EmitStoreValue(il);
12411241

12421242
il.MarkLabel(skipLabel);
@@ -1276,7 +1276,7 @@ private static void EmitNewObject(ILGenerator il, Type type, ObjectSerialization
12761276
il.EmitLdloca(localResult);
12771277
}
12781278

1279-
il.EmitLdloc(item.LocalField);
1279+
il.EmitLdloc(item.LocalVariable);
12801280
item.MemberInfo.EmitStoreValue(il);
12811281
}
12821282

@@ -1288,7 +1288,7 @@ private static void EmitNewObjectConstructorArguments(ILGenerator il, ObjectSeri
12881288
foreach (ObjectSerializationInfo.EmittableMemberAndConstructorParameter item in info.ConstructorParameters)
12891289
{
12901290
DeserializeInfo local = members.First(x => x.MemberInfo == item.MemberInfo);
1291-
il.EmitLdloc(local.LocalField);
1291+
il.EmitLdloc(local.LocalVariable);
12921292

12931293
if (!item.ConstructorParameter.ParameterType.IsValueType && local.MemberInfo.IsValueType)
12941294
{
@@ -1392,9 +1392,9 @@ private class DeserializeInfo
13921392
{
13931393
public ObjectSerializationInfo.EmittableMember MemberInfo { get; set; }
13941394

1395-
public LocalBuilder LocalField { get; set; }
1395+
public LocalBuilder LocalVariable { get; set; }
13961396

1397-
public LocalBuilder LocalIsInitializedField { get; set; }
1397+
public LocalBuilder IsInitializedLocalVariable { get; set; }
13981398

13991399
public Label SwitchLabel { get; set; }
14001400
}

0 commit comments

Comments
 (0)