[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/8] skeletons: style changes
From: |
Akim Demaille |
Subject: |
[PATCH 3/8] skeletons: style changes |
Date: |
Tue, 31 Jul 2012 11:17:26 +0200 |
* data/glr.c, data/lalr1.cc: Use more consistent comments,
and YY_NULL declaration.
---
data/glr.c | 4 ++--
data/lalr1.cc | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/glr.c b/data/glr.c
index 935ee96..6a12cfb 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -214,13 +214,13 @@ b4_percent_code_get([[top]])[
#define yynerrs ]b4_prefix[nerrs]b4_locations_if([[
#define yylloc ]b4_prefix[lloc]])])[
-/* Copy the first part of user declarations. */
+/* First part of user declarations. */
]b4_user_pre_prologue[
]b4_null_define[
]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],
- [b4_shared_declarations])[
+ [b4_shared_declarations])[
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
diff --git a/data/lalr1.cc b/data/lalr1.cc
index f71be3f..3d6bdca 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -358,17 +358,17 @@ m4_if(b4_prefix, [yy], [],
// Take the name prefix into account.
#define yylex b4_prefix[]lex])[
-/* First part of user declarations. */
+// First part of user declarations.
]b4_user_pre_prologue[
+]b4_null_define[
+
#include "@basename(]b4_spec_defines_file[@)"
/* User implementation prologue. */
]b4_user_post_prologue[
]b4_percent_code_get[
-]b4_null_define[
-
#ifndef YY_
# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
--
1.7.11.3
- [PATCH 0/8] {master} C++: make %locations and %defines optional, Akim Demaille, 2012/07/31
- [PATCH 2/8] glr.cc, lalr1.cc: define b4_shared_declarations, Akim Demaille, 2012/07/31
- [PATCH 5/8] lalr1.cc: location.hh and position.hh are not generated without %defines, Akim Demaille, 2012/07/31
- [PATCH 3/8] skeletons: style changes,
Akim Demaille <=
- [PATCH 8/8] tests: comment changes., Akim Demaille, 2012/07/31
- [PATCH 6/8] lalr1.cc: do not create stack.hh without %defines, Akim Demaille, 2012/07/31
- [PATCH 1/8] glr.cc: no longer require location support., Akim Demaille, 2012/07/31
- [PATCH 4/8] lalr1.cc: no longer require %defines., Akim Demaille, 2012/07/31
- [PATCH 7/8] tests: really check the set of generated files, Akim Demaille, 2012/07/31