twisty_puzzles 0.0.13 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20cf60d5066716b3eaa148e33f1e8c598387573170e1005d034f3128e6b971cb
-  data.tar.gz: 2770afd2a3a625f281089401c2a2ef47a6c61843d09026e9d999ee79139fe54e
+  metadata.gz: 440643127a42de2937ef3e1b0205f588a7d8624102dcf2596b3ff24050bf57ef
+  data.tar.gz: 8ef01a9cd10f729ed5bbb0f34a36fe75b5fcff2d8c9ee6cc64d4b7faa72e44a1
 SHA512:
-  metadata.gz: 2bdf4691d6efea522b259510bcdb405820784870566948d47b653c91e2d8ca495d9946e17f0d9f703ee234bf0758b3a59969dc52e4f91eafa94659c624ac3930
-  data.tar.gz: b28d42481604cbec6b748b025a3293eed64e2c7a90b0e6186c6eadeed63352f81b562e835f54bf6b4fbc9905bf047c917b269896c5504628c7d9c7352c1b70ec
+  metadata.gz: d247081d421f4b422293dc286e794cda52c04c9cb543d7ac62de8441f94117cbc028ecf7cff0a9c8100e57f1f7f87cfff0dfcfa8932e0fc60b7aa9409fd8d5df
+  data.tar.gz: ff1043f40ba14d3993268b4768ddfc3e8ffc7e84830c21f106a7a64d7b55a774c1120ef880e71feba101ba0f4c48b8ec920711c25a187f93b3412c27bb096002

data/lib/twisty_puzzles/abstract_direction.rb

@@ -4,7 +4,7 @@ module TwistyPuzzles
   # Base class for directions.
   class AbstractDirection
     include Comparable
-    POSSIBLE_DIRECTION_NAMES = [[''], ['2', '2\''], ['\'', '3']].freeze
+    POSSIBLE_DIRECTION_NAMES = [[''], ['2', '2\''], ['\'', '3', '’']].freeze
     SIMPLE_DIRECTION_NAMES = (['0'] + POSSIBLE_DIRECTION_NAMES.map(&:first)).freeze
     POSSIBLE_SKEWB_DIRECTION_NAMES = [['', '2\''], ['\'', '2']].freeze
     SIMPLE_SKEWB_DIRECTION_NAMES = (['0'] + POSSIBLE_SKEWB_DIRECTION_NAMES.map(&:first)).freeze

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)
@@ -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
 
@@ -156,45 +164,55 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       parse_open_bracket
       first_part = parse_nonempty_moves_with_triggers
       skip_spaces
-      parse_comma
+      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? || !@scanner.peek(1) == ','
+      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?
-      parse_comma
+      separator = parse_pure_separator
       second_part = parse_nonempty_moves_with_triggers
       skip_spaces
-      PureCommutator.new(first_part, second_part)
+      pseudo_pure_commutator(separator, first_part, second_part)
     end
 
-    def parse_comma
-      complain('middle of pure commutator') unless @scanner.getch == ','
+    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 == ','
+      elsif PURE_SEPARATORS.include?(separator)
         second_part = parse_nonempty_moves_with_triggers
-        PureCommutator.new(setup_or_first_part, second_part)
+        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
 
-    SEPARATORS = %w[; : ,].freeze
+    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

data/lib/twisty_puzzles/version.rb

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

metadata

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