Commit c8a972b0 authored by Paul Eggert's avatar Paul Eggert

Style fixes for indenting etc. in module code

This is mostly indenting and spacing changes.  Also, remove
some unnecessary static decls instead of bothering to reindent them.
* src/module.h (EMACS_EXTERN_C_BEGIN): Remove, and do this inline,
as most other Emacs files do for this sort of thing.
parent 7cd728c8
......@@ -3322,7 +3322,8 @@ fi
if test "${HAVE_MODULES}" = yes; then
MODULES_OBJ="dynlib.o module.o"
AC_DEFINE(HAVE_MODULES, 1, [Define to 1 if dynamic modules are enabled])
AC_DEFINE_UNQUOTED(MODULES_SUFFIX, "$MODULES_SUFFIX", [System extension for dynamic libraries])
AC_DEFINE_UNQUOTED(MODULES_SUFFIX, "$MODULES_SUFFIX",
[System extension for dynamic libraries])
fi
AC_SUBST(MODULES_OBJ)
AC_SUBST(LIBMODULES)
......
This diff is collapsed.
......@@ -19,11 +19,12 @@
(require 'ert)
(add-to-list 'load-path (file-name-directory (or #$ (expand-file-name (buffer-file-name)))))
(add-to-list 'load-path
(file-name-directory (or #$ (expand-file-name (buffer-file-name)))))
(require 'mod-test)
;;
;; basic tests
;; Basic tests.
;;
(ert-deftest mod-test-sum-test ()
......@@ -33,7 +34,7 @@
(should (string= (documentation 'mod-test-sum) "Return A + B")))
;;
;; non-local exists (throw, signal)
;; Non-local exists (throw, signal).
;;
(ert-deftest mod-test-non-local-exit-signal-test ()
......@@ -51,7 +52,8 @@
23)))
(ert-deftest mod-test-non-local-exit-funcall-signal ()
(should (equal (mod-test-non-local-exit-funcall (lambda () (signal 'error '(32))))
(should (equal (mod-test-non-local-exit-funcall
(lambda () (signal 'error '(32))))
'(signal error (32)))))
(ert-deftest mod-test-non-local-exit-funcall-throw ()
......@@ -59,7 +61,7 @@
'(throw tag 32))))
;;
;; string
;; String tests.
;;
(defun multiply-string (s n)
......@@ -77,7 +79,7 @@
(should (string= (mod-test-string-a-to-b "aaa") "bbb")))
;;
;; user-pointer
;; User-pointer tests.
;;
(ert-deftest mod-test-userptr-fun-test ()
......@@ -92,7 +94,7 @@
;; TODO: try to test finalizer
;;
;; vectors
;; Vector tests.
;;
(ert-deftest mod-test-vector-test ()
......
......@@ -56,7 +56,8 @@ def cmd_test(args):
print '[*] %s: running test' % m
testpath = os.path.join(m, 'test.el')
if os.path.isfile(testpath):
emacs_cmd = [EMACS, '-batch', '-L', '.', '-l', 'ert', '-l', testpath, '-f', 'ert-run-tests-batch-and-exit']
emacs_cmd = [EMACS, '-batch', '-L', '.', '-l', 'ert',
'-l', testpath, '-f', 'ert-run-tests-batch-and-exit']
print ' '.join(emacs_cmd)
r = sp.call(emacs_cmd)
if r != 0:
......@@ -111,13 +112,16 @@ def main():
subp = mainp.add_subparsers()
testp = subp.add_parser('test', help='run tests')
testp.add_argument('-f', '--force', action='store_true', help='force regeneration (make -B)')
testp.add_argument('module', nargs='*', help='path to module to test (default all)')
testp.add_argument('-f', '--force', action='store_true',
help='force regeneration (make -B)')
testp.add_argument('module', nargs='*',
help='path to module to test (default all)')
testp.set_defaults(func=cmd_test)
initp = subp.add_parser('init', help='create a test module from a template')
initp.add_argument('module', help='name of the new module')
initp.add_argument('-f', '--fun', default='fun', help='overide name of the default function')
initp.add_argument('-f', '--fun', default='fun',
help='overide name of the default function')
initp.set_defaults(func=cmd_init)
args = mainp.parse_args()
......@@ -149,13 +153,15 @@ def main():
int plugin_is_GPL_compatible;
static emacs_value ${c_func} (emacs_env *env, int nargs, emacs_value args[], void *data)
static emacs_value
${c_func} (emacs_env *env, int nargs, emacs_value args[], void *data)
{
return env->intern (env, "t");
}
/* Binds NAME to FUN */
static void bind_function (emacs_env *env, const char *name, emacs_value Sfun)
/* Bind NAME to FUN. */
static void
bind_function (emacs_env *env, const char *name, emacs_value Sfun)
{
emacs_value Qfset = env->intern (env, "fset");
emacs_value Qsym = env->intern (env, name);
......@@ -164,8 +170,9 @@ def main():
env->funcall (env, Qfset, 2, args);
}
/* Provide FEATURE to Emacs */
static void provide (emacs_env *env, const char *feature)
/* Provide FEATURE to Emacs. */
static void
provide (emacs_env *env, const char *feature)
{
emacs_value Qfeat = env->intern (env, feature);
emacs_value Qprovide = env->intern (env, "provide");
......@@ -174,10 +181,12 @@ def main():
env->funcall (env, Qprovide, 1, args);
}
int emacs_module_init (struct emacs_runtime *ert)
int
emacs_module_init (struct emacs_runtime *ert)
{
emacs_env *env = ert->get_environment (ert);
bind_function (env, "${lisp_func}", env->make_function (env, 1, 1, ${c_func}, "doc", NULL));
bind_function (env, "${lisp_func}",
env->make_function (env, 1, 1, ${c_func}, "doc", NULL));
provide (env, "${module}");
return 0;
}
......
......@@ -26,63 +26,68 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "dynlib.h"
/*
* Windows systems
*/
#if defined(_WIN32)
#if defined _WIN32
/* MS-Windows systems. */
#include <windows.h>
dynlib_handle_ptr dynlib_open (const char * path)
dynlib_handle_ptr
dynlib_open (const char *path)
{
return (dynlib_handle_ptr) LoadLibrary (path);
}
void * dynlib_sym (dynlib_handle_ptr h, const char * sym)
void *
dynlib_sym (dynlib_handle_ptr h, const char *sym)
{
return GetProcAddress ((HMODULE) h, sym);
}
bool dynlib_addr (void *ptr, const char **path, const char **sym)
bool
dynlib_addr (void *ptr, const char **path, const char **sym)
{
return false; /* not implemented */
}
const char * dynlib_error (void)
const char *
dynlib_error (void)
{
/* TODO: use GetLastError(), FormatMessage(), ... */
return "Can't load DLL";
}
int dynlib_close (dynlib_handle_ptr h)
int
dynlib_close (dynlib_handle_ptr h)
{
return FreeLibrary ((HMODULE) h) != 0;
}
#elif defined HAVE_UNISTD_H
/*
* POSIX systems
*/
#elif defined(HAVE_UNISTD_H)
/* POSIX systems. */
#include <dlfcn.h>
dynlib_handle_ptr dynlib_open (const char * path)
dynlib_handle_ptr
dynlib_open (const char *path)
{
return dlopen (path, RTLD_LAZY);
}
void * dynlib_sym (dynlib_handle_ptr h, const char * sym)
void *
dynlib_sym (dynlib_handle_ptr h, const char *sym)
{
return dlsym (h, sym);
}
bool dynlib_addr (void *ptr, const char **path, const char **sym)
bool
dynlib_addr (void *ptr, const char **path, const char **sym)
{
#ifdef HAVE_DLADDR
Dl_info info;
if (dladdr (ptr, &info) != 0 && info.dli_fname != NULL && info.dli_sname != NULL)
if (dladdr (ptr, &info) && info.dli_fname && info.dli_sname)
{
*path = info.dli_fname;
*sym = info.dli_sname;
......@@ -92,12 +97,14 @@ bool dynlib_addr (void *ptr, const char **path, const char **sym)
return false;
}
const char * dynlib_error (void)
const char *
dynlib_error (void)
{
return dlerror ();
}
int dynlib_close (dynlib_handle_ptr h)
int
dynlib_close (dynlib_handle_ptr h)
{
return dlclose (h) == 0;
}
......
......@@ -23,11 +23,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdbool.h>
typedef void* dynlib_handle_ptr;
dynlib_handle_ptr dynlib_open (const char * path);
void * dynlib_sym (dynlib_handle_ptr h, const char * sym);
typedef void *dynlib_handle_ptr;
dynlib_handle_ptr dynlib_open (const char *path);
void *dynlib_sym (dynlib_handle_ptr h, const char *sym);
bool dynlib_addr (void *ptr, const char **path, const char **sym);
const char * dynlib_error (void);
const char *dynlib_error (void);
int dynlib_close (dynlib_handle_ptr h);
#endif /* DYNLIB_H */
......@@ -2246,7 +2246,7 @@ struct Lisp_User_Ptr
bool_bf gcmarkbit : 1;
unsigned spacer : 15;
void (*finalizer) (void*);
void (*finalizer) (void *);
void *p;
};
#endif
......@@ -2347,7 +2347,6 @@ XUSER_PTR (Lisp_Object a)
}
#endif
/* Forwarding pointer to an int variable.
This is allowed only in the value cell of a symbol,
......
This diff is collapsed.
This diff is collapsed.
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