Browse Source

Update XamlX (#15333)

pull/13593/merge
Julien Lebosquain 3 years ago
committed by GitHub
parent
commit
0bf3ffc05b
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 8
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs
  2. 2
      src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github

8
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguage.cs

@ -79,7 +79,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
var emit = new XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> var emit = new XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult>
{ {
ProvideValueTargetPropertyEmitter = XamlIlAvaloniaPropertyHelper.EmitProvideValueTarget, ProvideValueTargetPropertyEmitter = XamlIlAvaloniaPropertyHelper.EmitProvideValueTarget,
ContextTypeBuilderCallback = (b, c) => EmitNameScopeField(rv, typeSystem, b, c) ContextTypeBuilderCallback = definition => EmitNameScopeField(rv, typeSystem, definition)
}; };
return (rv, emit); return (rv, emit);
} }
@ -88,13 +88,13 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
private static void EmitNameScopeField(XamlLanguageTypeMappings mappings, private static void EmitNameScopeField(XamlLanguageTypeMappings mappings,
IXamlTypeSystem typeSystem, IXamlTypeSystem typeSystem,
IXamlTypeBuilder<IXamlILEmitter> typebuilder, IXamlILEmitter constructor) IXamlILContextDefinition<IXamlILEmitter> definition)
{ {
var nameScopeType = typeSystem.FindType("Avalonia.Controls.INameScope"); var nameScopeType = typeSystem.FindType("Avalonia.Controls.INameScope");
var field = typebuilder.DefineField(nameScopeType, var field = definition.TypeBuilder.DefineField(nameScopeType,
ContextNameScopeFieldName, XamlVisibility.Public, false); ContextNameScopeFieldName, XamlVisibility.Public, false);
constructor definition.ConstructorBuilder.Generator
.Ldarg_0() .Ldarg_0()
.Ldarg(1) .Ldarg(1)
.Ldtype(nameScopeType) .Ldtype(nameScopeType)

2
src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github

@ -1 +1 @@
Subproject commit b357355b9df3e781cf194f2f2ce21669d798bb14 Subproject commit 9a9e96da6d9de92755728b053e044e16319ddc94
Loading…
Cancel
Save