From 0d2b2ab0334393ea6e8e25aacdcc511937cf7bd8 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 22 Jul 2008 10:24:53 +0200 Subject: [PATCH] Remove spurious initial empty lines. * data/glr.c, data/glr.cc, data/lalr1.cc, data/lalr1.java, * data/yacc.c: End the @output lines with an @. --- ChangeLog | 6 ++++ data/glr.c | 4 +-- data/glr.cc | 4 +-- data/lalr1.cc | 6 ++-- data/lalr1.java | 78 ++++++++++++++++++++++++------------------------- data/yacc.c | 4 +-- 6 files changed, 54 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3d6dddd..157cf954 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-04 Akim Demaille + + Remove spurious initial empty lines. + * data/glr.c, data/glr.cc, data/lalr1.cc, data/lalr1.java, + * data/yacc.c: End the @output lines with an @. + 2009-04-04 Joel E. Denny Replace BISON_PROG_GNU_M4 with Autoconf's AC_PROG_GNU_M4. diff --git a/data/glr.c b/data/glr.c index 84637e0e..53b7fa17 100644 --- a/data/glr.c +++ b/data/glr.c @@ -148,7 +148,7 @@ m4_define([b4_rhs_location], # We do want M4 expansion after # for CPP macros. m4_changecom() m4_divert_push(0)dnl -@output(b4_parser_file_name@) +@output(b4_parser_file_name@)@ b4_copyright([Skeleton implementation for Bison GLR parsers in C], [2002, 2003, 2004, 2005, 2006]) [ @@ -2637,7 +2637,7 @@ dnl glr.cc produces its own header. dnl m4_if(b4_skeleton, ["glr.c"], [b4_defines_if( -[@output(b4_spec_defines_file@) +[@output(b4_spec_defines_file@)@ b4_copyright([Skeleton interface for Bison GLR parsers in C], [2002, 2003, 2004, 2005, 2006]) diff --git a/data/glr.cc b/data/glr.cc index ea04b28d..afd0e613 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -1,7 +1,7 @@ -*- C -*- # C++ GLR skeleton for Bison -# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, +# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, # Inc. # This program is free software: you can redistribute it and/or modify @@ -217,7 +217,7 @@ m4_include(b4_pkgdatadir/[glr.c]) m4_popdef([b4_parse_param]) m4_divert_push(0) -@output(b4_spec_defines_file@) +@output(b4_spec_defines_file@)@ b4_copyright([Skeleton interface for Bison GLR parsers in C++], [2002, 2003, 2004, 2005, 2006])[ diff --git a/data/lalr1.cc b/data/lalr1.cc index ca1dfccd..603786e5 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -33,7 +33,7 @@ m4_include(b4_pkgdatadir/[location.cc]) m4_changecom() m4_divert_push(0)dnl b4_defines_if( -[@output(b4_spec_defines_file@) +[@output(b4_spec_defines_file@)@ b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++], [2002, 2003, 2004, 2005, 2006, 2007, 2008]) dnl FIXME: This is wrong, we want computed header guards. @@ -298,7 +298,7 @@ b4_percent_code_get([[provides]])[]dnl [#endif /* ! defined PARSER_HEADER_H */] ])dnl -@output(b4_parser_file_name@) +@output(b4_parser_file_name@)@ b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++], [2002, 2003, 2004, 2005, 2006, 2007, 2008]) b4_percent_code_get([[top]])[]dnl @@ -1055,7 +1055,7 @@ b4_error_verbose_if([, int tok])[) ]b4_epilogue dnl -@output(b4_dir_prefix[]stack.hh@) +@output(b4_dir_prefix[]stack.hh@)@ b4_copyright([Stack handling for Bison parsers in C++], [2002, 2003, 2004, 2005, 2006, 2007, 2008])[ diff --git a/data/lalr1.java b/data/lalr1.java index 7e220d98..c855a75f 100644 --- a/data/lalr1.java +++ b/data/lalr1.java @@ -23,7 +23,7 @@ m4_ifval(m4_defn([b4_symbol_destructors]), []) m4_divert_push(0)dnl -@output(b4_parser_file_name@) +@output(b4_parser_file_name@)@ b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java], [2007, 2008]) @@ -130,7 +130,7 @@ b4_token_enums(b4_tokens) /** * Entry point for the scanner. Returns the token identifier corresponding * to the next token and prepares to return the semantic value - * ]b4_locations_if([and beginning/ending positions ])[of the token. + * ]b4_locations_if([and beginning/ending positions ])[of the token. * @@return the token identifier corresponding to the next token. */ int yylex () ]b4_maybe_throws([b4_lex_throws])[; @@ -228,11 +228,11 @@ b4_lexer_if([[ public int size = 16; public int height = -1; - + public final void push (int state, ]b4_yystype[ value]dnl - b4_locations_if([, ]b4_location_type[ loc])[) { + b4_locations_if([, ]b4_location_type[ loc])[) { height++; - if (size == height) + if (size == height) { int[] newStateStack = new int[size * 2]; System.arraycopy (stateStack, 0, newStateStack, 0, height); @@ -241,7 +241,7 @@ b4_lexer_if([[ ]b4_location_type[[] newLocStack = new ]b4_location_type[[size * 2]; System.arraycopy (locStack, 0, newLocStack, 0, height); locStack = newLocStack;]]) - + b4_yystype[[] newValueStack = new ]b4_yystype[[size * 2]; System.arraycopy (valueStack, 0, newValueStack, 0, height); valueStack = newValueStack; @@ -283,7 +283,7 @@ b4_lexer_if([[ public void print (java.io.PrintStream out) { out.print ("Stack now"); - + for (int i = 0; i < height; i++) { out.print (' '); @@ -337,7 +337,7 @@ b4_lexer_if([[ /* If YYLEN is nonzero, implement the default value of the action: `$$ = $1'. Otherwise, use the top of the stack. - + Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison users should not rely upon it. */ @@ -345,7 +345,7 @@ b4_lexer_if([[ yyval = yystack.valueAt (yylen - 1); else yyval = yystack.valueAt (0); - + yy_reduce_print (yyn, yystack); switch (yyn) @@ -482,11 +482,11 @@ m4_popdef([b4_at_dollar])])dnl yycdebug ("Entering state " + yystate + "\n"); if (yydebug > 0) yystack.print (yyDebugStream); - + /* Accept? */ if (yystate == yyfinal_) return true; - + /* Take a decision. First try without lookahead. */ yyn = yypact_[yystate]; if (yyn == yypact_ninf_) @@ -494,7 +494,7 @@ m4_popdef([b4_at_dollar])])dnl label = YYDEFAULT; break; } - + /* Read a lookahead token. */ if (yychar == yyempty_) { @@ -502,10 +502,10 @@ m4_popdef([b4_at_dollar])])dnl yychar = yylex ();] b4_locations_if([[ yylloc = new ]b4_location_type[(yylexer.getStartPos (), - yylexer.getEndPos ());]]) + yylexer.getEndPos ());]]) yylval = yylexer.getLVal ();[ } - + /* Convert token to internal form. */ if (yychar <= EOF) { @@ -516,15 +516,15 @@ m4_popdef([b4_at_dollar])])dnl { yytoken = yytranslate_ (yychar); yy_symbol_print ("Next token is", yytoken, - yylval]b4_locations_if([, yylloc])[); + yylval]b4_locations_if([, yylloc])[); } - + /* If the proper action on seeing token YYTOKEN is to reduce or to detect an error, take that action. */ yyn += yytoken; if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yytoken) label = YYDEFAULT; - + /* <= 0 means reduce or error. */ else if ((yyn = yytable_[yyn]) <= 0) { @@ -536,27 +536,27 @@ m4_popdef([b4_at_dollar])])dnl label = YYREDUCE; } } - + else { /* Shift the lookahead token. */ yy_symbol_print ("Shifting", yytoken, - yylval]b4_locations_if([, yylloc])[); - + yylval]b4_locations_if([, yylloc])[); + /* Discard the token being shifted. */ yychar = yyempty_; - + /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus_ > 0) --yyerrstatus_; - + yystate = yyn; yystack.push (yystate, yylval]b4_locations_if([, yylloc])[); label = YYNEWSTATE; } break; - + /*-----------------------------------------------------------. | yydefault -- do the default action for the current state. | `-----------------------------------------------------------*/ @@ -567,7 +567,7 @@ m4_popdef([b4_at_dollar])])dnl else label = YYREDUCE; break; - + /*-----------------------------. | yyreduce -- Do a reduction. | `-----------------------------*/ @@ -576,7 +576,7 @@ m4_popdef([b4_at_dollar])])dnl label = yyaction (yyn, yystack, yylen); yystate = yystack.stateAt (0); break; - + /*------------------------------------. | yyerrlab -- here on detecting error | `------------------------------------*/ @@ -587,13 +587,13 @@ m4_popdef([b4_at_dollar])])dnl ++yynerrs_; yyerror (]b4_locations_if([yylloc, ])[yysyntax_error (yystate, yytoken)); } - + ]b4_locations_if([yyerrloc = yylloc;])[ if (yyerrstatus_ == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ - + if (yychar <= EOF) { /* Return failure if at end of input. */ @@ -603,17 +603,17 @@ m4_popdef([b4_at_dollar])])dnl else yychar = yyempty_; } - + /* Else will try to reuse lookahead token after shifting the error token. */ label = YYERRLAB1; break; - + /*---------------------------------------------------. | errorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ case YYERROR: - + ]b4_locations_if([yyerrloc = yystack.locationAt (yylen - 1);])[ /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ @@ -622,13 +622,13 @@ m4_popdef([b4_at_dollar])])dnl yystate = yystack.stateAt (0); label = YYERRLAB1; break; - + /*-------------------------------------------------------------. | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ case YYERRLAB1: yyerrstatus_ = 3; /* Each real token shifted decrements this. */ - + for (;;) { yyn = yypact_[yystate]; @@ -642,18 +642,18 @@ m4_popdef([b4_at_dollar])])dnl break; } } - + /* Pop the current state because it cannot handle the error token. */ if (yystack.height == 1) return false; - + ]b4_locations_if([yyerrloc = yystack.locationAt (0);])[ yystack.pop (); yystate = yystack.stateAt (0); if (yydebug > 0) yystack.print (yyDebugStream); } - + ]b4_locations_if([ /* Muck with the stack to setup for yylloc. */ yystack.push (0, null, yylloc); @@ -664,16 +664,16 @@ m4_popdef([b4_at_dollar])])dnl /* Shift the error token. */ yy_symbol_print ("Shifting", yystos_[yyn], yylval]b4_locations_if([, yyloc])[); - + yystate = yyn; yystack.push (yyn, yylval]b4_locations_if([, yyloc])[); label = YYNEWSTATE; break; - + /* Accept. */ case YYACCEPT: return true; - + /* Abort. */ case YYABORT: return false; @@ -842,7 +842,7 @@ m4_popdef([b4_at_dollar])])dnl for (int yyi = 0; yyi < yynrhs; yyi++) yy_symbol_print (" $" + (yyi + 1) + " =", yyrhs_[yyprhs_[yyrule] + yyi], - ]b4_rhs_value(yynrhs, yyi + 1)b4_locations_if([, + ]b4_rhs_value(yynrhs, yyi + 1)b4_locations_if([, b4_rhs_location(yynrhs, yyi + 1)])[); } diff --git a/data/yacc.c b/data/yacc.c index 19f77a5f..940b4a7a 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -153,7 +153,7 @@ m4_define([b4_rhs_location], # We do want M4 expansion after # for CPP macros. m4_changecom() m4_divert_push(0)dnl -@output(b4_parser_file_name@) +@output(b4_parser_file_name@)@ b4_copyright([Skeleton implementation for Bison's Yacc-like parsers in C],dnl ' [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006])[ @@ -1674,7 +1674,7 @@ yypushreturn: ]b4_epilogue b4_defines_if( -[@output(b4_spec_defines_file@) +[@output(b4_spec_defines_file@)@ b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],dnl ' [1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006]) -- 2.45.2