Re: [COMMIT] Don't extract a fixnum value unnecessarily, thank you Robert Delius Royar

The compilation now works with the with-union-type configuration
qualifier turned on. The program installs and runs, Thanks for the
fix.

On Fri, Mar 20, 2015 at 10:03 AM, Aidan Kehoe <[email protected]> wrote:
>
>  Ar an naoú lá déag de mí Márta, scríobh Robert Royar:
>
>  > This report is for f9e59cd39a9a+ using —with-union-type. Removing that
>  > directive from configure allows compilation and linking to succeed. I
>  > have not compiled Emacs-beta since January 2015, so I cannot say which
>  > of the change sets in February or March caused the problem. Note that
>  > I use clang to compile. I do not have a real gcc installed any longer.
>  >
>  > clang -c -Wall -Wno-switch -Wundef -Wsign-compare -Wno-char-subscripts
>  > -Wpacked -Wpointer-arith -Wshadow -Wmissing-declarations
>  > -Wmissing-prototypes -Wstrict-prototypes -Wdeclaration-after-statement
>  >  -Wunused-parameter -g  -arch x86_64 -g -I/opt/local/include
>  > -I/opt/X11/include -I/opt/X11/include/freetype2 -Demacs -I.
>  > -I/Users/royar/src/xemacs-hg/src -DHAVE_CONFIG_H -I/opt/X11/include
>  > -I/opt/X11/include/freetype2 -I/opt/X11/include -I/opt/X11/include
>  > data.c
>  > data.c:1520:17: error: assigning to 'Lisp_Object' (aka 'union
>  > Lisp_Object') from incompatible type 'long'
>  >   highest_value = XFIXNUM (XCHAR_TABLE (radix_table)->default_);
>  >                 ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>  > 1 error generated.
>  > make[1]: *** [data.o] Error 1
>  > make: *** [src] Error 2
>
> My mistake, thank you for the report, Robert! I’ve committed a change that
> addresses this locally, and pushed, if you have a few minutes I’d appreciate
> confirmation that it works for you.
>
> Best,
>
> Aidan
>
> APPROVE COMMIT
>
> NOTE: This patch has been committed
>
> # HG changeset patch
> # User Aidan Kehoe <[email protected]>
> # Date 1426859296 0
> #      Fri Mar 20 13:48:16 2015 +0000
> # Node ID 5a311f1f46aaf7481c34f90d66d4666c3d9838d3
> # Parent  f9e59cd39a9a3ac98bee0a471a22fda8e0d7c19d
> Don't extract a fixnum value unnecessarily, thank you Robert Delius Royar
>
> 2015-03-20  Aidan Kehoe  <[email protected]>
>
>         * data.c (build_fixnum_to_char_map):
>         Whoops, highest_value is a Lisp_Object, no need to extract the
>         fixnum from radix_table->default_ when initialising it. Thank you
>         Robert Delius Royar, Uwe Brauer, and the union build.
>
> diff -r f9e59cd39a9a -r 5a311f1f46aa src/ChangeLog
> --- a/src/ChangeLog     Tue Mar 17 12:22:50 2015 +0000
> +++ b/src/ChangeLog     Fri Mar 20 13:48:16 2015 +0000
> @@ -1,3 +1,10 @@
> +2015-03-20  Aidan Kehoe  <[email protected]>
> +
> +       * data.c (build_fixnum_to_char_map):
> +       Whoops, highest_value is a Lisp_Object, no need to extract the
> +       fixnum from radix_table->default_ when initialising it. Thank you
> +       Robert Delius Royar, Uwe Brauer, and the union build.
> +
>  2015-03-17  Aidan Kehoe  <[email protected]>
>
>         * data.c (fill_ichar_array):
> diff -r f9e59cd39a9a -r 5a311f1f46aa src/data.c
> --- a/src/data.c        Tue Mar 17 12:22:50 2015 +0000
> +++ b/src/data.c        Fri Mar 20 13:48:16 2015 +0000
> @@ -1517,7 +1517,8 @@
>    /* What's the greatest fixnum value seen? In passing, check all the char
>       table values are fixnums. */
>    CHECK_FIXNUM (XCHAR_TABLE (radix_table)->default_);
> -  highest_value = XFIXNUM (XCHAR_TABLE (radix_table)->default_);
> +  highest_value = XCHAR_TABLE (radix_table)->default_;
> +
>    map_char_table (radix_table, &ctr, find_highest_value, &highest_value);
>    cclen = XFIXNUM (highest_value) + 1;
>
>
>
> --
> ‘Tramadol is further fed to cattle […] when working them […] (as draft
> animals) so that the animals do not get tired quickly. …’
>         — Angewandte Chemie, Sept 2014, describing the social context of
>         (synthetic) tramadol having been found in Cameroon tree roots.



-- 
-- 
 Robert Royar <[email protected]>

_______________________________________________
XEmacs-Beta mailing list
[email protected]
http://lists.xemacs.org/mailman/listinfo/xemacs-beta