Various little fixes

exe/mm2ep-depend

@@ -6,6 +6,7 @@ require 'thor'
 require 'rly'
 require 'pry'
 require 'mm2ep_depend'
+require 'pp'
 
 module Mm2ep
   module Depend
@@ -17,7 +18,7 @@ module Mm2ep
           parser = Parser.new(Lexer.new)
           puts line.inspect
           token = parser.parse(line.chomp, true)
-          puts token
+          pp token
           # puts false && true
           # puts false || false
           # binding.pry

lib/mm2ep_depend/parser.rb

@@ -40,7 +40,6 @@ module Mm2ep
     end 
 
     class AndOp < TreeExpr
-      attr_reader :expr1, :expr2
       def initialize expr1, expr2
           @expr1 = expr1 
           @expr2 = expr2
@@ -53,47 +52,34 @@ module Mm2ep
     end
 
     class OrOp
-      attr_reader :expr1, :expr2
       def initialize expr1, expr2
-        unless expr1.value.to_s.match(/true/).nil?
+          @expr1 = expr1 
-          @expr1 = true
+          @expr2 = expr2
-        else
-          @expr1 = false
-        end
-        unless expr2.value.to_s.match(/true/).nil?
-          @expr2 = true
-        else
-          @expr2 = false
-        end
       end
 
       def compute
-        return @expr1 || @expr2
+        return @expr1.compute || @expr2.compute
       end
     end
 
     class NotOp
-      attr_reader :expr
       def initialize expr
         @expr = expr
       end
 
       def compute
-        # binding.pry
+        return ! @expr.compute 
-        return true unless @expr.value.to_s.eql? 'true'
-        return false
       end
     end
 
     class EqOp
-      attr_reader :val, :other
+      def initialize lval, rval
-      def initialize var, value
+        @lval = lval 
-        @var = var 
+        @rval = rval
-        @value = value
       end
 
       def compute
-        return if @val.value == @other.value
+        return if @lval.value == @rval.value
       end
     end