view src/dump-data.c @ 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

/* Static array to put the dumped data in and its management
   Copyright (C) 2003 Olivier Galibert

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. */

/* Mule-ized? Mwahahahahahaha */

/* Magic values by Larry McVoy to prevent every known compiler, including
   an especially perverse HP-UX one, from putting the array in BSS.
*/


#include <config.h>
#include "lisp.h"
#include "dump-data.h"

/* 4 bytes for the data size, 4096 for alignment */

static Rawbyte dumped_data[MAX_SIZE+4096+4] = {
  255,
  6,
  1,
  2,
  3,
  4,
  255,
  3,
  9,
  62,
  255,
  10,
  4,
  61,
  255
};

size_t
dumped_data_size (void)
{
  return dumped_data[0] | (dumped_data[1] << 8) | (dumped_data[2] << 16) |
    (dumped_data[3] << 24);
}

size_t
dumped_data_max_size (void)
{
  return MAX_SIZE;
}

size_t
dumped_data_align_offset (void)
{
  EMACS_INT iptr = (EMACS_INT) dumped_data;
  EMACS_INT iptr2;
  iptr2 = (iptr + 4 + 4095) & ~(EMACS_INT) 4095;
  
  return iptr2 - iptr;
}

Rawbyte *
dumped_data_get (void)
{
  EMACS_INT iptr = (EMACS_INT) dumped_data;
  iptr = (iptr + 4 + 4095) & ~(EMACS_INT) 4095;
  return (Rawbyte *) iptr;
}