hilbert 0.0.2700320 → 0.0.2700400

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e087bccd022bed9dc89823afeeb86a298dcf2aad
-  data.tar.gz: 7879c3558a6d2f44ce2ac09c8f3bee9df656ee3c
+  metadata.gz: aaae59caf189918270514b0f61b45b2a6fd58205
+  data.tar.gz: accc47c0dba81a2cd05232171b1d30720c57e16f
 SHA512:
-  metadata.gz: f2fa68a1d6aab887c5c746c60273f23571ea539f32a82d15dc0c3484874728d0aabeac4e3d6b66d72f9117b5b8e5274250a86046a8cdddd8547340e4d08bc7bd
-  data.tar.gz: 41ccc9ffd79d860803743bb4ec8adff3acf97d9a782212e70b576e6b1128483c09dd969468e5fcafd4e186aed13eb7533f9a0b95d85a068146180bc5868e1a8f
+  metadata.gz: fff4fc11e9d6afefd44c05e5f10b28e6d150bd37427e7eaea3ab56175e1c06a4960c1ed8fd5d50c9489900728d0b29be672027fa73182b2b37c9c57e7de6dcab
+  data.tar.gz: b262a9666e12a6f86e05eaaaad9cf948695219f445502b2dbaf54ad74a29fe1c1cc7e0d206eacdbed229ffdcf280eee13acd9a12410fe43d11227707a58c53c5

data/lib/hilbert/lexer/main_lexer.rb

@@ -6,11 +6,11 @@ module Hilbert
       rule(/paradox\?/) { :P_PARAD }
       rule(/\A.*[A-RT-Z].*\?.*\z/m) { :EVALOGIC }
       rule(/\A.*[A-RT-Z].*\z/m) { :DEFLOGIC }
-      rule(/[ \t\f]/)
+      rule(/#{SPC}/)
 
-      rule(/(\r|\n)+/) { :NULL }
+      rule(/#{NLIN}+/) { :NULL }
 
-      rule(/[^\(\)\{\}(\n\n)]+/) { :CONT }
+      rule(/[^\(\)\{\}(\n\n)]+/) { :UNKNOW }
       class << self
         include Tokens
         def zfc_analysis!

data/lib/hilbert/lexer/tokens.rb

@@ -68,7 +68,7 @@ module Hilbert
       LSARW = '<-'
       RDARW = '=>'
       LDARW = '<='
-      SPC = / /
+      SPC = /[ \t\f\v]/
       SPCS = / +/
       NLIN = /(\r|\n)/
 

data/lib/hilbert/parser.rb

@@ -88,6 +88,8 @@ module Hilbert
 
         when /:CONT(\d+)/
           lexed.parsed!(lexed.get_value($1), $1)
+        when /:UNKNOW(\d+)/
+          raise "#{lexed.get_value($1)} can not be parsed ;("
         end
         lexed.squash!(($1.to_i)..($1.to_i+1)) if lexed.token_str =~ /:(?:CONT|R)(\d+):(?:CONT|R)(\d+)/
       end

data/lib/hilbert/version.rb

@@ -1,3 +1,3 @@
 module Hilbert
-  VERSION = '0.0.2700320'
+  VERSION = '0.0.2700400'
 end

data/lib/hilbert/world.rb

@@ -8,29 +8,25 @@ module Hilbert
       class << self
         def <<(logic_str)
           @@propositions << to_rb_obj(logic_str)
-          %|"Defined: #{logic_str} is TRUE"|
+          Messanger.define(logic_str)
         end
 
         def impl(logic_str)
           # HOTFIX: we need to ..
-          return eval_rslt(logic_str, 'UNDEFINED') if @@propositions.empty?
+          return Messanger.evaluate(logic_str, 'UNDEFINED') if @@propositions.empty?
+
           logic = (@@propositions.inject(:*) >= to_rb_obj(logic_str))
           str = logic.dpll!.to_s
           case str
-          when 'TRUE'
-            eval_rslt(logic_str, 'TRUE')
-          when 'FALSE'
-            eval_rslt(logic_str, 'FALSE')
+          when 'TRUE'  then Messanger.evaluate(logic_str, 'TRUE')
+          when 'FALSE' then Messanger.evaluate(logic_str, 'FALSE')
           else
             logic = (@@propositions.inject(:*) >= (~to_rb_obj(logic_str)))
             str = logic.dpll!.to_s
             case str
-            when 'TRUE'
-              eval_rslt(logic_str, 'FALSE')
-            when 'FALSE'
-              eval_rslt(logic_str, 'TRUE')
-            else
-              eval_rslt(logic_str, 'UNDEFINED')
+            when 'TRUE'  then Messanger.evaluate(logic_str, 'FALSE')
+            when 'FALSE' then Messanger.evaluate(logic_str, 'TRUE')
+            else              Messanger.evaluate(logic_str, 'UNDEFINED')
             end
           end
         end
@@ -47,13 +43,11 @@ module Hilbert
         end
 
         def paradox?
-          return %|"FALSE"| if @@propositions.empty?
-          str = (!!!!!!!(@@propositions.inject(:*) >= (atom(:P) * ~atom(:P)))).to_s
-          case str
-          when 'TRUE'
-            %|"TRUE"|
-          else
-            %|"FALSE"|
+          return Messanger.tell_false if @@propositions.empty?
+
+          case (!!!!!!!(@@propositions.inject(:*) >= (atom(:P) * ~atom(:P)))).to_s
+          when 'TRUE' then Messanger.tell_true
+          else             Messanger.tell_false
           end
         end
 
@@ -63,11 +57,26 @@ module Hilbert
           Parser::WorldParser.execute(lexeds)
           eval Parser::WorldParser.parsed_srt
         end
+      end
 
-        def eval_rslt(logic_str, rslt)
-          %|"Evaluate: #{logic_str} is #{rslt}"|
-        end
+      module Messanger
+        class << self
+          def define(logic_str)
+            %|"Defined: #{logic_str} is TRUE"|
+          end
 
+          def evaluate(logic_str, rslt)
+            %|"Evaluate: #{logic_str} is #{rslt}"|
+          end
+
+          def tell_true
+            %|"TRUE"|
+          end
+
+          def tell_false
+            %|"FALSE"|
+          end
+        end
       end
     end
   end

data/lib/hilbert.rb

@@ -31,5 +31,4 @@ module Hilbert
       end
     end
   end
-
 end

data/test/interpreter/test_general.rb

@@ -10,6 +10,9 @@ class TestGeneral < TestInterpreterBase
   end
 
   def test_general
+    assert_iq_equal('2', '1 + 1')
+    assert_iq_equal('3 / 2', '1 + 1/2')
+    assert_iq_equal('1', '1/2 + 1/2')
     assert_iq_equal('2x', '2x')
     assert_iq_equal('2x', 'x + x')
     # assert_iq_equal('xy', 'xy')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hilbert
 version: !ruby/object:Gem::Version
-  version: 0.0.2700320
+  version: 0.0.2700400
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dydx