Updated Matcher library versions to v2.0.0

(cherry picked from commit ed0d445beb1ee4347ad966de5947fac83e7f95a3)
synfron · Mar 27, 2022 · e4370c0 · e4370c0
1 parent 1c7fb7c
commit e4370c0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/src/Matcher.Interop.Ebnf/Matcher.Interop.Ebnf.csproj b/src/Matcher.Interop.Ebnf/Matcher.Interop.Ebnf.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Synfron.Staxe.Matcher.Interop.Bnf</RootNamespace>
     <AssemblyName>Synfron.Staxe.Matcher.Interop.Bnf</AssemblyName>
-    <Version>1.0.1</Version>
+    <Version>2.0.0</Version>
     <Authors>Daquanne Dwight</Authors>
     <Company>Synfron</Company>
     <Copyright>© Daquanne Dwight</Copyright>

diff --git a/src/Matcher.Interop.Model/DefinitionConverter.cs b/src/Matcher.Interop.Model/DefinitionConverter.cs
@@ -36,7 +36,7 @@ public static LanguageMatcher Convert(LanguageMatcherDefinition languageMatcherM
 					id: matcherIndex + 1,
 					name: model.Name,
 					parts: new List<IMatcher>(),
-					fallThroughMode: model.FallThrough ? FallThroughMode.All : model.FallThroughMode,
+					fallThroughMode: model.FallThroughMode,
 					isNoise: model.IsNoise,
 					partsDelimiterRequired: model.PartsDelimiterRequired,
 					partsMatchMode: model.PartsMatchMode,
@@ -134,7 +134,6 @@ FragmentMatcherDefinition ConvertFragment(FragmentMatcher fragmentMatcher)
 					ExpressionMode = fragmentMatcher.ExpressionMode,
 					ExpressionOrder = fragmentMatcher.ExpressionOrder,
 					FallThroughMode = fragmentMatcher.FallThroughMode,
-					FallThrough = fragmentMatcher.FallThroughMode == FallThroughMode.All,
 					IsNoise = fragmentMatcher.IsNoise,
 					MinMatchedParts = fragmentMatcher.MinMatchedParts,
 					Negate = fragmentMatcher.Negate,

diff --git a/src/Matcher.Interop.Model/FragmentMatcherDefinition.cs b/src/Matcher.Interop.Model/FragmentMatcherDefinition.cs
@@ -42,7 +42,7 @@ public string Name
 
 		public FallThroughMode FallThroughMode { get; set; } = FallThroughMode.None;
 
-		[Obsolete("Replaced by FallThroughMode")]
+		[Obsolete("Replaced by FallThroughMode", true)]
 		public bool FallThrough { get; set; }
 
 		public bool Cacheable { get; set; }

diff --git a/src/Matcher.Interop.Model/Matcher.Interop.Model.csproj b/src/Matcher.Interop.Model/Matcher.Interop.Model.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Synfron.Staxe.Matcher.Interop.Model</RootNamespace>
     <AssemblyName>Synfron.Staxe.Matcher.Interop.Model</AssemblyName>
-    <Version>1.0.1</Version>
+    <Version>2.0.0</Version>
     <Authors>Daquanne Dwight</Authors>
     <Company>Synfron</Company>
     <Copyright>© Daquanne Dwight</Copyright>

diff --git a/src/Matcher.Interop/Matcher.Interop.csproj b/src/Matcher.Interop/Matcher.Interop.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Synfron.Staxe.Matcher.Interop</AssemblyName>
     <RootNamespace>Synfron.Staxe.Matcher.Interop</RootNamespace>
-    <Version>1.0.1</Version>
+    <Version>2.0.0</Version>
     <Authors>Daquanne Dwight</Authors>
     <Company>Synfron</Company>
     <Copyright>© Daquanne Dwight</Copyright>

diff --git a/src/Matcher/Matcher.csproj b/src/Matcher/Matcher.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Synfron.Staxe.Matcher</RootNamespace>
     <AssemblyName>Synfron.Staxe.Matcher</AssemblyName>
-    <Version>1.0.1</Version>
+    <Version>2.0.0</Version>
     <Authors>Daquanne Dwight</Authors>
     <Company>Synfron</Company>
     <Copyright>© Daquanne Dwight</Copyright>