Skip to content

Commit c5daab0

Browse files
singaraionasingaraiona
committed
chore(strings): compact
1 parent 7f80d14 commit c5daab0

41 files changed

Lines changed: 698 additions & 554 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ DEBUG_CFLAGS = -fPIC -Wall -Wextra -std=$(STD) -g -O0 -march=native -fsigned-cha
2626
RELEASE_CFLAGS = -fPIC -Wall -Wextra -std=$(STD) -O3 -fsigned-char -march=native\
2727
-fassociative-math -ftree-vectorize -funsafe-math-optimizations -funroll-loops -m64\
2828
-flax-vector-conversions -fno-math-errno -fomit-frame-pointer -fno-stack-protector\
29-
-ffunction-sections -fdata-sections -fno-unwind-tables -fno-asynchronous-unwind-tables
29+
-ffunction-sections -fdata-sections -fno-unwind-tables -fno-asynchronous-unwind-tables\
30+
-fmacro-prefix-map=$(PWD)/=
3031
LIBS = -lm -ldl -lpthread
3132
RELEASE_LDFLAGS = -Wl,--strip-all -Wl,--gc-sections -Wl,--as-needed\
3233
-Wl,--build-id=none -Wl,--no-eh-frame-hdr -Wl,--no-ld-generated-unwind-info\
@@ -41,7 +42,8 @@ DEBUG_CFLAGS = -fPIC -Wall -Wextra -Wunused-function -std=$(STD) -g -O0 -march=n
4142
RELEASE_CFLAGS = -fPIC -Wall -Wextra -std=$(STD) -O3 -fsigned-char -march=native\
4243
-fassociative-math -ftree-vectorize -funsafe-math-optimizations -funroll-loops -m64\
4344
-flax-vector-conversions -fno-math-errno -fomit-frame-pointer -fno-stack-protector\
44-
-ffunction-sections -fdata-sections -fno-unwind-tables -fno-asynchronous-unwind-tables
45+
-ffunction-sections -fdata-sections -fno-unwind-tables -fno-asynchronous-unwind-tables\
46+
-fmacro-prefix-map=$(PWD)/=
4547
LIBS = -lm -ldl -lpthread
4648
RELEASE_LDFLAGS = -Wl,-dead_strip -Wl,-export_dynamic
4749
DEBUG_LDFLAGS = -Wl,-export_dynamic

‎app/term.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ hist_p hist_create() {
198198
fd = fs_fopen(HIST_FILE_PATH, ATTR_RDWR | ATTR_CREAT);
199199

200200
if (fd == -1) {
201-
perror("can't open history file");
201+
perror("hist:open");
202202
return NULL;
203203
}
204204

@@ -207,13 +207,13 @@ hist_p hist_create() {
207207
OVERLAPPED overlapped = {0};
208208
// On Windows, fs_fopen already returns a HANDLE, not a POSIX fd
209209
if (!LockFileEx((HANDLE)fd, 0, 0, MAXDWORD, MAXDWORD, &overlapped)) {
210-
perror("can't lock history file for reading");
210+
perror("hist:lock");
211211
fs_fclose(fd);
212212
return NULL;
213213
}
214214
#else
215215
if (flock(fd, LOCK_SH) == -1) {
216-
perror("can't lock history file for reading");
216+
perror("hist:lock");
217217
fs_fclose(fd);
218218
return NULL;
219219
}
@@ -223,7 +223,7 @@ hist_p hist_create() {
223223
if (fsize == 0) {
224224
// Set initial file size if the file is empty
225225
if (fs_file_extend(fd, HIST_SIZE) == -1) {
226-
perror("can't truncate history file");
226+
perror("hist:trunc");
227227
#if defined(OS_WINDOWS)
228228
OVERLAPPED overlapped_err = {0};
229229
UnlockFileEx((HANDLE)fd, 0, MAXDWORD, MAXDWORD, &overlapped_err);
@@ -240,7 +240,7 @@ hist_p hist_create() {
240240
// Map file to memory with shared mapping so changes persist
241241
hist_data = (str_p)mmap_file_shared(fd, NULL, fsize, 0);
242242
if (hist_data == NULL) {
243-
perror("can't map history file");
243+
perror("hist:mmap");
244244
#if defined(OS_WINDOWS)
245245
OVERLAPPED overlapped_err = {0};
246246
UnlockFileEx((HANDLE)fd, 0, MAXDWORD, MAXDWORD, &overlapped_err);
@@ -253,7 +253,7 @@ hist_p hist_create() {
253253

254254
hist = (hist_p)heap_mmap(sizeof(struct hist_t));
255255
if (hist == NULL) {
256-
perror("can't allocate memory for history");
256+
perror("hist:alloc");
257257
#if defined(OS_WINDOWS)
258258
OVERLAPPED overlapped_err = {0};
259259
UnlockFileEx((HANDLE)fd, 0, MAXDWORD, MAXDWORD, &overlapped_err);
@@ -315,17 +315,17 @@ nil_t hist_destroy(hist_p hist) {
315315
#if defined(OS_WINDOWS)
316316
OVERLAPPED overlapped = {0};
317317
if (!LockFileEx((HANDLE)hist->fd, LOCKFILE_EXCLUSIVE_LOCK, 0, MAXDWORD, MAXDWORD, &overlapped)) {
318-
perror("can't lock history file for writing");
318+
perror("hist:lock");
319319
}
320320
#else
321321
if (flock(hist->fd, LOCK_EX) == -1) {
322-
perror("can't lock history file for writing");
322+
perror("hist:lock");
323323
}
324324
#endif
325325

326326
// Sync history buffer to file
327327
if (mmap_sync(hist->entries, hist->size) == -1)
328-
perror("can't sync history buffer");
328+
perror("hist:sync");
329329

330330
// Unlock file
331331
#if defined(OS_WINDOWS)
@@ -540,7 +540,7 @@ term_p term_create() {
540540

541541
hist = hist_create();
542542
if (hist == NULL)
543-
PANIC("can't create history");
543+
PANIC("hist:create");
544544

545545
term = (term_p)heap_mmap(sizeof(struct term_t));
546546

@@ -624,7 +624,7 @@ term_p term_create() {
624624

625625
hist = hist_create();
626626
if (hist == NULL)
627-
PANIC("can't create history");
627+
PANIC("hist:create");
628628

629629
term = (term_p)heap_mmap(sizeof(struct term_t));
630630

‎core/aggr.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ obj_p aggr_first_partial(raw_p arg1, raw_p arg2, raw_p arg3, raw_p arg4, raw_p a
433433
return res;
434434
default:
435435
destroy_partial_result(res);
436-
return err_type(TYPE_LIST, val->type, 0);
436+
return err_type(TYPE_LIST, val->type, 0, 0);
437437
}
438438
}
439439

@@ -497,7 +497,7 @@ obj_p aggr_first(obj_p val, obj_p index) {
497497
if (is_null(sym) || sym->type != TYPE_SYMBOL) {
498498
drop_obj(sym);
499499
drop_obj(res);
500-
return err_type(0, 0, 0);
500+
return err_type(0, 0, 0, 0);
501501
}
502502

503503
xe = AS_SYMBOL(sym);
@@ -711,7 +711,7 @@ obj_p aggr_first(obj_p val, obj_p index) {
711711

712712
return res;
713713
default:
714-
return err_type(0, 0, 0);
714+
return err_type(0, 0, 0, 0);
715715
}
716716
}
717717

@@ -757,7 +757,7 @@ obj_p aggr_last_partial(raw_p arg1, raw_p arg2, raw_p arg3, raw_p arg4, raw_p ar
757757
return res;
758758
default:
759759
destroy_partial_result(res);
760-
return err_type(0, 0, 0);
760+
return err_type(0, 0, 0, 0);
761761
}
762762
}
763763

@@ -809,7 +809,7 @@ obj_p aggr_last(obj_p val, obj_p index) {
809809
if (is_null(sym) || sym->type != TYPE_SYMBOL) {
810810
drop_obj(sym);
811811
drop_obj(res);
812-
return err_type(0, 0, 0);
812+
return err_type(0, 0, 0, 0);
813813
}
814814

815815
xe = AS_SYMBOL(sym);
@@ -938,7 +938,7 @@ obj_p aggr_last(obj_p val, obj_p index) {
938938
return PARTED_MAP(n, val, index, (raw_p)aggr_last_partial, i16, i16,
939939
if ($out[$y] == NULL_I16) $out[$y] = $in[$x]);
940940
default:
941-
return err_type(0, 0, 0);
941+
return err_type(0, 0, 0, 0);
942942
}
943943
}
944944

@@ -967,7 +967,7 @@ obj_p aggr_sum_partial(raw_p arg1, raw_p arg2, raw_p arg3, raw_p arg4, raw_p arg
967967
return res;
968968
default:
969969
destroy_partial_result(res);
970-
return err_type(0, 0, 0);
970+
return err_type(0, 0, 0, 0);
971971
}
972972
}
973973

@@ -1012,7 +1012,7 @@ obj_p aggr_sum(obj_p val, obj_p index) {
10121012
case TYPE_PARTEDI16:
10131013
return PARTED_MAP(n, val, index, (raw_p)aggr_sum_partial, i16, i16, $out[$y] = ADDI16($out[$y], $in[$x]));
10141014
default:
1015-
return err_type(0, 0, 0);
1015+
return err_type(0, 0, 0, 0);
10161016
}
10171017
}
10181018

@@ -1041,7 +1041,7 @@ obj_p aggr_max_partial(raw_p arg1, raw_p arg2, raw_p arg3, raw_p arg4, raw_p arg
10411041
return res;
10421042
default:
10431043
destroy_partial_result(res);
1044-
return err_type(0, 0, 0);
1044+
return err_type(0, 0, 0, 0);
10451045
}
10461046
}
10471047

@@ -1095,7 +1095,7 @@ obj_p aggr_max(obj_p val, obj_p index) {
10951095
case TYPE_PARTEDI16:
10961096
return PARTED_MAP(n, val, index, (raw_p)aggr_max_partial, i16, i16, $out[$y] = MAXI16($out[$y], $in[$x]));
10971097
default:
1098-
return err_type(0, 0, 0);
1098+
return err_type(0, 0, 0, 0);
10991099
}
11001100
}
11011101

@@ -1123,7 +1123,7 @@ obj_p aggr_min_partial(raw_p arg1, raw_p arg2, raw_p arg3, raw_p arg4, raw_p arg
11231123
$out[$y] = NULL_I32);
11241124
return res;
11251125
default:
1126-
return err_type(0, 0, 0);
1126+
return err_type(0, 0, 0, 0);
11271127
}
11281128
}
11291129

@@ -1177,7 +1177,7 @@ obj_p aggr_min(obj_p val, obj_p index) {
11771177
case TYPE_PARTEDI16:
11781178
return PARTED_MAP(n, val, index, (raw_p)aggr_min_partial, i16, i16, $out[$y] = MINI16($out[$y], $in[$x]));
11791179
default:
1180-
return err_type(0, 0, 0);
1180+
return err_type(0, 0, 0, 0);
11811181
}
11821182
}
11831183

@@ -1238,7 +1238,7 @@ obj_p aggr_count_partial(raw_p arg1, raw_p arg2, raw_p arg3, raw_p arg4, raw_p a
12381238
default:
12391239
res->len = 0;
12401240
drop_obj(res);
1241-
return err_type(0, 0, 0);
1241+
return err_type(0, 0, 0, 0);
12421242
}
12431243

12441244
return res;
@@ -1736,7 +1736,7 @@ obj_p aggr_avg_partial(raw_p arg1, raw_p arg2, raw_p arg3, raw_p arg4, raw_p arg
17361736
drop_obj(cnts_obj);
17371737
res->len = 0;
17381738
drop_obj(res);
1739-
return err_type(0, 0, 0);
1739+
return err_type(0, 0, 0, 0);
17401740
}
17411741
}
17421742

@@ -1994,7 +1994,7 @@ obj_p aggr_avg(obj_p val, obj_p index) {
19941994
}
19951995

19961996
default:
1997-
return err_type(0, 0, 0);
1997+
return err_type(0, 0, 0, 0);
19981998
}
19991999
}
20002000

@@ -2588,7 +2588,7 @@ obj_p aggr_dev_partial(raw_p arg1, raw_p arg2, raw_p arg3, raw_p arg4, raw_p arg
25882588
drop_obj(cnt_obj);
25892589
res->len = 0;
25902590
drop_obj(res);
2591-
return err_type(0, 0, 0);
2591+
return err_type(0, 0, 0, 0);
25922592
}
25932593
}
25942594

@@ -2879,7 +2879,7 @@ obj_p aggr_dev(obj_p val, obj_p index) {
28792879
}
28802880

28812881
default:
2882-
return err_type(0, 0, 0);
2882+
return err_type(0, 0, 0, 0);
28832883
}
28842884
}
28852885

@@ -2931,7 +2931,7 @@ obj_p aggr_collect(obj_p val, obj_p index) {
29312931
if (v->type != TYPE_SYMBOL) {
29322932
drop_obj(v);
29332933
drop_obj(res);
2934-
return err_type(0, 0, 0);
2934+
return err_type(0, 0, 0, 0);
29352935
}
29362936

29372937
AGGR_ITER(index, l, 0, val, res, i64, list, , push_raw($out + $y, AS_SYMBOL(v) + $in[$x]), );
@@ -2976,7 +2976,7 @@ obj_p aggr_collect(obj_p val, obj_p index) {
29762976
return res;
29772977
default:
29782978
drop_obj(res);
2979-
return err_type(0, 0, 0);
2979+
return err_type(0, 0, 0, 0);
29802980
}
29812981
}
29822982

‎core/binary.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ obj_p binary_set(obj_p x, obj_p y) {
191191
drop_obj(buf);
192192
drop_obj(k);
193193

194-
return err_type(0, 0, 0);
194+
return err_type(0, 0, 0, 0);
195195
}
196196

197197
AS_I64(k)[i] = size;
@@ -306,11 +306,11 @@ obj_p binary_set(obj_p x, obj_p y) {
306306
return clone_obj(x);
307307
}
308308

309-
return err_type(0, 0, 0);
309+
return err_type(0, 0, 0, 0);
310310
}
311311

312312
default:
313-
return err_type(0, 0, 0);
313+
return err_type(0, 0, 0, 0);
314314
}
315315
}
316316

@@ -340,6 +340,6 @@ obj_p ray_let(obj_p x, obj_p y) {
340340
return amend(x, e);
341341

342342
default:
343-
return err_type(0, 0, 0);
343+
return err_type(0, 0, 0, 0);
344344
}
345345
}

‎core/cc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ static obj_p cc_fn(cc_ctx_t *cc, obj_p *lst, i64_t n) {
379379
if (cc_body(cc, lst, n) == -1) {
380380
// Add location info from the failing expression before returning error
381381
cc_error_add_loc(cc);
382-
return err_type(0, 0, 0);
382+
return err_type(0, 0, 0, 0);
383383
}
384384

385385
end:

‎core/chrono.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ obj_p ray_timeit(obj_p *x, i64_t n) {
163163
return f64(ray_clock_elapsed_ms(&start, &end));
164164
case 2:
165165
if (x[0]->type != -TYPE_I64)
166-
return err_type(0, 0, 0);
166+
return err_type(0, 0, 0, 0);
167167

168168
l = x[0]->i64;
169169

170170
if (l < 1)
171-
return err_domain();
171+
return err_domain(0, 0);
172172

173173
ray_clock_get_time(&start);
174174

@@ -183,7 +183,7 @@ obj_p ray_timeit(obj_p *x, i64_t n) {
183183

184184
return f64(ray_clock_elapsed_ms(&start, &end));
185185
default:
186-
return err_length(0, 0);
186+
return err_arity(2, n, 0);
187187
}
188188
}
189189

@@ -364,33 +364,33 @@ obj_p ray_timer(obj_p *x, i64_t n) {
364364
timers_p timers;
365365

366366
if (n == 0)
367-
return err_length(0, 0);
367+
return err_arity(1, n, 0);
368368

369369
timers = runtime_get()->poll->timers;
370370

371371
if (n == 1) {
372372
if (x[0]->type != -TYPE_I64)
373-
return err_type(0, 0, 0);
373+
return err_type(-TYPE_I64, x[0]->type, 1, 0);
374374

375375
timer_del(timers, x[0]->i64);
376376

377377
return NULL_OBJ;
378378
}
379379

380380
if (n != 3)
381-
return err_length(0, 0);
381+
return err_arity(3, n, 0);
382382

383383
if (x[0]->type != -TYPE_I64)
384-
return err_type(0, 0, 0);
384+
return err_type(-TYPE_I64, x[0]->type, 1, 0);
385385

386386
if (x[1]->type != -TYPE_I64)
387-
return err_type(0, 0, 0);
387+
return err_type(-TYPE_I64, x[1]->type, 2, 0);
388388

389389
if (x[2]->type != TYPE_LAMBDA)
390-
return err_type(0, 0, 0);
390+
return err_type(TYPE_LAMBDA, x[2]->type, 3, 0);
391391

392392
if (AS_LAMBDA(x[2])->args->len != 1)
393-
return err_length(0, 0);
393+
return err_arity(1, AS_LAMBDA(x[2])->args->len, 3);
394394

395395
timers = runtime_get()->poll->timers;
396396

0 commit comments

Comments
 (0)