[vala] gidlparser: Do not set nullable to void type
- From: Luca Bruno <lucabru src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] gidlparser: Do not set nullable to void type
- Date: Thu, 20 Mar 2014 22:18:38 +0000 (UTC)
commit c1324f492737c27552a28d0d911e74064cdfa75b
Author: Luca Bruno <lucabru src gnome org>
Date: Thu Mar 20 22:24:27 2014 +0100
gidlparser: Do not set nullable to void type
vapigen/valagidlparser.vala | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index a5fc598..ee9f76a 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -2257,7 +2257,7 @@ public class Vala.GIdlParser : CodeVisitor {
m.set_attribute ("DestroysInstance", true,
m.source_reference);
}
} else if (nv[0] == "nullable") {
- if (eval (nv[1]) == "1") {
+ if (eval (nv[1]) == "1" && !(return_type is VoidType)) {
return_type.nullable = true;
}
} else if (nv[0] == "sentinel") {
@@ -2447,7 +2447,7 @@ public class Vala.GIdlParser : CodeVisitor {
}
}
} else if (nv[0] == "nullable") {
- if (eval (nv[1]) == "1") {
+ if (eval (nv[1]) == "1" && !(param_type is VoidType)) {
param_type.nullable = true;
}
} else if (nv[0] == "transfer_ownership") {
@@ -2732,7 +2732,7 @@ public class Vala.GIdlParser : CodeVisitor {
prop.set_attribute ("Experimental", true);
}
} else if (nv[0] == "nullable") {
- if (eval (nv[1]) == "1") {
+ if (eval (nv[1]) == "1" && !(prop.property_type is VoidType)) {
prop.property_type.nullable = true;
}
} else if (nv[0] == "abstract") {
@@ -3120,7 +3120,7 @@ public class Vala.GIdlParser : CodeVisitor {
p.direction = ParameterDirection.REF;
}
} else if (nv[0] == "nullable") {
- if (eval (nv[1]) == "1") {
+ if (eval (nv[1]) == "1" && !(param_type is VoidType)) {
param_type.nullable = true;
}
} else if (nv[0] == "transfer_ownership") {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]