Commit 8f46e67f authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-27

1fc742b6 ; Update ChangeLog.3
4c7f6217 * etc/AUTHORS: Update.
24391f51 Update authors.el
56f95880 * etc/NEWS: Remove temporary markup.
73a2f510 Add another test for global module references

# Conflicts:
#	etc/AUTHORS
#	etc/NEWS
parents 64a1b424 1fc742b6
This diff is collapsed.
This diff is collapsed.
......@@ -215,6 +215,35 @@ Fmod_test_globref_invalid_free (emacs_env *env, ptrdiff_t nargs,
return env->intern (env, "nil");
}
/* Allocate and free global references in a different order. */
static emacs_value
Fmod_test_globref_reordered (emacs_env *env, ptrdiff_t nargs,
emacs_value *args, void *data)
{
emacs_value booleans[2] = {
env->intern (env, "nil"),
env->intern (env, "t"),
};
emacs_value local = env->intern (env, "foo");
emacs_value globals[4] = {
env->make_global_ref (env, local),
env->make_global_ref (env, local),
env->make_global_ref (env, env->intern (env, "foo")),
env->make_global_ref (env, env->intern (env, "bar")),
};
emacs_value elements[4];
for (int i = 0; i < 4; ++i)
elements[i] = booleans[env->eq (env, globals[i], local)];
emacs_value ret = env->funcall (env, env->intern (env, "list"), 4, elements);
env->free_global_ref (env, globals[2]);
env->free_global_ref (env, globals[1]);
env->free_global_ref (env, globals[3]);
env->free_global_ref (env, globals[0]);
return ret;
}
/* Return a copy of the argument string where every 'a' is replaced
with 'b'. */
static emacs_value
......@@ -708,6 +737,8 @@ emacs_module_init (struct emacs_runtime *ert)
DEFUN ("mod-test-globref-free", Fmod_test_globref_free, 4, 4, NULL, NULL);
DEFUN ("mod-test-globref-invalid-free", Fmod_test_globref_invalid_free, 0, 0,
NULL, NULL);
DEFUN ("mod-test-globref-reordered", Fmod_test_globref_reordered, 0, 0, NULL,
NULL);
DEFUN ("mod-test-string-a-to-b", Fmod_test_string_a_to_b, 1, 1, NULL, NULL);
DEFUN ("mod-test-userptr-make", Fmod_test_userptr_make, 1, 1, NULL, NULL);
DEFUN ("mod-test-userptr-get", Fmod_test_userptr_get, 1, 1, NULL, NULL);
......
......@@ -162,6 +162,9 @@ changes."
(ert-deftest mod-test-globref-free-test ()
(should (eq (mod-test-globref-free 1 'a "test" 'b) 'ok)))
(ert-deftest mod-test-globref-reordered ()
(should (equal (mod-test-globref-reordered) '(t t t nil))))
(ert-deftest mod-test-string-a-to-b-test ()
(should (string= (mod-test-string-a-to-b "aaa") "bbb")))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment