Merge pull request #33 from quephird/add_modulus_operator

Add modulus operator
quephird · Mar 25, 2024 · 3ad7b51 · 3ad7b51
2 parents 4982e24 + 54acfc4
commit 3ad7b51
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 3 deletions.
diff --git a/slox/Interpreter.swift b/slox/Interpreter.swift
@@ -395,6 +395,8 @@ class Interpreter {
                 return .int(leftNumber * rightNumber)
             case .slash:
                 return .int(leftNumber / rightNumber)
+            case .modulus:
+                return .int(leftNumber % rightNumber)
             case .greater:
                 return .boolean(leftNumber > rightNumber)
             case .greaterEqual:

diff --git a/slox/Parser.swift b/slox/Parser.swift
@@ -404,7 +404,7 @@ struct Parser {
     //    equality       → comparison ( ( "!=" | "==" ) comparison )* ;
     //    comparison     → term ( ( ">" | ">=" | "<" | "<=" ) term )* ;
     //    term           → factor ( ( "-" | "+" ) factor )* ;
-    //    factor         → unary ( ( "/" | "*" ) unary )* ;
+    //    factor         → unary ( ( "/" | "*" | "%" ) unary )* ;
     //    unary          → ( "!" | "-" ) unary
     //                   | postfix ;
     //    postfix        → primary ( "(" arguments? ")" | "." IDENTIFIER | "[" logicOr "]" )* ;
@@ -503,7 +503,7 @@ struct Parser {
     mutating private func parseFactor() throws -> Expression {
         var expr = try parseUnary()
 
-        while currentTokenMatchesAny(types: [.slash, .star]) {
+        while currentTokenMatchesAny(types: [.slash, .star, .modulus]) {
             let oper = previousToken
             let rightExpr = try parseUnary()
             expr = .binary(expr, oper, rightExpr)

diff --git a/slox/Scanner.swift b/slox/Scanner.swift
@@ -82,6 +82,8 @@ struct Scanner {
             handleSingleCharacterLexeme(type: .semicolon)
         case "*":
             handleSingleCharacterLexeme(type: .star)
+        case "%":
+            handleSingleCharacterLexeme(type: .modulus)
         case "/":
             handleSlash()
 

diff --git a/slox/TokenType.swift b/slox/TokenType.swift
@@ -20,6 +20,7 @@ enum TokenType: Equatable {
     case star
     case leftBracket
     case rightBracket
+    case modulus
 
     // One of two character tokens
     case bang

diff --git a/sloxTests/InterpreterTests.swift b/sloxTests/InterpreterTests.swift
@@ -74,6 +74,14 @@ final class InterpreterTests: XCTestCase {
         XCTAssertEqual(actual, expected)
     }
 
+    func testInterpretBinaryExpressionInvolvingModulusOperator() throws {
+        let input = "8 % 3"
+        let interpreter = Interpreter()
+        let actual = try interpreter.interpretRepl(source: input)!
+        let expected: LoxValue = .int(2)
+        XCTAssertEqual(actual, expected)
+    }
+
     func testInterpretStringlyBinaryExpression() throws {
         let input = "\"forty\" + \"-two\""
         let interpreter = Interpreter()

diff --git a/sloxTests/ParserTests.swift b/sloxTests/ParserTests.swift
@@ -158,6 +158,27 @@ final class ParserTests: XCTestCase {
         XCTAssertEqual(actual, expected)
     }
 
+    func testParseFactorExpressionWithModulusOperator() throws {
+        let tokens: [Token] = [
+            Token(type: .int, lexeme: "5", line: 1),
+            Token(type: .modulus, lexeme: "%", line: 1),
+            Token(type: .int, lexeme: "3", line: 1),
+            Token(type: .semicolon, lexeme: ";", line: 1),
+            Token(type: .eof, lexeme: "", line: 1),
+        ]
+        var parser = Parser(tokens: tokens)
+
+        let actual = try parser.parse()
+        let expected: [Statement] = [
+            .expression(
+                .binary(
+                    .literal(.int(5)),
+                    Token(type: .modulus, lexeme: "%", line: 1),
+                    .literal(.int(3))))
+        ]
+        XCTAssertEqual(actual, expected)
+    }
+
     func testParseTermExpression() throws {
         let tokens: [Token] = [
             Token(type: .string, lexeme: "\"forty-\"", line: 1),

diff --git a/sloxTests/ScannerTests.swift b/sloxTests/ScannerTests.swift
@@ -9,7 +9,7 @@ import XCTest
 
 final class ScannerTests: XCTestCase {
     func testScanningOfOneCharacterLexemes() throws {
-        let source = "( ) { } [ ] , . - + ; *"
+        let source = "( ) { } [ ] , . - + ; * %"
         var scanner = Scanner(source: source)
         let actual = try! scanner.scanTokens()
         let expected: [Token] = [
@@ -25,6 +25,7 @@ final class ScannerTests: XCTestCase {
             Token(type: .plus, lexeme: "+", line: 1),
             Token(type: .semicolon, lexeme: ";", line: 1),
             Token(type: .star, lexeme: "*", line: 1),
+            Token(type: .modulus, lexeme: "%", line: 1),
             Token(type: .eof, lexeme: "", line: 1),
         ]