Skip to content
This repository was archived by the owner on Jan 8, 2025. It is now read-only.

Commit c6bd385

Browse files
committed
Upgrade to Mojo 2024.7.1305
1 parent fe7355a commit c6bd385

35 files changed

+1341
-746
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,4 @@ cython_debug/
170170
libmoxt.so
171171
.env
172172
config.toml
173+
*.Identifier

base/c.mojo

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ alias c_void_pointer = UnsafePointer[c_void]
3535

3636

3737
alias any_pointer_simd_int8_to_pointer_simd_int8 = rebind[
38-
Pointer[SIMD[DType.int8, 1]], UnsafePointer[SIMD[DType.int8, 1]]
38+
UnsafePointer[SIMD[DType.int8, 1]], UnsafePointer[SIMD[DType.int8, 1]]
3939
]
4040

4141

@@ -144,15 +144,15 @@ fn c_str_to_string_raw(s: UnsafePointer[UInt8], n: Int) -> String:
144144

145145
fn c_str_to_string(s: UnsafePointer[c_schar], n: Int) -> String:
146146
var size = n + 1
147-
var ptr = Pointer[Int8]().alloc(size)
147+
var ptr = UnsafePointer[Int8]().alloc(size)
148148
memset_zero(ptr.offset(n), 1)
149149
memcpy(ptr, s, n)
150150
return String(ptr.bitcast[UInt8](), size)
151151

152152

153153
fn c_str_to_string(s: UnsafePointer[c_char], n: Int) -> String:
154154
var size = n + 1
155-
var ptr = Pointer[UInt8]().alloc(size)
155+
var ptr = UnsafePointer[UInt8]().alloc(size)
156156
memset_zero(ptr.offset(n), 1)
157157
memcpy(ptr, s, n)
158158
return String(ptr, size)

base/far.mojo

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct Far:
4141
self.ptr,
4242
unsafe_ptr_as_scalar_pointer(key.unsafe_ptr()),
4343
len(key),
44-
Pointer[c_size_t].address_of(n),
44+
UnsafePointer[c_size_t].address_of(n),
4545
)
4646
return c_str_to_string(c_str, n)
4747

base/fixed.mojo

+1-4
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,8 @@ struct Fixed(Stringable):
6565
_value: FIXED_SCALE_I * v,
6666
}
6767

68-
fn __init__(v: FloatLiteral) -> Self:
69-
return Self {_value: Int64(FIXED_SCALE_F * v)}
70-
7168
fn __init__(v: Float64) -> Self:
72-
return Self {_value: Int64(FIXED_SCALE_F * v)}
69+
return Self {_value: Int64(int(v * FIXED_SCALE_F))}
7370

7471
fn __init__(v: String) -> Self:
7572
var v_ = seq_fixed12_new_string(

base/globals.mojo

+14-14
Original file line numberDiff line numberDiff line change
@@ -57,48 +57,48 @@ fn _destroy_global(p: UnsafePointer[NoneType]):
5757
p.free()
5858

5959

60-
fn _GLOBAL_INT[name: StringLiteral]() -> Pointer[Int]:
60+
fn _GLOBAL_INT[name: StringLiteral]() -> UnsafePointer[Int]:
6161
var p = _get_global[name, _initialize_int, _destroy_int]()
6262
return p.bitcast[Int]()
6363

6464

65-
fn _initialize_int(payload: Pointer[NoneType]) -> Pointer[NoneType]:
66-
var data = Pointer[Int].alloc(1)
65+
fn _initialize_int(payload: UnsafePointer[NoneType]) -> UnsafePointer[NoneType]:
66+
var data = UnsafePointer[Int].alloc(1)
6767
data[0] = 0
6868
return data.bitcast[NoneType]()
6969

7070

71-
fn _destroy_int(p: Pointer[NoneType]):
71+
fn _destroy_int(p: UnsafePointer[NoneType]):
7272
p.free()
7373

7474

75-
fn _GLOBAL_FLOAT[name: StringLiteral]() -> Pointer[Float64]:
75+
fn _GLOBAL_FLOAT[name: StringLiteral]() -> UnsafePointer[Float64]:
7676
var p = _get_global[name, _initialize_float64, _destroy_float64]()
7777
return p.bitcast[Float64]()
7878

7979

80-
fn _initialize_float64(payload: Pointer[NoneType]) -> Pointer[NoneType]:
81-
var data = Pointer[Float64].alloc(1)
82-
data.store(0)
80+
fn _initialize_float64(payload: UnsafePointer[NoneType]) -> UnsafePointer[NoneType]:
81+
var data = UnsafePointer[Float64].alloc(1)
82+
data[0] = 0
8383
return data.bitcast[NoneType]()
8484

8585

86-
fn _destroy_float64(p: Pointer[NoneType]):
86+
fn _destroy_float64(p: UnsafePointer[NoneType]):
8787
p.free()
8888

8989

90-
fn _GLOBAL_BOOL[name: StringLiteral]() -> Pointer[Bool]:
90+
fn _GLOBAL_BOOL[name: StringLiteral]() -> UnsafePointer[Bool]:
9191
var p = _get_global[name, _initialize_bool, _destroy_bool]()
9292
return p.bitcast[Bool]()
9393

9494

95-
fn _initialize_bool(payload: Pointer[NoneType]) -> Pointer[NoneType]:
96-
var data = Pointer[Bool].alloc(1)
97-
data.store(False)
95+
fn _initialize_bool(payload: UnsafePointer[NoneType]) -> UnsafePointer[NoneType]:
96+
var data = UnsafePointer[Bool].alloc(1)
97+
data[0] = False
9898
return data.bitcast[NoneType]()
9999

100100

101-
fn _destroy_bool(p: Pointer[NoneType]):
101+
fn _destroy_bool(p: UnsafePointer[NoneType]):
102102
p.free()
103103

104104

base/mo.mojo

+29-31
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ fn seq_set_global_string(id: Int, s: String) -> None:
4141
fn seq_get_global_string(id: Int) -> String:
4242
var s_len: c_size_t = 0
4343
var s = external_call[
44-
"seq_get_global_string", c_char_pointer, Int, Pointer[c_size_t]
45-
](id, Pointer.address_of(s_len))
44+
"seq_get_global_string", c_char_pointer, Int, UnsafePointer[c_size_t]
45+
](id, UnsafePointer.address_of(s_len))
4646
return c_str_to_string(s, s_len)
4747

4848

@@ -227,47 +227,47 @@ fn seq_simdjson_ondemand_get_string_d(
227227
p: c_void_pointer,
228228
key: c_char_pointer,
229229
len: c_size_t,
230-
n: Pointer[c_size_t],
230+
n: UnsafePointer[c_size_t],
231231
) -> c_char_pointer:
232232
return external_call[
233233
"seq_simdjson_ondemand_get_string_d",
234234
c_char_pointer,
235235
c_void_pointer,
236236
c_char_pointer,
237237
c_size_t,
238-
Pointer[c_size_t],
238+
UnsafePointer[c_size_t],
239239
](p, key, len, n)
240240

241241

242242
fn seq_simdjson_ondemand_get_string_v(
243243
p: c_void_pointer,
244244
key: c_char_pointer,
245245
len: c_size_t,
246-
n: Pointer[c_size_t],
246+
n: UnsafePointer[c_size_t],
247247
) -> c_char_pointer:
248248
return external_call[
249249
"seq_simdjson_ondemand_get_string_v",
250250
c_char_pointer,
251251
c_void_pointer,
252252
c_char_pointer,
253253
c_size_t,
254-
Pointer[c_size_t],
254+
UnsafePointer[c_size_t],
255255
](p, key, len, n)
256256

257257

258258
fn seq_simdjson_ondemand_get_string_o(
259259
p: c_void_pointer,
260260
key: c_char_pointer,
261261
len: c_size_t,
262-
n: Pointer[c_size_t],
262+
n: UnsafePointer[c_size_t],
263263
) -> c_char_pointer:
264264
return external_call[
265265
"seq_simdjson_ondemand_get_string_o",
266266
c_char_pointer,
267267
c_void_pointer,
268268
c_char_pointer,
269269
c_size_t,
270-
Pointer[c_size_t],
270+
UnsafePointer[c_size_t],
271271
](p, key, len, n)
272272

273273

@@ -400,13 +400,13 @@ fn seq_simdjson_ondemand_bool_v(p: c_void_pointer) -> Bool:
400400
# const char *
401401
# seq_simdjson_ondemand_string_v(ondemand ::value *p, size_t *n)
402402
fn seq_simdjson_ondemand_string_v(
403-
p: c_void_pointer, n: Pointer[c_size_t]
403+
p: c_void_pointer, n: UnsafePointer[c_size_t]
404404
) -> c_char_pointer:
405405
return external_call[
406406
"seq_simdjson_ondemand_string_v",
407407
c_char_pointer,
408408
c_void_pointer,
409-
Pointer[c_size_t],
409+
UnsafePointer[c_size_t],
410410
](p, n)
411411

412412

@@ -739,14 +739,14 @@ fn seq_simdjson_ondemand_array_at_bool(
739739
# size_t index,
740740
# size_t *n);
741741
fn seq_simdjson_ondemand_array_at_str(
742-
p: c_void_pointer, index: c_size_t, n: Pointer[c_size_t]
742+
p: c_void_pointer, index: c_size_t, n: UnsafePointer[c_size_t]
743743
) -> c_char_pointer:
744744
return external_call[
745745
"seq_simdjson_ondemand_array_at_str",
746746
c_char_pointer,
747747
c_void_pointer,
748748
c_size_t,
749-
Pointer[c_size_t],
749+
UnsafePointer[c_size_t],
750750
](p, index, n)
751751

752752

@@ -806,13 +806,13 @@ fn seq_simdjson_ondemand_array_iter_get_bool(p: c_void_pointer) -> Bool:
806806
# const char *seq_simdjson_ondemand_array_iter_get_str(
807807
# ondemand::array_iterator *self, size_t *n);
808808
fn seq_simdjson_ondemand_array_iter_get_str(
809-
p: c_void_pointer, n: Pointer[c_size_t]
809+
p: c_void_pointer, n: UnsafePointer[c_size_t]
810810
) -> c_char_pointer:
811811
return external_call[
812812
"seq_simdjson_ondemand_array_iter_get_str",
813813
c_char_pointer,
814814
c_void_pointer,
815-
Pointer[c_size_t],
815+
UnsafePointer[c_size_t],
816816
](p, n)
817817

818818

@@ -877,15 +877,15 @@ fn seq_simdjson_ondemand_array_iter_not_equal(
877877
# SEQ_FUNC void
878878
# seq_simdjson_ondemand_array_iter_step(ondemand::array_iterator *self);
879879
fn seq_simdjson_ondemand_array_iter_step(it: c_void_pointer) -> None:
880-
return external_call[
880+
external_call[
881881
"seq_simdjson_ondemand_array_iter_step", NoneType, c_void_pointer
882882
](it)
883883

884884

885885
# SEQ_FUNC void
886886
# seq_simdjson_ondemand_array_iter_free(ondemand::array_iterator *p)
887887
fn seq_simdjson_ondemand_array_iter_free(it: c_void_pointer) -> None:
888-
return external_call[
888+
external_call[
889889
"seq_simdjson_ondemand_array_iter_free",
890890
NoneType,
891891
c_void_pointer,
@@ -1120,15 +1120,15 @@ fn seq_far_get_string(
11201120
p: c_void_pointer,
11211121
key: c_char_pointer,
11221122
key_len: c_size_t,
1123-
n: Pointer[c_size_t],
1123+
n: UnsafePointer[c_size_t],
11241124
) -> c_char_pointer:
11251125
return external_call[
11261126
"seq_far_get_string",
11271127
c_char_pointer,
11281128
c_void_pointer,
11291129
c_char_pointer,
11301130
c_size_t,
1131-
Pointer[c_size_t],
1131+
UnsafePointer[c_size_t],
11321132
](p, key, key_len, n)
11331133

11341134

@@ -1286,14 +1286,14 @@ fn seq_ssmap_set(
12861286
# SEQ_FUNC const char *seq_ssmap_get(std::map<std::string, std::string> *p,
12871287
# const char *name, size_t *n)
12881288
fn seq_ssmap_get(
1289-
p: c_void_pointer, name: c_char_pointer, n: Pointer[c_size_t]
1289+
p: c_void_pointer, name: c_char_pointer, n: UnsafePointer[c_size_t]
12901290
) -> c_char_pointer:
12911291
return external_call[
12921292
"seq_ssmap_get",
12931293
c_char_pointer,
12941294
c_void_pointer,
12951295
c_char_pointer,
1296-
Pointer[c_size_t],
1296+
UnsafePointer[c_size_t],
12971297
](p, name, n)
12981298

12991299

@@ -1397,15 +1397,15 @@ fn seq_strtod(s: c_char_pointer, s_len: c_size_t) -> Float64:
13971397

13981398

13991399
fn test_identity_pool() -> None:
1400-
return external_call["test_identity_pool", NoneType]()
1400+
external_call["test_identity_pool", NoneType]()
14011401

14021402

14031403
fn seq_test_spdlog() -> None:
1404-
return external_call["seq_test_spdlog", NoneType]()
1404+
external_call["seq_test_spdlog", NoneType]()
14051405

14061406

14071407
fn test_ondemand_parser_pool() -> None:
1408-
return external_call["test_ondemand_parser_pool", NoneType]()
1408+
external_call["test_ondemand_parser_pool", NoneType]()
14091409

14101410

14111411
fn seq_add(a: Int, b: Int) -> Int:
@@ -1426,14 +1426,12 @@ alias signal_handle_t = fn (c_int) raises -> None
14261426

14271427
# SEQ_FUNC void seq_init_signal(signal_handle_t handle);
14281428
fn seq_init_signal(callback: signal_handle_t) -> None:
1429-
return external_call["seq_init_signal", NoneType, signal_handle_t](callback)
1429+
external_call["seq_init_signal", NoneType, signal_handle_t](callback)
14301430

14311431

14321432
# SEQ_FUNC void seq_init_photon_signal(signal_handle_t handle);
14331433
fn seq_init_photon_signal(callback: signal_handle_t) -> None:
1434-
return external_call["seq_init_photon_signal", NoneType, signal_handle_t](
1435-
callback
1436-
)
1434+
external_call["seq_init_photon_signal", NoneType, signal_handle_t](callback)
14371435

14381436

14391437
fn seq_skiplist_new(is_forward: Bool) -> c_void_pointer:
@@ -1465,7 +1463,7 @@ fn seq_skiplist_search(list: c_void_pointer, key: Int64) -> Int64:
14651463

14661464

14671465
fn seq_skiplist_dump(list: c_void_pointer) -> None:
1468-
return external_call["seq_skiplist_dump", NoneType, c_void_pointer](list)
1466+
external_call["seq_skiplist_dump", NoneType, c_void_pointer](list)
14691467

14701468

14711469
fn seq_skiplist_begin(list: c_void_pointer) -> c_void_pointer:
@@ -1489,14 +1487,14 @@ fn seq_skiplist_next(
14891487

14901488

14911489
fn seq_skiplist_node_value(
1492-
node: c_void_pointer, key: Pointer[Int64], value: Pointer[Int64]
1490+
node: c_void_pointer, key: UnsafePointer[Int64], value: UnsafePointer[Int64]
14931491
) -> None:
14941492
external_call[
14951493
"seq_skiplist_node_value",
14961494
NoneType,
14971495
c_void_pointer,
1498-
Pointer[Int64],
1499-
Pointer[Int64],
1496+
UnsafePointer[Int64],
1497+
UnsafePointer[Int64],
15001498
](node, key, value)
15011499

15021500

base/moutil.mojo

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ from ylstdlib.time import time_ns
66

77

88
fn time_ms() -> Int64:
9-
return time_ns() / 1e6
9+
return Int64(int(time_ns() / 1e6))
1010

1111

1212
fn time_us() -> Int64:
13-
return time_ns() / 1e3
13+
return Int64(int(time_ns() / 1e3))
1414

1515

1616
fn set_global_value_ptr[V: Intable](id: Int, v: UnsafePointer[V]) -> Int:

0 commit comments

Comments
 (0)