sugar done

Author: Qiang Kou

inst/include/Rcpp/sugar/matrix/as_vector.h

@@ -29,11 +29,11 @@ template <int RTYPE, bool NA, typename T>
 inline Rcpp::Vector<RTYPE>
 as_vector__impl( MatrixBase<RTYPE,NA,T>& t, Rcpp::traits::false_type ){
     T& ref = t.get_ref() ;
-    R_xlen_t nc = ref.ncol(), nr = ref.nrow() ;
+    int nc = ref.ncol(), nr = ref.nrow() ;
     Vector<RTYPE> out (nr*nc) ;
     R_xlen_t k =0;
-    for( R_xlen_t col_index=0; col_index<nc; col_index++)
-        for( R_xlen_t row_index=0; row_index<nr; row_index++, k++)
+    for( int col_index=0; col_index<nc; col_index++)
+        for( int row_index=0; row_index<nr; row_index++, k++)
             out[k] = ref( row_index, col_index ) ;
 
     return out ;

inst/include/Rcpp/sugar/nona/nona.h

@@ -33,8 +33,8 @@ namespace sugar {
 
         Nona( const SUGAR_TYPE& expr) : data(expr.get_ref()){}
 
-        inline int size() const { return data.size() ; }
-        inline STORAGE operator[](int i) const { return data[i] ; }
+        inline R_xlen_t size() const { return data.size() ; }
+        inline STORAGE operator[](R_xlen_t i) const { return data[i] ; }
 
     private:
         const VECTOR& data ;
@@ -50,12 +50,12 @@ namespace sugar {
 
         Nona( const SUGAR_TYPE& expr) : data(expr.get_ref().begin()), n(expr.size()){}
 
-        inline int size() const { return n ; }
-        inline STORAGE operator[](int i) const { return data[i] ; }
+        inline R_xlen_t size() const { return n ; }
+        inline STORAGE operator[](R_xlen_t i) const { return data[i] ; }
 
     private:
         iterator data ;
-        int n ;
+        R_xlen_t n ;
     } ;
 
     template <typename T>

inst/include/Rcpp/sugar/tools/iterator.h

@@ -30,15 +30,15 @@ namespace sugar {
     class SugarIterator {
     public:
 
-        typedef int difference_type ;
+        typedef R_xlen_t difference_type ;
         typedef typename Rcpp::traits::storage_type< Rcpp::traits::r_sexptype_traits<T>::rtype >::type STORAGE_TYPE ;
         typedef STORAGE_TYPE reference ;
         typedef STORAGE_TYPE* pointer ;
         typedef std::random_access_iterator_tag iterator_category ;
         typedef SugarIterator iterator ;
 
         SugarIterator( const T& ref_ ) :ref(ref_), index(0) {}
-        SugarIterator( const T& ref_, int index_) : ref(ref_), index(index_) {}
+        SugarIterator( const T& ref_, R_xlen_t index_) : ref(ref_), index(index_) {}
         SugarIterator( const SugarIterator& other) : ref(other.ref), index(other.index){}
 
         inline iterator& operator++(){ index++; return *this ; }
@@ -67,7 +67,7 @@ namespace sugar {
 			index -= n;
 			return *this ;
 		}
-        inline reference operator[](int i){
+        inline reference operator[](R_xlen_t i){
 		    return ref[index+i] ;
 		}
 
@@ -104,7 +104,7 @@ namespace sugar {
 
     private:
         const T& ref ;
-        int index ;
+        R_xlen_t index ;
     } ;
 
     template <typename T> struct sugar_const_iterator_type {