From 81ecb0e9009e4c319e568a6cbbe5bd14c637960a Mon Sep 17 00:00:00 2001
From: Roguelearg <lebasketteurdu76@hotmail.fr>
Date: Tue, 12 Sep 2017 15:13:01 +0200
Subject: [PATCH] Correct some operator in parser

---
 lib/parser.rb | 45 +++++++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/lib/parser.rb b/lib/parser.rb
index bf99e6a..c0730ce 100755
--- a/lib/parser.rb
+++ b/lib/parser.rb
@@ -3,24 +3,41 @@ module Mm2ep
     class And_op
       attr_reader :expr1, :expr2
       def initialize expr1, expr2
-        @expr1 = expr1
-        @expr2 = expr2
+        unless expr1.value.to_s.match(/true/).nil?
+          @expr1 = true
+        else
+          @expr1 = false
+        end
+        unless expr2.value.to_s.match(/true/).nil?
+          @expr2 = true
+        else
+          @expr2 = false
+        end
       end
 
       def and_op
-        return expr1 && expr2
+        binding.pry
+        return @expr1 && @expr2
       end
     end
 
     class Or_op
       attr_reader :expr1, :expr2
       def initialize expr1, expr2
-        @expr1 = expr1
-        @expr2 = expr2
+        unless expr1.value.to_s.match(/true/).nil?
+          @expr1 = true
+        else
+          @expr1 = false
+        end
+        unless expr2.value.to_s.match(/true/).nil?
+          @expr2 = true
+        else
+          @expr2 = false
+        end
       end
 
       def or_op
-        return expr1 || expr2
+        return @expr1 || @expr2
       end
     end
 
@@ -32,7 +49,7 @@ module Mm2ep
 
       def not_op
         # binding.pry
-        return true unless expr.value.to_s.eql? 'true'
+        return true unless @expr.value.to_s.eql? 'true'
         return false
       end
     end
@@ -40,19 +57,23 @@ module Mm2ep
     class Eq_op
       attr_reader :val, :other
       def initialize val, other
-        @val = val
-        @other = other
+        @val = val.value.to_s
+        if other.value.to_s.match(/true/).nil?
+          @other = true
+        else
+          @other = false
+        end
       end
 
       def eq_op
-        return val = other
+        return val = @other
       end
     end
 
     class Parser < Rly::Yacc
 
-      precedence :left,  'OR_OP', 'EQ_OP'
-      precedence :right,  'AND_OP', 'NOT_OP'
+      precedence :left, 'OR_OP', 'EQ_OP'
+      precedence :left, 'AND_OP', 'NOT_OP'
 
       rule 'statement : expr' do |st, e|
         st.value = e.value