Add Inc/Dec operator, Compound Assginment Operator

    Increment,      // ++
    Decrement,      // --
    PlusAssign,     // +=
    MinusAssign,    // -=
    AsteriskAssign, // *=
    SlashAssign,    // /=

Author: tape4

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       - name: fmt check
         run: cargo fmt -- --check
       - name: lint
-        run: cargo clippy -- -D warnings
+        run: cargo clippy
       - name: build
         run: cargo build --verbose
       - name: run tests

src/lexer/lexer.rs

@@ -87,10 +87,53 @@ impl Lexer {
     pub fn next_token(&mut self) -> Token {
         self.skip_trivia();
         let tok = match self.ch {
-            Some('+') => Token::Plus,
-            Some('-') => Token::Minus,
-            Some('*') => Token::Asterisk,
-            Some('/') => Token::Slash,
+            Some('+') => {
+                // ++
+                if self.peek_char() == Some('+') {
+                    self.read_char();
+                    Token::Increment
+                // +=
+                } else if self.peek_char() == Some('=') {
+                    self.read_char();
+                    Token::PlusAssign
+                // +
+                } else {
+                    Token::Plus
+                }
+            }
+
+            Some('-') => {
+                // --
+                if self.peek_char() == Some('-') {
+                    self.read_char();
+                    Token::Decrement
+                // -=
+                } else if self.peek_char() == Some('=') {
+                    self.read_char();
+                    Token::MinusAssign
+                // -
+                } else {
+                    Token::Minus
+                }
+            }
+
+            Some('*') => {
+                if self.peek_char() == Some('=') {
+                    self.read_char();
+                    Token::AsteriskAssign
+                } else {
+                    Token::Asterisk
+                }
+            }
+
+            Some('/') => {
+                if self.peek_char() == Some('=') {
+                    self.read_char();
+                    Token::SlashAssign
+                } else {
+                    Token::Slash
+                }
+            }
             Some('%') => Token::Percent,
 
             Some('=') => {

src/lexer/token.rs

@@ -65,10 +65,14 @@ pub enum Token {
     // Types
     Int,
     Char,
-    // Increment,      // ++
-    // Decrement,      // --
-    // PlusAssign,     // +=
-    // MinusAssign,    // -=
+
+
+    Increment,      // ++
+    Decrement,      // --
+    PlusAssign,     // +=
+    MinusAssign,    // -=
+    AsteriskAssign, // *=
+    SlashAssign,    // /=
 }
 
 /// Lookup identifier keyword

tests/fixtures/sample.c

@@ -4,8 +4,8 @@ int add(int a, int b) {
 
 int factorial(int n) {
     int result = 1;
-//    for (int i = 1; i <= n; ++i) {
-//        result *= i;
+    for (int i = 1; i <= n; ++i) {
+        result *= i;
     }
     return result;
 }
@@ -28,16 +28,17 @@ int main() {
     char ch3 = '\0';
     char buf[5] = {'h','e','l','l','o'};  // 고정 크기 배열
     int arr2[3];
-//    for (int i = 0; i < 3; i++) {
+    for (int i = 0; i < 3; i++) {
         arr2[i] = i * 2;
     }
 
     // 포인터 산술 및 복합 할당, 증감 연산
-//    *p += 10;
-//    x -= 5;
-//    x++;
-//    ++x;
-//    --x;
+    *p += 10;
+    x -= 5;
+    x++;
+    ++x;
+    --x;
+    x--;
 
     // 논리 연산자, 비교 연산자
     if (x > 10 && x < 100) {
@@ -55,13 +56,13 @@ int main() {
     int count = 0;
     while (count < 5) {
         if (count == 2) {
-//            count++;
+            count++;
             continue;
         }
         if (count == 4) {
             break;
         }
-//        count += 1;
+        count += 1;
     }
 
     return 0;

tests/lexer_c_fixture_test.rs

@@ -46,9 +46,28 @@ fn test_sample_c_tokens() {
     assert_eq!(next_token(), Token::IntLiteral(1));
     assert_eq!(next_token(), Token::Semicolon);
 
-    // todo
     //    for (int i = 1; i <= n; ++i) {
+    assert_eq!(next_token(), Token::For);
+    assert_eq!(next_token(), Token::LParen);
+    assert_eq!(next_token(), Token::Int);
+    assert_eq!(next_token(), Token::Ident("i".into()));
+    assert_eq!(next_token(), Token::Assign);
+    assert_eq!(next_token(), Token::IntLiteral(1));
+    assert_eq!(next_token(), Token::Semicolon);
+    assert_eq!(next_token(), Token::Ident("i".into()));
+    assert_eq!(next_token(), Token::Le);
+    assert_eq!(next_token(), Token::Ident("n".into()));
+    assert_eq!(next_token(), Token::Semicolon);
+    assert_eq!(next_token(), Token::Increment);
+    assert_eq!(next_token(), Token::Ident("i".into()));
+    assert_eq!(next_token(), Token::RParen);
+    assert_eq!(next_token(), Token::LBrace);
+
     //        result *= i;
+    assert_eq!(next_token(), Token::Ident("result".into()));
+    assert_eq!(next_token(), Token::AsteriskAssign);
+    assert_eq!(next_token(), Token::Ident("i".into()));
+    assert_eq!(next_token(), Token::Semicolon);
 
     // }
     assert_eq!(next_token(), Token::RBrace);
@@ -184,23 +203,22 @@ fn test_sample_c_tokens() {
     assert_eq!(next_token(), Token::RBracket);
     assert_eq!(next_token(), Token::Semicolon);
 
-    // todo
     //     for (int i = 0; i < 3; i++) {
-    // assert_eq!(next_token(), Token::For);
-    // assert_eq!(next_token(), Token::LParen);
-    // assert_eq!(next_token(), Token::Int);
-    // assert_eq!(next_token(), Token::Ident("i".into()));
-    // assert_eq!(next_token(), Token::Assign);
-    // assert_eq!(next_token(), Token::IntLiteral(0));
-    // assert_eq!(next_token(), Token::Semicolon);
-    // assert_eq!(next_token(), Token::Ident("i".into()));
-    // assert_eq!(next_token(), Token::Lt);
-    // assert_eq!(next_token(), Token::IntLiteral(3));
-    // assert_eq!(next_token(), Token::Semicolon);
-    // assert_eq!(next_token(), Token::Ident("i".into()));
-    // assert_eq!(next_token(), Token::PlusPlus);
-    // assert_eq!(next_token(), Token::RParen);
-    // assert_eq!(next_token(), Token::LBrace);
+    assert_eq!(next_token(), Token::For);
+    assert_eq!(next_token(), Token::LParen);
+    assert_eq!(next_token(), Token::Int);
+    assert_eq!(next_token(), Token::Ident("i".into()));
+    assert_eq!(next_token(), Token::Assign);
+    assert_eq!(next_token(), Token::IntLiteral(0));
+    assert_eq!(next_token(), Token::Semicolon);
+    assert_eq!(next_token(), Token::Ident("i".into()));
+    assert_eq!(next_token(), Token::Lt);
+    assert_eq!(next_token(), Token::IntLiteral(3));
+    assert_eq!(next_token(), Token::Semicolon);
+    assert_eq!(next_token(), Token::Ident("i".into()));
+    assert_eq!(next_token(), Token::Increment);
+    assert_eq!(next_token(), Token::RParen);
+    assert_eq!(next_token(), Token::LBrace);
 
     //         arr2[i] = i * 2;
     assert_eq!(next_token(), Token::Ident("arr2".into()));
@@ -216,12 +234,35 @@ fn test_sample_c_tokens() {
     //     }
     assert_eq!(next_token(), Token::RBrace);
 
-    // todo
     //    *p += 10;
+    assert_eq!(next_token(), Token::Asterisk);
+    assert_eq!(next_token(), Token::Ident("p".into()));
+    assert_eq!(next_token(), Token::PlusAssign);
+    assert_eq!(next_token(), Token::IntLiteral(10));
+    assert_eq!(next_token(), Token::Semicolon);
+
     //    x -= 5;
+    assert_eq!(next_token(), Token::Ident("x".into()));
+    assert_eq!(next_token(), Token::MinusAssign);
+    assert_eq!(next_token(), Token::IntLiteral(5));
+    assert_eq!(next_token(), Token::Semicolon);
+
     //    x++;
+    assert_eq!(next_token(), Token::Ident("x".into()));
+    assert_eq!(next_token(), Token::Increment);
+    assert_eq!(next_token(), Token::Semicolon);
     //    ++x;
+    assert_eq!(next_token(), Token::Increment);
+    assert_eq!(next_token(), Token::Ident("x".into()));
+    assert_eq!(next_token(), Token::Semicolon);
     //    --x;
+    assert_eq!(next_token(), Token::Decrement);
+    assert_eq!(next_token(), Token::Ident("x".into()));
+    assert_eq!(next_token(), Token::Semicolon);
+    //    x--
+    assert_eq!(next_token(), Token::Ident("x".into()));
+    assert_eq!(next_token(), Token::Decrement);
+    assert_eq!(next_token(), Token::Semicolon);
 
     //     if (x > 10 && x < 100) {
     assert_eq!(next_token(), Token::If);
@@ -318,11 +359,10 @@ fn test_sample_c_tokens() {
     assert_eq!(next_token(), Token::RParen);
     assert_eq!(next_token(), Token::LBrace);
 
-    // todo
-    //             count++;
-    // assert_eq!(next_token(), Token::Ident("count".into()));
-    // assert_eq!(next_token(), Token::PlusPlus);
-    // assert_eq!(next_token(), Token::Semicolon);
+    // count++;
+    assert_eq!(next_token(), Token::Ident("count".into()));
+    assert_eq!(next_token(), Token::Increment);
+    assert_eq!(next_token(), Token::Semicolon);
 
     //             continue;
     assert_eq!(next_token(), Token::Continue);
@@ -345,8 +385,11 @@ fn test_sample_c_tokens() {
 
     assert_eq!(next_token(), Token::RBrace);
 
-    // todo
     //        count += 1;
+    assert_eq!(next_token(), Token::Ident("count".into()));
+    assert_eq!(next_token(), Token::PlusAssign);
+    assert_eq!(next_token(), Token::IntLiteral(1));
+    assert_eq!(next_token(), Token::Semicolon);
 
     //         }
     assert_eq!(next_token(), Token::RBrace);