Move expressions to their own folder.

Avanade · Sep 9, 2024 · 007b97f · 007b97f
1 parent 73acc40
commit 007b97f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/.../QueryFilterCloseParenthesisExpression.cs → .../QueryFilterCloseParenthesisExpression.cs b/.../QueryFilterCloseParenthesisExpression.cs → .../QueryFilterCloseParenthesisExpression.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
 
-namespace CoreEx.Data.Querying
+namespace CoreEx.Data.Querying.Expressions
 {
     /// <summary>
     /// Represents a query filter <see cref="QueryFilterTokenKind.CloseParenthesis"/> expression.

diff --git a/...ata/Querying/QueryFilterExpressionBase.cs → .../Expressions/QueryFilterExpressionBase.cs b/...ata/Querying/QueryFilterExpressionBase.cs → .../Expressions/QueryFilterExpressionBase.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
 
-namespace CoreEx.Data.Querying
+namespace CoreEx.Data.Querying.Expressions
 {
     /// <summary>
     /// Provides a query filter expression.

diff --git a/.../Querying/QueryFilterLogicalExpression.cs → ...pressions/QueryFilterLogicalExpression.cs b/.../Querying/QueryFilterLogicalExpression.cs → ...pressions/QueryFilterLogicalExpression.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
 
-namespace CoreEx.Data.Querying
+namespace CoreEx.Data.Querying.Expressions
 {
     /// <summary>
     /// Represents a query filter <see cref="QueryFilterTokenKind.Logical"/> expression.
@@ -24,7 +24,7 @@ public override bool CanAddToken(QueryFilterToken token)
                 return token.Kind == QueryFilterTokenKind.Not;
 
             _isComplete = token.Kind == QueryFilterTokenKind.OpenParenthesis;
-            return _isComplete 
+            return _isComplete
                 ? false
                 : throw new QueryFilterParserException($"A '{_not.GetRawToken(Filter).ToString()}' expects an opening '(' to start an expression versus a syntactically incorrect '{token.GetValueToken(Filter)}' token.");
         }

diff --git a/...g/QueryFilterOpenParenthesisExpression.cs → ...s/QueryFilterOpenParenthesisExpression.cs b/...g/QueryFilterOpenParenthesisExpression.cs → ...s/QueryFilterOpenParenthesisExpression.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
 
-namespace CoreEx.Data.Querying
+namespace CoreEx.Data.Querying.Expressions
 {
     /// <summary>
     /// Represents a query filter <see cref="QueryFilterTokenKind.OpenParenthesis"/> expression.

diff --git a/...Querying/QueryFilterOperatorExpression.cs → ...ressions/QueryFilterOperatorExpression.cs b/...Querying/QueryFilterOperatorExpression.cs → ...ressions/QueryFilterOperatorExpression.cs
@@ -2,7 +2,7 @@
 
 using System.Collections.Generic;
 
-namespace CoreEx.Data.Querying
+namespace CoreEx.Data.Querying.Expressions
 {
     /// <summary>
     /// Represents a query filter <see cref="QueryFilterTokenKind.Operator"/> expression.
@@ -38,7 +38,7 @@ public sealed class QueryFilterOperatorExpression(QueryFilterParser parser, stri
         public override bool IsComplete => _isComplete;
 
         /// <inheritdoc/>
-        public override bool CanAddToken(QueryFilterToken token) => !_isComplete || (TokenCount == 1 && QueryFilterTokenKind.Operator.HasFlag(token.Kind));
+        public override bool CanAddToken(QueryFilterToken token) => !_isComplete || TokenCount == 1 && QueryFilterTokenKind.Operator.HasFlag(token.Kind);
 
         /// <inheritdoc/>
         protected override void AddToken(int index, QueryFilterToken token)

diff --git a/...ng/QueryFilterStringFunctionExpression.cs → ...ns/QueryFilterStringFunctionExpression.cs b/...ng/QueryFilterStringFunctionExpression.cs → ...ns/QueryFilterStringFunctionExpression.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
 
-namespace CoreEx.Data.Querying
+namespace CoreEx.Data.Querying.Expressions
 {
     /// <summary>
     /// Represents a query filter <see cref="QueryFilterTokenKind.StringFunction"/> expression.
@@ -40,7 +40,7 @@ public sealed class QueryFilterStringFunctionExpression(QueryFilterParser parser
 
         /// <inheritdoc/>
         protected override void AddToken(int index, QueryFilterToken token)
-        { 
+        {
             switch (index)
             {
                 case 0:

diff --git a/src/CoreEx.Data/Querying/QueryFilterParser.cs b/src/CoreEx.Data/Querying/QueryFilterParser.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
 
+using CoreEx.Data.Querying.Expressions;
 using CoreEx.RefData;
 using System;
 using System.Collections.Generic;