* data/c.m4 (b4_location_initial_column, b4_location_initial_line):

New, default to 1.
* data/yacc.c, data/glr.c, data/location.cc: Use them.
* NEWS, doc/bison.texinfo: The initial column and line are 1 by
default.
* tests/calc.at: Adjust.

diff --git a/ChangeLog b/ChangeLog
index b2aeb56ddc8bfa9755505c57d88a8efb62a369a4..81f0478d8d6c5048994cff7725e7061c1e50553b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-08  Akim Demaille  <akim@lrde.epita.fr>
+
+       * data/c.m4 (b4_location_initial_column, b4_location_initial_line):
+       New, default to 1.
+       * data/yacc.c, data/glr.c, data/location.cc: Use them.
+       * NEWS, doc/bison.texinfo: The initial column and line are 1 by
+       default.
+       * tests/calc.at: Adjust.
+

 2006-07-08  Akim Demaille  <akim@lrde.epita.fr>
 
        * data/c.m4 (b4_dirname): New.
 2006-07-08  Akim Demaille  <akim@lrde.epita.fr>
 
        * data/c.m4 (b4_dirname): New.

diff --git a/NEWS b/NEWS
index dd36e633ad222f2632b280e160801978147a8d0a..0b6b23415253e32f8770d05a7fe86d364b45b658 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ Bison News
 
 Changes in version 2.3+:
 
 
 Changes in version 2.3+:
 

+* Locations columns and lines start at 1.
+  In accordance with the GNU Coding Standards and Emacs.
+

 * Except for LALR(1) parsers in C with POSIX Yacc emulation enabled (with `-y',
   `--yacc', or `%yacc'), Bison no longer generates #define statements for
   associating token numbers with token names.  Removing the #define statements
 * Except for LALR(1) parsers in C with POSIX Yacc emulation enabled (with `-y',
   `--yacc', or `%yacc'), Bison no longer generates #define statements for
   associating token numbers with token names.  Removing the #define statements

diff --git a/data/c.m4 b/data/c.m4
index 4757c58c062b190edd6620c39ea85c0483a7228c..33b4dddad656d671d1a68c03504aef15af8fa479 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -91,6 +91,11 @@ m4_define_default([b4_epilogue], [])
 # If the %union is not named, its name is YYSTYPE.
 m4_define_default([b4_union_name], [YYSTYPE])
 
 # If the %union is not named, its name is YYSTYPE.
 m4_define_default([b4_union_name], [YYSTYPE])
 

+# The initial column and line.
+m4_define_default([b4_location_initial_column], [1])
+m4_define_default([b4_location_initial_line],   [1])
+
+

 ## ------------------------ ##
 ## Pure/impure interfaces.  ##
 ## ------------------------ ##
 ## ------------------------ ##
 ## Pure/impure interfaces.  ##
 ## ------------------------ ##

diff --git a/data/glr.c b/data/glr.c
index d956a3796ab1a776d36366c9c296d2883b9f7553..8da2048716cb8f9151075109e5dbdc7d790ff724 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -2303,8 +2303,8 @@ yyrecoverSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
   yylval = yyval_default;
 ]b4_locations_if([
 #if YYLTYPE_IS_TRIVIAL
   yylval = yyval_default;
 ]b4_locations_if([
 #if YYLTYPE_IS_TRIVIAL

-  yylloc.first_line   = yylloc.last_line   = 1;
-  yylloc.first_column = yylloc.last_column = 0;
+  yylloc.first_line   = yylloc.last_line   = ]b4_location_initial_line[;
+  yylloc.first_column = yylloc.last_column = ]b4_location_initial_column[;

 #endif
 ])
 m4_ifdef([b4_initial_action], [
 #endif
 ])
 m4_ifdef([b4_initial_action], [

diff --git a/data/location.cc b/data/location.cc
index 156115ca29bf2c55cc4fa53671a95ceaa54ec6ec..2d32bf77bf8f8c62ebaadd07a935f2d8d712e8bf 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -36,6 +36,7 @@ b4_copyright([Positions for Bison parsers in C++],
 
 # include <iostream>
 # include <string>
 
 # include <iostream>
 # include <string>

+# include <algorithm>

 
 namespace ]b4_namespace[
 {
 
 namespace ]b4_namespace[
 {


@@ -46,7 +47,7 @@ namespace ]b4_namespace[
 ]m4_ifdef([b4_location_constructors], [
     /// Construct a position.
     position ()
 ]m4_ifdef([b4_location_constructors], [
     /// Construct a position.
     position ()

-      : filename (0), line (1), column (0)
+      : filename (0), line (]b4_location_initial_line[), column (]b4_location_initial_column[)

     {
     }
 
     {
     }
 


@@ -55,8 +56,8 @@ namespace ]b4_namespace[
     inline void initialize (]b4_filename_type[* fn)
     {
       filename = fn;
     inline void initialize (]b4_filename_type[* fn)
     {
       filename = fn;

-      line = 1;
-      column = 0;
+      line = ]b4_location_initial_line[;
+      column = ]b4_location_initial_column[;

     }
 
     /** \name Line and Column related manipulators
     }
 
     /** \name Line and Column related manipulators


@@ -65,19 +66,14 @@ namespace ]b4_namespace[
     /// (line related) Advance to the COUNT next lines.
     inline void lines (int count = 1)
     {
     /// (line related) Advance to the COUNT next lines.
     inline void lines (int count = 1)
     {

-      column = 0;
+      column = ]b4_location_initial_column[;

       line += count;
     }
 
     /// (column related) Advance to the COUNT next columns.
     inline void columns (int count = 1)
     {
       line += count;
     }
 
     /// (column related) Advance to the COUNT next columns.
     inline void columns (int count = 1)
     {

-      int leftmost = 0;
-      int current  = column;
-      if (leftmost <= current + count)
-       column += count;
-      else
-       column = 0;
+      column = std::max (]b4_location_initial_column[u, column + count);

     }
     /** \} */
 
     }
     /** \} */
 

diff --git a/data/yacc.c b/data/yacc.c
index 11ea2a797a467433c3f951cc61b0c25c79605e85..2b1cadbaec710e05b45f93ba1dc23dbb38d82906 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1064,8 +1064,8 @@ b4_c_function_def([yyparse], [int], b4_parse_param)
 ]b4_locations_if([[  yylsp = yyls;
 #if YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
 ]b4_locations_if([[  yylsp = yyls;
 #if YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */

-  yylloc.first_line   = yylloc.last_line   = 1;
-  yylloc.first_column = yylloc.last_column = 0;
+  yylloc.first_line   = yylloc.last_line   = ]b4_location_initial_line[;
+  yylloc.first_column = yylloc.last_column = ]b4_location_initial_column[;

 #endif
 ]])
 m4_ifdef([b4_initial_action], [
 #endif
 ]])
 m4_ifdef([b4_initial_action], [

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index e40788c5984988ea7aecfa6d891ea928e89a0f43..0e181b8645368110362df462b28feeba8953730a 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -1998,7 +1998,9 @@ type for storing locations is not needed: we will use the type provided
 by default (@pxref{Location Type, ,Data Types of Locations}), which is a
 four member structure with the following integer fields:
 @code{first_line}, @code{first_column}, @code{last_line} and
 by default (@pxref{Location Type, ,Data Types of Locations}), which is a
 four member structure with the following integer fields:
 @code{first_line}, @code{first_column}, @code{last_line} and

-@code{last_column}.
+@code{last_column}.  By conventions, and in accordance with the GNU
+Coding Standards and common practice, the line and column count both
+start at 1.

 
 @node Ltcalc Rules
 @subsection Grammar Rules for @code{ltcalc}
 
 @node Ltcalc Rules
 @subsection Grammar Rules for @code{ltcalc}


@@ -3512,6 +3514,9 @@ typedef struct YYLTYPE
 @} YYLTYPE;
 @end example
 
 @} YYLTYPE;
 @end example
 

+At the beginning of the parsing, Bison initializes all these fields to 1
+for @code{yylloc}.
+

 @node Actions and Locations
 @subsection Actions and Locations
 @cindex location actions
 @node Actions and Locations
 @subsection Actions and Locations
 @cindex location actions

diff --git a/tests/calc.at b/tests/calc.at
index 75010c11b81d8324a8652d1a5c9f6ad1ad9bd660..0ade5ff9590865f97d5b60b2247a5149854ba39d 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -199,7 +199,7 @@ get_char (]AT_LEX_FORMALS[)
   if (res == '\n')
     {
       AT_LOC.last_line++;
   if (res == '\n')
     {
       AT_LOC.last_line++;

-      AT_LOC.last_column = 0;
+      AT_LOC.last_column = 1;

     }
   else
     AT_LOC.last_column++;
     }
   else
     AT_LOC.last_column++;


@@ -262,7 +262,7 @@ yylex (]AT_LEX_FORMALS[)
     {
       init = 0;
 ]AT_LOCATION_IF([
     {
       init = 0;
 ]AT_LOCATION_IF([

-      AT_LOC.last_column = 0;
+      AT_LOC.last_column = 1;

       AT_LOC.last_line = 1;
 ])[
     }
       AT_LOC.last_line = 1;
 ])[
     }


@@ -476,21 +476,21 @@ _AT_CHECK_CALC([$1],
 
 # Some syntax errors.
 _AT_CHECK_CALC_ERROR([$1], [1], [0 0], [15],
 
 # Some syntax errors.
 _AT_CHECK_CALC_ERROR([$1], [1], [0 0], [15],

-                     [1.2: syntax error, unexpected number])
+                     [1.3: syntax error, unexpected number])

 _AT_CHECK_CALC_ERROR([$1], [1], [1//2], [20],
 _AT_CHECK_CALC_ERROR([$1], [1], [1//2], [20],

-                     [1.2: syntax error, unexpected '/', expecting number or '-' or '(' or '!'])
+                     [1.3: syntax error, unexpected '/', expecting number or '-' or '(' or '!'])

 _AT_CHECK_CALC_ERROR([$1], [1], [error], [5],
 _AT_CHECK_CALC_ERROR([$1], [1], [error], [5],

-                     [1.0: syntax error, unexpected $undefined])
+                     [1.1: syntax error, unexpected $undefined])

 _AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [30],
 _AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [30],

-                     [1.6: syntax error, unexpected '='])
+                     [1.7: syntax error, unexpected '='])

 _AT_CHECK_CALC_ERROR([$1], [1],
                      [
 +1],
                      [20],
 _AT_CHECK_CALC_ERROR([$1], [1],
                      [
 +1],
                      [20],

-                     [2.0: syntax error, unexpected '+'])
+                     [2.1: syntax error, unexpected '+'])

 # Exercise error messages with EOF: work on an empty file.
 _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],
 # Exercise error messages with EOF: work on an empty file.
 _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],

-                     [1.0: syntax error, unexpected end of input])
+                     [1.1: syntax error, unexpected end of input])

 
 # Exercise the error token: without it, we die at the first error,
 # hence be sure to
 
 # Exercise the error token: without it, we die at the first error,
 # hence be sure to


@@ -511,20 +511,20 @@ _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],
 _AT_CHECK_CALC_ERROR([$1], [0],
                      [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
                      [250],
 _AT_CHECK_CALC_ERROR([$1], [0],
                      [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
                      [250],

-[1.1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
-1.17: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
-1.22: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
-1.40: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
+[1.2: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
+1.18: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
+1.23: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
+1.41: syntax error, unexpected '*', expecting number or '-' or '(' or '!'

 calc: error: 4444 != 1])
 
 # The same, but this time exercising explicitly triggered syntax errors.
 # POSIX says the lookahead causing the error should not be discarded.
 _AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [102],
 calc: error: 4444 != 1])
 
 # The same, but this time exercising explicitly triggered syntax errors.
 # POSIX says the lookahead causing the error should not be discarded.
 _AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [102],

-[1.9: syntax error, unexpected number
+[1.10: syntax error, unexpected number

 calc: error: 2222 != 1])
 _AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (0 0) = 1], [113],
 calc: error: 2222 != 1])
 _AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (0 0) = 1], [113],

-[1.3: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
-1.11: syntax error, unexpected number
+[1.4: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
+1.12: syntax error, unexpected number

 calc: error: 2222 != 1])
 AT_BISON_OPTION_POPDEFS
 
 calc: error: 2222 != 1])
 AT_BISON_OPTION_POPDEFS