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

Fixed parsing of function pointer parameters that do not specify a parameter name or do not contain "pfn" in their type.

Browse source
This commit is contained in:
the_fiddler 2009-08-11 19:18:12 +00:00
parent 3897c7c990
commit 6fe9641033
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Source/Converter/CHeaderToXML/ESCLParser.cs
View file

@ -199,10 +199,10 @@ namespace CHeaderToXML
// The second part (before the '|') matches parameters of the following formats: // The second part (before the '|') matches parameters of the following formats:
// '[return type] [parameter name]', '[return type] * [parameter name]', 'const [return type]* [parameter name]' // '[return type] [parameter name]', '[return type] * [parameter name]', 'const [return type]* [parameter name]'
// where [parameter name] can either be inside comments (/* ... */) or not. // where [parameter name] can either be inside comments (/* ... */) or not.
var get_param = new Regex(@"(\w+\s\(\*\w+\)\s*\(.*\)\s*(/\*.*?\*/|\w+) | (const\s)?\w+\s*\**\s*(/\*.*?\*/|\w+(\[.*?\])?)),?", RegexOptions.IgnorePatternWhitespace); var get_param = new Regex(@"(\w+\s\(\*\w+\)\s*\(.*\)\s*(/\*.*?\*/|\w+)? | (const\s)?\w+\s*\**\s*(/\*.*?\*/|\w+(\[.*?\])?)),?", RegexOptions.IgnorePatternWhitespace);
#if false #if true
if (funcname == "CreateContextFromType") if (funcname == "EnqueueNativeKernel")
Debugger.Break(); Debugger.Break();
var ars = get_param.Matches(paramaters_string).OfType<Match>().Select(m => m.Captures[0].Value.TrimEnd(',')); var ars = get_param.Matches(paramaters_string).OfType<Match>().Select(m => m.Captures[0].Value.TrimEnd(','));
#endif #endif
@ -219,8 +219,10 @@ namespace CHeaderToXML
from item in get_param.Matches(paramaters_string).OfType<Match>().Select(m => m.Captures[0].Value.TrimEnd(',')) from item in get_param.Matches(paramaters_string).OfType<Match>().Select(m => m.Captures[0].Value.TrimEnd(','))
//paramaters_string.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries) //paramaters_string.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
let tokens = item.Trim().Split(' ') let tokens = item.Trim().Split(' ')
let param_name = (tokens.Last().Trim() != "*/" ? tokens.Last() : tokens[tokens.Length - 2]).Trim() let is_function_pointer = item.Contains("(*") // This only occurs in function pointers, e.g. void (*pfn_notify)() or void (*user_func)()
let is_function_pointer = param_name.StartsWith("pfn") let param_name =
is_function_pointer ? tokens[1].TrimStart('(', '*').Split(')')[0] :
(tokens.Last().Trim() != "*/" ? tokens.Last() : tokens[tokens.Length - 2]).Trim()
let param_type = let param_type =
is_function_pointer ? "IntPtr" : is_function_pointer ? "IntPtr" :
(from t in tokens where t.Trim() != "const" && t.Trim() != "unsigned" select t).First().Trim() (from t in tokens where t.Trim() != "const" && t.Trim() != "unsigned" select t).First().Trim()