[nongnu] elpa/pacmacs b03ee65528 195/472: Merge branch 'board-refactoring-105'. Close #105

[ELPA Syncer]

branch: elpa/pacmacs
commit b03ee655281d581afdbcd0b4e9b40742842383b8
Merge: fe40eb20c7 805d91d22b
Author: rexim <reximkut@gmail.com>
Commit: rexim <reximkut@gmail.com>

    Merge branch 'board-refactoring-105'. Close #105
---
 pacmacs-board.el           |  4 ++--
 pacmacs-render.el          |  2 +-
 pacmacs.el                 | 40 ++++++++++++++++++++--------------------
 test/pacmacs-board-test.el |  8 ++++----
 test/pacmacs-test.el       | 38 +++++++++++++++++++-------------------
 5 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/pacmacs-board.el b/pacmacs-board.el
index 6b6242aabf..f00c47b2d0 100644
--- a/pacmacs-board.el
+++ b/pacmacs-board.el
@@ -42,7 +42,7 @@
           :height height
           :data board)))
 
-(defun pacmacs--cell-get (board row column)
+(defun pacmacs--cell-wrapped-get (board row column)
   (plist-bind ((width :width)
                (height :height)
                (data :data))
@@ -50,7 +50,7 @@
     (aref (aref data (mod row height))
           (mod column width))))
 
-(defun pacmacs--cell-set (board row column value)
+(defun pacmacs--cell-wrapped-set (board row column value)
   (plist-bind ((width :width)
                (height :height)
                (data :data))
diff --git a/pacmacs-render.el b/pacmacs-render.el
index c5966607ae..0a7e6f4bad 100644
--- a/pacmacs-render.el
+++ b/pacmacs-render.el
@@ -68,7 +68,7 @@
       track-board
     (dotimes (row height)
       (dotimes (column width)
-        (let ((x (pacmacs--cell-get track-board row column)))
+        (let ((x (pacmacs--cell-wrapped-get track-board row column)))
           (cond
            ((null x)
             (insert "."))
diff --git a/pacmacs.el b/pacmacs.el
index 790535bcd2..312f7f5aa1 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -63,8 +63,8 @@
 (defvar pacmacs-wall-cells nil)
 (defvar pacmacs-pills nil)
 
-(defvar pacmacs-board nil)
-(defvar pacmacs-track-board nil)
+(defvar pacmacs--render-board nil)
+(defvar pacmacs--track-board nil)
 
 (defvar pacmacs-play-pause nil)
 
@@ -187,17 +187,17 @@
       (kill-buffer buffer-or-name))))
 
 (defun pacmacs--wall-at-p (row column)
-  (pacmacs--object-at-p pacmacs-board
+  (pacmacs--object-at-p pacmacs--render-board
                         row column
                         pacmacs-wall-cells))
 
 (defun pacmacs--pill-at-p (row column)
-  (pacmacs--object-at-p pacmacs-board
+  (pacmacs--object-at-p pacmacs--render-board
                         row column
                         pacmacs-pills))
 
 (defun pacmacs--ghost-at-p (row column)
-  (pacmacs--object-at-p pacmacs-board
+  (pacmacs--object-at-p pacmacs--render-board
                         row column
                         pacmacs--ghosts))
 
@@ -207,7 +207,7 @@
     (pacmacs--kill-buffer-and-its-window pacmacs-buffer-name)))
 
 (defun pacmacs--cell-tracked-p (row column)
-  (pacmacs--cell-get pacmacs-track-board row column))
+  (pacmacs--cell-wrapped-get pacmacs--track-board row column))
 
 (defun pacmacs--switch-direction (game-object direction)
   (plist-bind ((direction-animations :direction-animations))
@@ -225,7 +225,7 @@
     (plist-put game-object :prev-row row)
     (plist-put game-object :prev-column column)
     (if (zerop speed-counter)
-        (let* ((new-point (pacmacs--step-point pacmacs-board row column 
direction))
+        (let* ((new-point (pacmacs--step-point pacmacs--render-board row 
column direction))
                (new-row (car new-point))
                (new-column (cdr new-point)))
           (plist-put game-object :speed-counter speed)
@@ -256,12 +256,12 @@
          (d-row (- end-row start-row))
          (d-column (- end-column start-column)))
     
-    (pacmacs--cell-set pacmacs-track-board
+    (pacmacs--cell-wrapped-set pacmacs--track-board
                        start-row start-column
                        (pacmacs--direction-name (cons d-row d-column)))))
 
 (defun pacmacs--recalc-track-board ()
-  (pacmacs--fill-board pacmacs-track-board nil)
+  (pacmacs--fill-board pacmacs--track-board nil)
   (plist-bind ((player-row :row)
                (player-column :column))
       pacmacs-player-state
@@ -284,7 +284,7 @@
   (plist-bind ((row :row)
                (column :column))
       game-object
-    (let ((direction (pacmacs--cell-get pacmacs-track-board row column)))
+    (let ((direction (pacmacs--cell-wrapped-get pacmacs--track-board row 
column)))
       (pacmacs--switch-direction game-object direction))))
 
 (defun pacmacs-tick ()
@@ -376,7 +376,7 @@
     (plist-bind ((row :row)
                  (column :column))
         anim-object
-      (pacmacs--cell-set pacmacs-board row column anim-object))))
+      (pacmacs--cell-wrapped-set pacmacs--render-board row column 
anim-object))))
 
 (defun pacmacs--switch-to-death-state ()
   (setq pacmacs-game-state 'death)
@@ -416,9 +416,9 @@
       (insert (format "Score: %d\n\n" pacmacs-score))
 
       (when pacmacs-debug-output
-        (pacmacs--render-track-board pacmacs-track-board))
+        (pacmacs--render-track-board pacmacs--track-board))
 
-      (pacmacs--fill-board pacmacs-board nil)
+      (pacmacs--fill-board pacmacs--render-board nil)
 
       (dolist (pill pacmacs-pills)
         (pacmacs--put-object pill))
@@ -430,13 +430,13 @@
       
       (dolist (wall pacmacs-wall-cells)
         (pacmacs--put-object wall))
-
+      
       (plist-bind ((width :width)
                    (height :height))
-          pacmacs-board
+          pacmacs--render-board
         (dotimes (row height)
           (dotimes (column width)
-            (let ((anim-object (pacmacs--cell-get pacmacs-board row column)))
+            (let ((anim-object (pacmacs--cell-wrapped-get 
pacmacs--render-board row column)))
               (pacmacs--render-object anim-object)))
           (insert "\n")))
       (insert "\n")
@@ -497,10 +497,10 @@
     (setq pacmacs-board-width board-width)
     (setq pacmacs-board-height board-height)
 
-    (setq pacmacs-board (pacmacs--make-board pacmacs-board-width
-                                             pacmacs-board-height))
-    (setq pacmacs-track-board (pacmacs--make-board pacmacs-board-width
-                                                   pacmacs-board-height))
+    (setq pacmacs--render-board (pacmacs--make-board pacmacs-board-width
+                                                     pacmacs-board-height))
+    (setq pacmacs--track-board (pacmacs--make-board pacmacs-board-width
+                                                    pacmacs-board-height))
 
     (setq pacmacs-wall-cells nil)
     (setq pacmacs-pills nil)
diff --git a/test/pacmacs-board-test.el b/test/pacmacs-board-test.el
index 61a850ccc3..9eabe6e059 100644
--- a/test/pacmacs-board-test.el
+++ b/test/pacmacs-board-test.el
@@ -10,14 +10,14 @@
     (should (equal expected-board
                    (pacmacs--make-board width height)))))
 
-(ert-deftest pacmacs--cell-get-test ()
+(ert-deftest pacmacs--cell-wrapped-get-test ()
   (let ((input-board (list :width 3
                            :height 2
                            :data [[nil nil nil]
                                   [nil 42 nil]])))
-    (should (equal 42 (pacmacs--cell-get input-board 1 1)))))
+    (should (equal 42 (pacmacs--cell-wrapped-get input-board 1 1)))))
 
-(ert-deftest pacmacs--cell-set-test ()
+(ert-deftest pacmacs--cell-wrapped-set-test ()
   (let ((input-board (list :width 3
                            :height 2
                            :data [[nil nil nil]
@@ -26,7 +26,7 @@
                               :height 2
                               :data [[nil nil nil]
                                      [nil 42 nil]])))
-    (pacmacs--cell-set input-board 1 1 42)
+    (pacmacs--cell-wrapped-set input-board 1 1 42)
     (should (equal expected-board
                    input-board))))
 
diff --git a/test/pacmacs-test.el b/test/pacmacs-test.el
index e27a3af2e1..745abeec26 100644
--- a/test/pacmacs-test.el
+++ b/test/pacmacs-test.el
@@ -1,31 +1,31 @@
 
 (ert-deftest pacmacs--cell-tracked-p-test ()
-  (let ((pacmacs-track-board (list :width 2
-                                   :height 2
-                                   :data [[nil nil]
-                                          ['left 'right]])))
+  (let ((pacmacs--track-board (list :width 2
+                                     :height 2
+                                     :data [[nil nil]
+                                            ['left 'right]])))
     (should (not (pacmacs--cell-tracked-p 0 0)))
     (should (pacmacs--cell-tracked-p 1 0))))
 
 (ert-deftest pacmacs--track-point-test ()
-  (let ((pacmacs-track-board (list :width 2
-                                   :height 2
-                                   :data [[nil nil]
-                                          [nil nil]])))
+  (let ((pacmacs--track-board (list :width 2
+                                     :height 2
+                                     :data [[nil nil]
+                                            [nil nil]])))
     (pacmacs--track-point (cons 0 0) (cons 0 1))
     (should (equal [[right nil]
                     [nil nil]]
-                   (plist-get pacmacs-track-board :data)))
+                   (plist-get pacmacs--track-board :data)))
     (pacmacs--track-point (cons 1 0) (cons 1 -1))
     (should (equal [[right nil]
                     [left nil]]
-                   (plist-get pacmacs-track-board :data)))))
+                   (plist-get pacmacs--track-board :data)))))
 
 (ert-deftest pacmacs--track-object-test ()
-  (let ((pacmacs-track-board (list :width 2
-                                   :height 2
-                                   :data [[right down]
-                                          [up left]]))
+  (let ((pacmacs--track-board (list :width 2
+                                     :height 2
+                                     :data [[right down]
+                                            [up left]]))
         (game-object (list :row 0
                            :column 0)))
     (with-mock
@@ -33,14 +33,14 @@
      (pacmacs--track-object game-object))))
 
 (ert-deftest pacmacs--put-object-test ()
-  (let ((pacmacs-board (list :width 2
-                             :height 2
-                             :data [[nil nil]
-                                    [nil nil]]))
+  (let ((pacmacs--render-board (list :width 2
+                                      :height 2
+                                      :data [[nil nil]
+                                             [nil nil]]))
         (anim-object (list :row 0 :column 1)))
     (pacmacs--put-object anim-object)
     (should (equal (list :width 2
                          :height 2
                          :data [[nil (:row 0 :column 1)]
                                 [nil nil]])
-                   pacmacs-board))))
+                   pacmacs--render-board))))