implement q!

hgwr · Jul 7, 2024 · c36e64f · c36e64f
1 parent db7e8c9
commit c36e64f
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/ex/parser.rs b/src/ex/parser.rs
@@ -259,15 +259,15 @@ impl Parser {
     }
 
     fn simple_command(&mut self) -> Result<MyOption<Box<dyn Command>>, GenericError> {
-        let command_opt = self.q_command()? | self.wq_command()?;
+        let command_opt =
+            self.q_command()? | self.wq_command()? | self.q_exclamation_command()?;
         if let MyOption::Some(command) = command_opt {
             return Ok(MyOption::Some(command));
         }
         Ok(MyOption::None)
     }
 
     fn q_command(&mut self) -> Result<MyOption<Box<dyn Command>>, GenericError> {
-        // tokens が "q" は Ok(Some(Box::new(ExitCommand {}))) を返す。
         if self.accept(TokenType::Command, "q") {
             self.pop();
             return Ok(MyOption::Some(Box::new(exit::ExitCommand {})));
@@ -276,8 +276,18 @@ impl Parser {
         Ok(MyOption::None)
     }
 
+    fn q_exclamation_command(&mut self) -> Result<MyOption<Box<dyn Command>>, GenericError> {
+        if self.accept(TokenType::Command, "q") {
+            self.pop();
+            if self.accept(TokenType::Command, "!") {
+                self.pop();
+                return Ok(MyOption::Some(Box::new(exit::ExitWithoutSaveCommand {})));
+            }
+        }
+        Ok(MyOption::None)
+    }
+
     fn wq_command(&mut self) -> Result<MyOption<Box<dyn Command>>, GenericError> {
-        // tokens が "w", "q" は Ok(Some(Box::new(ExitWithSaveCommand {}))) を返す。
         if self.accept(TokenType::Command, "w") {
             self.pop();
             if self.accept(TokenType::Command, "q") {