small improvements

joente · joente · commit 88ba8147a640 · 2025-11-08T16:57:55.000+01:00
diff --git a/inc/langdef/langdef.h b/inc/langdef/langdef.h
@@ -13,6 +13,8 @@
 #include <cleri/cleri.h>
 
 cleri_grammar_t * compile_langdef(void);
+
+/* TODO: (COMPAT) For compatibility with < v1.5 (old syntax) */
 cleri_grammar_t * compile_compat(void);
 
 enum cleri_grammar_ids {
diff --git a/inc/ti/fn/fnbase64encode.h b/inc/ti/fn/fnbase64encode.h
@@ -13,7 +13,7 @@ static int do__f_base64_encode(ti_query_t * query, cleri_node_t * nd, ex_t * e)
     {
         ex_set(e, EX_TYPE_ERROR,
             "function `base64_encode` expects argument 1 to be of "
-            "type `"TI_VAL_STR_S"` or type `"TI_VAL_BYTES_S"` "
+            "type `"TI_VAL_STR_S"`, `"TI_VAL_BYTES_S"` or `"TI_VAL_MPDATA_S"` "
             "but got type `%s` instead"DOC_BASE64_ENCODE,
             ti_val_str(query->rval));
         return e->nr;
diff --git a/inc/ti/fn/fncopy.h b/inc/ti/fn/fncopy.h
@@ -5,7 +5,8 @@ static int do__f_copy(ti_query_t * query, cleri_node_t * nd, ex_t * e)
     const char * doc;
     const int nargs = fn_get_nargs(nd);
     ti_val_t * val;
-    uint8_t deep = !(query->rval->tp & 0x4);  /* THING/WRAP: 1, ARR/SET: 0 */
+    /* use deep value of 0 for arr and set, 1 for thing, wrap, wano */
+    uint8_t deep = !(ti_val_is_arr(query->rval) || ti_val_is_set(query->rval));
 
     doc = doc_copy(query->rval);
     if (!doc)
diff --git a/inc/ti/fn/fndup.h b/inc/ti/fn/fndup.h
@@ -5,7 +5,8 @@ static int do__f_dup(ti_query_t * query, cleri_node_t * nd, ex_t * e)
     const char * doc;
     const int nargs = fn_get_nargs(nd);
     ti_val_t * val;
-    uint8_t deep = !(query->rval->tp & 0x4);  /* THING/WRAP: 1, ARR/SET: 0 */
+    /* use deep value of 0 for arr and set, 1 for thing, wrap, wano */
+    uint8_t deep = !(ti_val_is_arr(query->rval) || ti_val_is_set(query->rval));
 
     doc = doc_dup(query->rval);
     if (!doc)
diff --git a/inc/ti/member.t.h b/inc/ti/member.t.h
@@ -17,7 +17,7 @@ struct ti_member_s
 {
     uint32_t ref;
     uint8_t tp;
-    uint8_t unused_flags;
+    int:8;
     uint16_t idx;           /* index in enum_->vec */
     ti_enum_t * enum_;      /* parent enum */
     ti_name_t * name;       /* with reference */
diff --git a/inc/ti/name.t.h b/inc/ti/name.t.h
@@ -19,7 +19,7 @@ struct ti_name_s
 {
     uint32_t ref;
     uint8_t tp;
-    uint8_t unused_flags;
+    int:8;
     int:16;
     uint32_t n;
     char str[];             /* null terminated string */
diff --git a/inc/ti/raw.t.h b/inc/ti/raw.t.h
@@ -12,7 +12,7 @@ struct ti_raw_s
 {
     uint32_t ref;
     uint8_t tp;
-    uint8_t unused_flags;
+    int:8;
     int:16;
     uint32_t n;
     unsigned char data[];
diff --git a/inc/ti/room.t.h b/inc/ti/room.t.h
@@ -18,7 +18,7 @@ struct ti_room_s
 {
     uint32_t ref;
     uint8_t tp;
-    uint8_t unused_flags;
+    int:8;
     int:16;
     uint64_t id;
     ti_name_t * name;                /* Name is optional, might be NULL */
diff --git a/inc/ti/spec.t.h b/inc/ti/spec.t.h
@@ -36,9 +36,9 @@ typedef enum
     TI_SPEC_ERROR,          /* `error`              */
     TI_SPEC_ROOM,           /* `room`               */
     TI_SPEC_TASK,           /* `task`               */
-    TI_SPEC_EMAIL,          /* `email               */
-    TI_SPEC_URL,            /* `url `               */
-    TI_SPEC_TEL,            /* `tel `               */
+    TI_SPEC_EMAIL,          /* `email`              */
+    TI_SPEC_URL,            /* `url`                */
+    TI_SPEC_TEL,            /* `tel`                */
 
     TI_SPEC_REMATCH=0x5000, /* `/.../`              */
     TI_SPEC_INT_RANGE,      /* `int<:>              */
diff --git a/inc/ti/str.h b/inc/ti/str.h
@@ -10,7 +10,7 @@ struct ti_str_s
 {
     uint32_t ref;
     uint8_t tp;
-    uint8_t unused_flags;
+    int:8;
     int:16;
     uint32_t n;
     char str[];
diff --git a/inc/ti/template.h b/inc/ti/template.h
@@ -18,7 +18,7 @@ struct ti_template_s
 {
     uint32_t ref;
     uint8_t tp;
-    uint8_t unused_flags;
+    int:8;
     int:16;
     cleri_node_t * node;
 };
diff --git a/inc/ti/type.h b/inc/ti/type.h
@@ -28,13 +28,13 @@ ti_type_t * ti_type_create(
         size_t name_n,
         uint64_t created_at,
         uint64_t modified_at);
-ti_type_t * ti_type_create_unnamed(
+ti_type_t * ti_type_create_anonymous(
         ti_types_t * types,
         ti_raw_t * name,
         uint8_t flags);
 imap_t * ti_type_collect_things(ti_query_t * query, ti_type_t * type);
 void ti_type_drop(ti_type_t * type);
-void ti_type_drop_unnamed(ti_type_t * type);
+void ti_type_drop_anonymous(ti_type_t * type);
 void ti_type_del(ti_type_t * type, vec_t * vars);
 void ti_type_destroy(ti_type_t * type);
 void ti_type_map_cleanup(ti_type_t * type);
diff --git a/inc/ti/val.h b/inc/ti/val.h
@@ -31,7 +31,6 @@ extern ti_val_t * val__parent_name;
 extern ti_val_t * val__parent_type_name;
 extern ti_val_t * val__key_name;
 extern ti_val_t * val__key_type_name;
-extern ti_val_t * val__unnamed_name;
 
 /* string */
 extern ti_val_t * val__sany;
diff --git a/inc/ti/val.inline.h b/inc/ti/val.inline.h
@@ -914,11 +914,6 @@ static inline ti_val_t * ti_val_gmt_offset_name(void)
     return ti_incref(val__gmt_offset_name), val__gmt_offset_name;
 }
 
-static inline ti_val_t * ti_val_unnamed_name(void)
-{
-    return ti_incref(val__unnamed_name), val__unnamed_name;
-}
-
 static inline ti_val_t * ti_val_borrow_async_name(void)
 {
     return val__async_name;
diff --git a/inc/ti/val.t.h b/inc/ti/val.t.h
@@ -40,8 +40,6 @@
 #define TI_KIND_S_REGEX_OBSOLETE_     "*"
 
 /*
- * Both copy() and dup() use the following code to set the default deep value:
- *    !(type & 0x4);  THING/WRAP: 1 ARR/SET: 0
  * Be careful when changing the order in the enumerator.
  * The ti_forloop_t also depends on the order in this enumerator;
  */
diff --git a/inc/ti/version.h b/inc/ti/version.h
@@ -6,7 +6,7 @@
 
 #define TI_VERSION_MAJOR 1
 #define TI_VERSION_MINOR 8
-#define TI_VERSION_PATCH 1
+#define TI_VERSION_PATCH 2
 
 /* The syntax version is used to test compatibility with functions
  * using the `ti_nodes_check_syntax()` function */
@@ -25,7 +25,7 @@
  *  "-rc0"
  *  ""
  */
-#define TI_VERSION_PRE_RELEASE ""
+#define TI_VERSION_PRE_RELEASE "-alpha1"
 
 #define TI_MAINTAINER \
     "Jeroen van der Heijden <jeroen@cesbit.com>"
diff --git a/inc/ti/vfloat.h b/inc/ti/vfloat.h
@@ -15,7 +15,7 @@ struct ti_vfloat_s
 {
     uint32_t ref;
     uint8_t tp;
-    uint8_t unused_flags;
+    int:8;
     int:16;
     double float_;
 };
diff --git a/inc/ti/vint.h b/inc/ti/vint.h
@@ -19,7 +19,7 @@ struct ti_vint_s
 {
     uint32_t ref;
     uint8_t tp;
-    uint8_t unused_flags;
+    int:8;
     int:16;
     int64_t int_;
 };
diff --git a/inc/ti/wrap.h b/inc/ti/wrap.h
@@ -29,7 +29,7 @@ struct ti_wrap_s
 {
     uint32_t ref;
     uint8_t tp;
-    uint8_t unused_flags;
+    int:8;
     uint16_t type_id;
     ti_thing_t * thing;     /* with reference */
 };
diff --git a/src/ti/async.c b/src/ti/async.c
@@ -1,5 +1,5 @@
 /*
- * ti/modasync.c
+ * ti/async.c
  */
 #include <ti/async.h>
 #include <ti/varr.h>
diff --git a/src/ti/condition.c b/src/ti/condition.c
@@ -812,7 +812,7 @@ int ti_condition_init_type(ti_field_t * field, ex_t * e)
         }
     }
 
-    type = ti_type_create_unnamed(
+    type = ti_type_create_anonymous(
             field->type->types,
             field->type->rname,
             flags);
@@ -823,7 +823,7 @@ int ti_condition_init_type(ti_field_t * field, ex_t * e)
     }
 
     if (ti_type_init_from_thing(type, thing, e))
-        ti_type_drop_unnamed(type);
+        ti_type_drop_anonymous(type);
     else
         field->condition.type = type;
 
@@ -843,7 +843,7 @@ void ti_condition_destroy(ti_condition_via_t condition, uint16_t spec)
     {
     case TI_SPEC_TYPE:
     case TI_SPEC_ARR_TYPE:
-        ti_type_drop_unnamed(condition.type);
+        ti_type_drop_anonymous(condition.type);
         return;
     case TI_SPEC_ANY:
         return;  /* a field may be set to ANY while using mod_type in which
diff --git a/src/ti/field.c b/src/ti/field.c
@@ -913,7 +913,7 @@ static int field__init(ti_field_t * field, ex_t * e)
             field->name->str, field->type->name);
     }
     /* assert(field->dval_cb);  callback must have been set except for fields
-                                on unnamed type */
+                                on anonymous type */
     return e->nr;
 
 invalid:
@@ -2020,7 +2020,7 @@ int ti_field_make_assignable(
     ex_set(e, EX_TYPE_ERROR,
             "mismatch in type `%s`; "
             "property `%s` allows `any` type with the exception "
-            "of the `future` and `module` type",
+            "of the `"TI_VAL_FUTURE_S"` and `"TI_VAL_MODULE_S"` type",
             field->type->name,
             field->name->str);
     return e->nr;
diff --git a/src/ti/type.c b/src/ti/type.c
@@ -94,7 +94,7 @@ ti_type_t * ti_type_create(
     return type;
 }
 
-ti_type_t * ti_type_create_unnamed(
+ti_type_t * ti_type_create_anonymous(
         ti_types_t * types,
         ti_raw_t * name,
         uint8_t flags)
@@ -196,7 +196,7 @@ void ti_type_drop(ti_type_t * type)
     ti_type_destroy(type);
 }
 
-void ti_type_drop_unnamed(ti_type_t * type)
+void ti_type_drop_anonymous(ti_type_t * type)
 {
     if (!type)
         return;
diff --git a/src/ti/val.c b/src/ti/val.c
@@ -92,7 +92,6 @@ ti_val_t * val__parent_name;
 ti_val_t * val__parent_type_name;
 ti_val_t * val__key_name;
 ti_val_t * val__key_type_name;
-ti_val_t * val__unnamed_name;
 
 /* string */
 ti_val_t * val__sany;
@@ -775,9 +774,8 @@ int ti_val_init_common(void)
     val__parent_type_name = (ti_val_t *) ti_names_from_str_slow("parent_type");
     val__key_name = (ti_val_t *) ti_names_from_str_slow("key");
     val__key_type_name = (ti_val_t *) ti_names_from_str_slow("key_type");
-    val__unnamed_name = (ti_val_t *) ti_names_from_str_slow("__unnamed__");
-    val__re_email = (ti_val_t *) ti_regex_from_str("/^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$/");
-    val__re_url = (ti_val_t *) ti_regex_from_str("/^(https?|ftp):\\/\\/[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\b([-a-zA-Z0-9@:%_\\+.~#?&//=]*)$/");
+    val__re_email = (ti_val_t *) ti_regex_from_str("/^[a-zA-Z0-9.!#$%%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$/");
+    val__re_url = (ti_val_t *) ti_regex_from_str("/^(https?|ftp):\\/\\/[-a-zA-Z0-9@:%%._\\+~#=]{1,256}\\b([-a-zA-Z0-9@:%%_\\+.~#?&//=]*)$/");
     val__re_tel = (ti_val_t *) ti_regex_from_str("/^[\\+]?(\\([0-9]{1,4}\\)[-\\s\\.]?){0,2}([0-9]{1,4}[-\\s]?){3,5}$/");
 
     if (!val__empty_bin || !val__empty_str || !val__snil || !val__strue ||
@@ -794,8 +792,7 @@ int ti_val_init_common(void)
         !val__beautify_name || !val__parent_name || !val__parent_type_name ||
         !val__key_name || !val__key_type_name || !val__flags_name ||
         !val__data_name || !val__time_name || !val__re_email ||
-        !val__smodule || !val__re_url || !val__re_tel || !val__async_name ||
-        !val__unnamed_name)
+        !val__smodule || !val__re_url || !val__re_tel || !val__async_name)
     {
         return -1;
     }
@@ -986,9 +983,10 @@ int ti_val_convert_to_bytes(ti_val_t ** val, ex_t * e)
     {
     case TI_VAL_NAME:
     case TI_VAL_STR:
+    case TI_VAL_MPDATA: /* allow mpdata, issue #427 */
     {
         ti_raw_t * r = (ti_raw_t *) (*val);
-        if (r->ref == 1 && r->tp == TI_VAL_STR)
+        if (r->ref == 1 && r->tp != TI_VAL_NAME)
         {
             /* only one reference left we can just change the type */
             r->tp = TI_VAL_BYTES;
@@ -1010,7 +1008,6 @@ int ti_val_convert_to_bytes(ti_val_t ** val, ex_t * e)
     case TI_VAL_FLOAT:
     case TI_VAL_BOOL:
     case TI_VAL_DATETIME:
-    case TI_VAL_MPDATA:
     case TI_VAL_THING:
     case TI_VAL_WRAP:
     case TI_VAL_ROOM:
diff --git a/src/ti/wrap.c b/src/ti/wrap.c
@@ -189,7 +189,7 @@ static int wrap__field_val(
     case TI_VAL_WRAP:
         return ((*spec & TI_SPEC_MASK_NILLABLE) == TI_SPEC_TYPE)
             ? wrap__field_thing_type(
-                (ti_thing_t *) val,
+                ((ti_wrap_t *) val)->thing,
                 vp,
                 t_field->condition.type,
                 deep,
@@ -751,17 +751,17 @@ int ti_wrap_copy(ti_wrap_t ** wrap, uint8_t deep)
 int ti_wrap_dup(ti_wrap_t ** wrap, uint8_t deep)
 {
     assert(deep);
-    ti_wrap_t * nwrap = ti_wrap_create((*wrap)->thing, (*wrap)->type_id);
-    if (!nwrap)
+    ti_wrap_t * _wrap = ti_wrap_create((*wrap)->thing, (*wrap)->type_id);
+    if (!_wrap)
         return -1;
 
-    if (ti_thing_dup(&nwrap->thing, deep))
+    if (ti_thing_dup(&_wrap->thing, deep))
     {
-        ti_wrap_destroy(nwrap);
+        ti_wrap_destroy(_wrap);
         return -1;
     }
 
     ti_val_unsafe_drop((ti_val_t *) *wrap);
-    *wrap = nwrap;
+    *wrap = _wrap;
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ static int do__f_base64_encode(ti_query_t * query, cleri_node_t * nd, ex_t * e)`
`13`	`13`	`{`
`14`	`14`	`ex_set(e, EX_TYPE_ERROR,`
`15`	`15`	"function `base64_encode` expects argument 1 to be of "
`16`		- "type `"TI_VAL_STR_S"` or type `"TI_VAL_BYTES_S"` "
	`16`	+ "type `"TI_VAL_STR_S"`, `"TI_VAL_BYTES_S"` or `"TI_VAL_MPDATA_S"` "
`17`	`17`	"but got type `%s` instead"DOC_BASE64_ENCODE,
`18`	`18`	`ti_val_str(query->rval));`
`19`	`19`	`return e->nr;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ struct ti_member_s`
`17`	`17`	`{`
`18`	`18`	`uint32_t ref;`
`19`	`19`	`uint8_t tp;`
`20`		`- uint8_t unused_flags;`
	`20`	`+ int:8;`
`21`	`21`	`uint16_t idx; /* index in enum_->vec */`
`22`	`22`	`ti_enum_t * enum_; /* parent enum */`
`23`	`23`	`ti_name_t * name; /* with reference */`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ struct ti_name_s`
`19`	`19`	`{`
`20`	`20`	`uint32_t ref;`
`21`	`21`	`uint8_t tp;`
`22`		`- uint8_t unused_flags;`
	`22`	`+ int:8;`
`23`	`23`	`int:16;`
`24`	`24`	`uint32_t n;`
`25`	`25`	`char str[]; /* null terminated string */`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ struct ti_raw_s`
`12`	`12`	`{`
`13`	`13`	`uint32_t ref;`
`14`	`14`	`uint8_t tp;`
`15`		`- uint8_t unused_flags;`
	`15`	`+ int:8;`
`16`	`16`	`int:16;`
`17`	`17`	`uint32_t n;`
`18`	`18`	`unsigned char data[];`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ struct ti_room_s`
`18`	`18`	`{`
`19`	`19`	`uint32_t ref;`
`20`	`20`	`uint8_t tp;`
`21`		`- uint8_t unused_flags;`
	`21`	`+ int:8;`
`22`	`22`	`int:16;`
`23`	`23`	`uint64_t id;`
`24`	`24`	`ti_name_t * name; /* Name is optional, might be NULL */`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ struct ti_str_s`
`10`	`10`	`{`
`11`	`11`	`uint32_t ref;`
`12`	`12`	`uint8_t tp;`
`13`		`- uint8_t unused_flags;`
	`13`	`+ int:8;`
`14`	`14`	`int:16;`
`15`	`15`	`uint32_t n;`
`16`	`16`	`char str[];`