aboutsummaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorDan Nicolaescu2010-04-25 15:16:58 -0700
committerDan Nicolaescu2010-04-25 15:16:58 -0700
commit39e2ad1b9fef5b0437ed18c77bd703003a2b8e54 (patch)
treede4ba811bfa01e91b4ac0fbc1edbeadac226bd02 /src/eval.c
parent6bdf5d652360b79c8ee6194e8dd1b23ef4721a53 (diff)
downloademacs-39e2ad1b9fef5b0437ed18c77bd703003a2b8e54.tar.gz
emacs-39e2ad1b9fef5b0437ed18c77bd703003a2b8e54.zip
Remove all NO_ARG_ARRAY uses.
* fns.c (concat2, concat3, nconc2): * eval.c (apply1, call1, call2, call3, call4, call5, call6) (call7): Remove NO_ARG_ARRAY usage, assume it's always true. * m/xtensa.h (NO_ARG_ARRAY): * m/template.h (NO_ARG_ARRAY): * m/sparc.h (NO_ARG_ARRAY): * m/sh3.h (NO_ARG_ARRAY): * m/mips.h (NO_ARG_ARRAY): * m/macppc.h (NO_ARG_ARRAY): * m/iris4d.h (NO_ARG_ARRAY): * m/intel386.h (NO_ARG_ARRAY): * m/ibms390x.h (NO_ARG_ARRAY): * m/ibms390.h (NO_ARG_ARRAY): * m/ibmrs6000.h (NO_ARG_ARRAY): * m/ia64.h (NO_ARG_ARRAY): * m/hp800.h (NO_ARG_ARRAY): * m/arm.h (NO_ARG_ARRAY): * m/amdx86-64.h (NO_ARG_ARRAY): * m/alpha.h (NO_ARG_ARRAY): Remove definition.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c46
1 files changed, 0 insertions, 46 deletions
diff --git a/src/eval.c b/src/eval.c
index 501ffd452cb..184455f7e7d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2786,7 +2786,6 @@ apply1 (fn, arg)
2786 if (NILP (arg)) 2786 if (NILP (arg))
2787 RETURN_UNGCPRO (Ffuncall (1, &fn)); 2787 RETURN_UNGCPRO (Ffuncall (1, &fn));
2788 gcpro1.nvars = 2; 2788 gcpro1.nvars = 2;
2789#ifdef NO_ARG_ARRAY
2790 { 2789 {
2791 Lisp_Object args[2]; 2790 Lisp_Object args[2];
2792 args[0] = fn; 2791 args[0] = fn;
@@ -2794,9 +2793,6 @@ apply1 (fn, arg)
2794 gcpro1.var = args; 2793 gcpro1.var = args;
2795 RETURN_UNGCPRO (Fapply (2, args)); 2794 RETURN_UNGCPRO (Fapply (2, args));
2796 } 2795 }
2797#else /* not NO_ARG_ARRAY */
2798 RETURN_UNGCPRO (Fapply (2, &fn));
2799#endif /* not NO_ARG_ARRAY */
2800} 2796}
2801 2797
2802/* Call function fn on no arguments */ 2798/* Call function fn on no arguments */
@@ -2817,7 +2813,6 @@ call1 (fn, arg1)
2817 Lisp_Object fn, arg1; 2813 Lisp_Object fn, arg1;
2818{ 2814{
2819 struct gcpro gcpro1; 2815 struct gcpro gcpro1;
2820#ifdef NO_ARG_ARRAY
2821 Lisp_Object args[2]; 2816 Lisp_Object args[2];
2822 2817
2823 args[0] = fn; 2818 args[0] = fn;
@@ -2825,11 +2820,6 @@ call1 (fn, arg1)
2825 GCPRO1 (args[0]); 2820 GCPRO1 (args[0]);
2826 gcpro1.nvars = 2; 2821 gcpro1.nvars = 2;
2827 RETURN_UNGCPRO (Ffuncall (2, args)); 2822 RETURN_UNGCPRO (Ffuncall (2, args));
2828#else /* not NO_ARG_ARRAY */
2829 GCPRO1 (fn);
2830 gcpro1.nvars = 2;
2831 RETURN_UNGCPRO (Ffuncall (2, &fn));
2832#endif /* not NO_ARG_ARRAY */
2833} 2823}
2834 2824
2835/* Call function fn with 2 arguments arg1, arg2 */ 2825/* Call function fn with 2 arguments arg1, arg2 */
@@ -2839,7 +2829,6 @@ call2 (fn, arg1, arg2)
2839 Lisp_Object fn, arg1, arg2; 2829 Lisp_Object fn, arg1, arg2;
2840{ 2830{
2841 struct gcpro gcpro1; 2831 struct gcpro gcpro1;
2842#ifdef NO_ARG_ARRAY
2843 Lisp_Object args[3]; 2832 Lisp_Object args[3];
2844 args[0] = fn; 2833 args[0] = fn;
2845 args[1] = arg1; 2834 args[1] = arg1;
@@ -2847,11 +2836,6 @@ call2 (fn, arg1, arg2)
2847 GCPRO1 (args[0]); 2836 GCPRO1 (args[0]);
2848 gcpro1.nvars = 3; 2837 gcpro1.nvars = 3;
2849 RETURN_UNGCPRO (Ffuncall (3, args)); 2838 RETURN_UNGCPRO (Ffuncall (3, args));
2850#else /* not NO_ARG_ARRAY */
2851 GCPRO1 (fn);
2852 gcpro1.nvars = 3;
2853 RETURN_UNGCPRO (Ffuncall (3, &fn));
2854#endif /* not NO_ARG_ARRAY */
2855} 2839}
2856 2840
2857/* Call function fn with 3 arguments arg1, arg2, arg3 */ 2841/* Call function fn with 3 arguments arg1, arg2, arg3 */
@@ -2861,7 +2845,6 @@ call3 (fn, arg1, arg2, arg3)
2861 Lisp_Object fn, arg1, arg2, arg3; 2845 Lisp_Object fn, arg1, arg2, arg3;
2862{ 2846{
2863 struct gcpro gcpro1; 2847 struct gcpro gcpro1;
2864#ifdef NO_ARG_ARRAY
2865 Lisp_Object args[4]; 2848 Lisp_Object args[4];
2866 args[0] = fn; 2849 args[0] = fn;
2867 args[1] = arg1; 2850 args[1] = arg1;
@@ -2870,11 +2853,6 @@ call3 (fn, arg1, arg2, arg3)
2870 GCPRO1 (args[0]); 2853 GCPRO1 (args[0]);
2871 gcpro1.nvars = 4; 2854 gcpro1.nvars = 4;
2872 RETURN_UNGCPRO (Ffuncall (4, args)); 2855 RETURN_UNGCPRO (Ffuncall (4, args));
2873#else /* not NO_ARG_ARRAY */
2874 GCPRO1 (fn);
2875 gcpro1.nvars = 4;
2876 RETURN_UNGCPRO (Ffuncall (4, &fn));
2877#endif /* not NO_ARG_ARRAY */
2878} 2856}
2879 2857
2880/* Call function fn with 4 arguments arg1, arg2, arg3, arg4 */ 2858/* Call function fn with 4 arguments arg1, arg2, arg3, arg4 */
@@ -2884,7 +2862,6 @@ call4 (fn, arg1, arg2, arg3, arg4)
2884 Lisp_Object fn, arg1, arg2, arg3, arg4; 2862 Lisp_Object fn, arg1, arg2, arg3, arg4;
2885{ 2863{
2886 struct gcpro gcpro1; 2864 struct gcpro gcpro1;
2887#ifdef NO_ARG_ARRAY
2888 Lisp_Object args[5]; 2865 Lisp_Object args[5];
2889 args[0] = fn; 2866 args[0] = fn;
2890 args[1] = arg1; 2867 args[1] = arg1;
@@ -2894,11 +2871,6 @@ call4 (fn, arg1, arg2, arg3, arg4)
2894 GCPRO1 (args[0]); 2871 GCPRO1 (args[0]);
2895 gcpro1.nvars = 5; 2872 gcpro1.nvars = 5;
2896 RETURN_UNGCPRO (Ffuncall (5, args)); 2873 RETURN_UNGCPRO (Ffuncall (5, args));
2897#else /* not NO_ARG_ARRAY */
2898 GCPRO1 (fn);
2899 gcpro1.nvars = 5;
2900 RETURN_UNGCPRO (Ffuncall (5, &fn));
2901#endif /* not NO_ARG_ARRAY */
2902} 2874}
2903 2875
2904/* Call function fn with 5 arguments arg1, arg2, arg3, arg4, arg5 */ 2876/* Call function fn with 5 arguments arg1, arg2, arg3, arg4, arg5 */
@@ -2908,7 +2880,6 @@ call5 (fn, arg1, arg2, arg3, arg4, arg5)
2908 Lisp_Object fn, arg1, arg2, arg3, arg4, arg5; 2880 Lisp_Object fn, arg1, arg2, arg3, arg4, arg5;
2909{ 2881{
2910 struct gcpro gcpro1; 2882 struct gcpro gcpro1;
2911#ifdef NO_ARG_ARRAY
2912 Lisp_Object args[6]; 2883 Lisp_Object args[6];
2913 args[0] = fn; 2884 args[0] = fn;
2914 args[1] = arg1; 2885 args[1] = arg1;
@@ -2919,11 +2890,6 @@ call5 (fn, arg1, arg2, arg3, arg4, arg5)
2919 GCPRO1 (args[0]); 2890 GCPRO1 (args[0]);
2920 gcpro1.nvars = 6; 2891 gcpro1.nvars = 6;
2921 RETURN_UNGCPRO (Ffuncall (6, args)); 2892 RETURN_UNGCPRO (Ffuncall (6, args));
2922#else /* not NO_ARG_ARRAY */
2923 GCPRO1 (fn);
2924 gcpro1.nvars = 6;
2925 RETURN_UNGCPRO (Ffuncall (6, &fn));
2926#endif /* not NO_ARG_ARRAY */
2927} 2893}
2928 2894
2929/* Call function fn with 6 arguments arg1, arg2, arg3, arg4, arg5, arg6 */ 2895/* Call function fn with 6 arguments arg1, arg2, arg3, arg4, arg5, arg6 */
@@ -2933,7 +2899,6 @@ call6 (fn, arg1, arg2, arg3, arg4, arg5, arg6)
2933 Lisp_Object fn, arg1, arg2, arg3, arg4, arg5, arg6; 2899 Lisp_Object fn, arg1, arg2, arg3, arg4, arg5, arg6;
2934{ 2900{
2935 struct gcpro gcpro1; 2901 struct gcpro gcpro1;
2936#ifdef NO_ARG_ARRAY
2937 Lisp_Object args[7]; 2902 Lisp_Object args[7];
2938 args[0] = fn; 2903 args[0] = fn;
2939 args[1] = arg1; 2904 args[1] = arg1;
@@ -2945,11 +2910,6 @@ call6 (fn, arg1, arg2, arg3, arg4, arg5, arg6)
2945 GCPRO1 (args[0]); 2910 GCPRO1 (args[0]);
2946 gcpro1.nvars = 7; 2911 gcpro1.nvars = 7;
2947 RETURN_UNGCPRO (Ffuncall (7, args)); 2912 RETURN_UNGCPRO (Ffuncall (7, args));
2948#else /* not NO_ARG_ARRAY */
2949 GCPRO1 (fn);
2950 gcpro1.nvars = 7;
2951 RETURN_UNGCPRO (Ffuncall (7, &fn));
2952#endif /* not NO_ARG_ARRAY */
2953} 2913}
2954 2914
2955/* Call function fn with 7 arguments arg1, arg2, arg3, arg4, arg5, arg6, arg7 */ 2915/* Call function fn with 7 arguments arg1, arg2, arg3, arg4, arg5, arg6, arg7 */
@@ -2959,7 +2919,6 @@ call7 (fn, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
2959 Lisp_Object fn, arg1, arg2, arg3, arg4, arg5, arg6, arg7; 2919 Lisp_Object fn, arg1, arg2, arg3, arg4, arg5, arg6, arg7;
2960{ 2920{
2961 struct gcpro gcpro1; 2921 struct gcpro gcpro1;
2962#ifdef NO_ARG_ARRAY
2963 Lisp_Object args[8]; 2922 Lisp_Object args[8];
2964 args[0] = fn; 2923 args[0] = fn;
2965 args[1] = arg1; 2924 args[1] = arg1;
@@ -2972,11 +2931,6 @@ call7 (fn, arg1, arg2, arg3, arg4, arg5, arg6, arg7)
2972 GCPRO1 (args[0]); 2931 GCPRO1 (args[0]);
2973 gcpro1.nvars = 8; 2932 gcpro1.nvars = 8;
2974 RETURN_UNGCPRO (Ffuncall (8, args)); 2933 RETURN_UNGCPRO (Ffuncall (8, args));
2975#else /* not NO_ARG_ARRAY */
2976 GCPRO1 (fn);
2977 gcpro1.nvars = 8;
2978 RETURN_UNGCPRO (Ffuncall (8, &fn));
2979#endif /* not NO_ARG_ARRAY */
2980} 2934}
2981 2935
2982/* The caller should GCPRO all the elements of ARGS. */ 2936/* The caller should GCPRO all the elements of ARGS. */