logic 0.1.0 → 0.1.1

data/lib/logic_operations.rb

@@ -2,8 +2,13 @@ require 'array'
 require 'test_case_set'
 require 'truth_table'
 
-module LogicStatement
+class Treetop::Runtime::SyntaxNode
+  def condition_identifiers
+    []
+  end
+end
 
+module Decision
   def test_cases
     @test_cases ||= TestCaseSet.new(condition_identifiers, self)
   end
@@ -15,12 +20,10 @@ module LogicStatement
   def mcdc_pairs
     test_cases.mcdc_pairs
   end
-
 end
 
 module Condition
-
-  include LogicStatement
+  include Decision
   
   def condition_identifiers
     [text_value]
@@ -29,12 +32,10 @@ module Condition
   def evaluate(conditions)
     conditions.shift
   end
-
 end
 
-module Decision
-
-  include LogicStatement
+module BinaryDecision
+  include Decision
   
   def condition_identifiers
     elements.map(&:condition_identifiers).flatten
@@ -45,27 +46,44 @@ module Decision
     right = operand_2.evaluate(conditions)
     operator.apply(left, right)
   end
+end
+
+module Negation
+  include Decision
+  
+  def condition_identifiers
+    operand.condition_identifiers
+  end
 
+  def evaluate(conditions)
+    negate(operand.evaluate(conditions))
+  end
+
+  def negate(value)
+    1 ^ value
+  end
 end
 
 module Parenthesized
-
-  include LogicStatement
+  include Decision
 
   def condition_identifiers
-    binary_condition.condition_identifiers
+    contents.condition_identifiers
   end
 
   def evaluate(conditions)
-    binary_condition.evaluate(conditions)
+    contents.evaluate(conditions)
   end
-  
 end
 
-module NonCondition
-  
-  def condition_identifiers
-    []
+module And
+  def apply(a, b)
+    a & b
   end
+end
 
+module Or
+  def apply(a, b)
+    a | b
+  end
 end

data/lib/logic_parser.treetop

@@ -1,51 +1,39 @@
 grammar Logic
 
   rule decision
-    binary_condition / condition
+    binary_decision / unary_decision
   end
 
-  rule binary_condition
-    operand_1:condition S operator S operand_2:decision <Decision>  
+  rule binary_decision
+    operand_1:unary_decision space 
+    operator space 
+    operand_2:decision <BinaryDecision>
   end
 
-  rule condition
-    parenthesized / variable
+  rule unary_decision
+    negation / condition / parenthesized
+  end
+
+  rule negation
+    'not' space operand:unary_decision <Negation>
   end
 
-  rule variable
+  rule condition
     [A-Za-z]+ <Condition>
   end
 
   rule parenthesized
-    '(' binary_condition ')' <Parenthesized>
+    '(' contents:decision ')' <Parenthesized>
   end
 
   rule operator
-    ( and / or ) <NonCondition>
-  end
-
-  rule and
-    'and' {
-      def apply(a, b)
-        a & b
-      end
-    }
-  end
-
-  rule or
-    'or' {
-      def apply(a, b)
-        a | b
-      end
-    }
+    'and' <And>
+    / 
+    'or' <Or>
   end
 
-  rule s # Optional space
-    S?
-  end
- 
-  rule S # Mandatory space
-    [ \t\n\r]+ <NonCondition>
+  rule space
+    [ \t\n\r]+
   end
  
 end

data/spec/logic_parser_spec.rb

@@ -56,6 +56,14 @@ describe LogicParser, :parsing do
     { [0] => 0,
       [1] => 1
     },
+    '(Hello)' =>
+    { [0] => 0,
+      [1] => 1
+    },
+    'not Hello' =>
+    { [0] => 1,
+      [1] => 0
+    },
     'A or B' =>
     { [0, 0] => 0,
       [0, 1] => 1,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bryan Ash
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -04:00
+date: 2010-05-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency