X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/34136e65fc7bd6babcfedcbfcfdca3b9feb10f1d..3fd1d6b2f36722c64f8db77400c6f6a2639ebae0:/data/location.cc diff --git a/data/location.cc b/data/location.cc index 174ce6ef..b65bf490 100644 --- a/data/location.cc +++ b/data/location.cc @@ -18,32 +18,17 @@ m4_pushdef([b4_copyright_years], [2002-2012]) -# We do want M4 expansion after # for CPP macros. -m4_changecom() -m4_divert_push(0)dnl -@output(b4_dir_prefix[]position.hh@)@ -b4_copyright([Positions for Bison parsers in C++])[ - -/** - ** \file position.hh - ** Define the ]b4_namespace_ref[::position class. - */ - -#ifndef BISON_POSITION_HH -# define BISON_POSITION_HH - -# include -# include -# include - -]b4_namespace_open[ - /// Abstract a position. +# b4_position_define +# ------------------ +# Define class position. +m4_define([b4_position_define], +[[ /// Abstract a position. class position { public: ]m4_ifdef([b4_location_constructors], [[ /// Construct a position. - explicit position (]b4_percent_define_get([[filename_type]])[* f = 0, + explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULL, unsigned int l = ]b4_location_initial_line[u, unsigned int c = ]b4_location_initial_column[u) : filename (f) @@ -54,25 +39,26 @@ b4_copyright([Positions for Bison parsers in C++])[ ]])[ /// Initialization. - inline void initialize (]b4_percent_define_get([[filename_type]])[* fn) + void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULL, + unsigned int l = ]b4_location_initial_line[u, + unsigned int c = ]b4_location_initial_column[u) { filename = fn; - line = ]b4_location_initial_line[u; - column = ]b4_location_initial_column[u; + line = l; + column = c; } /** \name Line and Column related manipulators ** \{ */ /// (line related) Advance to the COUNT next lines. - /// Set current column to initial value. - inline void lines (int count = 1) + void lines (int count = 1) { column = ]b4_location_initial_column[u; line += count; } /// (column related) Advance to the COUNT next columns. - inline void columns (int count = 1) + void columns (int count = 1) { column = std::max (]b4_location_initial_column[u, column + count); } @@ -87,7 +73,7 @@ b4_copyright([Positions for Bison parsers in C++])[ }; /// Add and assign a position. - inline const position& + inline position& operator+= (position& res, const int width) { res.columns (width); @@ -103,7 +89,7 @@ b4_copyright([Positions for Bison parsers in C++])[ } /// Add and assign a position. - inline const position& + inline position& operator-= (position& res, const int width) { return res += -width; @@ -138,34 +124,21 @@ b4_copyright([Positions for Bison parsers in C++])[ ** \param ostr the destination output stream ** \param pos a reference to the position to redirect */ - inline std::ostream& - operator<< (std::ostream& ostr, const position& pos) + template + inline std::basic_ostream& + operator<< (std::basic_ostream& ostr, const position& pos) { if (pos.filename) ostr << *pos.filename << ':'; return ostr << pos.line << '.' << pos.column; } +]]) -]b4_namespace_close[ -#endif // not BISON_POSITION_HH] -@output(b4_dir_prefix[]location.hh@)@ -b4_copyright([Locations for Bison parsers in C++])[ - -/** - ** \file location.hh - ** Define the ]b4_namespace_ref[::location class. - */ - -#ifndef BISON_LOCATION_HH -# define BISON_LOCATION_HH -# include -# include -# include "position.hh" - -]b4_namespace_open[ - - /// Abstract a location. +# b4_location_define +# ------------------ +m4_define([b4_location_define], +[[ /// Abstract a location. class location { public: @@ -195,9 +168,11 @@ b4_copyright([Locations for Bison parsers in C++])[ ])[ /// Initialization. - inline void initialize (]b4_percent_define_get([[filename_type]])[* fn) + void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULL, + unsigned int l = ]b4_location_initial_line[u, + unsigned int c = ]b4_location_initial_column[u) { - begin.initialize (fn); + begin.initialize (f, l, c); end = begin; } @@ -205,19 +180,19 @@ b4_copyright([Locations for Bison parsers in C++])[ ** \{ */ public: /// Reset initial location to final location. - inline void step () + void step () { begin = end; } /// Extend the current location to the COUNT next columns. - inline void columns (unsigned int count = 1) + void columns (unsigned int count = 1) { end += count; } /// Extend the current location to the COUNT next lines. - inline void lines (unsigned int count = 1) + void lines (unsigned int count = 1) { end.lines (count); } @@ -274,7 +249,9 @@ b4_copyright([Locations for Bison parsers in C++])[ ** ** Avoid duplicate information. */ - inline std::ostream& operator<< (std::ostream& ostr, const location& loc) + template + inline std::basic_ostream& + operator<< (std::basic_ostream& ostr, const location& loc) { position last = loc.end - 1; ostr << loc.begin; @@ -288,10 +265,51 @@ b4_copyright([Locations for Bison parsers in C++])[ ostr << '-' << last.column; return ostr; } +]]) + +b4_defines_if([ +b4_output_begin([b4_dir_prefix[]position.hh]) +b4_copyright([Positions for Bison parsers in C++])[ + +/** + ** \file ]b4_dir_prefix[position.hh + ** Define the ]b4_namespace_ref[::position class. + */ + +]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[ + +# include // std::max +# include +# include + +]b4_null_define[ + +]b4_namespace_open[ +]b4_position_define[ +]b4_namespace_close[ +]b4_cpp_guard_close([b4_dir_prefix[]position.hh]) +b4_output_end() + + +b4_output_begin([b4_dir_prefix[]location.hh]) +b4_copyright([Locations for Bison parsers in C++])[ + +/** + ** \file ]b4_dir_prefix[location.hh + ** Define the ]b4_namespace_ref[::location class. + */ + +]b4_cpp_guard_open([b4_dir_prefix[]location.hh])[ + +# include "position.hh" + +]b4_namespace_open[ +]b4_location_define[ ]b4_namespace_close[ +]b4_cpp_guard_close([b4_dir_prefix[]location.hh]) +b4_output_end() +]) + -#endif // not BISON_LOCATION_HH] -m4_divert_pop(0) -m4_popdef([b4_copyright_years])dnl -m4_changecom([#]) +m4_popdef([b4_copyright_years])