After-merge fix

Author: SergeiPavlov

Orm/Xtensive.Orm/Orm/Rse/Providers/ProviderVisitor.cs

@@ -20,7 +20,7 @@ public abstract class ProviderVisitor<TResult> where TResult : Provider
     /// </summary>
     /// <param name="cp">The <see cref="CompilableProvider"/> to visit.</param>
     /// <returns>Visit result.</returns>
-    protected virtual CompilableProvider Visit(CompilableProvider cp) =>
+    protected virtual TResult Visit(CompilableProvider cp) =>
       cp == null
         ? null
         : cp.Type switch {
@@ -60,177 +60,177 @@ protected virtual CompilableProvider Visit(CompilableProvider cp) =>
     /// Visits <see cref="PredicateJoinProvider"/>.
     /// </summary>
     /// <param name="provider">Predicate join provider.</param>
-    protected abstract CompilableProvider VisitPredicateJoin(PredicateJoinProvider provider);
+    protected abstract TResult VisitPredicateJoin(PredicateJoinProvider provider);
 
     /// <summary>
     /// Visits <see cref="ExistenceProvider"/>.
     /// </summary>
     /// <param name="provider">Existence provider.</param>
-    protected abstract CompilableProvider VisitExistence(ExistenceProvider provider);
+    protected abstract TResult VisitExistence(ExistenceProvider provider);
 
     /// <summary>
     /// Visits <see cref="ApplyProvider"/>.
     /// </summary>
     /// <param name="provider">Apply provider.</param>
-    protected abstract CompilableProvider VisitApply(ApplyProvider provider);
+    protected abstract TResult VisitApply(ApplyProvider provider);
 
     /// <summary>
     /// Visits <see cref="RowNumberProvider"/>.
     /// </summary>
     /// <param name="provider">Row number provider.</param>
-    protected abstract CompilableProvider VisitRowNumber(RowNumberProvider provider);
+    protected abstract TResult VisitRowNumber(RowNumberProvider provider);
 
     /// <summary>
     /// Visits <see cref="TakeProvider"/>.
     /// </summary>
     /// <param name="provider">Take provider.</param>
-    protected abstract CompilableProvider VisitTake(TakeProvider provider);
+    protected abstract TResult VisitTake(TakeProvider provider);
 
     /// <summary>
     /// Visits <see cref="SkipProvider"/>.
     /// </summary>
     /// <param name="provider">Skip provider.</param>
-    protected abstract CompilableProvider VisitSkip(SkipProvider provider);
+    protected abstract TResult VisitSkip(SkipProvider provider);
 
     /// <summary>
     /// Visits <see cref="PagingProvider"/>.
     /// </summary>
     /// <param name="provider">Paging provider.</param>
-    protected abstract CompilableProvider VisitPaging(PagingProvider provider);
+    protected abstract TResult VisitPaging(PagingProvider provider);
 
     /// <summary>
     /// Visits <see cref="SelectProvider"/>.
     /// </summary>
     /// <param name="provider">Select provider.</param>
-    protected abstract CompilableProvider VisitSelect(SelectProvider provider);
+    protected abstract TResult VisitSelect(SelectProvider provider);
 
     /// <summary>
     /// Visits <see cref="TagProvider"/>.
     /// </summary>
     /// <param name="provider">Tag provider.</param>
-    protected abstract CompilableProvider VisitTag(TagProvider provider);
+    protected abstract TResult VisitTag(TagProvider provider);
 
     /// <summary>
     /// Visits <see cref="SeekProvider"/>.
     /// </summary>
     /// <param name="provider">Seek provider.</param>
-    protected abstract CompilableProvider VisitSeek(SeekProvider provider);
+    protected abstract TResult VisitSeek(SeekProvider provider);
 
     /// <summary>
     /// Visits <see cref="RawProvider"/>.
     /// </summary>
     /// <param name="provider">Raw provider.</param>
-    protected abstract CompilableProvider VisitRaw(RawProvider provider);
+    protected abstract TResult VisitRaw(RawProvider provider);
 
     /// <summary>
     /// Visits <see cref="SortProvider"/>.
     /// </summary>
     /// <param name="provider">Sort provider.</param>
-    protected abstract CompilableProvider VisitSort(SortProvider provider);
+    protected abstract TResult VisitSort(SortProvider provider);
 
     /// <summary>
     /// Visits <see cref="JoinProvider"/>.
     /// </summary>
     /// <param name="provider">Join provider.</param>
-    protected abstract CompilableProvider VisitJoin(JoinProvider provider);
+    protected abstract TResult VisitJoin(JoinProvider provider);
 
     /// <summary>
     /// Visits <see cref="FilterProvider"/>.
     /// </summary>
     /// <param name="provider">Filter provider.</param>
-    protected abstract CompilableProvider VisitFilter(FilterProvider provider);
+    protected abstract TResult VisitFilter(FilterProvider provider);
 
     /// <summary>
     /// Visits <see cref="DistinctProvider"/>.
     /// </summary>
     /// <param name="provider">Distinct provider.</param>
-    protected abstract CompilableProvider VisitDistinct(DistinctProvider provider);
+    protected abstract TResult VisitDistinct(DistinctProvider provider);
 
     /// <summary>
     /// Visits <see cref="CalculateProvider"/>.
     /// </summary>
     /// <param name="provider">Calculate provider.</param>
-    protected abstract CompilableProvider VisitCalculate(CalculateProvider provider);
+    protected abstract TResult VisitCalculate(CalculateProvider provider);
 
     /// <summary>
     /// Visits <see cref="AliasProvider"/>.
     /// </summary>
     /// <param name="provider">Alias provider.</param>
-    protected abstract CompilableProvider VisitAlias(AliasProvider provider);
+    protected abstract TResult VisitAlias(AliasProvider provider);
 
     /// <summary>
     /// Visits <see cref="AggregateProvider"/>.
     /// </summary>
     /// <param name="provider">Aggregate provider.</param>
     /// <returns></returns>
-    protected abstract CompilableProvider VisitAggregate(AggregateProvider provider);
+    protected abstract TResult VisitAggregate(AggregateProvider provider);
 
     /// <summary>
     /// Visits <see cref="StoreProvider"/>.
     /// </summary>
     /// <param name="provider">Store provider.</param>
-    protected abstract CompilableProvider VisitStore(StoreProvider provider);
+    protected abstract TResult VisitStore(StoreProvider provider);
 
     /// <summary>
     /// Visits <see cref="IndexProvider"/>.
     /// </summary>
     /// <param name="provider">Index provider.</param>
-    protected abstract CompilableProvider VisitIndex(IndexProvider provider);
+    protected abstract TResult VisitIndex(IndexProvider provider);
 
     /// <summary>
     /// Visits the <see cref="IntersectProvider"/>.
     /// </summary>
     /// <param name="provider">Intersect provider.</param>
     /// <returns></returns>
-    protected abstract CompilableProvider VisitIntersect(IntersectProvider provider);
+    protected abstract TResult VisitIntersect(IntersectProvider provider);
 
     /// <summary>
     /// Visits the <see cref="ExceptProvider"/>.
     /// </summary>
     /// <param name="provider">Except provider.</param>
     /// <returns></returns>
-    protected abstract CompilableProvider VisitExcept(ExceptProvider provider);
+    protected abstract TResult VisitExcept(ExceptProvider provider);
 
     /// <summary>
     /// Visits the <see cref="ConcatProvider"/>.
     /// </summary>
     /// <param name="provider">Concat provider.</param>
     /// <returns></returns>
-    protected abstract CompilableProvider VisitConcat(ConcatProvider provider);
+    protected abstract TResult VisitConcat(ConcatProvider provider);
 
     /// <summary>
     /// Visits the <see cref="UnionProvider"/>.
     /// </summary>
     /// <param name="provider">Union provider.</param>
     /// <returns></returns>
-    protected abstract CompilableProvider VisitUnion(UnionProvider provider);
+    protected abstract TResult VisitUnion(UnionProvider provider);
 
     /// <summary>
     /// Visits the <see cref="LockProvider"/>.
     /// </summary>
     /// <param name="provider">Lock provider.</param>
     /// <returns></returns>
-    protected abstract CompilableProvider VisitLock(LockProvider provider);
+    protected abstract TResult VisitLock(LockProvider provider);
 
     /// <summary>
     /// Visits the <see cref="IncludeProvider"/>.
     /// </summary>
     /// <param name="provider">Include provider.</param>
     /// <returns></returns>
-    protected abstract CompilableProvider VisitInclude(IncludeProvider provider);
+    protected abstract TResult VisitInclude(IncludeProvider provider);
 
     /// <summary>
     /// Visits the <see cref="FreeTextProvider"/>.
     /// </summary>
     /// <param name="provider">FreeText provider.</param>
     /// <returns></returns>
-    protected abstract CompilableProvider VisitFreeText(FreeTextProvider provider);
+    protected abstract TResult VisitFreeText(FreeTextProvider provider);
 
     /// <summary>
     /// Visits the <see cref="ContainsTableProvider"/>.
     /// </summary>
     /// <param name="provider">SearchCondition provider.</param>
     /// <returns></returns>
-    protected abstract CompilableProvider VisitContainsTable(ContainsTableProvider provider);
+    protected abstract TResult VisitContainsTable(ContainsTableProvider provider);
   }
 }