[elpa] 02/05: [gnugo int] Maintain tree MNUM.

[Thien-Thi Nguyen]

ttn pushed a commit to branch master
in repository elpa.

commit 47e3591400b5beaa29290c9c3e03e4e97368b3d0
Author: Thien-Thi Nguyen <address@hidden>
Date:   Sun Apr 6 17:04:31 2014 +0200

    [gnugo int] Maintain tree MNUM.
    
    * packages/gnugo/gnugo.el (gnugo--tree-mnum): New defsubst.
    (gnugo-note): Record new node's move number in the tree MNUM.
    (gnugo/sgf-create): Change tree MNUM weakness to ‘key’.
---
 packages/gnugo/gnugo.el |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/gnugo/gnugo.el b/packages/gnugo/gnugo.el
index a03cfd6..acd42f4 100644
--- a/packages/gnugo/gnugo.el
+++ b/packages/gnugo/gnugo.el
@@ -248,6 +248,9 @@ As things stabilize probably more info will be added to 
this docstring."
 See `gnugo-put'."
   (gethash key gnugo-state))
 
+(defsubst gnugo--tree-mnum (tree)
+  (aref tree 0))
+
 (defsubst gnugo--tree-ends (tree)
   (aref tree 2))
 
@@ -959,10 +962,12 @@ are dimmed.  The buffer is in View minor mode."
   (let* ((pair (cons property value))
          (fruit (list pair))
          (monkey (gnugo-get :monkey))
-         (mem (aref monkey 0)))
+         (mem (aref monkey 0))
+         (tip (car mem)))
     (if (memq property '(:B :W))
         (let* ((tree (gnugo-get :sgf-gametree))
                (ends (gnugo--tree-ends tree))
+               (mnum (gnugo--tree-mnum tree))
                (bidx (aref monkey 1)))
           ;; Detect déjà-vu.  That is, when placing "A", avoid:
           ;;
@@ -1013,11 +1018,12 @@ are dimmed.  The buffer is in View minor mode."
                        ;; copy old to the right of new
                        (push mem (nthcdr bidx ls))
                        (apply 'vector ls))))
+             (puthash fruit (1+ (gethash tip mnum)) mnum)
              (push fruit mem)
              (aset ends bidx mem)))
           (setf (aref monkey 0) mem)
           (incf (aref monkey 2)))
-      (setcdr (last (car mem)) fruit))))
+      (setcdr (last tip) fruit))))
 
 (defun gnugo-close-game (end-time resign)
   (gnugo-put :game-end-time end-time)
@@ -2543,7 +2549,7 @@ A collection is a list of gametrees, each a vector of 
four elements:
           (insert file-or-data)
           (goto-char (point-min)))
         (loop while (morep)
-              collect (let* ((mnum (gnugo--mkht))
+              collect (let* ((mnum (gnugo--mkht :weakness 'key))
                              (kids (gnugo--mkht))
                              (ends (TREE nil mnum kids))
                              (root (car (last (car ends)))))