ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Plural name to singular in convenience overloads

Browse source
This commit is contained in:
Stefanos A. 2013-11-10 10:16:47 +01:00
parent 11c1071625
commit 6098fa05ce
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Source/Bind/FuncProcessor.cs
View file

@ -46,7 +46,7 @@ namespace Bind
static readonly Regex Endings = static readonly Regex Endings =
new Regex(@"((((d|f|fi)|(L?(u?i?64)?u?[isb]))_?(64)?v?)|v)", RegexOptions.Compiled | RegexOptions.RightToLeft); new Regex(@"((((d|f|fi)|(L?(u?i?64)?u?[isb]))_?(64)?v?)|v)", RegexOptions.Compiled | RegexOptions.RightToLeft);
static readonly Regex EndingsNotToTrim = static readonly Regex EndingsNotToTrim =
new Regex("(ib|[tdrey]s|[eE]n[vd]|bled|Attrib|Access|Coord|Flag|Tess|Status|Pixels|Instanced|Indexed|Varyings|Boolean|IDs|Uniforms)", RegexOptions.Compiled | RegexOptions.RightToLeft); new Regex("(ib|[tdrey]s|[eE]n[vd]|bled|Attrib|Access|Coord|Feedbacks|Flag|Queries|Tess|Status|Pixels|Instanced|Indexed|Varyings|Boolean|IDs|Uniforms)", RegexOptions.Compiled | RegexOptions.RightToLeft);
static readonly Regex EndingsAddV = new Regex("^0", RegexOptions.Compiled); static readonly Regex EndingsAddV = new Regex("^0", RegexOptions.Compiled);
string Overrides { get; set; } string Overrides { get; set; }
@ -358,6 +358,15 @@ namespace Bind
} }
} }
// If we have a convenience overload, we should turn the name from
// plural into singular
if (d.ReturnType.WrapperType == WrapperTypes.ConvenienceReturnType ||
d.ReturnType.WrapperType == WrapperTypes.ConvenienceArrayReturnType)
{
trimmed_name = trimmed_name.Replace("Queries", "Query");
trimmed_name = trimmed_name.TrimEnd('s');
}
return trimmed_name; return trimmed_name;
} }
@ -748,7 +757,7 @@ namespace Bind
foreach (var list in delegates.Values) foreach (var list in delegates.Values)
{ {
var d = list.First(); var d = list.First();
if (d.Parameters.Count > 0) if (d.Parameters.Count > 0 && d.Parameters.Count <= 2)
{ {
var p = d.Parameters.Last(); var p = d.Parameters.Last();
var r = d.ReturnType; var r = d.ReturnType;