jkf 0.4.2 → 0.5.0

data/lib/jkf/parser/kifuable.rb

@@ -6,75 +6,74 @@ module Jkf::Parser
     # initialboard : (" " nonls nl)? ("+" nonls nl)? ikkatsuline+ ("+" nonls nl)?
     def parse_initialboard
       s0 = s1 = @current_pos
-      if match_space != :failed
+      if match_space == :failed
+        @current_pos = s1
+      else
         parse_nonls
         s2 = parse_nl
         @current_pos = s1 if s2 == :failed
-      else
-        @current_pos = s1
       end
       s2 = @current_pos
-      if match_str("+") != :failed
+      if match_str("+") == :failed
+        @current_pos = s2
+      else
         parse_nonls
         @current_pos = s2 if parse_nl == :failed
-      else
-        @current_pos = s2
       end
       s4 = parse_ikkatsuline
-      if s4 != :failed
+      if s4 == :failed
+        s3 = :failed
+      else
         s3 = []
         while s4 != :failed
           s3 << s4
           s4 = parse_ikkatsuline
         end
-      else
-        s3 = :failed
       end
-      if s3 != :failed
+      if s3 == :failed
+        @current_pos = s0
+        :failed
+      else
         s4 = @current_pos
-        if match_str("+") != :failed
+        if match_str("+") == :failed
+          @current_pos = s4
+        else
           parse_nonls
           @current_pos = s4 if parse_nl == :failed
-        else
-          @current_pos = s4
         end
         @reported_pos = s0
         transform_initialboard(s3)
-      else
-        @current_pos = s0
-        :failed
       end
     end
 
     # ikkatsuline : "|" masu:masu+ "|" nonls! nl
     def parse_ikkatsuline
       s0 = @current_pos
-      if match_str("|") != :failed
+      if match_str("|") == :failed
+        @current_pos = s0
+        s0 = :failed
+      else
         s3 = parse_masu
-        if s3 != :failed
+        if s3 == :failed
+          s2 = :failed
+        else
           s2 = []
           while s3 != :failed
             s2 << s3
             s3 = parse_masu
           end
-        else
-          s2 = :failed
         end
-        if s2 != :failed
-          if match_str("|") != :failed
-            s4 = parse_nonls!
-            if s4 != :failed
-              if parse_nl != :failed
-                @reported_pos = s0
-                s0 = s2
-              else
-                @current_pos = s0
-                s0 = :failed
-              end
-            else
-              @current_pos = s0
-              s0 = :failed
-            end
+        if s2 == :failed
+          @current_pos = s0
+          s0 = :failed
+        elsif match_str("|") != :failed
+          s4 = parse_nonls!
+          if s4 == :failed
+            @current_pos = s0
+            s0 = :failed
+          elsif parse_nl != :failed
+            @reported_pos = s0
+            s0 = s2
           else
             @current_pos = s0
             s0 = :failed
@@ -83,9 +82,6 @@ module Jkf::Parser
           @current_pos = s0
           s0 = :failed
         end
-      else
-        @current_pos = s0
-        s0 = :failed
       end
 
       s0
@@ -95,18 +91,18 @@ module Jkf::Parser
     def parse_masu
       s0 = @current_pos
       s1 = parse_teban
-      if s1 != :failed
+      if s1 == :failed
+        @current_pos = s0
+        s0 = :failed
+      else
         s2 = parse_piece
-        if s2 != :failed
-          @reported_pos = s0
-          s0 = { "color" => s1, "kind" => s2 }
-        else
+        if s2 == :failed
           @current_pos = s0
           s0 = :failed
+        else
+          @reported_pos = s0
+          s0 = { "color" => s1, "kind" => s2 }
         end
-      else
-        @current_pos = s0
-        s0 = :failed
       end
       if s0 == :failed
         s0 = @current_pos
@@ -151,18 +147,18 @@ module Jkf::Parser
     def parse_pointer
       s0 = @current_pos
       s1 = match_str("&")
-      if s1 != :failed
+      if s1 == :failed
+        @current_pos = s0
+        s0 = :failed
+      else
         s2 = parse_nonls
         s3 = parse_nl
-        if s3 != :failed
-          s0 = [s1, s2, s3]
-        else
+        if s3 == :failed
           @current_pos = s0
           s0 = :failed
+        else
+          s0 = [s1, s2, s3]
         end
-      else
-        @current_pos = s0
-        s0 = :failed
       end
       s0
     end
@@ -195,12 +191,12 @@ module Jkf::Parser
       s1 = match_str("成")
       s1 = "" if s1 == :failed
       s2 = match_regexp(/^[歩香桂銀金角飛王玉と杏圭全馬竜龍]/)
-      if s2 != :failed
-        @reported_pos = s0
-        kind2csa(s1 + s2)
-      else
+      if s2 == :failed
         @current_pos = s0
         :failed
+      else
+        @reported_pos = s0
+        kind2csa(s1 + s2)
       end
     end
 
@@ -211,63 +207,60 @@ module Jkf::Parser
     #          ) nl
     def parse_result
       s0 = @current_pos
-      if match_str("まで") != :failed
+      if match_str("まで") == :failed
+        @current_pos = s0
+        :failed
+      else
         s2 = match_digits!
-        if s2 != :failed
-          if match_str("手") != :failed
-            s4 = @current_pos
-            if match_str("で") != :failed
-              if parse_turn != :failed
-                if match_str("手の") != :failed
-                  s8 = parse_result_toryo
-                  s8 = parse_result_illegal if s8 == :failed
-                  s4 = if s8 != :failed
-                         @reported_pos = s4
-                         s8
-                       else
-                         @current_pos = s4
-                         :failed
-                       end
-                else
-                  @current_pos = s4
-                  s4 = :failed
-                end
-              else
-                @current_pos = s4
-                s4 = :failed
-              end
-            else
+        if s2 == :failed
+          @current_pos = s0
+          :failed
+        elsif match_str("手") != :failed
+          s4 = @current_pos
+          if match_str("で") == :failed
+            @current_pos = s4
+            s4 = :failed
+          elsif parse_turn != :failed
+            if match_str("手の") == :failed
               @current_pos = s4
               s4 = :failed
+            else
+              s8 = parse_result_toryo
+              s8 = parse_result_illegal if s8 == :failed
+              s4 = if s8 == :failed
+                     @current_pos = s4
+                     :failed
+                   else
+                     @reported_pos = s4
+                     s8
+                   end
             end
+          else
+            @current_pos = s4
+            s4 = :failed
+          end
+          if s4 == :failed
+            s4 = parse_result_timeup
             if s4 == :failed
-              s4 = parse_result_timeup
+              s4 = parse_result_chudan
               if s4 == :failed
-                s4 = parse_result_chudan
+                s4 = parse_result_jishogi
                 if s4 == :failed
-                  s4 = parse_result_jishogi
+                  s4 = parse_result_sennichite
                   if s4 == :failed
-                    s4 = parse_result_sennichite
-                    if s4 == :failed
-                      s4 = parse_result_tsumi
-                      s4 = parse_result_fuzumi if s4 == :failed
-                    end
+                    s4 = parse_result_tsumi
+                    s4 = parse_result_fuzumi if s4 == :failed
                   end
                 end
               end
             end
-            if s4 != :failed
-              if parse_nl != :failed || eos?
-                @reported_pos = s0
-                s4
-              else
-                @current_pos = s0
-                :failed
-              end
-            else
-              @current_pos = s0
-              :failed
-            end
+          end
+          if s4 == :failed
+            @current_pos = s0
+            :failed
+          elsif parse_nl != :failed || eos?
+            @reported_pos = s0
+            s4
           else
             @current_pos = s0
             :failed
@@ -276,9 +269,6 @@ module Jkf::Parser
           @current_pos = s0
           :failed
         end
-      else
-        @current_pos = s0
-        :failed
       end
     end
 
@@ -286,19 +276,22 @@ module Jkf::Parser
     def parse_result_toryo
       s0 = @current_pos
       s1 = match_str("勝ち")
-      if s1 != :failed
-        @reported_pos = s0
-        "TORYO"
-      else
+      if s1 == :failed
         @current_pos = s0
         :failed
+      else
+        @reported_pos = s0
+        "TORYO"
       end
     end
 
     # result_illegal : "反則" ("勝ち" | "負け")
     def parse_result_illegal
       s0 = @current_pos
-      if match_str("反則") != :failed
+      if match_str("反則") == :failed
+        @current_pos = s0
+        :failed
+      else
         s10 = @current_pos
         s11 = match_str("勝ち")
         if s11 != :failed
@@ -315,34 +308,29 @@ module Jkf::Parser
           end
           s10 = s11
         end
-        if s10 != :failed
-          @reported_pos = s0
-          s10
-        else
+        if s10 == :failed
           @current_pos = s0
           :failed
+        else
+          @reported_pos = s0
+          s10
         end
-      else
-        @current_pos = s0
-        :failed
       end
     end
 
     # result_timeup : "で時間切れにより" turn "手の勝ち"
     def parse_result_timeup
       s0 = @current_pos
-      if match_str("で時間切れにより") != :failed
-        if parse_turn != :failed
-          if match_str("手の勝ち") != :failed
-            @reported_pos = s0
-            "TIME_UP"
-          else
-            @current_pos = s0
-            :failed
-          end
-        else
+      if match_str("で時間切れにより") == :failed
+        @current_pos = s0
+        :failed
+      elsif parse_turn != :failed
+        if match_str("手の勝ち") == :failed
           @current_pos = s0
           :failed
+        else
+          @reported_pos = s0
+          "TIME_UP"
         end
       else
         @current_pos = s0
@@ -354,12 +342,12 @@ module Jkf::Parser
     def parse_result_chudan
       s0 = @current_pos
       s1 = match_str("で中断")
-      if s1 != :failed
-        @reported_pos = s0
-        "CHUDAN"
-      else
+      if s1 == :failed
         @current_pos = s0
         :failed
+      else
+        @reported_pos = s0
+        "CHUDAN"
       end
     end
 
@@ -367,12 +355,12 @@ module Jkf::Parser
     def parse_result_jishogi
       s0 = @current_pos
       s1 = match_str("で持将棋")
-      if s1 != :failed
-        @reported_pos = s0
-        "JISHOGI"
-      else
+      if s1 == :failed
         @current_pos = s0
         :failed
+      else
+        @reported_pos = s0
+        "JISHOGI"
       end
     end
 
@@ -380,12 +368,12 @@ module Jkf::Parser
     def parse_result_sennichite
       s0 = @current_pos
       s1 = match_str("で千日手")
-      if s1 != :failed
-        @reported_pos = s0
-        "SENNICHITE"
-      else
+      if s1 == :failed
         @current_pos = s0
         :failed
+      else
+        @reported_pos = s0
+        "SENNICHITE"
       end
     end
 
@@ -393,13 +381,13 @@ module Jkf::Parser
     def parse_result_tsumi
       s0 = @current_pos
       match_str("で")
-      if match_str("詰") != :failed
+      if match_str("詰") == :failed
+        @current_pos = s0
+        :failed
+      else
         match_str("み")
         @reported_pos = s0
         "TSUMI"
-      else
-        @current_pos = s0
-        :failed
       end
     end
 
@@ -407,12 +395,12 @@ module Jkf::Parser
     def parse_result_fuzumi
       s0 = @current_pos
       s1 = match_str("で不詰")
-      if s1 != :failed
-        @reported_pos = s0
-        "FUZUMI"
-      else
+      if s1 == :failed
         @current_pos = s0
         :failed
+      else
+        @reported_pos = s0
+        "FUZUMI"
       end
     end
 
@@ -420,18 +408,18 @@ module Jkf::Parser
     def parse_skipline
       s0 = @current_pos
       s1 = match_str("#")
-      if s1 != :failed
+      if s1 == :failed
+        @current_pos = s0
+        s0 = :failed
+      else
         s2 = parse_nonls
         s3 = parse_newline
-        s0 = if s3 != :failed
-               [s1, s2, s3]
-             else
+        s0 = if s3 == :failed
                @current_pos = s0
                :failed
+             else
+               [s1, s2, s3]
              end
-      else
-        @current_pos = s0
-        s0 = :failed
       end
       s0
     end
@@ -454,20 +442,20 @@ module Jkf::Parser
       if s2 == :failed
         s2 = @current_pos
         s3 = match_str("\r")
-        s2 = if s3 != :failed
+        s2 = if s3 == :failed
+               @current_pos = s2
+               :failed
+             else
                s4 = match_str("\n")
                s4 = nil if s4 == :failed
                [s3, s4]
-             else
-               @current_pos = s2
-               :failed
              end
       end
-      if s2 != :failed
-        [s1, s2]
-      else
+      if s2 == :failed
         @current_pos = s0
         :failed
+      else
+        [s1, s2]
       end
     end
 
@@ -475,16 +463,19 @@ module Jkf::Parser
     def parse_nl
       s0 = @current_pos
       s2 = parse_newline
-      if s2 != :failed
+      if s2 == :failed
+        s1 = :failed
+      else
         s1 = []
         while s2 != :failed
           s1 << s2
           s2 = parse_newline
         end
-      else
-        s1 = :failed
       end
-      if s1 != :failed
+      if s1 == :failed
+        @current_pos = s0
+        :failed
+      else
         s2 = []
         s3 = parse_skipline
         while s3 != :failed
@@ -492,9 +483,6 @@ module Jkf::Parser
           s3 = parse_skipline
         end
         [s1, s2]
-      else
-        @current_pos = s0
-        :failed
       end
     end
 

data/lib/jkf/version.rb

@@ -1,4 +1,4 @@
 module Jkf
   # Gem version
-  VERSION = "0.4.2".freeze
+  VERSION = "0.5.0".freeze
 end

data/manifest.scm

@@ -0,0 +1,142 @@
+(use-modules ((guix licenses)
+              #:prefix license:)
+             (gnu packages ruby)
+             (guix build-system ruby)
+             (guix download)
+             (guix git)
+             (guix packages)
+             (guix git-download))
+
+(define-public ruby-guard-rubocop
+  (package
+    (name "ruby-guard-rubocop")
+    (version "1.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "guard-rubocop" version))
+              (sha256
+               (base32
+                "0lb2fgfac97lvgwqvx2gbcimyvw2a0i76x6yabik3vmmvjbdfh9h"))))
+    (build-system ruby-build-system)
+    (arguments
+     `(#:tests? #f)) ;TODO
+    (propagated-inputs (list ruby-guard ruby-rubocop))
+    (synopsis
+     "Automatically checks Ruby code style with RuboCop when files are
+modified")
+    (description
+     "@code{Guard::RuboCop} automatically checks Ruby code style with
+RuboCop when files are modified.")
+    (home-page "https://github.com/rubocop/guard-rubocop")
+    (license license:expat)))
+
+(define-public ruby-guard-compat
+  (package
+    (name "ruby-guard-compat")
+    (version "1.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "guard-compat" version))
+              (sha256
+               (base32
+                "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis"))))
+    (build-system ruby-build-system)
+    (arguments
+     `(#:test-target "spec"))
+    (native-inputs (list ruby-rspec ruby-rubocop))
+    (synopsis "Helps creating valid Guard plugins and testing them")
+    (description "guard-compat helps creating valid Guard plugins and testing them.")
+    (home-page "https://github.com/guard/guard-compat")
+    (license license:expat)))
+
+(define-public ruby-ruby-dep
+  (package
+    (name "ruby-ruby-dep")
+    (version "1.5.0")
+    (source (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/e2/ruby_dep")
+                   (commit "4e79416a55dff4b3ff50e73c8fbd0455de1e68b7")))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32
+               "0vv2bm4lghh5pl8zi0ihp6hpbp7xlk8d5h888nhxr725in0ypy9x"))))
+    (build-system ruby-build-system)
+    (arguments
+     `(#:test-target "spec"
+       #:tests? #f ;FIXME: needs gem_isolator, but cyclic dependencies
+       ))
+    (native-inputs (list ruby-rspec))
+    (synopsis
+     "Creates a version constraint of supported Rubies, suitable for a
+gemspec file")
+    (description
+     "This package creates a version constraint of supported Rubies,
+suitable for a gemspec file.")
+    (home-page "https://github.com/e2/ruby_dep")
+    (license license:expat)))
+
+(define-public ruby-gem-isolator
+  (package
+    (name "ruby-gem-isolator")
+    (version "0.2.3")
+    (source (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/e2/gem_isolator")
+                   (commit "1ec35362d946e682089a3983e7063593231d5188")))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32
+               "1kkg7y2lw2jpdcdw33f2pvz9q14rlnx29l3a2qcwc5smivd03kww"))))
+    (build-system ruby-build-system)
+    (arguments
+     `(#:test-target "spec"
+       #:tests? #f ;FIXME: uninitialized constant Pathname
+       ))
+    (native-inputs (list ruby-rspec ruby-nenv ruby-rubocop))
+    (propagated-inputs (list ruby-ruby-dep))
+    (synopsis
+     "Good for testing dependencies of a gem and/or different gem version
+combinations")
+    (description
+     "gem_isolator is good for testing dependencies of a gem and/or
+different gem version combinations.")
+    (home-page "https://github.com/e2/gem_isolator")
+    (license license:expat)))
+
+(define-public ruby-guard-rspec
+  (package
+    (name "ruby-guard-rspec")
+    (version "4.7.3")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "guard-rspec" version))
+              (sha256
+               (base32
+                "1jkm5xp90gm4c5s51pmf92i9hc10gslwwic6mvk72g0yplya0yx4"))))
+    (build-system ruby-build-system)
+    (arguments
+     `(#:test-target "spec"
+       #:tests? #f ;FIXME: uninitialized constant Bundler
+       ))
+    (native-inputs (list ruby-rubocop ruby-launchy ruby-gem-isolator bundler ruby))
+    (propagated-inputs (list ruby-guard ruby-guard-compat ruby-rspec))
+    (synopsis "Automatically run your specs (much like autotest)")
+    (description
+     "@code{Guard::RSpec} automatically run your specs (much like autotest).")
+    (home-page "https://github.com/guard/guard-rspec")
+    (license license:expat)))
+
+(packages->manifest (list ruby-rake
+                          ruby-yard
+                          ruby-redcarpet
+                          ruby-rubocop
+                          ruby-guard-rubocop
+                          ruby-rubocop-rake
+                          ruby-rubocop-rspec
+                          ruby-rspec
+                          ruby-guard-rspec
+                          ruby-simplecov
+                          ruby))