var cparam = new CCodeParameter ("user_data", "gpointer");
cfundecl.add_parameter (cparam);
}
- if (d.get_error_types ().size > 0) {
+ if (d.tree_can_fail) {
var cparam = new CCodeParameter ("error", "GError**");
cfundecl.add_parameter (cparam);
}
cparam_map.set (get_param_pos (-3), cparam);
}
- if (m.get_error_types ().size > 0) {
+ if (m.tree_can_fail) {
var cparam = new CCodeParameter ("error", "GError**");
cparam_map.set (get_param_pos (-1), cparam);
}
carg_map.set (get_param_pos (-3), new CCodeIdentifier ("result"));
}
- if (m.get_error_types ().size > 0) {
+ if (m.tree_can_fail) {
carg_map.set (get_param_pos (-1), new CCodeIdentifier ("error"));
}
}
if (m.has_error_type_parameter ()) {
- foreach (DataType error_type in m.get_error_types ()) {
+ var error_types = new ArrayList<DataType> ();
+ m.get_error_types (error_types);
+ foreach (DataType error_type in error_types) {
generate_type_declaration (error_type, decl_space);
}
var ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_task_propagate_pointer"));
ccall.add_argument (async_result_cast);
- if (m.get_error_types ().size > 0) {
+ if (m.tree_can_fail) {
ccall.add_argument (new CCodeIdentifier ("error"));
} else {
ccall.add_argument (new CCodeConstant ("NULL"));
}
// If a task is cancelled, g_task_propagate_pointer returns NULL
- if (m.get_error_types ().size > 0 || has_cancellable) {
+ if (m.tree_can_fail || has_cancellable) {
var is_null = new CCodeBinaryExpression (CCodeBinaryOperator.EQUALITY, new CCodeConstant ("NULL"), data_var);
ccode.open_if (is_null);
ccode.add_declaration ("GUnixFDList*", new CCodeVariableDeclarator ("_fd_list"));
}
- bool has_error_argument = (m.get_error_types ().size > 0);
+ bool has_error_argument = m.tree_can_fail;
CCodeExpression error_argument;
if (has_error_argument) {
error_argument = new CCodeIdentifier ("error");
}
// register errors
- foreach (var error_type in m.get_error_types ()) {
+ var error_types = new ArrayList<DataType> ();
+ m.get_error_types (error_types);
+ foreach (var error_type in error_types) {
var errtype = (ErrorType) error_type;
if (errtype.error_domain != null) {
ccode.add_expression (new CCodeIdentifier (get_ccode_upper_case_name (errtype.error_domain)));
}
if (!m.coroutine || ready) {
- if (m.get_error_types ().size > 0) {
+ if (m.tree_can_fail) {
ccall.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("error")));
}
}
ccode.add_assignment (new CCodeIdentifier ("result"), ccall);
}
- if (m.get_error_types ().size > 0) {
+ if (m.tree_can_fail) {
ccode.open_if (new CCodeIdentifier ("error"));
var return_error = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_method_invocation_return_gerror"));
}
var error_types = new ArrayList<DataType> ();
- foreach (DataType node_error_type in node.get_error_types ()) {
- error_types.add (node_error_type);
- }
+ node.get_error_types (error_types);
bool has_general_catch_clause = false;
// should never happen with correct bindings
uncaught_error_statement (inner_error, true);
}
- } else if (current_method != null && current_method.get_error_types ().size > 0) {
+ } else if (current_method != null && current_method.tree_can_fail) {
// current method can fail, propagate error
CCodeBinaryExpression ccond = null;
- foreach (DataType error_type in current_method.get_error_types ()) {
+ var error_types = new ArrayList<DataType> ();
+ current_method.get_error_types (error_types);
+ foreach (DataType error_type in error_types) {
// If GLib.Error is allowed we propagate everything
if (error_type.equals (gerror_type)) {
ccond = null;
return left.is_accessible (sym) && right.is_accessible (sym);
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ left.get_error_types (collection, source_reference);
+ right.get_error_types (collection, source_reference);
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
value_type = null;
}
- add_error_types (left.get_error_types ());
- add_error_types (right.get_error_types ());
-
return !error;
}
return left.is_accessible (sym) && right.is_accessible (sym);
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ left.get_error_types (collection, source_reference);
+ right.get_error_types (collection, source_reference);
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
constant.active = false;
}
- // use get_statements () instead of statement_list to not miss errors within StatementList objects
- foreach (Statement stmt in get_statements ()) {
- add_error_types (stmt.get_error_types ());
- }
-
context.analyzer.current_symbol = old_symbol;
context.analyzer.insert_block = old_insert_block;
return !error;
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ // use get_statements () instead of statement_list to not miss errors within StatementList objects
+ foreach (Statement stmt in get_statements ()) {
+ stmt.get_error_types (collection, source_reference);
+ }
+ }
+
public override void emit (CodeGenerator codegen) {
codegen.visit_block (this);
}
builder.append_c (')');
// Append error-types
- var error_types = get_error_types ();
+ var error_types = new ArrayList<DataType> ();
+ get_error_types (error_types);
if (error_types.size > 0) {
builder.append (" throws ");
}
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ inner.get_error_types (collection, source_reference);
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
* Specifies that this node or a child node may throw an exception.
*/
public bool tree_can_fail {
- get { return _error_types != null && _error_types.size > 0; }
+ get {
+ var error_types = new ArrayList<DataType> ();
+ get_error_types (error_types);
+ return error_types.size > 0;
+ }
}
- private List<DataType> _error_types;
- private static List<DataType> _empty_type_list;
private AttributeCache[] attributes_cache;
static int last_temp_nr = 0;
static int next_attribute_cache_index = 0;
- /**
- * Specifies the exceptions that can be thrown by this node or a child node
- */
- public List<DataType> get_error_types () {
- if (_error_types != null) {
- return _error_types;
- }
- if (_empty_type_list == null) {
- _empty_type_list = new ArrayList<DataType> ();
- }
- return _empty_type_list;
- }
-
- /**
- * Adds an error type to the exceptions that can be thrown by this node
- * or a child node
- */
- public void add_error_type (DataType error_type) {
- if (_error_types == null) {
- _error_types = new ArrayList<DataType> ();
- }
- _error_types.add (error_type);
- error_type.parent_node = this;
- }
-
- /**
- * Adds a collection of error types to the exceptions that can be thrown by this node
- * or a child node
- */
- public void add_error_types (List<DataType> error_types) {
- foreach (DataType error_type in error_types) {
- add_error_type (error_type);
- }
- }
-
/**
* Visits this code node with the specified CodeVisitor.
*
public virtual void get_used_variables (Collection<Variable> collection) {
}
+ public virtual void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ }
+
public static string get_temp_name () {
return "." + (++last_temp_nr).to_string ();
}
write_params (cb.get_parameters ());
- write_error_domains (cb.get_error_types ());
+ var error_types = new ArrayList<DataType> ();
+ cb.get_error_types (error_types);
+ write_error_domains (error_types);
write_string (";");
write_params (m.get_parameters ());
- write_error_domains (m.get_error_types ());
+ var error_types = new ArrayList<DataType> ();
+ m.get_error_types (error_types);
+ write_error_domains (error_types);
write_code_block (m.body);
return condition.is_accessible (sym) && true_expression.is_accessible (sym) && false_expression.is_accessible (sym);
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ condition.get_error_types (collection, source_reference);
+ true_expression.get_error_types (collection, source_reference);
+ false_expression.get_error_types (collection, source_reference);
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
body.check (context);
}
- foreach (DataType body_error_type in body.get_error_types ()) {
+ var body_errors = new ArrayList<DataType> ();
+ body.get_error_types (body_errors);
+ foreach (DataType body_error_type in body_errors) {
if (!((ErrorType) body_error_type).dynamic_error) {
Report.warning (body_error_type.source_reference, "unhandled error `%s'".printf (body_error_type.to_string()));
}
param.accept (visitor);
}
- foreach (DataType error_type in get_error_types ()) {
- error_type.accept (visitor);
+ if (error_types != null) {
+ foreach (DataType error_type in error_types) {
+ error_type.accept (visitor);
+ }
}
foreach (Expression precondition in get_preconditions ()) {
i++;
}
- foreach (DataType error_type in get_error_types ()) {
- error_type.check (context);
+ if (error_types != null) {
+ foreach (DataType error_type in error_types) {
+ error_type.check (context);
+ }
}
foreach (Expression precondition in get_preconditions ()) {
// check that all errors that can be thrown in the method body are declared
if (body != null) {
- foreach (DataType body_error_type in body.get_error_types ()) {
+ var body_errors = new ArrayList<DataType> ();
+ body.get_error_types (body_errors);
+ foreach (DataType body_error_type in body_errors) {
bool can_propagate_error = false;
- foreach (DataType method_error_type in get_error_types ()) {
- if (body_error_type.compatible (method_error_type)) {
- can_propagate_error = true;
+ if (error_types != null) {
+ foreach (DataType method_error_type in error_types) {
+ if (body_error_type.compatible (method_error_type)) {
+ can_propagate_error = true;
+ }
}
}
if (!can_propagate_error && !((ErrorType) body_error_type).dynamic_error) {
declaration.accept (visitor);
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ if (source_reference == null) {
+ source_reference = this.source_reference;
+ }
+ var local = declaration as LocalVariable;
+ if (local != null && local.initializer != null) {
+ local.initializer.get_error_types (collection, source_reference);
+ }
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
declaration.check (context);
- var local = declaration as LocalVariable;
- if (local != null && local.initializer != null) {
- foreach (DataType error_type in local.initializer.get_error_types ()) {
- // ensure we can trace back which expression may throw errors of this type
- var initializer_error_type = error_type.copy ();
- initializer_error_type.source_reference = local.initializer.source_reference;
-
- add_error_type (initializer_error_type);
- }
- }
-
return !error;
}
private DataType _return_type;
private bool? _has_target;
+ private List<DataType> error_types;
+
/**
* Creates a new delegate.
*
return false;
}
- var error_types = get_error_types ();
- var method_error_types = m.get_error_types ();
+ var method_error_types = new ArrayList<DataType> ();
+ m.get_error_types (method_error_types);
// method must throw error if the delegate does
- if (error_types.size > 0 && method_error_types.size == 0) {
+ if (error_types != null && error_types.size > 0 && method_error_types.size == 0) {
return false;
}
// method may throw less but not more errors than the delegate
foreach (DataType method_error_type in method_error_types) {
bool match = false;
- foreach (DataType delegate_error_type in error_types) {
- if (method_error_type.compatible (delegate_error_type)) {
- match = true;
- break;
+ if (error_types != null) {
+ foreach (DataType delegate_error_type in error_types) {
+ if (method_error_type.compatible (delegate_error_type)) {
+ match = true;
+ break;
+ }
}
}
param.accept (visitor);
}
- foreach (DataType error_type in get_error_types ()) {
- error_type.accept (visitor);
+ if (error_types != null) {
+ foreach (DataType error_type in error_types) {
+ error_type.accept (visitor);
+ }
}
}
return false;
}
+ /**
+ * Adds an error type to the exceptions that can be
+ * thrown by this delegate.
+ */
+ public void add_error_type (DataType error_type) {
+ if (error_types == null) {
+ error_types = new ArrayList<DataType> ();
+ }
+ error_types.add (error_type);
+ error_type.parent_node = this;
+ }
+
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ if (error_types != null) {
+ foreach (var error_type in error_types) {
+ if (source_reference != null) {
+ var type = error_type.copy ();
+ type.source_reference = source_reference;
+ collection.add (type);
+ } else {
+ collection.add (error_type);
+ }
+ }
+ }
+ }
+
public override void replace_type (DataType old_type, DataType new_type) {
if (return_type == old_type) {
return_type = new_type;
return;
}
- var error_types = get_error_types ();
- for (int i = 0; i < error_types.size; i++) {
- if (error_types[i] == old_type) {
- error_types[i] = new_type;
- return;
+ if (error_types != null) {
+ for (int i = 0; i < error_types.size; i++) {
+ if (error_types[i] == old_type) {
+ error_types[i] = new_type;
+ return;
+ }
}
}
}
param.check (context);
}
- foreach (DataType error_type in get_error_types ()) {
- error_type.check (context);
+ if (error_types != null) {
+ foreach (DataType error_type in error_types) {
+ error_type.check (context);
+ }
}
context.analyzer.current_source_file = old_source_file;
}
// target-delegate may throw less but not more errors than the delegate
- foreach (DataType error_type in get_error_types ()) {
+ var error_types = new ArrayList<DataType> ();
+ get_error_types (error_types);
+ foreach (DataType error_type in error_types) {
bool match = false;
- foreach (DataType delegate_error_type in dt_target.get_error_types ()) {
+ var delegate_error_types = new ArrayList<DataType> ();
+ dt_target.get_error_types (delegate_error_types);
+ foreach (DataType delegate_error_type in delegate_error_types) {
if (error_type.compatible (delegate_error_type)) {
match = true;
break;
return container.is_accessible (sym);
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ container.get_error_types (collection, source_reference);
+ foreach (Expression e in indices) {
+ e.get_error_types (collection, source_reference);
+ }
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
return false;
}
- add_error_types (expression.get_error_types ());
-
return !error;
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ expression.get_error_types (collection, source_reference);
+ }
+
public override void emit (CodeGenerator codegen) {
expression.emit (codegen);
var last_block = current_block;
// exceptional control flow
- foreach (DataType error_data_type in node.get_error_types()) {
+ var error_types = new ArrayList<DataType> ();
+ node.get_error_types (error_types);
+ foreach (DataType error_data_type in error_types) {
var error_type = error_data_type as ErrorType;
var error_class = error_data_type.data_type as Class;
current_block = last_block;
add_local_variable (collection_variable);
collection_variable.active = true;
- add_error_types (collection.get_error_types ());
- add_error_types (body.get_error_types ());
-
return !error;
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ if (source_reference == null) {
+ source_reference = this.source_reference;
+ }
+ this.collection.get_error_types (collection, source_reference);
+ body.get_error_types (collection, source_reference);
+ }
+
public override void emit (CodeGenerator codegen) {
if (use_iterator) {
base.emit (codegen);
// ensure getter vfunc if the property is abstract
if (m != null) {
getter.process (parser);
- if (m.return_type is VoidType || m.get_parameters().size != 0 || m.get_error_types ().size > 0) {
+ if (m.return_type is VoidType || m.get_parameters().size != 0 || m.tree_can_fail) {
prop.set_attribute ("NoAccessorMethod", true);
} else {
if (getter.name == name) {
// ensure setter vfunc if the property is abstract
if (m != null) {
setter.process (parser);
- if (!(m.return_type is VoidType || m.return_type is BooleanType) || m.get_parameters ().size != 1 || m.get_error_types ().size > 0) {
+ if (!(m.return_type is VoidType || m.return_type is BooleanType) || m.get_parameters ().size != 1 || m.tree_can_fail) {
prop.set_attribute ("NoAccessorMethod", true);
prop.set_attribute ("ConcreteAccessor", false);
} else {
if (!(metadata.get_expression (ArgumentType.THROWS) is NullLiteral)) {
if (metadata.has_argument (ArgumentType.THROWS)) {
- var error_types = metadata.get_string(ArgumentType.THROWS).split(",");
- foreach (var error_type in error_types) {
- s.add_error_type (parse_type_from_string (error_type, true, metadata.get_source_reference (ArgumentType.THROWS)));
+ var error_types = metadata.get_string (ArgumentType.THROWS).split(",");
+ foreach (var error_type_name in error_types) {
+ var error_type = parse_type_from_string (error_type_name, true, metadata.get_source_reference (ArgumentType.THROWS));
+ if (s is Method) {
+ ((Method) s).add_error_type (error_type);
+ } else {
+ ((Delegate) s).add_error_type (error_type);
+ }
}
} else if (throws_string == "1") {
- s.add_error_type (new ErrorType (null, null));
+ if (s is Method) {
+ ((Method) s).add_error_type (new ErrorType (null, null));
+ } else {
+ ((Delegate) s).add_error_type (new ErrorType (null, null));
+ }
}
}
deleg.add_parameter (param.copy ());
}
- foreach (var error_type in orig.get_error_types ()) {
+ var error_types = new ArrayList<DataType> ();
+ orig.get_error_types (error_types, alias.source_reference);
+ foreach (var error_type in error_types) {
deleg.add_error_type (error_type.copy ());
}
}
}
- foreach (DataType error_type in finish_method.get_error_types ()) {
- method.add_error_type (error_type.copy ());
+ var error_types = new ArrayList<DataType> ();
+ finish_method.get_error_types (error_types, method.source_reference);
+ foreach (DataType error_type in error_types) {
+ method.add_error_type (error_type);
}
finish_method_node.processed = true;
finish_method_node.merged = true;
}
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ condition.get_error_types (collection, source_reference);
+ true_statement.get_error_types (collection, source_reference);
+ if (false_statement != null) {
+ false_statement.get_error_types (collection, source_reference);
+ }
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
return false;
}
- add_error_types (condition.get_error_types ());
- add_error_types (true_statement.get_error_types ());
-
- if (false_statement != null) {
- add_error_types (false_statement.get_error_types ());
- }
-
return !error;
}
return false;
}
- foreach (var error_type in cb.get_error_types ()) {
+ var error_types = new ArrayList<DataType> ();
+ cb.get_error_types (error_types);
+ foreach (var error_type in error_types) {
method.add_error_type (error_type.copy ());
}
body.accept (visitor);
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ body.get_error_types (collection, source_reference);
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
body.check (context);
- add_error_types (body.get_error_types ());
-
return !error;
}
}
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ if (inner != null) {
+ inner.get_error_types (collection, source_reference);
+ }
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
private List<Expression> postconditions;
private DataType _return_type;
+ protected List<DataType> error_types;
+
private weak Method _base_method;
private weak Method _base_interface_method;
private DataType _base_interface_type;
param.accept (visitor);
}
- foreach (DataType error_type in get_error_types ()) {
+ if (error_types != null) {
+ foreach (DataType error_type in error_types) {
error_type.accept (visitor);
}
+ }
if (result_var != null) {
result_var.accept (visitor);
}
/* this method may throw less but not more errors than the base method */
- foreach (DataType method_error_type in get_error_types ()) {
+ var base_method_errors = new ArrayList<DataType> ();
+ base_method.get_error_types (base_method_errors);
+ if (error_types != null) {
+ foreach (DataType method_error_type in error_types) {
bool match = false;
- foreach (DataType base_method_error_type in base_method.get_error_types ()) {
+ foreach (DataType base_method_error_type in base_method_errors) {
if (method_error_type.compatible (base_method_error_type)) {
match = true;
break;
return false;
}
}
+ }
if (base_method.coroutine != this.coroutine) {
invalid_match = "async mismatch";
return false;
return _empty_expression_list;
}
+ /**
+ * Adds an error type to the exceptions that can be
+ * thrown by this method.
+ */
+ public void add_error_type (DataType error_type) {
+ if (error_types == null) {
+ error_types = new ArrayList<DataType> ();
+ }
+ error_types.add (error_type);
+ error_type.parent_node = this;
+ }
+
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ if (error_types != null) {
+ foreach (var error_type in error_types) {
+ if (source_reference != null) {
+ var type = error_type.copy ();
+ type.source_reference = source_reference;
+ collection.add (type);
+ } else {
+ collection.add (error_type);
+ }
+ }
+ }
+ }
+
public override void replace_type (DataType old_type, DataType new_type) {
if (base_interface_type == old_type) {
base_interface_type = new_type;
return_type = new_type;
return;
}
- var error_types = get_error_types ();
+ if (error_types != null) {
for (int i = 0; i < error_types.size; i++) {
if (error_types[i] == old_type) {
error_types[i] = new_type;
}
}
}
+ }
private void find_base_methods () {
if (base_methods_valid) {
this_parameter.variable_type.value_owned = true;
}
if (get_attribute ("NoThrow") != null) {
- get_error_types ().clear ();
+ error_types = null;
}
if (parent_symbol is Class && (is_abstract || is_virtual)) {
}
}
- foreach (DataType error_type in get_error_types ()) {
+ if (error_types != null) {
+ foreach (DataType error_type in error_types) {
error_type.check (context);
// check whether error type is at least as accessible as the method
return false;
}
}
+ }
if (result_var != null) {
result_var.check (context);
// check that all errors that can be thrown in the method body are declared
if (body != null) {
- foreach (DataType body_error_type in body.get_error_types ()) {
+ var body_errors = new ArrayList<DataType> ();
+ body.get_error_types (body_errors);
+ foreach (DataType body_error_type in body_errors) {
bool can_propagate_error = false;
- foreach (DataType method_error_type in get_error_types ()) {
+ if (error_types != null) {
+ foreach (DataType method_error_type in error_types) {
if (body_error_type.compatible (method_error_type)) {
can_propagate_error = true;
}
}
+ }
bool is_dynamic_error = body_error_type is ErrorType && ((ErrorType) body_error_type).dynamic_error;
if (!can_propagate_error && !is_dynamic_error) {
Report.warning (body_error_type.source_reference, "unhandled error `%s'".printf (body_error_type.to_string()));
bool throws_gerror = false;
bool throws_gioerror = false;
bool throws_gdbuserror = false;
- foreach (DataType error_type in get_error_types ()) {
+ var error_types = new ArrayList<DataType> ();
+ get_error_types (error_types);
+ foreach (DataType error_type in error_types) {
if (!(error_type is ErrorType)) {
continue;
}
}
public bool has_error_type_parameter () {
- if (get_error_types ().size > 0) {
+ if (tree_can_fail) {
return true;
}
if (base_method != null && base_method != this && base_method.has_error_type_parameter ()) {
return call.is_accessible (sym);
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ if (source_reference == null) {
+ source_reference = this.source_reference;
+ }
+ var mtype = call.value_type;
+ if (mtype is MethodType) {
+ var m = ((MethodType) mtype).method_symbol;
+ if (!(m != null && m.coroutine && !is_yield_expression && ((MemberAccess) call).member_name != "end")) {
+ m.get_error_types (collection, source_reference);
+ }
+ } else if (mtype is ObjectType) {
+ // constructor
+ var cl = (Class) ((ObjectType) mtype).type_symbol;
+ var m = cl.default_construction_method;
+ m.get_error_types (collection, source_reference);
+ } else if (mtype is DelegateType) {
+ var d = ((DelegateType) mtype).delegate_symbol;
+ d.get_error_types (collection, source_reference);
+ }
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
formal_value_type = ret_type.copy ();
value_type = formal_value_type.get_actual_type (target_object_type, method_type_args, this);
- bool may_throw = false;
-
if (mtype is MethodType) {
var m = ((MethodType) mtype).method_symbol;
if (is_yield_expression) {
Report.error (source_reference, "yield expression not available outside async method");
}
}
- if (m != null && m.coroutine && !is_yield_expression && ((MemberAccess) call).member_name != "end") {
- // .begin call of async method, no error can happen here
- } else {
- foreach (DataType error_type in m.get_error_types ()) {
- may_throw = true;
- // ensure we can trace back which expression may throw errors of this type
- var call_error_type = error_type.copy ();
- call_error_type.source_reference = source_reference;
-
- add_error_type (call_error_type);
- }
- }
if (m.returns_floating_reference) {
value_type.floating_reference = true;
}
((MemberAccess) call).inner.lvalue = true;
}
// avoid passing possible null to ref_sink_function without checking
- if (may_throw && !value_type.nullable && value_type.floating_reference && ret_type is ObjectType) {
+ if (tree_can_fail && !value_type.nullable && value_type.floating_reference && ret_type is ObjectType) {
value_type.nullable = true;
}
mtype = new MethodType (m.get_end_method ());
}
}
- } else if (mtype is ObjectType) {
- // constructor
- var cl = (Class) ((ObjectType) mtype).type_symbol;
- var m = cl.default_construction_method;
- foreach (DataType error_type in m.get_error_types ()) {
- may_throw = true;
-
- // ensure we can trace back which expression may throw errors of this type
- var call_error_type = error_type.copy ();
- call_error_type.source_reference = source_reference;
-
- add_error_type (call_error_type);
- }
- } else if (mtype is DelegateType) {
- var d = ((DelegateType) mtype).delegate_symbol;
- foreach (DataType error_type in d.get_error_types ()) {
- may_throw = true;
-
- // ensure we can trace back which expression may throw errors of this type
- var call_error_type = error_type.copy ();
- call_error_type.source_reference = source_reference;
-
- add_error_type (call_error_type);
- }
}
if (!context.analyzer.check_arguments (this, mtype, params, get_argument_list ())) {
}
}
- if (may_throw) {
+ if (tree_can_fail) {
if (parent_node is LocalVariable || parent_node is ExpressionStatement) {
// simple statements, no side effects after method call
} else if (!(context.analyzer.current_symbol is Block)) {
value_type = type_reference.copy ();
value_type.value_owned = true;
- bool may_throw = false;
-
int given_num_type_args = type_reference.get_type_arguments ().size;
int expected_num_type_args = 0;
}
context.analyzer.check_arguments (this, new MethodType (m), m.get_parameters (), args);
-
- foreach (DataType error_type in m.get_error_types ()) {
- may_throw = true;
-
- // ensure we can trace back which expression may throw errors of this type
- var call_error_type = error_type.copy ();
- call_error_type.source_reference = source_reference;
-
- add_error_type (call_error_type);
- }
} else if (type_reference is ErrorType) {
if (type_reference != null) {
type_reference.check (context);
context.analyzer.visit_member_initializer (init, type_reference);
}
- if (may_throw) {
+ if (tree_can_fail) {
if (parent_node is LocalVariable || parent_node is ExpressionStatement) {
// simple statements, no side effects after method call
} else if (!(context.analyzer.current_symbol is Block)) {
return !error;
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ if (symbol_reference is Method) {
+ if (source_reference == null) {
+ source_reference = this.source_reference;
+ }
+ var m = (Method) symbol_reference;
+ m.get_error_types (collection, source_reference);
+ }
+ }
+
public override void emit (CodeGenerator codegen) {
foreach (Expression arg in argument_list) {
arg.emit (codegen);
if (accept (TokenType.THROWS)) {
do {
- prop.add_error_type (parse_type (true, false));
+ parse_type (true, false);
} while (accept (TokenType.COMMA));
Report.error (prop.source_reference, "properties throwing errors are not supported yet");
}
return inner.is_accessible (sym);
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ inner.get_error_types (collection, source_reference);
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
body.check (context);
- foreach (DataType body_error_type in body.get_error_types ()) {
+ var error_types = new ArrayList<DataType> ();
+ body.get_error_types (error_types);
+ foreach (DataType body_error_type in error_types) {
if (!((ErrorType) body_error_type).dynamic_error) {
Report.warning (body_error_type.source_reference, "unhandled error `%s'".printf (body_error_type.to_string()));
}
}
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ if (return_expression != null) {
+ return_expression.get_error_types (collection, source_reference);
+ }
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
Report.warning (source_reference, "`null' incompatible with return type `%s'".printf (context.analyzer.current_return_type.to_string ()));
}
- add_error_types (return_expression.get_error_types ());
-
return !error;
}
list.insert (index, stmt);
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ foreach (var stmt in list) {
+ stmt.get_error_types (collection, source_reference);
+ }
+ }
+
public override void accept (CodeVisitor visitor) {
foreach (Statement stmt in list) {
stmt.accept (visitor);
}
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ // use get_statements () instead of statement_list to not miss errors within StatementList objects
+ foreach (var stmt in get_statements ()) {
+ stmt.get_error_types (collection, source_reference);
+ }
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
local.active = false;
}
- // use get_statements () instead of statement_list to not miss errors within StatementList objects
- foreach (Statement stmt in get_statements ()) {
- add_error_types (stmt.get_error_types ());
- }
-
context.analyzer.current_symbol = old_symbol;
context.analyzer.insert_block = old_insert_block;
}
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ foreach (SwitchSection section in sections) {
+ section.get_error_types (collection, source_reference);
+ }
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
}
}
}
- add_error_types (section.get_error_types ());
}
return !error;
}
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ if (source_reference == null) {
+ source_reference = this.source_reference;
+ }
+ var error_type = error_expression.value_type.copy ();
+ error_type.source_reference = source_reference;
+ collection.add (error_type);
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
}
}
- var error_type = error_expression.value_type.copy ();
- error_type.source_reference = source_reference;
-
- add_error_type (error_type);
-
return !error;
}
}
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ var error_types = new ArrayList<DataType> ();
+ body.get_error_types (error_types, source_reference);
+
+ foreach (CatchClause clause in catch_clauses) {
+ for (int i=0; i < error_types.size; i++) {
+ var error_type = error_types[i];
+ if (clause.error_type == null || error_type.compatible (clause.error_type)) {
+ error_types.remove_at (i);
+ i--;
+ }
+ }
+
+ clause.body.get_error_types (collection, source_reference);
+ }
+
+ if (finally_body != null) {
+ finally_body.get_error_types (collection, source_reference);
+ }
+
+ foreach (var error_type in error_types) {
+ collection.add (error_type);
+ }
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
body.check (context);
- var error_types = new ArrayList<DataType> ();
- foreach (DataType body_error_type in body.get_error_types ()) {
- error_types.add (body_error_type);
- }
-
- var handled_error_types = new ArrayList<DataType> ();
foreach (CatchClause clause in catch_clauses) {
- foreach (DataType body_error_type in error_types) {
- if (clause.error_type == null || body_error_type.compatible (clause.error_type)) {
- handled_error_types.add (body_error_type);
- }
- }
- foreach (DataType handled_error_type in handled_error_types) {
- error_types.remove (handled_error_type);
- }
- handled_error_types.clear ();
-
clause.check (context);
- foreach (DataType body_error_type in clause.body.get_error_types ()) {
- error_types.add (body_error_type);
- }
}
if (finally_body != null) {
finally_body.check (context);
- foreach (DataType body_error_type in finally_body.get_error_types ()) {
- error_types.add (body_error_type);
- }
}
- add_error_types (error_types);
-
return !error;
}
return null;
}
+ public override void get_error_types (Collection<DataType> collection, SourceReference? source_reference = null) {
+ inner.get_error_types (collection, source_reference);
+ }
+
public override bool check (CodeContext context) {
if (checked) {
return !error;
return symbol_map.get (symbol);
}
- private void resolve_thrown_list (Symbol symbol, Vala.List<Vala.DataType> types) {
- foreach (Vala.DataType type in types) {
+ private void resolve_thrown_list (Symbol symbol, Vala.Symbol vala_symbol) {
+ var error_types = new Vala.ArrayList<Vala.DataType> ();
+ vala_symbol.get_error_types (error_types);
+ foreach (Vala.DataType type in error_types) {
Vala.ErrorDomain vala_edom = (Vala.ErrorDomain) type.data_type;
Symbol? edom = symbol_map.get (vala_edom);
symbol.add_child (edom ?? glib_error);
resolve_type_reference (item.return_type);
- resolve_thrown_list (item, vala_delegate.get_error_types ());
+ resolve_thrown_list (item, vala_delegate);
item.accept_all_children (this, false);
}
item.base_method = (Method?) resolve (base_vala_method);
}
- resolve_thrown_list (item, vala_method.get_error_types ());
+ resolve_thrown_list (item, vala_method);
resolve_type_reference (item.return_type);
m.add_parameter (async_param);
}
}
- foreach (DataType error_type in finish_method.get_error_types ()) {
- m.add_error_type (error_type.copy ());
+ var error_types = new ArrayList<DataType> ();
+ finish_method.get_error_types (error_types, m.source_reference);
+ foreach (DataType error_type in error_types) {
+ m.add_error_type (error_type);
}
finish_methods.add (finish_method);
}
projects / thirdparty / vala.git / commitdiff
