ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-07 19:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved token conflicts in favor of tokens without reference.

Browse source
This commit is contained in:
the_fiddler 2010-11-19 11:29:02 +00:00
parent 93e224ff83
commit c57853abb6
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Bind/ES/ESGenerator.cs
View file

@ -175,11 +175,21 @@ namespace Bind.ES
e.ConstantCollection.Add(c.Name, c); e.ConstantCollection.Add(c.Name, c);
} }
else if (e.ConstantCollection[c.Name].Value != c.Value) else if (e.ConstantCollection[c.Name].Value != c.Value)
{
var existing = e.ConstantCollection[c.Name];
if (existing.Reference != null && c.Reference == null)
{
e.ConstantCollection[c.Name] = c;
}
else if (existing.Reference == null && c.Reference != null)
{ } // Keep existing
else
{ {
Console.WriteLine("[Warning] Conflicting token {0}.{1} with value {2} != {3}", Console.WriteLine("[Warning] Conflicting token {0}.{1} with value {2} != {3}",
e.Name, c.Name, e.ConstantCollection[c.Name].Value, c.Value); e.Name, c.Name, e.ConstantCollection[c.Name].Value, c.Value);
} }
} }
}
catch (ArgumentException ex) catch (ArgumentException ex)
{ {
Console.WriteLine("[Warning] Failed to add constant {0} to enum {1}: {2}", c.Name, e.Name, ex.Message); Console.WriteLine("[Warning] Failed to add constant {0} to enum {1}: {2}", c.Name, e.Name, ex.Message);

3
Source/Bind/EnumProcessor.cs
View file

@ -302,8 +302,11 @@ namespace Bind
.Where(c => !Constant.TranslateConstantWithReference(c, enums, null)) .Where(c => !Constant.TranslateConstantWithReference(c, enums, null))
.Select(c => c).ToList(); .Select(c => c).ToList();
foreach (var c in broken_references) foreach (var c in broken_references)
{
Console.WriteLine("[Warning] Reference {0} not found for token {1}.", c.Reference, c);
e.ConstantCollection.Remove(c.Name); e.ConstantCollection.Remove(c.Name);
} }
}
static bool IsValue(string test) static bool IsValue(string test)
{ {