diff options
| author | Lars Brinkhoff | 2013-01-06 14:27:44 +0100 |
|---|---|---|
| committer | Lars Brinkhoff | 2017-04-04 08:23:46 +0200 |
| commit | a2c33430292c79ac520100b1d0e8e7c04dfe426a (patch) | |
| tree | c14abd179a8646449c1430f24762db3e2359886a /src/data.c | |
| parent | 19b92cdfb04a025037d7388954b64468d6f54462 (diff) | |
| download | emacs-a2c33430292c79ac520100b1d0e8e7c04dfe426a.tar.gz emacs-a2c33430292c79ac520100b1d0e8e7c04dfe426a.zip | |
Add record objects with user-defined types.
* src/alloc.c (allocate_record): New function.
(Fmake_record, Frecord, Fcopy_record): New functions.
(syms_of_alloc): defsubr them.
(purecopy): Work with records.
* src/data.c (Ftype_of): Return slot 0 for record objects, or type
name if record's type holds class.
(Frecordp): New function.
(syms_of_data): defsubr it. Define `Qrecordp'.
(Faref, Faset): Work with records.
* src/fns.c (Flength): Work with records.
* src/lisp.h (prec_type): Add PVEC_RECORD.
(RECORDP, CHECK_RECORD, CHECK_RECORD_TYPE): New functions.
* src/lread.c (read1): Add syntax for records.
* src/print.c (PRINT_CIRCLE_CANDIDATE_P): Add RECORDP.
(print_object): Add syntax for records.
* test/lisp/emacs-lisp/cl-print-tests.el (cl-print-tests-2):
New test.
* test/src/alloc-tests.el (record-1, record-2, record-3):
New tests.
* doc/lispref/elisp.texi, doc/lispref/objects.texi,
doc/lispref/records.texi: Add documentation for records.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/src/data.c b/src/data.c index ae8dd9721c2..5fdbec2000e 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -267,6 +267,15 @@ for example, (type-of 1) returns `integer'. */) | |||
| 267 | case PVEC_MUTEX: return Qmutex; | 267 | case PVEC_MUTEX: return Qmutex; |
| 268 | case PVEC_CONDVAR: return Qcondition_variable; | 268 | case PVEC_CONDVAR: return Qcondition_variable; |
| 269 | case PVEC_TERMINAL: return Qterminal; | 269 | case PVEC_TERMINAL: return Qterminal; |
| 270 | case PVEC_RECORD: | ||
| 271 | { | ||
| 272 | Lisp_Object t = AREF (object, 0); | ||
| 273 | if (RECORDP (t) && 1 < (ASIZE (t) & PSEUDOVECTOR_SIZE_MASK)) | ||
| 274 | /* Return the type name field of the class! */ | ||
| 275 | return AREF (t, 1); | ||
| 276 | else | ||
| 277 | return t; | ||
| 278 | } | ||
| 270 | /* "Impossible" cases. */ | 279 | /* "Impossible" cases. */ |
| 271 | case PVEC_XWIDGET: | 280 | case PVEC_XWIDGET: |
| 272 | case PVEC_OTHER: | 281 | case PVEC_OTHER: |
| @@ -359,6 +368,15 @@ DEFUN ("vectorp", Fvectorp, Svectorp, 1, 1, 0, | |||
| 359 | return Qnil; | 368 | return Qnil; |
| 360 | } | 369 | } |
| 361 | 370 | ||
| 371 | DEFUN ("recordp", Frecordp_p, Srecordp, 1, 1, 0, | ||
| 372 | doc: /* Return t if OBJECT is a record. */) | ||
| 373 | (Lisp_Object object) | ||
| 374 | { | ||
| 375 | if (RECORDP (object)) | ||
| 376 | return Qt; | ||
| 377 | return Qnil; | ||
| 378 | } | ||
| 379 | |||
| 362 | DEFUN ("stringp", Fstringp, Sstringp, 1, 1, 0, | 380 | DEFUN ("stringp", Fstringp, Sstringp, 1, 1, 0, |
| 363 | doc: /* Return t if OBJECT is a string. */ | 381 | doc: /* Return t if OBJECT is a string. */ |
| 364 | attributes: const) | 382 | attributes: const) |
| @@ -2287,7 +2305,7 @@ or a byte-code object. IDX starts at 0. */) | |||
| 2287 | ptrdiff_t size = 0; | 2305 | ptrdiff_t size = 0; |
| 2288 | if (VECTORP (array)) | 2306 | if (VECTORP (array)) |
| 2289 | size = ASIZE (array); | 2307 | size = ASIZE (array); |
| 2290 | else if (COMPILEDP (array)) | 2308 | else if (COMPILEDP (array) || RECORDP (array)) |
| 2291 | size = ASIZE (array) & PSEUDOVECTOR_SIZE_MASK; | 2309 | size = ASIZE (array) & PSEUDOVECTOR_SIZE_MASK; |
| 2292 | else | 2310 | else |
| 2293 | wrong_type_argument (Qarrayp, array); | 2311 | wrong_type_argument (Qarrayp, array); |
| @@ -2308,7 +2326,8 @@ bool-vector. IDX starts at 0. */) | |||
| 2308 | 2326 | ||
| 2309 | CHECK_NUMBER (idx); | 2327 | CHECK_NUMBER (idx); |
| 2310 | idxval = XINT (idx); | 2328 | idxval = XINT (idx); |
| 2311 | CHECK_ARRAY (array, Qarrayp); | 2329 | if (! RECORDP (array)) |
| 2330 | CHECK_ARRAY (array, Qarrayp); | ||
| 2312 | 2331 | ||
| 2313 | if (VECTORP (array)) | 2332 | if (VECTORP (array)) |
| 2314 | { | 2333 | { |
| @@ -2328,7 +2347,14 @@ bool-vector. IDX starts at 0. */) | |||
| 2328 | CHECK_CHARACTER (idx); | 2347 | CHECK_CHARACTER (idx); |
| 2329 | CHAR_TABLE_SET (array, idxval, newelt); | 2348 | CHAR_TABLE_SET (array, idxval, newelt); |
| 2330 | } | 2349 | } |
| 2331 | else | 2350 | else if (RECORDP (array)) |
| 2351 | { | ||
| 2352 | ptrdiff_t size = ASIZE (array) & PSEUDOVECTOR_SIZE_MASK; | ||
| 2353 | if (idxval < 0 || idxval >= size) | ||
| 2354 | args_out_of_range (array, idx); | ||
| 2355 | ASET (array, idxval, newelt); | ||
| 2356 | } | ||
| 2357 | else /* STRINGP */ | ||
| 2332 | { | 2358 | { |
| 2333 | int c; | 2359 | int c; |
| 2334 | 2360 | ||
| @@ -3604,6 +3630,7 @@ syms_of_data (void) | |||
| 3604 | DEFSYM (Qsequencep, "sequencep"); | 3630 | DEFSYM (Qsequencep, "sequencep"); |
| 3605 | DEFSYM (Qbufferp, "bufferp"); | 3631 | DEFSYM (Qbufferp, "bufferp"); |
| 3606 | DEFSYM (Qvectorp, "vectorp"); | 3632 | DEFSYM (Qvectorp, "vectorp"); |
| 3633 | DEFSYM (Qrecordp, "recordp"); | ||
| 3607 | DEFSYM (Qbool_vector_p, "bool-vector-p"); | 3634 | DEFSYM (Qbool_vector_p, "bool-vector-p"); |
| 3608 | DEFSYM (Qchar_or_string_p, "char-or-string-p"); | 3635 | DEFSYM (Qchar_or_string_p, "char-or-string-p"); |
| 3609 | DEFSYM (Qmarkerp, "markerp"); | 3636 | DEFSYM (Qmarkerp, "markerp"); |
| @@ -3714,6 +3741,7 @@ syms_of_data (void) | |||
| 3714 | DEFSYM (Qbuffer, "buffer"); | 3741 | DEFSYM (Qbuffer, "buffer"); |
| 3715 | DEFSYM (Qframe, "frame"); | 3742 | DEFSYM (Qframe, "frame"); |
| 3716 | DEFSYM (Qvector, "vector"); | 3743 | DEFSYM (Qvector, "vector"); |
| 3744 | DEFSYM (Qrecord, "record"); | ||
| 3717 | DEFSYM (Qchar_table, "char-table"); | 3745 | DEFSYM (Qchar_table, "char-table"); |
| 3718 | DEFSYM (Qbool_vector, "bool-vector"); | 3746 | DEFSYM (Qbool_vector, "bool-vector"); |
| 3719 | DEFSYM (Qhash_table, "hash-table"); | 3747 | DEFSYM (Qhash_table, "hash-table"); |
| @@ -3750,6 +3778,7 @@ syms_of_data (void) | |||
| 3750 | defsubr (&Sstringp); | 3778 | defsubr (&Sstringp); |
| 3751 | defsubr (&Smultibyte_string_p); | 3779 | defsubr (&Smultibyte_string_p); |
| 3752 | defsubr (&Svectorp); | 3780 | defsubr (&Svectorp); |
| 3781 | defsubr (&Srecordp); | ||
| 3753 | defsubr (&Schar_table_p); | 3782 | defsubr (&Schar_table_p); |
| 3754 | defsubr (&Svector_or_char_table_p); | 3783 | defsubr (&Svector_or_char_table_p); |
| 3755 | defsubr (&Sbool_vector_p); | 3784 | defsubr (&Sbool_vector_p); |