refactor: use switch (true) {} pattern

exuanbo · Dec 11, 2023 · a4ed504 · a4ed504
1 parent ee38719
commit a4ed504
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/__tests__/features/assembler/parser.test.ts b/__tests__/features/assembler/parser.test.ts
@@ -265,9 +265,9 @@ end
   describe('when parsing move instruction', () => {
     it('should throw OperandTypeError if second operand is of wrong type', () => {
       expect(() => {
-        parse('mov al, "bl"')
+        parse('mov al, bll')
       }).toThrowErrorMatchingInlineSnapshot(
-        `"Expected number, address or register address, got '\\"bl\\"'."`,
+        `"Expected number, address or register address, got 'bll'."`,
       )
 
       expect(() => {

diff --git a/src/features/assembler/core/parser.ts b/src/features/assembler/core/parser.ts
@@ -213,12 +213,14 @@ const parseSingleOperand =
         }
         break
       case TokenType.Unknown:
-        if (isExpectedType((t = OperandType.Number))) {
-          if (NUMBER_REGEXP.test(token.value)) {
-            return createOperand(t, validateNumber(token))
-          }
-        } else if (isExpectedType((t = OperandType.Label))) {
-          return createOperand(t, validateLabel(token))
+        switch (true) {
+          case isExpectedType((t = OperandType.Number)):
+            if (NUMBER_REGEXP.test(token.value)) {
+              return createOperand(t, validateNumber(token))
+            }
+            break
+          case isExpectedType((t = OperandType.Label)):
+            return createOperand(t, validateLabel(token))
         }
         break
     }

diff --git a/src/features/controller/core/index.ts b/src/features/controller/core/index.ts
@@ -191,10 +191,13 @@ export class Controller {
   }
 
   private stepFrom = (lastStepResult: StepResult | null): void => {
-    if (applySelector(selectEditorInput) !== applySelector(selectAssembledSource)) {
-      store.dispatch(setEditorMessage(sourceChangedMessage))
-    } else if (applySelector(selectEditorMessage) === sourceChangedMessage) {
-      store.dispatch(clearEditorMessage())
+    switch (true) {
+      case applySelector(selectEditorInput) !== applySelector(selectAssembledSource):
+        store.dispatch(setEditorMessage(sourceChangedMessage))
+        break
+      case applySelector(selectEditorMessage) === sourceChangedMessage:
+        store.dispatch(clearEditorMessage())
+        break
     }
     const { fault, halted } = applySelector(selectCpuStatus)
     if (fault !== null || halted) {

diff --git a/src/features/cpu/core/index.ts b/src/features/cpu/core/index.ts
@@ -246,10 +246,13 @@ export const step = (lastStepResult: StepResult, inputSignals: InputSignals): St
         flags |= StatusRegisterFlag.Overflow
       }
       const result = __result > 0xff ? __result % 0x100 : unsign8(__result)
-      if (result === 0) {
-        flags |= StatusRegisterFlag.Zero
-      } else if (result >= 0x80) {
-        flags |= StatusRegisterFlag.Sign
+      switch (true) {
+        case result === 0:
+          flags |= StatusRegisterFlag.Zero
+          break
+        case result >= 0x80:
+          flags |= StatusRegisterFlag.Sign
+          break
       }
       const interruptFlag = __cpuRegisters.sr & StatusRegisterFlag.Interrupt
       setSr(flags | interruptFlag)