Fix testing in Github CI. Simplify compilation and testing process.

Remove Cask and its dependencies for now, and simplify the
compilation/testing process. Make compile byte-compiles all files,
make test runs ERT tests. Fix various imports and warnings.

Author: mtreca

.github/workflows/test.yml

@@ -28,10 +28,13 @@ jobs:
         version: ${{ matrix.emacs_version }}
     - uses: conao3/setup-cask@master
 
+    - name: Install Gnuplot
+      run: sudo apt update && sudo apt install gnuplot
+
     - name: Run tests
       if: matrix.allow_failure != true
-      run: 'cask && cask build && cask exec buttercup -L .'
+      run: 'make && make test'
 
     - name: Run tests (allow failure)
       if: matrix.allow_failure == true
-      run: 'cask && cask build && cask exec buttercup -L . || true'
+      run: 'make && make test || true'

Cask

@@ -1,38 +1,21 @@
-# -*- mode: makefile -*-
-
 EMACS ?= emacs
 
-## You will probably not need to change anything below this line
-
-BYTE = $(EMACS) -batch -q -no-site-file -l dot.el -f batch-byte-compile
-
-.PHONY: all default clean pdf ps
-
-default: gnuplot.elc gnuplot-gui.elc gnuplot-context.elc
-
-pdf: gpelcard.pdf
-
-ps: gpelcard.ps
-
-all: gnuplot.elc gnuplot-gui.elc gnuplot-context.elc gpelcard.pdf gpelcard.ps
-
-%.elc: %.el
-	$(BYTE) "$<"
+LOAD = -l gnuplot \
+	-l gnuplot-context \
+	-l gnuplot-debug-context \
+	-l gnuplot-gui \
+	-l gnuplot-tests \
+	-l gnuplot-test-context
 
-test: gnuplot.elc gnuplot-context.elc gnuplot-tests.elc gnuplot-test-context.elc
-	$(EMACS) --batch -L .				\
-	  --load=gnuplot-tests				\
-	  --load=gnuplot-test-context			\
-	  --eval='(ert-run-tests-batch "^gnuplot-")'
+.PHONY: all default clean
 
-gpelcard.ps: gpelcard.dvi
-	dvips -o gpelcard.ps gpelcard.dvi
+default: compile
 
-gpelcard.pdf: gpelcard.tex
-	pdflatex gpelcard.tex
+test:
+	$(EMACS) -batch -L . $(LOAD) -f ert-run-tests-batch-and-exit
 
-gpelcard.dvi: gpelcard.tex
-	 latex gpelcard.tex
+compile:
+	$(EMACS) -batch -L . -f batch-byte-compile *.el
 
 clean:
-	rm -f *.elc gpelcard.dvi gpelcard.log gpelcard.aux
+	rm -f *.elc

Makefile

@@ -230,22 +230,11 @@
 
 ;;; Code:
 
-
-;; Library dependencies
-(eval-when-compile
-  (require 'cl-lib)
-
-  ;; Prevent compiler warnings about undefined functions
-  (require 'gnuplot))
-
-;; We need ElDoc support
+(require 'cl-lib)
+(require 'gnuplot)
 (require 'eldoc)
-
-;; Compatibility for Emacs version < 23
-(eval-when-compile
-  (when (not (fboundp 'string-match-p))
-    (defmacro string-match-p (&rest args)
-      `(save-match-data (string-match ,@args)))))
+(require 'info)
+(require 'info-look)
 
 
 ;;;; The tokenizer.
@@ -498,7 +487,7 @@ name; otherwise continues tokenizing up to the token at point.  FIXME."
 
             (t              ; two patterns
              (let* ((pat1 (cadr pat))
-                    (pat2 (caddr pat))
+                    (pat2 (cl-caddr pat))
                     (pat1-c (gnuplot-compile-pattern pat1))
                     (pat2-c (gnuplot-compile-pattern pat2))
                     (pat1-l (length pat1-c))
@@ -536,7 +525,7 @@ name; otherwise continues tokenizing up to the token at point.  FIXME."
           ;; Syntactic sugar for delimited lists
           ((delimited-list)
            (let* ((item (cadr pat))
-                  (sep (caddr pat)))
+                  (sep (cl-caddr pat)))
              (gnuplot-compile-pattern
               `(sequence ,item (many (sequence ,sep ,item))))))
 
@@ -1827,7 +1816,7 @@ there."
               ;; (literal LITERAL NO-COMPLETE)
               ((literal)
                (let ((expect (cadr inst))
-                     (no-complete (caddr inst)))
+                     (no-complete (cl-caddr inst)))
                  (cond (end-of-tokens
                         (unless no-complete
                           (gnuplot-trace "\tpushing \"%s\" to completions\n" expect)
@@ -1852,7 +1841,7 @@ there."
               ;; regexp-matches REGEXP, use NAME for completions
               ((keyword)
                (let ((regexp (cadr inst))
-                     (name (caddr inst)))
+                     (name (cl-caddr inst)))
                  (cond (end-of-tokens
                         (gnuplot-trace "\tpushing \"%s\" to completions\n" name)
                         (push name gnuplot-completions)
@@ -1929,7 +1918,7 @@ there."
               ;; onto the stack
               ((push)
                (let* ((type (cadr inst))
-                      (value (caddr inst)))
+                      (value (cl-caddr inst)))
                  (push `(,type ,value ,tokens) stack)))
 
               ;; (pop TYPE): pop something off the stack
@@ -1953,7 +1942,7 @@ there."
                       (record (assoc name gnuplot-captures)))
                  (if (not record)
                      (error "Gnuplot-match-tokens: no open capture group named %s" name)
-                   (setf (caddr record) tokens)
+                   (setf (cl-caddr record) tokens)
                    (gnuplot-debug (gnuplot-dump-captures)))))
 
               ;; (check-progress): make sure not stuck in an infinite loop
@@ -2003,7 +1992,7 @@ there."
                 (not (and gnuplot-info-at-point gnuplot-eldoc)))
       (let* ((item (car stack))
              (type (car item))
-             (position (caddr item))) ; must progress by at least one token
+             (position (cl-caddr item))) ; must progress by at least one token
         (if (and (memq type '(info eldoc no-scan))
                  (not (eq position tokens)))
             (cl-case type
@@ -2041,7 +2030,7 @@ there."
   (let ((record (assoc name gnuplot-captures)))
     (if (not record) nil
       (let ((begin (cadr record))
-            (end (caddr record))
+            (end (cl-caddr record))
             (accum '()))
         (while (and begin (not (eq begin end)))
           (push (pop begin) accum))

dot.el

@@ -2,7 +2,7 @@
 ;; debugging utilities for the gnuplot-mode context matcher
 ;;
 
-(require 'gnuplot-test-context) 	; for gnuplot-simplify-tokens
+(require 'gnuplot-test-context) ; for gnuplot-simplify-tokens
 
 (defun gnuplot-unload ()
   (interactive)
@@ -65,15 +65,15 @@
                          (if (eq (car x) 'return)
                              x
                            (list (car x) (cadr x)
-                                 (gnuplot-simplify-tokens (caddr x)))))))
+                                 (gnuplot-simplify-tokens (cl-caddr x)))))))
        (insert "-- end backtrace  --\n"))))
 
 (defun gnuplot-dump-backtrack (backtrack)
   (if backtrack
       (with-gnuplot-trace-buffer
        (insert "\n-- * backtrack records: * --\n")
        (dolist (x backtrack)
-         (insert (format "%s\t%s\n" (caddr x) (gnuplot-simplify-tokens (cadr x)))))
+         (insert (format "%s\t%s\n" (cl-caddr x) (gnuplot-simplify-tokens (cadr x)))))
        (insert "-- end backtrack records  --\n\n"))))
 
 (defun gnuplot-dump-progress (progress)

gnuplot-context.el

@@ -1110,8 +1110,8 @@ arguments."
             (if (and (string= prefix (car temp-list))
                      (string-match "^[-0-9.]+$" (cadr temp-list)))
                 (let ((this-car (cadr temp-list))
-                      (this-cdr (if (string-match "^[-0-9.]+$" (caddr temp-list))
-                                    (caddr temp-list) "")))
+                      (this-cdr (if (string-match "^[-0-9.]+$" (cl-caddr temp-list))
+                                    (cl-caddr temp-list) "")))
                   (setq this-cons (cons tag (cons this-car this-cdr))
                         temp-list nil))
               (setq temp-list (cdr temp-list))))

gnuplot-debug-context.el

@@ -32,7 +32,7 @@
 (defun gnuplot-simplify-tokens (tokens)
   (mapcar
    (lambda (token)
-     (case (gnuplot-token-type token)
+     (cl-case (gnuplot-token-type token)
        (number
         (string-to-number (gnuplot-token-id token)))
 

gnuplot-gui.el

@@ -3,9 +3,8 @@
 ;;; Currently these attempt to cover the correct identification of
 ;;; string and comment syntax.
 
-(require 'gnuplot)
 (require 'ert)
-(eval-when-compile (require 'cl-lib))
+(require 'cl-lib)
 
 ;; Hide an annoying interactive message during batch testing
 (when (require 'nadvice nil t)

gnuplot-test-context.el

@@ -1777,7 +1777,7 @@ updates Gnuplot with the appropriate 'set output' command."
             (when (and size (> size 0))
               (gnuplot-send-hiding-output "set output\n") ; Flush output file
               (sit-for 0.1)             ; Hack: wait for Gnuplot IO to finish
-              (ecase gnuplot-inline-image-mode
+              (cl-ecase gnuplot-inline-image-mode
                 (nil nil)
                 (inline
                   (ignore-errors
@@ -2324,7 +2324,7 @@ the height of the frame.
 
 The *info* buffer should already exist when this function is
 called."
-  (case gnuplot-info-display
+  (cl-case gnuplot-info-display
     (window
      (switch-to-buffer-other-window "*info*")
      ;; Adjust window height only if the frame is split