comparison src/eval.c @ 40656:cdfd4d09b79a

Update usage of CHECK_ macros (remove unused second argument).
author Pavel Jan?k <Pavel@Janik.cz>
date Fri, 02 Nov 2001 20:46:55 +0000
parents bfacd603fb71
children 2677a5e901f8
comparison
equal deleted inserted replaced
40655:45453187feeb 40656:cdfd4d09b79a
688 (symbol, aliased) 688 (symbol, aliased)
689 Lisp_Object symbol, aliased; 689 Lisp_Object symbol, aliased;
690 { 690 {
691 struct Lisp_Symbol *sym; 691 struct Lisp_Symbol *sym;
692 692
693 CHECK_SYMBOL (symbol, 0); 693 CHECK_SYMBOL (symbol);
694 CHECK_SYMBOL (aliased, 1); 694 CHECK_SYMBOL (aliased);
695 695
696 if (SYMBOL_CONSTANT_P (symbol)) 696 if (SYMBOL_CONSTANT_P (symbol))
697 error ("Cannot make a constant an alias"); 697 error ("Cannot make a constant an alias");
698 698
699 sym = XSYMBOL (symbol); 699 sym = XSYMBOL (symbol);
1213 volatile Lisp_Object var; 1213 volatile Lisp_Object var;
1214 1214
1215 var = Fcar (args); 1215 var = Fcar (args);
1216 bodyform = Fcar (Fcdr (args)); 1216 bodyform = Fcar (Fcdr (args));
1217 handlers = Fcdr (Fcdr (args)); 1217 handlers = Fcdr (Fcdr (args));
1218 CHECK_SYMBOL (var, 0); 1218 CHECK_SYMBOL (var);
1219 1219
1220 for (val = handlers; ! NILP (val); val = Fcdr (val)) 1220 for (val = handlers; ! NILP (val); val = Fcdr (val))
1221 { 1221 {
1222 Lisp_Object tem; 1222 Lisp_Object tem;
1223 tem = Fcar (val); 1223 tem = Fcar (val);
1823 { 1823 {
1824 #ifdef NO_ARG_ARRAY 1824 #ifdef NO_ARG_ARRAY
1825 Lisp_Object args[4]; 1825 Lisp_Object args[4];
1826 #endif 1826 #endif
1827 1827
1828 CHECK_SYMBOL (function, 0); 1828 CHECK_SYMBOL (function);
1829 CHECK_STRING (file, 1); 1829 CHECK_STRING (file);
1830 1830
1831 /* If function is defined and not as an autoload, don't override */ 1831 /* If function is defined and not as an autoload, don't override */
1832 if (!EQ (XSYMBOL (function)->function, Qunbound) 1832 if (!EQ (XSYMBOL (function)->function, Qunbound)
1833 && !(CONSP (XSYMBOL (function)->function) 1833 && !(CONSP (XSYMBOL (function)->function)
1834 && EQ (XCAR (XSYMBOL (function)->function), Qautoload))) 1834 && EQ (XCAR (XSYMBOL (function)->function), Qautoload)))
1886 int count = specpdl_ptr - specpdl; 1886 int count = specpdl_ptr - specpdl;
1887 Lisp_Object fun, queue, first, second; 1887 Lisp_Object fun, queue, first, second;
1888 struct gcpro gcpro1, gcpro2, gcpro3; 1888 struct gcpro gcpro1, gcpro2, gcpro3;
1889 1889
1890 fun = funname; 1890 fun = funname;
1891 CHECK_SYMBOL (funname, 0); 1891 CHECK_SYMBOL (funname);
1892 GCPRO3 (fun, funname, fundef); 1892 GCPRO3 (fun, funname, fundef);
1893 1893
1894 /* Preserve the match data. */ 1894 /* Preserve the match data. */
1895 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); 1895 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
1896 1896
2156 struct gcpro gcpro1; 2156 struct gcpro gcpro1;
2157 2157
2158 fun = args [0]; 2158 fun = args [0];
2159 funcall_args = 0; 2159 funcall_args = 0;
2160 spread_arg = args [nargs - 1]; 2160 spread_arg = args [nargs - 1];
2161 CHECK_LIST (spread_arg, nargs); 2161 CHECK_LIST (spread_arg);
2162 2162
2163 numargs = XINT (Flength (spread_arg)); 2163 numargs = XINT (Flength (spread_arg));
2164 2164
2165 if (numargs == 0) 2165 if (numargs == 0)
2166 return Ffuncall (nargs - 1, args); 2166 return Ffuncall (nargs - 1, args);
2958 Lisp_Object symbol, value; 2958 Lisp_Object symbol, value;
2959 { 2959 {
2960 Lisp_Object ovalue; 2960 Lisp_Object ovalue;
2961 Lisp_Object valcontents; 2961 Lisp_Object valcontents;
2962 2962
2963 CHECK_SYMBOL (symbol, 0); 2963 CHECK_SYMBOL (symbol);
2964 if (specpdl_ptr == specpdl + specpdl_size) 2964 if (specpdl_ptr == specpdl + specpdl_size)
2965 grow_specpdl (); 2965 grow_specpdl ();
2966 2966
2967 /* The most common case is that of a non-constant symbol with a 2967 /* The most common case is that of a non-constant symbol with a
2968 trivial value. Make that as fast as we can. */ 2968 trivial value. Make that as fast as we can. */
3115 top_level_value (symbol) 3115 top_level_value (symbol)
3116 Lisp_Object symbol; 3116 Lisp_Object symbol;
3117 { 3117 {
3118 register struct specbinding *ptr = specpdl; 3118 register struct specbinding *ptr = specpdl;
3119 3119
3120 CHECK_SYMBOL (symbol, 0); 3120 CHECK_SYMBOL (symbol);
3121 for (; ptr != specpdl_ptr; ptr++) 3121 for (; ptr != specpdl_ptr; ptr++)
3122 { 3122 {
3123 if (EQ (ptr->symbol, symbol)) 3123 if (EQ (ptr->symbol, symbol))
3124 return ptr->old_value; 3124 return ptr->old_value;
3125 } 3125 }
3130 top_level_set (symbol, newval) 3130 top_level_set (symbol, newval)
3131 Lisp_Object symbol, newval; 3131 Lisp_Object symbol, newval;
3132 { 3132 {
3133 register struct specbinding *ptr = specpdl; 3133 register struct specbinding *ptr = specpdl;
3134 3134
3135 CHECK_SYMBOL (symbol, 0); 3135 CHECK_SYMBOL (symbol);
3136 for (; ptr != specpdl_ptr; ptr++) 3136 for (; ptr != specpdl_ptr; ptr++)
3137 { 3137 {
3138 if (EQ (ptr->symbol, symbol)) 3138 if (EQ (ptr->symbol, symbol))
3139 { 3139 {
3140 ptr->old_value = newval; 3140 ptr->old_value = newval;
3153 Lisp_Object level, flag; 3153 Lisp_Object level, flag;
3154 { 3154 {
3155 register struct backtrace *backlist = backtrace_list; 3155 register struct backtrace *backlist = backtrace_list;
3156 register int i; 3156 register int i;
3157 3157
3158 CHECK_NUMBER (level, 0); 3158 CHECK_NUMBER (level);
3159 3159
3160 for (i = 0; backlist && i < XINT (level); i++) 3160 for (i = 0; backlist && i < XINT (level); i++)
3161 { 3161 {
3162 backlist = backlist->next; 3162 backlist = backlist->next;
3163 } 3163 }
3241 { 3241 {
3242 register struct backtrace *backlist = backtrace_list; 3242 register struct backtrace *backlist = backtrace_list;
3243 register int i; 3243 register int i;
3244 Lisp_Object tem; 3244 Lisp_Object tem;
3245 3245
3246 CHECK_NATNUM (nframes, 0); 3246 CHECK_NATNUM (nframes);
3247 3247
3248 /* Find the frame requested. */ 3248 /* Find the frame requested. */
3249 for (i = 0; backlist && i < XFASTINT (nframes); i++) 3249 for (i = 0; backlist && i < XFASTINT (nframes); i++)
3250 backlist = backlist->next; 3250 backlist = backlist->next;
3251 3251