exo6: add the basic operations code.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/exo6/Opadd.java b/exo6/Opadd.java
index 81b3bda9fa6f1f2c344a53a728eaa6d58ef46cca..d631090d24a86ff49e50d39089577d0e147e134d 100644 (file)
--- a/exo6/Opadd.java
+++ b/exo6/Opadd.java
@@ -1,4 +1,10 @@
 
 abstract class Opadd extends Expression {
+    protected Terme gauche;
+    protected Expression droite;
 
+    Opadd(Terme g, Expression d) {
+        gauche = g;
+        droite = d;
+    }
 }

diff --git a/exo6/Opdiv.java b/exo6/Opdiv.java
index 99a38838cbe463b7ef03c50c43b08c176c01aecb..0fe971828cba3ccc6cf59b6048d165344b65583e 100644 (file)
--- a/exo6/Opdiv.java
+++ b/exo6/Opdiv.java
@@ -1,7 +1,11 @@
 
 class Opdiv extends Opmul {
 
+    Opdiv(Facteur g,Terme d) {
+        super(g, d);
+    }
+
     public double evaluer() {
-        return 0.0;
+        return gauche.evaluer() / droite.evaluer();
     }
 }

diff --git a/exo6/Opminus.java b/exo6/Opminus.java
index d33cd17fb710c3a823cfb72ef8e5393820b228e3..9e5307adf175609aebbf6a70781e26eb7e2c6769 100644 (file)
--- a/exo6/Opminus.java
+++ b/exo6/Opminus.java
@@ -1,7 +1,11 @@
 
 class Opminus extends Opadd {
 
+    Opminus(Terme g, Expression d) {
+        super(g, d);
+    }
+
     public double evaluer() {
-        return 0.0;
+        return gauche.evaluer() - droite.evaluer();
     }
 }

diff --git a/exo6/Opmul.java b/exo6/Opmul.java
index 736b4ef9f1ee2c5c8a833765e2bc43b9d3053eda..2793babd44adfec2cf23ad5a50af1a320d09d983 100644 (file)
--- a/exo6/Opmul.java
+++ b/exo6/Opmul.java
@@ -1,4 +1,11 @@
 
 abstract class Opmul extends Terme {
+    protected Facteur gauche;
+    protected Terme droite;
+
+    Opmul(Facteur g, Terme d) {
+        gauche = g;
+        droite = d;
+    }
 
 }

diff --git a/exo6/Opmulti.java b/exo6/Opmulti.java
index 596015f42437b9ee325bae1c198d3dd28f8a0632..fdb93fd94a809de81043d1fba4ee771310f8264c 100644 (file)
--- a/exo6/Opmulti.java
+++ b/exo6/Opmulti.java
@@ -1,7 +1,11 @@
 
 class Opmulti extends Opmul {
 
+    Opmulti(Facteur g,Terme d) {
+        super(g, d);
+    }
+
     public double evaluer() {
-        return 0.0;
+        return gauche.evaluer() * droite.evaluer();
     }
 }

diff --git a/exo6/Opplus.java b/exo6/Opplus.java
index 0bd4bfa408a6c971c177e0264b3666fab6f6b54d..95b200b1c158056301f9a99315a46533899ef0e0 100644 (file)
--- a/exo6/Opplus.java
+++ b/exo6/Opplus.java
@@ -1,7 +1,11 @@
 
 class Opplus extends Opadd {
 
+    Opplus(Terme g, Expression d) {
+        super(g, d);
+    }
+
     public double evaluer() {
-        return 0.0;
+        return gauche.evaluer() + droite.evaluer();
     }
 }