Fix josefpihrt#7: Make structs read-only.

bovorasr · Jul 19, 2018 · d8f0edb · d8f0edb
1 parent 3becb3a
commit d8f0edb
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 24 deletions.
diff --git a/src/DotMarkdown/DotMarkdown.csproj b/src/DotMarkdown/DotMarkdown.csproj
@@ -15,6 +15,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>DotMarkdown.snk</AssemblyOriginatorKeyFile>
+    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/DotMarkdown/Error.cs b/src/DotMarkdown/Error.cs
@@ -33,7 +33,7 @@ public static void ThrowOnInvalidFencedCodeBlockInfo(string info)
             }
         }
 
-        public static void ThrowOnInvalidHorizontalRuleFormat(HorizontalRuleFormat format)
+        public static void ThrowOnInvalidHorizontalRuleFormat(in HorizontalRuleFormat format)
         {
             ThrowOnInvalidHorizontalRuleCount(format.Count);
             ThrowOnInvalidHorizontalRuleSeparator(format.Separator);

diff --git a/src/DotMarkdown/HorizontalRuleFormat.cs b/src/DotMarkdown/HorizontalRuleFormat.cs
@@ -6,7 +6,7 @@
 namespace DotMarkdown
 {
     [DebuggerDisplay("{HorizontalRuleStyle} {Count}{SeparatorDebuggerDisplay,nq}")]
-    public struct HorizontalRuleFormat : IEquatable<HorizontalRuleFormat>
+    public readonly struct HorizontalRuleFormat : IEquatable<HorizontalRuleFormat>
     {
         internal const HorizontalRuleStyle DefaultStyle = HorizontalRuleStyle.Hyphen;
         internal const int DefaultCount = 3;
@@ -81,12 +81,12 @@ public override int GetHashCode()
             return Hash.Combine((int)Style, Hash.Combine(Count, Hash.Create(Separator)));
         }
 
-        public static bool operator ==(HorizontalRuleFormat format1, HorizontalRuleFormat format2)
+        public static bool operator ==(in HorizontalRuleFormat format1, in HorizontalRuleFormat format2)
         {
             return format1.Equals(format2);
         }
 
-        public static bool operator !=(HorizontalRuleFormat format1, HorizontalRuleFormat format2)
+        public static bool operator !=(in HorizontalRuleFormat format1, in HorizontalRuleFormat format2)
         {
             return !(format1 == format2);
         }

diff --git a/src/DotMarkdown/Linq/MFactory.cs b/src/DotMarkdown/Linq/MFactory.cs
@@ -491,7 +491,7 @@ public static MHorizontalRule HorizontalRule()
             return HorizontalRule(HorizontalRuleFormat.Default);
         }
 
-        public static MHorizontalRule HorizontalRule(HorizontalRuleFormat format)
+        public static MHorizontalRule HorizontalRule(in HorizontalRuleFormat format)
         {
             return new MHorizontalRule(format);
         }

diff --git a/src/DotMarkdown/Linq/MHorizontalRule.cs b/src/DotMarkdown/Linq/MHorizontalRule.cs
@@ -16,7 +16,7 @@ public MHorizontalRule(HorizontalRuleStyle style, int count, string separator)
             Separator = separator;
         }
 
-        public MHorizontalRule(HorizontalRuleFormat format)
+        public MHorizontalRule(in HorizontalRuleFormat format)
             : this(format.Style, format.Count, format.Separator)
         {
         }

diff --git a/src/DotMarkdown/MarkdownBaseWriter.cs b/src/DotMarkdown/MarkdownBaseWriter.cs
@@ -1339,7 +1339,7 @@ protected enum State
         }
 
         [DebuggerDisplay("{DebuggerDisplay,nq}")]
-        private struct ElementInfo
+        private readonly struct ElementInfo
         {
             public ElementInfo(State state, int number)
             {

diff --git a/src/DotMarkdown/MarkdownFormat.cs b/src/DotMarkdown/MarkdownFormat.cs
@@ -335,7 +335,7 @@ public MarkdownFormat WithOrderedListStyle(OrderedListStyle orderedListStyle)
                 HorizontalRuleFormat);
         }
 
-        public MarkdownFormat WithHorizontalRuleFormat(HorizontalRuleFormat horizontalRuleFormat)
+        public MarkdownFormat WithHorizontalRuleFormat(in HorizontalRuleFormat horizontalRuleFormat)
         {
             return new MarkdownFormat(
                 BoldStyle,

diff --git a/src/DotMarkdown/MarkdownWriter.cs b/src/DotMarkdown/MarkdownWriter.cs
@@ -293,7 +293,7 @@ public void WriteHorizontalRule()
             WriteHorizontalRule(Format.HorizontalRuleFormat);
         }
 
-        public void WriteHorizontalRule(HorizontalRuleFormat format)
+        public void WriteHorizontalRule(in HorizontalRuleFormat format)
         {
             WriteHorizontalRule(format.Style, format.Count, format.Separator);
         }

diff --git a/src/DotMarkdown/TableColumnInfo.cs b/src/DotMarkdown/TableColumnInfo.cs
@@ -7,7 +7,7 @@
 namespace DotMarkdown
 {
     [DebuggerDisplay("{Alignment} {Width} IsWhiteSpace = {IsWhiteSpace}")]
-    public struct TableColumnInfo : IEquatable<TableColumnInfo>
+    public readonly struct TableColumnInfo : IEquatable<TableColumnInfo>
     {
         public TableColumnInfo(HorizontalAlignment alignment, int width, bool isWhiteSpace)
         {
@@ -87,12 +87,12 @@ public override int GetHashCode()
             return Hash.Combine((int)Alignment, Hash.Combine(IsWhiteSpace, Hash.Create(Width)));
         }
 
-        public static bool operator ==(TableColumnInfo info1, TableColumnInfo info2)
+        public static bool operator ==(in TableColumnInfo info1, in TableColumnInfo info2)
         {
             return info1.Equals(info2);
         }
 
-        public static bool operator !=(TableColumnInfo info1, TableColumnInfo info2)
+        public static bool operator !=(in TableColumnInfo info1, in TableColumnInfo info2)
         {
             return !(info1 == info2);
         }

diff --git a/src/TestConsole/DotMarkdown.TestConsole.csproj b/src/TestConsole/DotMarkdown.TestConsole.csproj
@@ -2,16 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <IsPackable>false</IsPackable>
+    <OutputType>Exe</OutputType>
     <AssemblyName>DotMarkdown.TestConsole</AssemblyName>
     <RootNamespace>DotMarkdown.TestConsole</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <CodeAnalysisRuleSet>..\..\global.ruleset</CodeAnalysisRuleSet>
-    <ApplicationIcon />
-    <OutputType>Exe</OutputType>
-    <StartupObject />
+    <LangVersion>7.2</LangVersion>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tests/DotMarkdown.Tests.csproj b/src/Tests/DotMarkdown.Tests.csproj
@@ -2,15 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <IsPackable>false</IsPackable>
     <AssemblyName>DotMarkdown.Tests</AssemblyName>
     <RootNamespace>DotMarkdown.Tests</RootNamespace>
+    <CodeAnalysisRuleSet>..\..\global.ruleset</CodeAnalysisRuleSet>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>DotMarkdown.Tests.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <CodeAnalysisRuleSet>..\..\global.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.2</LangVersion>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>