diff --git a/.github/workflows/IKVM.ByteCode.yml b/.github/workflows/IKVM.ByteCode.yml index 34bd6f9..2634b79 100644 --- a/.github/workflows/IKVM.ByteCode.yml +++ b/.github/workflows/IKVM.ByteCode.yml @@ -36,11 +36,11 @@ jobs: with: dotnet-version: 8.0.x - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v1 + uses: gittools/actions/gitversion/setup@v3 with: versionSpec: 5.x - name: Execute GitVersion - uses: gittools/actions/gitversion/execute@v1 + uses: gittools/actions/gitversion/execute@v3 with: useConfigFile: true configFilePath: GitVersion.yml @@ -215,17 +215,17 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup .NET 7.0 + - name: Setup .NET 8.0 uses: actions/setup-dotnet@v4 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v1 + uses: gittools/actions/gitversion/setup@v3 with: versionSpec: 5.x - name: Execute GitVersion id: GitVersion - uses: gittools/actions/gitversion/execute@v1 + uses: gittools/actions/gitversion/execute@v3 with: useConfigFile: true - name: Download NuGet Packages diff --git a/README.md b/README.md index 2f43201..0946b6b 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Each of the field-only record structures can be individually used to parse or en `TryRead` actually reads the data. In both of these cases, `false` is returned if the end of the memory has been reached. Exceptions are thrown for parsing errors involving valid data. -Each of the field-only record structures also contains `EncodeTo` and `WriteTo`. `EncodeTo` processes the structure, along with a `IConstantHandleMap`, and reemits it to an Encoder. This allows you to copy structures read from one class file into another, either creating the necessary constants in the new class, or reencode it to an output stream using `IdentityConstantMap`. `EncodeTo` requires acccess to a `IConstantHandleMap` to read constant data in order to navigate into dynamic components that require constant data to reason about (for instance `Attribute`s). `WriteTo` is much lighter weight: it simply emits the structure as is without consideration as to the constants. They must already be present in whatever constant table is used with the resulting class file. +Each of the field-only record structures also contains `CopyTo` and `WriteTo`. `CopyTo` processes the structure, along with a `IConstantHandleMap`, and reemits it to an Encoder. This allows you to copy structures read from one class file into another, either creating the necessary constants in the new class, or reencode it to an output stream using `IdentityConstantMap`. `CopyTo` requires acccess to a `IConstantHandleMap` to read constant data in order to navigate into dynamic components that require constant data to reason about (for instance `Attribute`s). `WriteTo` is much lighter weight: it simply emits the structure as is without consideration as to the constants. They must already be present in whatever constant table is used with the resulting class file. ### Constants diff --git a/src/IKVM.ByteCode/Decoding/Annotation.cs b/src/IKVM.ByteCode/Decoding/Annotation.cs index e6f05c6..31f6ab5 100644 --- a/src/IKVM.ByteCode/Decoding/Annotation.cs +++ b/src/IKVM.ByteCode/Decoding/Annotation.cs @@ -48,11 +48,11 @@ public static bool TryRead(ref ClassFormatReader reader, out Annotation annotati /// /// /// - public readonly void EncodeTo(TConstantMap map, ref AnnotationEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref AnnotationEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.Annotation(map.Map(Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.Annotation(map.Map(Type), e => self.Elements.CopyTo(map, ref e)); } /// diff --git a/src/IKVM.ByteCode/Decoding/AnnotationDefaultAttribute.cs b/src/IKVM.ByteCode/Decoding/AnnotationDefaultAttribute.cs index c188426..da808e5 100644 --- a/src/IKVM.ByteCode/Decoding/AnnotationDefaultAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/AnnotationDefaultAttribute.cs @@ -38,11 +38,11 @@ public static bool TryRead(ref ClassFormatReader reader, out AnnotationDefaultAt /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.AnnotationDefault(attributeName, e => self.DefaultValue.EncodeTo(map, ref e)); + encoder.AnnotationDefault(attributeName, e => self.DefaultValue.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/AnnotationTable.cs b/src/IKVM.ByteCode/Decoding/AnnotationTable.cs index 3a5aa98..bb026ff 100644 --- a/src/IKVM.ByteCode/Decoding/AnnotationTable.cs +++ b/src/IKVM.ByteCode/Decoding/AnnotationTable.cs @@ -149,11 +149,11 @@ readonly ref readonly Annotation GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref AnnotationTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref AnnotationTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - encoder.Annotation(e => i.EncodeTo(map, ref e)); + encoder.Annotation(e => i.CopyTo(map, ref e)); } /// diff --git a/src/IKVM.ByteCode/Decoding/AppendStackMapFrame.cs b/src/IKVM.ByteCode/Decoding/AppendStackMapFrame.cs index 4b19187..fbb0190 100644 --- a/src/IKVM.ByteCode/Decoding/AppendStackMapFrame.cs +++ b/src/IKVM.ByteCode/Decoding/AppendStackMapFrame.cs @@ -51,11 +51,11 @@ public static bool TryRead(ref ClassFormatReader reader, byte frameType, out App /// /// /// - public readonly void EncodeTo(TConstantMap map, ref StackMapTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref StackMapTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.Append(FrameType, OffsetDelta, e => self.Locals.EncodeTo(map, ref e)); + encoder.Append(FrameType, OffsetDelta, e => self.Locals.CopyTo(map, ref e)); } public readonly byte FrameType = FrameType; diff --git a/src/IKVM.ByteCode/Decoding/Attribute.cs b/src/IKVM.ByteCode/Decoding/Attribute.cs index 803f134..53b1dcb 100644 --- a/src/IKVM.ByteCode/Decoding/Attribute.cs +++ b/src/IKVM.ByteCode/Decoding/Attribute.cs @@ -78,7 +78,7 @@ public static bool TryRead(ref ClassFormatReader reader, out Attribute attribute /// /// /// - public readonly void EncodeTo(TConstantMap map, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { EncodeSelfTo(map, ref encoder); diff --git a/src/IKVM.ByteCode/Decoding/Attribute.g.cs b/src/IKVM.ByteCode/Decoding/Attribute.g.cs index 4d3bca6..b2f97d4 100644 --- a/src/IKVM.ByteCode/Decoding/Attribute.g.cs +++ b/src/IKVM.ByteCode/Decoding/Attribute.g.cs @@ -345,94 +345,94 @@ readonly void EncodeSelfTo(TConstantMap map, ref AttributeTableEnc switch (map.Get(Name).Value) { case AttributeName.ConstantValue: - ((ConstantValueAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((ConstantValueAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.Code: - ((CodeAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((CodeAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.StackMapTable: - ((StackMapTableAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((StackMapTableAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.Exceptions: - ((ExceptionsAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((ExceptionsAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.InnerClasses: - ((InnerClassesAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((InnerClassesAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.EnclosingMethod: - ((EnclosingMethodAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((EnclosingMethodAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.Synthetic: - ((SyntheticAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((SyntheticAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.Signature: - ((SignatureAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((SignatureAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.SourceFile: - ((SourceFileAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((SourceFileAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.SourceDebugExtension: - ((SourceDebugExtensionAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((SourceDebugExtensionAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.LineNumberTable: - ((LineNumberTableAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((LineNumberTableAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.LocalVariableTable: - ((LocalVariableTableAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((LocalVariableTableAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.LocalVariableTypeTable: - ((LocalVariableTypeTableAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((LocalVariableTypeTableAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.Deprecated: - ((DeprecatedAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((DeprecatedAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.RuntimeVisibleAnnotations: - ((RuntimeVisibleAnnotationsAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((RuntimeVisibleAnnotationsAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.RuntimeInvisibleAnnotations: - ((RuntimeInvisibleAnnotationsAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((RuntimeInvisibleAnnotationsAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.RuntimeVisibleParameterAnnotations: - ((RuntimeVisibleParameterAnnotationsAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((RuntimeVisibleParameterAnnotationsAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.RuntimeInvisibleParameterAnnotations: - ((RuntimeInvisibleParameterAnnotationsAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((RuntimeInvisibleParameterAnnotationsAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.RuntimeVisibleTypeAnnotations: - ((RuntimeVisibleTypeAnnotationsAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((RuntimeVisibleTypeAnnotationsAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.RuntimeInvisibleTypeAnnotations: - ((RuntimeInvisibleTypeAnnotationsAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((RuntimeInvisibleTypeAnnotationsAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.AnnotationDefault: - ((AnnotationDefaultAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((AnnotationDefaultAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.BootstrapMethods: - ((BootstrapMethodsAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((BootstrapMethodsAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.MethodParameters: - ((MethodParametersAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((MethodParametersAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.Module: - ((ModuleAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((ModuleAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.ModulePackages: - ((ModulePackagesAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((ModulePackagesAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.ModuleMainClass: - ((ModuleMainClassAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((ModuleMainClassAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.NestHost: - ((NestHostAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((NestHostAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.NestMembers: - ((NestMembersAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((NestMembersAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.Record: - ((RecordAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((RecordAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; case AttributeName.PermittedSubclasses: - ((PermittedSubclassesAttribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((PermittedSubclassesAttribute)this).CopyTo(map, map.Map(Name), ref encoder); break; default: throw new ByteCodeException("Cannot encode unknown attribute. Attribute layout is unknown."); diff --git a/src/IKVM.ByteCode/Decoding/Attribute.g.tt b/src/IKVM.ByteCode/Decoding/Attribute.g.tt index 6755213..9c6d3b3 100644 --- a/src/IKVM.ByteCode/Decoding/Attribute.g.tt +++ b/src/IKVM.ByteCode/Decoding/Attribute.g.tt @@ -42,7 +42,7 @@ foreach (var i in File.ReadAllLines(Host.ResolvePath(Path.Combine("..", "Attribu var name = i.Trim(); #> case AttributeName.<#= name #>: - ((<#= name #>Attribute)this).EncodeTo(map, map.Map(Name), ref encoder); + ((<#= name #>Attribute)this).CopyTo(map, map.Map(Name), ref encoder); break; <# } diff --git a/src/IKVM.ByteCode/Decoding/AttributeTable.cs b/src/IKVM.ByteCode/Decoding/AttributeTable.cs index c30d880..16b95b5 100644 --- a/src/IKVM.ByteCode/Decoding/AttributeTable.cs +++ b/src/IKVM.ByteCode/Decoding/AttributeTable.cs @@ -151,11 +151,11 @@ readonly ref readonly Attribute GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/BootstrapMethod.cs b/src/IKVM.ByteCode/Decoding/BootstrapMethod.cs index ab64935..dd6ba29 100644 --- a/src/IKVM.ByteCode/Decoding/BootstrapMethod.cs +++ b/src/IKVM.ByteCode/Decoding/BootstrapMethod.cs @@ -33,11 +33,11 @@ public static bool TryRead(ref ClassFormatReader reader, out BootstrapMethod met /// /// /// - public readonly void EncodeTo(TConstantMap map, ref BootstrapMethodTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref BootstrapMethodTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.Method(map.Map(Method), e => self.Arguments.EncodeTo(map, ref e)); + encoder.Method(map.Map(Method), e => self.Arguments.CopyTo(map, ref e)); } public readonly MethodHandleConstantHandle Method = Method; diff --git a/src/IKVM.ByteCode/Decoding/BootstrapMethodTable.cs b/src/IKVM.ByteCode/Decoding/BootstrapMethodTable.cs index 556d4c2..460f35a 100644 --- a/src/IKVM.ByteCode/Decoding/BootstrapMethodTable.cs +++ b/src/IKVM.ByteCode/Decoding/BootstrapMethodTable.cs @@ -103,11 +103,11 @@ readonly ref readonly BootstrapMethod GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref BootstrapMethodTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref BootstrapMethodTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/BootstrapMethodsAttribute.cs b/src/IKVM.ByteCode/Decoding/BootstrapMethodsAttribute.cs index a59c7b3..80964b0 100644 --- a/src/IKVM.ByteCode/Decoding/BootstrapMethodsAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/BootstrapMethodsAttribute.cs @@ -50,11 +50,11 @@ public static bool TryRead(ref ClassFormatReader reader, out BootstrapMethodsAtt /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.BootstrapMethods(attributeName, e => self.Methods.EncodeTo(map, ref e)); + encoder.BootstrapMethods(attributeName, e => self.Methods.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/ChopStackMapFrame.cs b/src/IKVM.ByteCode/Decoding/ChopStackMapFrame.cs index 42b7c19..cacba05 100644 --- a/src/IKVM.ByteCode/Decoding/ChopStackMapFrame.cs +++ b/src/IKVM.ByteCode/Decoding/ChopStackMapFrame.cs @@ -39,7 +39,7 @@ public static bool TryRead(ref ClassFormatReader reader, byte frameType, out Cho /// /// /// - public readonly void EncodeTo(TConstantMap map, ref StackMapTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref StackMapTableEncoder encoder) where TConstantMap : IConstantMap { encoder.Chop(FrameType, OffsetDelta); diff --git a/src/IKVM.ByteCode/Decoding/ClassConstantHandleTable.cs b/src/IKVM.ByteCode/Decoding/ClassConstantHandleTable.cs index 6f6a211..889d10f 100644 --- a/src/IKVM.ByteCode/Decoding/ClassConstantHandleTable.cs +++ b/src/IKVM.ByteCode/Decoding/ClassConstantHandleTable.cs @@ -103,7 +103,7 @@ readonly ref readonly ClassConstantHandle GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ClassConstantTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ClassConstantTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) diff --git a/src/IKVM.ByteCode/Decoding/CodeAttribute.cs b/src/IKVM.ByteCode/Decoding/CodeAttribute.cs index e762606..e79b0f1 100644 --- a/src/IKVM.ByteCode/Decoding/CodeAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/CodeAttribute.cs @@ -63,7 +63,7 @@ public static bool TryRead(ref ClassFormatReader reader, out CodeAttribute attri /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; diff --git a/src/IKVM.ByteCode/Decoding/ConstantHandleTable.cs b/src/IKVM.ByteCode/Decoding/ConstantHandleTable.cs index 5cf5a0a..b8fe233 100644 --- a/src/IKVM.ByteCode/Decoding/ConstantHandleTable.cs +++ b/src/IKVM.ByteCode/Decoding/ConstantHandleTable.cs @@ -103,7 +103,7 @@ readonly ref readonly ConstantHandle GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ConstantTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ConstantTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) diff --git a/src/IKVM.ByteCode/Decoding/ConstantValueAttribute.cs b/src/IKVM.ByteCode/Decoding/ConstantValueAttribute.cs index ce12e9c..379b497 100644 --- a/src/IKVM.ByteCode/Decoding/ConstantValueAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/ConstantValueAttribute.cs @@ -40,7 +40,7 @@ public static bool TryRead(ref ClassFormatReader reader, out ConstantValueAttrib /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; diff --git a/src/IKVM.ByteCode/Decoding/DeprecatedAttribute.cs b/src/IKVM.ByteCode/Decoding/DeprecatedAttribute.cs index 05ed7b1..3e344c6 100644 --- a/src/IKVM.ByteCode/Decoding/DeprecatedAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/DeprecatedAttribute.cs @@ -34,7 +34,7 @@ public static bool TryRead(ref ClassFormatReader reader, out DeprecatedAttribute /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { encoder.Deprecated(attributeName); diff --git a/src/IKVM.ByteCode/Decoding/ElementValue.cs b/src/IKVM.ByteCode/Decoding/ElementValue.cs index 2e318e1..bd49d0d 100644 --- a/src/IKVM.ByteCode/Decoding/ElementValue.cs +++ b/src/IKVM.ByteCode/Decoding/ElementValue.cs @@ -231,7 +231,7 @@ public readonly ArrayElementValue AsArray() /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ElementValueEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ElementValueEncoder encoder) where TConstantMap : IConstantMap { switch (Kind) @@ -282,7 +282,7 @@ public readonly void EncodeTo(TConstantMap map, ref ElementValueEn break; case ElementValueKind.Annotation: var _annotation = AsAnnotation(); - encoder.Annotation(e => _annotation.Annotation.EncodeTo(map, ref e)); + encoder.Annotation(e => _annotation.Annotation.CopyTo(map, ref e)); break; case ElementValueKind.Array: break; diff --git a/src/IKVM.ByteCode/Decoding/ElementValuePair.cs b/src/IKVM.ByteCode/Decoding/ElementValuePair.cs index 6654220..6ea1ae8 100644 --- a/src/IKVM.ByteCode/Decoding/ElementValuePair.cs +++ b/src/IKVM.ByteCode/Decoding/ElementValuePair.cs @@ -62,11 +62,11 @@ public static bool TryRead(ref ClassFormatReader reader, out ElementValuePair pa /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ElementValuePairTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ElementValuePairTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.Element(map.Map(Name), e => self.Value.EncodeTo(map, ref e)); + encoder.Element(map.Map(Name), e => self.Value.CopyTo(map, ref e)); } /// diff --git a/src/IKVM.ByteCode/Decoding/ElementValuePairTable.cs b/src/IKVM.ByteCode/Decoding/ElementValuePairTable.cs index c064a19..5960d9b 100644 --- a/src/IKVM.ByteCode/Decoding/ElementValuePairTable.cs +++ b/src/IKVM.ByteCode/Decoding/ElementValuePairTable.cs @@ -148,11 +148,11 @@ readonly ref readonly ElementValuePair GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ElementValuePairTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ElementValuePairTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/EnclosingMethodAttribute.cs b/src/IKVM.ByteCode/Decoding/EnclosingMethodAttribute.cs index 6a5f117..7d2395d 100644 --- a/src/IKVM.ByteCode/Decoding/EnclosingMethodAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/EnclosingMethodAttribute.cs @@ -43,7 +43,7 @@ public static bool TryRead(ref ClassFormatReader reader, out EnclosingMethodAttr /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { encoder.EnclosingMethod(attributeName, map.Map(Class), map.Map(Method)); diff --git a/src/IKVM.ByteCode/Decoding/ExceptionHandler.cs b/src/IKVM.ByteCode/Decoding/ExceptionHandler.cs index 3f04748..1cb0d16 100644 --- a/src/IKVM.ByteCode/Decoding/ExceptionHandler.cs +++ b/src/IKVM.ByteCode/Decoding/ExceptionHandler.cs @@ -51,7 +51,7 @@ public static bool TryRead(ref ClassFormatReader reader, out ExceptionHandler ex /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ExceptionTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ExceptionTableEncoder encoder) where TConstantMap : IConstantMap { encoder.Exception(StartOffset, EndOffset, HandlerOffset, map.Map(CatchType)); diff --git a/src/IKVM.ByteCode/Decoding/ExceptionHandlerTable.cs b/src/IKVM.ByteCode/Decoding/ExceptionHandlerTable.cs index dbb9c0f..4e3e786 100644 --- a/src/IKVM.ByteCode/Decoding/ExceptionHandlerTable.cs +++ b/src/IKVM.ByteCode/Decoding/ExceptionHandlerTable.cs @@ -144,11 +144,11 @@ readonly ref readonly ExceptionHandler GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ExceptionTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ExceptionTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/ExceptionsAttribute.cs b/src/IKVM.ByteCode/Decoding/ExceptionsAttribute.cs index 618c27f..3c7d446 100644 --- a/src/IKVM.ByteCode/Decoding/ExceptionsAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/ExceptionsAttribute.cs @@ -49,11 +49,11 @@ public static bool TryRead(ref ClassFormatReader reader, out ExceptionsAttribute /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.Exceptions(attributeName, e => self.EncodeTo(map, ref e)); + encoder.Exceptions(attributeName, e => self.CopyTo(map, ref e)); } /// @@ -61,10 +61,10 @@ public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ClassConstantTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ClassConstantTableEncoder encoder) where TConstantMap : IConstantMap { - Exceptions.EncodeTo(map, ref encoder); + Exceptions.CopyTo(map, ref encoder); } } diff --git a/src/IKVM.ByteCode/Decoding/FullStackMapFrame.cs b/src/IKVM.ByteCode/Decoding/FullStackMapFrame.cs index 7740a16..1f0963a 100644 --- a/src/IKVM.ByteCode/Decoding/FullStackMapFrame.cs +++ b/src/IKVM.ByteCode/Decoding/FullStackMapFrame.cs @@ -86,11 +86,11 @@ public static bool TryRead(ref ClassFormatReader reader, byte tag, out FullStack /// /// /// - public readonly void EncodeTo(TConstantMap map, ref StackMapTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref StackMapTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.Full(OffsetDelta, e => self.Locals.EncodeTo(map, ref e), e => self.Stack.EncodeTo(map, ref e)); + encoder.Full(OffsetDelta, e => self.Locals.CopyTo(map, ref e), e => self.Stack.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/InnerClassesAttribute.cs b/src/IKVM.ByteCode/Decoding/InnerClassesAttribute.cs index f8008c2..9df442e 100644 --- a/src/IKVM.ByteCode/Decoding/InnerClassesAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/InnerClassesAttribute.cs @@ -55,11 +55,11 @@ public static bool TryRead(ref ClassFormatReader reader, out InnerClassesAttribu /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.InnerClasses(attributeName, e => self.EncodeTo(map, ref e)); + encoder.InnerClasses(attributeName, e => self.CopyTo(map, ref e)); } /// @@ -67,7 +67,7 @@ public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle /// /// /// - public readonly void EncodeTo(TConstantMap map, ref InnerClassTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref InnerClassTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in Table) diff --git a/src/IKVM.ByteCode/Decoding/LineNumberInfo.cs b/src/IKVM.ByteCode/Decoding/LineNumberInfo.cs index 67fb7e9..e181247 100644 --- a/src/IKVM.ByteCode/Decoding/LineNumberInfo.cs +++ b/src/IKVM.ByteCode/Decoding/LineNumberInfo.cs @@ -25,7 +25,7 @@ public readonly record struct LineNumberInfo(ushort StartPc, ushort LineNumber) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref LineNumberTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref LineNumberTableEncoder encoder) where TConstantMap : IConstantMap { encoder.LineNumber(StartPc, LineNumber); diff --git a/src/IKVM.ByteCode/Decoding/LineNumberTable.cs b/src/IKVM.ByteCode/Decoding/LineNumberTable.cs index ee99e85..7a2dede 100644 --- a/src/IKVM.ByteCode/Decoding/LineNumberTable.cs +++ b/src/IKVM.ByteCode/Decoding/LineNumberTable.cs @@ -103,11 +103,11 @@ readonly ref readonly LineNumberInfo GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref LineNumberTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref LineNumberTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/LineNumberTableAttribute.cs b/src/IKVM.ByteCode/Decoding/LineNumberTableAttribute.cs index a5e5b02..aec2bf8 100644 --- a/src/IKVM.ByteCode/Decoding/LineNumberTableAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/LineNumberTableAttribute.cs @@ -51,11 +51,11 @@ public static bool TryRead(ref ClassFormatReader reader, out LineNumberTableAttr /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.LineNumberTable(attributeName, e => self.LineNumbers.EncodeTo(map, ref e)); + encoder.LineNumberTable(attributeName, e => self.LineNumbers.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/LocalVarTarget.cs b/src/IKVM.ByteCode/Decoding/LocalVarTarget.cs index 512d991..a690f05 100644 --- a/src/IKVM.ByteCode/Decoding/LocalVarTarget.cs +++ b/src/IKVM.ByteCode/Decoding/LocalVarTarget.cs @@ -153,11 +153,11 @@ readonly ref readonly LocalVarTargetItem GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref LocalVarTargetTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref LocalVarTargetTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/LocalVarTargetItem.cs b/src/IKVM.ByteCode/Decoding/LocalVarTargetItem.cs index b6679bd..d7dc8d2 100644 --- a/src/IKVM.ByteCode/Decoding/LocalVarTargetItem.cs +++ b/src/IKVM.ByteCode/Decoding/LocalVarTargetItem.cs @@ -50,7 +50,7 @@ record = default; /// /// /// - public readonly void EncodeTo(TConstantMap map, ref LocalVarTargetTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref LocalVarTargetTableEncoder encoder) where TConstantMap : IConstantMap { WriteTo(ref encoder); diff --git a/src/IKVM.ByteCode/Decoding/LocalVariable.cs b/src/IKVM.ByteCode/Decoding/LocalVariable.cs index 86d5faa..2536963 100644 --- a/src/IKVM.ByteCode/Decoding/LocalVariable.cs +++ b/src/IKVM.ByteCode/Decoding/LocalVariable.cs @@ -11,7 +11,7 @@ public readonly record struct LocalVariable(ushort StartPc, ushort Length, Utf8C /// /// /// - public readonly void EncodeTo(TConstantMap map, ref LocalVariableTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref LocalVariableTableEncoder encoder) where TConstantMap : IConstantMap { encoder.LocalVariable(StartPc, Length, map.Map(Name), map.Map(Descriptor), Slot); diff --git a/src/IKVM.ByteCode/Decoding/LocalVariableTable.cs b/src/IKVM.ByteCode/Decoding/LocalVariableTable.cs index 9315c7d..7b10b8d 100644 --- a/src/IKVM.ByteCode/Decoding/LocalVariableTable.cs +++ b/src/IKVM.ByteCode/Decoding/LocalVariableTable.cs @@ -103,11 +103,11 @@ readonly ref readonly LocalVariable GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref LocalVariableTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref LocalVariableTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/LocalVariableTableAttribute.cs b/src/IKVM.ByteCode/Decoding/LocalVariableTableAttribute.cs index dc6efa1..0db1677 100644 --- a/src/IKVM.ByteCode/Decoding/LocalVariableTableAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/LocalVariableTableAttribute.cs @@ -57,11 +57,11 @@ public static bool TryRead(ref ClassFormatReader reader, out LocalVariableTableA /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.LocalVariableTable(attributeName, e => self.LocalVariables.EncodeTo(map, ref e)); + encoder.LocalVariableTable(attributeName, e => self.LocalVariables.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/LocalVariableType.cs b/src/IKVM.ByteCode/Decoding/LocalVariableType.cs index 523459f..0391be3 100644 --- a/src/IKVM.ByteCode/Decoding/LocalVariableType.cs +++ b/src/IKVM.ByteCode/Decoding/LocalVariableType.cs @@ -13,7 +13,7 @@ public readonly record struct LocalVariableType(ushort StartPc, ushort Length, U /// /// /// - public readonly void EncodeTo(TConstantMap map, ref LocalVariableTypeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref LocalVariableTypeTableEncoder encoder) where TConstantMap : IConstantMap { encoder.LocalVariableType(StartPc, Length, map.Map(Name), map.Map(Signature), Slot); diff --git a/src/IKVM.ByteCode/Decoding/LocalVariableTypeTable.cs b/src/IKVM.ByteCode/Decoding/LocalVariableTypeTable.cs index 0061d3b..a20201f 100644 --- a/src/IKVM.ByteCode/Decoding/LocalVariableTypeTable.cs +++ b/src/IKVM.ByteCode/Decoding/LocalVariableTypeTable.cs @@ -103,11 +103,11 @@ readonly ref readonly LocalVariableType GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref LocalVariableTypeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref LocalVariableTypeTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/LocalVariableTypeTableAttribute.cs b/src/IKVM.ByteCode/Decoding/LocalVariableTypeTableAttribute.cs index 1078b34..3d5dd39 100644 --- a/src/IKVM.ByteCode/Decoding/LocalVariableTypeTableAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/LocalVariableTypeTableAttribute.cs @@ -57,11 +57,11 @@ public static bool TryRead(ref ClassFormatReader reader, out LocalVariableTypeTa /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.LocalVariableTypeTable(attributeName, e => self.LocalVariableTypes.EncodeTo(map, ref e)); + encoder.LocalVariableTypeTable(attributeName, e => self.LocalVariableTypes.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/MethodParameterTable.cs b/src/IKVM.ByteCode/Decoding/MethodParameterTable.cs index 114f27b..dc709b8 100644 --- a/src/IKVM.ByteCode/Decoding/MethodParameterTable.cs +++ b/src/IKVM.ByteCode/Decoding/MethodParameterTable.cs @@ -103,7 +103,7 @@ readonly ref readonly MethodParameter GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref MethodParameterTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref MethodParameterTableEncoder encoder) where TConstantMap : IConstantMap { diff --git a/src/IKVM.ByteCode/Decoding/MethodParametersAttribute.cs b/src/IKVM.ByteCode/Decoding/MethodParametersAttribute.cs index 9a705a7..4437f64 100644 --- a/src/IKVM.ByteCode/Decoding/MethodParametersAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/MethodParametersAttribute.cs @@ -51,11 +51,11 @@ public static bool TryRead(ref ClassFormatReader reader, out MethodParametersAtt /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.MethodParameters(attributeName, e => self.Parameters.EncodeTo(map, ref e)); + encoder.MethodParameters(attributeName, e => self.Parameters.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/ModuleAttribute.cs b/src/IKVM.ByteCode/Decoding/ModuleAttribute.cs index bd6099f..4c8ed18 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleAttribute.cs @@ -155,7 +155,7 @@ public static bool TryRead(ref ClassFormatReader reader, out ModuleAttribute att /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; @@ -164,11 +164,11 @@ public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle map.Map(Name), Flags, map.Map(Version), - e => self.Requires.EncodeTo(map, ref e), - e => self.Exports.EncodeTo(map, ref e), - e => self.Opens.EncodeTo(map, ref e), - e => self.Uses.EncodeTo(map, ref e), - e => self.Provides.EncodeTo(map, ref e)); + e => self.Requires.CopyTo(map, ref e), + e => self.Exports.CopyTo(map, ref e), + e => self.Opens.CopyTo(map, ref e), + e => self.Uses.CopyTo(map, ref e), + e => self.Provides.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/ModuleExportInfo.cs b/src/IKVM.ByteCode/Decoding/ModuleExportInfo.cs index 7914690..0899d14 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleExportInfo.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleExportInfo.cs @@ -28,7 +28,7 @@ public readonly record struct ModuleExportInfo(PackageConstantHandle Package, Mo /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ModuleExportsTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ModuleExportsTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; diff --git a/src/IKVM.ByteCode/Decoding/ModuleExportsTable.cs b/src/IKVM.ByteCode/Decoding/ModuleExportsTable.cs index 0502921..175977b 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleExportsTable.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleExportsTable.cs @@ -97,11 +97,11 @@ readonly ref readonly ModuleExportInfo GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ModuleExportsTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ModuleExportsTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/ModuleMainClassAttribute.cs b/src/IKVM.ByteCode/Decoding/ModuleMainClassAttribute.cs index ff069ef..4ccdb95 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleMainClassAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleMainClassAttribute.cs @@ -38,7 +38,7 @@ public static bool TryRead(ref ClassFormatReader reader, out ModuleMainClassAttr /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { encoder.ModuleMainClass(attributeName, map.Map(MainClass)); diff --git a/src/IKVM.ByteCode/Decoding/ModuleOpenInfo.cs b/src/IKVM.ByteCode/Decoding/ModuleOpenInfo.cs index bff7509..15c532d 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleOpenInfo.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleOpenInfo.cs @@ -28,7 +28,7 @@ public readonly record struct ModuleOpenInfo(PackageConstantHandle Package, Modu /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ModuleOpensTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ModuleOpensTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; diff --git a/src/IKVM.ByteCode/Decoding/ModuleOpensTable.cs b/src/IKVM.ByteCode/Decoding/ModuleOpensTable.cs index c755755..d0c1aab 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleOpensTable.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleOpensTable.cs @@ -97,11 +97,11 @@ readonly ref readonly ModuleOpenInfo GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ModuleOpensTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ModuleOpensTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/ModulePackagesAttribute.cs b/src/IKVM.ByteCode/Decoding/ModulePackagesAttribute.cs index 13d221a..94e4693 100644 --- a/src/IKVM.ByteCode/Decoding/ModulePackagesAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/ModulePackagesAttribute.cs @@ -47,11 +47,11 @@ public static bool TryRead(ref ClassFormatReader reader, out ModulePackagesAttri /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.ModulePackages(attributeName, e => self.Packages.EncodeTo(map, ref e)); + encoder.ModulePackages(attributeName, e => self.Packages.CopyTo(map, ref e)); } /// @@ -59,10 +59,10 @@ public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle /// /// /// - public readonly void EncodeTo(TConstantMap map, ref PackageConstantTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref PackageConstantTableEncoder encoder) where TConstantMap : IConstantMap { - Packages.EncodeTo(map, ref encoder); + Packages.CopyTo(map, ref encoder); } } diff --git a/src/IKVM.ByteCode/Decoding/ModuleProvideInfo.cs b/src/IKVM.ByteCode/Decoding/ModuleProvideInfo.cs index 2a10284..639edb5 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleProvideInfo.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleProvideInfo.cs @@ -25,11 +25,11 @@ public readonly record struct ModuleProvideInfo(ClassConstantHandle Class, Class /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ModuleProvidesTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ModuleProvidesTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.Provides(map.Map(Class), e => self.With.EncodeTo(map, ref e)); + encoder.Provides(map.Map(Class), e => self.With.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/ModuleProvidesTable.cs b/src/IKVM.ByteCode/Decoding/ModuleProvidesTable.cs index 98149d4..345c94d 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleProvidesTable.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleProvidesTable.cs @@ -97,11 +97,11 @@ readonly ref readonly ModuleProvideInfo GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ModuleProvidesTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ModuleProvidesTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/ModuleRequireInfo.cs b/src/IKVM.ByteCode/Decoding/ModuleRequireInfo.cs index bab2ea9..b06d4b6 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleRequireInfo.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleRequireInfo.cs @@ -28,7 +28,7 @@ public readonly record struct ModuleRequireInfo(ModuleConstantHandle Module, Mod /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ModuleRequiresTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ModuleRequiresTableEncoder encoder) where TConstantMap : IConstantMap { encoder.Requires(map.Map(Module), Flag, map.Map(Version)); diff --git a/src/IKVM.ByteCode/Decoding/ModuleRequiresTable.cs b/src/IKVM.ByteCode/Decoding/ModuleRequiresTable.cs index 803fbc8..1b27c05 100644 --- a/src/IKVM.ByteCode/Decoding/ModuleRequiresTable.cs +++ b/src/IKVM.ByteCode/Decoding/ModuleRequiresTable.cs @@ -100,11 +100,11 @@ readonly ref readonly ModuleRequireInfo GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ModuleRequiresTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ModuleRequiresTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/NestHostAttribute.cs b/src/IKVM.ByteCode/Decoding/NestHostAttribute.cs index 116c746..f795245 100644 --- a/src/IKVM.ByteCode/Decoding/NestHostAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/NestHostAttribute.cs @@ -40,7 +40,7 @@ public static bool TryRead(ref ClassFormatReader reader, out NestHostAttribute a /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { encoder.NestHost(attributeName, map.Map(NestHost)); diff --git a/src/IKVM.ByteCode/Decoding/NestMembersAttribute.cs b/src/IKVM.ByteCode/Decoding/NestMembersAttribute.cs index 49781fc..e4dc5ae 100644 --- a/src/IKVM.ByteCode/Decoding/NestMembersAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/NestMembersAttribute.cs @@ -47,11 +47,11 @@ public static bool TryRead(ref ClassFormatReader reader, out NestMembersAttribut /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.NestMembers(attributeName, e => self.EncodeTo(map, ref e)); + encoder.NestMembers(attributeName, e => self.CopyTo(map, ref e)); } /// @@ -59,10 +59,10 @@ public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ClassConstantTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ClassConstantTableEncoder encoder) where TConstantMap : IConstantMap { - NestMembers.EncodeTo(map, ref encoder); + NestMembers.CopyTo(map, ref encoder); } } diff --git a/src/IKVM.ByteCode/Decoding/PackageConstantHandleTable.cs b/src/IKVM.ByteCode/Decoding/PackageConstantHandleTable.cs index 6fce079..8359d95 100644 --- a/src/IKVM.ByteCode/Decoding/PackageConstantHandleTable.cs +++ b/src/IKVM.ByteCode/Decoding/PackageConstantHandleTable.cs @@ -103,7 +103,7 @@ readonly ref readonly PackageConstantHandle GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref PackageConstantTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref PackageConstantTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) diff --git a/src/IKVM.ByteCode/Decoding/ParameterAnnotation.cs b/src/IKVM.ByteCode/Decoding/ParameterAnnotation.cs index a5284d1..a65e041 100644 --- a/src/IKVM.ByteCode/Decoding/ParameterAnnotation.cs +++ b/src/IKVM.ByteCode/Decoding/ParameterAnnotation.cs @@ -69,11 +69,11 @@ public static bool TryRead(ref ClassFormatReader reader, out ParameterAnnotation /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ParameterAnnotationTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ParameterAnnotationTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.ParameterAnnotation(e => self.EncodeTo(map, ref e)); + encoder.ParameterAnnotation(e => self.CopyTo(map, ref e)); } /// @@ -81,10 +81,10 @@ public readonly void EncodeTo(TConstantMap map, ref ParameterAnnot /// /// /// - public readonly void EncodeTo(TConstantMap map, ref AnnotationTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref AnnotationTableEncoder encoder) where TConstantMap : IConstantMap { - Annotations.EncodeTo(map, ref encoder); + Annotations.CopyTo(map, ref encoder); } } diff --git a/src/IKVM.ByteCode/Decoding/ParameterAnnotationTable.cs b/src/IKVM.ByteCode/Decoding/ParameterAnnotationTable.cs index 17dae1a..a168e9a 100644 --- a/src/IKVM.ByteCode/Decoding/ParameterAnnotationTable.cs +++ b/src/IKVM.ByteCode/Decoding/ParameterAnnotationTable.cs @@ -151,11 +151,11 @@ readonly ref readonly ParameterAnnotation GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ParameterAnnotationTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ParameterAnnotationTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - encoder.ParameterAnnotation(e => i.EncodeTo(map, ref e)); + encoder.ParameterAnnotation(e => i.CopyTo(map, ref e)); } /// diff --git a/src/IKVM.ByteCode/Decoding/PermittedSubclassesAttribute.cs b/src/IKVM.ByteCode/Decoding/PermittedSubclassesAttribute.cs index e68a2b6..036e714 100644 --- a/src/IKVM.ByteCode/Decoding/PermittedSubclassesAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/PermittedSubclassesAttribute.cs @@ -49,11 +49,11 @@ public static bool TryRead(ref ClassFormatReader reader, out PermittedSubclasses /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.PermittedSubclasses(attributeName, e => self.EncodeTo(map, ref e)); + encoder.PermittedSubclasses(attributeName, e => self.CopyTo(map, ref e)); } /// @@ -61,10 +61,10 @@ public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle /// /// /// - public readonly void EncodeTo(TConstantMap map, ref ClassConstantTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref ClassConstantTableEncoder encoder) where TConstantMap : IConstantMap { - PermittedSubclasses.EncodeTo(map, ref encoder); + PermittedSubclasses.CopyTo(map, ref encoder); } } diff --git a/src/IKVM.ByteCode/Decoding/RecordAttribute.cs b/src/IKVM.ByteCode/Decoding/RecordAttribute.cs index 789c836..36dbc49 100644 --- a/src/IKVM.ByteCode/Decoding/RecordAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/RecordAttribute.cs @@ -53,11 +53,11 @@ public static bool TryRead(ref ClassFormatReader reader, out RecordAttribute att /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.Record(attributeName, e => self.Components.EncodeTo(map, ref e)); + encoder.Record(attributeName, e => self.Components.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/RecordComponent.cs b/src/IKVM.ByteCode/Decoding/RecordComponent.cs index 5429609..2e2eb6e 100644 --- a/src/IKVM.ByteCode/Decoding/RecordComponent.cs +++ b/src/IKVM.ByteCode/Decoding/RecordComponent.cs @@ -30,11 +30,11 @@ public readonly record struct RecordComponent(Utf8ConstantHandle Name, Utf8Const /// /// /// - public readonly void EncodeTo(TConstantMap map, ref RecordComponentTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref RecordComponentTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.RecordComponent(map.Map(Name), map.Map(Descriptor), e => self.Attributes.EncodeTo(map, ref e)); + encoder.RecordComponent(map.Map(Name), map.Map(Descriptor), e => self.Attributes.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/RecordComponentTable.cs b/src/IKVM.ByteCode/Decoding/RecordComponentTable.cs index 2f65295..1510c54 100644 --- a/src/IKVM.ByteCode/Decoding/RecordComponentTable.cs +++ b/src/IKVM.ByteCode/Decoding/RecordComponentTable.cs @@ -103,11 +103,11 @@ readonly ref readonly RecordComponent GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref RecordComponentTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref RecordComponentTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/RuntimeInvisibleAnnotationsAttribute.cs b/src/IKVM.ByteCode/Decoding/RuntimeInvisibleAnnotationsAttribute.cs index bd9e7a6..439a44e 100644 --- a/src/IKVM.ByteCode/Decoding/RuntimeInvisibleAnnotationsAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/RuntimeInvisibleAnnotationsAttribute.cs @@ -48,11 +48,11 @@ public static bool TryRead(ref ClassFormatReader reader, out RuntimeInvisibleAnn /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.RuntimeInvisibleAnnotations(attributeName,e => self.Annotations.EncodeTo(map, ref e)); + encoder.RuntimeInvisibleAnnotations(attributeName,e => self.Annotations.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/RuntimeInvisibleParameterAnnotationsAttribute.cs b/src/IKVM.ByteCode/Decoding/RuntimeInvisibleParameterAnnotationsAttribute.cs index fba914d..7cae7b9 100644 --- a/src/IKVM.ByteCode/Decoding/RuntimeInvisibleParameterAnnotationsAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/RuntimeInvisibleParameterAnnotationsAttribute.cs @@ -49,11 +49,11 @@ public static bool TryRead(ref ClassFormatReader reader, out RuntimeInvisiblePar /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.RuntimeInvisibleParameterAnnotations(attributeName, e => self.ParameterAnnotations.EncodeTo(map, ref e)); + encoder.RuntimeInvisibleParameterAnnotations(attributeName, e => self.ParameterAnnotations.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/RuntimeInvisibleTypeAnnotationsAttribute.cs b/src/IKVM.ByteCode/Decoding/RuntimeInvisibleTypeAnnotationsAttribute.cs index e8ca120..67c91d3 100644 --- a/src/IKVM.ByteCode/Decoding/RuntimeInvisibleTypeAnnotationsAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/RuntimeInvisibleTypeAnnotationsAttribute.cs @@ -49,11 +49,11 @@ public static bool TryRead(ref ClassFormatReader reader, out RuntimeInvisibleTyp /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.RuntimeInvisibleTypeAnnotations(attributeName, e => self.TypeAnnotations.EncodeTo(map, ref e)); + encoder.RuntimeInvisibleTypeAnnotations(attributeName, e => self.TypeAnnotations.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/RuntimeVisibleAnnotationsAttribute.cs b/src/IKVM.ByteCode/Decoding/RuntimeVisibleAnnotationsAttribute.cs index 56ffdd9..b8c20fe 100644 --- a/src/IKVM.ByteCode/Decoding/RuntimeVisibleAnnotationsAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/RuntimeVisibleAnnotationsAttribute.cs @@ -46,11 +46,11 @@ public static bool TryRead(ref ClassFormatReader reader, out RuntimeVisibleAnnot /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.RuntimeVisibleAnnotations(attributeName, e => self.Annotations.EncodeTo(map, ref e)); + encoder.RuntimeVisibleAnnotations(attributeName, e => self.Annotations.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/RuntimeVisibleParameterAnnotationsAttribute.cs b/src/IKVM.ByteCode/Decoding/RuntimeVisibleParameterAnnotationsAttribute.cs index 37e0a4c..795ebcf 100644 --- a/src/IKVM.ByteCode/Decoding/RuntimeVisibleParameterAnnotationsAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/RuntimeVisibleParameterAnnotationsAttribute.cs @@ -49,11 +49,11 @@ public static bool TryRead(ref ClassFormatReader reader, out RuntimeVisibleParam /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.RuntimeVisibleParameterAnnotations(attributeName, e => self.ParameterAnnotations.EncodeTo(map, ref e)); + encoder.RuntimeVisibleParameterAnnotations(attributeName, e => self.ParameterAnnotations.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/RuntimeVisibleTypeAnnotationsAttribute.cs b/src/IKVM.ByteCode/Decoding/RuntimeVisibleTypeAnnotationsAttribute.cs index 79783f1..8434153 100644 --- a/src/IKVM.ByteCode/Decoding/RuntimeVisibleTypeAnnotationsAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/RuntimeVisibleTypeAnnotationsAttribute.cs @@ -49,11 +49,11 @@ public static bool TryRead(ref ClassFormatReader reader, out RuntimeVisibleTypeA /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.RuntimeVisibleTypeAnnotations(attributeName, e => self.TypeAnnotations.EncodeTo(map, ref e)); + encoder.RuntimeVisibleTypeAnnotations(attributeName, e => self.TypeAnnotations.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/SameExtendedStackMapFrame.cs b/src/IKVM.ByteCode/Decoding/SameExtendedStackMapFrame.cs index 49d1235..933ef6a 100644 --- a/src/IKVM.ByteCode/Decoding/SameExtendedStackMapFrame.cs +++ b/src/IKVM.ByteCode/Decoding/SameExtendedStackMapFrame.cs @@ -54,7 +54,7 @@ public static bool TryRead(ref ClassFormatReader reader, byte frameType, out Sam /// /// /// - public readonly void EncodeTo(TConstantMap map, ref StackMapTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref StackMapTableEncoder encoder) where TConstantMap : IConstantMap { encoder.SameExtended(OffsetDelta); diff --git a/src/IKVM.ByteCode/Decoding/SameLocalsOneExtendedStackMapFrame.cs b/src/IKVM.ByteCode/Decoding/SameLocalsOneExtendedStackMapFrame.cs index c7eeccd..9214fe9 100644 --- a/src/IKVM.ByteCode/Decoding/SameLocalsOneExtendedStackMapFrame.cs +++ b/src/IKVM.ByteCode/Decoding/SameLocalsOneExtendedStackMapFrame.cs @@ -59,11 +59,11 @@ public static bool TryRead(ref ClassFormatReader reader, byte frameType, out Sam /// /// /// - public readonly void EncodeTo(TConstantMap map, ref StackMapTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref StackMapTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.SameLocalsOneStackItemExtended(OffsetDelta, e => self.Stack.EncodeTo(map, ref e)); + encoder.SameLocalsOneStackItemExtended(OffsetDelta, e => self.Stack.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/SameLocalsOneStackMapFrame.cs b/src/IKVM.ByteCode/Decoding/SameLocalsOneStackMapFrame.cs index b53f60d..03ab1ac 100644 --- a/src/IKVM.ByteCode/Decoding/SameLocalsOneStackMapFrame.cs +++ b/src/IKVM.ByteCode/Decoding/SameLocalsOneStackMapFrame.cs @@ -52,11 +52,11 @@ public static bool TryRead(ref ClassFormatReader reader, byte frameType, out Sam /// /// /// - public readonly void EncodeTo(TConstantMap map, ref StackMapTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref StackMapTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.SameLocalsOneStackItem(FrameType, e => self.Stack.EncodeTo(map, ref e)); + encoder.SameLocalsOneStackItem(FrameType, e => self.Stack.CopyTo(map, ref e)); } } diff --git a/src/IKVM.ByteCode/Decoding/SameStackMapFrame.cs b/src/IKVM.ByteCode/Decoding/SameStackMapFrame.cs index c079fa2..2ce8476 100644 --- a/src/IKVM.ByteCode/Decoding/SameStackMapFrame.cs +++ b/src/IKVM.ByteCode/Decoding/SameStackMapFrame.cs @@ -43,7 +43,7 @@ public static bool TryRead(ref ClassFormatReader reader, byte frameType, out Sam /// /// /// - public readonly void EncodeTo(TConstantMap map, ref StackMapTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref StackMapTableEncoder encoder) where TConstantMap : IConstantMap { encoder.Same(FrameType); diff --git a/src/IKVM.ByteCode/Decoding/SignatureAttribute.cs b/src/IKVM.ByteCode/Decoding/SignatureAttribute.cs index 1685e50..e86eba3 100644 --- a/src/IKVM.ByteCode/Decoding/SignatureAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/SignatureAttribute.cs @@ -40,7 +40,7 @@ public static bool TryRead(ref ClassFormatReader reader, out SignatureAttribute /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { encoder.Signature(attributeName, map.Map(Signature)); diff --git a/src/IKVM.ByteCode/Decoding/SourceDebugExtensionAttribute.cs b/src/IKVM.ByteCode/Decoding/SourceDebugExtensionAttribute.cs index c2876e8..9b7e8bf 100644 --- a/src/IKVM.ByteCode/Decoding/SourceDebugExtensionAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/SourceDebugExtensionAttribute.cs @@ -42,7 +42,7 @@ public static bool TryRead(ref ClassFormatReader reader, out SourceDebugExtensio /// /// /// - public void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var b = new BlobBuilder(); diff --git a/src/IKVM.ByteCode/Decoding/SourceFileAttribute.cs b/src/IKVM.ByteCode/Decoding/SourceFileAttribute.cs index 96060f1..3a65247 100644 --- a/src/IKVM.ByteCode/Decoding/SourceFileAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/SourceFileAttribute.cs @@ -40,7 +40,7 @@ public static bool TryRead(ref ClassFormatReader reader, out SourceFileAttribute /// /// /// - public void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { encoder.SourceFile(attributeName, map.Map(SourceFile)); diff --git a/src/IKVM.ByteCode/Decoding/StackMapFrame.cs b/src/IKVM.ByteCode/Decoding/StackMapFrame.cs index 31c2349..77593ad 100644 --- a/src/IKVM.ByteCode/Decoding/StackMapFrame.cs +++ b/src/IKVM.ByteCode/Decoding/StackMapFrame.cs @@ -192,23 +192,23 @@ public readonly FullStackMapFrame AsFullStackMap() /// /// /// - public readonly void EncodeTo(TConstantMap map, ref StackMapTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref StackMapTableEncoder encoder) where TConstantMap : IConstantMap { if (FrameType is <= 65) - ((SameStackMapFrame)this).EncodeTo(map, ref encoder); + ((SameStackMapFrame)this).CopyTo(map, ref encoder); else if (FrameType is >= 64 and <= 127) - ((SameLocalsOneStackMapFrame)this).EncodeTo(map, ref encoder); + ((SameLocalsOneStackMapFrame)this).CopyTo(map, ref encoder); else if (FrameType is 247) - ((SameLocalsOneExtendedStackMapFrame)this).EncodeTo(map, ref encoder); + ((SameLocalsOneExtendedStackMapFrame)this).CopyTo(map, ref encoder); else if (FrameType is >= 248 and <= 250) - ((ChopStackMapFrame)this).EncodeTo(map, ref encoder); + ((ChopStackMapFrame)this).CopyTo(map, ref encoder); else if (FrameType is 251) - ((SameExtendedStackMapFrame)this).EncodeTo(map, ref encoder); + ((SameExtendedStackMapFrame)this).CopyTo(map, ref encoder); else if (FrameType is >= 252 and <= 254) - ((AppendStackMapFrame)this).EncodeTo(map, ref encoder); + ((AppendStackMapFrame)this).CopyTo(map, ref encoder); else if (FrameType is 255) - ((FullStackMapFrame)this).EncodeTo(map, ref encoder); + ((FullStackMapFrame)this).CopyTo(map, ref encoder); else throw new ByteCodeException("Invalid stack map frame type."); } diff --git a/src/IKVM.ByteCode/Decoding/StackMapTableAttribute.cs b/src/IKVM.ByteCode/Decoding/StackMapTableAttribute.cs index 90ddec8..fce8aec 100644 --- a/src/IKVM.ByteCode/Decoding/StackMapTableAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/StackMapTableAttribute.cs @@ -46,11 +46,11 @@ public static bool TryRead(ref ClassFormatReader reader, out StackMapTableAttrib /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.StackMapTable(attributeName, e => self.EncodeTo(map, ref e)); + encoder.StackMapTable(attributeName, e => self.CopyTo(map, ref e)); } /// @@ -58,12 +58,12 @@ public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle /// /// /// - public readonly void EncodeTo(TConstantMap map, ref StackMapTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref StackMapTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; foreach (var i in self.Frames) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } } diff --git a/src/IKVM.ByteCode/Decoding/SyntheticAttribute.cs b/src/IKVM.ByteCode/Decoding/SyntheticAttribute.cs index 03b6f3a..374eeaa 100644 --- a/src/IKVM.ByteCode/Decoding/SyntheticAttribute.cs +++ b/src/IKVM.ByteCode/Decoding/SyntheticAttribute.cs @@ -34,7 +34,7 @@ public static bool TryRead(ref ClassFormatReader reader, out SyntheticAttribute /// /// /// - public readonly void EncodeTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, Utf8ConstantHandle attributeName, ref AttributeTableEncoder encoder) where TConstantMap : IConstantMap { encoder.Synthetic(attributeName); diff --git a/src/IKVM.ByteCode/Decoding/TypeAnnotation.cs b/src/IKVM.ByteCode/Decoding/TypeAnnotation.cs index 76f78f9..092ccb8 100644 --- a/src/IKVM.ByteCode/Decoding/TypeAnnotation.cs +++ b/src/IKVM.ByteCode/Decoding/TypeAnnotation.cs @@ -62,11 +62,11 @@ public static bool TryRead(ref ClassFormatReader reader, out TypeAnnotation anno /// /// /// - public readonly void EncodeTo(TConstantMap map, ref TypeAnnotationTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref TypeAnnotationTableEncoder encoder) where TConstantMap : IConstantMap { var self = this; - encoder.TypeAnnotation(e => self.EncodeTo(map, ref e)); + encoder.TypeAnnotation(e => self.CopyTo(map, ref e)); } /// @@ -74,7 +74,7 @@ public readonly void EncodeTo(TConstantMap map, ref TypeAnnotation /// /// /// - public readonly void EncodeTo(TConstantMap map, ref TypeAnnotationEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref TypeAnnotationEncoder encoder) where TConstantMap : IConstantMap { var self = this; @@ -83,91 +83,91 @@ public readonly void EncodeTo(TConstantMap map, ref TypeAnnotation { case TypeAnnotationTargetType.ClassTypeParameter: var _classTypeParameter = Target.AsTypeParameterTarget(); - encoder.ClassTypeParameter(_classTypeParameter.ParameterIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.ClassTypeParameter(_classTypeParameter.ParameterIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.MethodTypeParameter: var _methodTypeParameter = Target.AsTypeParameterTarget(); - encoder.MethodTypeParameter(_methodTypeParameter.ParameterIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.MethodTypeParameter(_methodTypeParameter.ParameterIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.ClassExtends: var superTypeTarget = Target.AsSuperTypeTarget(); - encoder.ClassExtends(superTypeTarget.SuperTypeIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.ClassExtends(superTypeTarget.SuperTypeIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.ClassTypeParameterBound: var classTypeParameterBound = Target.AsTypeParameterBoundTarget(); - encoder.ClassTypeParameterBound(classTypeParameterBound.ParameterIndex, classTypeParameterBound.BoundIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.ClassTypeParameterBound(classTypeParameterBound.ParameterIndex, classTypeParameterBound.BoundIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.MethodTypeParameterBound: var methodTypeParameterBound = Target.AsTypeParameterBoundTarget(); - encoder.MethodTypeParameterBound(methodTypeParameterBound.ParameterIndex, methodTypeParameterBound.BoundIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.MethodTypeParameterBound(methodTypeParameterBound.ParameterIndex, methodTypeParameterBound.BoundIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.Field: var field = Target.AsEmptyTarget(); - encoder.Field(e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.Field(e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.MethodReturn: var methodReturn = Target.AsEmptyTarget(); - encoder.MethodReturn(e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.MethodReturn(e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.MethodReceiver: var methodReceiver = Target.AsEmptyTarget(); - encoder.MethodReceiver(e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.MethodReceiver(e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.MethodFormalParameter: var methodFormalParameter = Target.AsFormalParameterTarget(); - encoder.MethodFormalParameter(methodFormalParameter.ParameterIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.MethodFormalParameter(methodFormalParameter.ParameterIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.Throws: var throws = Target.AsThrowsTarget(); - encoder.Throws(throws.ThrowsTypeIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.Throws(throws.ThrowsTypeIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.LocalVar: var localVar = Target.AsLocalVarTarget(); - encoder.LocalVariable(e => localVar.EncodeTo(map, ref e), e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.LocalVariable(e => localVar.CopyTo(map, ref e), e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.ResourceVariable: var resourceVariable = Target.AsLocalVarTarget(); - encoder.ResourceVariable(e => resourceVariable.EncodeTo(map, ref e), e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.ResourceVariable(e => resourceVariable.CopyTo(map, ref e), e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.ExceptionParameter: var catchTarget = Target.AsCatchTarget(); - encoder.ExceptionParameter(catchTarget.ExceptionTableIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.ExceptionParameter(catchTarget.ExceptionTableIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.InstanceOf: var instanceOf = Target.AsOffsetTarget(); - encoder.InstanceOf(instanceOf.Offset, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.InstanceOf(instanceOf.Offset, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.New: var new_ = Target.AsOffsetTarget(); - encoder.New(new_.Offset, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.New(new_.Offset, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.ConstructorReference: var constructorReference = Target.AsOffsetTarget(); - encoder.ConstructorReference(constructorReference.Offset, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.ConstructorReference(constructorReference.Offset, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.MethodReference: var methodReference = Target.AsOffsetTarget(); - encoder.MethodReference(methodReference.Offset, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.MethodReference(methodReference.Offset, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.Cast: var cast = Target.AsTypeArgumentTarget(); - encoder.Cast(cast.Offset, cast.TypeArgumentIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.Cast(cast.Offset, cast.TypeArgumentIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.ConstructorInvocationTypeArgument: var constructorInvocationTypeArgument = Target.AsTypeArgumentTarget(); - encoder.ConstructorInvocationTypeArgument(constructorInvocationTypeArgument.Offset, constructorInvocationTypeArgument.TypeArgumentIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.ConstructorInvocationTypeArgument(constructorInvocationTypeArgument.Offset, constructorInvocationTypeArgument.TypeArgumentIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.MethodInvocationTypeArgument: var methodInvocationTypeArgument = Target.AsTypeArgumentTarget(); - encoder.MethodInvocationTypeArgument(methodInvocationTypeArgument.Offset, methodInvocationTypeArgument.TypeArgumentIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.MethodInvocationTypeArgument(methodInvocationTypeArgument.Offset, methodInvocationTypeArgument.TypeArgumentIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.ConstructorReferenceTypeArgument: var constructorReferenceTypeArgument = Target.AsTypeArgumentTarget(); - encoder.ConstructorReferenceTypeArgument(constructorReferenceTypeArgument.Offset, constructorReferenceTypeArgument.TypeArgumentIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.ConstructorReferenceTypeArgument(constructorReferenceTypeArgument.Offset, constructorReferenceTypeArgument.TypeArgumentIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; case TypeAnnotationTargetType.MethodReferenceTypeArgument: var methodReferenceTypeArgument = Target.AsTypeArgumentTarget(); - encoder.ConstructorReferenceTypeArgument(methodReferenceTypeArgument.Offset, methodReferenceTypeArgument.TypeArgumentIndex, e => self.TargetPath.EncodeTo(map, ref e), map.Map(self.Type), e => self.Elements.EncodeTo(map, ref e)); + encoder.ConstructorReferenceTypeArgument(methodReferenceTypeArgument.Offset, methodReferenceTypeArgument.TypeArgumentIndex, e => self.TargetPath.CopyTo(map, ref e), map.Map(self.Type), e => self.Elements.CopyTo(map, ref e)); break; default: throw new ByteCodeException("Invalid type annotation target type."); diff --git a/src/IKVM.ByteCode/Decoding/TypeAnnotationTable.cs b/src/IKVM.ByteCode/Decoding/TypeAnnotationTable.cs index 237b1fb..c4f5c0e 100644 --- a/src/IKVM.ByteCode/Decoding/TypeAnnotationTable.cs +++ b/src/IKVM.ByteCode/Decoding/TypeAnnotationTable.cs @@ -151,11 +151,11 @@ readonly ref readonly TypeAnnotation GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref TypeAnnotationTableEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref TypeAnnotationTableEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/TypePath.cs b/src/IKVM.ByteCode/Decoding/TypePath.cs index 72006e6..af031e6 100644 --- a/src/IKVM.ByteCode/Decoding/TypePath.cs +++ b/src/IKVM.ByteCode/Decoding/TypePath.cs @@ -134,11 +134,11 @@ readonly ref readonly TypePathComponent GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref TypePathEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref TypePathEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } /// diff --git a/src/IKVM.ByteCode/Decoding/TypePathComponent.cs b/src/IKVM.ByteCode/Decoding/TypePathComponent.cs index bbf4429..ac42697 100644 --- a/src/IKVM.ByteCode/Decoding/TypePathComponent.cs +++ b/src/IKVM.ByteCode/Decoding/TypePathComponent.cs @@ -47,7 +47,7 @@ record = default; /// /// /// - public readonly void EncodeTo(TConstantMap map, ref TypePathEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref TypePathEncoder encoder) where TConstantMap : IConstantMap { WriteTo(ref encoder); diff --git a/src/IKVM.ByteCode/Decoding/VerificationTypeInfo.cs b/src/IKVM.ByteCode/Decoding/VerificationTypeInfo.cs index 99f464a..5600fa5 100644 --- a/src/IKVM.ByteCode/Decoding/VerificationTypeInfo.cs +++ b/src/IKVM.ByteCode/Decoding/VerificationTypeInfo.cs @@ -318,7 +318,7 @@ public readonly UninitializedVariableInfo AsUninitialized() /// /// /// - public readonly void EncodeTo(TConstantMap map, ref VerificationTypeInfoEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref VerificationTypeInfoEncoder encoder) where TConstantMap : IConstantMap { switch (Kind) diff --git a/src/IKVM.ByteCode/Decoding/VerificationTypeInfoTable.cs b/src/IKVM.ByteCode/Decoding/VerificationTypeInfoTable.cs index f72f870..10c0b26 100644 --- a/src/IKVM.ByteCode/Decoding/VerificationTypeInfoTable.cs +++ b/src/IKVM.ByteCode/Decoding/VerificationTypeInfoTable.cs @@ -103,11 +103,11 @@ readonly ref readonly VerificationTypeInfo GetItem(int index) /// /// /// - public readonly void EncodeTo(TConstantMap map, ref VerificationTypeInfoEncoder encoder) + public readonly void CopyTo(TConstantMap map, ref VerificationTypeInfoEncoder encoder) where TConstantMap : IConstantMap { foreach (var i in this) - i.EncodeTo(map, ref encoder); + i.CopyTo(map, ref encoder); } ///