EOF after \\ raise EOF Error

HyeockJinKim · HyeockJinKim · commit cdd98135eeef · 2020-05-16T09:45:44.000+09:00
Return EOF Error to get the next line after` \\ `in the shell. Closes RustPython#1928
diff --git a/parser/src/error.rs b/parser/src/error.rs
@@ -28,6 +28,7 @@ pub enum LexicalErrorType {
     UnrecognizedToken { tok: char },
     FStringError(FStringErrorType),
     LineContinuationError,
+    EOF,
     OtherError(String),
 }
 
@@ -59,6 +60,7 @@ impl fmt::Display for LexicalErrorType {
             LexicalErrorType::LineContinuationError => {
                 write!(f, "unexpected character after line continuation character")
             }
+            LexicalErrorType::EOF => write!(f, "unexpected EOF while parsing"),
             LexicalErrorType::OtherError(msg) => write!(f, "{}", msg),
         }
     }
diff --git a/parser/src/lexer.rs b/parser/src/lexer.rs
@@ -1191,6 +1191,13 @@ where
                         location: self.get_pos(),
                     });
                 }
+
+                if self.chr0.is_none() {
+                    return Err(LexicalError {
+                        error: LexicalErrorType::EOF,
+                        location: self.get_pos(),
+                    });
+                }
             }
 
             _ => {
diff --git a/src/shell.rs b/src/shell.rs
@@ -1,7 +1,7 @@
 mod helper;
 
 use rustpython_compiler::{compile, error::CompileError, error::CompileErrorType};
-use rustpython_parser::error::ParseErrorType;
+use rustpython_parser::error::{LexicalErrorType, ParseErrorType};
 use rustpython_vm::readline::{Readline, ReadlineResult};
 use rustpython_vm::{
     exceptions::{print_exception, PyBaseExceptionRef},
@@ -23,6 +23,10 @@ fn shell_exec(vm: &VirtualMachine, source: &str, scope: Scope) -> ShellExecResul
             Ok(_val) => ShellExecResult::Ok,
             Err(err) => ShellExecResult::PyErr(err),
         },
+        Err(CompileError {
+            error: CompileErrorType::Parse(ParseErrorType::Lexical(LexicalErrorType::EOF)),
+            ..
+        }) => ShellExecResult::Continue,
         Err(CompileError {
             error: CompileErrorType::Parse(ParseErrorType::EOF),
             ..

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ pub enum LexicalErrorType {`
`28`	`28`	`UnrecognizedToken { tok: char },`
`29`	`29`	`FStringError(FStringErrorType),`
`30`	`30`	`LineContinuationError,`
	`31`	`+ EOF,`
`31`	`32`	`OtherError(String),`
`32`	`33`	`}`
`33`	`34`
`@@ -59,6 +60,7 @@ impl fmt::Display for LexicalErrorType {`
`59`	`60`	`LexicalErrorType::LineContinuationError => {`
`60`	`61`	`write!(f, "unexpected character after line continuation character")`
`61`	`62`	`}`
	`63`	`+ LexicalErrorType::EOF => write!(f, "unexpected EOF while parsing"),`
`62`	`64`	`LexicalErrorType::OtherError(msg) => write!(f, "{}", msg),`
`63`	`65`	`}`
`64`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1191,6 +1191,13 @@ where`
`1191`	`1191`	`location: self.get_pos(),`
`1192`	`1192`	`});`
`1193`	`1193`	`}`
	`1194`	`+`
	`1195`	`+ if self.chr0.is_none() {`
	`1196`	`+ return Err(LexicalError {`
	`1197`	`+ error: LexicalErrorType::EOF,`
	`1198`	`+ location: self.get_pos(),`
	`1199`	`+ });`
	`1200`	`+ }`
`1194`	`1201`	`}`
`1195`	`1202`
`1196`	`1203`	`_ => {`