Converted all files with DOS line endings to LINUX.

1 files changed, 182 insertions, 182 deletions

diff --git a/include/stc/cbox.h b/include/stc/cbox.h
index 73b437d4..f1e410b1 100644
--- a/include/stc/cbox.h
+++ b/include/stc/cbox.h
@@ -1,182 +1,182 @@
-

-/* MIT License

- *

- * Copyright (c) 2022 Tyge Løvset, NORCE, www.norceresearch.no

- *

- * Permission is hereby granted, free of charge, to any person obtaining a copy

- * of this software and associated documentation files (the "Software"), to deal

- * in the Software without restriction, including without limitation the rights

- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

- * copies of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in all

- * copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- */

-

-/* cbox: heap allocated boxed type

-#include <stc/cstr.h>

-

-typedef struct { cstr name, email; } Person;

-

-Person Person_from(const char* name, const char* email) {

-    return (Person){.name = cstr_from(name), .email = cstr_from(email)};

-}

-Person Person_clone(Person p) {

-    p.name = cstr_clone(p.name);

-    p.email = cstr_clone(p.email);

-    return p;

-}

-void Person_drop(Person* p) {

-    printf("drop: %s %s\n", cstr_str(&p->name), cstr_str(&p->email));

-    c_drop(cstr, &p->name, &p->email);

-}

-

-#define i_key_bind Person // bind Person clone+drop fn's

-#define i_opt c_no_cmp // compare by .get addresses only

-#define i_type PBox

-#include <stc/cbox.h>

-

-int main() {

-    c_auto (PBox, p, q)

-    {

-        p = PBox_make(Person_from("John Smiths", "[email protected]"));

-        q = PBox_clone(p);

-        cstr_assign(&q.get->name, "Joe Smiths");

-

-        printf("%s %s.\n", cstr_str(&p.get->name), cstr_str(&p.get->email));

-        printf("%s %s.\n", cstr_str(&q.get->name), cstr_str(&q.get->email));

-    }

-}

-*/

-#include "ccommon.h"

-

-#ifndef CBOX_H_INCLUDED

-#define CBOX_H_INCLUDED

-#include "forward.h"

-#include <stdlib.h>

-#include <string.h>

-

-#define cbox_null {NULL}

-#endif // CBOX_H_INCLUDED

-

-#ifndef _i_prefix

-#define _i_prefix cbox_

-#endif

-#include "template.h"

-typedef i_keyraw _cx_raw;

-

-#if !c_option(c_is_fwd)

-_cx_deftypes(_c_cbox_types, _cx_self, i_key);

-#endif

-

-// constructors (takes ownsership)

-STC_INLINE _cx_self _cx_memb(_init)(void)

-    { return c_make(_cx_self){NULL}; }

-

-STC_INLINE long _cx_memb(_use_count)(_cx_self box)

-    { return (long)(box.get != NULL); }

-

-STC_INLINE _cx_self _cx_memb(_from_ptr)(_cx_value* p)

-    { return c_make(_cx_self){p}; }

-

-// c++: std::make_unique<i_key>(val)

-STC_INLINE _cx_self _cx_memb(_make)(_cx_value val) {

-    _cx_self ptr = {c_alloc(_cx_value)};

-    *ptr.get = val; return ptr;

-}

-

-STC_INLINE _cx_raw _cx_memb(_toraw)(const _cx_self* self)

-    { return i_keyto(self->get); }

-

-STC_INLINE _cx_value _cx_memb(_toval)(const _cx_self* self)

-    { return *self->get; }

-

-// destructor

-STC_INLINE void _cx_memb(_drop)(_cx_self* self) {

-    if (self->get) {

-        i_keydrop(self->get);

-        c_free(self->get);

-    }

-}

-

-STC_INLINE _cx_self _cx_memb(_move)(_cx_self* self) {

-    _cx_self ptr = *self; 

-    self->get = NULL;

-    return ptr;

-}

-

-STC_INLINE void _cx_memb(_reset)(_cx_self* self) {

-    _cx_memb(_drop)(self);

-    self->get = NULL;

-}

-

-// take ownership of p

-STC_INLINE void _cx_memb(_reset_to)(_cx_self* self, _cx_value* p) {

-    if (self->get)

-        i_keydrop(self->get);

-    self->get = p;

-}

-

-#if !defined _i_no_clone

-#if !defined _i_no_emplace

-    STC_INLINE _cx_self _cx_memb(_from)(_cx_raw raw)

-        { return _cx_memb(_make)(i_keyfrom(raw)); }

-#endif

-    STC_INLINE _cx_self _cx_memb(_clone)(_cx_self other) {

-        if (!other.get)

-            return other;

-        _cx_self out = {c_alloc(i_key)};

-        *out.get = i_keyclone(*other.get);

-        return out;

-    }

-

-    STC_INLINE void _cx_memb(_copy)(_cx_self* self, _cx_self other) {

-        if (self->get == other.get)

-            return;

-        _cx_memb(_drop)(self);

-        *self = _cx_memb(_clone)(other);

-    }

-#endif // !_i_no_clone

-

-STC_INLINE void _cx_memb(_take)(_cx_self* self, _cx_self other) {

-    if (other.get != self->get)

-        _cx_memb(_drop)(self);

-    *self = other;

-}

-

-STC_INLINE uint64_t _cx_memb(_value_hash)(const _cx_value* x) {

-    #if c_option(c_no_cmp)

-        return c_default_hash(&x);

-    #else

-        _cx_raw rx = i_keyto(x);

-        return i_hash((&rx));

-    #endif

-}

-

-STC_INLINE int _cx_memb(_value_cmp)(const _cx_value* x, const _cx_value* y) {

-    #if c_option(c_no_cmp)

-        return c_default_cmp(&x, &y);

-    #else

-        _cx_raw rx = i_keyto(x), ry = i_keyto(y);

-        return i_cmp((&rx), (&ry));

-    #endif

-}

-

-STC_INLINE bool _cx_memb(_value_eq)(const _cx_value* x, const _cx_value* y) {

-    #if c_option(c_no_cmp)

-        return x == y;

-    #else

-        _cx_raw rx = i_keyto(x), ry = i_keyto(y);

-        return i_eq((&rx), (&ry));

-    #endif

-}

-#include "template.h"

+
+/* MIT License
+ *
+ * Copyright (c) 2022 Tyge Løvset, NORCE, www.norceresearch.no
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/* cbox: heap allocated boxed type
+#include <stc/cstr.h>
+
+typedef struct { cstr name, email; } Person;
+
+Person Person_from(const char* name, const char* email) {
+    return (Person){.name = cstr_from(name), .email = cstr_from(email)};
+}
+Person Person_clone(Person p) {
+    p.name = cstr_clone(p.name);
+    p.email = cstr_clone(p.email);
+    return p;
+}
+void Person_drop(Person* p) {
+    printf("drop: %s %s\n", cstr_str(&p->name), cstr_str(&p->email));
+    c_drop(cstr, &p->name, &p->email);
+}
+
+#define i_key_bind Person // bind Person clone+drop fn's
+#define i_opt c_no_cmp // compare by .get addresses only
+#define i_type PBox
+#include <stc/cbox.h>
+
+int main() {
+    c_auto (PBox, p, q)
+    {
+        p = PBox_make(Person_from("John Smiths", "[email protected]"));
+        q = PBox_clone(p);
+        cstr_assign(&q.get->name, "Joe Smiths");
+
+        printf("%s %s.\n", cstr_str(&p.get->name), cstr_str(&p.get->email));
+        printf("%s %s.\n", cstr_str(&q.get->name), cstr_str(&q.get->email));
+    }
+}
+*/
+#include "ccommon.h"
+
+#ifndef CBOX_H_INCLUDED
+#define CBOX_H_INCLUDED
+#include "forward.h"
+#include <stdlib.h>
+#include <string.h>
+
+#define cbox_null {NULL}
+#endif // CBOX_H_INCLUDED
+
+#ifndef _i_prefix
+#define _i_prefix cbox_
+#endif
+#include "template.h"
+typedef i_keyraw _cx_raw;
+
+#if !c_option(c_is_fwd)
+_cx_deftypes(_c_cbox_types, _cx_self, i_key);
+#endif
+
+// constructors (takes ownsership)
+STC_INLINE _cx_self _cx_memb(_init)(void)
+    { return c_make(_cx_self){NULL}; }
+
+STC_INLINE long _cx_memb(_use_count)(_cx_self box)
+    { return (long)(box.get != NULL); }
+
+STC_INLINE _cx_self _cx_memb(_from_ptr)(_cx_value* p)
+    { return c_make(_cx_self){p}; }
+
+// c++: std::make_unique<i_key>(val)
+STC_INLINE _cx_self _cx_memb(_make)(_cx_value val) {
+    _cx_self ptr = {c_alloc(_cx_value)};
+    *ptr.get = val; return ptr;
+}
+
+STC_INLINE _cx_raw _cx_memb(_toraw)(const _cx_self* self)
+    { return i_keyto(self->get); }
+
+STC_INLINE _cx_value _cx_memb(_toval)(const _cx_self* self)
+    { return *self->get; }
+
+// destructor
+STC_INLINE void _cx_memb(_drop)(_cx_self* self) {
+    if (self->get) {
+        i_keydrop(self->get);
+        c_free(self->get);
+    }
+}
+
+STC_INLINE _cx_self _cx_memb(_move)(_cx_self* self) {
+    _cx_self ptr = *self; 
+    self->get = NULL;
+    return ptr;
+}
+
+STC_INLINE void _cx_memb(_reset)(_cx_self* self) {
+    _cx_memb(_drop)(self);
+    self->get = NULL;
+}
+
+// take ownership of p
+STC_INLINE void _cx_memb(_reset_to)(_cx_self* self, _cx_value* p) {
+    if (self->get)
+        i_keydrop(self->get);
+    self->get = p;
+}
+
+#if !defined _i_no_clone
+#if !defined _i_no_emplace
+    STC_INLINE _cx_self _cx_memb(_from)(_cx_raw raw)
+        { return _cx_memb(_make)(i_keyfrom(raw)); }
+#endif
+    STC_INLINE _cx_self _cx_memb(_clone)(_cx_self other) {
+        if (!other.get)
+            return other;
+        _cx_self out = {c_alloc(i_key)};
+        *out.get = i_keyclone(*other.get);
+        return out;
+    }
+
+    STC_INLINE void _cx_memb(_copy)(_cx_self* self, _cx_self other) {
+        if (self->get == other.get)
+            return;
+        _cx_memb(_drop)(self);
+        *self = _cx_memb(_clone)(other);
+    }
+#endif // !_i_no_clone
+
+STC_INLINE void _cx_memb(_take)(_cx_self* self, _cx_self other) {
+    if (other.get != self->get)
+        _cx_memb(_drop)(self);
+    *self = other;
+}
+
+STC_INLINE uint64_t _cx_memb(_value_hash)(const _cx_value* x) {
+    #if c_option(c_no_cmp)
+        return c_default_hash(&x);
+    #else
+        _cx_raw rx = i_keyto(x);
+        return i_hash((&rx));
+    #endif
+}
+
+STC_INLINE int _cx_memb(_value_cmp)(const _cx_value* x, const _cx_value* y) {
+    #if c_option(c_no_cmp)
+        return c_default_cmp(&x, &y);
+    #else
+        _cx_raw rx = i_keyto(x), ry = i_keyto(y);
+        return i_cmp((&rx), (&ry));
+    #endif
+}
+
+STC_INLINE bool _cx_memb(_value_eq)(const _cx_value* x, const _cx_value* y) {
+    #if c_option(c_no_cmp)
+        return x == y;
+    #else
+        _cx_raw rx = i_keyto(x), ry = i_keyto(y);
+        return i_eq((&rx), (&ry));
+    #endif
+}
+#include "template.h"