Mercurial > hg > xemacs-beta
view src/mc-alloc.h @ 5908:6174848f3e6c
Use parse_integer() in read_atom(); support bases with ratios like integers
src/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* data.c (init_errors_once_early):
Move the Qunsupported_type here from numbers.c, so it's available
when the majority of our types are not supported.
* general-slots.h: Add it here, too.
* number.c: Remove the definition of Qunsupported_type from here.
* lread.c (read_atom):
Check if the first character could reflect a rational, if so, call
parse_integer(), don't check the syntax of the other
characters. This allows us to accept the non-ASCII digit
characters too.
If that worked partially, but not completely, and the next char is
a slash, try to parse as a ratio.
If that fails, try isfloat_string(), but only if the first
character could plausibly be part of a float.
Otherwise, treat as a symbol.
* lread.c (read_rational):
Rename from read_integer. Handle ratios with the same radix
specification as was used for integers.
* lread.c (read1):
Rename read_integer in this function. Support the Common Lisp
#NNNrMMM syntax for parsing a number MMM of arbitrary radix NNN.
man/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* lispref/numbers.texi (Numbers):
Describe the newly-supported arbitrary-base syntax for rationals
(integers and ratios). Describe that ratios can take the same base
specification as integers, something also new.
tests/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
Check the arbitrary-base integer reader syntax support, just
added. Check the reader base support for ratios, just added.
Check the non-ASCII-digit support in the reader, just added.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 09 May 2015 00:40:57 +0100 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* New allocator for XEmacs. Copyright (C) 2005 Marcus Crestani. Copyright (C) 2010 Ben Wing. This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_mc_alloc_h_ #define INCLUDED_mc_alloc_h_ /*--- prototypes -------------------------------------------------------*/ BEGIN_C_DECLS /* Set to 1 if memory becomes short. */ extern EMACS_INT memory_shortage; /* Internal Allocator Functions: */ /* Initialize the allocator. This has to be called prior to requesting memory. */ void init_mc_allocator (void); /* Allocate a block of memory of given size and return the pointer to it. */ void *mc_alloc (size_t size); /* Allocate a block of memory as an array with elemcount elements of given size and return the pointer to it. Arrays contain several objects that are allocated in one consecutive block of memory with each element being a fully qualified object---that is, it has a Lisp object header and a mark bit. Objects like hash tables and dynamic arrays use this function. */ void *mc_alloc_array (size_t size, EMACS_INT elemcount); /* Modify the size of the memory block pointed to by ptr. Return the address of the new block of given size. The content of the memory block will be unchanged to the minimum of the old and new sizes: if the new size is smaller, the overlaying data is cut off; if the new size is bigger, the newly allocated memory will be uninitialized.*/ void *mc_realloc (void *ptr, size_t size); /* Modify the size of the array pointed to by ptr. Return the address of the new array block with elemcount elements of given size. The content of the memory block will be unchanged to the minimum of the old and new sizes: if the new size is smaller, the overlaying data is cut off; if the new size is bigger, the newly allocated memory will be uninitialized.*/ void *mc_realloc_array (void *ptr, size_t size, EMACS_INT elemcount); /* Garbage collection related functions and macros: */ enum mark_bit_colors { WHITE = 0, BLACK = 1, GREY = 2 }; /* Set the mark bit of the object pointed to by ptr to value.*/ void set_mark_bit (void *ptr, EMACS_INT value); /* Return the mark bit of the object pointed to by ptr. */ EMACS_INT get_mark_bit (void *ptr); /* mark bit macros */ /* Returns true if the mark bit of the object pointed to by ptr is set. */ #define MARKED_P(ptr) (get_mark_bit (ptr) != WHITE) /* Marks the object pointed to by ptr (sets the mark bit to 1). */ #define MARK(ptr) set_mark_bit (ptr, BLACK) /* Unmarks the object pointed to by ptr (sets the mark bit to 0). */ #define UNMARK(ptr) set_mark_bit (ptr, WHITE) #define MARK_WHITE(ptr) set_mark_bit (ptr, WHITE) #define MARK_GREY(ptr) set_mark_bit (ptr, GREY) #define MARK_BLACK(ptr) set_mark_bit (ptr, BLACK) #define MARKED_WHITE_P(ptr) (get_mark_bit (ptr) == WHITE) #define MARKED_GREY_P(ptr) (get_mark_bit (ptr) == GREY) #define MARKED_BLACK_P(ptr) (get_mark_bit (ptr) == BLACK) /* The finalizer of every not marked object is called. The macro MC_ALLOC_CALL_FINALIZER has to be defined and call the finalizer of the object. Returns number of processed pages. */ EMACS_INT mc_finalize (void); /* All not marked objects of the used heap are freed. Returns number of processed pages. */ EMACS_INT mc_sweep (void); /* Portable dumper related functions and macros: */ /* The finalizer for disksave of every object is called to shrink the dump image. The macro MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE has to be defined and call the finalizer for disksave of the object. Returns number of processed pages. */ EMACS_INT mc_finalize_for_disksave (void); /* Functions and macros related with allocation statistics: */ /* Returns the real size, including overhead, which is actually alloced for an object with given claimed_size. */ Bytecount mc_alloced_storage_size (Bytecount claimed_size, struct usage_stats *stats); /* Incremental Garbage Collector / Write Barrier Support: */ /* Return the PAGESIZE the allocator uses. Generally equals to the system's PAGESIZE. */ EMACS_INT mc_get_page_size (void); /* Is the fault at ptr on a protected page? */ EMACS_INT fault_on_protected_page (void *ptr); /* Remove protection (if there) of heap page of given page header ph. Returns number of processed pages. */ EMACS_INT protect_heap_pages (void); /* Remove protection for all heap pages which are protected. Returns number of processed pages. */ EMACS_INT unprotect_heap_pages (void); /* Remove protection and mark page dirty. */ void unprotect_page_and_mark_dirty (void *ptr); /* Repush all objects on dirty pages onto the mark stack. Return number of repushed objects. */ int repush_all_objects_on_page (void *ptr); /* Mark black if object is currently grey. */ EMACS_INT maybe_mark_black (void *ptr); /* Only for debugging---not used anywhere in the sources. */ EMACS_INT object_on_heap_p (void *ptr); END_C_DECLS #endif /* INCLUDED_mc_alloc_h_ */