more internal

Author: bfarmer67

src/Hyperbee.Expressions/Transformation/AwaitBinder.cs

@@ -6,7 +6,7 @@ namespace Hyperbee.Expressions.Transformation;
 internal delegate TAwaiter AwaitBinderGetAwaiterDelegate<TAwaitable, out TAwaiter>( ref TAwaitable awaitable, bool configureAwait );
 internal delegate TResult AwaitBinderGetResultDelegate<TAwaiter, out TResult>( ref TAwaiter awaiter );
 
-public class AwaitBinder
+internal class AwaitBinder
 {
     public MethodInfo WaitMethod { get; }
     public MethodInfo GetAwaiterMethod { get; }

src/Hyperbee.Expressions/Transformation/LoweringResult.cs

@@ -13,7 +13,7 @@ internal record LoweringResult
 
     public IEnumerable<NodeExpression> Nodes => Scopes.SelectMany( scope => scope.Nodes );
 
-    internal string DebugView
+    internal string DebugView //BF ME - does this still have value?
     {
         get
         {

src/Hyperbee.Expressions/Transformation/LoweringVisitor.cs

@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using System.Linq.Expressions;
+using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
 using Hyperbee.Expressions.Transformation.Transitions;
 using Hyperbee.Expressions.Visitors;
@@ -15,7 +14,7 @@ internal class LoweringVisitor : ExpressionVisitor
     private int _awaitCount;
 
     private readonly StateContext _states = new( InitialCapacity );
-    private readonly ExpressionDependencyMatcher _dependencyMatcher = new( expr => expr is AwaitExpression || expr is AsyncBlockExpression );
+    private readonly ExpressionMatcher _expressionMatcher = new( expr => expr is AwaitExpression || expr is AsyncBlockExpression );
 
     private VariableResolver _variableResolver;
 
@@ -99,7 +98,7 @@ private void UpdateTailState( Expression visited, NodeExpression defaultTarget =
     [MethodImpl( MethodImplOptions.AggressiveInlining )]
     private bool RequiresLowering( Expression node )
     {
-        return _dependencyMatcher.HasMatch( node );
+        return _expressionMatcher.HasMatch( node );
     }
 
     // Override methods for specific expression types

…/Visitors/ExpressionDependencyMatcher.cs …xpressions/Visitors/ExpressionMatcher.cssrc/Hyperbee.Expressions/Visitors/ExpressionDependencyMatcher.cs renamed to src/Hyperbee.Expressions/Visitors/ExpressionMatcher.cs src/Hyperbee.Expressions/Visitors/ExpressionDependencyMatcher.cs renamed to src/Hyperbee.Expressions/Visitors/ExpressionMatcher.cs

@@ -2,13 +2,13 @@
 
 namespace Hyperbee.Expressions.Visitors;
 
-internal class ExpressionDependencyMatcher : ExpressionVisitor
+internal class ExpressionMatcher : ExpressionVisitor
 {
     private readonly Dictionary<Expression, int> _countDictionary = [];
     private readonly Func<Expression, bool> _matchPredicate;
     private int _counter;
 
-    public ExpressionDependencyMatcher( Func<Expression, bool> matchPredicate )
+    public ExpressionMatcher( Func<Expression, bool> matchPredicate )
     {
         _matchPredicate = matchPredicate ?? throw new ArgumentNullException( nameof( matchPredicate ) );
     }

test/Hyperbee.Expressions.Tests/ExpressionDependencyMatcherTests.cs

@@ -29,7 +29,7 @@ public void ExpressionDependencyMatcher_ShouldFindAwaits()
         );
 
         var rootExpr = Block( blockAsyncExpr );
-        var counter = new ExpressionDependencyMatcher( expr => expr is AsyncBlockExpression || expr is AwaitExpression );
+        var counter = new ExpressionMatcher( expr => expr is AsyncBlockExpression || expr is AwaitExpression );
 
         // Act
         var rootExprCount = counter.MatchCount( rootExpr );