Fixed problem where IJ4JLogger wasn't being passed correctly among objects. Fixed problem where tokens weren't being created if the initial token was text (which will always be the case if the program's path is passed). Enhanced error messages when parsing problems encountered.

Author: markolbert

Binder/J4JCommandLineSource.cs

@@ -11,25 +11,23 @@ public class J4JCommandLineSource : IConfigurationSource
 
         public J4JCommandLineSource(
             IOptionCollection options,
-            string cmdLine,
-            Func<IJ4JLogger>? loggerFactory = null
+            string cmdLine
         )
         {
             Options = options;
             _cmdLine = cmdLine;
 
-            var tokenizer = new Tokenizer( options.CommandLineStyle, options.MasterText.TextComparison, loggerFactory );
-            var parsingTable = new ParsingTable( options, loggerFactory );
+            var tokenizer = new Tokenizer( options.CommandLineStyle, options.MasterText.TextComparison, options.LoggerFactory );
+            var parsingTable = new ParsingTable( options, options.LoggerFactory );
 
-            _parser = new Parser( options, tokenizer, parsingTable, loggerFactory?.Invoke() );
+            _parser = new Parser( options, tokenizer, parsingTable, options.LoggerFactory?.Invoke() );
         }
 
         public J4JCommandLineSource(
             IOptionCollection options,
-            string[] args,
-            Func<IJ4JLogger>? loggerFactory
+            string[] args
         )
-            : this( options, string.Join( " ", args ), loggerFactory )
+            : this( options, string.Join( " ", args ) )
         {
         }
 

Binder/grammar/Parser.cs

@@ -12,19 +12,16 @@ public Parser(
             CommandLineStyle style = CommandLineStyle.Windows,
             Func<IJ4JLogger>? loggerFactory = null
         )
-            : this( new OptionCollection( style ), loggerFactory )
+            : this( new OptionCollection( style, loggerFactory ) )
         {
         }
 
-        public Parser(
-            IOptionCollection options,
-            Func<IJ4JLogger>? loggerFactory = null
-        )
+        public Parser( IOptionCollection options )
             : this(
                 options,
-                new Tokenizer( options.CommandLineStyle, options.MasterText.TextComparison, loggerFactory ),
-                new ParsingTable( options, loggerFactory ),
-                (loggerFactory == null ? options.LoggerFactory : loggerFactory)?.Invoke() )
+                new Tokenizer( options.CommandLineStyle, options.MasterText.TextComparison, options.LoggerFactory ),
+                new ParsingTable( options, options.LoggerFactory ),
+                options.LoggerFactory?.Invoke() )
         {
         }
 
@@ -56,9 +53,7 @@ public bool Parse( string cmdLine )
 
             var allOkay = true;
 
-            var tokens = _tokenizer.Tokenize( cmdLine );
-            foreach( var token in tokens )
-                //foreach( var token in _tokenizer.Tokenize( cmdLine ) )
+            foreach( var token in _tokenizer.Tokenize(cmdLine))
             {
                 allOkay &= ParsingTable[ prevToken.Type, token.Type ]!( prevToken, token, token.Text );
 

Binder/grammar/TokenEntry.TokenEntries.cs

@@ -30,8 +30,8 @@ public bool Create( Token prevToken, Token curToken, params string[] args )
 
             public bool TerminateWithPrejuidice( Token prevToken, Token curToken, params string[] args )
             {
-                _logger?.Error( "{0} ('{1}') follows {2} ('{3}'), which is not allowed",
-                    new object[] { curToken.Type, curToken.Text, prevToken.Type, prevToken.Text } );
+                _logger?.Error( "{0} ('{1}') => {2} ('{3}'): {4}",
+                    new object[] { curToken.Type, curToken.Text, prevToken.Type, prevToken.Text, "invalid token sequence" } );
 
                 Current = null;
 
@@ -42,13 +42,26 @@ public bool Commit( Token prevToken, Token curToken, params string[] args )
             {
                 if( Current == null )
                 {
-                    _logger?.Error( "Attempted to commit undefined TokenEntry" );
+                    // if we're not yet building an entry but we received a KeyPrefix token we must be
+                    // about to start building one
+                    if( curToken.Type == TokenType.KeyPrefix )
+                        return Create( prevToken, curToken );
+
+                    _logger?.Error("{0} ('{1}') => {2} ('{3}'): {4}",
+                        new object[] { curToken.Type, curToken.Text, prevToken.Type, prevToken.Text, "undefined TokenEntry" });
+
                     return false;
                 }
 
                 if( Current.Option == null )
                 {
-                    _logger?.Error<string>( "Found entry with unexpected key '{0}'", Current.Key ?? string.Empty );
+                    _logger?.Error( "{0} ('{1}') => {2} ('{3}'): {4}",
+                        new object[]
+                        {
+                            curToken.Type, curToken.Text, prevToken.Type, prevToken.Text,
+                            $"unexpected key '{Current.Key}'"
+                        } );
+
                     Options.UnknownKeys.Add( Current );
 
                     // create a new TokenEntry
@@ -78,11 +91,12 @@ public bool ProcessText( Token prevToken, Token curToken, params string[] args )
             {
                 if( args.Length != 1 )
                 {
-                    _logger?.Error<int, TokenType, string>(
-                        "Invalid number of text arguments ({0}) process {1} ('{2}')",
-                        args.Length,
-                        curToken.Type,
-                        curToken.Text );
+                    _logger?.Error("{0} ('{1}') => {2} ('{3}'): {4}",
+                        new object[]
+                        {
+                            curToken.Type, curToken.Text, prevToken.Type, prevToken.Text,
+                            $"invalid number of text arguments '{args.Length}'"
+                        });
 
                     Current = null;