Add some priority spec

lib/mm2ep_depend/parser.rb

@@ -20,7 +20,11 @@ module Mm2ep
     class VarValue < TreeValue
       def initialize(str, value)
         @name = str
-        @value = value
+        @value = case value
+                 when /true/i then true
+                 when /false/i then false
+                 else value
+                 end
       end
 
       def compute
@@ -62,7 +66,10 @@ module Mm2ep
 
     class BoolValue < TreeValue
       def initialize(str)
-        @value = str
+        @value = case str
+                 when /true/i then true
+                 when /false/i then false
+                 end
       end
 
       def compute
@@ -125,7 +132,7 @@ module Mm2ep
       end
 
       def compute
-        @lval.value.eql? @rval.value
+        @lval.value == @rval.value
       end
 
       def to_s

spec/files/priority_not_and.txt

@@ -0,0 +1 @@
+NOT false AND NOT false

spec/files/priority_not_or.txt

@@ -0,0 +1 @@
+NOT true OR NOT true

spec/files/priority_or_and.txt

@@ -0,0 +1 @@
+false OR true AND false

spec/files/priority_or_and_or.txt

@@ -0,0 +1 @@
+false OR false AND true OR true

spec/files/simple_expr_and_expr.txt

@@ -1 +1 @@
-truc_bidule and machin
+truc_bidule AND machin

spec/files/simple_expr_or_expr.txt

@@ -1 +1 @@
-truc_bidule or machin
+truc_bidule OR machin

spec/files/test2.txt

@@ -1 +0,0 @@
-NOT ( truc_bidule = true ) OR ( truc ) AND machin = false

spec/files/test3.txt

@@ -1 +0,0 @@
-NOT ( truc_bidule = true ) OR ( true ) AND machin = false

spec/files/test4.txt

@@ -1 +0,0 @@
-NOT true OR NOT false AND true OR false

spec/mm2ep_depend/priority_parser_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'mm2ep_depend'
+
+describe Mm2ep::Depend::Parser do
+
+  it 'has to do not before or' do
+    line = File.read(testfile('priority_not_or.txt')).delete("\n")
+    parser = Mm2ep::Depend::Parser.new(Mm2ep::Depend::Lexer.new)
+    token = parser.parse(line.chomp)
+    assert_equal(false, token.compute)
+  end
+
+  it 'has to do not before and' do
+    line = File.read(testfile('priority_not_and.txt')).delete("\n")
+    parser = Mm2ep::Depend::Parser.new(Mm2ep::Depend::Lexer.new)
+    token = parser.parse(line.chomp)
+    assert_equal(true, token.compute)
+  end
+
+  it 'has to do and before or' do
+    line = File.read(testfile('priority_or_and.txt')).delete("\n")
+    parser = Mm2ep::Depend::Parser.new(Mm2ep::Depend::Lexer.new)
+    token = parser.parse(line.chomp)
+    assert_equal(false, token.compute)
+  end
+
+  it 'has to do and before or operators' do
+    line = File.read(testfile('priority_or_and_or.txt')).delete("\n")
+    parser = Mm2ep::Depend::Parser.new(Mm2ep::Depend::Lexer.new)
+    token = parser.parse(line.chomp)
+    assert_equal(true, token.compute)
+  end
+
+end

spec/mm2ep_depend/simple_expr_parser_spec.rb

@@ -59,7 +59,7 @@ describe Mm2ep::Depend::Parser do
   end
 
   it 'has to evaluate true OR true and return true' do
-    line = File.read(testfile('simple_or_expr_string.txt')).delete("\n")
+    line = File.read(testfile('simple_expr_or_expr.txt')).delete("\n")
     parser = Mm2ep::Depend::Parser.new(Mm2ep::Depend::Lexer.new)
     parser.names={'truc_bidule' => 'true',
                   'machin' => 'true'