Updates

Author: promicsw

Docs/FexElementsRef.md

@@ -432,9 +432,11 @@ A PreOp is efficient as it will execute only once while trying several *lookahea
 |`GlobalPreOp(Action<Ctx> preOp)`|Global setting to automatically attach to all operators.|
 |`PreOp(Action<Ctx> preOp)`| Use directly after an operator to attach/override a PreOp|
 
-See the Expression example which uses a SetPreOp to skip all spaces before the *tokens*
+See the Expression example which uses a GlobalPreOp to skip all spaces before the *tokens*
 
-> **Note** The preOp action may be null if no PreOp should be executed.
+> **Notes:** 
+> - The preOp action may be null if no PreOp should be executed.
+> - The above mechanism could then be used to *switch off* the GlobalPreOp for selected Op's.
 
 [(toc)](#id-toc)
 

FexSampleSet/Program.cs

@@ -248,7 +248,7 @@ void ExpressionREPL() {
 
     var primary = fex.Seq(s => s.RefName("primary")
         .OneOf(o => o
-            .Seq(e => e.Ch('(').Ref("expr").Ch(')').OnFail(") expected"))
+            .Seq(e => e.Ch('(').Fex(expr).Ch(')').OnFail(") expected"))
             .Seq(s => s.NumDecimal(n => numStack.Push(n)))
             .Seq(s => s.Ch('a').Act(c => numStack.Push(ans)))  // a is previous answer
          ));
@@ -260,6 +260,7 @@ void ExpressionREPL() {
             Console.Write("> ");
             var line = Console.ReadLine();
             if (string.IsNullOrEmpty(line)) return false;
+            //Console.WriteLine($"Line:{line}");
             c.SetSource(line);
 
             if (exprEval.Run(scn)) {

Psw.FlowExpressions/FexScannerExt.cs

@@ -116,7 +116,7 @@ public static FexBuilder<T> IsString<T>(this FexBuilder<T> exp, string matchStri
         /// <param name="comp">Comparison type (default = StringComparison.InvariantCultureIgnoreCase)</param>
         /// <returns>True and matching string is logged as a Value, else false</returns>
         public static FexBuilder<T> IsAnyString<T>(this FexBuilder<T> exp, IEnumerable<string> matchStrings, bool advanceIndex = true, StringComparison comp = StringComparison.InvariantCultureIgnoreCase) where T : FexScanner
-            => exp.Op((c, v) => v.SetValue(c.IsAnyString(matchStrings, advanceIndex, comp), c.Token));
+            => exp.Op((c, v) => v.SetValue(c.IsAnyString(matchStrings, advanceIndex, comp), c.Match));
 
         /// <summary>
         /// Check if text at Index equals any string in matchString and optionally advance Index if it matches.<br/>
@@ -126,7 +126,7 @@ public static FexBuilder<T> IsAnyString<T>(this FexBuilder<T> exp, IEnumerable<s
         /// <param name="comp">Comparison type (default = StringComparison.InvariantCultureIgnoreCase)</param>
         /// <returns>True and matching string is logged as a Value, else false</returns>
         public static FexBuilder<T> IsAnyString<T>(this FexBuilder<T> exp, string matchStrings, bool advanceIndex = true, StringComparison comp = StringComparison.InvariantCultureIgnoreCase) where T : FexScanner
-            => exp.Op((c, v) => v.SetValue(c.IsAnyString(matchStrings, advanceIndex, comp), c.Token));
+            => exp.Op((c, v) => v.SetValue(c.IsAnyString(matchStrings, advanceIndex, comp), c.Match));
 
         // Skip Operations ====================================================
 
@@ -195,7 +195,7 @@ public static FexBuilder<T> SkipToStr<T>(this FexBuilder<T> exp, string str, boo
         ///   False: Not found or Eos. Index unchanged
         /// </returns>
         public static FexBuilder<T> SkipToAnyStr<T>(this FexBuilder<T> exp, IEnumerable<string> matchStrings, bool skipOver = false, StringComparison comp = StringComparison.InvariantCultureIgnoreCase) where T : FexScanner
-            => exp.Op((c, v) => v.SetValue(c.SkipToAnyStr(matchStrings, skipOver, comp), c.Token));
+            => exp.Op((c, v) => v.SetValue(c.SkipToAnyStr(matchStrings, skipOver, comp), c.Match));
 
         /// <summary>
         /// Skip up to first occurrence of any string in delimited matchStrings and optionally skip over the matching string.<br/>
@@ -209,7 +209,7 @@ public static FexBuilder<T> SkipToAnyStr<T>(this FexBuilder<T> exp, IEnumerable<
         ///   False: Not found or Eos. Index unchanged
         /// </returns>
         public static FexBuilder<T> SkipToAnyStr<T>(this FexBuilder<T> exp, string matchStrings, bool skipOver = false, StringComparison comp = StringComparison.InvariantCultureIgnoreCase) where T : FexScanner
-            => exp.Op((c, v) => v.SetValue(c.SkipToAnyStr(matchStrings, skipOver, comp), c.Token));
+            => exp.Op((c, v) => v.SetValue(c.SkipToAnyStr(matchStrings, skipOver, comp), c.Match));
 
         /// <summary>
         /// Skip to Eol or Eos (last line)<br/>

Psw.FlowExpressions/FlowExpression.cs

@@ -49,7 +49,7 @@ protected FexElement<T> _Prod(FexElement<T> prod, Action<FexBuilder<T>> build)
         /// <summary>
         /// Define an optional set of sequences where one of them may pass
         /// </summary>
-        public FexElement<T> OptOneOf(Action<FexBuilder<T>> buildFex) => Opt(o => OneOf(buildFex));
+        public FexElement<T> OptOneOf(Action<FexBuilder<T>> buildFex) => Opt(o => o.OneOf(buildFex));
 
         /// <summary>
         /// Inverse of OneOf, where it fails if any sequence passes<br />
@@ -83,6 +83,6 @@ protected FexElement<T> _Prod(FexElement<T> prod, Action<FexBuilder<T>> build)
         /// <summary>
         /// Repeat a OneOf construct repMin up to repMax times (-1 for any reps > repMin) (see documentation for details)
         /// </summary>
-        public FexElement<T> RepOneOf(int repMin, int repMax, Action<FexBuilder<T>> buildFex) => Rep(repMin, repMax, r => OneOf(buildFex));
+        public FexElement<T> RepOneOf(int repMin, int repMax, Action<FexBuilder<T>> buildFex) => Rep(repMin, repMax, r => r.OneOf(buildFex));
     }
 }

Psw.FlowExpressions/Psw.FlowExpressions.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Psw.Scanners" Version="1.0.0" />
+    <PackageReference Include="Psw.Scanners" Version="1.0.1" />
   </ItemGroup>
 
 </Project>