huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename IR* -> RazorIR*

This commit is contained in:
Ryan Nowak 2016-11-01 15:39:07 -07:00 committed by N. Taylor Mullen
parent d40f6d3151
commit d42a4c84a1
12 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DefaultIRBuilder.cs → src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/DefaultRazorIRBuilder.cs
View File

@ -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<IRNode> _stack;
private readonly List<RazorIRNode> _stack;
private int _depth;
public DefaultIRBuilder()
public DefaultRazorIRBuilder()
{
_stack = new List<IRNode>();
_stack = new List<RazorIRNode>();
}
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)
{

23
src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRBuilder.cs
View File

@ -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();
}
}

20
src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNode.cs
View File

@ -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<IRNode> Children { get; }
public abstract IRNode Parent { get; set; }
public abstract void Accept(IRNodeVisitor visitor);
public abstract TResult Accept<TResult>(IRNodeVisitor<TResult> visitor);
}
}

23
src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRBuilder.cs Normal file
View File

@ -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();
}
}

14
src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRDocument.cs → src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRDocument.cs
View File

@ -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<IRNode>();
Children = new List<RazorIRNode>();
}
public override IList<IRNode> Children { get; }
public override IList<RazorIRNode> 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<TResult>(IRNodeVisitor<TResult> visitor)
public override TResult Accept<TResult>(RazorIRNodeVisitor<TResult> visitor)
{
return visitor.VisitDocument(this);
}

20
src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNode.cs Normal file
View File

@ -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<RazorIRNode> Children { get; }
public abstract RazorIRNode Parent { get; set; }
public abstract void Accept(RazorIRNodeVisitor visitor);
public abstract TResult Accept<TResult>(RazorIRNodeVisitor<TResult> visitor);
}
}

8
src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeVisitor.cs → src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeVisitor.cs
View File

@ -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);
}

8
src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeVisitorOfT.cs → src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeVisitorOfT.cs
View File

@ -3,19 +3,19 @@
namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
{
public abstract class IRNodeVisitor<TResult>
public abstract class RazorIRNodeVisitor<TResult>
{
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);
}

4
src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/IRNodeWalker.cs → src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/RazorIRNodeWalker.cs
View File

@ -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++)

26
test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultIRBuilderTest.cs → test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/DefaultRazorIRBuilderTest.cs
View File

@ -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<InvalidOperationException>(
@ -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<IRNode> Children { get; } = new List<IRNode>();
public override IList<RazorIRNode> Children { get; } = new List<RazorIRNode>();
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<TResult>(IRNodeVisitor<TResult> visitor)
public override TResult Accept<TResult>(RazorIRNodeVisitor<TResult> visitor)
{
throw new NotImplementedException();
}

6
test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/IRBuilderTest.cs → test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRBuilderTest.cs
View File

@ -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<IRDocument>(builder.Current);
Assert.IsType<RazorIRDocument>(builder.Current);
}
}
}

22
test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/IRNodeWalkerTest.cs → test/Microsoft.AspNetCore.Razor.Evolution.Test/Intermediate/RazorIRNodeWalkerTest.cs
View File

@ -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<IRNode> Visited { get; } = new List<IRNode>();
public List<RazorIRNode> Visited { get; } = new List<RazorIRNode>();
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<IRNode> Children { get; } = new List<IRNode>();
public override IList<RazorIRNode> Children { get; } = new List<RazorIRNode>();
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<TResult>(IRNodeVisitor<TResult> visitor)
public override TResult Accept<TResult>(RazorIRNodeVisitor<TResult> visitor)
{
throw new NotImplementedException();
}