Renamed '_rawvalue\b' to '_raw'

13 files changed, 28 insertions, 28 deletions

diff --git a/include/stc/alt/clist.h b/include/stc/alt/clist.h
index 14abc7e4..38b722a4 100644
--- a/include/stc/alt/clist.h
+++ b/include/stc/alt/clist.h
@@ -64,13 +64,13 @@ STC_API size_t _clist_count(const clist_VOID* self);
 #define _c_using_clist(_cx_self, i_val, i_cmp, i_valdrop, i_valfrom, i_valto, i_valraw, defTypes) \

 \

     defTypes( _c_clist_types(_cx_self, i_val); ) \

-    typedef i_valraw _cx_rawvalue; \

+    typedef i_valraw _cx_raw; \

 \

     STC_API _cx_self          _cx_memb(_clone)(_cx_self lst); \

     STC_API void        _cx_memb(_drop)(_cx_self* self); \

     STC_API void        _cx_memb(_push_back)(_cx_self* self, i_val value); \

     STC_API void        _cx_memb(_push_front)(_cx_self* self, i_val value); \

-    STC_API void        _cx_memb(_emplace_items)(_cx_self *self, const _cx_rawvalue arr[], size_t n); \

+    STC_API void        _cx_memb(_emplace_items)(_cx_self *self, const _cx_raw arr[], size_t n); \

     STC_API _cx_self          _cx_memb(_split_after)(_cx_self* self, _cx_iter pos1, _cx_iter pos2); \

     STC_API void        _cx_memb(_splice_after)(_cx_self* self, _cx_iter pos, _cx_self* other); \

     STC_DEF void        _cx_memb(_splice_after_range)(_cx_self* self, _cx_iter pos, _cx_self* other, _cx_iter i1, _cx_iter i2); \

@@ -176,7 +176,7 @@ STC_API size_t _clist_count(const clist_VOID* self);
     } \

 \

     STC_DEF void \

-    _cx_memb(_emplace_items)(_cx_self *self, const _cx_rawvalue arr[], size_t n) { \

+    _cx_memb(_emplace_items)(_cx_self *self, const _cx_raw arr[], size_t n) { \

         for (size_t i=0; i<n; ++i) _cx_memb(_push_back)(self, i_valfrom(arr[i])); \

     } \

 \

diff --git a/include/stc/alt/csmap.h b/include/stc/alt/csmap.h
index beccf559..9be41054 100644
--- a/include/stc/alt/csmap.h
+++ b/include/stc/alt/csmap.h
@@ -74,7 +74,7 @@ int main(void) {
     typedef _i_SET_ONLY( _cx_rawkey ) \

             _i_MAP_ONLY( struct { _cx_rawkey first; \

                                    _cx_memb(_rawmapped) second; } ) \

-    _cx_rawvalue; \

+    _cx_raw; \

 \

     STC_API _cx_self               _cx_memb(_init)(void); \

     STC_API _cx_value*    _cx_memb(_find_it)(const _cx_self* self, i_keyraw rkey, _cx_iter* out); \

@@ -125,7 +125,7 @@ int main(void) {
     } \

 \

     STC_INLINE void \

-    _cx_memb(_emplace_items)(_cx_self* self, const _cx_rawvalue arr[], size_t n) { \

+    _cx_memb(_emplace_items)(_cx_self* self, const _cx_raw arr[], size_t n) { \

         for (size_t i=0; i<n; ++i) _i_SET_ONLY( _cx_memb(_emplace)(self, arr[i]); ) \

                                    _i_MAP_ONLY( _cx_memb(_emplace)(self, arr[i].first, arr[i].second); ) \

     } \

diff --git a/include/stc/cbox.h b/include/stc/cbox.h
index 37687134..fdde5e8c 100644
--- a/include/stc/cbox.h
+++ b/include/stc/cbox.h
@@ -72,7 +72,7 @@ int main() {
 #define _i_prefix cbox_

 #endif

 #include "template.h"

-typedef i_valraw _cx_rawvalue;

+typedef i_valraw _cx_raw;

 

 #if !c_option(c_is_fwd)

 _cx_deftypes(_c_cbox_types, _cx_self, i_val);

diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h
index e11fa3be..ac6e9d31 100644
--- a/include/stc/ccommon.h
+++ b/include/stc/ccommon.h
@@ -208,14 +208,14 @@ STC_INLINE uint64_t c_default_hash(const void* key, size_t len) {
 

 // [deprecated]

 #define c_apply_OLD(C, method, cx, ...) do { \

-    const C##_rawvalue _c_arr[] = __VA_ARGS__; \

+    const C##_raw _c_arr[] = __VA_ARGS__; \

     C* _c_cx = cx; \

     for (size_t _c_i = 0; _c_i < c_arraylen(_c_arr); ++_c_i) \

         C##_##method(_c_cx, _c_arr[_c_i]); \

 } while (0)

 // [deprecated]

 #define c_apply_pair_OLD(C, method, cx, ...) do { \

-    const C##_rawvalue _c_arr[] = __VA_ARGS__; \

+    const C##_raw _c_arr[] = __VA_ARGS__; \

     C* _c_cx = cx; \

     for (size_t _c_i = 0; _c_i < c_arraylen(_c_arr); ++_c_i) \

         C##_##method(_c_cx, _c_arr[_c_i].first, _c_arr[_c_i].second); \

diff --git a/include/stc/cdeq.h b/include/stc/cdeq.h
index 050f9e67..f0866dad 100644
--- a/include/stc/cdeq.h
+++ b/include/stc/cdeq.h
@@ -38,7 +38,7 @@ struct cdeq_rep { size_t size, cap; void* base[]; };
 #if !c_option(c_is_fwd)

 _cx_deftypes(_c_cdeq_types, _cx_self, i_val);

 #endif

-typedef i_valraw _cx_rawvalue;

+typedef i_valraw _cx_raw;

 

 STC_API _cx_self        _cx_memb(_init)(void);

 STC_API void            _cx_memb(_clear)(_cx_self* self);

@@ -51,7 +51,7 @@ STC_API void            _cx_memb(_shrink_to_fit)(_cx_self *self);
 STC_API _cx_iter        _cx_memb(_clone_range_p)(_cx_self* self, _cx_value* pos,

                                                   const _cx_value* p1, const _cx_value* p2);

 STC_API _cx_iter        _cx_memb(_emplace_range_p)(_cx_self* self, _cx_value* pos,

-                                                   const _cx_rawvalue* p1, const _cx_rawvalue* p2);

+                                                   const _cx_raw* p1, const _cx_raw* p2);

 #endif // !c_no_clone

 

 #if !c_option(c_no_cmp)

@@ -166,7 +166,7 @@ _cx_memb(_emplace)(_cx_self* self, const size_t idx, i_valraw raw) {
     return _cx_memb(_emplace_range_p)(self, self->data + idx, &raw, &raw + 1);

 }

 STC_INLINE _cx_iter

-_cx_memb(_emplace_n)(_cx_self* self, const size_t idx, const _cx_rawvalue arr[], const size_t n) {

+_cx_memb(_emplace_n)(_cx_self* self, const size_t idx, const _cx_raw arr[], const size_t n) {

     return _cx_memb(_emplace_range_p)(self, self->data + idx, arr, arr + n);

 }

 STC_INLINE _cx_iter

@@ -369,7 +369,7 @@ _cx_memb(_erase_range_p)(_cx_self* self, _cx_value* p1, _cx_value* p2) {
 #if !c_option(c_no_clone)

 

 STC_DEF _cx_iter

-_cx_memb(_emplace_range_p)(_cx_self* self, _cx_value* pos, const _cx_rawvalue* p1, const _cx_rawvalue* p2) {

+_cx_memb(_emplace_range_p)(_cx_self* self, _cx_value* pos, const _cx_raw* p1, const _cx_raw* p2) {

     pos = _cx_memb(_insert_space_)(self, pos, p2 - p1);

     _cx_iter it = {pos};

     for (; p1 != p2; ++p1) *pos++ = i_valfrom(*p1);

diff --git a/include/stc/clist.h b/include/stc/clist.h
index c239fdd9..2194067c 100644
--- a/include/stc/clist.h
+++ b/include/stc/clist.h
@@ -87,7 +87,7 @@ _c_clist_complete_types(clist_VOID, dummy);
   _cx_deftypes(_c_clist_types, _cx_self, i_val);

 #endif

 _cx_deftypes(_c_clist_complete_types, _cx_self, dummy);

-typedef i_valraw _cx_rawvalue;

+typedef i_valraw _cx_raw;

 

 STC_API size_t _clist_count(const clist_VOID* self);

 

diff --git a/include/stc/cmap.h b/include/stc/cmap.h
index b7529871..87ed7c6c 100644
--- a/include/stc/cmap.h
+++ b/include/stc/cmap.h
@@ -85,7 +85,7 @@ typedef i_valraw _cx_memb(_rawmapped);
 typedef _i_SET_ONLY( i_keyraw )

         _i_MAP_ONLY( struct { i_keyraw first;

                               i_valraw second; } )

-_cx_rawvalue;

+_cx_raw;

 

 STC_API _cx_self        _cx_memb(_with_capacity)(size_t cap);

 #if !c_option(c_no_clone)

@@ -153,10 +153,10 @@ _cx_memb(_emplace)(_cx_self* self, i_keyraw rkey _i_MAP_ONLY(, i_valraw rmapped)
 }

 #endif // !c_no_clone

 

-STC_INLINE _cx_rawvalue

+STC_INLINE _cx_raw

 _cx_memb(_value_toraw)(_cx_value* val) {

     return _i_SET_ONLY( i_keyto(val) )

-           _i_MAP_ONLY( c_make(_cx_rawvalue){i_keyto(&val->first), i_valto(&val->second)} );

+           _i_MAP_ONLY( c_make(_cx_raw){i_keyto(&val->first), i_valto(&val->second)} );

 }

 

 STC_INLINE void

diff --git a/include/stc/cpque.h b/include/stc/cpque.h
index 87be1e73..caea1549 100644
--- a/include/stc/cpque.h
+++ b/include/stc/cpque.h
@@ -36,7 +36,7 @@
 #if !c_option(c_is_fwd)

    _cx_deftypes(_c_cpque_types, _cx_self, i_val);

 #endif

-typedef i_valraw _cx_rawvalue;

+typedef i_valraw _cx_raw;

 

 STC_API void _cx_memb(_make_heap)(_cx_self* self);

 STC_API void _cx_memb(_erase_at)(_cx_self* self, size_t idx);

diff --git a/include/stc/csmap.h b/include/stc/csmap.h
index 04dc895d..8115cf46 100644
--- a/include/stc/csmap.h
+++ b/include/stc/csmap.h
@@ -91,7 +91,7 @@ typedef i_keyraw _cx_rawkey;
 typedef i_valraw _cx_memb(_rawmapped);

 typedef _i_SET_ONLY( i_keyraw )

         _i_MAP_ONLY( struct { i_keyraw first; i_valraw second; } )

-        _cx_rawvalue;

+        _cx_raw;

 

 STC_API _cx_self        _cx_memb(_init)(void);

 #if !c_option(c_no_clone)

@@ -128,10 +128,10 @@ _cx_memb(_with_capacity)(const size_t cap) {
     return tree;

 }

 

-STC_INLINE _cx_rawvalue

+STC_INLINE _cx_raw

 _cx_memb(_value_toraw)(_cx_value* val) {

     return _i_SET_ONLY( i_keyto(val) )

-           _i_MAP_ONLY( c_make(_cx_rawvalue){i_keyto(&val->first), i_valto(&val->second)} );

+           _i_MAP_ONLY( c_make(_cx_raw){i_keyto(&val->first), i_valto(&val->second)} );

 }

 

 STC_INLINE int

diff --git a/include/stc/csptr.h b/include/stc/csptr.h
index 4e9b4687..0718a4cc 100644
--- a/include/stc/csptr.h
+++ b/include/stc/csptr.h
@@ -76,7 +76,7 @@ int main() {
 #endif

 #define _i_has_internal_clone

 #include "template.h"

-typedef i_valraw _cx_rawvalue;

+typedef i_valraw _cx_raw;

 

 #if !c_option(c_no_atomic)

   #define _i_atomic_inc(v)          c_atomic_inc(v)

diff --git a/include/stc/cstack.h b/include/stc/cstack.h
index fa74494d..387c0126 100644
--- a/include/stc/cstack.h
+++ b/include/stc/cstack.h
@@ -36,7 +36,7 @@
 #if !c_option(c_is_fwd)

 _cx_deftypes(_c_cstack_types, _cx_self, i_val);

 #endif

-typedef i_valraw _cx_rawvalue;

+typedef i_valraw _cx_raw;

 

 STC_INLINE _cx_self _cx_memb(_init)(void)

     { return c_make(_cx_self){0, 0, 0}; }

@@ -96,7 +96,7 @@ STC_INLINE const _cx_value* _cx_memb(_at)(const _cx_self* self, size_t idx)
 

 #if !c_option(c_no_clone)

 

-STC_INLINE _cx_value* _cx_memb(_emplace)(_cx_self* self, _cx_rawvalue raw)

+STC_INLINE _cx_value* _cx_memb(_emplace)(_cx_self* self, _cx_raw raw)

     { return _cx_memb(_push)(self, i_valfrom(raw)); }

 

 STC_INLINE _cx_self _cx_memb(_clone)(_cx_self v) {

diff --git a/include/stc/cvec.h b/include/stc/cvec.h
index 92f6afd6..3486cc37 100644
--- a/include/stc/cvec.h
+++ b/include/stc/cvec.h
@@ -76,7 +76,7 @@ struct cvec_rep { size_t size, cap; void* data[]; };
 #if !c_option(c_is_fwd)

    _cx_deftypes(_c_cvec_types, _cx_self, i_val);

 #endif

-typedef i_valraw _cx_rawvalue;

+typedef i_valraw _cx_raw;

 

 STC_API _cx_self        _cx_memb(_init)(void);

 STC_API void            _cx_memb(_drop)(_cx_self* self);

@@ -98,7 +98,7 @@ STC_API _cx_self        _cx_memb(_clone)(_cx_self cx);
 STC_API _cx_iter        _cx_memb(_clone_range_p)(_cx_self* self, _cx_value* pos,

                                                  const _cx_value* p1, const _cx_value* p2);

 STC_API _cx_iter        _cx_memb(_emplace_range_p)(_cx_self* self, _cx_value* pos,

-                                                   const _cx_rawvalue* p1, const _cx_rawvalue* p2);

+                                                   const _cx_raw* p1, const _cx_raw* p2);

 STC_INLINE i_val        _cx_memb(_value_clone)(_cx_value val)

                             { return i_valfrom(i_valto(&val)); }

 STC_INLINE i_val        _cx_memb(_value_fromraw)(i_valraw raw) { return i_valfrom(raw); }

@@ -112,7 +112,7 @@ _cx_memb(_copy)(_cx_self *self, _cx_self other) {
     _cx_memb(_drop)(self); *self = _cx_memb(_clone)(other);

 }

 STC_INLINE _cx_iter

-_cx_memb(_emplace_n)(_cx_self* self, const size_t idx, const _cx_rawvalue arr[], const size_t n) {

+_cx_memb(_emplace_n)(_cx_self* self, const size_t idx, const _cx_raw arr[], const size_t n) {

     return _cx_memb(_emplace_range_p)(self, self->data + idx, arr, arr + n);

 }

 STC_INLINE _cx_iter

@@ -350,7 +350,7 @@ _cx_memb(_clone_range_p)(_cx_self* self, _cx_value* pos,
 

 STC_DEF _cx_iter

 _cx_memb(_emplace_range_p)(_cx_self* self, _cx_value* pos,

-                           const _cx_rawvalue* p1, const _cx_rawvalue* p2) {

+                           const _cx_raw* p1, const _cx_raw* p2) {

     pos = _cx_memb(_insert_space_)(self, pos, p2 - p1);

     _cx_iter it = {pos};

     for (; p1 != p2; ++p1) *pos++ = i_valfrom(*p1);

diff --git a/include/stc/template.h b/include/stc/template.h
index 675baa47..1d1551fa 100644
--- a/include/stc/template.h
+++ b/include/stc/template.h
@@ -31,7 +31,7 @@
   #define _cx_value _cx_memb(_value)

   #define _cx_key _cx_memb(_key)

   #define _cx_mapped _cx_memb(_mapped)

-  #define _cx_rawvalue _cx_memb(_rawvalue)

+  #define _cx_raw _cx_memb(_raw)

   #define _cx_rawkey _cx_memb(_rawkey)

   #define _cx_rawmapped _cx_memb(_rawmapped)

   #define _cx_iter _cx_memb(_iter)