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

[Bind] Do not re-translate translated enum names

Browse source
This commit is contained in:
thefiddler 2014-08-14 10:30:14 +02:00
parent d50bef3ba6
commit 5ec28b65be
3 changed files with 112 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
Source/Bind/EnumProcessor.cs
View file

@ -139,6 +139,17 @@ namespace Bind
return name; return name;
} }
static bool IsAlreadyProcessed(string name)
{
string extension = Utilities.GetExtension(name, true);
bool unprocessed = false;
unprocessed |= name.Contains("_") || name.Contains("-");
unprocessed |= Char.IsDigit(name[0]);
unprocessed |= name.All(c => Char.IsUpper(c));
unprocessed |= !String.IsNullOrEmpty(extension) && extension.All(c => Char.IsUpper(c));
return !unprocessed;
}
public string TranslateEnumName(string name) public string TranslateEnumName(string name)
{ {
if (String.IsNullOrEmpty(name)) if (String.IsNullOrEmpty(name))
@ -147,71 +158,74 @@ namespace Bind
if (Utilities.Keywords(Settings.Language).Contains(name)) if (Utilities.Keywords(Settings.Language).Contains(name))
return name; return name;
if (Char.IsDigit(name[0])) if (!IsAlreadyProcessed(name))
name = Settings.ConstantPrefix + name;
StringBuilder translator = new StringBuilder(name);
// Split on IHV names and acronyms, to ensure that characters appearing after these name are uppercase.
var match = Utilities.Acronyms.Match(name);
int offset = 0; // Everytime we insert a match, we must increase offset to compensate.
while (match.Success)
{ {
int insert_pos = match.Index + match.Length + offset++; if (Char.IsDigit(name[0]))
translator.Insert(insert_pos, "_"); name = Settings.ConstantPrefix + name;
match = match.NextMatch();
}
name = translator.ToString();
translator.Remove(0, translator.Length);
// Process according to these rules: StringBuilder translator = new StringBuilder(name);
// 1. if current char is '_', '-' remove it and make next char uppercase
// 2. if current char is or '0-9' keep it and make next char uppercase. // Split on IHV names and acronyms, to ensure that characters appearing after these name are uppercase.
// 3. if current char is uppercase make next char lowercase. var match = Utilities.Acronyms.Match(name);
// 4. if current char is lowercase, respect next char case. int offset = 0; // Everytime we insert a match, we must increase offset to compensate.
bool is_after_underscore_or_number = true; while (match.Success)
bool is_previous_uppercase = false;
foreach (char c in name)
{
char char_to_add;
if (c == '_' || c == '-')
{ {
is_after_underscore_or_number = true; int insert_pos = match.Index + match.Length + offset++;
continue; // skip this character translator.Insert(insert_pos, "_");
match = match.NextMatch();
} }
else if (Char.IsDigit(c)) name = translator.ToString();
translator.Remove(0, translator.Length);
// Process according to these rules:
// 1. if current char is '_', '-' remove it and make next char uppercase
// 2. if current char is or '0-9' keep it and make next char uppercase.
// 3. if current char is uppercase make next char lowercase.
// 4. if current char is lowercase, respect next char case.
bool is_after_underscore_or_number = true;
bool is_previous_uppercase = false;
foreach (char c in name)
{ {
is_after_underscore_or_number = true; char char_to_add;
if (c == '_' || c == '-')
{
is_after_underscore_or_number = true;
continue; // skip this character
}
else if (Char.IsDigit(c))
{
is_after_underscore_or_number = true;
}
if (is_after_underscore_or_number)
char_to_add = Char.ToUpper(c);
else if (is_previous_uppercase)
char_to_add = Char.ToLower(c);
else
char_to_add = c;
translator.Append(char_to_add);
is_previous_uppercase = Char.IsUpper(c);
is_after_underscore_or_number = false;
} }
if (is_after_underscore_or_number) // First letter should always be uppercase in order
char_to_add = Char.ToUpper(c); // to conform to .Net style guidelines.
else if (is_previous_uppercase) translator[0] = Char.ToUpper(translator[0]);
char_to_add = Char.ToLower(c);
else
char_to_add = c;
translator.Append(char_to_add); // Replace a number of words that do not play well
// with the previous process (i.e. they have two
// consecutive uppercase letters).
translator.Replace("Pname", "PName");
translator.Replace("AttribIp", "AttribIP");
translator.Replace("SRgb", "Srgb");
is_previous_uppercase = Char.IsUpper(c); name = translator.ToString();
is_after_underscore_or_number = false; if (name.StartsWith(Settings.EnumPrefix))
name = name.Substring(Settings.EnumPrefix.Length);
} }
// First letter should always be uppercase in order
// to conform to .Net style guidelines.
translator[0] = Char.ToUpper(translator[0]);
// Replace a number of words that do not play well
// with the previous process (i.e. they have two
// consecutive uppercase letters).
translator.Replace("Pname", "PName");
translator.Replace("AttribIp", "AttribIP");
translator.Replace("SRgb", "Srgb");
name = translator.ToString();
if (name.StartsWith(Settings.EnumPrefix))
name = name.Substring(Settings.EnumPrefix.Length);
return name; return name;
} }

63
Source/Bind/Utilities.cs
View file

@ -103,31 +103,42 @@ namespace Bind
public static readonly char[] Separators = { ' ', '\n', ',', '(', ')', ';', '#' }; public static readonly char[] Separators = { ' ', '\n', ',', '(', ')', ';', '#' };
public static Regex Extensions { get; private set; } public static Regex Extensions { get; private set; }
public static Regex Acronyms { get; private set; } public static Regex Acronyms { get; private set; }
//public static readonly Regex Extensions = new Regex(
// "ARB|EXT|ATIX|ATI|AMDX|AMD|NV|NVX|SUNX|SUN|SGIS|SGIX|SGI|MESAX|MESA|3DFX|IBM|GREMEDY|HP|INTEL|PGI|INGR|APPLE|OML|I3D|ARM|ANGLE|OES|QCOM|VIV|IMG",
// RegexOptions.Compiled);
//public static readonly Regex Acronyms = new Regex(Extensions.ToString() + "|EGL|3TC|DXT|ES|GL|CL|RGBA|BGRA|RGB|BGR|ETC",
// RegexOptions.Compiled);
public static void InitExtensions(IEnumerable<string> extensions) static List<string> extension_names = new List<string>();
public static void AddExtensions(IEnumerable<string> extensions)
{ {
var acronyms = new string[] // Merge the new extensions with the current list of extensions
int extension_count = extension_names.Count;
extension_names.AddRange(
extensions.Where(n => !extension_names.Contains(n)));
// If any new extensions have been added,
// recreate the Extensions regex.
if (extension_names.Count != extension_count)
{ {
"EGL", "ES", "GL", "CL", // Sort longest extensions first, otherwise SGIS may be
"RGBA", "BGRA", "RGB", "BGR", // incorrectly matched as SGI.
"SRGB", "YCBCR", extension_names.Sort((a, b) => b.Length.CompareTo(a.Length));
"3TC", "DXT", "BPTC", "RGTC",
"3DC", "ATC", "ETC",
"ANGLE", "MESAX", "MESA",
};
Extensions = new Regex( Extensions = new Regex(
String.Join("|", extensions.ToArray()), String.Join("|", extension_names.ToArray()),
RegexOptions.Compiled); RegexOptions.Compiled);
Acronyms = new Regex( var acronyms = new string[]
String.Join("|", extensions.Concat(acronyms).ToArray()), {
RegexOptions.Compiled); "EGL", "ES", "GL", "CL",
"RGBA", "BGRA", "RGB", "BGR",
"SRGB", "YCBCR",
"3TC", "DXT", "BPTC", "RGTC",
"3DC", "ATC", "ETC",
"ANGLE", "MESAX", "MESA",
};
var acronym_names = extensions.Concat(acronyms).ToList();
acronym_names.Sort((a, b) => b.Length.CompareTo(a.Length));
Acronyms = new Regex(String.Join("|", acronym_names.ToArray()), RegexOptions.Compiled);
}
} }
#region internal StreamReader OpenSpecFile(string file) #region internal StreamReader OpenSpecFile(string file)
@ -271,14 +282,22 @@ namespace Bind
#region internal static string GetGL2Extension(string name) #region internal static string GetGL2Extension(string name)
internal static string GetGL2Extension(string name) internal static string GetGL2Extension(string name)
{
return GetExtension(name, false);
}
internal static string GetExtension(string name, bool return_unmodified)
{ {
var match = Extensions.Match(name); var match = Extensions.Match(name);
if (match.Success) if (match.Success)
{ {
string ext = match.Value; string ext = match.Value;
if (ext.Length > 2) if (!return_unmodified)
{ {
ext = ext[0] + ext.Substring(1).ToLower(); if (ext.Length > 2)
{
ext = ext[0] + ext.Substring(1).ToLower();
}
} }
return ext; return ext;
} }

2
Source/Bind/XmlSpecReader.cs
View file

@ -331,7 +331,7 @@ namespace Bind
delegates.Add(d); delegates.Add(d);
} }
Utilities.InitExtensions(extensions); Utilities.AddExtensions(extensions);
return delegates; return delegates;
} }