diff options
| author | Jürg Billeter <j@bitron.ch> | 2008-12-01 11:28:37 +0000 |
|---|---|---|
| committer | Jürg Billeter <juergbi@src.gnome.org> | 2008-12-01 11:28:37 +0000 |
| commit | 1c9f36c0f89c4ab065b12e86eccc7f1225b62ef2 (patch) | |
| tree | a6e1777290fe88621dd34056da187faab24978ca /vala/valaconditionalexpression.vala | |
| parent | ee6732275694c32c543ad0e14367f15e839456c4 (diff) | |
| download | vala-1c9f36c0f89c4ab065b12e86eccc7f1225b62ef2.tar.gz | |
Fix critical when using conditional expressions in method contracts
2008-12-01 Jürg Billeter <j@bitron.ch>
* vala/valabinaryexpression.vala:
* vala/valaconditionalexpression.vala:
Fix critical when using conditional expressions in method contracts
svn path=/trunk/; revision=2109
Diffstat (limited to 'vala/valaconditionalexpression.vala')
| -rw-r--r-- | vala/valaconditionalexpression.vala | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vala/valaconditionalexpression.vala b/vala/valaconditionalexpression.vala index 2d002b68b..191d0fc0c 100644 --- a/vala/valaconditionalexpression.vala +++ b/vala/valaconditionalexpression.vala @@ -105,6 +105,12 @@ public class Vala.ConditionalExpression : Expression { checked = true; + if (!(analyzer.current_symbol is Block)) { + Report.error (source_reference, "Conditional expressions may only be used in blocks"); + error = true; + return false; + } + var old_insert_block = analyzer.insert_block; analyzer.insert_block = prepare_condition_split (analyzer); |