From 4d48bdfe7c3806ec1995cd499ca9382ace2d8a53 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 25 Mar 2017 13:50:01 -0400
Subject: drop 'generic' prefix for rewriters since they're all generic now

---
 .../Finders/EventFinder.cs                         | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs

(limited to 'src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs')

diff --git a/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
new file mode 100644
index 00000000..359ca63e
--- /dev/null
+++ b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
@@ -0,0 +1,54 @@
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using StardewModdingAPI.AssemblyRewriters.Framework;
+
+namespace StardewModdingAPI.AssemblyRewriters.Finders
+{
+    /// <summary>Finds CIL instructions that reference a given event.</summary>
+    public sealed class EventFinder : BaseMethodFinder
+    {
+        /*********
+        ** Properties
+        *********/
+        /// <summary>The full type name for which to find references.</summary>
+        private readonly string FullTypeName;
+
+        /// <summary>The event name for which to find references.</summary>
+        private readonly string EventName;
+
+
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>A brief noun phrase indicating what the instruction finder matches.</summary>
+        public override string NounPhrase { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="fullTypeName">The full type name for which to find references.</param>
+        /// <param name="eventName">The event name for which to find references.</param>
+        public EventFinder(string fullTypeName, string eventName)
+        {
+            this.FullTypeName = fullTypeName;
+            this.EventName = eventName;
+            this.NounPhrase = $"obsolete {fullTypeName}.{eventName} event";
+        }
+
+
+        /*********
+        ** Protected methods
+        *********/
+        /// <summary>Get whether a method reference should be rewritten.</summary>
+        /// <param name="instruction">The IL instruction.</param>
+        /// <param name="methodRef">The method reference.</param>
+        /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
+        protected override bool IsMatch(Instruction instruction, MethodReference methodRef, bool platformChanged)
+        {
+            return methodRef.DeclaringType.FullName == this.FullTypeName
+                && (methodRef.Name == "add_" + this.EventName || methodRef.Name == "remove_" + this.EventName);
+        }
+    }
+}
-- 
cgit 


From 7b641d816466fe7d9229374c175f59ee32b8dc5c Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 25 Mar 2017 15:17:26 -0400
Subject: simplify CIL rewriter hierarchy

---
 .../Finders/EventFinder.cs                                | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs')

diff --git a/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
index 359ca63e..9d0184c6 100644
--- a/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
+++ b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
@@ -1,11 +1,10 @@
 using Mono.Cecil;
 using Mono.Cecil.Cil;
-using StardewModdingAPI.AssemblyRewriters.Framework;
 
 namespace StardewModdingAPI.AssemblyRewriters.Finders
 {
     /// <summary>Finds CIL instructions that reference a given event.</summary>
-    public sealed class EventFinder : BaseMethodFinder
+    public sealed class EventFinder : IInstructionFinder
     {
         /*********
         ** Properties
@@ -21,7 +20,7 @@ namespace StardewModdingAPI.AssemblyRewriters.Finders
         ** Accessors
         *********/
         /// <summary>A brief noun phrase indicating what the instruction finder matches.</summary>
-        public override string NounPhrase { get; }
+        public string NounPhrase { get; }
 
 
         /*********
@@ -41,13 +40,15 @@ namespace StardewModdingAPI.AssemblyRewriters.Finders
         /*********
         ** Protected methods
         *********/
-        /// <summary>Get whether a method reference should be rewritten.</summary>
+        /// <summary>Get whether a CIL instruction matches.</summary>
         /// <param name="instruction">The IL instruction.</param>
-        /// <param name="methodRef">The method reference.</param>
         /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
-        protected override bool IsMatch(Instruction instruction, MethodReference methodRef, bool platformChanged)
+        public bool IsMatch(Instruction instruction, bool platformChanged)
         {
-            return methodRef.DeclaringType.FullName == this.FullTypeName
+            MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+            return
+                methodRef != null
+                && methodRef.DeclaringType.FullName == this.FullTypeName
                 && (methodRef.Name == "add_" + this.EventName || methodRef.Name == "remove_" + this.EventName);
         }
     }
-- 
cgit 


From 06f5e92b88fac190f94690f1580775449014e411 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sat, 25 Mar 2017 22:08:48 -0400
Subject: minor cleanup

---
 src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs')

diff --git a/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
index 9d0184c6..848e54ff 100644
--- a/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
+++ b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
@@ -29,11 +29,12 @@ namespace StardewModdingAPI.AssemblyRewriters.Finders
         /// <summary>Construct an instance.</summary>
         /// <param name="fullTypeName">The full type name for which to find references.</param>
         /// <param name="eventName">The event name for which to find references.</param>
-        public EventFinder(string fullTypeName, string eventName)
+        /// <param name="nounPhrase">A brief noun phrase indicating what the instruction finder matches (or <c>null</c> to generate one).</param>
+        public EventFinder(string fullTypeName, string eventName, string nounPhrase = null)
         {
             this.FullTypeName = fullTypeName;
             this.EventName = eventName;
-            this.NounPhrase = $"obsolete {fullTypeName}.{eventName} event";
+            this.NounPhrase = nounPhrase ?? $"{fullTypeName}.{eventName} event";
         }
 
 
-- 
cgit 


From 85ed48809032fdbb8461ce4c34acfbe06f68652b Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 26 Mar 2017 19:01:35 -0400
Subject: merge CIL finders & rewriters into one interface (#254)

---
 .../Finders/EventFinder.cs                         | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs')

diff --git a/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
index 848e54ff..bcceee32 100644
--- a/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
+++ b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
@@ -3,8 +3,8 @@ using Mono.Cecil.Cil;
 
 namespace StardewModdingAPI.AssemblyRewriters.Finders
 {
-    /// <summary>Finds CIL instructions that reference a given event.</summary>
-    public sealed class EventFinder : IInstructionFinder
+    /// <summary>Finds incompatible CIL instructions that reference a given event and throws an <see cref="IncompatibleInstructionException"/>.</summary>
+    public class EventFinder : IInstructionRewriter
     {
         /*********
         ** Properties
@@ -37,6 +37,22 @@ namespace StardewModdingAPI.AssemblyRewriters.Finders
             this.NounPhrase = nounPhrase ?? $"{fullTypeName}.{eventName} event";
         }
 
+        /// <summary>Rewrite a CIL instruction for compatibility.</summary>
+        /// <param name="module">The module being rewritten.</param>
+        /// <param name="cil">The CIL rewriter.</param>
+        /// <param name="instruction">The instruction to rewrite.</param>
+        /// <param name="assemblyMap">Metadata for mapping assemblies to the current platform.</param>
+        /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
+        /// <returns>Returns whether the instruction was rewritten.</returns>
+        /// <exception cref="IncompatibleInstructionException">The CIL instruction is not compatible, and can't be rewritten.</exception>
+        public bool Rewrite(ModuleDefinition module, ILProcessor cil, Instruction instruction, PlatformAssemblyMap assemblyMap, bool platformChanged)
+        {
+            if (!this.IsMatch(instruction, platformChanged))
+                return false;
+
+            throw new IncompatibleInstructionException(this.NounPhrase);
+        }
+
 
         /*********
         ** Protected methods
@@ -44,7 +60,7 @@ namespace StardewModdingAPI.AssemblyRewriters.Finders
         /// <summary>Get whether a CIL instruction matches.</summary>
         /// <param name="instruction">The IL instruction.</param>
         /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
-        public bool IsMatch(Instruction instruction, bool platformChanged)
+        protected bool IsMatch(Instruction instruction, bool platformChanged)
         {
             MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
             return
-- 
cgit 


From 8bf3ef118a822afd1c7d7f80f6cf6eaeed346167 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 26 Mar 2017 19:17:48 -0400
Subject: add support for rewriting method definitions (#254)

---
 .../Finders/EventFinder.cs                            | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs')

diff --git a/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
index bcceee32..c0051469 100644
--- a/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
+++ b/src/StardewModdingAPI.AssemblyRewriters/Finders/EventFinder.cs
@@ -37,6 +37,18 @@ namespace StardewModdingAPI.AssemblyRewriters.Finders
             this.NounPhrase = nounPhrase ?? $"{fullTypeName}.{eventName} event";
         }
 
+        /// <summary>Rewrite a method definition for compatibility.</summary>
+        /// <param name="module">The module being rewritten.</param>
+        /// <param name="method">The method definition to rewrite.</param>
+        /// <param name="assemblyMap">Metadata for mapping assemblies to the current platform.</param>
+        /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
+        /// <returns>Returns whether the instruction was rewritten.</returns>
+        /// <exception cref="IncompatibleInstructionException">The CIL instruction is not compatible, and can't be rewritten.</exception>
+        public virtual bool Rewrite(ModuleDefinition module, MethodDefinition method, PlatformAssemblyMap assemblyMap, bool platformChanged)
+        {
+            return false;
+        }
+
         /// <summary>Rewrite a CIL instruction for compatibility.</summary>
         /// <param name="module">The module being rewritten.</param>
         /// <param name="cil">The CIL rewriter.</param>
@@ -45,9 +57,9 @@ namespace StardewModdingAPI.AssemblyRewriters.Finders
         /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
         /// <returns>Returns whether the instruction was rewritten.</returns>
         /// <exception cref="IncompatibleInstructionException">The CIL instruction is not compatible, and can't be rewritten.</exception>
-        public bool Rewrite(ModuleDefinition module, ILProcessor cil, Instruction instruction, PlatformAssemblyMap assemblyMap, bool platformChanged)
+        public virtual bool Rewrite(ModuleDefinition module, ILProcessor cil, Instruction instruction, PlatformAssemblyMap assemblyMap, bool platformChanged)
         {
-            if (!this.IsMatch(instruction, platformChanged))
+            if (!this.IsMatch(instruction))
                 return false;
 
             throw new IncompatibleInstructionException(this.NounPhrase);
@@ -59,8 +71,7 @@ namespace StardewModdingAPI.AssemblyRewriters.Finders
         *********/
         /// <summary>Get whether a CIL instruction matches.</summary>
         /// <param name="instruction">The IL instruction.</param>
-        /// <param name="platformChanged">Whether the mod was compiled on a different platform.</param>
-        protected bool IsMatch(Instruction instruction, bool platformChanged)
+        protected bool IsMatch(Instruction instruction)
         {
             MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
             return
-- 
cgit