diff options
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/eval.c b/src/eval.c index 0f9e012b823..d6d62aa4afb 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -126,6 +126,7 @@ static Lisp_Object funcall_lambda (Lisp_Object, size_t, Lisp_Object *); | |||
| 126 | static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; | 126 | static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; |
| 127 | static int interactive_p (int); | 127 | static int interactive_p (int); |
| 128 | static Lisp_Object apply_lambda (Lisp_Object fun, Lisp_Object args); | 128 | static Lisp_Object apply_lambda (Lisp_Object fun, Lisp_Object args); |
| 129 | INFUN (Ffetch_bytecode, 1); | ||
| 129 | 130 | ||
| 130 | void | 131 | void |
| 131 | init_eval_once (void) | 132 | init_eval_once (void) |
| @@ -339,7 +340,7 @@ usage: (cond CLAUSES...) */) | |||
| 339 | return val; | 340 | return val; |
| 340 | } | 341 | } |
| 341 | 342 | ||
| 342 | DEFUN ("progn", Fprogn, Sprogn, 0, UNEVALLED, 0, | 343 | DEFUE ("progn", Fprogn, Sprogn, 0, UNEVALLED, 0, |
| 343 | doc: /* Eval BODY forms sequentially and return value of last one. | 344 | doc: /* Eval BODY forms sequentially and return value of last one. |
| 344 | usage: (progn BODY...) */) | 345 | usage: (progn BODY...) */) |
| 345 | (Lisp_Object args) | 346 | (Lisp_Object args) |
| @@ -504,7 +505,7 @@ usage: (function ARG) */) | |||
| 504 | } | 505 | } |
| 505 | 506 | ||
| 506 | 507 | ||
| 507 | DEFUN ("interactive-p", Finteractive_p, Sinteractive_p, 0, 0, 0, | 508 | DEFUE ("interactive-p", Finteractive_p, Sinteractive_p, 0, 0, 0, |
| 508 | doc: /* Return t if the containing function was run directly by user input. | 509 | doc: /* Return t if the containing function was run directly by user input. |
| 509 | This means that the function was called with `call-interactively' | 510 | This means that the function was called with `call-interactively' |
| 510 | \(which includes being called as the binding of a key) | 511 | \(which includes being called as the binding of a key) |
| @@ -1310,7 +1311,7 @@ unwind_to_catch (struct catchtag *catch, Lisp_Object value) | |||
| 1310 | _longjmp (catch->jmp, 1); | 1311 | _longjmp (catch->jmp, 1); |
| 1311 | } | 1312 | } |
| 1312 | 1313 | ||
| 1313 | DEFUN ("throw", Fthrow, Sthrow, 2, 2, 0, | 1314 | DEFUE ("throw", Fthrow, Sthrow, 2, 2, 0, |
| 1314 | doc: /* Throw to the catch for TAG and return VALUE from it. | 1315 | doc: /* Throw to the catch for TAG and return VALUE from it. |
| 1315 | Both TAG and VALUE are evalled. */) | 1316 | Both TAG and VALUE are evalled. */) |
| 1316 | (register Lisp_Object tag, Lisp_Object value) | 1317 | (register Lisp_Object tag, Lisp_Object value) |
| @@ -1648,7 +1649,7 @@ static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object, | |||
| 1648 | static int maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig, | 1649 | static int maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig, |
| 1649 | Lisp_Object data); | 1650 | Lisp_Object data); |
| 1650 | 1651 | ||
| 1651 | DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0, | 1652 | DEFUE ("signal", Fsignal, Ssignal, 2, 2, 0, |
| 1652 | doc: /* Signal an error. Args are ERROR-SYMBOL and associated DATA. | 1653 | doc: /* Signal an error. Args are ERROR-SYMBOL and associated DATA. |
| 1653 | This function does not return. | 1654 | This function does not return. |
| 1654 | 1655 | ||
| @@ -2032,7 +2033,7 @@ error (const char *m, ...) | |||
| 2032 | va_end (ap); | 2033 | va_end (ap); |
| 2033 | } | 2034 | } |
| 2034 | 2035 | ||
| 2035 | DEFUN ("commandp", Fcommandp, Scommandp, 1, 2, 0, | 2036 | DEFUE ("commandp", Fcommandp, Scommandp, 1, 2, 0, |
| 2036 | doc: /* Non-nil if FUNCTION makes provisions for interactive calling. | 2037 | doc: /* Non-nil if FUNCTION makes provisions for interactive calling. |
| 2037 | This means it contains a description for how to read arguments to give it. | 2038 | This means it contains a description for how to read arguments to give it. |
| 2038 | The value is nil for an invalid function or a symbol with no function | 2039 | The value is nil for an invalid function or a symbol with no function |
| @@ -2213,7 +2214,7 @@ do_autoload (Lisp_Object fundef, Lisp_Object funname) | |||
| 2213 | } | 2214 | } |
| 2214 | 2215 | ||
| 2215 | 2216 | ||
| 2216 | DEFUN ("eval", Feval, Seval, 1, 2, 0, | 2217 | DEFUE ("eval", Feval, Seval, 1, 2, 0, |
| 2217 | doc: /* Evaluate FORM and return its value. | 2218 | doc: /* Evaluate FORM and return its value. |
| 2218 | If LEXICAL is t, evaluate using lexical scoping. */) | 2219 | If LEXICAL is t, evaluate using lexical scoping. */) |
| 2219 | (Lisp_Object form, Lisp_Object lexical) | 2220 | (Lisp_Object form, Lisp_Object lexical) |
| @@ -2449,7 +2450,7 @@ eval_sub (Lisp_Object form) | |||
| 2449 | return val; | 2450 | return val; |
| 2450 | } | 2451 | } |
| 2451 | 2452 | ||
| 2452 | DEFUN ("apply", Fapply, Sapply, 2, MANY, 0, | 2453 | DEFUE ("apply", Fapply, Sapply, 2, MANY, 0, |
| 2453 | doc: /* Call FUNCTION with our remaining args, using our last arg as list of args. | 2454 | doc: /* Call FUNCTION with our remaining args, using our last arg as list of args. |
| 2454 | Then return the value FUNCTION returns. | 2455 | Then return the value FUNCTION returns. |
| 2455 | Thus, (apply '+ 1 2 '(3 4)) returns 10. | 2456 | Thus, (apply '+ 1 2 '(3 4)) returns 10. |
| @@ -2544,7 +2545,7 @@ funcall_nil (size_t nargs, Lisp_Object *args) | |||
| 2544 | return Qnil; | 2545 | return Qnil; |
| 2545 | } | 2546 | } |
| 2546 | 2547 | ||
| 2547 | DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0, | 2548 | DEFUE ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0, |
| 2548 | doc: /* Run each hook in HOOKS. | 2549 | doc: /* Run each hook in HOOKS. |
| 2549 | Each argument should be a symbol, a hook variable. | 2550 | Each argument should be a symbol, a hook variable. |
| 2550 | These symbols are processed in the order specified. | 2551 | These symbols are processed in the order specified. |
| @@ -2573,7 +2574,7 @@ usage: (run-hooks &rest HOOKS) */) | |||
| 2573 | return Qnil; | 2574 | return Qnil; |
| 2574 | } | 2575 | } |
| 2575 | 2576 | ||
| 2576 | DEFUN ("run-hook-with-args", Frun_hook_with_args, | 2577 | DEFUE ("run-hook-with-args", Frun_hook_with_args, |
| 2577 | Srun_hook_with_args, 1, MANY, 0, | 2578 | Srun_hook_with_args, 1, MANY, 0, |
| 2578 | doc: /* Run HOOK with the specified arguments ARGS. | 2579 | doc: /* Run HOOK with the specified arguments ARGS. |
| 2579 | HOOK should be a symbol, a hook variable. If HOOK has a non-nil | 2580 | HOOK should be a symbol, a hook variable. If HOOK has a non-nil |
| @@ -2619,7 +2620,7 @@ funcall_not (size_t nargs, Lisp_Object *args) | |||
| 2619 | return NILP (Ffuncall (nargs, args)) ? Qt : Qnil; | 2620 | return NILP (Ffuncall (nargs, args)) ? Qt : Qnil; |
| 2620 | } | 2621 | } |
| 2621 | 2622 | ||
| 2622 | DEFUN ("run-hook-with-args-until-failure", Frun_hook_with_args_until_failure, | 2623 | DEFUE ("run-hook-with-args-until-failure", Frun_hook_with_args_until_failure, |
| 2623 | Srun_hook_with_args_until_failure, 1, MANY, 0, | 2624 | Srun_hook_with_args_until_failure, 1, MANY, 0, |
| 2624 | doc: /* Run HOOK with the specified arguments ARGS. | 2625 | doc: /* Run HOOK with the specified arguments ARGS. |
| 2625 | HOOK should be a symbol, a hook variable. If HOOK has a non-nil | 2626 | HOOK should be a symbol, a hook variable. If HOOK has a non-nil |
| @@ -2906,7 +2907,7 @@ call7 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, | |||
| 2906 | 2907 | ||
| 2907 | /* The caller should GCPRO all the elements of ARGS. */ | 2908 | /* The caller should GCPRO all the elements of ARGS. */ |
| 2908 | 2909 | ||
| 2909 | DEFUN ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0, | 2910 | DEFUE ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0, |
| 2910 | doc: /* Non-nil if OBJECT is a function. */) | 2911 | doc: /* Non-nil if OBJECT is a function. */) |
| 2911 | (Lisp_Object object) | 2912 | (Lisp_Object object) |
| 2912 | { | 2913 | { |
| @@ -2939,7 +2940,7 @@ DEFUN ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0, | |||
| 2939 | return Qnil; | 2940 | return Qnil; |
| 2940 | } | 2941 | } |
| 2941 | 2942 | ||
| 2942 | DEFUN ("funcall", Ffuncall, Sfuncall, 1, MANY, 0, | 2943 | DEFUE ("funcall", Ffuncall, Sfuncall, 1, MANY, 0, |
| 2943 | doc: /* Call first argument as a function, passing remaining arguments to it. | 2944 | doc: /* Call first argument as a function, passing remaining arguments to it. |
| 2944 | Return the value that function returns. | 2945 | Return the value that function returns. |
| 2945 | Thus, (funcall 'cons 'x 'y) returns (x . y). | 2946 | Thus, (funcall 'cons 'x 'y) returns (x . y). |
| @@ -3647,8 +3648,6 @@ mark_backtrace (void) | |||
| 3647 | } | 3648 | } |
| 3648 | } | 3649 | } |
| 3649 | 3650 | ||
| 3650 | EXFUN (Funintern, 2); | ||
| 3651 | |||
| 3652 | void | 3651 | void |
| 3653 | syms_of_eval (void) | 3652 | syms_of_eval (void) |
| 3654 | { | 3653 | { |