[109] 불필요한 코드 제거

myyrakle · Jul 10, 2024 · 5358c59 · 5358c59
1 parent 73f4a64
commit 5358c59
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/src/lexer/test/select.rs b/src/lexer/test/select.rs
@@ -110,11 +110,11 @@ pub fn test_errors() {
             input: r#"SELECT @"#.to_owned(),
             want_error: true,
         },
-        TestCase {
-            name: "예상하지 못한 특수문자: $".to_owned(),
-            input: r#"SELECT $"#.to_owned(),
-            want_error: true,
-        },
+        // TestCase {
+        //     name: "예상하지 못한 특수문자: $".to_owned(),
+        //     input: r#"SELECT $"#.to_owned(),
+        //     want_error: true,
+        // },
         TestCase {
             name: "예상하지 못한 특수문자: $$$".to_owned(),
             input: r#"SELECT $$$"#.to_owned(),
@@ -208,12 +208,20 @@ pub fn test_identifier() {
         expected: Vec<Token>,
     }
 
-    let test_cases = vec![TestCase {
-        name: "백틱 파싱".to_owned(),
-        input: r#"SELECT `foo`"#.to_owned(),
-        want_error: false,
-        expected: vec![Token::Select, Token::Identifier("foo".to_owned())],
-    }];
+    let test_cases = vec![
+        TestCase {
+            name: "백틱 파싱".to_owned(),
+            input: r#"SELECT `foo`"#.to_owned(),
+            want_error: false,
+            expected: vec![Token::Select, Token::Identifier("foo".to_owned())],
+        },
+        TestCase {
+            name: "백틱 안에 백틱 파싱".to_owned(),
+            input: r#"SELECT `foo``bar`"#.to_owned(),
+            want_error: false,
+            expected: vec![Token::Select, Token::Identifier("foo`bar".to_owned())],
+        },
+    ];
 
     for t in test_cases {
         let got = Tokenizer::string_to_tokens(t.input);

diff --git a/src/lexer/tokenizer.rs b/src/lexer/tokenizer.rs
@@ -80,9 +80,7 @@ impl Tokenizer {
 
     // 보관했던 문자 하나를 다시 버퍼에 돌려놓습니다.
     pub fn unread_char(&mut self) {
-        if self.buffer_index == 0 {
-            self.last_char = ' ';
-        } else {
+        if self.buffer_index != 0 {
             self.buffer_index -= 1;
             self.last_char = self.buffer[self.buffer_index];
         }
@@ -312,7 +310,7 @@ impl Tokenizer {
                 let identifier: String = identifier.into_iter().collect::<String>();
 
                 Token::Identifier(identifier)
-            } else if self.last_char == '\'' {
+            } else {
                 let mut string = vec![];
 
                 self.read_char();
@@ -338,8 +336,6 @@ impl Tokenizer {
                 let string: String = string.into_iter().collect::<String>();
 
                 Token::String(string)
-            } else {
-                Token::UnknownCharacter(self.last_char)
             }
         } else if self.is_backtick() {
             let mut string = vec![];