Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Merge nmirror to master #1662

Merged
merged 7 commits into from
Aug 17, 2016
Merged

Merge nmirror to master #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
975afb1
A small preparatory change for TypeInfo restoration.
Aug 16, 2016
233f9da
Merge pull request #1660 from AtsushiKan/refprep
atsushikan Aug 16, 2016
e5cfdde
Update metadata reader to be more lazy
MichalStrehovsky Aug 16, 2016
6d5b72b
Merge pull request #1661 from dotnet-bot/from-tfs
jkotas Aug 16, 2016
fd1262c
Merge pull request #1663 from dotnet/master
jkotas Aug 17, 2016
3dfe928
Delete low value assert
jkotas Aug 17, 2016
9197ee6
Merge pull request #1664 from dotnet-bot/from-tfs
jkotas Aug 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 32 additions & 34 deletions src/Common/src/Internal/Metadata/NativeFormat/Generator/MdBinaryReaderGen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,42 +34,65 @@ public void EmitSource()

foreach (var primitiveType in SchemaDef.PrimitiveTypes)
{
EmitReadPrimitiveArray(primitiveType.Name);
EmitReadPrimitiveCollection(primitiveType.TypeName);
}

foreach (var enumType in SchemaDef.EnumTypes)
{
EmitReadEnum(enumType);
}

EmitReadArray($"Handle");
EmitReadCollection($"Handle");

foreach (var typeName in SchemaDef.HandleSchema)
{
EmitRead($"{typeName}Handle");
EmitReadArray($"{typeName}Handle");
}

foreach (var typeName in SchemaDef.TypeNamesWithCollectionTypes)
{
EmitReadCollection($"{typeName}Handle");
}

CloseScope("MdBinaryReader");
CloseScope("Internal.Metadata.NativeFormat");
}

private void EmitReadPrimitiveArray(string typeName)
private void EmitReadCollection(string typeName)
{
OpenScope($"public static uint Read(this NativeReader reader, uint offset, out {typeName}[] values)");
string collectionTypeName = $"{typeName}Collection";

OpenScope($"public static uint Read(this NativeReader reader, uint offset, out {collectionTypeName} values)");
WriteLine($"values = new {collectionTypeName}(reader, offset);");
WriteLine("uint count;");
WriteLine("offset = reader.DecodeUnsigned(offset, out count);");
WriteLine($"values = new {typeName}[count];");
WriteLine("for (uint i = 0; i < count; ++i)");
WriteLine("{");
WriteLine($" {typeName} tmp;");
WriteLine(" offset = reader.Read(offset, out tmp);");
WriteLine(" values[i] = tmp;");
WriteLine(" offset = reader.SkipInteger(offset);");
WriteLine("}");
WriteLine("return offset;");
CloseScope("Read");
}

private void EmitReadPrimitiveCollection(string typeName)
{
if (typeName == "String")
{
EmitReadCollection(typeName);
return;
}

string collectionTypeName = $"{typeName}Collection";

OpenScope($"public static unsafe uint Read(this NativeReader reader, uint offset, out {collectionTypeName} values)");
WriteLine($"values = new {collectionTypeName}(reader, offset);");
WriteLine("uint count;");
WriteLine("offset = reader.DecodeUnsigned(offset, out count);");
WriteLine($"offset = checked(offset + count * sizeof({typeName}));");
WriteLine("return offset;");
CloseScope("Read");
}

private void EmitReadEnum(EnumType enumType)
{
OpenScope($"public static uint Read(this NativeReader reader, uint offset, out {enumType.Name} value)");
Expand All @@ -90,29 +113,4 @@ private void EmitRead(string typeName)
WriteLine("return offset;");
CloseScope("Read");
}

private void EmitReadArray(string typeName)
{
OpenScope($"public static uint Read(this NativeReader reader, uint offset, out {typeName}[] values)");
WriteLine("uint count;");
WriteLine("offset = reader.DecodeUnsigned(offset, out count);");
WriteLine("#if !NETFX_45");
WriteLine("if (count == 0)");
WriteLine("{");
WriteLine($" values = Array.Empty<{typeName}>();");
WriteLine("}");
WriteLine("else");
WriteLine("#endif");
WriteLine("{");
WriteLine($" values = new {typeName}[count];");
WriteLine(" for (uint i = 0; i < count; ++i)");
WriteLine(" {");
WriteLine($" {typeName} tmp;");
WriteLine(" offset = reader.Read(offset, out tmp);");
WriteLine(" values[i] = tmp;");
WriteLine(" }");
WriteLine("}");
WriteLine("return offset;");
CloseScope("Read");
}
}
89 changes: 89 additions & 0 deletions src/Common/src/Internal/Metadata/NativeFormat/Generator/ReaderGen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public void EmitSource()
WriteLine("using System;");
WriteLine("using System.Reflection;");
WriteLine("using System.Collections.Generic;");
WriteLine("using Internal.NativeFormat;");
WriteLine();

OpenScope("namespace Internal.Metadata.NativeFormat");
Expand All @@ -35,8 +36,19 @@ public void EmitSource()
EmitRecord(record);
EmitHandle(record);
}

foreach (var typeName in SchemaDef.TypeNamesWithCollectionTypes)
{
EmitCollection(typeName + "HandleCollection", typeName + "Handle");
}

foreach (var primitiveType in SchemaDef.PrimitiveTypes)
{
EmitCollection(primitiveType.TypeName + "Collection", primitiveType.Name);
}

EmitOpaqueHandle();
EmitCollection("HandleCollection", "Handle");
EmitMetadataReader();

CloseScope("Internal.Metadata.NativeFormat");
Expand Down Expand Up @@ -160,6 +172,83 @@ private void EmitHandle(RecordDef record)
CloseScope(handleName);
}

private void EmitCollection(string collectionTypeName, string elementTypeName)
{
OpenScope($"public partial struct {collectionTypeName} : IReadOnlyCollection<{elementTypeName}>");

WriteLine("private NativeReader _reader;");
WriteLine("private uint _offset;");

OpenScope($"internal {collectionTypeName}(NativeReader reader, uint offset)");
WriteLine("_offset = offset;");
WriteLine("_reader = reader;");
CloseScope();

OpenScope("public int Count");
OpenScope("get");
WriteLine("uint count;");
WriteLine("_reader.DecodeUnsigned(_offset, out count);");
WriteLine("return (int)count;");
CloseScope();
CloseScope("Count");

OpenScope($"public Enumerator GetEnumerator()");
WriteLine($"return new Enumerator(_reader, _offset);");
CloseScope("GetEnumerator");

OpenScope($"IEnumerator<{elementTypeName}> IEnumerable<{elementTypeName}>.GetEnumerator()");
WriteLine($"return new Enumerator(_reader, _offset);");
CloseScope("GetEnumerator");

OpenScope($"System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()");
WriteLine("return new Enumerator(_reader, _offset);");
CloseScope("GetEnumerator");

OpenScope($"public struct Enumerator : IEnumerator<{elementTypeName}>");

WriteLine("private NativeReader _reader;");
WriteLine("private uint _offset;");
WriteLine("private uint _remaining;");
WriteLine($"private {elementTypeName} _current;");

OpenScope($"internal Enumerator(NativeReader reader, uint offset)");
WriteLine("_reader = reader;");
WriteLine("_offset = reader.DecodeUnsigned(offset, out _remaining);");
WriteLine($"_current = default({elementTypeName});");
CloseScope();

OpenScope($"public {elementTypeName} Current");
OpenScope("get");
WriteLine("return _current;");
CloseScope();
CloseScope("Current");

OpenScope("object System.Collections.IEnumerator.Current");
OpenScope("get");
WriteLine("return _current;");
CloseScope();
CloseScope("Current");

OpenScope("public bool MoveNext()");
WriteLine("if (_remaining == 0)");
WriteLine(" return false;");
WriteLine("_remaining--;");
WriteLine("_offset = _reader.Read(_offset, out _current);");
WriteLine("return true;");
CloseScope("MoveNext");

OpenScope("void System.Collections.IEnumerator.Reset()");
WriteLine("throw new NotSupportedException();");
CloseScope("Reset");

OpenScope("public void Dispose()");
CloseScope("Dispose");

CloseScope("Enumerator");

CloseScope(collectionTypeName);
}

private void EmitOpaqueHandle()
{
OpenScope("public partial struct Handle");
Expand Down
26 changes: 20 additions & 6 deletions src/Common/src/Internal/Metadata/NativeFormat/Generator/SchemaDef.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,11 @@ public string GetMemberType(MemberTypeKind kind = MemberTypeKind.Accessor)
{
if ((Flags & (MemberDefFlags.List | MemberDefFlags.Map)) != 0)
return $"List<{typeName}>";
else
return $"{typeName}[]";
}

return (kind != MemberTypeKind.Accessor) ? $"{typeName}[]" : $"IEnumerable<{typeName}>";
return $"{typeName}Collection";
}
return typeName;
}
Expand Down Expand Up @@ -319,7 +321,7 @@ from primitiveType in PrimitiveTypes select
new RecordDef(
name: "Constant" + primitiveType.TypeName + "Array",
members: new MemberDef[] {
new MemberDef(name: "Value", flags: MemberDefFlags.Array, typeName: primitiveType.Name)
new MemberDef(name: "Value", flags: MemberDefFlags.Array, typeName: primitiveType.TypeName)
}
)
)
Expand Down Expand Up @@ -455,7 +457,7 @@ from primitiveType in PrimitiveTypes select
new MemberDef("MinorVersion", "ushort", MemberDefFlags.Compare),
new MemberDef("BuildNumber", "ushort", MemberDefFlags.Compare),
new MemberDef("RevisionNumber", "ushort", MemberDefFlags.Compare),
new MemberDef("PublicKey", "byte", MemberDefFlags.Array | MemberDefFlags.Compare),
new MemberDef("PublicKey", "Byte", MemberDefFlags.Array | MemberDefFlags.Compare),
new MemberDef("Culture", "ConstantStringValue", MemberDefFlags.RecordRef | MemberDefFlags.Child | MemberDefFlags.Compare),
new MemberDef("RootNamespaceDefinition", "NamespaceDefinition", MemberDefFlags.RecordRef | MemberDefFlags.Child),
new MemberDef("CustomAttributes", "CustomAttribute", MemberDefFlags.List | MemberDefFlags.RecordRef | MemberDefFlags.Child),
Expand All @@ -470,7 +472,7 @@ from primitiveType in PrimitiveTypes select
new MemberDef("MinorVersion", "ushort"),
new MemberDef("BuildNumber", "ushort"),
new MemberDef("RevisionNumber", "ushort"),
new MemberDef("PublicKeyOrToken", "byte", MemberDefFlags.Array),
new MemberDef("PublicKeyOrToken", "Byte", MemberDefFlags.Array),
new MemberDef("Culture", "ConstantStringValue", MemberDefFlags.RecordRef | MemberDefFlags.Child),
new MemberDef("CustomAttributes", "CustomAttribute", MemberDefFlags.List | MemberDefFlags.RecordRef | MemberDefFlags.Child),
}
Expand Down Expand Up @@ -653,8 +655,8 @@ from primitiveType in PrimitiveTypes select
members: new MemberDef[] {
new MemberDef("ElementType", TypeDefOrRefOrSpec, MemberDefFlags.RecordRef),
new MemberDef("Rank", "int"),
new MemberDef("Sizes", "int", MemberDefFlags.Array),
new MemberDef("LowerBounds", "int", MemberDefFlags.Array),
new MemberDef("Sizes", "Int32", MemberDefFlags.Array),
new MemberDef("LowerBounds", "Int32", MemberDefFlags.Array),
}
),
new RecordDef(
Expand Down Expand Up @@ -732,4 +734,16 @@ from primitiveType in PrimitiveTypes select
// Contains a list of records with corresponding Handle types (currently all of them).
/// </summary>
public readonly static string[] HandleSchema = (from record in RecordSchema select record.Name).ToArray();

public readonly static string[] TypeNamesWithCollectionTypes =
RecordSchema.SelectMany(r =>
from member in r.Members
let memberTypeName = member.TypeName as string
where memberTypeName != null &&
((member.Flags & MemberDefFlags.Array) != 0 ||
(member.Flags & MemberDefFlags.List) != 0 ||
(member.Flags & MemberDefFlags.Map) != 0) &&
!PrimitiveTypes.Any(pt => pt.TypeName == memberTypeName)
select memberTypeName
).Concat(new[] { "ScopeDefinition" }).Distinct().ToArray();
}
Loading