comparison src/lisp.h @ 5445:6506fcb40fcf

Merged with trunk.
author Mats Lidell <matsl@xemacs.org>
date Fri, 31 Dec 2010 00:27:29 +0100
parents 8d29f1c4bb98 df125a42c50c
children a9094f28f9a9
comparison
equal deleted inserted replaced
5444:388762703a21 5445:6506fcb40fcf
3637 DECLARE_N_KEYWORDS_4(a,b,c,d), e = Qnil 3637 DECLARE_N_KEYWORDS_4(a,b,c,d), e = Qnil
3638 #define DECLARE_N_KEYWORDS_6(a,b,c,d,e,f) \ 3638 #define DECLARE_N_KEYWORDS_6(a,b,c,d,e,f) \
3639 DECLARE_N_KEYWORDS_5(a,b,c,d,e), f = Qnil 3639 DECLARE_N_KEYWORDS_5(a,b,c,d,e), f = Qnil
3640 #define DECLARE_N_KEYWORDS_7(a,b,c,d,e,f,g) \ 3640 #define DECLARE_N_KEYWORDS_7(a,b,c,d,e,f,g) \
3641 DECLARE_N_KEYWORDS_6(a,b,c,d,e,f), g = Qnil 3641 DECLARE_N_KEYWORDS_6(a,b,c,d,e,f), g = Qnil
3642 #define DECLARE_N_KEYWORDS_8(a,b,c,d,e,f,g,h) \
3643 DECLARE_N_KEYWORDS_7(a,b,c,d,e,f,g), h = Qnil
3644 #define DECLARE_N_KEYWORDS_9(a,b,c,d,e,f,g,h,i) \
3645 DECLARE_N_KEYWORDS_8(a,b,c,d,e,f,g,h), i = Qnil
3642 3646
3643 #define CHECK_N_KEYWORDS_1(a) \ 3647 #define CHECK_N_KEYWORDS_1(a) \
3644 else if (EQ (pk_key, Q_##a)) { a = pk_value; } 3648 else if (EQ (pk_key, Q_##a)) { a = pk_value; }
3645 #define CHECK_N_KEYWORDS_2(a,b) CHECK_N_KEYWORDS_1(a) \ 3649 #define CHECK_N_KEYWORDS_2(a,b) CHECK_N_KEYWORDS_1(a) \
3646 else if (EQ (pk_key, Q_##b)) { b = pk_value; } 3650 else if (EQ (pk_key, Q_##b)) { b = pk_value; }
3652 else if (EQ (pk_key, Q_##e)) { e = pk_value; } 3656 else if (EQ (pk_key, Q_##e)) { e = pk_value; }
3653 #define CHECK_N_KEYWORDS_6(a,b,c,d,e,f) CHECK_N_KEYWORDS_5(a,b,c,d,e) \ 3657 #define CHECK_N_KEYWORDS_6(a,b,c,d,e,f) CHECK_N_KEYWORDS_5(a,b,c,d,e) \
3654 else if (EQ (pk_key, Q_##f)) { f = pk_value; } 3658 else if (EQ (pk_key, Q_##f)) { f = pk_value; }
3655 #define CHECK_N_KEYWORDS_7(a,b,c,d,e,f,g) CHECK_N_KEYWORDS_6(a,b,c,d,e,f) \ 3659 #define CHECK_N_KEYWORDS_7(a,b,c,d,e,f,g) CHECK_N_KEYWORDS_6(a,b,c,d,e,f) \
3656 else if (EQ (pk_key, Q_##g)) { g = pk_value; } 3660 else if (EQ (pk_key, Q_##g)) { g = pk_value; }
3661 #define CHECK_N_KEYWORDS_8(a,b,c,d,e,f,g,h) \
3662 CHECK_N_KEYWORDS_7(a,b,c,d,e,f,g) \
3663 else if (EQ (pk_key, Q_##h)) { h = pk_value; }
3664 #define CHECK_N_KEYWORDS_9(a,b,c,d,e,f,g,h,i) \
3665 CHECK_N_KEYWORDS_8(a,b,c,d,e,f,g,h) \
3666 else if (EQ (pk_key, Q_##i)) { i = pk_value; }
3657 3667
3658 Boolint non_nil_allow_other_keys_p (Elemcount offset, int nargs, 3668 Boolint non_nil_allow_other_keys_p (Elemcount offset, int nargs,
3659 Lisp_Object *args); 3669 Lisp_Object *args);
3660 3670
3661 3671
5301 EXFUN (Freally_free, 1); 5311 EXFUN (Freally_free, 1);
5302 5312
5303 /* Defined in general.c */ 5313 /* Defined in general.c */
5304 #define SYMBOL(fou) extern Lisp_Object fou 5314 #define SYMBOL(fou) extern Lisp_Object fou
5305 #define SYMBOL_MODULE_API(fou) extern MODULE_API Lisp_Object fou 5315 #define SYMBOL_MODULE_API(fou) extern MODULE_API Lisp_Object fou
5306 #define SYMBOL_KEYWORD(la_cle_est_fou) extern Lisp_Object la_cle_est_fou 5316 #define SYMBOL_KEYWORD(la_cle_est_folle) extern Lisp_Object la_cle_est_folle
5307 #define SYMBOL_GENERAL(tout_le_monde, est_fou) \ 5317 #define SYMBOL_GENERAL(tout_le_monde, est_fou) \
5308 extern Lisp_Object tout_le_monde 5318 extern Lisp_Object tout_le_monde
5319 #define SYMBOL_KEYWORD_GENERAL(y_compris_ben, mais_que_peut_on_faire) \
5320 extern Lisp_Object y_compris_ben
5309 5321
5310 #include "general-slots.h" 5322 #include "general-slots.h"
5311 5323
5312 #undef SYMBOL 5324 #undef SYMBOL
5313 #undef SYMBOL_MODULE_API 5325 #undef SYMBOL_MODULE_API
5314 #undef SYMBOL_KEYWORD 5326 #undef SYMBOL_KEYWORD
5315 #undef SYMBOL_GENERAL 5327 #undef SYMBOL_GENERAL
5328 #undef SYMBOL_KEYWORD_GENERAL
5316 5329
5317 extern Lisp_Object Qeq; 5330 extern Lisp_Object Qeq;
5318 extern Lisp_Object Qeql; 5331 extern Lisp_Object Qeql;
5319 extern Lisp_Object Qequal; 5332 extern Lisp_Object Qequal;
5320 extern Lisp_Object Qequalp; 5333 extern Lisp_Object Qequalp;