* input/regression/bar-scripts.ly: Re-enable.

* lily/parser.yy:
* stepmake/stepmake/c++-rules.make: Fixes for bison 1.51 to be
released rsn.  Bison 1.50 has a crucial bug and won't work.

* lily/lexer.ll (My_lily_lexer): Avoid silly flex induced gcc warnings.

diff --git a/ChangeLog b/ChangeLog
index bcc25818d84140b28f5eb6df103d4f098d0dbdfd..3b387f40987493dff07006941762e9c8b5a251f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-10  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/regression/bar-scripts.ly: Re-enable.
+
+       * lily/parser.yy:
+       * stepmake/stepmake/c++-rules.make: Fixes for bison 1.51 to be
+       released rsn.  Bison 1.50 has a crucial bug and won't work.
+
+       * lily/lexer.ll (My_lily_lexer): Avoid silly flex induced gcc warnings.
+
 2002-10-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/regression/bar-scripts.ly: Blunt documentation build fix.

diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly
index de39ac5875c37f48690216f2d3644c456d226311..f6595cb40d0066b24d2bec95e802fe1ffa724dae 100644 (file)
--- a/input/regression/bar-scripts.ly
+++ b/input/regression/bar-scripts.ly
@@ -13,35 +13,33 @@ knowing it.  Consequently, they fall over  often.
 
 % FIXME including this file makes lily crash lateron -- breaks website build
 
-% onestaff =  \context Staff = foo\notes  {
-%      \property Staff.instr = instr
-%      \property Staff.instrument = instrument \mark "B"
-%       c1 \mark "A" \break c2  c2 \break
-% }
+onestaff =  \context Staff = foo\notes  {
+       \property Staff.instr = instr
+       \property Staff.instrument = instrument \mark "B"
+        c1 \mark "A" \break c2  c2 \break
+}
 
-% grstaff =  \notes \context GrandStaff <
-%      \context Staff = bar {
+grstaff =  \notes \context GrandStaff <
+       \context Staff = bar {
 
-%      \property Staff.instr = instr
+       \property Staff.instr = instr
        
-%       \mark "B" \break c1 \mark "A" c2  }
-%      \context Staff = bufl { c1 c2  }
-% >
-
-% scpaper =  \paper {\translator {\OrchestralScoreContext}}
-% % stpaper =  \paper{ \translator {\BarNumberingStaffContext }}
-% stpaper =  \paper{ }
+        \mark "B" \break c1 \mark "A" c2  }
+       \context Staff = bufl { c1 c2  }
+>
 
-% scscore =  \score { \grstaff \paper {
-% \scpaper
-% }}
+scpaper =  \paper {\translator {\OrchestralScoreContext}}
+% stpaper =  \paper{ \translator {\BarNumberingStaffContext }}
+stpaper =  \paper{ }
 
+scscore =  \score { \grstaff \paper {
+\scpaper
+}}
 
-% stscore =  \score { \onestaff \paper {
-%  \stpaper
-% }}
 
-% %\score {\stscore}
-% \score {\scscore}
+stscore =  \score { \onestaff \paper {
+ \stpaper
+}}
 
-\score{\notes c''}
\ No newline at end of file
+%\score {\stscore}
+\score {\scscore}

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 00cff1fd1c95b8e6c1484ede359a84b3155a089a..2d0b5dfa0f9084d30ba32b92224dfb16af1cf714 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -727,3 +727,19 @@ scan_fraction (String frac)
        return gh_cons (gh_int2scm (n), gh_int2scm (d));
 }
                
+/* avoid silly flex induced gcc warnings */
+static void yy_push_state (int) {;}
+static void yy_pop_state () {;}
+static int yy_top_state () { return 0; }
+
+static void
+avoid_silly_flex_induced_gcc_warnings ()
+{
+       (void)yy_start_stack_ptr;
+       (void)yy_start_stack_depth;
+       (void)yy_start_stack;
+       yy_push_state (0);
+       yy_pop_state ();
+       yy_top_state ();
+       avoid_silly_flex_induced_gcc_warnings ();
+}

diff --git a/lily/parser.yy b/lily/parser.yy
index aa0373329564df34ad42142079fdd469c3caaedc..9e57da52ec72a3d790340d5427b8af34a4197496 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -111,6 +111,7 @@ make_span_req (SCM name)
 
 #define YYERROR_VERBOSE 1
 
+My_lily_parser* my_lily_parser;
 #define YYPARSE_PARAM my_lily_parser
 #define YYLEX_PARAM my_lily_parser
 #define THIS\
@@ -1401,7 +1402,6 @@ verbose_event:
                $$->set_spot (THIS->here_input ());
        }
        | SPANREQUEST bare_int STRING {
-
                Music * sp = make_span_req ($3);
                sp->set_mus_property ("span-direction", gh_int2scm ( $2));
                sp->set_spot (THIS->here_input ());

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 1bec4365b2570ec980bfc343d62fb604314acb6c..fd33d15f9bb1ccd7c0e43f515308bd97acc10f70 100644 (file)
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -13,15 +13,15 @@ $(outdir)/%.lo: $(outdir)/%.cc
        $(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.cc: %.yy
-       $(BISON) $<
-       @-mv -f $(*F).yy.tab.c $(*F).tab.cc  # bison < 1.30
-       mv $(*F).tab.cc $@
+       $(BISON) -o $@ $<
+       -mv -f $(*F).yy.tab.c $@ # bison < 1.30
 
 $(outdir)/%.hh: %.yy
-       $(BISON) -d $<
-       @-mv -f $(*F).yy.tab.h $(*F).tab.hh  # bison < 1.30
-       mv $(*F).tab.hh $@
-       rm -f $(*F).tab.c $(*F).tab.cc  # if this happens in the wrong order it triggers recompile of the .cc file 
+       $(BISON) -o$(outdir)/$(*F).cc -d $<
+       -mv -f $(*F).yy.tab.h $@  # bison < 1.30
+       -mv $(*F).tab.hh $@
+       rm -f $(*F).tab.c $(*F).tab.cc # bison < 1.30
+       rm -f $(outdir)/$(*F).cc # avoid recompiling the .cc file 
 
 $(outdir)/%.cc: %.ll
        $(FLEX) -Cfe -p -p -t $< > $@