From d42a4c84a1ee84cabd59c7e1dfc34789195b9fe1 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Tue, 1 Nov 2016 15:39:07 -0700 Subject: [PATCH] Rename IR* -> RazorIR* --- ...tIRBuilder.cs => DefaultRazorIRBuilder.cs} | 16 ++++++------ .../Intermediate/IRBuilder.cs | 23 ---------------- .../Intermediate/IRNode.cs | 20 -------------- .../Intermediate/RazorIRBuilder.cs | 23 ++++++++++++++++ .../{IRDocument.cs => RazorIRDocument.cs} | 14 +++++----- .../Intermediate/RazorIRNode.cs | 20 ++++++++++++++ ...IRNodeVisitor.cs => RazorIRNodeVisitor.cs} | 8 +++--- ...VisitorOfT.cs => RazorIRNodeVisitorOfT.cs} | 8 +++--- .../{IRNodeWalker.cs => RazorIRNodeWalker.cs} | 4 +-- ...erTest.cs => DefaultRazorIRBuilderTest.cs} | 26 +++++++++---------- ...IRBuilderTest.cs => RazorIRBuilderTest.cs} | 6 ++--- ...WalkerTest.cs => RazorIRNodeWalkerTest.cs} | 22 ++++++++-------- 12 files changed, 95 insertions(+), 95 deletions(-) rename src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/{DefaultIRBuilder.cs => DefaultRazorIRBuilder.cs} (79%) delete mode 100644 src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRBuilder.cs delete mode 100644 src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNode.cs create mode 100644 src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRBuilder.cs rename src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/{IRDocument.cs => RazorIRDocument.cs} (57%) create mode 100644 src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNode.cs rename src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/{IRNodeVisitor.cs => RazorIRNodeVisitor.cs} (62%) rename src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/{IRNodeVisitorOfT.cs => RazorIRNodeVisitorOfT.cs} (63%) rename src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/{IRNodeWalker.cs => RazorIRNodeWalker.cs} (78%) rename test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/{DefaultIRBuilderTest.cs => DefaultRazorIRBuilderTest.cs} (79%) rename test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/{IRBuilderTest.cs => RazorIRBuilderTest.cs} (72%) rename test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/{IRNodeWalkerTest.cs => RazorIRNodeWalkerTest.cs} (73%) diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DefaultIRBuilder.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DefaultRazorIRBuilder.cs similarity index 79% rename from src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DefaultIRBuilder.cs rename to src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DefaultRazorIRBuilder.cs index 71cc105d67..78915e5b9f 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DefaultIRBuilder.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DefaultRazorIRBuilder.cs @@ -6,17 +6,17 @@ using System.Collections.Generic; namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate { - internal class DefaultIRBuilder : IRBuilder + internal class DefaultRazorIRBuilder : RazorIRBuilder { - private readonly List _stack; + private readonly List _stack; private int _depth; - public DefaultIRBuilder() + public DefaultRazorIRBuilder() { - _stack = new List(); + _stack = new List(); } - public override IRNode Current + public override RazorIRNode Current { get { @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate } } - public override void Add(IRNode node) + public override void Add(RazorIRNode node) { if (node == null) { @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate Pop(); } - public override IRNode Pop() + public override RazorIRNode Pop() { if (_depth == 0) { @@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate return node; } - public override void Push(IRNode node) + public override void Push(RazorIRNode node) { if (node == null) { diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRBuilder.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRBuilder.cs deleted file mode 100644 index 9df1b17bef..0000000000 --- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate -{ - public abstract class IRBuilder - { - public static IRBuilder Document() - { - var builder = new DefaultIRBuilder(); - builder.Push(new IRDocument()); - return builder; - } - - public abstract IRNode Current { get; } - - public abstract void Add(IRNode node); - - public abstract void Push(IRNode node); - - public abstract IRNode Pop(); - } -} diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNode.cs deleted file mode 100644 index ed596676e8..0000000000 --- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNode.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; - -namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate -{ - public abstract class IRNode - { - internal static readonly IRNode[] EmptyArray = new IRNode[0]; - - public abstract IList Children { get; } - - public abstract IRNode Parent { get; set; } - - public abstract void Accept(IRNodeVisitor visitor); - - public abstract TResult Accept(IRNodeVisitor visitor); - } -} diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRBuilder.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRBuilder.cs new file mode 100644 index 0000000000..3ca31d81a0 --- /dev/null +++ b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRBuilder.cs @@ -0,0 +1,23 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate +{ + public abstract class RazorIRBuilder + { + public static RazorIRBuilder Document() + { + var builder = new DefaultRazorIRBuilder(); + builder.Push(new RazorIRDocument()); + return builder; + } + + public abstract RazorIRNode Current { get; } + + public abstract void Add(RazorIRNode node); + + public abstract void Push(RazorIRNode node); + + public abstract RazorIRNode Pop(); + } +} diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRDocument.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRDocument.cs similarity index 57% rename from src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRDocument.cs rename to src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRDocument.cs index 4cd40c46ba..84f1d65220 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRDocument.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRDocument.cs @@ -5,25 +5,25 @@ using System.Collections.Generic; namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate { - public sealed class IRDocument : IRNode + public sealed class RazorIRDocument : RazorIRNode { // Only allow creation of documents through the builder API because // they can't be nested. - internal IRDocument() + internal RazorIRDocument() { - Children = new List(); + Children = new List(); } - public override IList Children { get; } + public override IList Children { get; } - public override IRNode Parent { get; set; } + public override RazorIRNode Parent { get; set; } - public override void Accept(IRNodeVisitor visitor) + public override void Accept(RazorIRNodeVisitor visitor) { visitor.VisitDocument(this); } - public override TResult Accept(IRNodeVisitor visitor) + public override TResult Accept(RazorIRNodeVisitor visitor) { return visitor.VisitDocument(this); } diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNode.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNode.cs new file mode 100644 index 0000000000..00f6fedd26 --- /dev/null +++ b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNode.cs @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; + +namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate +{ + public abstract class RazorIRNode + { + internal static readonly RazorIRNode[] EmptyArray = new RazorIRNode[0]; + + public abstract IList Children { get; } + + public abstract RazorIRNode Parent { get; set; } + + public abstract void Accept(RazorIRNodeVisitor visitor); + + public abstract TResult Accept(RazorIRNodeVisitor visitor); + } +} diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeVisitor.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeVisitor.cs similarity index 62% rename from src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeVisitor.cs rename to src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeVisitor.cs index 8e5b1df86c..4fcd13f3a5 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeVisitor.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeVisitor.cs @@ -3,18 +3,18 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate { - public abstract class IRNodeVisitor + public abstract class RazorIRNodeVisitor { - public virtual void Visit(IRNode node) + public virtual void Visit(RazorIRNode node) { node.Accept(this); } - public virtual void VisitDefault(IRNode node) + public virtual void VisitDefault(RazorIRNode node) { } - public virtual void VisitDocument(IRDocument node) + public virtual void VisitDocument(RazorIRDocument node) { VisitDefault(node); } diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeVisitorOfT.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeVisitorOfT.cs similarity index 63% rename from src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeVisitorOfT.cs rename to src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeVisitorOfT.cs index 9fa0e1a246..21f9ec8fd1 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeVisitorOfT.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeVisitorOfT.cs @@ -3,19 +3,19 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate { - public abstract class IRNodeVisitor + public abstract class RazorIRNodeVisitor { - public virtual TResult Visit(IRNode node) + public virtual TResult Visit(RazorIRNode node) { return node.Accept(this); } - public virtual TResult VisitDefault(IRNode node) + public virtual TResult VisitDefault(RazorIRNode node) { return default(TResult); } - public virtual TResult VisitDocument(IRDocument node) + public virtual TResult VisitDocument(RazorIRDocument node) { return VisitDefault(node); } diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeWalker.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeWalker.cs similarity index 78% rename from src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeWalker.cs rename to src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeWalker.cs index 2ea7a60224..0620d5fd07 100644 --- a/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeWalker.cs +++ b/src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeWalker.cs @@ -3,9 +3,9 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate { - public abstract class IRNodeWalker : IRNodeVisitor + public abstract class RazorIRNodeWalker : RazorIRNodeVisitor { - public override void VisitDefault(IRNode node) + public override void VisitDefault(RazorIRNode node) { var children = node.Children; for (var i = 0; i < node.Children.Count; i++) diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultIRBuilderTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultRazorIRBuilderTest.cs similarity index 79% rename from test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultIRBuilderTest.cs rename to test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultRazorIRBuilderTest.cs index 7395be5a6b..834cef8299 100644 --- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultIRBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultRazorIRBuilderTest.cs @@ -8,13 +8,13 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate { - public class DefaultIRBuilderTest + public class DefaultRazorIRBuilderTest { [Fact] public void Ctor_CreatesEmptyBuilder() { // Arrange & Act - var builder = new DefaultIRBuilder(); + var builder = new DefaultRazorIRBuilder(); var current = builder.Current; // Assert @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate public void Push_WhenEmpty_AddsNode() { // Arrange - var builder = new DefaultIRBuilder(); + var builder = new DefaultRazorIRBuilder(); var node = new BasicIRNode(); // Act @@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate public void Push_WhenNonEmpty_SetsUpParentAndChild() { // Arrange - var builder = new DefaultIRBuilder(); + var builder = new DefaultRazorIRBuilder(); var parent = new BasicIRNode(); builder.Push(parent); @@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate public void Pop_ThrowsWhenEmpty() { // Arrange - var builder = new DefaultIRBuilder(); + var builder = new DefaultRazorIRBuilder(); // Act & Assert ExceptionAssert.Throws( @@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate public void Pop_SingleNodeDepth_RemovesAndReturnsNode() { // Arrange - var builder = new DefaultIRBuilder(); + var builder = new DefaultRazorIRBuilder(); var node = new BasicIRNode(); builder.Push(node); @@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate public void Pop_MultipleNodeDepth_RemovesAndReturnsNode() { // Arrange - var builder = new DefaultIRBuilder(); + var builder = new DefaultRazorIRBuilder(); var parent = new BasicIRNode(); builder.Push(parent); @@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate public void Add_DoesPushAndPop() { // Arrange - var builder = new DefaultIRBuilder(); + var builder = new DefaultRazorIRBuilder(); var parent = new BasicIRNode(); builder.Push(parent); @@ -125,18 +125,18 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate Assert.Collection(parent.Children, n => Assert.Same(node, n)); } - private class BasicIRNode : IRNode + private class BasicIRNode : RazorIRNode { - public override IList Children { get; } = new List(); + public override IList Children { get; } = new List(); - public override IRNode Parent { get; set; } + public override RazorIRNode Parent { get; set; } - public override void Accept(IRNodeVisitor visitor) + public override void Accept(RazorIRNodeVisitor visitor) { throw new NotImplementedException(); } - public override TResult Accept(IRNodeVisitor visitor) + public override TResult Accept(RazorIRNodeVisitor visitor) { throw new NotImplementedException(); } diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/IRBuilderTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRBuilderTest.cs similarity index 72% rename from test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/IRBuilderTest.cs rename to test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRBuilderTest.cs index 44a919f28a..c14aa27a5e 100644 --- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/IRBuilderTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRBuilderTest.cs @@ -5,16 +5,16 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate { - public class IRBuilderTest + public class RazorIRBuilderTest { [Fact] public void Document_CreatesDocumentNode() { // Arrange & Act - var builder = IRBuilder.Document(); + var builder = RazorIRBuilder.Document(); // Assert - Assert.IsType(builder.Current); + Assert.IsType(builder.Current); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/IRNodeWalkerTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRNodeWalkerTest.cs similarity index 73% rename from test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/IRNodeWalkerTest.cs rename to test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRNodeWalkerTest.cs index 25e66b9432..dfc2f5c6ed 100644 --- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/IRNodeWalkerTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRNodeWalkerTest.cs @@ -7,7 +7,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate { - public class IRNodeWalkerTest + public class RazorIRNodeWalkerTest { [Fact] public void IRNodeWalker_Visit_TraversesEntireGraph() @@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate // Arrange var walker = new DerivedIRNodeWalker(); - var nodes = new IRNode[] + var nodes = new RazorIRNode[] { new BasicIRNode("Root"), new BasicIRNode("Root->A"), @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate new BasicIRNode("Root->C"), }; - var builder = new DefaultIRBuilder(); + var builder = new DefaultRazorIRBuilder(); builder.Push(nodes[0]); builder.Add(nodes[1]); builder.Push(nodes[2]); @@ -43,11 +43,11 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate Assert.Equal(nodes, walker.Visited.ToArray()); } - private class DerivedIRNodeWalker : IRNodeWalker + private class DerivedIRNodeWalker : RazorIRNodeWalker { - public List Visited { get; } = new List(); + public List Visited { get; } = new List(); - public override void VisitDefault(IRNode node) + public override void VisitDefault(RazorIRNode node) { Visited.Add(node); @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate } - private class BasicIRNode : IRNode + private class BasicIRNode : RazorIRNode { public BasicIRNode(string name) { @@ -70,16 +70,16 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate public string Name { get; } - public override IList Children { get; } = new List(); + public override IList Children { get; } = new List(); - public override IRNode Parent { get; set; } + public override RazorIRNode Parent { get; set; } - public override void Accept(IRNodeVisitor visitor) + public override void Accept(RazorIRNodeVisitor visitor) { ((DerivedIRNodeWalker)visitor).VisitBasic(this); } - public override TResult Accept(IRNodeVisitor visitor) + public override TResult Accept(RazorIRNodeVisitor visitor) { throw new NotImplementedException(); }