From 6b8640205fe7a0c601562761dd6f5508ee859931 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 11 May 2019 16:40:47 +0300 Subject: [PATCH] Removed gazillion of compiler warnings --- .../Avalonia.Build.Tasks.csproj | 2 +- .../Avalonia.Markup.Xaml.csproj | 2 +- .../Transformers/AddNameScopeRegistration.cs | 1 - ...olTemplateTargetTypeMetadataTransformer.cs | 12 +++++----- .../AvaloniaXamlIlSelectorTransformer.cs | 24 +++++++++---------- ...amlIlTransitionsTypeMetadataTransformer.cs | 4 ++-- .../Avalonia.Markup.Xaml/XamlIl/xamlil.github | 2 +- 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj index e20dd09cde..582e4499c5 100644 --- a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj +++ b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj @@ -5,7 +5,7 @@ exe false tools - $(DefineConstants);BUILDTASK;XAMLIL_CECIL_INTERNAL + $(DefineConstants);BUILDTASK;XAMLIL_CECIL_INTERNAL;XAMLIL_INTERNAL true NU1605 diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 9ed48b079e..8ce29e5b8e 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -1,7 +1,7 @@  netstandard2.0 - PCL;NETSTANDARD;NETSTANDARD2_0;HAS_TYPE_CONVERTER;HAS_CUSTOM_ATTRIBUTE_PROVIDER; + PCL;NETSTANDARD;NETSTANDARD2_0;HAS_TYPE_CONVERTER;HAS_CUSTOM_ATTRIBUTE_PROVIDER;XAMLIL_INTERNAL false $(DefineConstants);RUNTIME_XAML_CECIL False diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AddNameScopeRegistration.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AddNameScopeRegistration.cs index f9bc440b6b..33056fa3e8 100644 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AddNameScopeRegistration.cs +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AddNameScopeRegistration.cs @@ -51,7 +51,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers class ScopeRegistrationNode : XamlIlAstNode, IXamlIlAstManipulationNode, IXamlIlAstEmitableNode { - private readonly IXamlIlType _targetType; public IXamlIlAstValueNode Value { get; set; } public ScopeRegistrationNode(IXamlIlAstValueNode value) : base(value) { diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs index 15ede5f641..aab43bbd6f 100644 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer.cs @@ -31,7 +31,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers { var parentScope = context.ParentNodes().OfType() .FirstOrDefault(); - if (parentScope?.Type == AvaloniaXamlIlTargetTypeMetadataNode.ScopeType.Style) + if (parentScope?.ScopeType == AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style) targetType = parentScope.TargetType; else if (context.ParentNodes().Skip(1).FirstOrDefault() is XamlIlAstObjectNode directParentNode && templatableBaseType.IsAssignableFrom(directParentNode.Type.GetClrType())) @@ -44,16 +44,16 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers return new AvaloniaXamlIlTargetTypeMetadataNode(on, targetType, - AvaloniaXamlIlTargetTypeMetadataNode.ScopeType.ControlTemplate); + AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.ControlTemplate); } } class AvaloniaXamlIlTargetTypeMetadataNode : XamlIlValueWithSideEffectNodeBase { public IXamlIlAstTypeReference TargetType { get; set; } - public ScopeType Type { get; } + public ScopeTypes ScopeType { get; } - public enum ScopeType + public enum ScopeTypes { Style, ControlTemplate, @@ -61,11 +61,11 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers } public AvaloniaXamlIlTargetTypeMetadataNode(IXamlIlAstValueNode value, IXamlIlAstTypeReference targetType, - ScopeType type) + ScopeTypes type) : base(value, value) { TargetType = targetType; - Type = type; + ScopeType = type; } } } diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs index a7f7603012..aac07f5b6e 100644 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlSelectorTransformer.cs @@ -53,10 +53,10 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers result = new XamlIlTypeSelector(result, typeResolver(@is.Xmlns, @is.TypeName).Type, false); break; case SelectorGrammar.ClassSyntax @class: - result = new XamlIlStringSelector(result, XamlIlStringSelector.Type.Class, @class.Class); + result = new XamlIlStringSelector(result, XamlIlStringSelector.SelectorType.Class, @class.Class); break; case SelectorGrammar.NameSyntax name: - result = new XamlIlStringSelector(result, XamlIlStringSelector.Type.Name, name.Name); + result = new XamlIlStringSelector(result, XamlIlStringSelector.SelectorType.Name, name.Name); break; case SelectorGrammar.PropertySyntax property: { @@ -82,13 +82,13 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers break; } case SelectorGrammar.ChildSyntax child: - result = new XamlIlCombinatorSelector(result, XamlIlCombinatorSelector.Type.Child); + result = new XamlIlCombinatorSelector(result, XamlIlCombinatorSelector.SelectorType.Child); break; case SelectorGrammar.DescendantSyntax descendant: - result = new XamlIlCombinatorSelector(result, XamlIlCombinatorSelector.Type.Descendant); + result = new XamlIlCombinatorSelector(result, XamlIlCombinatorSelector.SelectorType.Descendant); break; case SelectorGrammar.TemplateSyntax template: - result = new XamlIlCombinatorSelector(result, XamlIlCombinatorSelector.Type.Template); + result = new XamlIlCombinatorSelector(result, XamlIlCombinatorSelector.SelectorType.Template); break; case SelectorGrammar.NotSyntax not: result = new XamlIlNotSelector(result, Create(not.Argument, typeResolver)); @@ -123,7 +123,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers return new AvaloniaXamlIlTargetTypeMetadataNode(on, new XamlIlAstClrTypeReference(selector, selector.TargetType, false), - AvaloniaXamlIlTargetTypeMetadataNode.ScopeType.Style); + AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Style); } } @@ -199,15 +199,15 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers class XamlIlStringSelector : XamlIlSelectorNode { public string String { get; set; } - public enum Type + public enum SelectorType { Class, Name } - private Type _type; + private SelectorType _type; - public XamlIlStringSelector(XamlIlSelectorNode previous, Type type, string s) : base(previous) + public XamlIlStringSelector(XamlIlSelectorNode previous, SelectorType type, string s) : base(previous) { _type = type; String = s; @@ -226,15 +226,15 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers class XamlIlCombinatorSelector : XamlIlSelectorNode { - private readonly Type _type; + private readonly SelectorType _type; - public enum Type + public enum SelectorType { Child, Descendant, Template } - public XamlIlCombinatorSelector(XamlIlSelectorNode previous, Type type) : base(previous) + public XamlIlCombinatorSelector(XamlIlSelectorNode previous, SelectorType type) : base(previous) { _type = type; } diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs index 36c5cc2b98..c4136f4824 100644 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/CompilerExtensions/Transformers/AvaloniaXamlIlTransitionsTypeMetadataTransformer.cs @@ -3,7 +3,7 @@ using XamlIl.Transform; namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers { - public class AvaloniaXamlIlTransitionsTypeMetadataTransformer : IXamlIlAstTransformer + class AvaloniaXamlIlTransitionsTypeMetadataTransformer : IXamlIlAstTransformer { public IXamlIlAstNode Transform(XamlIlAstTransformationContext context, IXamlIlAstNode node) { @@ -17,7 +17,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers for (var c = 0; c < pn.Values.Count; c++) { pn.Values[c] = new AvaloniaXamlIlTargetTypeMetadataNode(pn.Values[c], on.Type, - AvaloniaXamlIlTargetTypeMetadataNode.ScopeType.Transitions); + AvaloniaXamlIlTargetTypeMetadataNode.ScopeTypes.Transitions); } } } diff --git a/src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github b/src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github index 2f0a885a7f..560a8efabf 160000 --- a/src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github +++ b/src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github @@ -1 +1 @@ -Subproject commit 2f0a885a7fff4dda8f0372448951f7e59e4d09b7 +Subproject commit 560a8efabf4fe01aa759539b106ec3f5000d267c