diff options
author | Jürg Billeter <j@bitron.ch> | 2008-11-07 09:19:18 +0000 |
---|---|---|
committer | Jürg Billeter <juergbi@src.gnome.org> | 2008-11-07 09:19:18 +0000 |
commit | 93d408f9d29ef6cd7a0bcdf0af8df3362c2aa463 (patch) | |
tree | 37b3c1568a89d22a162eb1d5ee0b4fb276eab45c /vala/valasemanticanalyzer.vala | |
parent | db5f3f9062a7dd32a41a37031835e4cecff30656 (diff) | |
download | vala-93d408f9d29ef6cd7a0bcdf0af8df3362c2aa463.tar.gz |
Move foreach statement checking to ForeachStatement.check
2008-11-07 Jürg Billeter <j@bitron.ch>
* vala/valaforeachstatement.vala:
* vala/valasemanticanalyzer.vala:
Move foreach statement checking to ForeachStatement.check
svn path=/trunk/; revision=1995
Diffstat (limited to 'vala/valasemanticanalyzer.vala')
-rw-r--r-- | vala/valasemanticanalyzer.vala | 105 |
1 files changed, 1 insertions, 104 deletions
diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala index ecbd73683..0a4a7a2e4 100644 --- a/vala/valasemanticanalyzer.vala +++ b/vala/valasemanticanalyzer.vala @@ -717,110 +717,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { } public override void visit_foreach_statement (ForeachStatement stmt) { - // analyze collection expression first, used for type inference - stmt.collection.accept (this); - - if (stmt.collection.error) { - // ignore inner error - stmt.error = true; - return; - } else if (stmt.collection.value_type == null) { - Report.error (stmt.collection.source_reference, "invalid collection expression"); - stmt.error = true; - return; - } - - var collection_type = stmt.collection.value_type.copy (); - stmt.collection.target_type = collection_type.copy (); - - DataType element_data_type = null; - bool element_owned = false; - - if (collection_type.is_array ()) { - var array_type = (ArrayType) collection_type; - element_data_type = array_type.element_type; - } else if (collection_type.compatible (glist_type) || collection_type.compatible (gslist_type)) { - if (collection_type.get_type_arguments ().size > 0) { - element_data_type = (DataType) collection_type.get_type_arguments ().get (0); - } - } else if (iterable_type != null && collection_type.compatible (iterable_type)) { - element_owned = true; - - if (list_type == null || !collection_type.compatible (new ObjectType (list_type))) { - // don't use iterator objects for lists for performance reasons - var foreach_iterator_type = new ObjectType (iterator_type); - foreach_iterator_type.value_owned = true; - foreach_iterator_type.add_type_argument (stmt.type_reference); - stmt.iterator_variable = new LocalVariable (foreach_iterator_type, "%s_it".printf (stmt.variable_name)); - - stmt.add_local_variable (stmt.iterator_variable); - stmt.iterator_variable.active = true; - } - - var it_method = (Method) iterable_type.data_type.scope.lookup ("iterator"); - if (it_method.return_type.get_type_arguments ().size > 0) { - var type_arg = it_method.return_type.get_type_arguments ().get (0); - if (type_arg.type_parameter != null) { - element_data_type = SemanticAnalyzer.get_actual_type (collection_type, it_method, type_arg, stmt); - } else { - element_data_type = type_arg; - } - } - } else { - stmt.error = true; - Report.error (stmt.source_reference, "Gee.List not iterable"); - return; - } - - if (element_data_type == null) { - stmt.error = true; - Report.error (stmt.collection.source_reference, "missing type argument for collection"); - return; - } - - // analyze element type - if (stmt.type_reference == null) { - // var type - stmt.type_reference = element_data_type.copy (); - } else if (!element_data_type.compatible (stmt.type_reference)) { - stmt.error = true; - Report.error (stmt.source_reference, "Foreach: Cannot convert from `%s' to `%s'".printf (element_data_type.to_string (), stmt.type_reference.to_string ())); - return; - } else if (element_data_type.is_disposable () && element_owned && !stmt.type_reference.value_owned) { - stmt.error = true; - Report.error (stmt.source_reference, "Foreach: Invalid assignment from owned expression to unowned variable"); - return; - } - - current_source_file.add_type_dependency (stmt.type_reference, SourceFileDependencyType.SOURCE); - - stmt.element_variable = new LocalVariable (stmt.type_reference, stmt.variable_name); - - stmt.body.scope.add (stmt.variable_name, stmt.element_variable); - - stmt.body.add_local_variable (stmt.element_variable); - stmt.element_variable.active = true; - - // analyze body - stmt.owner = current_symbol.scope; - current_symbol = stmt; - - stmt.body.accept (this); - - foreach (LocalVariable local in stmt.get_local_variables ()) { - local.active = false; - } - - current_symbol = current_symbol.parent_symbol; - - stmt.collection_variable = new LocalVariable (collection_type, "%s_collection".printf (stmt.variable_name)); - - stmt.add_local_variable (stmt.collection_variable); - stmt.collection_variable.active = true; - - - stmt.add_error_types (stmt.collection.get_error_types ()); - stmt.add_error_types (stmt.body.get_error_types ()); + stmt.check (this); } public override void visit_return_statement (ReturnStatement stmt) { |