Re: compile error, latest CVS 13-April

[Jan Nieuwenhuizen]

David Bobroff <address@hidden> writes:

> I have 2.5.4a-29 (stock RH9.0) which, until yesterday, was not causing
> any trouble.

Which means that you should have yyFlexLexer.yy_current_buffer.

> Attached.

Thanks.

> configure:5017: checking for yyFlexLexer.yy_current_buffer
> configure:5049: g++ -c  -O2 -finline-functions -g   conftest.cc >&5
> configure:5030:1: warning: "PACKAGE_NAME" redefined
> configure:5024:1: warning: this is the location of the previous definition
> configure:5052: $? = 0
[..]
> ## ----------- ##
> ## confdefs.h. ##
> ## ----------- ##
[..]
> #define HAVE_FLEXLEXER_YY_CURRENT_BUFFER 1

Ok, so the configure magic works.  This is quite strange.  Your error:

    types -Wconversion  -o out/includable-lexer.o includable-lexer.cc
    includable-lexer.cc:68: `yy_buffer_stack' undeclared (first use this
       function)

indicates usage of yy_buffer_stack at includable-lexer.cc:68

    if (yy_current_buffer)

which is defined at includable-lexer.cc:29

    /* Flex >= 2.5.29 has include stack; but we don't use that yet.  */
    #ifndef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
    #define yy_current_buffer \
      (yy_buffer_stack != 0 ? yy_buffer_stack[yy_buffer_stack_top] : 0)
    #endif

Hmm.  Oops.  Could you try latest CVS (or the attached fix)?

Jan.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
retrieving revision 1.835
diff -p -u -r1.835 ChangeLog
--- ChangeLog   14 Apr 2003 08:28:37 -0000      1.835
+++ ChangeLog   14 Apr 2003 10:57:08 -0000
@@ -1,5 +1,10 @@
 2003-04-14  Jan Nieuwenhuizen  <address@hidden>
 
+       * stepmake/aclocal.m4: Include compile fix for broken flex, as
+       used in includable-lexer.hh.
+
+       * lily/includable-lexer.cc: Bugfix: include config.h.
+
        * stepmake/aclocal.m4: Check for $GUILE_CONFIG; allows
         circumvention of Debian packaging bug.
 
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/lilypond/lilypond/aclocal.m4,v
retrieving revision 1.122
diff -p -u -r1.122 aclocal.m4
--- aclocal.m4  14 Apr 2003 08:28:37 -0000      1.122
+++ aclocal.m4  14 Apr 2003 10:57:09 -0000
@@ -1,4 +1,4 @@
-:dnl aclocal.m4   -*-shell-script-*-
+dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
 
@@ -337,6 +337,7 @@ AC_DEFUN(STEPMAKE_FLEXLEXER, [
     AC_CACHE_CHECK([for yyFlexLexer.yy_current_buffer],
        [stepmake_flexlexer_yy_current_buffer],
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+using namespace std;
 #include <FlexLexer.h>
 class yy_flex_lexer: public yyFlexLexer
 {
Index: lily/includable-lexer.cc
===================================================================
RCS file: /cvsroot/lilypond/lilypond/lily/includable-lexer.cc,v
retrieving revision 1.27
diff -p -u -r1.27 includable-lexer.cc
--- lily/includable-lexer.cc    13 Apr 2003 11:48:48 -0000      1.27
+++ lily/includable-lexer.cc    14 Apr 2003 10:57:14 -0000
@@ -7,10 +7,10 @@
 */
 
 #include <sstream>
+#include "config.h"
 
-
-#include "file-path.hh"
 #include "includable-lexer.hh"
+#include "file-path.hh"
 #include "source-file.hh"
 #include "source.hh"
 #include "warn.hh"
Index: stepmake/aclocal.m4
===================================================================
RCS file: /cvsroot/lilypond/lilypond/stepmake/aclocal.m4,v
retrieving revision 1.95
diff -p -u -r1.95 aclocal.m4
--- stepmake/aclocal.m4 14 Apr 2003 08:25:53 -0000      1.95
+++ stepmake/aclocal.m4 14 Apr 2003 10:57:14 -0000
@@ -337,6 +337,7 @@ AC_DEFUN(STEPMAKE_FLEXLEXER, [
     AC_CACHE_CHECK([for yyFlexLexer.yy_current_buffer],
        [stepmake_flexlexer_yy_current_buffer],
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+using namespace std;
 #include <FlexLexer.h>
 class yy_flex_lexer: public yyFlexLexer
 {


-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org