From a1bf3bd84775ebc0a393c74a5bca02d4b953fc3a Mon Sep 17 00:00:00 2001
From: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Date: Thu, 23 Nov 2017 09:39:31 +1000
Subject: [PATCH 1/6] Dev version bump [Skip CI]

---
 .../Serilog.Filters.Expressions.csproj                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj b/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
index 6b3f67a..488adbc 100644
--- a/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
+++ b/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Expression-based event filtering for Serilog.</Description>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.1.1</VersionPrefix>
     <Authors>Serilog Contributors</Authors>
     <TargetFrameworks>net45;netstandard1.5</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

From 68a0b8daf956d61f851d23d195f3d7028582b560 Mon Sep 17 00:00:00 2001
From: Matthew Erbs <matthew.erbs@merbla.com>
Date: Wed, 9 May 2018 15:56:30 +1000
Subject: [PATCH 2/6] New NuGet API Key

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index cf14c5c..c919437 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ artifacts:
 deploy:
 - provider: NuGet
   api_key:
-    secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
+    secure: bd9z4P73oltOXudAjPehwp9iDKsPtC+HbgshOrSgoyQKr5xVK+bxJQngrDJkHdY8
   skip_symbols: true
   on:
     branch: /^(master|dev)$/

From 1b574596707f57461109fa180cbd7d49ec94efa9 Mon Sep 17 00:00:00 2001
From: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Date: Wed, 23 May 2018 20:34:10 +1000
Subject: [PATCH 3/6] Update Superpower dependency to v2 (-dev); Serilog to
 2.7.1

---
 .../.idea/contentModel.xml                    | 198 +++++++++
 .../.idea/indexLayout.xml                     |   7 +
 .../.idea/modules.xml                         |   8 +
 .../.idea/vcs.xml                             |   6 +
 .../.idea/workspace.xml                       | 411 ++++++++++++++++++
 .../riderModule.iml                           |  14 +
 .../Parsing/FilterExpressionTokenizer.cs      |   8 +-
 .../Serilog.Filters.Expressions.csproj        |  17 +-
 ...ilters.Expressions.PerformanceTests.csproj |   4 +-
 .../FilterExpressionParserTests.cs            |  11 +
 .../Serilog.Filters.Expressions.Tests.csproj  |  14 +-
 .../app.config                                |  16 -
 12 files changed, 674 insertions(+), 40 deletions(-)
 create mode 100644 .idea/.idea.serilog-filters-expressions/.idea/contentModel.xml
 create mode 100644 .idea/.idea.serilog-filters-expressions/.idea/indexLayout.xml
 create mode 100644 .idea/.idea.serilog-filters-expressions/.idea/modules.xml
 create mode 100644 .idea/.idea.serilog-filters-expressions/.idea/vcs.xml
 create mode 100644 .idea/.idea.serilog-filters-expressions/.idea/workspace.xml
 create mode 100644 .idea/.idea.serilog-filters-expressions/riderModule.iml
 delete mode 100644 test/Serilog.Filters.Expressions.Tests/app.config

diff --git a/.idea/.idea.serilog-filters-expressions/.idea/contentModel.xml b/.idea/.idea.serilog-filters-expressions/.idea/contentModel.xml
new file mode 100644
index 0000000..30d4ae5
--- /dev/null
+++ b/.idea/.idea.serilog-filters-expressions/.idea/contentModel.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelStore">
+    <e p="$USER_HOME$/.Rider2018.1/system/resharper-host/local/Transient/ReSharperHost/v12/SolutionCaches/_serilog-filters-expressions.1711640538.00" t="ExcludeRecursive" />
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.abstractions.dll" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.reporters.net452.dll" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.utility.net452.dll" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.visualstudio.testadapter.dll" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.reporters.netcoreapp10.dll" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.utility.netcoreapp10.dll" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.visualstudio.dotnetcore.testadapter.dll" t="Include" />
+    <e p="$PROJECT_DIR$" t="IncludeFlat">
+      <e p=".gitattributes" t="Include" />
+      <e p=".gitignore" t="Include" />
+      <e p="Build.ps1" t="Include" />
+      <e p="LICENSE" t="Include" />
+      <e p="README.md" t="Include" />
+      <e p="RunPerfTests.ps1" t="Include" />
+      <e p="appveyor.yml" t="Include" />
+      <e p="example" t="Include">
+        <e p="Sample" t="IncludeRecursive">
+          <e p="Program.cs" t="Include" />
+          <e p="Properties" t="Include">
+            <e p="AssemblyInfo.cs" t="Include" />
+          </e>
+          <e p="Sample.csproj" t="IncludeRecursive" />
+          <e p="bin" t="ExcludeRecursive" />
+          <e p="obj" t="ExcludeRecursive">
+            <e p="Debug" t="Include">
+              <e p="netcoreapp1.0" t="Include">
+                <e p="Sample.AssemblyInfo.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+        </e>
+      </e>
+      <e p="global" t="Include" />
+      <e p="packages" t="ExcludeRecursive" />
+      <e p="serilog-filters-expressions.sln" t="IncludeFlat" />
+      <e p="src" t="Include">
+        <e p="Serilog.Filters.Expressions" t="IncludeRecursive">
+          <e p="Filters" t="Include">
+            <e p="Expressions" t="Include">
+              <e p="Ast" t="Include">
+                <e p="FilterArrayExpression.cs" t="Include" />
+                <e p="FilterCallExpression.cs" t="Include" />
+                <e p="FilterConstantExpression.cs" t="Include" />
+                <e p="FilterExpression.cs" t="Include" />
+                <e p="FilterExpressionType.cs" t="Include" />
+                <e p="FilterLambdaExpression.cs" t="Include" />
+                <e p="FilterParameterExpression.cs" t="Include" />
+                <e p="FilterPropertyExpression.cs" t="Include" />
+                <e p="FilterSubpropertyExpression.cs" t="Include" />
+                <e p="FilterTextExpression.cs" t="Include" />
+                <e p="FilterTextMatching.cs" t="Include" />
+                <e p="FilterWildcard.cs" t="Include" />
+                <e p="FilterWildcardExpression.cs" t="Include" />
+              </e>
+              <e p="Compilation" t="Include">
+                <e p="Arrays" t="Include">
+                  <e p="FilterExpressionConstantArrayEvaluator.cs" t="Include" />
+                </e>
+                <e p="CompiledFilterExpression.cs" t="Include" />
+                <e p="Costing" t="Include">
+                  <e p="FilterExpressionCostReordering.cs" t="Include" />
+                  <e p="FilterExpressionCosting.cs" t="Include" />
+                </e>
+                <e p="FilterExpressionCompiler.cs" t="Include" />
+                <e p="In" t="Include">
+                  <e p="FilterExpressionNotInRewriter.cs" t="Include" />
+                </e>
+                <e p="Is" t="Include">
+                  <e p="IsOperatorTransformer.cs" t="Include" />
+                </e>
+                <e p="Like" t="Include">
+                  <e p="LikeOperatorTransformer.cs" t="Include" />
+                </e>
+                <e p="Linq" t="Include">
+                  <e p="ExpressionConstantMapper.cs" t="Include" />
+                  <e p="LinqExpressionCompiler.cs" t="Include" />
+                  <e p="ParameterReplacementVisitor.cs" t="Include" />
+                </e>
+                <e p="Properties" t="Include">
+                  <e p="PropertiesObjectAccessorTransformer.cs" t="Include" />
+                </e>
+                <e p="Text" t="Include">
+                  <e p="IndexOfIgnoreCaseCallRewriter.cs" t="Include" />
+                  <e p="MatchingRewriter.cs" t="Include" />
+                  <e p="RegexSecondMatchCallRewriter.cs" t="Include" />
+                  <e p="SymmetricMatchCallRewriter.cs" t="Include" />
+                  <e p="TextMatchingTransformer.cs" t="Include" />
+                </e>
+                <e p="Transformations" t="Include">
+                  <e p="FilterExpressionIdentityTransformer.cs" t="Include" />
+                  <e p="FilterExpressionNodeReplacer.cs" t="Include" />
+                  <e p="FilterExpressionTransformer`1.cs" t="Include" />
+                </e>
+                <e p="Wildcards" t="Include">
+                  <e p="FilterExpressionWildcardSearch.cs" t="Include" />
+                  <e p="WildcardComprehensionTransformer.cs" t="Include" />
+                </e>
+              </e>
+              <e p="FilterExpressionLanguage.cs" t="Include" />
+              <e p="LoggingFilterSwitch.cs" t="Include" />
+              <e p="Operators.cs" t="Include" />
+              <e p="Parsing" t="Include">
+                <e p="FilterExpressionKeyword.cs" t="Include" />
+                <e p="FilterExpressionParser.cs" t="Include" />
+                <e p="FilterExpressionTextParsers.cs" t="Include" />
+                <e p="FilterExpressionToken.cs" t="Include" />
+                <e p="FilterExpressionTokenParsers.cs" t="Include" />
+                <e p="FilterExpressionTokenizer.cs" t="Include" />
+                <e p="ParserExtensions.cs" t="Include" />
+              </e>
+              <e p="Runtime" t="Include">
+                <e p="AcceptNullAttribute.cs" t="Include" />
+                <e p="AcceptUndefinedAttribute.cs" t="Include" />
+                <e p="BooleanAttribute.cs" t="Include" />
+                <e p="NumericAttribute.cs" t="Include" />
+                <e p="NumericComparableAttribute.cs" t="Include" />
+                <e p="Representation.cs" t="Include" />
+                <e p="RuntimeOperators.cs" t="Include" />
+                <e p="Undefined.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+          <e p="LoggerFilterConfigurationExtensions.cs" t="Include" />
+          <e p="Properties" t="Include">
+            <e p="AssemblyInfo.cs" t="Include" />
+          </e>
+          <e p="Serilog.Filters.Expressions.csproj" t="IncludeRecursive" />
+          <e p="bin" t="ExcludeRecursive" />
+          <e p="obj" t="ExcludeRecursive">
+            <e p="Debug" t="Include">
+              <e p="net4.5" t="Include">
+                <e p="Serilog.Filters.Expressions.AssemblyInfo.cs" t="Include" />
+              </e>
+              <e p="netstandard1.5" t="Include">
+                <e p="Serilog.Filters.Expressions.AssemblyInfo.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+        </e>
+      </e>
+      <e p="test" t="Include">
+        <e p="Serilog.Filters.Expressions.PerformanceTests" t="IncludeRecursive">
+          <e p="ComparisonBenchmark.cs" t="Include" />
+          <e p="Harness.cs" t="Include" />
+          <e p="Serilog.Filters.Expressions.PerformanceTests.csproj" t="IncludeRecursive" />
+          <e p="Support" t="Include">
+            <e p="NullSink.cs" t="Include" />
+            <e p="Some.cs" t="Include" />
+          </e>
+          <e p="bin" t="ExcludeRecursive" />
+          <e p="obj" t="ExcludeRecursive">
+            <e p="Debug" t="Include">
+              <e p="net4.6.2" t="Include">
+                <e p="Serilog.Filters.Expressions.PerformanceTests.AssemblyInfo.cs" t="Include" />
+                <e p="Serilog.Filters.Expressions.PerformanceTests.Program.cs" t="Include" />
+              </e>
+              <e p="netcoreapp2.0" t="Include">
+                <e p="Serilog.Filters.Expressions.PerformanceTests.AssemblyInfo.cs" t="Include" />
+                <e p="Serilog.Filters.Expressions.PerformanceTests.Program.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+        </e>
+        <e p="Serilog.Filters.Expressions.Tests" t="IncludeRecursive">
+          <e p="FilterExpressionCompilerTests.cs" t="Include" />
+          <e p="FilterExpressionParserTests.cs" t="Include" />
+          <e p="LoggingFilterSwitchTests.cs" t="Include" />
+          <e p="PackagingTests.cs" t="Include" />
+          <e p="Properties" t="Include">
+            <e p="launchSettings.json" t="Include" />
+          </e>
+          <e p="Serilog.Filters.Expressions.Tests.csproj" t="IncludeRecursive" />
+          <e p="Support" t="Include">
+            <e p="CollectingSink.cs" t="Include" />
+            <e p="Some.cs" t="Include" />
+          </e>
+          <e p="bin" t="ExcludeRecursive" />
+          <e p="obj" t="ExcludeRecursive">
+            <e p="Debug" t="Include">
+              <e p="net4.6.2" t="Include">
+                <e p="Serilog.Filters.Expressions.Tests.AssemblyInfo.cs" t="Include" />
+                <e p="Serilog.Filters.Expressions.Tests.Program.cs" t="Include" />
+              </e>
+              <e p="netcoreapp2.0" t="Include">
+                <e p="Serilog.Filters.Expressions.Tests.AssemblyInfo.cs" t="Include" />
+                <e p="Serilog.Filters.Expressions.Tests.Program.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+        </e>
+      </e>
+    </e>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/.idea/indexLayout.xml b/.idea/.idea.serilog-filters-expressions/.idea/indexLayout.xml
new file mode 100644
index 0000000..f1feadf
--- /dev/null
+++ b/.idea/.idea.serilog-filters-expressions/.idea/indexLayout.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelUserStore">
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/.idea/modules.xml b/.idea/.idea.serilog-filters-expressions/.idea/modules.xml
new file mode 100644
index 0000000..e3c7652
--- /dev/null
+++ b/.idea/.idea.serilog-filters-expressions/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.serilog-filters-expressions/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.serilog-filters-expressions/riderModule.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/.idea/vcs.xml b/.idea/.idea.serilog-filters-expressions/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/.idea.serilog-filters-expressions/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/.idea/workspace.xml b/.idea/.idea.serilog-filters-expressions/.idea/workspace.xml
new file mode 100644
index 0000000..91ccdd1
--- /dev/null
+++ b/.idea/.idea.serilog-filters-expressions/.idea/workspace.xml
@@ -0,0 +1,411 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="f5a33502-3407-4ef1-bf58-d4af9d35166d" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/app.config" beforeDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
+      <file leaf-file-name="Serilog.Filters.Expressions.csproj" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="467">
+              <caret line="21" lean-forward="true" selection-start-line="20" selection-end-line="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="LoggerFilterConfigurationExtensions.cs" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/LoggerFilterConfigurationExtensions.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <marker date="1527068665414" expanded="false" signature="6:77" ph="..." />
+                <marker date="1527068665414" expanded="true" signature="96:2893" ph="{...}" />
+                <marker date="1527068665414" expanded="true" signature="103:217" ph="/// Extends logger configuration with methods for filtering with expressions. ... " />
+                <marker date="1527068665414" expanded="true" signature="277:2891" ph="{...}" />
+                <marker date="1527068665414" expanded="true" signature="292:633" ph="/// Include only log events that match the provided expression. ... " />
+                <marker date="1527068665414" expanded="true" signature="768:1158" ph="{...}" />
+                <marker date="1527068665414" expanded="true" signature="1168:1504" ph="/// Exclude log events that match the provided expression. ... " />
+                <marker date="1527068665414" expanded="true" signature="1635:2021" ph="{...}" />
+                <marker date="1527068665414" expanded="true" signature="2031:2460" ph="/// Use a &lt;see cref=&quot;LoggingFilterSwitch&quot;/&gt; to dynamically control filtering. ... " />
+                <marker date="1527068665414" expanded="true" signature="2602:2885" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Serilog.Filters.Expressions.Tests.csproj" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="62">
+              <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Serilog.Filters.Expressions.PerformanceTests.csproj" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="616">
+              <caret line="21" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FilterExpressionParserTests.cs" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="506">
+              <caret line="66" column="64" selection-start-line="66" selection-start-column="64" selection-end-line="66" selection-end-column="64" />
+              <folding>
+                <marker date="1527071232270" expanded="false" signature="6:69" ph="..." />
+                <marker date="1527071232270" expanded="true" signature="114:3942" ph="{...}" />
+                <marker date="1527071232270" expanded="true" signature="161:3940" ph="{...}" />
+                <marker date="1527071232270" expanded="true" signature="2489:2641" ph="{...}" />
+                <marker date="1527071232270" expanded="true" signature="3173:3282" ph="{...}" />
+                <marker date="1527071232270" expanded="true" signature="3761:3934" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/LoggerFilterConfigurationExtensions.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/553D3306-7298-43D3-851B-E2645BB2DA18/d2/82ad09b4/Tokenizer`1.cs" root0="SKIP_INSPECTION" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs" />
+        <option value="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj" />
+        <option value="$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj" />
+        <option value="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj" />
+        <option value="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="695" />
+    <option name="y" value="50" />
+    <option name="width" value="1587" />
+    <option name="height" value="1298" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="SolutionExplorer" proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scratches" />
+      <pane id="SolutionExplorer">
+        <subPane>
+          <expand>
+            <path>
+              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
+              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
+            </path>
+            <path>
+              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
+              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
+              <item name="src" type="977d5f41:SolutionExplorerNodeRider" />
+            </path>
+            <path>
+              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
+              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
+              <item name="src" type="977d5f41:SolutionExplorerNodeRider" />
+              <item name="Serilog.Filters.Expressions" type="977d5f41:SolutionExplorerNodeRider" />
+            </path>
+            <path>
+              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
+              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
+              <item name="test" type="977d5f41:SolutionExplorerNodeRider" />
+            </path>
+            <path>
+              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
+              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
+              <item name="test" type="977d5f41:SolutionExplorerNodeRider" />
+              <item name="Serilog.Filters.Expressions.Tests" type="977d5f41:SolutionExplorerNodeRider" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+        <option name="show-file-system" value="false" />
+        <option name="show-all-items" value="false" />
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="Rider.ProjectViewActivator.IsNotFirstRun" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="settings.editor.selected.configurable" value="RiderUnitTestingPageId" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected=".NET Project.Default">
+    <configuration name="Default" type="DotNetProject" factoryName=".NET Project">
+      <option name="EXE_PATH" value="" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PASS_PARENT_ENVS" value="1" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="PROJECT_PATH" value="" />
+      <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+      <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+      <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+      <option name="PROJECT_KIND" value="None" />
+      <option name="PROJECT_TFM" value="" />
+    </configuration>
+    <list>
+      <item itemvalue=".NET Project.Default" />
+    </list>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="f5a33502-3407-4ef1-bf58-d4af9d35166d" name="Default" comment="" />
+      <created>1527068703066</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1527068703066</updated>
+      <workItem from="1527068705142" duration="1214000" />
+      <workItem from="1527069958414" duration="1648000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="2862000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="98" y="50" width="2462" height="1390" extended-state="6" />
+    <layout>
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Errors In Solution" order="3" />
+      <window_info anchor="bottom" id="Messages" sideWeight="0.49957982" weight="0.32942238" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50084037" side_tool="true" weight="0.36101082" />
+      <window_info active="true" anchor="bottom" id="Unit Tests" order="7" sideWeight="0.49915966" visible="true" weight="0.36101082" />
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32942238" />
+      <window_info anchor="bottom" id="NuGet" order="7" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25630254" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Build" order="7" weight="0.32942238" />
+      <window_info anchor="right" id="Database" order="3" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="744">
+          <caret line="24" column="67" selection-start-line="24" selection-start-column="67" selection-end-line="24" selection-end-column="67" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4433">
+          <caret line="145" column="46" selection-start-line="145" selection-start-column="46" selection-end-line="145" selection-end-column="46" />
+          <folding>
+            <marker date="1527069719934" expanded="false" signature="6:75" ph="..." />
+            <marker date="1527069719934" expanded="true" signature="122:8717" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="195:8715" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="410:1060" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="1135:1824" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="1869:2914" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="3100:8289" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="3298:4437" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="3439:3656" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="3681:4158" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="4267:4419" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="4482:4896" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="4940:5712" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="5332:5501" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="5526:5694" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="5785:6572" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="6232:6368" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="6393:6554" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="6779:7220" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="7241:8187" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="7402:7625" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="7740:7950" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="7975:8169" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="8374:8709" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="8428:8622" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="8499:8608" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/553D3306-7298-43D3-851B-E2645BB2DA18/d2/82ad09b4/Tokenizer`1.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="527">
+          <caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="341">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/553D3306-7298-43D3-851B-E2645BB2DA18/d2/82ad09b4/Tokenizer`1.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="527">
+          <caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="202">
+          <caret line="145" column="46" selection-start-line="145" selection-start-column="46" selection-end-line="145" selection-end-column="46" />
+          <folding>
+            <marker date="1527069719934" expanded="false" signature="6:75" ph="..." />
+            <marker date="1527069719934" expanded="true" signature="122:8717" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="195:8715" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="410:1060" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="1135:1824" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="1869:2914" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="3100:8289" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="3298:4437" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="3439:3656" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="3681:4158" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="4267:4419" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="4482:4896" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="4940:5712" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="5332:5501" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="5526:5694" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="5785:6572" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="6232:6368" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="6393:6554" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="6779:7220" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="7241:8187" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="7402:7625" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="7740:7950" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="7975:8169" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="8374:8709" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="8428:8622" ph="{...}" />
+            <marker date="1527069719934" expanded="true" signature="8499:8608" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="62">
+          <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="616">
+          <caret line="21" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/LoggerFilterConfigurationExtensions.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <marker date="1527068665414" expanded="false" signature="6:77" ph="..." />
+            <marker date="1527068665414" expanded="true" signature="96:2893" ph="{...}" />
+            <marker date="1527068665414" expanded="true" signature="103:217" ph="/// Extends logger configuration with methods for filtering with expressions. ... " />
+            <marker date="1527068665414" expanded="true" signature="277:2891" ph="{...}" />
+            <marker date="1527068665414" expanded="true" signature="292:633" ph="/// Include only log events that match the provided expression. ... " />
+            <marker date="1527068665414" expanded="true" signature="768:1158" ph="{...}" />
+            <marker date="1527068665414" expanded="true" signature="1168:1504" ph="/// Exclude log events that match the provided expression. ... " />
+            <marker date="1527068665414" expanded="true" signature="1635:2021" ph="{...}" />
+            <marker date="1527068665414" expanded="true" signature="2031:2460" ph="/// Use a &lt;see cref=&quot;LoggingFilterSwitch&quot;/&gt; to dynamically control filtering. ... " />
+            <marker date="1527068665414" expanded="true" signature="2602:2885" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="467">
+          <caret line="21" lean-forward="true" selection-start-line="20" selection-end-line="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="506">
+          <caret line="66" column="64" selection-start-line="66" selection-start-column="64" selection-end-line="66" selection-end-column="64" />
+          <folding>
+            <marker date="1527071232270" expanded="false" signature="6:69" ph="..." />
+            <marker date="1527071232270" expanded="true" signature="114:3942" ph="{...}" />
+            <marker date="1527071232270" expanded="true" signature="161:3940" ph="{...}" />
+            <marker date="1527071232270" expanded="true" signature="2489:2641" ph="{...}" />
+            <marker date="1527071232270" expanded="true" signature="3173:3282" ph="{...}" />
+            <marker date="1527071232270" expanded="true" signature="3761:3934" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/riderModule.iml b/.idea/.idea.serilog-filters-expressions/riderModule.iml
new file mode 100644
index 0000000..e8439a1
--- /dev/null
+++ b/.idea/.idea.serilog-filters-expressions/riderModule.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RIDER_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.abstractions.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.reporters.net452.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.utility.net452.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.visualstudio.testadapter.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.reporters.netcoreapp10.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.utility.netcoreapp10.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.visualstudio.dotnetcore.testadapter.dll" />
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs b/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs
index 2f02a4e..2ab1c90 100644
--- a/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs
+++ b/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs
@@ -61,7 +61,9 @@ static FilterExpressionTokenizer()
             SimpleOps['?'] = FilterExpressionToken.QuestionMark;
         }
 
-        protected override IEnumerable<Result<FilterExpressionToken>> Tokenize(TextSpan stringSpan)
+        protected override IEnumerable<Result<FilterExpressionToken>> Tokenize(
+            TextSpan stringSpan,
+            TokenizationState<FilterExpressionToken> tokenizationState)
         {
             var next = SkipWhiteSpace(stringSpan);
             if (!next.HasValue)
@@ -141,7 +143,9 @@ protected override IEnumerable<Result<FilterExpressionToken>> Tokenize(TextSpan
                         yield return Result.Value(FilterExpressionToken.Identifier, beginIdentifier, next.Location);
                     }
                 }
-                else if (next.Value == '/' && (!Previous.HasValue || PreRegexTokens.Contains(Previous.Kind)))
+                else if (next.Value == '/' && 
+                         (!tokenizationState.Previous.HasValue || 
+                            PreRegexTokens.Contains(tokenizationState.Previous.Value.Kind)))
                 {
                     var regex = FilterExpressionTextParsers.RegularExpression(next.Location);
                     if (!regex.HasValue)
diff --git a/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj b/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
index 488adbc..26aa862 100644
--- a/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
+++ b/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <Description>Expression-based event filtering for Serilog.</Description>
-    <VersionPrefix>1.1.1</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>Serilog Contributors</Authors>
-    <TargetFrameworks>net45;netstandard1.5</TargetFrameworks>
+    <TargetFrameworks>net4.5;netstandard1.5</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Serilog.Filters.Expressions</AssemblyName>
@@ -14,18 +14,19 @@
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>Serilog.Filters.Expressions</PackageId>
     <PackageTags>serilog</PackageTags>
-    <PackageIconUrl>http://serilog.net/images/serilog-extension-nuget.png</PackageIconUrl>
+    <PackageIconUrl>https://serilog.net/images/serilog-extension-nuget.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/serilog/serilog-filters-expressions</PackageProjectUrl>
-    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.0</NetStandardImplicitPackageVersion>
+    <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net4.5' ">True</DisableImplicitFrameworkReferences>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.1</NetStandardImplicitPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.3.0" />
-    <PackageReference Include="Superpower" Version="1.0.1" />
+    <PackageReference Include="Serilog" Version="2.7.1" />
+    <PackageReference Include="Superpower" Version="2.0.0-dev-00107" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net4.5' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
diff --git a/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj b/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj
index 5601665..917ba9e 100644
--- a/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj
+++ b/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net462</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net4.6.2</TargetFrameworks>
     <AssemblyName>Serilog.Filters.Expressions.PerformanceTests</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.10.9" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs b/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs
index 9c0c58c..034a231 100644
--- a/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs
+++ b/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs
@@ -59,5 +59,16 @@ public void InvalidSyntaxIsRejected(string input)
         {
             Assert.Throws<ArgumentException>(() => FilterExpressionParser.Parse(input));
         }
+
+        [Theory]
+        [InlineData("A = 'b", "Syntax error: unexpected end of input, expected `'`.")]
+        [InlineData("A or B) and C", "Syntax error (line 1, column 7): unexpected `)`.")]
+        [InlineData("A lik3 C", "Syntax error (line 1, column 3): unexpected identifier `lik3`.")]
+        [InlineData("A > 1234f", "Syntax error (line 1, column 9): unexpected `f`, expected digit.")]
+        public void PreciseErrorsAreReported(string input, string expectedMessage)
+        {
+            var ex = Assert.Throws<ArgumentException>(() => FilterExpressionParser.Parse(input));
+            Assert.Equal(expectedMessage, ex.Message);
+        }
     }
 }
diff --git a/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj b/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj
index ded4f51..5127527 100644
--- a/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj
+++ b/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net4.6.2</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>Serilog.Filters.Expressions.Tests</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
@@ -10,28 +9,19 @@
     <PackageId>Serilog.Filters.Expressions.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Serilog.Filters.Expressions\Serilog.Filters.Expressions.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/test/Serilog.Filters.Expressions.Tests/app.config b/test/Serilog.Filters.Expressions.Tests/app.config
deleted file mode 100644
index afad5d2..0000000
--- a/test/Serilog.Filters.Expressions.Tests/app.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <add key="serilog:enrich:with-property:Path" value="%PATH%" />
-    <add key="custom1:serilog:minimum-level" value="Warning" />
-    <add key="custom2:serilog:minimum-level" value="Error" />
-    <add key="serilog:using:Environment" value="Serilog.Enrichers.Environment" />
-    <add key="serilog:using:Process" value="Serilog.Enrichers.Process" />
-    <add key="serilog:using:Thread" value="Serilog.Enrichers.Thread" />
-    <add key="serilog:enrich:WithThreadId"/>
-    <add key="serilog:enrich:WithMachineName"/>
-    <add key="serilog:enrich:WithProcessId"/>
-    <add key="serilog:enrich:WithEnvironmentUserName"/>
-    <add key="serilog:enrich:FromLogContext"/>
-  </appSettings>
-</configuration>
\ No newline at end of file

From 4505e331c248cdda7e4d3fc4ad3bc22f0ffd9593 Mon Sep 17 00:00:00 2001
From: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Date: Wed, 23 May 2018 20:35:51 +1000
Subject: [PATCH 4/6] Don't include .idea

---
 .gitignore                                    |   1 +
 .../.idea/contentModel.xml                    | 198 ---------
 .../.idea/indexLayout.xml                     |   7 -
 .../.idea/modules.xml                         |   8 -
 .../.idea/vcs.xml                             |   6 -
 .../.idea/workspace.xml                       | 411 ------------------
 .../riderModule.iml                           |  14 -
 7 files changed, 1 insertion(+), 644 deletions(-)
 delete mode 100644 .idea/.idea.serilog-filters-expressions/.idea/contentModel.xml
 delete mode 100644 .idea/.idea.serilog-filters-expressions/.idea/indexLayout.xml
 delete mode 100644 .idea/.idea.serilog-filters-expressions/.idea/modules.xml
 delete mode 100644 .idea/.idea.serilog-filters-expressions/.idea/vcs.xml
 delete mode 100644 .idea/.idea.serilog-filters-expressions/.idea/workspace.xml
 delete mode 100644 .idea/.idea.serilog-filters-expressions/riderModule.iml

diff --git a/.gitignore b/.gitignore
index 27c9d82..8a8700a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+.idea
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
diff --git a/.idea/.idea.serilog-filters-expressions/.idea/contentModel.xml b/.idea/.idea.serilog-filters-expressions/.idea/contentModel.xml
deleted file mode 100644
index 30d4ae5..0000000
--- a/.idea/.idea.serilog-filters-expressions/.idea/contentModel.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ContentModelStore">
-    <e p="$USER_HOME$/.Rider2018.1/system/resharper-host/local/Transient/ReSharperHost/v12/SolutionCaches/_serilog-filters-expressions.1711640538.00" t="ExcludeRecursive" />
-    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.abstractions.dll" t="Include" />
-    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.reporters.net452.dll" t="Include" />
-    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.utility.net452.dll" t="Include" />
-    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.visualstudio.testadapter.dll" t="Include" />
-    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.reporters.netcoreapp10.dll" t="Include" />
-    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.utility.netcoreapp10.dll" t="Include" />
-    <e p="$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.visualstudio.dotnetcore.testadapter.dll" t="Include" />
-    <e p="$PROJECT_DIR$" t="IncludeFlat">
-      <e p=".gitattributes" t="Include" />
-      <e p=".gitignore" t="Include" />
-      <e p="Build.ps1" t="Include" />
-      <e p="LICENSE" t="Include" />
-      <e p="README.md" t="Include" />
-      <e p="RunPerfTests.ps1" t="Include" />
-      <e p="appveyor.yml" t="Include" />
-      <e p="example" t="Include">
-        <e p="Sample" t="IncludeRecursive">
-          <e p="Program.cs" t="Include" />
-          <e p="Properties" t="Include">
-            <e p="AssemblyInfo.cs" t="Include" />
-          </e>
-          <e p="Sample.csproj" t="IncludeRecursive" />
-          <e p="bin" t="ExcludeRecursive" />
-          <e p="obj" t="ExcludeRecursive">
-            <e p="Debug" t="Include">
-              <e p="netcoreapp1.0" t="Include">
-                <e p="Sample.AssemblyInfo.cs" t="Include" />
-              </e>
-            </e>
-          </e>
-        </e>
-      </e>
-      <e p="global" t="Include" />
-      <e p="packages" t="ExcludeRecursive" />
-      <e p="serilog-filters-expressions.sln" t="IncludeFlat" />
-      <e p="src" t="Include">
-        <e p="Serilog.Filters.Expressions" t="IncludeRecursive">
-          <e p="Filters" t="Include">
-            <e p="Expressions" t="Include">
-              <e p="Ast" t="Include">
-                <e p="FilterArrayExpression.cs" t="Include" />
-                <e p="FilterCallExpression.cs" t="Include" />
-                <e p="FilterConstantExpression.cs" t="Include" />
-                <e p="FilterExpression.cs" t="Include" />
-                <e p="FilterExpressionType.cs" t="Include" />
-                <e p="FilterLambdaExpression.cs" t="Include" />
-                <e p="FilterParameterExpression.cs" t="Include" />
-                <e p="FilterPropertyExpression.cs" t="Include" />
-                <e p="FilterSubpropertyExpression.cs" t="Include" />
-                <e p="FilterTextExpression.cs" t="Include" />
-                <e p="FilterTextMatching.cs" t="Include" />
-                <e p="FilterWildcard.cs" t="Include" />
-                <e p="FilterWildcardExpression.cs" t="Include" />
-              </e>
-              <e p="Compilation" t="Include">
-                <e p="Arrays" t="Include">
-                  <e p="FilterExpressionConstantArrayEvaluator.cs" t="Include" />
-                </e>
-                <e p="CompiledFilterExpression.cs" t="Include" />
-                <e p="Costing" t="Include">
-                  <e p="FilterExpressionCostReordering.cs" t="Include" />
-                  <e p="FilterExpressionCosting.cs" t="Include" />
-                </e>
-                <e p="FilterExpressionCompiler.cs" t="Include" />
-                <e p="In" t="Include">
-                  <e p="FilterExpressionNotInRewriter.cs" t="Include" />
-                </e>
-                <e p="Is" t="Include">
-                  <e p="IsOperatorTransformer.cs" t="Include" />
-                </e>
-                <e p="Like" t="Include">
-                  <e p="LikeOperatorTransformer.cs" t="Include" />
-                </e>
-                <e p="Linq" t="Include">
-                  <e p="ExpressionConstantMapper.cs" t="Include" />
-                  <e p="LinqExpressionCompiler.cs" t="Include" />
-                  <e p="ParameterReplacementVisitor.cs" t="Include" />
-                </e>
-                <e p="Properties" t="Include">
-                  <e p="PropertiesObjectAccessorTransformer.cs" t="Include" />
-                </e>
-                <e p="Text" t="Include">
-                  <e p="IndexOfIgnoreCaseCallRewriter.cs" t="Include" />
-                  <e p="MatchingRewriter.cs" t="Include" />
-                  <e p="RegexSecondMatchCallRewriter.cs" t="Include" />
-                  <e p="SymmetricMatchCallRewriter.cs" t="Include" />
-                  <e p="TextMatchingTransformer.cs" t="Include" />
-                </e>
-                <e p="Transformations" t="Include">
-                  <e p="FilterExpressionIdentityTransformer.cs" t="Include" />
-                  <e p="FilterExpressionNodeReplacer.cs" t="Include" />
-                  <e p="FilterExpressionTransformer`1.cs" t="Include" />
-                </e>
-                <e p="Wildcards" t="Include">
-                  <e p="FilterExpressionWildcardSearch.cs" t="Include" />
-                  <e p="WildcardComprehensionTransformer.cs" t="Include" />
-                </e>
-              </e>
-              <e p="FilterExpressionLanguage.cs" t="Include" />
-              <e p="LoggingFilterSwitch.cs" t="Include" />
-              <e p="Operators.cs" t="Include" />
-              <e p="Parsing" t="Include">
-                <e p="FilterExpressionKeyword.cs" t="Include" />
-                <e p="FilterExpressionParser.cs" t="Include" />
-                <e p="FilterExpressionTextParsers.cs" t="Include" />
-                <e p="FilterExpressionToken.cs" t="Include" />
-                <e p="FilterExpressionTokenParsers.cs" t="Include" />
-                <e p="FilterExpressionTokenizer.cs" t="Include" />
-                <e p="ParserExtensions.cs" t="Include" />
-              </e>
-              <e p="Runtime" t="Include">
-                <e p="AcceptNullAttribute.cs" t="Include" />
-                <e p="AcceptUndefinedAttribute.cs" t="Include" />
-                <e p="BooleanAttribute.cs" t="Include" />
-                <e p="NumericAttribute.cs" t="Include" />
-                <e p="NumericComparableAttribute.cs" t="Include" />
-                <e p="Representation.cs" t="Include" />
-                <e p="RuntimeOperators.cs" t="Include" />
-                <e p="Undefined.cs" t="Include" />
-              </e>
-            </e>
-          </e>
-          <e p="LoggerFilterConfigurationExtensions.cs" t="Include" />
-          <e p="Properties" t="Include">
-            <e p="AssemblyInfo.cs" t="Include" />
-          </e>
-          <e p="Serilog.Filters.Expressions.csproj" t="IncludeRecursive" />
-          <e p="bin" t="ExcludeRecursive" />
-          <e p="obj" t="ExcludeRecursive">
-            <e p="Debug" t="Include">
-              <e p="net4.5" t="Include">
-                <e p="Serilog.Filters.Expressions.AssemblyInfo.cs" t="Include" />
-              </e>
-              <e p="netstandard1.5" t="Include">
-                <e p="Serilog.Filters.Expressions.AssemblyInfo.cs" t="Include" />
-              </e>
-            </e>
-          </e>
-        </e>
-      </e>
-      <e p="test" t="Include">
-        <e p="Serilog.Filters.Expressions.PerformanceTests" t="IncludeRecursive">
-          <e p="ComparisonBenchmark.cs" t="Include" />
-          <e p="Harness.cs" t="Include" />
-          <e p="Serilog.Filters.Expressions.PerformanceTests.csproj" t="IncludeRecursive" />
-          <e p="Support" t="Include">
-            <e p="NullSink.cs" t="Include" />
-            <e p="Some.cs" t="Include" />
-          </e>
-          <e p="bin" t="ExcludeRecursive" />
-          <e p="obj" t="ExcludeRecursive">
-            <e p="Debug" t="Include">
-              <e p="net4.6.2" t="Include">
-                <e p="Serilog.Filters.Expressions.PerformanceTests.AssemblyInfo.cs" t="Include" />
-                <e p="Serilog.Filters.Expressions.PerformanceTests.Program.cs" t="Include" />
-              </e>
-              <e p="netcoreapp2.0" t="Include">
-                <e p="Serilog.Filters.Expressions.PerformanceTests.AssemblyInfo.cs" t="Include" />
-                <e p="Serilog.Filters.Expressions.PerformanceTests.Program.cs" t="Include" />
-              </e>
-            </e>
-          </e>
-        </e>
-        <e p="Serilog.Filters.Expressions.Tests" t="IncludeRecursive">
-          <e p="FilterExpressionCompilerTests.cs" t="Include" />
-          <e p="FilterExpressionParserTests.cs" t="Include" />
-          <e p="LoggingFilterSwitchTests.cs" t="Include" />
-          <e p="PackagingTests.cs" t="Include" />
-          <e p="Properties" t="Include">
-            <e p="launchSettings.json" t="Include" />
-          </e>
-          <e p="Serilog.Filters.Expressions.Tests.csproj" t="IncludeRecursive" />
-          <e p="Support" t="Include">
-            <e p="CollectingSink.cs" t="Include" />
-            <e p="Some.cs" t="Include" />
-          </e>
-          <e p="bin" t="ExcludeRecursive" />
-          <e p="obj" t="ExcludeRecursive">
-            <e p="Debug" t="Include">
-              <e p="net4.6.2" t="Include">
-                <e p="Serilog.Filters.Expressions.Tests.AssemblyInfo.cs" t="Include" />
-                <e p="Serilog.Filters.Expressions.Tests.Program.cs" t="Include" />
-              </e>
-              <e p="netcoreapp2.0" t="Include">
-                <e p="Serilog.Filters.Expressions.Tests.AssemblyInfo.cs" t="Include" />
-                <e p="Serilog.Filters.Expressions.Tests.Program.cs" t="Include" />
-              </e>
-            </e>
-          </e>
-        </e>
-      </e>
-    </e>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/.idea/indexLayout.xml b/.idea/.idea.serilog-filters-expressions/.idea/indexLayout.xml
deleted file mode 100644
index f1feadf..0000000
--- a/.idea/.idea.serilog-filters-expressions/.idea/indexLayout.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ContentModelUserStore">
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/.idea/modules.xml b/.idea/.idea.serilog-filters-expressions/.idea/modules.xml
deleted file mode 100644
index e3c7652..0000000
--- a/.idea/.idea.serilog-filters-expressions/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.serilog-filters-expressions/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.serilog-filters-expressions/riderModule.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/.idea/vcs.xml b/.idea/.idea.serilog-filters-expressions/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/.idea.serilog-filters-expressions/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/.idea/workspace.xml b/.idea/.idea.serilog-filters-expressions/.idea/workspace.xml
deleted file mode 100644
index 91ccdd1..0000000
--- a/.idea/.idea.serilog-filters-expressions/.idea/workspace.xml
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="f5a33502-3407-4ef1-bf58-d4af9d35166d" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/app.config" beforeDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
-      <file leaf-file-name="Serilog.Filters.Expressions.csproj" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="467">
-              <caret line="21" lean-forward="true" selection-start-line="20" selection-end-line="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="LoggerFilterConfigurationExtensions.cs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/LoggerFilterConfigurationExtensions.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <folding>
-                <marker date="1527068665414" expanded="false" signature="6:77" ph="..." />
-                <marker date="1527068665414" expanded="true" signature="96:2893" ph="{...}" />
-                <marker date="1527068665414" expanded="true" signature="103:217" ph="/// Extends logger configuration with methods for filtering with expressions. ... " />
-                <marker date="1527068665414" expanded="true" signature="277:2891" ph="{...}" />
-                <marker date="1527068665414" expanded="true" signature="292:633" ph="/// Include only log events that match the provided expression. ... " />
-                <marker date="1527068665414" expanded="true" signature="768:1158" ph="{...}" />
-                <marker date="1527068665414" expanded="true" signature="1168:1504" ph="/// Exclude log events that match the provided expression. ... " />
-                <marker date="1527068665414" expanded="true" signature="1635:2021" ph="{...}" />
-                <marker date="1527068665414" expanded="true" signature="2031:2460" ph="/// Use a &lt;see cref=&quot;LoggingFilterSwitch&quot;/&gt; to dynamically control filtering. ... " />
-                <marker date="1527068665414" expanded="true" signature="2602:2885" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Serilog.Filters.Expressions.Tests.csproj" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="62">
-              <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Serilog.Filters.Expressions.PerformanceTests.csproj" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="616">
-              <caret line="21" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="FilterExpressionParserTests.cs" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="506">
-              <caret line="66" column="64" selection-start-line="66" selection-start-column="64" selection-end-line="66" selection-end-column="64" />
-              <folding>
-                <marker date="1527071232270" expanded="false" signature="6:69" ph="..." />
-                <marker date="1527071232270" expanded="true" signature="114:3942" ph="{...}" />
-                <marker date="1527071232270" expanded="true" signature="161:3940" ph="{...}" />
-                <marker date="1527071232270" expanded="true" signature="2489:2641" ph="{...}" />
-                <marker date="1527071232270" expanded="true" signature="3173:3282" ph="{...}" />
-                <marker date="1527071232270" expanded="true" signature="3761:3934" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/LoggerFilterConfigurationExtensions.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/553D3306-7298-43D3-851B-E2645BB2DA18/d2/82ad09b4/Tokenizer`1.cs" root0="SKIP_INSPECTION" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs" />
-        <option value="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj" />
-        <option value="$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj" />
-        <option value="$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj" />
-        <option value="$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="695" />
-    <option name="y" value="50" />
-    <option name="width" value="1587" />
-    <option name="height" value="1298" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="SolutionExplorer" proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scratches" />
-      <pane id="SolutionExplorer">
-        <subPane>
-          <expand>
-            <path>
-              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
-              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
-            </path>
-            <path>
-              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
-              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
-              <item name="src" type="977d5f41:SolutionExplorerNodeRider" />
-            </path>
-            <path>
-              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
-              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
-              <item name="src" type="977d5f41:SolutionExplorerNodeRider" />
-              <item name="Serilog.Filters.Expressions" type="977d5f41:SolutionExplorerNodeRider" />
-            </path>
-            <path>
-              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
-              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
-              <item name="test" type="977d5f41:SolutionExplorerNodeRider" />
-            </path>
-            <path>
-              <item name="" type="13324e5d:SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" />
-              <item name="serilog-filters-expressions (4 projects)" type="977d5f41:SolutionExplorerNodeRider" />
-              <item name="test" type="977d5f41:SolutionExplorerNodeRider" />
-              <item name="Serilog.Filters.Expressions.Tests" type="977d5f41:SolutionExplorerNodeRider" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-        <option name="show-file-system" value="false" />
-        <option name="show-all-items" value="false" />
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="Rider.ProjectViewActivator.IsNotFirstRun" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="RiderUnitTestingPageId" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager" selected=".NET Project.Default">
-    <configuration name="Default" type="DotNetProject" factoryName=".NET Project">
-      <option name="EXE_PATH" value="" />
-      <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="PASS_PARENT_ENVS" value="1" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="PROJECT_PATH" value="" />
-      <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-      <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-      <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-      <option name="PROJECT_KIND" value="None" />
-      <option name="PROJECT_TFM" value="" />
-    </configuration>
-    <list>
-      <item itemvalue=".NET Project.Default" />
-    </list>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="f5a33502-3407-4ef1-bf58-d4af9d35166d" name="Default" comment="" />
-      <created>1527068703066</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1527068703066</updated>
-      <workItem from="1527068705142" duration="1214000" />
-      <workItem from="1527069958414" duration="1648000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2862000" />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="98" y="50" width="2462" height="1390" extended-state="6" />
-    <layout>
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Errors In Solution" order="3" />
-      <window_info anchor="bottom" id="Messages" sideWeight="0.49957982" weight="0.32942238" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50084037" side_tool="true" weight="0.36101082" />
-      <window_info active="true" anchor="bottom" id="Unit Tests" order="7" sideWeight="0.49915966" visible="true" weight="0.36101082" />
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="7" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32942238" />
-      <window_info anchor="bottom" id="NuGet" order="7" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25630254" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Build" order="7" weight="0.32942238" />
-      <window_info anchor="right" id="Database" order="3" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="744">
-          <caret line="24" column="67" selection-start-line="24" selection-start-column="67" selection-end-line="24" selection-end-column="67" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4433">
-          <caret line="145" column="46" selection-start-line="145" selection-start-column="46" selection-end-line="145" selection-end-column="46" />
-          <folding>
-            <marker date="1527069719934" expanded="false" signature="6:75" ph="..." />
-            <marker date="1527069719934" expanded="true" signature="122:8717" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="195:8715" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="410:1060" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="1135:1824" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="1869:2914" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="3100:8289" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="3298:4437" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="3439:3656" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="3681:4158" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="4267:4419" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="4482:4896" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="4940:5712" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="5332:5501" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="5526:5694" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="5785:6572" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="6232:6368" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="6393:6554" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="6779:7220" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="7241:8187" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="7402:7625" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="7740:7950" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="7975:8169" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="8374:8709" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="8428:8622" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="8499:8608" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/553D3306-7298-43D3-851B-E2645BB2DA18/d2/82ad09b4/Tokenizer`1.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="341">
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/553D3306-7298-43D3-851B-E2645BB2DA18/d2/82ad09b4/Tokenizer`1.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="145" column="46" selection-start-line="145" selection-start-column="46" selection-end-line="145" selection-end-column="46" />
-          <folding>
-            <marker date="1527069719934" expanded="false" signature="6:75" ph="..." />
-            <marker date="1527069719934" expanded="true" signature="122:8717" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="195:8715" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="410:1060" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="1135:1824" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="1869:2914" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="3100:8289" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="3298:4437" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="3439:3656" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="3681:4158" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="4267:4419" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="4482:4896" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="4940:5712" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="5332:5501" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="5526:5694" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="5785:6572" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="6232:6368" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="6393:6554" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="6779:7220" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="7241:8187" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="7402:7625" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="7740:7950" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="7975:8169" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="8374:8709" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="8428:8622" ph="{...}" />
-            <marker date="1527069719934" expanded="true" signature="8499:8608" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/Serilog.Filters.Expressions.Tests.csproj">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="62">
-          <caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.PerformanceTests/Serilog.Filters.Expressions.PerformanceTests.csproj">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="616">
-          <caret line="21" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/LoggerFilterConfigurationExtensions.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <marker date="1527068665414" expanded="false" signature="6:77" ph="..." />
-            <marker date="1527068665414" expanded="true" signature="96:2893" ph="{...}" />
-            <marker date="1527068665414" expanded="true" signature="103:217" ph="/// Extends logger configuration with methods for filtering with expressions. ... " />
-            <marker date="1527068665414" expanded="true" signature="277:2891" ph="{...}" />
-            <marker date="1527068665414" expanded="true" signature="292:633" ph="/// Include only log events that match the provided expression. ... " />
-            <marker date="1527068665414" expanded="true" signature="768:1158" ph="{...}" />
-            <marker date="1527068665414" expanded="true" signature="1168:1504" ph="/// Exclude log events that match the provided expression. ... " />
-            <marker date="1527068665414" expanded="true" signature="1635:2021" ph="{...}" />
-            <marker date="1527068665414" expanded="true" signature="2031:2460" ph="/// Use a &lt;see cref=&quot;LoggingFilterSwitch&quot;/&gt; to dynamically control filtering. ... " />
-            <marker date="1527068665414" expanded="true" signature="2602:2885" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="467">
-          <caret line="21" lean-forward="true" selection-start-line="20" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="66" column="64" selection-start-line="66" selection-start-column="64" selection-end-line="66" selection-end-column="64" />
-          <folding>
-            <marker date="1527071232270" expanded="false" signature="6:69" ph="..." />
-            <marker date="1527071232270" expanded="true" signature="114:3942" ph="{...}" />
-            <marker date="1527071232270" expanded="true" signature="161:3940" ph="{...}" />
-            <marker date="1527071232270" expanded="true" signature="2489:2641" ph="{...}" />
-            <marker date="1527071232270" expanded="true" signature="3173:3282" ph="{...}" />
-            <marker date="1527071232270" expanded="true" signature="3761:3934" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/.idea.serilog-filters-expressions/riderModule.iml b/.idea/.idea.serilog-filters-expressions/riderModule.iml
deleted file mode 100644
index e8439a1..0000000
--- a/.idea/.idea.serilog-filters-expressions/riderModule.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RIDER_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.abstractions.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.reporters.net452.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.utility.net452.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/_common/xunit.runner.visualstudio.testadapter.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.reporters.netcoreapp10.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.utility.netcoreapp10.dll" />
-    <content url="file://$USER_HOME$/.nuget/packages/xunit.runner.visualstudio/2.3.1/build/netcoreapp1.0/xunit.runner.visualstudio.dotnetcore.testadapter.dll" />
-    <content url="file://$MODULE_DIR$/../.." />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

From d6e6eb9fc592edf4e1f8bdb0c44ac8addab9d33e Mon Sep 17 00:00:00 2001
From: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Date: Mon, 11 Jun 2018 07:53:51 +1000
Subject: [PATCH 5/6] Fix assembly versioning test, general cleanup, fix
 tokenizer recognition of '+' as a delimiter

---
 .../Expressions/FilterExpressionLanguage.cs       |  9 +++------
 .../Expressions/Parsing/FilterExpressionParser.cs | 11 +++--------
 .../Parsing/FilterExpressionTokenParsers.cs       |  9 ++++++++-
 .../Parsing/FilterExpressionTokenizer.cs          | 15 ++++++++++++---
 .../Serilog.Filters.Expressions.csproj            |  2 +-
 .../FilterExpressionParserTests.cs                |  1 +
 .../PackagingTests.cs                             |  2 +-
 7 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/Serilog.Filters.Expressions/Filters/Expressions/FilterExpressionLanguage.cs b/src/Serilog.Filters.Expressions/Filters/Expressions/FilterExpressionLanguage.cs
index 11f6c23..7b67953 100644
--- a/src/Serilog.Filters.Expressions/Filters/Expressions/FilterExpressionLanguage.cs
+++ b/src/Serilog.Filters.Expressions/Filters/Expressions/FilterExpressionLanguage.cs
@@ -1,5 +1,4 @@
 using Serilog.Events;
-using Serilog.Filters.Expressions.Ast;
 using Serilog.Filters.Expressions.Compilation;
 using System;
 using System.Linq;
@@ -19,9 +18,7 @@ public static class FilterLanguage
         /// <returns>A function that evaluates the expression in the context of the log event.</returns>
         public static Func<LogEvent, object> CreateFilter(string expression)
         {
-            Func<LogEvent, object> filter;
-            string error;
-            if (!TryCreateFilter(expression, out filter, out error))
+            if (!TryCreateFilter(expression, out var filter, out var error))
                 throw new ArgumentException(error);
 
             return filter;
@@ -36,8 +33,7 @@ public static Func<LogEvent, object> CreateFilter(string expression)
         /// <returns>True if the filter could be created; otherwise, false.</returns>
         public static bool TryCreateFilter(string expression, out Func<LogEvent, object> filter, out string error)
         {
-            FilterExpression root;
-            if (!FilterExpressionParser.TryParse(expression, out root, out error))
+            if (!FilterExpressionParser.TryParse(expression, out var root, out error))
             {
                 filter = null;
                 return false;
@@ -54,6 +50,7 @@ public static bool TryCreateFilter(string expression, out Func<LogEvent, object>
         /// <param name="text">The text to escape.</param>
         /// <returns>The text with any special values escaped. Will need to be passed through
         /// <see cref="EscapeStringContent(string)"/> if it is being embedded directly into a filter expression.</returns>
+        // ReSharper disable once UnusedMember.Global
         public static string EscapeLikeExpressionContent(string text)
         {
             if (text == null) throw new ArgumentNullException(nameof(text));
diff --git a/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionParser.cs b/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionParser.cs
index 52d3970..a0c47e9 100644
--- a/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionParser.cs
+++ b/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionParser.cs
@@ -1,6 +1,5 @@
 using System;
 using Serilog.Filters.Expressions.Ast;
-using Superpower;
 
 namespace Serilog.Filters.Expressions.Parsing
 {
@@ -8,9 +7,7 @@ static class FilterExpressionParser
     {
         public static FilterExpression Parse(string filterExpression)
         {
-            FilterExpression root;
-            string error;
-            if (!TryParse(filterExpression, out root, out error))
+            if (!TryParse(filterExpression, out var root, out var error))
                 throw new ArgumentException(error);
 
             return root;
@@ -20,9 +17,7 @@ public static bool TryParse(string filterExpression, out FilterExpression root,
         {
             if (filterExpression == null) throw new ArgumentNullException(nameof(filterExpression));
 
-            var tokenizer = new FilterExpressionTokenizer();
-            var tokenList = tokenizer.TryTokenize(filterExpression);
-            
+            var tokenList = FilterExpressionTokenizer.Instance.TryTokenize(filterExpression);       
             if (!tokenList.HasValue)
             {
                 error = tokenList.ToString();
@@ -30,7 +25,7 @@ public static bool TryParse(string filterExpression, out FilterExpression root,
                 return false;
             }
 
-            var result = FilterExpressionTokenParsers.Expr.AtEnd().TryParse(tokenList.Value);
+            var result = FilterExpressionTokenParsers.TryParse(tokenList.Value);
             if (!result.HasValue)
             {
                 error = result.ToString();
diff --git a/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenParsers.cs b/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenParsers.cs
index f214aff..ff3dac8 100644
--- a/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenParsers.cs
+++ b/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenParsers.cs
@@ -4,11 +4,18 @@
 using System;
 using System.Globalization;
 using System.Linq;
+using Superpower.Model;
 
 namespace Serilog.Filters.Expressions.Parsing
 {
     static class FilterExpressionTokenParsers
     {
+        public static TokenListParserResult<FilterExpressionToken, FilterExpression> TryParse(
+            TokenList<FilterExpressionToken> input)
+        {
+            return Expr.AtEnd().TryParse(input);
+        }
+
         static readonly TokenListParser<FilterExpressionToken, string> Add = Token.EqualTo(FilterExpressionToken.Plus).Value(Operators.OpAdd);
         static readonly TokenListParser<FilterExpressionToken, string> Subtract = Token.EqualTo(FilterExpressionToken.Minus).Value(Operators.OpSubtract);
         static readonly TokenListParser<FilterExpressionToken, string> Multiply = Token.EqualTo(FilterExpressionToken.Asterisk).Value(Operators.OpMultiply);
@@ -130,7 +137,7 @@ from factor in Factor
 
         static readonly TokenListParser<FilterExpressionToken, FilterExpression> Disjunction = Parse.Chain(Or, Conjunction, MakeBinary);
 
-        public static readonly TokenListParser<FilterExpressionToken, FilterExpression> Expr = Disjunction;
+        static readonly TokenListParser<FilterExpressionToken, FilterExpression> Expr = Disjunction;
 
         static FilterExpression MakeBinary(string operatorName, FilterExpression leftOperand, FilterExpression rightOperand)
         {
diff --git a/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs b/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs
index 2ab1c90..bdc038b 100644
--- a/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs
+++ b/src/Serilog.Filters.Expressions/Filters/Expressions/Parsing/FilterExpressionTokenizer.cs
@@ -27,7 +27,7 @@ class FilterExpressionTokenizer : Tokenizer<FilterExpressionToken>
             FilterExpressionToken.Is
         };
 
-        static readonly FilterExpressionKeyword[] SqlKeywords =
+        static readonly FilterExpressionKeyword[] Keywords =
         {
             new FilterExpressionKeyword("and", FilterExpressionToken.And),
             new FilterExpressionKeyword("in", FilterExpressionToken.In),
@@ -90,7 +90,7 @@ protected override IEnumerable<Result<FilterExpressionToken>> Tokenize(
                         next = real.Remainder.ConsumeChar();
                     }
 
-                    if (next.HasValue && !char.IsPunctuation(next.Value) && !char.IsWhiteSpace(next.Value))
+                    if (!IsDelimiter(next))
                     {
                         yield return Result.Empty<FilterExpressionToken>(next.Location, new[] { "digit" });
                     }
@@ -178,9 +178,16 @@ protected override IEnumerable<Result<FilterExpressionToken>> Tokenize(
             } while (next.HasValue);
         }
 
+        static bool IsDelimiter(Result<char> next)
+        {
+            return !next.HasValue ||
+                   char.IsWhiteSpace(next.Value) ||
+                   next.Value < SimpleOps.Length && SimpleOps[next.Value] != FilterExpressionToken.None;
+        }
+
         static bool TryGetKeyword(TextSpan span, out FilterExpressionToken keyword)
         {
-            foreach (var kw in SqlKeywords)
+            foreach (var kw in Keywords)
             {
                 if (span.EqualsValueIgnoreCase(kw.Text))
                 {
@@ -192,5 +199,7 @@ static bool TryGetKeyword(TextSpan span, out FilterExpressionToken keyword)
             keyword = FilterExpressionToken.None;
             return false;
         }
+        
+        public static FilterExpressionTokenizer Instance { get; } = new FilterExpressionTokenizer();
     }
 }
diff --git a/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj b/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
index 26aa862..1f10000 100644
--- a/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
+++ b/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.7.1" />
-    <PackageReference Include="Superpower" Version="2.0.0-dev-00107" />
+    <PackageReference Include="Superpower" Version="2.0.0-*" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net4.5' ">
diff --git a/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs b/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs
index 034a231..4c771ec 100644
--- a/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs
+++ b/test/Serilog.Filters.Expressions.Tests/FilterExpressionParserTests.cs
@@ -38,6 +38,7 @@ public class FilterExpressionParserTests
         [InlineData("@EventType = 0xC0ffee", "Equal(@EventType,12648430)")]
         [InlineData("@Level in ['Error', 'Warning']", "_Internal_In(@Level,[@\"Error\",@\"Warning\"])")]
         [InlineData("5 not in [1, 2]", "_Internal_NotIn(5,[1,2])")]
+        [InlineData("1+1", "Add(1,1)")]
         public void ValidSyntaxIsAccepted(string input, string expected = null)
         {
             var roundTrip = FilterExpressionParser.Parse(input).ToString();
diff --git a/test/Serilog.Filters.Expressions.Tests/PackagingTests.cs b/test/Serilog.Filters.Expressions.Tests/PackagingTests.cs
index 07ba975..5cfff1d 100644
--- a/test/Serilog.Filters.Expressions.Tests/PackagingTests.cs
+++ b/test/Serilog.Filters.Expressions.Tests/PackagingTests.cs
@@ -9,7 +9,7 @@ public class PackagingTests
         public void AssemblyVersionIsSet()
         {
             var version = typeof(LoggerFilterConfigurationExtensions).GetTypeInfo().Assembly.GetName().Version;
-            Assert.Equal("1", version.ToString(1));
+            Assert.Equal("2", version.ToString(1));
         }
     }
 }

From 8b9ded8800da24ed958b43b5e5598c103d62ed3e Mon Sep 17 00:00:00 2001
From: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Date: Mon, 11 Jun 2018 08:32:19 +1000
Subject: [PATCH 6/6] Superpower v2 final

---
 .../Serilog.Filters.Expressions.csproj                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj b/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
index 1f10000..9531817 100644
--- a/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
+++ b/src/Serilog.Filters.Expressions/Serilog.Filters.Expressions.csproj
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.7.1" />
-    <PackageReference Include="Superpower" Version="2.0.0-*" />
+    <PackageReference Include="Superpower" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net4.5' ">