Mercurial > hg > xemacs-beta
annotate netinstall/iniparse.y @ 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 /* Parse the setup.ini files. inilex.l provides the tokens for this. */ | |
| 18 | |
| 19 #include <stdio.h> | |
| 20 #include <stdlib.h> | |
| 21 #include <string.h> | |
| 22 #include "win32.h" | |
| 23 | |
| 24 #include "ini.h" | |
| 25 #include "iniparse.h" | |
| 26 | |
| 27 #include "port.h" | |
| 28 | |
| 29 #define YYERROR_VERBOSE 1 | |
| 30 /*#define YYDEBUG 1*/ | |
| 31 | |
| 32 static Package *cp; | |
| 33 static int trust; | |
| 34 extern unsigned int setup_timestamp; | |
| 35 extern char *setup_version; | |
| 36 extern int yylineno; | |
| 37 extern int CDECL yyerror (char *s, ...); | |
| 38 | |
| 39 #define cpt (cp->info+trust) | |
| 40 | |
| 41 %} | |
| 42 | |
| 43 %token STRING | |
| 44 %token SETUP_TIMESTAMP SETUP_VERSION VERSION INSTALL SOURCE SDESC LDESC TYPE | |
| 45 %token T_PREV T_CURR T_TEST T_UNKNOWN | |
| 46 | |
| 47 %% | |
| 48 | |
| 49 whole_file | |
| 50 : setup_headers packages | |
| 51 ; | |
| 52 | |
| 53 setup_headers | |
| 54 : setup_header setup_headers | |
| 55 | /* empty */ | |
| 56 ; | |
| 57 | |
| 58 setup_header | |
| 59 : SETUP_TIMESTAMP STRING '\n' { setup_timestamp = strtoul ($2, 0, 0); } | |
| 60 | SETUP_VERSION STRING '\n' { setup_version = strdup ($2); } | |
| 61 | '\n' | |
| 62 | error { yyerror ("unrecognized line in setup.ini headers (do you have the latest setup?)"); } '\n' | |
| 63 ; | |
| 64 | |
| 65 packages | |
| 66 : package packages | |
| 67 | /* empty */ | |
| 68 ; | |
| 69 | |
| 70 package | |
| 71 : '@' STRING '\n' { new_package($2); } | |
| 72 lines | |
| 73 ; | |
| 74 | |
| 75 lines | |
| 76 : simple_line '\n' lines | |
| 77 | simple_line | |
| 78 ; | |
| 79 | |
| 80 simple_line | |
| 81 : VERSION STRING { cpt->version = $2; } | |
| 82 | SDESC STRING { cp->sdesc = $2; } | |
| 83 | LDESC STRING { cp->ldesc = $2; } | |
| 84 | INSTALL STRING STRING { cpt->install = $2; | |
| 85 cpt->install_size = atoi($3); } | |
| 86 | SOURCE STRING STRING { cpt->source = $2; | |
| 87 cpt->source_size = atoi($3); } | |
| 88 | TYPE STRING { if (!strcmp ($2, "cygwin")) | |
| 89 cp->type = TY_CYGWIN; | |
| 90 else if (!strcmp ($2, "native")) | |
| 91 cp->type = TY_NATIVE; | |
| 92 else | |
| 93 cp->type = TY_GENERIC; } | |
| 94 | T_PREV { trust = TRUST_PREV; } | |
| 95 | T_CURR { trust = TRUST_CURR; } | |
| 96 | T_TEST { trust = TRUST_TEST; } | |
| 97 | T_UNKNOWN { trust = TRUST_UNKNOWN; } | |
| 98 | /* empty */ | |
| 99 | error '\n' { yylineno --; | |
| 100 yyerror ("unrecognized line in package %s (do you have the latest setup?)", cp->name); | |
| 101 yylineno ++; | |
| 102 } | |
| 103 ; | |
| 104 | |
| 105 %% | |
| 106 | |
| 107 Package *package = 0; | |
| 108 Package *xemacs_package = 0; | |
| 109 int npackages = 0; | |
| 110 static int maxpackages = 0; | |
| 111 | |
| 112 Package * | |
| 113 new_package (char *name) | |
| 114 { | |
| 115 if (package == 0) | |
| 116 maxpackages = npackages = 0; | |
| 117 if (npackages >= maxpackages) | |
| 118 { | |
| 119 maxpackages += 10; | |
| 120 if (package) | |
| 121 package = (Package *) realloc (package, maxpackages * sizeof (Package)); | |
| 122 else | |
| 123 package = (Package *) malloc (maxpackages * sizeof (Package)); | |
| 124 } | |
| 125 cp = package + npackages; | |
| 126 npackages ++; | |
| 127 | |
| 128 memset (cp, 0, sizeof (Package)); | |
| 129 cp->name = name; | |
| 130 | |
| 131 trust = TRUST_CURR; | |
| 132 | |
| 133 return cp; | |
| 134 } |