vala: Report error for yield statements without async context

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 41481e7e85f2b738de7b8986d40873260beb3bfa..f0000a94b3aa29cfeb22fb0978f49b7fc19a4ea2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -715,6 +715,7 @@ TESTS = \
        semantic/yield-call-requires-async-method.test \
        semantic/yield-creation-requires-async-context.test \
        semantic/yield-creation-requires-async-method.test \
+       semantic/yield-statement-requires-async-context.test \
        $(NULL)
 
 NON_NULL_TESTS = \

diff --git a/tests/semantic/yield-statement-requires-async-context.test b/tests/semantic/yield-statement-requires-async-context.test
new file mode 100644 (file)
index 0000000..8dd0395
--- /dev/null
+++ b/tests/semantic/yield-statement-requires-async-context.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+       yield;
+}

diff --git a/vala/valayieldstatement.vala b/vala/valayieldstatement.vala
index 795de27610417c7cc3815de08e6e1c8c4673c76d..91d8e7f9f67acdea4514c7dbb2644a84ab38a21d 100644 (file)
--- a/vala/valayieldstatement.vala
+++ b/vala/valayieldstatement.vala
@@ -35,6 +35,21 @@ public class Vala.YieldStatement : CodeNode, Statement {
                this.source_reference = source_reference;
        }
 
+       public override bool check (CodeContext context) {
+               if (checked) {
+                       return !error;
+               }
+
+               checked = true;
+
+               if (context.analyzer.current_method == null || !context.analyzer.current_method.coroutine) {
+                       error = true;
+                       Report.error (source_reference, "yield statement not available outside async method");
+               }
+
+               return !error;
+       }
+
        public override void emit (CodeGenerator codegen) {
                codegen.visit_yield_statement (this);
        }