This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

[v3] Fully preprocessorify TR1 tuples

From: Doug Gregor <dgregor at cs dot indiana dot edu>
To: gcc-patches at gcc dot gnu dot org
Cc: libstdc++ at gcc dot gnu dot org
Date: Fri, 13 Oct 2006 14:20:34 -0400
Subject: [v3] Fully preprocessorify TR1 tuples

Hi folks,

The TR1 function objects are fully preprocessor-based, so that tweaking the "repeat.h" and "bind_repeat.h" headers allow us to change the maximum number of parameter supported. TR1 tuples were 95% of the way there; this patch finishes the job. The two Perl scripts are used to generate repeat.h and bind_repeat.h; I'm including them in the e-mail for archival purposes, to make it easier to change the number of support parameters later.

Test powerpc-apple-darwin8.8.0; no regressions.

	Cheers,
	Doug

Attachment: tr1-full-meta.patch
Description: Binary data

#!/usr/bin/perl -w
use English;

$max = shift @ARGV;

$template_params = "typename _T1";
$template_params_unnamed = "typename";
$template_args = "_T1";
$params = "_T1 __a1";
$ref_params = "_T1& __a1";
$args = "__a1";
$bind_members = "_T1 _M_arg1;";
$bind_members_init = "_M_arg1(__a1)";
$mu_get_tuple_args = "::std::tr1::get<0>(__tuple)";
$bind_v_template_args = "typename result_of<_Mu<_T1> _CV(_T1, tuple<_GLIBCXX_BIND_TEMPLATE_ARGS>)>::type";
$bind_v_args = "_Mu<_T1>()(_M_arg1, ::std::tr1::tie(_GLIBCXX_BIND_ARGS))";
$tuple_add_cref = "typename __add_c_ref<_T1>::type __a1";
$tuple_copy_init = "_M_arg1(__in._M_arg1)";
$tuple_assign = "_M_arg1 = __in._M_arg1;";
$template_params_null_class = "typename _T1 = _NullClass";
$template_args_stripped = "typename __strip_reference_wrapper<_T1>::__type";
$template_params_u = "typename _U1";
$template_args_u = "_U1";
$ref_wrap_params = "ref(__a1)";
$ref_template_args = "_T1&";
for ($num_args = 2; $num_args <= $max; ++$num_args) {
  $prev_args = $num_args - 1;
  $next_args = $num_args + 1;
  $template_params_shifted = $template_params;
  $template_args_shifted = $template_args;
  $params_shifted = $params;
  $args_shifted = $args;
  $template_params .= ", typename _T$num_args";
  $template_params_unnamed .= ", typename";
  $template_args .= ", _T$num_args";
  $params .= ", _T$num_args __a$num_args";
  $ref_params .=", _T$num_args& __a$num_args";
  $args .= ", __a$num_args";
  $bind_members .= " _T$num_args _M_arg$num_args;";
  $bind_members_init .= ", _M_arg$num_args(__a$num_args)";
  $mu_get_tuple_args .= ", ::std::tr1::get<$prev_args>(__tuple)";
  $bind_v_template_args .= ", typename result_of<_Mu<_T$num_args> _CV(_T$num_args, tuple<_GLIBCXX_BIND_TEMPLATE_ARGS>)>::type";
  $bind_v_args .= ", _Mu<_T$num_args>()(_M_arg$num_args, ::std::tr1::tie(_GLIBCXX_BIND_ARGS))";
  $tuple_add_cref .= ", typename __add_c_ref<_T$num_args>::type __a$num_args";
  $tuple_copy_init .= ", _M_arg$num_args(__in._M_arg$num_args)";
  $tuple_assign .= " _M_arg$num_args = __in._M_arg$num_args;";
  $template_params_null_class .= ", typename _T$num_args = _NullClass";
  $template_args_stripped .= ", typename __strip_reference_wrapper<_T$num_args>::__type";
  $template_params_u .= ", typename _U$num_args";
  $template_args_u .= ", _U$num_args";
  $ref_wrap_params .= ", ref(__a$num_args)";
  $ref_template_args .= ", _T$num_args&";

  if ($num_args == $max) {
    print "#define _GLIBCXX_LAST_INCLUDE\n"
  }
  print "#define _GLIBCXX_NUM_ARGS $num_args\n";
  print "#define _GLIBCXX_COMMA ,\n";
  print "#define _GLIBCXX_TEMPLATE_PARAMS $template_params\n";
  print "#define _GLIBCXX_TEMPLATE_ARGS $template_args\n";
  print "#define _GLIBCXX_PARAMS $params\n";
  print "#define _GLIBCXX_REF_PARAMS $ref_params\n";
  print "#define _GLIBCXX_ARGS $args\n";
  print "#define _GLIBCXX_COMMA_SHIFTED ,\n";
  print "#define _GLIBCXX_TEMPLATE_PARAMS_SHIFTED $template_params_shifted\n";
  print "#define _GLIBCXX_TEMPLATE_ARGS_SHIFTED $template_args_shifted\n";
  print "#define _GLIBCXX_PARAMS_SHIFTED $params_shifted\n";
  print "#define _GLIBCXX_ARGS_SHIFTED $args_shifted\n";
  print "#define _GLIBCXX_BIND_MEMBERS $bind_members\n";
  print "#define _GLIBCXX_BIND_MEMBERS_INIT $bind_members_init\n";
  print "#define _GLIBCXX_MU_GET_TUPLE_ARGS $mu_get_tuple_args\n";
  print "#define _GLIBCXX_BIND_V_TEMPLATE_ARGS(_CV) $bind_v_template_args\n";
  print "#define _GLIBCXX_BIND_V_ARGS $bind_v_args\n";
  print "#define _GLIBCXX_TUPLE_ADD_CREF $tuple_add_cref\n";
  print "#define _GLIBCXX_TUPLE_COPY_INIT $tuple_copy_init\n";
  print "#define _GLIBCXX_TUPLE_ASSIGN $tuple_assign\n";
  print "#define _GLIBCXX_TEMPLATE_PARAMS_NULL_CLASS $template_params_null_class\n";
  print "#define _GLIBCXX_TEMPLATE_ARGS_STRIPPED $template_args_stripped\n";
  print "#define _GLIBCXX_TEMPLATE_PARAMS_U $template_params_u\n";
  print "#define _GLIBCXX_TEMPLATE_ARGS_U $template_args_u\n";
  print "#define _GLIBCXX_REF_WRAP_PARAMS $ref_wrap_params\n";
  print "#define _GLIBCXX_REF_TEMPLATE_ARGS $ref_template_args\n";
  print "#define _GLIBCXX_NUM_ARGS_PLUS_1 $next_args\n";
  print "#define _GLIBCXX_T_NUM_ARGS_PLUS_1 _T$next_args\n";
  print "#include _GLIBCXX_REPEAT_HEADER\n";
  print "#undef _GLIBCXX_T_NUM_ARGS_PLUS_1\n";
  print "#undef _GLIBCXX_NUM_ARGS_PLUS_1\n";
  print "#undef _GLIBCXX_REF_TEMPLATE_ARGS\n";
  print "#undef _GLIBCXX_REF_WRAP_PARAMS\n";
  print "#undef _GLIBCXX_TEMPLATE_ARGS_U\n";
  print "#undef _GLIBCXX_TEMPLATE_PARAMS_U\n";
  print "#undef _GLIBCXX_TEMPLATE_ARGS_STRIPPED\n";
  print "#undef _GLIBCXX_TEMPLATE_PARAMS_NULL_CLASS\n";
  print "#undef _GLIBCXX_TUPLE_ASSIGN\n";
  print "#undef _GLIBCXX_TUPLE_COPY_INIT\n";
  print "#undef _GLIBCXX_TUPLE_ADD_CREF\n";
  print "#undef _GLIBCXX_BIND_V_ARGS\n";
  print "#undef _GLIBCXX_BIND_V_TEMPLATE_ARGS\n";
  print "#undef _GLIBCXX_MU_GET_TUPLE_ARGS\n";
  print "#undef _GLIBCXX_BIND_MEMBERS_INIT\n";
  print "#undef _GLIBCXX_BIND_MEMBERS\n";
  print "#undef _GLIBCXX_ARGS_SHIFTED\n";
  print "#undef _GLIBCXX_PARAMS_SHIFTED\n";
  print "#undef _GLIBCXX_TEMPLATE_ARGS_SHIFTED\n";
  print "#undef _GLIBCXX_TEMPLATE_PARAMS_SHIFTED\n";
  print "#undef _GLIBCXX_COMMA_SHIFTED\n";
  print "#undef _GLIBCXX_ARGS\n";
  print "#undef _GLIBCXX_REF_PARAMS\n";
  print "#undef _GLIBCXX_PARAMS\n";
  print "#undef _GLIBCXX_TEMPLATE_ARGS\n";
  print "#undef _GLIBCXX_TEMPLATE_PARAMS\n";
  print "#undef _GLIBCXX_COMMA\n";
  print "#undef _GLIBCXX_NUM_ARGS\n";
  if ($num_args == $max) {
    print "#undef _GLIBCXX_LAST_INCLUDE\n"
  }
}

print "\n";
print "#ifndef _GLIBCXX_TUPLE_ALL_TEMPLATE_PARAMS\n";
print "#  define _GLIBCXX_TUPLE_ALL_TEMPLATE_PARAMS $template_params\n";
print "#  define _GLIBCXX_TUPLE_ALL_TEMPLATE_PARAMS_UNNAMED $template_params_unnamed\n";
print "#  define _GLIBCXX_TUPLE_ALL_TEMPLATE_ARGS $template_args\n";
print "#endif\n";
print "\n";

#!/usr/bin/perl -w
use English;

$max = shift @ARGV;

$template_params = "typename _U1";
$template_args = "_U1";
$params = "_U1& __u1";
$args = "__u1";

for ($num_args = 2; $num_args <= $max; ++$num_args) {
  $template_params .= ", typename _U$num_args";
  $template_args .= ", _U$num_args";
  $params .= ", _U$num_args& __u$num_args";
  $args .= ", __u$num_args";
  print "#define _GLIBCXX_BIND_NUM_ARGS $num_args\n";
  print "#define _GLIBCXX_BIND_COMMA ,\n";
  print "#define _GLIBCXX_BIND_TEMPLATE_PARAMS $template_params\n";
  print "#define _GLIBCXX_BIND_TEMPLATE_ARGS $template_args\n";
  print "#define _GLIBCXX_BIND_PARAMS $params\n";
  print "#define _GLIBCXX_BIND_ARGS $args\n";
  print "#include _GLIBCXX_BIND_REPEAT_HEADER\n";
  print "#undef _GLIBCXX_BIND_ARGS\n";
  print "#undef _GLIBCXX_BIND_PARAMS\n";
  print "#undef _GLIBCXX_BIND_TEMPLATE_ARGS\n";
  print "#undef _GLIBCXX_BIND_TEMPLATE_PARAMS\n";
  print "#undef _GLIBCXX_BIND_COMMA\n";
  print "#undef _GLIBCXX_BIND_NUM_ARGS\n";
  print "\n";
}

2006-10-13 Douglas Gregor <doug.gregor@gmail.com>

	* include/Makefile.in (tr1_headers): Add new tuple_defs.h.
	* include/tr1/tuple (tuple): Move declaration to tuple_defs.h.
	(get): Ditto.
	(operator==): Ditto.
	(operator<): Ditto.
	(operator!=): Ditto.
	(operator>): Ditto.
	(operator<=): Ditto.
	(operator>=): Ditto.
	(__stripped_tuple_type): Ditto.
	Include tuple.defs.h
	* include/tr1/tuple_iterate.h (tuple): Use
	_GLIBCXX_TUPLE_ALL_TEMPLATE_PARAMS_UNNAMED macro instead of 10
	"typename"s.
	(tuple_element): Use _GLIBCXX_TUPLE_ALL_TEMPLATE_PARAMS and
	_GLIBCXX_TYPLE_ALL_TEMPLATE_ARGS instead of 10
	parameters/arguments.
	* include/tr1/tuple_defs.h: New header, contains declarations and
	definitions for the tuple template with all arguments.
	* include/tr1/repeat.h (_GLIBCXX_TUPLE_ALL_TEMPLATE_PARAMS): New.
	(_GLIBCXX_TUPLE_ALL_TEMPLATE_PARAMS_UNNAMED): New.
	(_GLIBCXX_TUPLE_ALL_TEMPLATE_ARGS): New.
	(_GLIBCXX_TEMPLATE_PARAMS_NULL_CLASS): New.
	(_GLIBCXX_TEMPLATE_ARGS_STRIPPED): New.
	* include/Makefile.am (tr1_headers): Add new tuple_defs.h.

Follow-Ups:
- Re: [v3] Fully preprocessorify TR1 tuples
  - From: Paolo Carlini
- Re: [v3] Fully preprocessorify TR1 tuples
  - From: Benjamin Kosnik
- Re: [v3] Fully preprocessorify TR1 tuples
  - From: Benjamin Kosnik

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]