twisty_puzzles 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f95cf6c568aab20bad9dd5d48222afd5261215984a5da7c2c18b9d3bdf315763
-  data.tar.gz: 713e3825d332a49805f4938b8bc2be924f3813d49e25e9997278966409bb73fe
+  metadata.gz: d5631e9c30819f3520d04ed81aa9b1ceebbee7a3da5c3b51bf2a81947f8fb3a1
+  data.tar.gz: fc4769b6c1ebab5d14cb64ddb3e39356a408750d1d0c7954d4929156296b9f9e
 SHA512:
-  metadata.gz: 2e0ba5a01642a11c57a1d83aeb6b22aa4de037fcbbd6a062a2aff29028f37260cd06a38e009fe5683949a65509a899acd925bbe3b58fdf1552760d5664631ade
-  data.tar.gz: 3b2d41b1b10065029813152e693f0c61c6b28557e1794d16dcb4d6c7b300fd7d0d6fa94b2b23de3e01041526ef03463a05a8854b1eec1be7cfaec7ef1943debb
+  metadata.gz: c941aaef4dbf2bc8d580d712d669042061c20670aadcf2ee353f353eae4eb31713de9d4791f6d8126e4427ef9e7125562e26b53c85f0a92e09bfe120e8f24f04
+  data.tar.gz: 5e943e567b069fd2b2e21c77fdc7a48ad3e81fb365832439cd1f402da838b5771bc7af4b2293bf635fa1b6de158ddfbea78f9981e690ce3e72a6149c6b042bd2

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)
@@ -156,11 +162,11 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       parse_open_bracket
       first_part = parse_nonempty_moves_with_triggers
       skip_spaces
-      parse_pure_separator
+      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
@@ -172,14 +178,16 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
 
       first_part = first_part_or_algorithm
       complain('move') if first_part.empty?
-      parse_pure_separator
+      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_pure_separator
-      complain('middle of pure commutator') unless PURE_SEPARATORS.include?(@scanner.getch)
+      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)
@@ -188,15 +196,21 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
         SetupCommutator.new(setup_or_first_part, inner_commutator)
       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
 
-    SETUP_SEPARATORS = %w[; :].freeze
-    PURE_SEPARATORS = %w[/ ,].freeze
-    SEPARATORS = (SETUP_SEPARATORS + PURE_SEPARATORS).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.14'
+  VERSION = '0.0.15'
 end

metadata

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