twisty_puzzles 0.0.12 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78089ff494b1a687a567d483eb155e9891c69a991e8f4b045bf024e7365c58df
-  data.tar.gz: 820b61382a22d1c283f552ee637507dd9a511efa1d7f66656decd64f67304c8b
+  metadata.gz: 1477b8bdab0eb6f001734d952bb7923c96ded08d2810ad14fc6ada8cbf2976b1
+  data.tar.gz: 452de382df3a44d33ede47f7093e8c2204f56c26836b22e16633586e6e396ad9
 SHA512:
-  metadata.gz: 063d2c8607b7d7708d0dea3fa78eebe3a883135cf2e2a46e5db7d5e0b80f6d21dd084b7a554718b54d45866eeecddf784857eb247a4a1de4ac924b8293aedd50
-  data.tar.gz: 9dff522e48073f756d4aa0e2377ff754b8fbefe0caaf8fb830383e47d14be7bb354e55c1ef2355fca1259dc255002e732f5089bd9269727973e2979de6a9d6e2
+  metadata.gz: 8adbb4a4d7c3282e18a6c28b73184893aad54e97cf62e96945382a8305bd1638e22d5df3363bea3b0ce2e73d2162632175e836d0e231840964442fa80aab5253
+  data.tar.gz: 265ef1e6511c51099b41b8efeaf82b34468bb9bf9ff7e13b549d0adae1022359ec02607f667e53263feb47f076a6ee1538ee451fa831e80aadb564480449aa83

data/lib/twisty_puzzles/algorithm.rb

@@ -133,9 +133,12 @@ module TwistyPuzzles
 
     def *(other)
       raise TypeError unless other.is_a?(Integer)
-      raise ArgumentError if other.negative?
 
-      self.class.new(@moves * other)
+      if other.negative?
+        inverse * -other
+      else
+        self.class.new(@moves * other)
+      end
     end
 
     def compiled_for_skewb

data/lib/twisty_puzzles/commutator.rb

@@ -83,6 +83,21 @@ module TwistyPuzzles
     end
   end
 
+  # Slash commutator of the form A B A2 B' A.
+  class SlashCommutator < PureCommutator
+    def inverse
+      SlashCommutator.new(first_part.inverse, second_part)
+    end
+
+    def to_s
+      "[#{@first_part}/#{@second_part}]"
+    end
+
+    def algorithm
+      first_part + second_part + (first_part * 2) + second_part.inverse + first_part
+    end
+  end
+
   # Setup commutator of the form A B A'.
   class SetupCommutator < Commutator
     def initialize(setup, inner_commutator)

data/lib/twisty_puzzles/parser.rb

@@ -16,6 +16,12 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
     OPENING_PAREN = '('
     CLOSING_BRACKET = ']'
     CLOSING_PAREN = ')'
+    SLASH = '/'
+    COMMA = ','
+    SETUP_SEPARATORS = %w[; :].freeze
+    PURE_SEPARATORS = [SLASH, COMMA].freeze
+    SEPARATORS = (SETUP_SEPARATORS + PURE_SEPARATORS).freeze
+
     TIMES = '*'
 
     def initialize(alg_string, move_parser)
@@ -77,8 +83,8 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
     end
 
     # Parses at least one move.
-    def parse_nonempty_moves
-      moves = parse_moves
+    def parse_nonempty_moves_with_triggers
+      moves = parse_moves_with_triggers
       complain('move') if moves.empty?
       moves
     end
@@ -89,6 +95,8 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       while (m = begin skip_spaces; parse_move_internal end)
         moves.push(m)
       end
+      skip_spaces
+      moves *= parse_multiplier if @scanner.peek(1) == TIMES
       Algorithm.new(moves)
     end
 
@@ -117,10 +125,26 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       if @scanner.peek(1) == OPENING_BRACKET
         parse_commutator_internal
       else
-        FakeCommutator.new(parse_moves_with_triggers)
+        parse_commutator_no_brackets
       end
     end
 
+    def parse_commutator_no_brackets
+      setup_or_first_part_or_algorithm = parse_moves_with_triggers
+      skip_spaces
+      if @scanner.eos? || !SEPARATORS.include?(@scanner.peek(1))
+        return FakeCommutator.new(setup_or_first_part_or_algorithm)
+      end
+
+      setup_or_first_part = setup_or_first_part_or_algorithm
+      complain('move') if setup_or_first_part.empty?
+      separator = parse_separator
+      comm = parse_commutator_internal_after_separator(setup_or_first_part, separator)
+      skip_spaces
+      complain('end of commutator') unless @scanner.eos?
+      comm
+    end
+
     def parse_algorithm
       skip_spaces
       parse_moves_with_triggers
@@ -131,40 +155,77 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       if @scanner.peek(1) == OPENING_BRACKET
         parse_pure_commutator
       else
-        FakeCommutator.new(parse_moves_with_triggers)
+        parse_pure_commutator_no_brackets
       end
     end
 
     def parse_pure_commutator
       skip_spaces
       parse_open_bracket
-      first_part = parse_nonempty_moves
+      first_part = parse_nonempty_moves_with_triggers
       skip_spaces
-      complain('middle of pure commutator') unless @scanner.getch == ','
-      second_part = parse_nonempty_moves
+      separator = parse_pure_separator
+      second_part = parse_nonempty_moves_with_triggers
       skip_spaces
       parse_close_bracket
-      PureCommutator.new(first_part, second_part)
+      pseudo_pure_commutator(separator, first_part, second_part)
+    end
+
+    def parse_pure_commutator_no_brackets
+      first_part_or_algorithm = parse_moves_with_triggers
+      skip_spaces
+      if @scanner.eos? || !PURE_SEPARATORS.include?(@scanner.peek(1))
+        return FakeCommutator.new(first_part_or_algorithm)
+      end
+
+      first_part = first_part_or_algorithm
+      complain('move') if first_part.empty?
+      separator = parse_pure_separator
+      second_part = parse_nonempty_moves_with_triggers
+      skip_spaces
+      pseudo_pure_commutator(separator, first_part, second_part)
+    end
+
+    def parse_pure_separator
+      separator = @scanner.getch
+      complain('middle of pure commutator') unless PURE_SEPARATORS.include?(separator)
+      separator
     end
 
     def parse_commutator_internal_after_separator(setup_or_first_part, separator)
-      if [':', ';'].include?(separator)
+      if SETUP_SEPARATORS.include?(separator)
         inner_commutator = parse_setup_commutator_inner
         SetupCommutator.new(setup_or_first_part, inner_commutator)
-      elsif separator == ','
-        second_part = parse_nonempty_moves
-        PureCommutator.new(setup_or_first_part, second_part)
+      elsif PURE_SEPARATORS.include?(separator)
+        second_part = parse_nonempty_moves_with_triggers
+        pseudo_pure_commutator(separator, setup_or_first_part, second_part)
       else
         complain('end of setup or middle of pure commutator') unless @scanner.eos?
       end
     end
 
+    def pseudo_pure_commutator(separator, first_part, second_part)
+      if separator == COMMA
+        PureCommutator.new(first_part, second_part)
+      elsif separator == SLASH
+        SlashCommutator.new(first_part, second_part)
+      else
+        complain('middle of pure commutator') unless PURE_SEPARATORS.include?(separator)
+      end
+    end
+
+    def parse_separator
+      separator = @scanner.getch
+      complain('separator between commutator parts') unless SEPARATORS.include?(separator)
+      separator
+    end
+
     def parse_commutator_internal
       skip_spaces
       parse_open_bracket
-      setup_or_first_part = parse_nonempty_moves
+      setup_or_first_part = parse_nonempty_moves_with_triggers
       skip_spaces
-      separator = @scanner.getch
+      separator = parse_separator
       comm = parse_commutator_internal_after_separator(setup_or_first_part, separator)
       skip_spaces
       parse_close_bracket

data/lib/twisty_puzzles/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TwistyPuzzles
-  VERSION = '0.0.12'
+  VERSION = '0.0.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twisty_puzzles
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.16
 platform: ruby
 authors:
 - Bernhard F. Brodowsky