Simpliefied how TypeBoundOptions are created. Fixed problem with log message enumerator. Identified bug in allocation system (quotes not being removed).

Author: markolbert

Binder.Tests/support/BaseTest.cs

@@ -22,9 +22,8 @@ protected void Initialize( TestConfig testConfig )
         protected void Bind<TTarget, TProp>( Expression<Func<TTarget, TProp>> propSelector )
             where TTarget : class, new()
         {
-            Options.Bind( propSelector, out var option  )
-                .Should()
-                .BeTrue();
+            var option = Options.Bind( propSelector );
+            option.Should().NotBeNull();
 
             var optConfig = TestConfig!.OptionConfigurations
                 .FirstOrDefault( x =>

Binder/CommandLineLogger.cs

@@ -18,7 +18,7 @@ public class LogEntry
         public void LogError( string mesg ) => _messages.Add( new LogEntry { IsError = true, Message = mesg } );
         public void LogInformation( string mesg) => _messages.Add(new LogEntry { Message = mesg });
 
-        public IEnumerator<string> GetMessages( bool errorsOnly = true )
+        public IEnumerable<string> GetMessages( bool errorsOnly = true )
         {
             foreach( var entry in _messages.Where(m=>m.IsError == errorsOnly  ) )
             {

Binder/option/TypeBoundOption.cs

@@ -23,9 +23,7 @@ public override string? ContextPath
                 if( base.ContextPath == null )
                     return null;
 
-                return Container.TargetsMultipleTypes
-                    ? $"{Container.GetContextPathPrefix<TTarget>()}:{base.ContextPath}"
-                    : base.ContextPath;
+                return $"{Container.GetTypePrefix<TTarget>()}{base.ContextPath}";
             }
         }
     }

Binder/options/OptionCollection.cs

@@ -72,7 +72,7 @@ public OptionCollection(
         public ReadOnlyCollection<IOption> Options => _options.AsReadOnly();
         public int Count => _options.Count;
 
-        public void SetTypeContextKeyPrefix<TTarget>(string prefix)
+        public void SetTypePrefix<TTarget>(string prefix)
             where TTarget : class, new()
         {
             var type = typeof(TTarget);
@@ -83,15 +83,15 @@ public void SetTypeContextKeyPrefix<TTarget>(string prefix)
             _typePrefixes.Add(type, prefix);
         }
 
-        public string GetContextPathPrefix<TTarget>()
+        public string GetTypePrefix<TTarget>()
             where TTarget : class, new()
         {
             var type = typeof(TTarget);
 
-            if (_typePrefixes.ContainsKey(type))
-                return _typePrefixes[type];
+            if( _typePrefixes.ContainsKey( type ) )
+                return $"{_typePrefixes[ type ]}:";
 
-            return type.Name;
+            return TargetsMultipleTypes ? $"{type.Name}:" : string.Empty;
         }
 
         public bool TargetsMultipleTypes => _options.Cast<ITypeBoundOption>().Distinct(_comparer).Count() > 1;
@@ -105,14 +105,11 @@ public IOption Add(string contextPath)
             return retVal;
         }
 
-        public bool Bind<TTarget, TProp>(
+        public Option? Bind<TTarget, TProp>(
             Expression<Func<TTarget, TProp>> propertySelector,
-            out Option? result,
             params string[] cmdLineKeys )
             where TTarget : class, new()
         {
-            result = null;
-
             // walk the expression tree to extract the PropertyInfo objects defining
             // the path to the property of interest
             var propElements = new List<PropertyInfo>();
@@ -129,7 +126,7 @@ public bool Bind<TTarget, TProp>(
                         if( !ValidateProperty( propInfo, out var curStyle ) )
                         {
                             Log.LogError( $"Property '{propInfo.Name}' is invalid");
-                            return false;
+                            return null;
                         }
 
                         firstStyle ??= curStyle;
@@ -149,7 +146,7 @@ public bool Bind<TTarget, TProp>(
                             if (!ValidateProperty(propInfo2, out var curStyle2))
                             {
                                 Log.LogError($"Property '{propInfo2.Name}' is invalid");
-                                return false;
+                                return null;
                             }
 
                             firstStyle ??= curStyle2;
@@ -172,18 +169,18 @@ public bool Bind<TTarget, TProp>(
 
             propElements.Reverse();
 
-            result = new TypeBoundOption<TTarget>(this, GetContextPath(propElements), MasterText);
+            var retVal = new TypeBoundOption<TTarget>(this, GetContextPath(propElements), MasterText);
 
-            result.SetStyle(firstStyle!.Value);
+            retVal.SetStyle(firstStyle!.Value);
 
             foreach( var key in ValidateCommandLineKeys( cmdLineKeys ) )
             {
-                result.AddCommandLineKey( key );
+                retVal.AddCommandLineKey( key );
             }
 
-            _options.Add(result);
+            _options.Add(retVal);
 
-            return true;
+            return retVal;
         }
 
         // determines whether or not a key is being used by an existing option, honoring whatever