Fix syntax error tests

coolreader18 · coolreader18 · commit af25fbed39fa · 2020-03-21T00:35:36.000-05:00
diff --git a/compiler/src/compile.rs b/compiler/src/compile.rs
@@ -562,8 +562,6 @@ impl<O: OutputStream> Compiler<O> {
                 }
                 match value {
                     Some(v) => {
-<<<<<<< Updated upstream
-=======
                         if self.ctx.func == FunctionContext::AsyncFunction
                             && self.current_output().is_generator()
                         {
@@ -572,7 +570,6 @@ impl<O: OutputStream> Compiler<O> {
                                 statement.location.clone(),
                             ));
                         }
->>>>>>> Stashed changes
                         self.compile_expression(v)?;
                     }
                     None => {
@@ -1658,16 +1655,7 @@ impl<O: OutputStream> Compiler<O> {
             }
             Await { value } => {
                 if self.ctx.func != FunctionContext::AsyncFunction {
-<<<<<<< Updated upstream
-                    return Err(CompileError {
-                        statement: None,
-                        error: CompileErrorType::InvalidAwait,
-                        location: self.current_source_location.clone(),
-                        source_path: None,
-                    });
-=======
                     return Err(self.error(CompileErrorType::InvalidAwait));
->>>>>>> Stashed changes
                 }
                 self.compile_expression(value)?;
                 self.emit(Instruction::GetAwaitable);
@@ -1679,27 +1667,10 @@ impl<O: OutputStream> Compiler<O> {
             YieldFrom { value } => {
                 match self.ctx.func {
                     FunctionContext::NoFunction => {
-<<<<<<< Updated upstream
-                        return Err(CompileError {
-                            statement: None,
-                            error: CompileErrorType::InvalidYieldFrom,
-                            location: self.current_source_location.clone(),
-                            source_path: None,
-                        })
-                    }
-                    FunctionContext::AsyncFunction => {
-                        return Err(CompileError {
-                            statement: None,
-                            error: CompileErrorType::AsyncYieldFrom,
-                            location: self.current_source_location.clone(),
-                            source_path: None,
-                        })
-=======
                         return Err(self.error(CompileErrorType::InvalidYieldFrom))
                     }
                     FunctionContext::AsyncFunction => {
                         return Err(self.error(CompileErrorType::AsyncYieldFrom))
->>>>>>> Stashed changes
                     }
                     FunctionContext::Function => {}
                 }
diff --git a/compiler/src/error.rs b/compiler/src/error.rs
@@ -57,6 +57,7 @@ pub enum CompileErrorType {
     InvalidYieldFrom,
     InvalidAwait,
     AsyncYieldFrom,
+    AsyncReturnValue,
 }
 
 impl CompileError {
@@ -102,6 +103,9 @@ impl fmt::Display for CompileError {
             CompileErrorType::InvalidYieldFrom => "'yield from' outside function".to_owned(),
             CompileErrorType::InvalidAwait => "'await' outside async function".to_owned(),
             CompileErrorType::AsyncYieldFrom => "'yield from' inside async function".to_owned(),
+            CompileErrorType::AsyncReturnValue => {
+                "'return' with value inside async generator".to_owned()
+            }
         };
 
         if let Some(statement) = &self.statement {
diff --git a/compiler/src/output_stream.rs b/compiler/src/output_stream.rs
@@ -7,6 +7,8 @@ pub trait OutputStream: From<CodeObject> + Into<CodeObject> {
     fn set_label(&mut self, label: Label);
     /// Mark the inner CodeObject as a generator
     fn mark_generator(&mut self);
+    /// Check to see if the inner CodeObject is a generator
+    fn is_generator(&self) -> bool;
 }
 
 pub struct CodeObjectStream {
@@ -36,4 +38,7 @@ impl OutputStream for CodeObjectStream {
     fn mark_generator(&mut self) {
         self.code.flags |= CodeFlags::IS_GENERATOR;
     }
+    fn is_generator(&self) -> bool {
+        self.code.flags.contains(CodeFlags::IS_GENERATOR)
+    }
 }
diff --git a/compiler/src/peephole.rs b/compiler/src/peephole.rs
@@ -112,6 +112,9 @@ where
     fn mark_generator(&mut self) {
         self.inner.mark_generator()
     }
+    fn is_generator(&self) -> bool {
+        self.inner.is_generator()
+    }
 }
 
 impl<O: OutputStream> OptimizationBuffer for PeepholeOptimizer<O> {
diff --git a/parser/src/lexer.rs b/parser/src/lexer.rs
@@ -685,6 +685,8 @@ where
                     tabs = 0;
                 }
                 None => {
+                    spaces = 0;
+                    tabs = 0;
                     break;
                 }
                 _ => {

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ pub trait OutputStream: From<CodeObject> + Into<CodeObject> {`
`7`	`7`	`fn set_label(&mut self, label: Label);`
`8`	`8`	`/// Mark the inner CodeObject as a generator`
`9`	`9`	`fn mark_generator(&mut self);`
	`10`	`+ /// Check to see if the inner CodeObject is a generator`
	`11`	`+ fn is_generator(&self) -> bool;`
`10`	`12`	`}`
`11`	`13`
`12`	`14`	`pub struct CodeObjectStream {`
`@@ -36,4 +38,7 @@ impl OutputStream for CodeObjectStream {`
`36`	`38`	`fn mark_generator(&mut self) {`
`37`	`39`	`self.code.flags \|= CodeFlags::IS_GENERATOR;`
`38`	`40`	`}`
	`41`	`+ fn is_generator(&self) -> bool {`
	`42`	`+ self.code.flags.contains(CodeFlags::IS_GENERATOR)`
	`43`	`+ }`
`39`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,9 @@ where`
`112`	`112`	`fn mark_generator(&mut self) {`
`113`	`113`	`self.inner.mark_generator()`
`114`	`114`	`}`
	`115`	`+ fn is_generator(&self) -> bool {`
	`116`	`+ self.inner.is_generator()`
	`117`	`+ }`
`115`	`118`	`}`
`116`	`119`
`117`	`120`	`impl<O: OutputStream> OptimizationBuffer for PeepholeOptimizer<O> {`
Original file line number	Diff line number	Diff line change
`@@ -685,6 +685,8 @@ where`
`685`	`685`	`tabs = 0;`
`686`	`686`	`}`
`687`	`687`	`None => {`
	`688`	`+ spaces = 0;`
	`689`	`+ tabs = 0;`
`688`	`690`	`break;`
`689`	`691`	`}`
`690`	`692`	`_ => {`