[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ess 2d18e439f6 17/19: Add prefixes to test helpers
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/ess 2d18e439f6 17/19: Add prefixes to test helpers |
|
Date: |
Sat, 15 Apr 2023 19:57:45 -0400 (EDT) |
branch: externals/ess
commit 2d18e439f62f09c59965b64c3d76e8c36de3c82b
Author: Lionel Henry <lionel.hry@gmail.com>
Commit: Lionel Henry <lionel.hry@gmail.com>
Add prefixes to test helpers
---
lisp/ess-r-syntax.el | 6 +-
test/ess-test-inf.el | 22 +++----
test/ess-test-r-syntax.el | 2 +-
test/ess-test-r-utils.el | 22 +++----
test/ess-test-r.el | 82 ++++++++++++-------------
test/literate/tokens.R | 150 +++++++++++++++++++++++-----------------------
test/literate/tokens.el | 2 +-
7 files changed, 143 insertions(+), 143 deletions(-)
diff --git a/lisp/ess-r-syntax.el b/lisp/ess-r-syntax.el
index c3d6adc97c..5f36436ca9 100644
--- a/lisp/ess-r-syntax.el
+++ b/lisp/ess-r-syntax.el
@@ -576,11 +576,11 @@ content. Return nil when the end of the buffer is
reached."
(list start infix-token end))))
(defun ess-parser-led-funcall (left infix-token)
- (when (ess-token= left (append '("identifier" "string" "node")
+ (when (ess-ess-test-token= left (append '("identifier" "string" "node")
ess-r-prefix-keywords-list))
(let* ((power (ess-parser-power infix-token))
(right (ess-parse-arglist power infix-token))
- (type (if (ess-token= left ess-r-prefix-keywords-list)
+ (type (if (ess-ess-test-token= left ess-r-prefix-keywords-list)
"prefixed-expr"
"funcall")))
(when (string= type "prefixed-expr")
@@ -590,7 +590,7 @@ content. Return nil when the end of the buffer is reached."
(list left right)))))
(defun ess-parser-rid-expr-prefix (right suffix-token)
- (when (ess-refined-token= suffix-token "prefixed-expr-delimiter")
+ (when (ess-refined-ess-test-token= suffix-token "prefixed-expr-delimiter")
(ess-parser-rnud-paren suffix-token right)))
(defun ess-parser-rnud-paren (suffix-token &optional prefixed-expr)
diff --git a/test/ess-test-inf.el b/test/ess-test-inf.el
index 315fbd06e8..65e9916e8c 100644
--- a/test/ess-test-inf.el
+++ b/test/ess-test-inf.el
@@ -39,7 +39,7 @@
(let ((default-directory user-emacs-directory)
(ess-startup-directory temporary-file-directory)
ess-ask-for-ess-directory)
- (with-r-running nil
+ (ess-test-with-r-running nil
(should (string= default-directory user-emacs-directory))
(should (string= (inferior-ess-default-directory)
temporary-file-directory)))
(should (string= default-directory user-emacs-directory))))
@@ -55,7 +55,7 @@
(format-message error-msg))))))
(ert-deftest ess-test-inferior-local-start-args ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(let ((inf-data (buffer-local-value 'inferior-ess--local-data
(process-buffer *proc*))))
(should (equal (car inf-data) "R"))
@@ -92,7 +92,7 @@
;; t)
;; (ess-async-command "{cat(1:5);Sys.sleep(5);cat(2:6)}\n" nil (get-process
"R")
;; (lambda (proc) (message "done"))
- (with-r-running nil
+ (ess-test-with-r-running nil
(let ((inf-proc *proc*)
semaphore)
(ess-async-command "{cat(1:5);Sys.sleep(0.5);cat(2:6, '\n')}\n"
@@ -106,15 +106,15 @@
finally (should-not (process-get inf-proc 'callbacks))))))
(ert-deftest ess-run-presend-hooks-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(let ((ess-presend-filter-functions (list (lambda (_string) "\"bar\""))))
- (should (output= (ess-send-string (ess-get-process) "\"foo\"")
+ (should (ess-test-output= (ess-send-string (ess-get-process) "\"foo\"")
"[1] \"bar\"")))))
(ert-deftest ess-load-file-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(should (string-match "^\\[1\\] \"foo\"\nSourced file"
- (output nil (ess-load-file (expand-file-name
"file.R" ess-test-fixtures-directory)))))))
+ (ess-test-output nil (ess-load-file
(expand-file-name "file.R" ess-test-fixtures-directory)))))))
(etest-deftest ess-command-incomplete-test ()
"`ess-command' fails with incomplete input."
@@ -443,9 +443,9 @@ OUT-STRING is the content of the region captured by
))
(ert-deftest ess-setwd-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
;; Working directory is set verbosely
- (should (output= (ess-set-working-directory temporary-file-directory)
+ (should (ess-test-output= (ess-set-working-directory
temporary-file-directory)
(format "setwd('%s')" temporary-file-directory)))
;; Update process default-directory but not caller's buffer
(let* ((cur-dir default-directory)
@@ -574,7 +574,7 @@ head(cars, 2)
"source('file')\n"))))
(ert-deftest ess-get-words-from-vector-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(should (cl-every #'string= (ess-get-words-from-vector "c('1')\n") '("1")))
(should (cl-every #'string= (ess-get-words-from-vector "c('1', \"2\")\n")
'("1" "2")))
(should (cl-every #'string= (ess-get-words-from-vector
"c('aaa','bbb\"ccc', 'dddd')\n")
@@ -642,7 +642,7 @@ head(cars, 2)
(should (string= (buffer-name) "*R-3.2.1:2*")))))))))
(ert-deftest ess-switch-to-inferior-or-script-buffer-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(should (derived-mode-p 'ess-mode))
(ess-switch-to-inferior-or-script-buffer nil)
(should (derived-mode-p 'inferior-ess-mode))))
diff --git a/test/ess-test-r-syntax.el b/test/ess-test-r-syntax.el
index aec1d7a4b3..4184eefca0 100644
--- a/test/ess-test-r-syntax.el
+++ b/test/ess-test-r-syntax.el
@@ -43,7 +43,7 @@
(etest-deftest ess-r-tokens-pipe-operator-test ()
:case "a ¶|> b"
- (should (token= "|>"))
+ (should (ess-test-token= "|>"))
:result "a |>¶ b")
(etest-deftest ess-r-raw-strings-test ()
diff --git a/test/ess-test-r-utils.el b/test/ess-test-r-utils.el
index fad7f00f95..a896f18a84 100644
--- a/test/ess-test-r-utils.el
+++ b/test/ess-test-r-utils.el
@@ -224,17 +224,17 @@ split arbitrarily."
;; !!! NB: proc functionality from now on uses inferior-ess-ordinary-filter and
;; !!! *proc* dynamic var
-(defmacro with-r-running (buffer-or-file &rest body)
+(defmacro ess-test-with-r-running (buffer-or-file &rest body)
"Run BODY within BUFFER-OR-FILE with attached R process.
If BUFFER-OR-FILE is a file, the file is visited first. The R
process is run with `inferior-ess-ordinary-filter' which is not
representative to the common interactive use with tracebug on.
BODY can refer to the process via the variable `*proc*'."
(declare (indent 1) (debug (form body)))
- `(ess--with-r-running-1 ,buffer-or-file
- (lambda (*proc*) (ignore *proc*) ,@body)))
+ `(ess-test-with-r-running-1 ,buffer-or-file
+ (lambda (*proc*) (ignore *proc*) ,@body)))
-(defun ess--with-r-running-1 (buffer-or-file body-fun)
+(defun ess-test-with-r-running-1 (buffer-or-file body-fun)
(let* ((inhibit-message ess-inhibit-message-in-tests)
(r-file-buffer (cond ((bufferp buffer-or-file)
buffer-or-file)
@@ -269,7 +269,7 @@ BODY can refer to the process via the variable `*proc*'."
;; to perform ulterior tests with a fresh R to avoid contaminating
;; them.
-(defmacro output (&rest body) ;; FIXME: `ess-' prefix?
+(defmacro ess-test-output (&rest body)
(declare (indent 1) (debug (&rest body)))
`(progn
(ess-wait-for-process *proc*)
@@ -280,10 +280,10 @@ BODY can refer to the process via the variable `*proc*'."
(prog1 (buffer-substring-no-properties (point-min) (point-max))
(erase-buffer)))))
-(defmacro output= (body expected) ;; FIXME: `ess-' prefix?
+(defmacro ess-test-output= (body expected)
(declare (indent 0) (debug (sexp sexp)))
`(progn
- (let ((output (output ,body))
+ (let ((output (ess-test-output ,body))
(expected ,expected))
(if (string= output expected)
output
@@ -291,14 +291,14 @@ BODY can refer to the process via the variable `*proc*'."
(signal 'ert-test-failed (list (concat "Expected: \n" expected)
(concat "Result: \n" output)))))))
-(defun face-at (point) ;; FIXME: `ess-' prefix?
+(defun ess-test-face-at (point)
(save-excursion
(if (>= point 0)
(goto-char point)
(forward-char point))
(get-char-property (point) 'face)))
-(defun insert-fontified (&rest args)
+(defun ess-test-insert-fontified (&rest args)
(apply #'insert args)
(font-lock-default-fontify-buffer))
@@ -375,7 +375,7 @@ which is relied upon by `ess-command')."
"Attempt to attach the ESSR environment.
Throws an error if unsuccesful."
(with-ess-test-r-file file
- (with-r-running (current-buffer)
+ (ess-test-with-r-running (current-buffer)
;; ensure that there is no ESSR environment nor any ESSR objects in the
;; global environment
(ess--essr-remove)
@@ -387,7 +387,7 @@ Throws an error if unsuccesful."
(should (ess--essr-check-if-in-essrenv)))
(kill-buffer)))
-(defun token= (type &optional value) ;; FIXME: `ess-' prefix?
+(defun ess-test-token= (type &optional value) ;; FIXME: `ess-' prefix?
"Check that the next token conforms to TYPE and VALUE.
This checks it back and forth and moves the point after the
token."
diff --git a/test/ess-test-r.el b/test/ess-test-r.el
index f41adb6ae3..fb3da5bf57 100644
--- a/test/ess-test-r.el
+++ b/test/ess-test-r.el
@@ -82,41 +82,41 @@
found)))))
(ert-deftest ess-r-send-single-quoted-strings-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(insert "'hop'\n")
(let (ess-eval-visibly)
- (should (output= (ess-eval-buffer nil)
+ (should (ess-test-output= (ess-eval-buffer nil)
"[1] \"hop\"")))))
(ert-deftest ess-r-send-double-quoted-strings-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(insert "\"hop\"\n")
(let (ess-eval-visibly)
- (should (output= (ess-eval-buffer nil)
+ (should (ess-test-output= (ess-eval-buffer nil)
"[1] \"hop\"")))))
(ert-deftest ess-eval-line-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(insert "1 + 1")
(let (ess-eval-visibly)
- (should (output= (ess-eval-line)
+ (should (ess-test-output= (ess-eval-line)
"[1] 2")))
(let ((ess-eval-visibly t))
- (should (output= (ess-eval-line)
+ (should (ess-test-output= (ess-eval-line)
"1 + 1\n[1] 2")))))
(ert-deftest ess-eval-region-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(insert "1 + \n1")
(let (ess-eval-visibly)
- (should (output= (ess-eval-region (point-min) (point-max) nil)
+ (should (ess-test-output= (ess-eval-region (point-min) (point-max) nil)
"+ [1] 2")))
(let ((ess-eval-visibly t))
- (should (output= (ess-eval-region (point-min) (point-max) nil)
+ (should (ess-test-output= (ess-eval-region (point-min) (point-max) nil)
"1 + \n+ 1\n[1] 2")))))
(ert-deftest ess-eval-function ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(let (ess-eval-visibly)
(insert "x <- function(a){\n a + 1\n}")
(forward-line -1)
@@ -124,14 +124,14 @@
(delete-region (progn (beginning-of-defun) (point))
(progn (end-of-defun) (point)))
(insert "x(1)")
- (should (output= (ess-eval-region (point-min) (point-max) nil)
+ (should (ess-test-output= (ess-eval-region (point-min) (point-max) nil)
"+ + > [1] 2")))))
(ert-deftest ess-r-eval-rectangle-mark-mode-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(insert "x <- 1\nx\nx + 1\nx + 2\n")
(let (ess-eval-visibly)
- (should (output= (progn
+ (should (ess-test-output= (progn
(goto-char (point-min))
(transient-mark-mode)
(rectangle-mark-mode)
@@ -141,46 +141,46 @@
"> [1] 1\n> [1] 2\n> [1] 3")))))
(ert-deftest ess-set-working-directory-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(ess-set-working-directory "/")
(ess-eval-linewise "getwd()" 'invisible)
- (should (output= (ess-eval-buffer nil)
+ (should (ess-test-output= (ess-eval-buffer nil)
"setwd('/')\n> [1] \"/\""))
(should (string= (ess-get-process-variable 'default-directory) "/"))))
(ert-deftest ess-inferior-force-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(should (equal (ess-get-words-from-vector "letters[1:2]\n")
(list "a" "b")))))
;;; Namespaced evaluation
(ert-deftest ess-r-run-presend-hooks-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(let ((ess-presend-filter-functions (list (lambda (_string) "\"bar\"")))
(ess-r-evaluation-env "base")
ess-eval-visibly)
(insert "\"foo\"\n")
- (should (output= (ess-eval-region (point-min) (point-max) nil)
+ (should (ess-test-output= (ess-eval-region (point-min) (point-max) nil)
"[1] \"bar\"")))))
(ert-deftest ess-r-namespaced-eval-no-sourced-message-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(let ((ess-r-evaluation-env "base")
ess-eval-visibly)
(insert "\"foo\"\n")
- (should (output= (ess-eval-region (point-min) (point-max) nil)
+ (should (ess-test-output= (ess-eval-region (point-min) (point-max) nil)
"[1] \"foo\"")))))
(ert-deftest ess-r-namespaced-eval-no-srcref-in-errors-test ()
;; Fails since https://github.com/emacs-ess/ESS/commit/3a7d913
(when nil
- (with-r-running nil
+ (ess-test-with-r-running nil
(let ((ess-r-evaluation-env "base")
(error-msg "Error: unexpected symbol")
ess-eval-visibly)
(insert "(foo bar)\n")
- (let ((output (output (ess-eval-region (point-min) (point-max) nil))))
+ (let ((output (ess-test-output (ess-eval-region (point-min)
(point-max) nil))))
(should (string= (substring output 0 (length error-msg))
error-msg)))))))
@@ -306,27 +306,27 @@
(should (eq (face-at-point) 'font-lock-function-name-face)))))
(ert-deftest inferior-ess-r-fontification-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(with-ess-process-buffer nil
;; Function-like keywords
(should (eq major-mode 'inferior-ess-r-mode))
- (insert-fontified "for")
- (should (not (face-at -1)))
- (insert-fontified "(")
- (should (eq (face-at -2) 'ess-keyword-face))
+ (ess-test-insert-fontified "for")
+ (should (not (ess-test-face-at -1)))
+ (ess-test-insert-fontified "(")
+ (should (eq (ess-test-face-at -2) 'ess-keyword-face))
;; `in` keyword
- (insert-fontified "foo in bar)")
+ (ess-test-insert-fontified "foo in bar)")
(search-backward "in")
(should (eq (face-at-point) 'ess-keyword-face))
(erase-buffer)
- (insert-fontified "for foo in bar")
+ (ess-test-insert-fontified "for foo in bar")
(search-backward "in")
(should (not (face-at-point))))))
;; roxy
(ert-deftest ess-roxy-preview-Rd-test ()
(let ((buf (generate-new-buffer " *temp*")))
- (with-r-running buf
+ (ess-test-with-r-running buf
(if (member "roxygen2" (ess-installed-packages))
(should
(string= "% Generated by roxygen2: do not edit by hand
@@ -647,7 +647,7 @@ x <- function(x){
(should (looking-at-p "x <- function(x){$"))))
(ert-deftest ess-test-r-help-mode ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(let ((ess-pop-to-buffer t))
(ess-display-help-on-object "plot")
(should (equal ess-help-object "plot"))
@@ -662,7 +662,7 @@ x <- function(x){
(ert-deftest ess-test-r-index-mode ()
(skip-unless (not noninteractive))
- (with-r-running nil
+ (ess-test-with-r-running nil
(let ((ess-pop-to-buffer t))
(ess-display-package-index "stats")
(should (equal ess-help-object "stats"))
@@ -693,11 +693,11 @@ x <- function(x){
(let ((proj-dir (expand-file-name ".."))
(cur-dir (directory-file-name (expand-file-name default-directory))))
(let ((ess-startup-directory nil))
- (with-r-running nil
+ (ess-test-with-r-running nil
(with-current-buffer (ess-get-process-buffer)
(should (string= proj-dir (directory-file-name (expand-file-name
default-directory)))))))
(let ((ess-startup-directory 'default-directory))
- (with-r-running nil
+ (ess-test-with-r-running nil
(with-current-buffer (ess-get-process-buffer)
(should (string= cur-dir (directory-file-name (expand-file-name
default-directory)))))))))
@@ -705,22 +705,22 @@ x <- function(x){
(let ((ess-history-file t)
(ess-startup-directory 'default-directory) ; don't start in the project
ess-history-directory)
- (with-r-running nil
+ (ess-test-with-r-running nil
(should (string= (expand-file-name ".Rhistory" default-directory)
(buffer-local-value 'comint-input-ring-file-name
(ess-get-process-buffer))))))
(let ((ess-history-file "foo")
(ess-history-directory temporary-file-directory))
- (with-r-running nil
+ (ess-test-with-r-running nil
(should (string= (expand-file-name "foo" temporary-file-directory)
(buffer-local-value 'comint-input-ring-file-name
(ess-get-process-buffer))))))
(let ((ess-history-file t)
(ess-history-directory temporary-file-directory))
- (with-r-running nil
+ (ess-test-with-r-running nil
(should (string= (expand-file-name ".Rhistory" temporary-file-directory)
(buffer-local-value 'comint-input-ring-file-name
(ess-get-process-buffer))))))
(let (ess-history-file
ess-history-directory)
- (with-r-running nil
+ (ess-test-with-r-running nil
(should-not (buffer-local-value 'comint-input-ring-file-name
(ess-get-process-buffer))))))
(ert-deftest ess-test-roxy-prefix-strip ()
@@ -873,7 +873,7 @@
https://github.com/emacs-ess/ESS/issues/725#issuecomment-431781558";
;; Check that our test is doing what we think it should, namely that it is
;; creating a mock remote process (i.e. a test of our test setup)
(with-ess-test-r-file (ess-test-create-remote-path "dummy-pkg/R/test.R")
- (with-r-running (current-buffer)
+ (ess-test-with-r-running (current-buffer)
(should (file-remote-p (ess-get-process-variable 'default-directory))))
(kill-buffer)))
@@ -906,7 +906,7 @@
https://github.com/emacs-ess/ESS/issues/725#issuecomment-431781558";
(ess--essr-load-or-throw-error remote-file-path
#'ess-r--fetch-ESSR-remote)))
(ert-deftest ess-r-failed-init-disable-bg-eval-test ()
- (with-r-running nil
+ (ess-test-with-r-running nil
(should-error (ess-r--init-error-handler))
(should (not (ess-can-eval-in-background)))
(let ((proc (ess-get-current-process)))
diff --git a/test/literate/tokens.R b/test/literate/tokens.R
index 8ba98565b1..e84bb2ef77 100644
--- a/test/literate/tokens.R
+++ b/test/literate/tokens.R
@@ -5,11 +5,11 @@
¶`a"a"a` "a`a`a"
-##! (should (token= "identifier" "`a\"a\"a`"))
+##! (should (ess-test-token= "identifier" "`a\"a\"a`"))
`a"a"a`¶ "a`a`a"
-##> (should (token= "string" "\"a`a`a\""))
+##> (should (ess-test-token= "string" "\"a`a`a\""))
`a"a"a` "a`a`a"¶
@@ -18,11 +18,11 @@
¶.a_a a10
-##! (should (token= "identifier" ".a_a"))
+##! (should (ess-test-token= "identifier" ".a_a"))
.a_a¶ a10
-##> (should (token= "identifier" "a10"))
+##> (should (ess-test-token= "identifier" "a10"))
.a_a a10¶
@@ -31,19 +31,19 @@
¶100 1E10 1e10 1.10
-##! (should (token= "number" "100"))
+##! (should (ess-test-token= "number" "100"))
100¶ 1E10 1e10 1.10
-##> (should (token= "number" "1E10"))
+##> (should (ess-test-token= "number" "1E10"))
100 1E10¶ 1e10 1.10
-##> (should (token= "number" "1e10"))
+##> (should (ess-test-token= "number" "1e10"))
100 1E10 1e10¶ 1.10
-##> (should (token= "number" "1.10"))
+##> (should (ess-test-token= "number" "1.10"))
100 1E10 1e10 1.10¶
@@ -52,16 +52,16 @@
¶() a[[[]]] {}
-##! (should (token= "("))
+##! (should (ess-test-token= "("))
(¶) a[[[]]] {}
-##> (should (token= ")"))
+##> (should (ess-test-token= ")"))
()¶ a[[[]]] {}
##> (ess-jump-token)
-##> (should (token= "[["))
+##> (should (ess-test-token= "[["))
() a[[¶[]]] {}
@@ -70,7 +70,7 @@
() a[[[¶]]] {}
-##> (should (token= "]]"))
+##> (should (ess-test-token= "]]"))
() a[[[]]¶] {}
@@ -79,11 +79,11 @@
() a[[[]]]¶ {}
-##> (should (token= "{"))
+##> (should (ess-test-token= "{"))
() a[[[]]] {¶}
-##> (should (token= "}"))
+##> (should (ess-test-token= "}"))
() a[[[]]] {}¶
@@ -103,12 +103,12 @@
¶.; .,
##! (ess-jump-token)
-##! (should (token= ";"))
+##! (should (ess-test-token= ";"))
.;¶ .,
##> (ess-jump-token)
-##> (should (token= ","))
+##> (should (ess-test-token= ","))
.; .,¶
@@ -117,12 +117,12 @@
¶if if_else else function while for
-##! (should (token= "if"))
-##! (should (token= "identifier" "if_else"))
-##! (should (token= "else"))
-##! (should (token= "function"))
-##! (should (token= "while"))
-##! (should (token= "for"))
+##! (should (ess-test-token= "if"))
+##! (should (ess-test-token= "identifier" "if_else"))
+##! (should (ess-test-token= "else"))
+##! (should (ess-test-token= "function"))
+##! (should (ess-test-token= "while"))
+##! (should (ess-test-token= "for"))
if if_else else function while for¶
@@ -135,17 +135,17 @@ if if_else else function while for¶
¶a & a && a &&& a | a || a ||| a
##! (ess-jump-token)
-##! (should (token= "&"))
+##! (should (ess-test-token= "&"))
a &¶ a && a &&& a | a || a ||| a
##> (ess-jump-token)
-##> (should (token= "&&"))
+##> (should (ess-test-token= "&&"))
a & a &&¶ a &&& a | a || a ||| a
##> (ess-jump-token)
-##> (should (token= "&&"))
+##> (should (ess-test-token= "&&"))
a & a && a &&¶& a | a || a ||| a
@@ -155,17 +155,17 @@ a & a && a &&¶& a | a || a ||| a
a & a && a &&&¶ a | a || a ||| a
##> (ess-jump-token)
-##> (should (token= "|"))
+##> (should (ess-test-token= "|"))
a & a && a &&& a |¶ a || a ||| a
##> (ess-jump-token)
-##> (should (token= "||"))
+##> (should (ess-test-token= "||"))
a & a && a &&& a | a ||¶ a ||| a
##> (ess-jump-token)
-##> (should (token= "||"))
+##> (should (ess-test-token= "||"))
a & a && a &&& a | a || a ||¶| a
@@ -180,22 +180,22 @@ a & a && a &&& a | a || a |||¶ a
¶a = a := a == a === a :== a != a :!= a
##! (ess-jump-token)
-##! (should (token= "="))
+##! (should (ess-test-token= "="))
a =¶ a := a == a === a :== a != a :!= a
##> (ess-jump-token)
-##> (should (token= ":="))
+##> (should (ess-test-token= ":="))
a = a :=¶ a == a === a :== a != a :!= a
##> (ess-jump-token)
-##> (should (token= "=="))
+##> (should (ess-test-token= "=="))
a = a := a ==¶ a === a :== a != a :!= a
##> (ess-jump-token)
-##> (should (token= "=="))
+##> (should (ess-test-token= "=="))
a = a := a == a ==¶= a :== a != a :!= a
@@ -205,7 +205,7 @@ a = a := a == a ==¶= a :== a != a :!= a
a = a := a == a ===¶ a :== a != a :!= a
##> (ess-jump-token)
-##> (should (token= ":="))
+##> (should (ess-test-token= ":="))
a = a := a == a === a :=¶= a != a :!= a
@@ -215,16 +215,16 @@ a = a := a == a === a :=¶= a != a :!= a
a = a := a == a === a :==¶ a != a :!= a
##> (ess-jump-token)
-##> (should (token= "!="))
+##> (should (ess-test-token= "!="))
a = a := a == a === a :== a !=¶ a :!= a
##> (ess-jump-token)
-##> (should (token= ":"))
+##> (should (ess-test-token= ":"))
a = a := a == a === a :== a != a :¶!= a
-##> (should (token= "!="))
+##> (should (ess-test-token= "!="))
a = a := a == a === a :== a != a :!=¶ a
@@ -234,26 +234,26 @@ a = a := a == a === a :== a != a :!=¶ a
¶a %>% a %a`a`a"a"a$a@a% a %% a %%% a % a
##! (ess-jump-token)
-##! (should (token= "%infix%" "%>%"))
+##! (should (ess-test-token= "%infix%" "%>%"))
a %>%¶ a %a`a`a"a"a$a@a% a %% a %%% a % a
##> (ess-jump-token)
-##> (should (token= "%infix%" "%a`a`a\"a\"a$a@a%"))
+##> (should (ess-test-token= "%infix%" "%a`a`a\"a\"a$a@a%"))
a %>% a %a`a`a"a"a$a@a%¶ a %% a %%% a % a
##> (ess-jump-token)
-##> (should (token= "%%"))
+##> (should (ess-test-token= "%%"))
a %>% a %a`a`a"a"a$a@a% a %%¶ a %%% a % a
##> (ess-jump-token)
-##> (should (token= "%%"))
+##> (should (ess-test-token= "%%"))
a %>% a %a`a`a"a"a$a@a% a %% a %%¶% a % a
-##> (should (token= "%infix%" "% a %"))
+##> (should (ess-test-token= "%infix%" "% a %"))
a %>% a %a`a`a"a"a$a@a% a %% a %%% a %¶ a
@@ -263,49 +263,49 @@ a %>% a %a`a`a"a"a$a@a% a %% a %%% a %¶ a
¶a + a - a - -a * a ** a ^ a ^ ++a
##! (ess-jump-token)
-##! (should (token= "+"))
+##! (should (ess-test-token= "+"))
a +¶ a - a - -a * a ** a ^ a ^ ++a
##> (ess-jump-token)
-##> (should (token= "-"))
+##> (should (ess-test-token= "-"))
a + a -¶ a - -a * a ** a ^ a ^ ++a
##> (ess-jump-token)
-##> (should (token= "-"))
+##> (should (ess-test-token= "-"))
a + a - a -¶ -a * a ** a ^ a ^ ++a
-##> (should (token= "-"))
+##> (should (ess-test-token= "-"))
a + a - a - -¶a * a ** a ^ a ^ ++a
##> (ess-jump-token)
-##> (should (token= "*"))
+##> (should (ess-test-token= "*"))
a + a - a - -a *¶ a ** a ^ a ^ ++a
##> (ess-jump-token)
-##> (should (token= "**"))
+##> (should (ess-test-token= "**"))
a + a - a - -a * a **¶ a ^ a ^ ++a
##> (ess-jump-token)
-##> (should (token= "^"))
+##> (should (ess-test-token= "^"))
a + a - a - -a * a ** a ^¶ a ^ ++a
##> (ess-jump-token)
-##> (should (token= "^"))
+##> (should (ess-test-token= "^"))
a + a - a - -a * a ** a ^ a ^¶ ++a
-##> (should (token= "+"))
+##> (should (ess-test-token= "+"))
a + a - a - -a * a ** a ^ a ^ +¶+a
-##> (should (token= "+"))
+##> (should (ess-test-token= "+"))
a + a - a - -a * a ** a ^ a ^ ++¶a
@@ -315,22 +315,22 @@ a + a - a - -a * a ** a ^ a ^ ++¶a
¶a: a:: a::: a:::: a:::=
##! (ess-jump-token)
-##! (should (token= ":"))
+##! (should (ess-test-token= ":"))
a:¶ a:: a::: a:::: a:::=
##> (ess-jump-token)
-##> (should (token= "::"))
+##> (should (ess-test-token= "::"))
a: a::¶ a::: a:::: a:::=
##> (ess-jump-token)
-##> (should (token= ":::"))
+##> (should (ess-test-token= ":::"))
a: a:: a:::¶ a:::: a:::=
##> (ess-jump-token)
-##> (should (token= ":::"))
+##> (should (ess-test-token= ":::"))
a: a:: a::: a:::¶: a:::=
@@ -340,7 +340,7 @@ a: a:: a::: a:::¶: a:::=
a: a:: a::: a::::¶ a:::=
##> (ess-jump-token)
-##> (should (token= ":::"))
+##> (should (ess-test-token= ":::"))
a: a:: a::: a:::: a:::¶=
@@ -350,32 +350,32 @@ a: a:: a::: a:::: a:::¶=
¶a <- a <<- a -> > a ->> a >> a
##! (ess-jump-token)
-##! (should (token= "<-"))
+##! (should (ess-test-token= "<-"))
a <-¶ a <<- a -> > a ->> a >> a
##> (ess-jump-token)
-##> (should (token= "<<-"))
+##> (should (ess-test-token= "<<-"))
a <- a <<-¶ a -> > a ->> a >> a
##> (ess-jump-token)
-##> (should (token= "->"))
+##> (should (ess-test-token= "->"))
a <- a <<- a ->¶ > a ->> a >> a
-##> (should (token= ">"))
+##> (should (ess-test-token= ">"))
a <- a <<- a -> >¶ a ->> a >> a
##> (ess-jump-token)
-##> (should (token= "->>"))
+##> (should (ess-test-token= "->>"))
a <- a <<- a -> > a ->>¶ a >> a
##> (ess-jump-token)
-##> (should (token= ">"))
-##> (should (token= ">"))
+##> (should (ess-test-token= ">"))
+##> (should (ess-test-token= ">"))
a <- a <<- a -> > a ->> a >>¶ a
@@ -385,30 +385,30 @@ a <- a <<- a -> > a ->> a >>¶ a
¶a < > a >= a > = a <=
##! (ess-jump-token)
-##! (should (token= "<"))
+##! (should (ess-test-token= "<"))
a <¶ > a >= a > = a <=
-##> (should (token= ">"))
+##> (should (ess-test-token= ">"))
a < >¶ a >= a > = a <=
##> (ess-jump-token)
-##> (should (token= ">="))
+##> (should (ess-test-token= ">="))
a < > a >=¶ a > = a <=
##> (ess-jump-token)
-##> (should (token= ">"))
+##> (should (ess-test-token= ">"))
a < > a >= a >¶ = a <=
-##> (should (token= "="))
+##> (should (ess-test-token= "="))
a < > a >= a > =¶ a <=
##> (ess-jump-token)
-##> (should (token= "<="))
+##> (should (ess-test-token= "<="))
a < > a >= a > = a <=¶
@@ -417,13 +417,13 @@ a < > a >= a > = a <=¶
¶~a~~a
-##! (should (token= "~"))
+##! (should (ess-test-token= "~"))
~¶a~~a
##> (ess-jump-token)
-##> (should (token= "~"))
-##> (should (token= "~"))
+##> (should (ess-test-token= "~"))
+##> (should (ess-test-token= "~"))
~a~~¶a
@@ -435,7 +435,7 @@ a < > a >= a > = a <=¶
call(param ¶= NULL)
-##! (should (token= "="))
+##! (should (ess-test-token= "="))
##! (should (ess-refined-token= (ess-token-before) "param-assign"))
call(param =¶ NULL)
@@ -445,7 +445,7 @@ call(param =¶ NULL)
call(¶"param" = NULL)
-##! (should (token= "string" "\"param\""))
+##! (should (ess-test-token= "string" "\"param\""))
##! (should (ess-refined-token= (ess-token-before) "identifier"))
call("param"¶ = NULL)
@@ -455,7 +455,7 @@ call("param"¶ = NULL)
¶"call"()
-##! (should (token= "string" "\"call\""))
+##! (should (ess-test-token= "string" "\"call\""))
##! (should (ess-refined-token= (ess-token-before) "identifier"))
"call"¶()
diff --git a/test/literate/tokens.el b/test/literate/tokens.el
index 03298696f2..c549b82df9 100644
--- a/test/literate/tokens.el
+++ b/test/literate/tokens.el
@@ -1,6 +1,6 @@
;; -*- lexical-binding: t; -*-
-(defun token= (type &optional value)
+(defun ess-test-token= (type &optional value)
"Check that the next token conforms to TYPE and VALUE.
This checks it back and forth and moves the point after the
token."
- [elpa] externals/ess updated (71b0e364a1 -> 3bff8e738c), ELPA Syncer, 2023/04/15
- [elpa] externals/ess d0f2e91c9c 05/19: Remove unused variable `ess-tmp-alist`, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 456b3bcaac 07/19: Remove dangling commands, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 06ac43a877 10/19: Define list variant of `face-at-point`, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 55d0eefc84 16/19: Fix state of failing test, ELPA Syncer, 2023/04/15
- [elpa] externals/ess d1fd5a52ad 13/19: Fix variable lookup, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 2d18e439f6 17/19: Add prefixes to test helpers,
ELPA Syncer <=
- [elpa] externals/ess a4bf4be25b 11/19: Disable failing tests for now, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 8dea4587a2 09/19: Fix etest paths, ELPA Syncer, 2023/04/15
- [elpa] externals/ess e4c73b573d 14/19: Use `save-current-buffer`, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 0a003c5f80 18/19: Enable lexical binding in `ess-r-syntax.el`, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 607710b650 02/19: Declare `inferior-ess-output-filter`, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 5a68fcc46f 15/19: Simplify `ess-test--with-r-running-1`, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 4c3a967f9f 03/19: Add missing declarations, ELPA Syncer, 2023/04/15
- [elpa] externals/ess f677bd1ffa 04/19: Remove lexical binding in syntax file, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 31e9f2cdbf 01/19: Fix compilation of package installed from Git; plus cosmetics, ELPA Syncer, 2023/04/15
- [elpa] externals/ess 3bff8e738c 19/19: Merge pull request #1245 from emacs-ess/patch-stefan, ELPA Syncer, 2023/04/15