eschulte pushed a commit to branch go in repository elpa. commit 74bb083ecab87539cae6b4d6003cd298a213cc27 Author: Eric Schulte <eric.schu...@gmx.com> Date: Sat May 26 16:17:43 2012 -0600
once again passing most tests --- go-gtp.el | 2 +- go-sgf.el | 4 ++-- go-tests.el | 20 ++++++++++---------- go-trans.el | 32 ++++++++++++++++---------------- sgf2el.el | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/go-gtp.el b/go-gtp.el index 93576d1..aead8c4 100644 --- a/go-gtp.el +++ b/go-gtp.el @@ -54,7 +54,7 @@ (t (+ ?A num))))) (defun go-pos-to-gtp (pos) - (format "%c%d" (num-to-char (1+ (car pos))) (1+ (cdr pos)))) + (format "%c%d" (go-gtp-num-to-char (1+ (car pos))) (1+ (cdr pos)))) (defun go-gtp-to-pos (color gtp) (cons color (cons :pos (cons (go-gtp-char-to-num (aref gtp 0)) diff --git a/go-sgf.el b/go-sgf.el index 05bf63a..fc4975d 100644 --- a/go-sgf.el +++ b/go-sgf.el @@ -63,10 +63,10 @@ "Class for the SGF back end.") (defmethod current ((sgf sgf)) - (sgf-ref (self sgf) (index sgf))) + (go-sgf-ref (self sgf) (index sgf))) (defmethod root ((sgf sgf)) - (sgf-ref (self sgf) '(0))) + (go-sgf-ref (self sgf) '(0))) (defmethod go->move ((sgf sgf) move)) diff --git a/go-tests.el b/go-tests.el index e657fef..eca67e1 100644 --- a/go-tests.el +++ b/go-tests.el @@ -27,11 +27,11 @@ ;;; Code: (require 'go-util) -(require 'go2el) +(require 'sgf2el) (require 'go-board) (require 'go-gtp) (require 'go-gnugo) -(require 'go) +(require 'go-sgf) (require 'ert) @@ -154,14 +154,14 @@ ;;; GTP and gnugo tests (ert-deftest go-test-go-gtp-char-to-gtp () - (should (= 1 (go-gtp-char-to-num ?A))) - (should (= 8 (go-gtp-char-to-num ?H))) - (should (= 9 (go-gtp-char-to-num ?J))) - (should (= 19 (go-gtp-char-to-num ?T))) - (should (= 1 (go-gtp-char-to-num ?a))) - (should (= 8 (go-gtp-char-to-num ?h))) - (should (= 9 (go-gtp-char-to-num ?j))) - (should (= 19 (go-gtp-char-to-num ?t)))) + (should (= 0 (go-gtp-char-to-num ?A))) + (should (= 7 (go-gtp-char-to-num ?H))) + (should (= 8 (go-gtp-char-to-num ?J))) + (should (= 18 (go-gtp-char-to-num ?T))) + (should (= 0 (go-gtp-char-to-num ?a))) + (should (= 7 (go-gtp-char-to-num ?h))) + (should (= 8 (go-gtp-char-to-num ?j))) + (should (= 18 (go-gtp-char-to-num ?t)))) (defmacro with-gnugo (&rest body) `(let (*gnugo*) diff --git a/go-trans.el b/go-trans.el index 14689ac..b08d50d 100644 --- a/go-trans.el +++ b/go-trans.el @@ -1,4 +1,4 @@ -;;; sgf-trans.el --- Translate and transfer between GO back ends +;;; go-trans.el --- Translate and transfer between GO back ends ;; Copyright (C) 2012 Eric Schulte <eric.schu...@gmx.com> @@ -34,20 +34,20 @@ ;; - the IGS protocol ;;; Code: -(require 'sgf-util) +(require 'go-util) (require 'eieio) -(defgeneric sgf->move (back-end move) "Send MOVE to BACK-END.") -(defgeneric sgf->board (back-end size) "Send SIZE to BACK-END.") -(defgeneric sgf->resign (back-end resign) "Send RESIGN to BACK-END.") -(defgeneric sgf->undo (back-end) "Tell BACK-END undo the last move.") -(defgeneric sgf->comment (back-end comment) "Send COMMENT to BACK-END.") -(defgeneric sgf->reset (back-end) "Reset the current BACK-END.") -(defgeneric sgf<-size (back-end) "Get size from BACK-END") -(defgeneric sgf<-name (back-end) "Get a game name from BACK-END.") -(defgeneric sgf<-alt (back-end) "Get an alternative from BACK-END.") -(defgeneric sgf<-move (back-end color) "Get a pos from BACK-END.") -(defgeneric sgf<-turn (back-end color) "Get a full turn from BACK-END.") -(defgeneric sgf<-comment (back-end) "Get COMMENT from BACK-END.") - -(provide 'sgf-trans) +(defgeneric go->move (back-end move) "Send MOVE to BACK-END.") +(defgeneric go->board (back-end size) "Send SIZE to BACK-END.") +(defgeneric go->resign (back-end resign) "Send RESIGN to BACK-END.") +(defgeneric go->undo (back-end) "Tell BACK-END undo the last move.") +(defgeneric go->comment (back-end comment) "Send COMMENT to BACK-END.") +(defgeneric go->reset (back-end) "Reset the current BACK-END.") +(defgeneric go<-size (back-end) "Get size from BACK-END") +(defgeneric go<-name (back-end) "Get a game name from BACK-END.") +(defgeneric go<-alt (back-end) "Get an alternative from BACK-END.") +(defgeneric go<-move (back-end color) "Get a pos from BACK-END.") +(defgeneric go<-turn (back-end color) "Get a full turn from BACK-END.") +(defgeneric go<-comment (back-end) "Get COMMENT from BACK-END.") + +(provide 'go-trans) diff --git a/sgf2el.el b/sgf2el.el index f3012fa..b18bd0f 100644 --- a/sgf2el.el +++ b/sgf2el.el @@ -26,7 +26,7 @@ ;; Boston, MA 02110-1301, USA. ;;; Code: -(require 'sgf-util) +(require 'go-util) (defvar prop-re "\\([[:alpha:]]+\\)\\(\\(\\[\\]\\|[[:space:]]*\\[[^\000]*?[^\\]\\]\\)+\\)")