Mercurial > hg > xemacs-beta
annotate netinstall/inilex.l @ 4678:b5e1d4f6b66f
Make #'floor, #'ceiling, #'round, #'truncate conform to Common Lisp.
lisp/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (ceiling*, floor*, round*, truncate*):
Implement these in terms of the C functions; mark them as
obsolete.
(mod*, rem*): Use #'nth-value with the C functions, not #'nth with
the CL emulation functions.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* lispref/numbers.texi (Bigfloat Basics):
Correct this documentation (ignoring for the moment that it breaks
off in mid-sentence).
tests/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test the new Common Lisp-compatible rounding functions available in
C.
(generate-rounding-output): Provide a function useful for
generating the data for the rounding functions tests.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* floatfns.c (ROUNDING_CONVERT, CONVERT_WITH_NUMBER_TYPES)
(CONVERT_WITHOUT_NUMBER_TYPES, MAYBE_TWO_ARGS_BIGNUM)
(MAYBE_ONE_ARG_BIGNUM, MAYBE_TWO_ARGS_RATIO)
(MAYBE_ONE_ARG_RATIO, MAYBE_TWO_ARGS_BIGFLOAT)
(MAYBE_ONE_ARG_BIGFLOAT, MAYBE_EFF, MAYBE_CHAR_OR_MARKER):
New macros, used in the implementation of the rounding functions.
(ceiling_two_fixnum, ceiling_two_bignum, ceiling_two_ratio)
(ceiling_two_bigfloat, ceiling_one_ratio, ceiling_one_bigfloat)
(ceiling_two_float, ceiling_one_float, ceiling_one_mundane_arg)
(floor_two_fixnum, floor_two_bignum, floor_two_ratio)
(floor_two_bigfloat, floor_one_ratio, floor_one_bigfloat)
(floor_two_float, floor_one_mundane_arg, round_two_fixnum)
(round_two_bignum_1, round_two_bignum, round_two_ratio)
(round_one_bigfloat_1, round_two_bigfloat, round_one_ratio)
(round_one_bigfloat, round_two_float, round_one_float)
(round_one_mundane_arg, truncate_two_fixnum)
(truncate_two_bignum, truncate_two_ratio, truncate_two_bigfloat)
(truncate_one_ratio, truncate_one_bigfloat, truncate_two_float)
(truncate_one_float, truncate_one_mundane_arg):
New functions, used in the implementation of the rounding
functions.
(Fceiling, Ffloor, Fround, Ftruncate, Ffceiling, Fffloor)
(Ffround, Fftruncate):
Revise to fully support Common Lisp conventions. This means:
-- All functions have optional DIVISOR arguments
-- All functions return multiple values; see #'values
-- All functions do their arithmetic with the correct number types
according to the contamination rules.
-- #'round and #'fround always round towards the even number
in ambiguous cases.
* doprnt.c (emacs_doprnt_1):
* number.c (internal_coerce_number):
Call Ftruncate with two arguments, not one.
* floatfns.c (Ffloat):
Correct this, if NUMBER is a bignum.
* lisp.h:
Declare Ftruncate as taking two arguments.
* number.c:
Provide scratch_ratio2, init it appropriately.
* number.h:
Make scratch_ratio2 available.
* number.h (BIGFLOAT_ARITH_RETURN):
* number.h (BIGFLOAT_ARITH_RETURN1):
Correct these functions.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 11 Aug 2009 17:59:23 +0100 |
| parents | 3078fd1074e8 |
| children |
| rev | line source |
|---|---|
| 448 | 1 %{ |
| 2 /* | |
| 3 * Copyright (c) 2000, Red Hat, Inc. | |
| 4 * | |
| 5 * This program is free software; you can redistribute it and/or modify | |
| 6 * it under the terms of the GNU General Public License as published by | |
| 7 * the Free Software Foundation; either version 2 of the License, or | |
| 8 * (at your option) any later version. | |
| 9 * | |
| 10 * A copy of the GNU General Public License can be found at | |
| 11 * http://www.gnu.org/ | |
| 12 * | |
| 13 * Written by DJ Delorie <dj@cygnus.com> | |
| 14 * | |
| 15 */ | |
| 16 | |
| 17 /* tokenize the setup.ini files. We parse a string which we've | |
| 18 previously downloaded. The program must call ini_init() to specify | |
| 19 that string. */ | |
| 20 | |
| 21 #include "win32.h" | |
| 22 #include <string.h> | |
| 23 #include <stdlib.h> | |
| 24 | |
| 25 #include "ini.h" | |
| 26 #include "iniparse.h" | |
| 27 | |
| 28 #define YY_INPUT(buf,result,max_size) { result = ini_getchar(buf, max_size); } | |
| 29 | |
| 30 static int ini_getchar(char *buf, int max_size); | |
| 31 static void ignore_line (); | |
| 32 | |
| 33 %} | |
| 34 | |
| 35 /*%option debug */ | |
| 36 %option noyywrap | |
| 37 %option yylineno | |
| 38 %option never-interactive | |
| 39 | |
| 40 STR [a-zA-Z0-9_./-]+ | |
| 41 | |
| 42 %% | |
| 43 | |
| 44 \"[^"]*\" { yylval = strdup (yytext+1); | |
| 45 yylval[strlen (yylval)-1] = 0; | |
| 46 return STRING; } | |
| 47 | |
| 48 "setup-timestamp:" return SETUP_TIMESTAMP; | |
| 49 "setup-version:" return SETUP_VERSION; | |
| 50 "version:" return VERSION; | |
| 51 "install:" return INSTALL; | |
| 52 "type:" return TYPE; | |
| 53 "source:" return SOURCE; | |
| 54 "sdesc:" return SDESC; | |
| 55 "ldesc:" return LDESC; | |
| 56 | |
| 57 ^{STR}":" ignore_line (); | |
| 58 | |
| 59 "[curr]" return T_CURR; | |
| 60 "[test]" return T_TEST; | |
| 61 "[exp]" return T_TEST; | |
| 62 "[prev]" return T_PREV; | |
| 63 "["{STR}"]" return T_UNKNOWN; | |
| 64 | |
| 65 {STR} { yylval = strdup (yytext); | |
| 66 return STRING; } | |
| 67 | |
| 68 [ \t\r]+ /* do nothing */ | |
| 69 | |
| 70 "#".*\n /* ignore comments */ | |
| 71 | |
| 72 \n { return yytext[0]; } | |
| 73 . { return yytext[0]; } | |
| 74 | |
| 75 %% | |
| 76 | |
| 77 static char *input_string = 0; | |
| 78 static char *end_input_string; | |
| 79 | |
| 80 void | |
| 81 ini_init(char *string) | |
| 82 { | |
| 83 input_string = string; | |
| 84 end_input_string = input_string + strlen(input_string); | |
| 85 } | |
| 86 | |
| 87 static int | |
| 88 ini_getchar(char *buf, int max_size) | |
| 89 { | |
| 90 if (input_string) | |
| 91 { | |
| 92 int avail = end_input_string - input_string; | |
| 93 if (avail == 0) | |
| 94 { | |
| 95 input_string = end_input_string = 0; | |
| 96 return 0; | |
| 97 } | |
| 98 if (avail > max_size) | |
| 99 avail = max_size; | |
| 100 memcpy(buf, input_string, avail); | |
| 101 input_string += avail; | |
| 102 return avail; | |
| 103 } | |
| 104 else | |
| 105 return 0; | |
| 106 } | |
| 107 | |
| 108 static void | |
| 109 ignore_line () | |
| 110 { | |
| 111 char c; | |
| 112 while (c = input ()) | |
| 113 { | |
| 114 if (c == EOF) | |
| 115 return; | |
| 116 if (c == '\n') | |
| 117 return; | |
| 118 } | |
| 119 } |