reversi 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb57c511c13a037077ba6d8f0ab1caa8cd8cc577
-  data.tar.gz: ba9e86d039af5cf0b84131abc34b840391a870cb
+  metadata.gz: 097177f5c48836f3fd8a77fed3861784aac94da5
+  data.tar.gz: 7d9d9f9558e2c244a90c714b85b0a92193ded4b1
 SHA512:
-  metadata.gz: c8750708addcd46a68728174747d20dd86190b121bcb49860e9a157aaf7c70e9403c1723f1901ff45e90fa020c0b9f42b0cf2db8f23bdccf043a41daf01cb061
-  data.tar.gz: c5173b9bead22a20bf952fc0f79c7e15b54b9572821d4bd3a331bebc5d52d33c3b01248ae06a6e77f348249daccfcf81bcfc2118ac36a7600f3e204e993f4d14
+  metadata.gz: a3bc92b431d249ec5c8ed2f533f6aec338de44a5393abb2e8f4595bf1437554b96df26086819556664fed75d3fabcd845141b9edd7282c025e313010d6a583ff
+  data.tar.gz: d82e22537236e447c7fa416428db7d1dd6a3b3aaed52c35eb47c3c1e5b03df7a2bf658832018c5741b99f960905fdf3d11cc1735920f9a741e8226626d381dd0

data/ext/reversi/bit_board_functions.c

@@ -3,14 +3,14 @@
 /*
  * Convert coordinate data to a bitboard.
  */
-unsigned long XY2BB(int x, int y) {
-  return (unsigned long)1 << ((8-x) + (8-y) * 8);
+uint64_t XY2BB(int x, int y) {
+  return (uint64_t)1 << ((8-x) + (8-y) * 8);
 }
 
 /*
  * Convert a bitboard to coordinate data.
  */
-VALUE BB2XY(unsigned long bb) {
+VALUE BB2XY(uint64_t bb) {
   VALUE xy = rb_ary_new();
 
   switch(bb) {
@@ -92,7 +92,7 @@ VALUE BB2XY(unsigned long bb) {
 /*
  * Rotate a bitboard by 90 degrees to the right.
  */
-unsigned long rotate_r90(unsigned long bb) {
+uint64_t rotate_r90(uint64_t bb) {
   bb = ((bb <<  8) & 0xAA00AA00AA00AA00) |
        ((bb >>  8) & 0x0055005500550055) |
        ((bb <<  1) & 0x00AA00AA00AA00AA) |
@@ -111,7 +111,7 @@ unsigned long rotate_r90(unsigned long bb) {
 /*
  * Rotate a bitboard by 90 degrees to the left.
  */
-unsigned long rotate_l90(unsigned long bb) {
+uint64_t rotate_l90(uint64_t bb) {
   bb = ((bb <<  1) & 0xAA00AA00AA00AA00) |
        ((bb >>  1) & 0x0055005500550055) |
        ((bb >>  8) & 0x00AA00AA00AA00AA) |
@@ -130,7 +130,7 @@ unsigned long rotate_l90(unsigned long bb) {
 /*
  * Rotate a bitboard by 45 degrees to the right.
  */
-unsigned long rotate_r45(unsigned long bb) {
+uint64_t rotate_r45(uint64_t bb) {
   bb = (bb & 0x0101010101010101) |
        (((bb <<  8) | (bb >> 56)) & 0x0202020202020202) |
        (((bb << 16) | (bb >> 48)) & 0x0404040404040404) |
@@ -145,7 +145,7 @@ unsigned long rotate_r45(unsigned long bb) {
 /*
  * Rotate a bitboard by 45 degrees to the left.
  */
-unsigned long rotate_l45(unsigned long bb) {
+uint64_t rotate_l45(uint64_t bb) {
   bb = (bb & 0x0101010101010101) |
        (((bb >>  8) | (bb << 56)) & 0x0202020202020202) |
        (((bb >> 16) | (bb << 48)) & 0x0404040404040404) |
@@ -157,31 +157,31 @@ unsigned long rotate_l45(unsigned long bb) {
   return bb;
 }
 
-unsigned long horizontal_pat(unsigned long my, unsigned long op, unsigned long p) {
+uint64_t horizontal_pat(uint64_t my, uint64_t op, uint64_t p) {
   op &= 0x7E7E7E7E7E7E7E7E;
   return right_pat(my, op, p) | left_pat(my, op, p);
 }
 
-unsigned long vertical_pat(unsigned long my, unsigned long op, unsigned long p) {
+uint64_t vertical_pat(uint64_t my, uint64_t op, uint64_t p) {
   my = rotate_r90(my);
   op = rotate_r90(op & 0x00FFFFFFFFFFFF00);
   p  = rotate_r90(p);
   return rotate_l90(right_pat(my, op, p) | left_pat(my, op, p));
 }
 
-unsigned long diagonal_pat(unsigned long my, unsigned long op, unsigned long p) {
-  unsigned long my_r45 = rotate_r45(my);
-  unsigned long op_r45 = rotate_r45(op & 0x007E7E7E7E7E7E00);
-  unsigned long p_r45  = rotate_r45(p);
-  unsigned long my_l45 = rotate_l45(my);
-  unsigned long op_l45 = rotate_l45(op & 0x00FF7E7E7E7E7E00);
-  unsigned long p_l45  = rotate_l45(p);
+uint64_t diagonal_pat(uint64_t my, uint64_t op, uint64_t p) {
+  uint64_t my_r45 = rotate_r45(my);
+  uint64_t op_r45 = rotate_r45(op & 0x007E7E7E7E7E7E00);
+  uint64_t p_r45  = rotate_r45(p);
+  uint64_t my_l45 = rotate_l45(my);
+  uint64_t op_l45 = rotate_l45(op & 0x00FF7E7E7E7E7E00);
+  uint64_t p_l45  = rotate_l45(p);
   return rotate_l45(right_pat(my_r45, op_r45, p_r45) | left_pat(my_r45, op_r45, p_r45)) |
          rotate_r45(right_pat(my_l45, op_l45, p_l45) | left_pat(my_l45, op_l45, p_l45));
 }
 
-unsigned long right_pat(unsigned long my, unsigned long op, unsigned long p) {
-  unsigned long rev =  (p >> 1) & op;
+uint64_t right_pat(uint64_t my, uint64_t op, uint64_t p) {
+  uint64_t rev =  (p >> 1) & op;
   rev |= (rev >> 1) & op;
   rev |= (rev >> 1) & op;
   rev |= (rev >> 1) & op;
@@ -190,8 +190,8 @@ unsigned long right_pat(unsigned long my, unsigned long op, unsigned long p) {
   return ((rev >> 1) & my) == 0 ? 0 : rev;
 }
 
-unsigned long left_pat(unsigned long my, unsigned long op, unsigned long p) {
-  unsigned long rev =  (p << 1) & op;
+uint64_t left_pat(uint64_t my, uint64_t op, uint64_t p) {
+  uint64_t rev =  (p << 1) & op;
   rev |= (rev << 1) & op;
   rev |= (rev << 1) & op;
   rev |= (rev << 1) & op;
@@ -200,31 +200,31 @@ unsigned long left_pat(unsigned long my, unsigned long op, unsigned long p) {
   return ((rev << 1) & my) == 0 ? 0 : rev;
 }
 
-unsigned long horizontal_pos(unsigned long my, unsigned long op, unsigned long blank) {
+uint64_t horizontal_pos(uint64_t my, uint64_t op, uint64_t blank) {
   op &= 0x7E7E7E7E7E7E7E7E;
   return right_pos(my, op, blank) | left_pos(my, op, blank);
 }
 
-unsigned long vertical_pos(unsigned long my, unsigned long op, unsigned long blank) {
+uint64_t vertical_pos(uint64_t my, uint64_t op, uint64_t blank) {
   my    = rotate_r90(my);
   op    = rotate_r90(op & 0x00FFFFFFFFFFFF00);
   blank = rotate_r90(blank);
   return rotate_l90(right_pos(my, op, blank) | left_pos(my, op, blank));
 }
 
-unsigned long diagonal_pos(unsigned long my, unsigned long op, unsigned long blank) {
-  unsigned long my_r45    = rotate_r45(my);
-  unsigned long op_r45    = rotate_r45(op & 0x007E7E7E7E7E7E00);
-  unsigned long blank_r45 = rotate_r45(blank);
-  unsigned long my_l45    = rotate_l45(my);
-  unsigned long op_l45    = rotate_l45(op & 0x007E7E7E7E7E7E00);
-  unsigned long blank_l45 = rotate_l45(blank);
+uint64_t diagonal_pos(uint64_t my, uint64_t op, uint64_t blank) {
+  uint64_t my_r45    = rotate_r45(my);
+  uint64_t op_r45    = rotate_r45(op & 0x007E7E7E7E7E7E00);
+  uint64_t blank_r45 = rotate_r45(blank);
+  uint64_t my_l45    = rotate_l45(my);
+  uint64_t op_l45    = rotate_l45(op & 0x007E7E7E7E7E7E00);
+  uint64_t blank_l45 = rotate_l45(blank);
   return rotate_l45(right_pos(my_r45, op_r45, blank_r45) | left_pos(my_r45, op_r45, blank_r45)) |
          rotate_r45(right_pos(my_l45, op_l45, blank_l45) | left_pos(my_l45, op_l45, blank_l45));
 }
 
-unsigned long right_pos(unsigned long my, unsigned long op, unsigned long blank) {
-  unsigned long rev =  (my  << 1) & op;
+uint64_t right_pos(uint64_t my, uint64_t op, uint64_t blank) {
+  uint64_t rev =  (my  << 1) & op;
   rev |= (rev << 1) & op;
   rev |= (rev << 1) & op;
   rev |= (rev << 1) & op;
@@ -233,8 +233,8 @@ unsigned long right_pos(unsigned long my, unsigned long op, unsigned long blank)
   return (rev << 1) & blank;
 }
 
-unsigned long left_pos(unsigned long my, unsigned long op, unsigned long blank) {
-  unsigned long rev =  (my  >> 1) & op;
+uint64_t left_pos(uint64_t my, uint64_t op, uint64_t blank) {
+  uint64_t rev =  (my  >> 1) & op;
   rev |= (rev >> 1) & op;
   rev |= (rev >> 1) & op;
   rev |= (rev >> 1) & op;

data/ext/reversi/bit_board_functions.h

@@ -3,24 +3,24 @@
 
 #include "reversi.h"
 
-unsigned long XY2BB(int x, int y);
-VALUE BB2XY(unsigned long bb);
+uint64_t XY2BB(int x, int y);
+VALUE BB2XY(uint64_t bb);
 
-unsigned long rotate_r90(unsigned long bb);
-unsigned long rotate_l90(unsigned long bb);
-unsigned long rotate_r45(unsigned long bb);
-unsigned long rotate_l45(unsigned long bb);
+uint64_t rotate_r90(uint64_t bb);
+uint64_t rotate_l90(uint64_t bb);
+uint64_t rotate_r45(uint64_t bb);
+uint64_t rotate_l45(uint64_t bb);
 
-unsigned long horizontal_pat(unsigned long my, unsigned long op, unsigned long p);
-unsigned long vertical_pat(unsigned long my, unsigned long op, unsigned long p);
-unsigned long diagonal_pat(unsigned long my, unsigned long op, unsigned long p);
-unsigned long right_pat(unsigned long my, unsigned long op, unsigned long p);
-unsigned long left_pat(unsigned long my, unsigned long op, unsigned long p);
+uint64_t horizontal_pat(uint64_t my, uint64_t op, uint64_t p);
+uint64_t vertical_pat(uint64_t my, uint64_t op, uint64_t p);
+uint64_t diagonal_pat(uint64_t my, uint64_t op, uint64_t p);
+uint64_t right_pat(uint64_t my, uint64_t op, uint64_t p);
+uint64_t left_pat(uint64_t my, uint64_t op, uint64_t p);
 
-unsigned long horizontal_pos(unsigned long my, unsigned long op, unsigned long blank);
-unsigned long vertical_pos(unsigned long my, unsigned long op, unsigned long blank);
-unsigned long diagonal_pos(unsigned long my, unsigned long op, unsigned long blank);
-unsigned long right_pos(unsigned long my, unsigned long op, unsigned long blank);
-unsigned long left_pos(unsigned long my, unsigned long op, unsigned long blank);
+uint64_t horizontal_pos(uint64_t my, uint64_t op, uint64_t blank);
+uint64_t vertical_pos(uint64_t my, uint64_t op, uint64_t blank);
+uint64_t diagonal_pos(uint64_t my, uint64_t op, uint64_t blank);
+uint64_t right_pos(uint64_t my, uint64_t op, uint64_t blank);
+uint64_t left_pos(uint64_t my, uint64_t op, uint64_t blank);
 
 #endif

data/ext/reversi/board.c

@@ -72,7 +72,7 @@ VALUE status(VALUE self) {
   VALUE white_ary = rb_ary_new();
   VALUE none_ary  = rb_ary_new();
   VALUE status = rb_hash_new();
-  unsigned long black = 0, white = 0, blank = 0, p = 0;
+  uint64_t black = 0, white = 0, blank = 0, p = 0;
   struct bit_board *ptr;
   Data_Get_Struct(self, struct bit_board, ptr);
 
@@ -111,8 +111,8 @@ VALUE status(VALUE self) {
  * @return [Integer] the openness
  */
 VALUE openness(VALUE self, VALUE rb_x, VALUE rb_y) {
-  unsigned long p = XY2BB(FIX2INT(rb_x), FIX2INT(rb_y));
-  unsigned long blank = 0, bb = 0;
+  uint64_t p = XY2BB(FIX2INT(rb_x), FIX2INT(rb_y));
+  uint64_t blank = 0, bb = 0;
   struct bit_board *ptr;
   Data_Get_Struct(self, struct bit_board, ptr);
 
@@ -141,7 +141,7 @@ VALUE openness(VALUE self, VALUE rb_x, VALUE rb_y) {
  * @return [Symbol] the color or `:none`
  */
 VALUE at(VALUE self, VALUE rb_x, VALUE rb_y) {
-  unsigned long p = XY2BB(FIX2INT(rb_x), FIX2INT(rb_y));
+  uint64_t p = XY2BB(FIX2INT(rb_x), FIX2INT(rb_y));
   struct bit_board *ptr;
   Data_Get_Struct(self, struct bit_board, ptr);
 
@@ -157,7 +157,7 @@ VALUE at(VALUE self, VALUE rb_x, VALUE rb_y) {
  * @return [Integer] the sum of the counted disks
  */
 VALUE count_disks(VALUE self, VALUE color) {
-  unsigned long bb = 0;
+  uint64_t bb = 0;
   struct bit_board *ptr;
   Data_Get_Struct(self, struct bit_board, ptr);
 
@@ -182,7 +182,7 @@ VALUE count_disks(VALUE self, VALUE color) {
  * @return [Array<Array<Integer, Integer>>]
  */
 VALUE next_moves(VALUE self, VALUE color) {
-  unsigned long my = 0, op = 0, blank = 0, p = 0, pos = 0;
+  uint64_t my = 0, op = 0, blank = 0, p = 0, pos = 0;
   VALUE moves = rb_ary_new();
   struct bit_board *ptr;
   Data_Get_Struct(self, struct bit_board, ptr);
@@ -212,7 +212,7 @@ VALUE next_moves(VALUE self, VALUE color) {
  * @param color [Integer]
  */
 VALUE put_disk(VALUE self, VALUE rb_x, VALUE rb_y, VALUE color) {
-  unsigned long p = XY2BB(FIX2INT(rb_x), FIX2INT(rb_y));
+  uint64_t p = XY2BB(FIX2INT(rb_x), FIX2INT(rb_y));
   struct bit_board *ptr;
   Data_Get_Struct(self, struct bit_board, ptr);
 
@@ -234,8 +234,8 @@ VALUE put_disk(VALUE self, VALUE rb_x, VALUE rb_y, VALUE color) {
  * @param color [Integer]
  */
 VALUE flip_disks(VALUE self, VALUE rb_x, VALUE rb_y, VALUE color) {
-  unsigned long p = XY2BB(FIX2INT(rb_x), FIX2INT(rb_y));
-  unsigned long my = 0, op = 0, rev = 0;
+  uint64_t p = XY2BB(FIX2INT(rb_x), FIX2INT(rb_y));
+  uint64_t my = 0, op = 0, rev = 0;
   struct bit_board *ptr;
   Data_Get_Struct(self, struct bit_board, ptr);
 

data/ext/reversi/board.h

@@ -4,8 +4,8 @@
 #include "reversi.h"
 
 struct bit_board {
-  unsigned long black;
-  unsigned long white;
+  uint64_t black;
+  uint64_t white;
 };
 
 VALUE bit_board_alloc(VALUE class);

data/ext/reversi/reversi.h

@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <memory.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #include "board.h"
 #include "bit_board_functions.h"

data/lib/reversi/version.rb

@@ -1,3 +1,3 @@
 module Reversi
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reversi
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - seinosuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler