logic 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc59412e7a4c95a2104f101dbe57fd5b9aacc6250ac885b8e64f58f139852bad
-  data.tar.gz: 8a97b64638e50d50ee0fd36827afb60e2771cfbf84e61765e435d2e7ac2f8918
+  metadata.gz: f481073e7764c17e89d4b3dc6c815a4f80a6c5bbe1127e7c1eb6aed715a772cf
+  data.tar.gz: d376cb1038e3d591a8f08f7f729cac2cb63212bf253b42923391e594dc1b6f8a
 SHA512:
-  metadata.gz: 185427c28647b5124e6efd34ce2c114ccba5d5e881a411afcb5458ed6c39b5d1addedc816a99414bdfd64df6d4f2f5df9c473a621f4cedb3489a528096f2e244
-  data.tar.gz: 18a97e43de0ea689fdb053e8e455f2db7b629fe868d26a8a8940b689bb6ff0ad8dd88e62992efd897f4248e34ebd82fb0bab2d28b46c2d0d4ae9a69281e62659
+  metadata.gz: 9e5151ce6d38b0b049d8b10fe0daa4aaf35d8e10e8dd138239c64f76ede097fd80f724c9fd69c54a4cd628f4484465903fe2164c83555ef650ef4f7b7a999591
+  data.tar.gz: 155670f39c0a88e89fc7be17ac12338f984c89a4aede20af26d4587bd744967a4f18090c939ac3a30e2a3576bc35695c1a077844ed3799c747cdf8e8b3416d04

data/README.md

@@ -0,0 +1,53 @@
+# logic
+
+Parses logic expressions to produce a truth table and MC/DC cases.
+
+## Installation
+
+    gem install logic
+
+## Usage
+
+By default, you get a truth table and a list of MC/DC pairs:
+
+  logic '(apple or bongo) and (cat or dog)'
+
+Gives you:
+
+    a <= apple
+    b <= bongo
+    c <= cat
+    d <= dog
+
+         a b c d | output
+      1) 0 0 0 0 |   0
+      2) 0 0 0 1 |   0
+      3) 0 0 1 0 |   0
+      4) 0 0 1 1 |   0
+      5) 0 1 0 0 |   0
+      6) 0 1 0 1 |   1
+      7) 0 1 1 0 |   1
+      8) 0 1 1 1 |   1
+      9) 1 0 0 0 |   0
+     10) 1 0 0 1 |   1
+     11) 1 0 1 0 |   1
+     12) 1 0 1 1 |   1
+     13) 1 1 0 0 |   0
+     14) 1 1 0 1 |   1
+     15) 1 1 1 0 |   1
+     16) 1 1 1 1 |   1
+
+    a => [[2, 10], [3, 11], [4, 12]]
+    b => [[2, 6], [3, 7], [4, 8]]
+    c => [[5, 7], [9, 11], [13, 15]]
+    d => [[5, 6], [9, 10], [13, 14]]
+
+## Options
+
+    -l, --[no-]truth_table           Show the truth table for the decision
+    -m, --[no-]mcdc_pairs            Show MC/DC test case pairs
+
+
+## Operators
+
+The syntax understands: `and`, `&&`, `or`, `||`, `xor`, `^`, `not`, `!`, and parenthesis.

data/lib/logic_parser.treetop

@@ -8,21 +8,21 @@ grammar Logic
   end
 
   rule and_tail
-    (operator:and operand:primitive)* <Tail>
+    (operator:and_operator operand:primitive)* <Tail>
   end
 
   rule or_tail
-    (operator:or operand:conjunction)* <Tail>
+    (operator:or_operator operand:conjunction)* <Tail>
   end
 
-  rule and
-    (space 'and' space / space? '&&' space?) <And>
+  rule and_operator
+    (space and space / space? '&&' space?) <And>
   end
 
-  rule or
-    (space 'or' space / space? '||' space?) <Or>
+  rule or_operator
+    (space or space / space? '||' space?) <Or>
     /
-    (space 'xor' space / space? '^' space?) <Xor>
+    (space xor space / space? '^' space?) <Xor>
   end
 
   rule primitive
@@ -41,6 +41,18 @@ grammar Logic
     '(' space? contents:disjunction space? ')' <Parenthesized>
   end
 
+  rule and
+    [aA] [nN] [dD]
+  end
+
+  rule or
+    [oO] [rR]
+  end
+
+  rule xor
+    [xX] [oO] [rR]
+  end
+
   rule space
     [ \t\n\r]+
   end

data/spec/logic_parser_spec.rb

@@ -68,6 +68,12 @@ describe LogicParser, :parsing do
       [1, 0] => 1,
       [1, 1] => 1
     },
+    'A OR B' =>
+    { [0, 0] => 0,
+      [0, 1] => 1,
+      [1, 0] => 1,
+      [1, 1] => 1
+    },
     'A || B' =>
     { [0, 0] => 0,
       [0, 1] => 1,
@@ -104,6 +110,12 @@ describe LogicParser, :parsing do
       [1, 0] => 0,
       [1, 1] => 1
     },
+    'A AND B' =>
+    { [0, 0] => 0,
+      [0, 1] => 0,
+      [1, 0] => 0,
+      [1, 1] => 1
+    },
     'A && B' =>
     { [0, 0] => 0,
       [0, 1] => 0,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Bryan Ash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -59,10 +59,10 @@ executables:
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.rdoc
+- README.md
 files:
 - LICENSE
-- README.rdoc
+- README.md
 - bin/logic
 - lib/integer.rb
 - lib/logic_operations.rb

data/README.rdoc

@@ -1,49 +0,0 @@
-= logic
-
-== Installation
-
-  gem install logic
-
-== Usage
-
-By default, you get a truth table and a list of MC/DC pairs:
-
-  logic '(apple or bongo) and (cat or dog)'
-
-Gives you:
-
-a <= apple
-b <= bongo
-c <= cat
-d <= dog
-
-      a b c d | output
-   1) 0 0 0 0 |   0
-   2) 0 0 0 1 |   0
-   3) 0 0 1 0 |   0
-   4) 0 0 1 1 |   0
-   5) 0 1 0 0 |   0
-   6) 0 1 0 1 |   1
-   7) 0 1 1 0 |   1
-   8) 0 1 1 1 |   1
-   9) 1 0 0 0 |   0
-  10) 1 0 0 1 |   1
-  11) 1 0 1 0 |   1
-  12) 1 0 1 1 |   1
-  13) 1 1 0 0 |   0
-  14) 1 1 0 1 |   1
-  15) 1 1 1 0 |   1
-  16) 1 1 1 1 |   1
-
-  a => [[2, 10], [3, 11], [4, 12]]
-  b => [[2, 6], [3, 7], [4, 8]]
-  c => [[5, 7], [9, 11], [13, 15]]
-  d => [[5, 6], [9, 10], [13, 14]]
-
-== Operators
-
-The syntax understands: 'and', '&&', 'or', '||', 'xor', '^', 'not', '!', and parenthesis.
-
-== Copyright
-
-Copyright (c) 2019 Bryan Ash. See LICENSE for details.