[vala/switch-to-gir: 10/34] girparser: Generate default parameter names for callbacks
- From: Luca Bruno <lucabru src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/switch-to-gir: 10/34] girparser: Generate default parameter names for callbacks
- Date: Sun, 29 Aug 2010 16:20:33 +0000 (UTC)
commit cf2f3aab24594bce13ca24c1ebdab9bb22eb12a9
Author: Luca Bruno <lethalman88 gmail com>
Date: Mon Aug 23 22:16:58 2010 +0200
girparser: Generate default parameter names for callbacks
vala/valagirparser.vala | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index e54939f..a39dae5 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -473,7 +473,7 @@ public class Vala.GirParser : CodeVisitor {
return type;
}
- FormalParameter parse_parameter (out int array_length_idx = null, out int closure_idx = null, out int destroy_idx = null, out string? scope = null) {
+ FormalParameter parse_parameter (out int array_length_idx = null, out int closure_idx = null, out int destroy_idx = null, out string? scope = null, string? default_name = null) {
FormalParameter param;
if (&array_length_idx != null) {
@@ -488,6 +488,9 @@ public class Vala.GirParser : CodeVisitor {
start_element ("parameter");
string name = reader.get_attribute ("name");
+ if (name == null) {
+ name = default_name;
+ }
string direction = reader.get_attribute ("direction");
string transfer = reader.get_attribute ("transfer-ownership");
string allow_none = reader.get_attribute ("allow-none");
@@ -1120,7 +1123,11 @@ public class Vala.GirParser : CodeVisitor {
while (current_token == MarkupTokenType.START_ELEMENT) {
int array_length_idx, closure_idx, destroy_idx;
string scope;
- var param = parse_parameter (out array_length_idx, out closure_idx, out destroy_idx, out scope);
+ string default_param_name = null;
+ if (s is Delegate) {
+ default_param_name = "arg%d".printf (parameters.size);
+ }
+ var param = parse_parameter (out array_length_idx, out closure_idx, out destroy_idx, out scope, default_param_name);
if (array_length_idx != -1) {
array_length_parameters.add (array_length_idx);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]