summaryrefslogtreecommitdiff
path: root/codegen/valaccodememberaccessmodule.vala
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2018-11-15 20:50:02 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2019-09-30 14:43:00 +0200
commita6bdd4c53b371a979d6ff68c2a81f53e570853d6 (patch)
tree04a4f6642d839856aa86a611d0c937e116509556 /codegen/valaccodememberaccessmodule.vala
parent061c02a91056b2f8c8b4cc985db4aec9c0a235fc (diff)
downloadvala-a6bdd4c53b371a979d6ff68c2a81f53e570853d6.tar.gz
codegen: Follow rename of DataType data_type property to type_symbol
Diffstat (limited to 'codegen/valaccodememberaccessmodule.vala')
-rw-r--r--codegen/valaccodememberaccessmodule.vala12
1 files changed, 6 insertions, 6 deletions
diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala
index 5ef5f4eb9..8e546878e 100644
--- a/codegen/valaccodememberaccessmodule.vala
+++ b/codegen/valaccodememberaccessmodule.vala
@@ -100,7 +100,7 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
// expr.inner is null in the special case of referencing the method in a constant initializer
var delegate_target = (CCodeExpression) get_ccodenode (expr.inner);
delegate_type = expr.target_type as DelegateType;
- if ((expr.value_type.value_owned || (delegate_type != null && delegate_type.is_called_once)) && expr.inner.value_type.data_type != null && is_reference_counting (expr.inner.value_type.data_type)) {
+ if ((expr.value_type.value_owned || (delegate_type != null && delegate_type.is_called_once)) && expr.inner.value_type.type_symbol != null && is_reference_counting (expr.inner.value_type.type_symbol)) {
var ref_call = new CCodeFunctionCall (get_dup_func_expression (expr.inner.value_type, expr.source_reference));
ref_call.add_argument (delegate_target);
delegate_target = ref_call;
@@ -452,7 +452,7 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
// use closure
result.cvalue = new CCodeMemberAccess.pointer (new CCodeIdentifier ("_data_"), "self");
} else {
- var st = result.value_type.data_type as Struct;
+ unowned Struct? st = result.value_type.type_symbol as Struct;
if (st != null && !st.is_simple_type ()) {
result.cvalue = new CCodeIdentifier ("(*self)");
} else {
@@ -489,7 +489,7 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
}
}
} else {
- var type_as_struct = result.value_type.data_type as Struct;
+ unowned Struct? type_as_struct = result.value_type.type_symbol as Struct;
if (param.direction == ParameterDirection.OUT) {
name = "_vala_%s".printf (name);
@@ -576,8 +576,8 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
var instance_target_type = get_data_type_for_symbol ((TypeSymbol) field.parent_symbol);
- var cl = instance_target_type.data_type as Class;
- bool is_gtypeinstance = ((instance_target_type.data_type == cl) && (cl == null || !cl.is_compact));
+ unowned Class? cl = instance_target_type.type_symbol as Class;
+ bool is_gtypeinstance = ((instance_target_type.type_symbol == cl) && (cl == null || !cl.is_compact));
CCodeExpression inst;
if (is_gtypeinstance && field.access == SymbolAccessibility.PRIVATE) {
@@ -596,7 +596,7 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
return result;
}
- if (instance_target_type.data_type.is_reference_type () || (instance != null && instance.value_type is PointerType)) {
+ if (instance_target_type.type_symbol.is_reference_type () || (instance != null && instance.value_type is PointerType)) {
result.cvalue = new CCodeMemberAccess.pointer (inst, get_ccode_name (field));
} else {
result.cvalue = new CCodeMemberAccess (inst, get_ccode_name (field));