Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[Dmitry Antipov]

On 07/27/2012 10:45 AM, martin rudalics wrote:

> revno: 109223
> committer: Dmitry Antipov <address@hidden>
> branch nick: trunk
> timestamp: Fri 2012-07-27 10:04:35 +0400
> message:
>    Utility function to make a list from specified amount of objects.
>    * lisp.h (enum constype): New datatype.
>    (listn): New prototype.
>    * alloc.c (listn): New function.
>    (Fmemory_use_count, syms_of_alloc): Use it.
>    * buffer.c (syms_of_buffer): Likewise.
>    * callint.c (syms_of_callint): Likewise.
>    * charset.c (define_charset_internal): Likewise.
>    * coding.c (syms_of_coding): Likewise.
>    * keymap.c (syms_of_keymap): Likewise.
>    * search.c (syms_of_search): Likewise.
>    * syntax.c (syms_of_syntax): Likewise.
>    * w32.c (init_environment): Likewise.
>    * w32fns.c (Fw32_battery_status, syms_of_w32fns): Likewise.
>    * xdisp.c (syms_of_xdisp): Likewise.
>    * xfns.c (syms_of_xfns): Likewise.
>
> gets me
>
> w32.c: In function 'init_environment':
> w32.c:1727:34: error: expected ')' before ';' token
> make[1]: *** [oo/i386/w32.o] Error 1
> make[1]: Leaving directory `c:/emacs/trunk/src'
> make: *** [all-other-dirs-gmake] Error 2

Two obvious typos are fixed in 109225.

Dmitry

Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[martin rudalics]

> Two obvious typos are fixed in 109225.

I already fixed those here but am still getting:

w32fns.c: In function 'syms_of_w32fns':
w32fns.c:6797:13: error: expected expression before ',' token
make[1]: *** [oo/i386/w32fns.o] Error 1
make[1]: Leaving directory `c:/emacs/trunk/src'
make: *** [all-other-dirs-gmake] Error 2

martin

Re: /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[Andy Moreton]

On Fri 27 Jul 2012, martin rudalics wrote:

>> Two obvious typos are fixed in 109225.
>
> I already fixed those here but am still getting:
>
> w32fns.c: In function 'syms_of_w32fns':
> w32fns.c:6797:13: error: expected expression before ',' token
> make[1]: *** [oo/i386/w32fns.o] Error 1
> make[1]: Leaving directory `c:/emacs/trunk/src'
> make: *** [all-other-dirs-gmake] Error 2
>
> martin

I see this with MinGw gcc 4.6.1, because mingw include/basetyps.h this
at line 71:

#  define PURE

The #defines for listn should use a longer name that does not clash with
Windows headers.

    AndyM

Re: /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[Eli Zaretskii]

> From: Andy Moreton <andrewjmoreton@gmail.com>
> Date: Fri, 27 Jul 2012 10:12:00 +0100
> 
> On Fri 27 Jul 2012, martin rudalics wrote:
> 
> >> Two obvious typos are fixed in 109225.
> >
> > I already fixed those here but am still getting:
> >
> > w32fns.c: In function 'syms_of_w32fns':
> > w32fns.c:6797:13: error: expected expression before ',' token
> > make[1]: *** [oo/i386/w32fns.o] Error 1
> > make[1]: Leaving directory `c:/emacs/trunk/src'
> > make: *** [all-other-dirs-gmake] Error 2
> >
> > martin
> 
> I see this with MinGw gcc 4.6.1, because mingw include/basetyps.h this
> at line 71:
> 
> #  define PURE
> 
> The #defines for listn should use a longer name that does not clash with
> Windows headers.

Yes.  I'm fixing this as we speak.

Re: /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[Eli Zaretskii]

> Date: Fri, 27 Jul 2012 12:15:02 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
> 
> > From: Andy Moreton <andrewjmoreton@gmail.com>
> > Date: Fri, 27 Jul 2012 10:12:00 +0100
> > 
> > On Fri 27 Jul 2012, martin rudalics wrote:
> > 
> > >> Two obvious typos are fixed in 109225.
> > >
> > > I already fixed those here but am still getting:
> > >
> > > w32fns.c: In function 'syms_of_w32fns':
> > > w32fns.c:6797:13: error: expected expression before ',' token
> > > make[1]: *** [oo/i386/w32fns.o] Error 1
> > > make[1]: Leaving directory `c:/emacs/trunk/src'
> > > make: *** [all-other-dirs-gmake] Error 2
> > >
> > > martin
> > 
> > I see this with MinGw gcc 4.6.1, because mingw include/basetyps.h this
> > at line 71:
> > 
> > #  define PURE
> > 
> > The #defines for listn should use a longer name that does not clash with
> > Windows headers.
> 
> Yes.  I'm fixing this as we speak.

Should be fixed now, please check.

Re: /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[martin rudalics]

> Should be fixed now, please check.

Works now.  Thanks!

martin

Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[Dmitry Antipov]

On 07/27/2012 12:21 PM, martin rudalics wrote:

>> Two obvious typos are fixed in 109225.
>
> I already fixed those here but am still getting:
>
> w32fns.c: In function 'syms_of_w32fns':
> w32fns.c:6797:13: error: expected expression before ',' token
> make[1]: *** [oo/i386/w32fns.o] Error 1
> make[1]: Leaving directory `c:/emacs/trunk/src'
> make: *** [all-other-dirs-gmake] Error 2

Hm... name clash? Can you preprocess and see what PURE is expanded to?
It may be predefined to some unexpected value.

Dmitry

Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[Eli Zaretskii]

> Date: Fri, 27 Jul 2012 13:17:00 +0400
> From: Dmitry Antipov <dmantipov@yandex.ru>
> Cc: emacs-diffs@gnu.org, Emacs development discussions <emacs-devel@gnu.org>
> 
> On 07/27/2012 12:21 PM, martin rudalics wrote:
> 
> >> Two obvious typos are fixed in 109225.
> >
> > I already fixed those here but am still getting:
> >
> > w32fns.c: In function 'syms_of_w32fns':
> > w32fns.c:6797:13: error: expected expression before ',' token
> > make[1]: *** [oo/i386/w32fns.o] Error 1
> > make[1]: Leaving directory `c:/emacs/trunk/src'
> > make: *** [all-other-dirs-gmake] Error 2
> 
> Hm... name clash? Can you preprocess and see what PURE is expanded to?

It is expanded to an empty string:

  Fput (Qundefined_color, Qerror_conditions,
 listn (, 2, Qundefined_color, Qerror));

This is because:

  # 69 "D:/usr/bin/../lib/gcc/mingw32/3.4.2/../../../../include/basetyps.h" 3
  #define STDMETHOD(m) HRESULT(STDMETHODCALLTYPE *m)
  #define STDMETHOD_(t,m) t(STDMETHODCALLTYPE *m)
  #define PURE 
  #define THIS_ INTERFACE *,
  #define THIS INTERFACE *

But note that gmalloc.c also has its own definition for HEAP:

  /* Determine the amount of memory spanned by the initial heap table
     (not an absolute limit).  */
  #define HEAP		(INT_BIT > 16 ? 4194304 : 65536)

Morale: never use too general names for symbols.

I fixed this by renaming the constants to CONSTYPE_PURE and
CONSTYPE_HEAP.

Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[Eli Zaretskii]

> Date: Fri, 27 Jul 2012 11:56:19 +0400
> From: Dmitry Antipov <dmantipov@yandex.ru>
> Cc: emacs-diffs@gnu.org, Emacs development discussions <emacs-devel@gnu.org>
> 
> On 07/27/2012 10:45 AM, martin rudalics wrote:
> 
> > revno: 109223
> > committer: Dmitry Antipov <address@hidden>
> > branch nick: trunk
> > timestamp: Fri 2012-07-27 10:04:35 +0400
> > message:
> >    Utility function to make a list from specified amount of objects.
> >    * lisp.h (enum constype): New datatype.
> >    (listn): New prototype.
> >    * alloc.c (listn): New function.
> >    (Fmemory_use_count, syms_of_alloc): Use it.
> >    * buffer.c (syms_of_buffer): Likewise.
> >    * callint.c (syms_of_callint): Likewise.
> >    * charset.c (define_charset_internal): Likewise.
> >    * coding.c (syms_of_coding): Likewise.
> >    * keymap.c (syms_of_keymap): Likewise.
> >    * search.c (syms_of_search): Likewise.
> >    * syntax.c (syms_of_syntax): Likewise.
> >    * w32.c (init_environment): Likewise.
> >    * w32fns.c (Fw32_battery_status, syms_of_w32fns): Likewise.
> >    * xdisp.c (syms_of_xdisp): Likewise.
> >    * xfns.c (syms_of_xfns): Likewise.
> >
> > gets me
> >
> > w32.c: In function 'init_environment':
> > w32.c:1727:34: error: expected ')' before ';' token
> > make[1]: *** [oo/i386/w32.o] Error 1
> > make[1]: Leaving directory `c:/emacs/trunk/src'
> > make: *** [all-other-dirs-gmake] Error 2

In addition, there was a more serious error in listn: it consed the
arguments in the wrong order: from first to last, instead of the other
way around.  This caused incorrect frame title to be displayed, but
also had other manifestations: e.g., memory-use-counts would display
its results in the reversed order.

(I fixed listn in revision 109230.)

Dmitry, I wonder how you tested listn, that left these problems
undetected.  Just stepping into memory-use-counts with a debugger and
comparing the values of the variables with the list returned to Lisp
should have shown the problem very clearly.

Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109223: Utility function to make a list from specified amount of objects.

[Dmitry Antipov]

On 07/27/2012 02:37 PM, Eli Zaretskii wrote:

> In addition, there was a more serious error in listn: it consed the
> arguments in the wrong order: from first to last, instead of the other
> way around.  This caused incorrect frame title to be displayed, but
> also had other manifestations: e.g., memory-use-counts would display
> its results in the reversed order.
>
> (I fixed listn in revision 109230.)
>
> Dmitry, I wonder how you tested listn, that left these problems
> undetected.  Just stepping into memory-use-counts with a debugger and
> comparing the values of the variables with the list returned to Lisp
> should have shown the problem very clearly.

Argh, thanks, it should be like in Flist.

It looks like I shouldn't try to escalate more than one feature in parallel.

Dmitry