Merge pull request #1 from josueJURE/dividing-by-zero-2.0

Dividing by zero 2.0

Author: josueJURE

index.js

@@ -73,32 +73,42 @@ btns.forEach((btn) => {
       canUserAddDot();
     }
 
-    // This is the = fuction
+ 
     if (buttonValue === "=") {
       try {
         const replacedArray = data.map((item) => (item === "x" ? "*" : item === "÷" ? "/" : item));
-        let result = eval(replacedArray .join(""));
-        console.log(eval(replacedArray .join("")));
-        displayResult(replacedArray, result);
-        zeroDivedByZero(screen, result)
-        divideByZero(screen, result);
-        data = [];
-        data.push(result)
+        // Check if the expression involves 0/0
+        if (hasZeroDividedByZero(replacedArray)) {
+          screen.innerText = "Invalid format used. You cannot divide by zero";
+        } else {
+          let result = eval(replacedArray.join(""));
+          console.log(result);
+          displayResult(replacedArray, result);
+          divideByZero(screen, result);
+          data = [];
+          data.push(result);
+        }
       } catch (e) {
         screen.innerText = `${e.name} press AC`;
       }
     }
+ 
 
     function divideByZero(display, outcome) {
       outcome === Infinity
         ? (display.innerText = "Math Error. Cannot divide by zero")
         : (display.innerText = outcome);
     }
-    function zeroDivedByZero(display, outcome) {
-      Number.isNaN(outcome)
-      ? (display.innerText = "0÷0 is an nvalid format press AC" )
-      : (display.innerText = outcome)
+
+    function hasZeroDividedByZero(array) {
+      for (let i = 0; i < array.length - 2; i++) {
+        if (array[i] === "0" && array[i + 1] === "/" && array[i + 2] === "0") {
+          return true;
+        }
+      }
+      return false;
     }
+   
     function displayResult(array, outcome) {
       array = [];
       array.push(outcome);