commit 31ce1af

default  ·  2024-09-14 16:59:49 +0000 UTC
parent c659494
Minor code cleaning.
3 files changed,  +6, -2
M xs.h
M xs.h
+4, -0
 1@@ -157,6 +157,7 @@ unsigned int xs_hash_func(const char *data, int size);
 2 
 3 #define xs_is_true(v) (xs_type((v)) == XSTYPE_TRUE)
 4 #define xs_is_false(v) (xs_type((v)) == XSTYPE_FALSE)
 5+#define xs_not(v) xs_stock(xs_is_true((v)) ? XSTYPE_FALSE : XSTYPE_TRUE)
 6 
 7 #define xs_list_foreach(l, v) for (int ct_##__LINE__ = 0; xs_list_next(l, &v, &ct_##__LINE__); )
 8 #define xs_dict_foreach(l, k, v) for (int ct_##__LINE__ = 0; xs_dict_next(l, &k, &v, &ct_##__LINE__); )
 9@@ -357,6 +358,9 @@ int xs_is_null(const xs_val *data)
10 int xs_cmp(const xs_val *v1, const xs_val *v2)
11 /* compares two values */
12 {
13+    if (xs_type(v1) == XSTYPE_STRING && xs_type(v2) == XSTYPE_STRING)
14+        return strcmp(v1, v2);
15+
16     int s1 = xs_size(v1);
17     int s2 = xs_size(v2);
18     int d = s1 - s2;
+1, -1
1@@ -212,7 +212,7 @@ static xs_val *_xs_json_load_lexer(FILE *f, js_type *t)
2     *t = JS_ERROR;
3 
4     /* skip blanks */
5-    while ((c = fgetc(f)) == L' ' || c == L'\t' || c == L'\n' || c == L'\r');
6+    while ((c = fgetc(f)) == ' ' || c == '\t' || c == '\n' || c == '\r');
7 
8     if (c == '{')
9         *t = JS_OCURLY;
+1, -1
1@@ -1 +1 @@
2-/* 2a3ecc6aef531366cfd45cbf19e34a15f83f69f8 2024-08-30T18:33:51+02:00 */
3+/* 9c3dd1b1165c25baa154e82d8d278926e376af81 2024-09-14T18:18:42+02:00 */