propose 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e51a21663914889a221fc855ab81d9b864e4f7c
-  data.tar.gz: c100032842cfb108b8181ca745767d428921aac4
+  metadata.gz: d85782cc245209ea1652fdfab739c34c4ef26722
+  data.tar.gz: 5b844f9c256d31e5afe1d0fb644908b59cba5df1
 SHA512:
-  metadata.gz: 0fa8554ec8b5b662c683cf8b8dafd9beecbd90a92ace372f3dd18308d9e21ce05013343288c0394ca32841bdbe0007400f7c0b1e1124e1895cc263207b4697fb
-  data.tar.gz: fd45c6fd818f0255ebae73f43c56feb70ea892b7a9e12fc12739d5604a7a3e7529b6abd5b8c506366b803a7cc3f4e681841fc2e3530c572d9d5689990c4cc576
+  metadata.gz: 57475acdf41eedf0797b0444d2a62f3ad6450327f7d1fdf71d197b246ef51901788b00ca6d97c79958d7f350034fe74a6e787f0735c553053e9e3cac64e0a88b
+  data.tar.gz: 47a6772312b2703530f8c6e921d03d3ae4bc824149287663e00d7de8475fa6e18a625d0bd2db6d1018318655a34a5dc7d55672eea6c65651a72399656a42eeb5

data/grammar/propositional_logic.treetop

@@ -0,0 +1,164 @@
+# Defines the grammar for propositional logic formulas.
+grammar PropositionalLogic
+  rule statement
+    sequent
+    /
+    formula
+  end
+
+  rule formula
+    implication
+    /
+    disjunction
+    /
+    conjunction
+    /
+    unit
+  end
+
+  rule not
+    _? ('not' _ / '!' / '¬') _?
+  end
+
+  rule conjunction
+    left:unit and right:(conjunction / unit) {
+      def to_ast
+        Propose::Tree::Conjunction.new(left.to_ast, right.to_ast)
+      end
+    }
+  end
+
+  rule and
+    _ 'and' _
+    /
+    _? ('∧' / '&') _?
+  end
+
+  rule disjunction
+    left:(conjunction / unit) or right:(disjunction / conjunction / unit) {
+      def to_ast
+        Propose::Tree::Disjunction.new(left.to_ast, right.to_ast)
+      end
+    }
+  end
+
+  rule or
+    _ 'or' _
+    /
+    _? ('∨' / '|') _?
+  end
+
+  rule implication
+    left:(disjunction / conjunction / unit) imply right:formula {
+      def to_ast
+        Propose::Tree::Implication.new(left.to_ast, right.to_ast)
+      end
+    }
+  end
+
+  rule imply
+    _? ('=>' / '->') _?
+    /
+    _ ('imply' / 'implies') _
+  end
+
+  rule unit
+    literal
+    /
+    bracketed_formula
+    /
+    not bracketed_formula {
+      def to_ast
+        Propose::Tree::Negation.new(bracketed_formula.to_ast)
+      end
+    }
+  end
+
+  rule bracketed_formula
+    '(' _? formula _? ')' {
+      def to_ast
+        formula.to_ast
+      end
+    }
+  end
+
+  rule literal
+    not atom {
+      def to_ast
+        Propose::Tree::Negation.new(atom.to_ast)
+      end
+    }
+    /
+    atom
+    /
+    verum
+    /
+    falsum
+  end
+
+  rule atom
+    !(not / proves) name:[a-z]+ {
+      def to_ast
+        Propose::Tree::Atom.new(name.text_value.to_sym)
+      end
+    }
+  end
+
+  rule verum
+    'T' {
+      def to_ast
+        Propose::Tree::Verum.instance
+      end
+    }
+  end
+
+  rule falsum
+    'F' {
+      def to_ast
+        Propose::Tree::Falsum.instance
+      end
+    }
+  end
+
+  rule sequent
+    premises:premise_list proves conclusion:formula {
+      def to_ast
+        Propose::Tree::Sequent.new(premises.to_a, conclusion.to_ast)
+      end
+    }
+    /
+    proves formula {
+      def to_ast
+        Propose::Tree::Sequent.new([], formula.to_ast)
+      end
+    }
+  end
+
+  rule proves
+    _? 'proves' _
+    /
+    _? ('⊢' / '|-') _?
+  end
+
+  rule premise_list
+    premise:formula comma list:premise_list {
+      def to_a
+        [premise.to_ast] + list.to_a
+      end
+    }
+    /
+    premise:formula {
+      def to_a
+        [premise.to_ast]
+      end
+    }
+  end
+
+  rule comma
+    _? ',' _?
+  end
+
+  rule _
+    [\s]+
+  end
+end

data/lib/propose/repl.rb

@@ -37,15 +37,20 @@ module Propose
 
     def print_truth_table(statement)
       tt = Propose::TruthTable.new(statement)
-
       atoms = tt.formula_atoms.to_a
+      table = create_table(statement, atoms, tt)
+
+      puts table.to_s
+                .gsub('T', 'T'.green)
+                .gsub('F', 'F'.red)
+                .gsub(table.title, table.title.cyan)
+    end
 
+    def create_table(statement, atoms, tt)
       table = Terminal::Table.new do |t|
         t << atoms + ['Result']
         t.add_separator
-        tt.evaluations.each do |assignment, result|
-          t << assignment.values.map { |v| shorthand_value(v) } + [shorthand_value(result)]
-        end
+        add_truth_table_rows(t, tt)
       end
 
       table.title = statement.to_s
@@ -54,10 +59,13 @@ module Propose
         table.align_column(i, :center)
       end
 
-      puts table.to_s
-                .gsub('T', 'T'.green)
-                .gsub('F', 'F'.red)
-                .gsub(table.title, table.title.cyan)
+      table
+    end
+
+    def add_truth_table_rows(table, truth_table)
+      truth_table.evaluations.map do |assignment, result|
+        table << assignment.values.map { |v| shorthand_value(v) } + [shorthand_value(result)]
+      end
     end
 
     def shorthand_value(value)

data/lib/propose/tree/binary_operation.rb

@@ -24,8 +24,7 @@ module Propose::Tree
     end
 
     def to_s
-      output = []
-      output << (left.literal? ? left.to_s : "(#{left})")
+      output = [(left.literal? ? left.to_s : "(#{left})")]
       output << " #{operator} "
       output << (right.literal? ? right.to_s : "(#{right})")
       output.join

data/lib/propose/version.rb

@@ -1,4 +1,4 @@
 # Specifies the gem version.
 module Propose
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propose
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.29.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.29.1
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Create, manipulate, and verify propositional logic sentences
 email: shane@dasilva.io
 executables:
@@ -102,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/propose
+- grammar/propositional_logic.treetop
 - lib/propose.rb
 - lib/propose/atom_finder.rb
 - lib/propose/parser.rb