MethodEntry -> MethodExport

TobitoFatitoRE · Jul 31, 2019 · c82b9a6 · c82b9a6
1 parent 6f70f88
commit c82b9a6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Rhydon.Core/Extensions.cs b/Rhydon.Core/Extensions.cs
@@ -3,7 +3,7 @@
 
 namespace Rhydon.Core {
     public static class Extensions {
-        public static byte ReadKoiByte(this BinaryReader reader, MethodEntry sig) {
+        public static byte ReadKoiByte(this BinaryReader reader, MethodExport sig) {
             var b = (byte)(reader.ReadInt64() ^ sig.Key);
             reader.BaseStream.Position -= 7;
             sig.Key = sig.Key * 7 + b;

diff --git a/Rhydon.Core/Parser/KoiHeader.cs b/Rhydon.Core/Parser/KoiHeader.cs
@@ -27,7 +27,7 @@ public KoiHeader(RhydonContext ctx) {
 
             References = new Dictionary<uint, IMemberRef>(refCount);
             Strings = new Dictionary<uint, string>(strCount);
-            Methods = new Dictionary<uint, MethodEntry>(metCount);
+            Methods = new Dictionary<uint, MethodExport>(metCount);
 
             ReadReferences(ctx, refCount);
             ctx.Logger.Success($"Parsed {refCount} references");
@@ -66,7 +66,7 @@ void ReadStrings(RhydonContext ctx, int count) {
         void ReadMethods(RhydonContext ctx, int count) {
             for (var i = 0; i < count; i++) {
                 var id = ctx.ReadCompressedUint();
-                var export = MethodEntry.Create(ctx);
+                var export = MethodExport.Create(ctx);
 
                 ctx.Logger.Debug($"Methods[{id:D3}]: Offset: 0x{export.Offset:X8} Key: 0x{export.Key:X8}");
                 Methods[id] = export;
@@ -77,7 +77,7 @@ void ReadMethods(RhydonContext ctx, int count) {
 
         public readonly Dictionary<uint, IMemberRef> References;
         public readonly Dictionary<uint, string> Strings;
-        public readonly Dictionary<uint, MethodEntry> Methods;
+        public readonly Dictionary<uint, MethodExport> Methods;
 
         public static uint FromCodedToken(uint codedToken) {
             var rid = codedToken >> 3;
@@ -102,9 +102,9 @@ public static uint FromCodedToken(uint codedToken) {
         }
     }
 
-    public class MethodEntry {
-        public static MethodEntry Create(RhydonContext ctx) {
-            var obj = new MethodEntry { Offset = ctx.Reader.ReadUInt32() };
+    public class MethodExport {
+        public static MethodExport Create(RhydonContext ctx) {
+            var obj = new MethodExport() { Offset = ctx.Reader.ReadUInt32() };
             if (obj.Offset != 0) {
                 obj.Key = ctx.Reader.ReadUInt32();
             }

diff --git a/Rhydon.Core/RhydonContext.cs b/Rhydon.Core/RhydonContext.cs
@@ -17,7 +17,7 @@ public byte[] ReadBytes(int len) =>
         public uint ReadUInt32() =>
             Reader.ReadUInt32();
 
-        public byte ReadKoi(MethodEntry export) =>
+        public byte ReadKoi(MethodExport export) =>
             Reader.ReadKoiByte(export);
 
         public uint ReadCompressedUint() =>

diff --git a/Rhydon.Emulator/KoiEmulator.cs b/Rhydon.Emulator/KoiEmulator.cs
@@ -3,14 +3,14 @@
 
 namespace Rhydon.Emulator {
     public class KoiEmulator {
-        public KoiEmulator(RhydonContext ctx, MethodEntry export) {
+        public KoiEmulator(RhydonContext ctx, MethodExport export) {
             Context = ctx;
             Export = export;
             Registers = new object[16];
             Ip = export.Offset;
         }
 
-        public void ExecuteNext() {
+        public void EmulateNext() {
             var reader = Context.Reader;
             var code = reader.ReadKoiByte(Export);
             reader.ReadKoiByte(Export); //For "key fixup" according Koi source...
@@ -19,7 +19,7 @@ public void ExecuteNext() {
         }
 
         internal readonly RhydonContext Context;
-        internal readonly MethodEntry Export;
+        internal readonly MethodExport Export;
         internal object[] Registers;
         internal uint Ip;
     }