Skip to content

Commit 9b6a8b4

Browse files
josesimoesjosesimoes
authored
Rename TryGetFieldReferenceId to Definition (#209)
***NO_CI***
1 parent 5b78994 commit 9b6a8b4

File tree

8 files changed

+23
-21
lines changed

8 files changed

+23
-21
lines changed

‎MetadataProcessor.Shared/Pdbx/PdbxFileHelpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public partial class Field
148148
{
149149
public Field(nanoTablesContext context, FieldDefinition field)
150150
{
151-
context.FieldsTable.TryGetFieldReferenceId(field, false, out ushort fieldToken);
151+
context.FieldsTable.TryGetFieldDefinitionId(field, false, out ushort fieldToken);
152152

153153
Token = new Token(field.MetadataToken, NanoClrTable.TBL_FieldDef.ToNanoTokenType() | fieldToken);
154154

‎MetadataProcessor.Shared/Tables/nanoFieldDefinitionTable.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,24 @@ protected override void WriteSingleItem(
9494
}
9595

9696
/// <summary>
97-
/// Gets field reference identifier (if field is defined inside target assembly).
97+
/// Gets field definition identifier (if field is defined inside target assembly).
9898
/// </summary>
9999
/// <param name="field">Field definition in Mono.Cecil format.</param>
100-
/// <param name="trackMaxReferenceId">If set to <c>true</c> we should track max ID value.</param>
101-
/// <param name="referenceId">Field reference identifier for filling.</param>
100+
/// <param name="trackMaxDefinitionId">If set to <c>true</c> we should track max ID value.</param>
101+
/// <param name="definitionId">Field definition identifier for filling.</param>
102102
/// <returns>Returns <c>true</c> if item found, otherwise returns <c>false</c>.</returns>
103-
public bool TryGetFieldReferenceId(
103+
public bool TryGetFieldDefinitionId(
104104
FieldDefinition field,
105-
bool trackMaxReferenceId,
106-
out ushort referenceId)
105+
bool trackMaxDefinitionId,
106+
out ushort definitionId)
107107
{
108-
var found = TryGetIdByValue(field, out referenceId);
109-
if (trackMaxReferenceId && found)
108+
bool found = TryGetIdByValue(field, out definitionId);
109+
110+
if (trackMaxDefinitionId && found)
110111
{
111-
_maxReferenceId = Math.Max(_maxReferenceId, referenceId + 1);
112+
_maxReferenceId = Math.Max(_maxReferenceId, definitionId + 1);
112113
}
114+
113115
return found;
114116
}
115117

‎MetadataProcessor.Shared/Tables/nanoTablesContext.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public ushort GetFieldReferenceId(
324324
if (fieldReference is FieldDefinition)
325325
{
326326
// field definition is internal
327-
if (FieldsTable.TryGetFieldReferenceId(fieldReference as FieldDefinition, false, out referenceId))
327+
if (FieldsTable.TryGetFieldDefinitionId(fieldReference as FieldDefinition, false, out referenceId))
328328
{
329329
// field reference is internal => field definition
330330
ownerTable = NanoClrTable.TBL_FieldDef;
@@ -381,7 +381,7 @@ public uint GetMetadataToken(
381381
TypeSpecificationsTable.TryGetTypeReferenceId((TypeReference)token, out referenceId);
382382
return (uint)0x09000000 | referenceId;
383383
case TokenType.Field:
384-
FieldsTable.TryGetFieldReferenceId((FieldDefinition)token, false, out referenceId);
384+
FieldsTable.TryGetFieldDefinitionId((FieldDefinition)token, false, out referenceId);
385385
return (uint)0x05000000 | referenceId;
386386
case TokenType.GenericParam:
387387
GenericParamsTable.TryGetParameterId((GenericParameter)token, out referenceId);

‎MetadataProcessor.Shared/Tables/nanoTypeDefinitionTable.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ private void WriteClassFields(
229229
foreach (var field in fieldsList.Where(item => item.IsStatic))
230230
{
231231
ushort fieldReferenceId;
232-
if (_context.FieldsTable.TryGetFieldReferenceId(field, false, out fieldReferenceId))
232+
if (_context.FieldsTable.TryGetFieldDefinitionId(field, false, out fieldReferenceId))
233233
{
234234
if (staticFieldsCount == 0)
235235
{
@@ -254,7 +254,7 @@ private void WriteClassFields(
254254
foreach (var field in fieldsList.Where(item => !item.IsStatic))
255255
{
256256
ushort fieldReferenceId;
257-
if (_context.FieldsTable.TryGetFieldReferenceId(field, false, out fieldReferenceId))
257+
if (_context.FieldsTable.TryGetFieldDefinitionId(field, false, out fieldReferenceId))
258258
{
259259
if (instanceFieldsCount == 0)
260260
{

‎MetadataProcessor.Shared/Utility/nanoDependencyGeneratorWriter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ private IEnumerable<Tuple<uint, uint>> GetFieldsTokens(
194194
foreach (var field in fields.Where(item => !item.HasConstant))
195195
{
196196
ushort fieldToken;
197-
_context.FieldsTable.TryGetFieldReferenceId(field, false, out fieldToken);
197+
_context.FieldsTable.TryGetFieldDefinitionId(field, false, out fieldToken);
198198
yield return new Tuple<uint, uint>(
199199
field.MetadataToken.ToUInt32(), 0x05000000 | (uint)fieldToken);
200200
}

‎MetadataProcessor.Shared/nanoDumperGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ private void DumpTypeDefinitions(DumpAllTable dumpTable)
328328
uint att = (uint)f.Attributes;
329329

330330
string realToken = f.MetadataToken.ToInt32().ToString("X8");
331-
_tablesContext.FieldsTable.TryGetFieldReferenceId(f, false, out referenceId);
331+
_tablesContext.FieldsTable.TryGetFieldDefinitionId(f, false, out referenceId);
332332

333333
var fieldDef = new FieldDef()
334334
{
@@ -784,7 +784,7 @@ private void DumpTypeSpecifications(
784784
Signature = fd.FieldType.TypeSignatureAsString()
785785
};
786786

787-
if (_tablesContext.FieldsTable.TryGetFieldReferenceId(fd, false, out ushort fieldId))
787+
if (_tablesContext.FieldsTable.TryGetFieldDefinitionId(fd, false, out ushort fieldId))
788788
{
789789
realToken = fd.MetadataToken.ToInt32().ToString("X8");
790790
memberRef.ReferenceId = $"[{new nanoMetadataToken(NanoClrTable.TBL_FieldDef, fieldId)}] /*{realToken}*/";

‎MetadataProcessor.Shared/nanoSkeletonGenerator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ private void GenerateAssemblyHeader()
498498
{
499499
FixFieldName(f, out string fixedFieldName, out string fieldWarning);
500500

501-
if (_tablesContext.FieldsTable.TryGetFieldReferenceId(f, false, out ushort fieldRefId))
501+
if (_tablesContext.FieldsTable.TryGetFieldDefinitionId(f, false, out ushort fieldRefId))
502502
{
503503
classData.InstanceFields.Add(new InstanceField()
504504
{

‎MetadataProcessor.Tests/Core/Utility/DumperTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ public void DumpAssemblyTest()
9292

9393
FieldDefinition maxField = nanoTablesContext.FieldsTable.Items.FirstOrDefault(f => f.Name == "_max");
9494
string maxFieldRealToken = maxField.MetadataToken.ToInt32().ToString("X8");
95-
nanoTablesContext.FieldsTable.TryGetFieldReferenceId(maxField, false, out ushort maxFieldReferenceId);
95+
nanoTablesContext.FieldsTable.TryGetFieldDefinitionId(maxField, false, out ushort maxFieldReferenceId);
9696

9797
FieldDefinition sField = nanoTablesContext.FieldsTable.Items.FirstOrDefault(f => f.Name == "_s");
9898
string sFieldRealToken = sField.MetadataToken.ToInt32().ToString("X8");
99-
nanoTablesContext.FieldsTable.TryGetFieldReferenceId(sField, false, out ushort sFieldReferenceId);
99+
nanoTablesContext.FieldsTable.TryGetFieldDefinitionId(sField, false, out ushort sFieldReferenceId);
100100

101101
FieldDefinition bField = nanoTablesContext.FieldsTable.Items.FirstOrDefault(f => f.Name == "_b");
102102
string bFieldRealToken = bField.MetadataToken.ToInt32().ToString("X8");
103-
nanoTablesContext.FieldsTable.TryGetFieldReferenceId(bField, false, out ushort bFieldReferenceId);
103+
nanoTablesContext.FieldsTable.TryGetFieldDefinitionId(bField, false, out ushort bFieldReferenceId);
104104

105105

106106
typeFlags = (uint)nanoTypeDefinitionTable.GetFlags(type1, nanoTablesContext.MethodDefinitionTable);

0 commit comments

Comments
 (0)