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

Fixed generic type parameters (for real this time!), suppressed pointer parameters and shuffled code for improved readability.

Browse source
This commit is contained in:
the_fiddler 2011-12-05 13:03:48 +00:00
parent 14c56427ed
commit 6bd6877a97
1 changed files with 86 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

158
Source/Bind/JavaSpecWriter.cs
View file

@ -161,12 +161,15 @@ namespace Bind
static void WriteWrapper(Function f, BindStreamWriter sw) static void WriteWrapper(Function f, BindStreamWriter sw)
{ {
var parameters = GenerateParameterString(f); var valid = true;
var generic_parameters = GenerateGenericParameterString(f); var generic_parameters = GenerateGenericParameterString(f);
var parameters = GenerateParameterString(f, out valid);
if (!valid)
return;
if (!String.IsNullOrEmpty(generic_parameters)) if (!String.IsNullOrEmpty(generic_parameters))
sw.WriteLine("public static {0} <1> {2}({3})", f.ReturnType, generic_parameters, sw.WriteLine("public static <{0}> {1} {2}({3})", generic_parameters,
f.TrimmedName, parameters); f.ReturnType, f.TrimmedName, parameters);
else else
sw.WriteLine("public static {0} {1}({2})", f.ReturnType, f.TrimmedName, sw.WriteLine("public static {0} {1}({2})", f.ReturnType, f.TrimmedName,
parameters); parameters);
@ -187,6 +190,86 @@ namespace Bind
// sw.WriteLine("GLES20.{0}{1};", f.WrappedDelegate.Name, callstring); // sw.WriteLine("GLES20.{0}{1};", f.WrappedDelegate.Name, callstring);
} }
#region GenerateParameterString
static string GenerateParameterString(Function f, out bool valid)
{
if (f == null)
throw new ArgumentNullException("f");
valid = true;
var sb = new StringBuilder();
if (f.Parameters.Count > 0)
{
foreach (var p in f.Parameters)
{
if (p.Reference)
{
if (p.Flow == FlowDirection.Out)
sb.Append("Out<");
else
sb.Append("Ref<");
sb.Append(p.CurrentType);
sb.Append(">");
}
else if (p.Pointer > 0 && p.Array > 0)
{
sb.Append(p.CurrentType);
if (p.Array > 0)
sb.Append("[]");
}
else if (p.Pointer > 0)
{
// Java does not support pointers
// Todo: maybe use one of the java.nio.* pointer classes?
valid = false;
return String.Empty;
}
else
{
sb.Append(p.CurrentType);
}
sb.Append(" ");
sb.Append(p.Name);
sb.Append(", ");
}
if (f.Parameters.Count > 0)
sb.Remove(sb.Length - 2, 2);
}
return sb.ToString();
}
#endregion
#region GenerateGenericParameterString
static string GenerateGenericParameterString(Function f)
{
var parameters = f.Parameters.Where(p => p.Generic);
if (parameters.Count() > 0)
{
var sb = new StringBuilder();
foreach (var p in f.Parameters.Where(p => p.Generic))
{
sb.Append(p.CurrentType);
sb.Append(", ");
}
if (parameters.Count() > 0)
sb.Remove(sb.Length - 2, 2);
return sb.ToString();
}
return String.Empty;
}
#endregion
static DocProcessor processor = new DocProcessor(Path.Combine(Settings.DocPath, Settings.DocFile)); static DocProcessor processor = new DocProcessor(Path.Combine(Settings.DocPath, Settings.DocFile));
static Dictionary<string, string> docfiles; static Dictionary<string, string> docfiles;
void WriteDocumentation(BindStreamWriter sw, Function f) void WriteDocumentation(BindStreamWriter sw, Function f)
@ -261,74 +344,5 @@ namespace Bind
} }
#endregion #endregion
#region GenerateParameterString
static string GenerateParameterString(Function f)
{
if (f == null)
throw new ArgumentNullException("f");
var sb = new StringBuilder();
if (f.Parameters.Count > 0)
{
foreach (var p in f.Parameters)
{
if (p.Array == 0 || (p.Array > 0 && p.ElementCount != 1))
{
sb.Append(p.CurrentType);
if (p.Array > 0)
sb.Append("[]");
}
else if (p.Array > 0 && p.ElementCount == 1)
{
if (p.Flow == FlowDirection.Out)
sb.Append("Out<");
else
sb.Append("Ref<");
sb.Append(p.CurrentType);
sb.Append(">");
}
else
{
throw new Exception();
}
sb.Append(" ");
sb.Append(p.Name);
sb.Append(", ");
}
sb.Remove(sb.Length - 2, 2);
}
return sb.ToString();
}
#endregion
#region GenerateGenericParameterString
static string GenerateGenericParameterString(Function f)
{
var parameters = f.Parameters.Where(p => p.Generic);
if (parameters.Count() > 0)
{
var sb = new StringBuilder();
foreach (var p in f.Parameters.Where(p => p.Generic))
{
sb.Append(p.CurrentType);
}
if (parameters.Count() > 1)
sb.Remove(sb.Length - 2, 2);
return sb.ToString();
}
return String.Empty;
}
#endregion
} }
} }