[Core] Fixes #422. Added synchronization between Bam.Core.TokenizedString.IsParsed and Bam.Core.TokenizedString.Parse().

Author: markfinal

Bam.Core/TokenizedString.cs

@@ -122,6 +122,7 @@ private enum EFlags
         private Module ModuleWithMacros = null;
         private string OriginalString = null;
         private string ParsedString = null;
+        private readonly object ParsedStringGuard = new object(); // since you can't lock ParsedString as it may be null
         private bool Verbatim;
         private TokenizedStringArray PositionalTokens = null;
         private string CreationStackTrace = null;
@@ -426,8 +427,11 @@ public bool IsParsed
                     return false;
                 }
                 var hasTokens = (null != this.Tokens);
-                var hasParsedString = (null != this.ParsedString);
-                return !hasTokens && hasParsedString;
+                lock (this.ParsedStringGuard)
+                {
+                    var hasParsedString = (null != this.ParsedString);
+                    return !hasTokens && hasParsedString;
+                }
             }
         }
 
@@ -531,7 +535,10 @@ public void
                     this.parsedStackTrace,
                     AllStringsParsed ? " after the string parsing phase" : string.Empty);
             }
-            this.ParseInternalWithAlreadyParsedCheck(null);
+            lock (this.ParsedStringGuard)
+            {
+                this.ParseInternalWithAlreadyParsedCheck(null);
+            }
             lock (StringsForParsing)
             {
                 StringsForParsing.Remove(this);

Changelog.txt

@@ -1,3 +1,5 @@
+20-Jan-2018 Fixes #422. Added synchronization between Bam.Core.TokenizedString.IsParsed and Bam.Core.TokenizedString.Parse().
+
 20-Jan-2018 Fixes #421. Publisher.Collation.IncludeAllModulesInNamespace now only includes modules that generate the specified pathkey.
 
 20-Jan-2018 Fixes #420. Container source modules which are passed into C[.Cxx].ConsoleApplication.ExtendSource() should not standalone compile, as there is no guarantee that they have sufficient dependencies in order to compile. The applications consuming them may provide those dependencies.