fix correction

Author: gharel

TP/JS1/content/JS1.js

@@ -46,7 +46,7 @@ function range(stop, start, step) {
   return res;
 }
 
-/* Exercice 3 : Calculatrice polonaise inverse */
+/* Exercice 4 : Calculatrice polonaise inverse */
 let evaluate = function (expr) {
   console.log("[js] evaluate (" + expr + ")");
   let results = [];

TP/JS1/demo.js

@@ -1,8 +1,8 @@
 // Exercice : objet avec une méthode : l'objet magique `this`
 
 o = {
-  x: "Romu",
-  y: 41,
+  x: "Guillaume",
+  y: 40,
   do: function () {
     console.log(this.x, this.y);
   },
@@ -41,6 +41,24 @@ iterate_array_while([1, 1, 2, 3, 5, 8]);
 console.log("Array.forEach");
 [1, 1, 2, 3, 5, 8].forEach(x => console.log(x))
 
+// Exercice 1 : 99 Bottles of Beer
+// ----------------------------
+
+function bottles(beers) {
+  console.log("[js] bottles (" + beers + ")");
+  let res = "";
+
+  const bottle = n => `${n || "No more"} bottle${n === 1 ? "" : "s"} of beer`;
+
+  for (let n = beers; n > 0; n--) {
+    res += `${bottle(n)} on the wall, ${bottle(n).toLowerCase()}.
+Take one down and pass it around, ${bottle(n - 1).toLowerCase()} on the wall.
+
+`;
+  }
+
+  return res.trim();
+}
 
 // Exercice 2 : fonction `range`
 // ----------------------------
@@ -78,3 +96,30 @@ function fibonacci_fa(n) {
 
 console.log(fibonacci_fa(8));
 
+// Exercice 4 : calculatrice polonaise inverse
+// ----------------------------
+
+let evaluate = function (expr) {
+  console.log("[js] evaluate (" + expr + ")");
+  let results = [];
+
+  const ops = {
+    "+": (a, b) => a + b,
+    "-": (a, b) => a - b,
+    "*": (a, b) => a * b,
+    "/": (a, b) => a / b,
+  };
+
+  expr.split(" ").forEach(item => {
+    let nb = parseFloat(item);
+
+    if (!isNaN(nb)) results.push(nb);
+    else {
+      let b = results.pop();
+      let a = results.pop();
+      results.push(ops[item](a, b));
+    }
+  });
+
+  return results.pop() || 0;
+};