Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r58099 - in sandbox/numeric_bindings/libs/numeric/bindings/tools: . templates
From: rutger_at_[hidden]
Date: 2009-12-02 10:46:59


Author: rutger
Date: 2009-12-02 10:46:58 EST (Wed, 02 Dec 2009)
New Revision: 58099
URL: http://svn.boost.org/trac/boost/changeset/58099

Log:
Sync of Python generators used by the Numeric_Bindings lib

Text files modified:
   sandbox/numeric_bindings/libs/numeric/bindings/tools/documentation.py | 4 ++--
   sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py | 12 ++++++------
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.qbk | 40 ++++++++++++----------------------------
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.qbk | 38 +++++++++++++++++---------------------
   4 files changed, 37 insertions(+), 57 deletions(-)

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/documentation.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/documentation.py (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/documentation.py 2009-12-02 10:46:58 EST (Wed, 02 Dec 2009)
@@ -184,8 +184,8 @@
                     readable_arg = "Scalar" + splitted[1]
                     if 'const' in arg:
                         readable_arg = 'const ' + readable_arg
- elif '::value_type' in arg:
- splitted = arg.split( "::value_type" )
+ elif '::type' in arg:
+ splitted = arg.split( "::type" )
                     readable_arg = "Scalar" + splitted[1]
                     if 'const' in arg:
                         readable_arg = 'const ' + readable_arg

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/netlib.py 2009-12-02 10:46:58 EST (Wed, 02 Dec 2009)
@@ -170,12 +170,12 @@
   if result != None:
     if properties[ 'value_type' ] == 'REAL' or properties[ 'value_type' ] == 'DOUBLE PRECISION':
       result = result.replace( "real_type", \
- "typename traits::type_traits< typename traits::tensor_traits" + \
- "< $FIRST_TYPENAME >::value_type >::real_type" )
+ "typename traits::type_traits< typename value" + \
+ "< $FIRST_TYPENAME >::type >::real_type" )
     if properties[ 'value_type' ][ 0:7] == 'COMPLEX' or \
       properties[ 'value_type' ] == 'DOUBLE COMPLEX':
- result = result.replace( "value_type", "typename tensor_traits" + \
- "< $FIRST_TYPENAME >::value_type" )
+ result = result.replace( "value_type", "typename value" + \
+ "< $FIRST_TYPENAME >::type" )
   return result
 
 
@@ -221,10 +221,10 @@
   if 'workspace' not in properties[ 'io' ]:
     if properties[ 'type' ] == 'matrix' or properties[ 'type' ] == 'vector':
       #result = level1_typename( name, properties ).replace( "typename ", "" )
- result = "typename tensor_traits< " + level1_typename( name, properties ).replace( "typename ", "" ) + " >::value_type"
+ result = "typename value< " + level1_typename( name, properties ).replace( "typename ", "" ) + " >::type"
     elif properties[ 'type' ] == 'scalar':
       result = "TODO HOOK"
- #result = "typename tensor_traits< " + level1_type( name, properties ) + " >::value_type"
+ #result = "typename value< " + level1_type( name, properties ) + " >::type"
   return result
 
 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.qbk
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.qbk (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/blas.qbk 2009-12-02 10:46:58 EST (Wed, 02 Dec 2009)
@@ -1,14 +1,12 @@
 $TEMPLATE[blas.qbk]
 
-[section x$GROUPNAME]
+[section $groupname]
 
-[section Prototype]
+[heading Prototype]
 There $PROTOTYPE_OVERLOADS `$groupname` available, please see below.
 $PROTOTYPES
 
-[endsect]
-
-[section Description]
+[heading Description]
 
 `$groupname` (short for $FRIENDLY_NAME) provides a C++
 interface to BLAS routines $SUBROUTINES.
@@ -16,21 +14,18 @@
 
 The selection of the BLAS routine is done during compile-time,
 and is determined by the type of values contained in type `$FIRST_TYPENAME`.
-The type of values is obtained through the tensor-traits
-type-definition `typename tensor_traits<$FIRST_TYPENAME>::value_type`.
-Table xx illustrates to which specific routinev this dispatching will take place.
+The type of values is obtained through the `value` meta-function
+ `typename value<$FIRST_TYPENAME>::type`.
+Table X below illustrates to which specific routine this dispatching will take place.
 
 [table Dispatching of $groupname.
 $DISPATCH_TABLE
 ]
 
-[endsect]
-
-[section Definition]
+[heading Definition]
 Defined in header [headerref $header].
-[endsect]
 
-[section Parameters or Requirements on Types]
+[heading Parameters or Requirements on Types]
 
 [variablelist Parameters
     [[MatrixA] [The definition of term 1]]
@@ -42,15 +37,9 @@
     ]]
 ]
 
-The tensor_traits<>::value_type of A, B, and C should be the same.
-Tensor C should be mutable.
-
-[endsect]
-
-[section Complexity]
-[endsect]
+[heading Complexity]
 
-[section Example]
+[heading Example]
 ``
 #include <$header>
 using namespace boost::numeric::bindings;
@@ -65,18 +54,13 @@
 [5] 0 1 2 3 4 5
 ``
 
-[endsect]
+[heading Notes]
 
-[section Notes]
-[endsect]
-
-[section See Also]
+[heading See Also]
 
 * Originating Fortran source files $ORIGINATING_SOURCES at Netlib.
 
 [endsect]
-
-[endsect]
 $TEMPLATE[blas_prototype.qbk]
 ``
 $groupname( $LEVEL2 );

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.qbk
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.qbk (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.qbk 2009-12-02 10:46:58 EST (Wed, 02 Dec 2009)
@@ -1,13 +1,12 @@
 $TEMPLATE[lapack.qbk]
 
-[section x$GROUPNAME]
+[section $groupname]
 
-[section Prototype]
+[heading Prototype]
 There $PROTOTYPE_OVERLOADS `$groupname` available, please see below.
 $PROTOTYPES
-[endsect]
 
-[section Description]
+[heading Description]
 
 `$groupname` (short for $FRIENDLY_NAME) provides a C++
 interface to LAPACK routines $SUBROUTINES.
@@ -15,21 +14,20 @@
 
 The selection of the LAPACK routine is done during compile-time,
 and is determined by the type of values contained in type `$FIRST_TYPENAME`.
-The type of values is obtained through the tensor-traits
-type-definition `typename tensor_traits<$FIRST_TYPENAME>::value_type`.
-Table xx illustrates to which specific routines this dispatching will take place.
+The type of values is obtained through the `value` meta-function
+ `typename value<$FIRST_TYPENAME>::type`.
+Table X below illustrates to which specific routine this dispatching will take place.
 
 [table Dispatching of $groupname
 $DISPATCH_TABLE
 ]
 
-[endsect]
 
-[section Definition]
+[heading Definition]
 Defined in header [headerref $header].
-[endsect]
 
-[section Parameters or Requirements on Types]
+
+[heading Parameters or Requirements on Types]
 
 [variablelist Parameters
     [[MatrixA] [The definition of term 1]]
@@ -44,12 +42,12 @@
 The tensor_traits<>::value_type of A, B, and C should be the same.
 Tensor C should be mutable.
 
-[endsect]
 
-[section Complexity]
-[endsect]
 
-[section Example]
+[heading Complexity]
+
+
+[heading Example]
 ``
 #include <$header>
 using namespace boost::numeric::bindings;
@@ -64,16 +62,14 @@
 [5] 0 1 2 3 4 5
 ``
 
-[endsect]
 
-[section Notes]
-[endsect]
 
-[section See Also]
+[heading Notes]
 
-* Originating Fortran source files $ORIGINATING_SOURCES at Netlib.
 
-[endsect]
+[heading See Also]
+
+* Originating Fortran source files $ORIGINATING_SOURCES at Netlib.
 
 [endsect]
 $TEMPLATE[lapack_doc_include_hierarchy]


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk