mt-lang 0.3.30 → 0.3.32

data/std/c/flecs.mt

@@ -106,7 +106,7 @@ struct ecs_world_stats_t_http:
 union ecs_meta_op_t_is:
     members: ptr[ecs_hashmap_t]
     constants: ptr[ecs_map_t]
-    opaque_: fn(arg0: const_ptr[ecs_serializer_t], arg1: const_ptr[void]) -> int
+    opaque: fn(arg0: const_ptr[ecs_serializer_t], arg1: const_ptr[void]) -> int
 
 opaque ecs_event_id_record_t = c"struct ecs_event_id_record_t"
 opaque ecs_query_var_t = c"struct ecs_query_var_t"
@@ -136,7 +136,7 @@ type ecs_poly_t = void
 opaque ecs_mixins_t = c"ecs_mixins_t"
 
 struct ecs_header_t:
-    type_: int
+    type: int
     refcount: int
     mixins: ptr[ecs_mixins_t]
 
@@ -486,7 +486,7 @@ struct ecs_term_t:
     first: ecs_term_ref_t
     second: ecs_term_ref_t
     trav: ptr_uint
-    inout_: short
+    inout: short
     oper: short
     field_index: byte
     flags_: ushort
@@ -497,7 +497,7 @@ struct ecs_query_t:
     sizes: ptr[int]
     ids: ptr[ecs_id_t]
     bloom_filter: ptr_uint
-    flags_: uint
+    flags: uint
     var_count: byte
     term_count: byte
     field_count: byte
@@ -547,7 +547,7 @@ struct ecs_type_hooks_t:
     move_dtor: fn(arg0: ptr[void], arg1: ptr[void], arg2: int, arg3: const_ptr[ecs_type_info_t]) -> void
     cmp: fn(arg0: const_ptr[void], arg1: const_ptr[void], arg2: const_ptr[ecs_type_info_t]) -> int
     equals: fn(arg0: const_ptr[void], arg1: const_ptr[void], arg2: const_ptr[ecs_type_info_t]) -> bool
-    flags_: uint
+    flags: uint
     on_add: fn(arg0: ptr[ecs_iter_t]) -> void
     on_set: fn(arg0: ptr[ecs_iter_t]) -> void
     on_remove: fn(arg0: ptr[ecs_iter_t]) -> void
@@ -575,7 +575,7 @@ struct ecs_event_record_t:
     wildcard: ptr[ecs_event_id_record_t]
     wildcard_pair: ptr[ecs_event_id_record_t]
     event_ids: ecs_map_t
-    event_: ptr_uint
+    event: ptr_uint
 
 struct ecs_observable_t:
     on_add: ecs_event_record_t
@@ -720,7 +720,7 @@ struct ecs_table_records_t:
     count: int
 
 struct ecs_value_t:
-    type_: ptr_uint
+    type: ptr_uint
     ptr: ptr[void]
 
 struct ecs_entity_desc_t:
@@ -747,7 +747,7 @@ struct ecs_bulk_desc_t:
 struct ecs_component_desc_t:
     _canary: int
     entity: ptr_uint
-    type_: ecs_type_info_t
+    type: ecs_type_info_t
 
 struct ecs_iter_t:
     world: ptr[ecs_world_t]
@@ -769,7 +769,7 @@ struct ecs_iter_t:
     row_fields: uint
     up_fields: uint
     system: ptr_uint
-    event_: ptr_uint
+    event: ptr_uint
     event_id: ptr_uint
     event_cur: int
     field_count: byte
@@ -783,7 +783,7 @@ struct ecs_iter_t:
     delta_time: float
     delta_system_time: float
     frame_offset: int
-    flags_: uint
+    flags: uint
     interrupted_by: ptr_uint
     priv_: ecs_iter_private_t
     next: fn(arg0: ptr[ecs_iter_t]) -> bool
@@ -796,7 +796,7 @@ struct ecs_query_desc_t:
     terms: array[ecs_term_t, 32]
     expr: cstr
     cache_kind: ecs_query_cache_kind_t
-    flags_: uint
+    flags: uint
     order_by_callback: fn(arg0: ecs_entity_t, arg1: const_ptr[void], arg2: ecs_entity_t, arg3: const_ptr[void]) -> int
     order_by_table_callback: fn(arg0: ptr[ecs_world_t], arg1: ptr[ecs_table_t], arg2: ptr[ecs_entity_t], arg3: ptr[void], arg4: int, arg5: int, arg6: int, arg7: ecs_order_by_action_t) -> void
     order_by: ptr_uint
@@ -832,7 +832,7 @@ struct ecs_observer_desc_t:
     flags_: uint
 
 struct ecs_event_desc_t:
-    event_: ptr_uint
+    event: ptr_uint
     ids: const_ptr[ecs_type_t]
     table: ptr[ecs_table_t]
     other_table: ptr[ecs_table_t]
@@ -842,12 +842,12 @@ struct ecs_event_desc_t:
     param: ptr[void]
     const_param: const_ptr[void]
     observable: ptr[ecs_poly_t]
-    flags_: uint
+    flags: uint
 
 struct ecs_build_info_t:
     compiler: cstr
     addons: ptr[cstr]
-    flags_: ptr[cstr]
+    flags: ptr[cstr]
     version: cstr
     version_major: short
     version_minor: short
@@ -1690,7 +1690,7 @@ struct EcsAlertsActive:
 struct ecs_alert_severity_filter_t:
     severity: ptr_uint
     with: ptr_uint
-    var_: cstr
+    var: cstr
     _var_index: int
 
 struct ecs_alert_desc_t:
@@ -1705,7 +1705,7 @@ struct ecs_alert_desc_t:
     retain_period: float
     member: ptr_uint
     id: ptr_uint
-    var_: cstr
+    var: cstr
 
 external function ecs_alert_init(world: ptr[ecs_world_t], desc: const_ptr[ecs_alert_desc_t]) -> ecs_entity_t
 external function ecs_get_alert_count(world: const_ptr[ecs_world_t], entity: ptr_uint, alert: ptr_uint) -> int
@@ -1812,7 +1812,7 @@ struct EcsScript:
 
 struct ecs_function_ctx_t:
     world: ptr[ecs_world_t]
-    function_: ptr_uint
+    function: ptr_uint
     ctx: ptr[void]
 
 type ecs_function_callback_t = fn(arg0: const_ptr[ecs_function_ctx_t], arg1: int, arg2: const_ptr[ecs_value_t], arg3: ptr[ecs_value_t]) -> void
@@ -1820,7 +1820,7 @@ type ecs_vector_function_callback_t = fn(arg0: const_ptr[ecs_function_ctx_t], ar
 
 struct ecs_script_parameter_t:
     name: cstr
-    type_: ptr_uint
+    type: ptr_uint
 
 struct EcsScriptConstVar:
     value: ecs_value_t
@@ -1880,7 +1880,7 @@ struct ecs_expr_eval_desc_t:
     name: cstr
     expr: cstr
     vars: const_ptr[ecs_script_vars_t]
-    type_: ptr_uint
+    type: ptr_uint
     lookup_action: fn(arg0: const_ptr[ecs_world_t], arg1: cstr, arg2: ptr[void]) -> ecs_entity_t
     lookup_ctx: ptr[void]
     disable_folding: bool
@@ -1898,7 +1898,7 @@ external function ecs_script_string_interpolate(world: ptr[ecs_world_t], str_: c
 struct ecs_const_var_desc_t:
     name: cstr
     parent: ptr_uint
-    type_: ptr_uint
+    type: ptr_uint
     value: ptr[void]
 
 external function ecs_const_var_init(world: ptr[ecs_world_t], desc: ptr[ecs_const_var_desc_t]) -> ecs_entity_t
@@ -1999,7 +1999,7 @@ struct EcsPrimitive:
     kind: ecs_primitive_kind_t
 
 struct EcsMember:
-    type_: ptr_uint
+    type: ptr_uint
     count: int
     unit: ptr_uint
     offset: int
@@ -2016,7 +2016,7 @@ struct EcsMemberRanges:
 
 struct ecs_member_t:
     name: cstr
-    type_: ptr_uint
+    type: ptr_uint
     count: int
     offset: int
     unit: ptr_uint
@@ -2053,11 +2053,11 @@ struct EcsConstants:
     ordered_constants: ecs_vec_t
 
 struct EcsArray:
-    type_: ptr_uint
+    type: ptr_uint
     count: int
 
 struct EcsVector:
-    type_: ptr_uint
+    type: ptr_uint
 
 struct ecs_serializer_t:
     value: fn(arg0: const_ptr[ecs_serializer_t], arg1: ecs_entity_t, arg2: const_ptr[void]) -> int
@@ -2146,22 +2146,22 @@ struct ecs_meta_op_t:
     elem_size: int
     op_count: short
     member_index: short
-    type_: ptr_uint
+    type: ptr_uint
     type_info: const_ptr[ecs_type_info_t]
-    is_: ecs_meta_op_t_is
+    is: ecs_meta_op_t_is
 
 struct EcsTypeSerializer:
     kind: ecs_type_kind_t
     ops: ecs_vec_t
 
 struct ecs_meta_scope_t:
-    type_: ptr_uint
+    type: ptr_uint
     ops: ptr[ecs_meta_op_t]
     ops_count: short
     ops_cur: short
     prev_depth: short
     ptr: ptr[void]
-    opaque_: const_ptr[EcsOpaque]
+    opaque: const_ptr[EcsOpaque]
     members: ptr[ecs_hashmap_t]
     is_collection: bool
     is_empty_scope: bool
@@ -2237,14 +2237,14 @@ external function ecs_bitmask_init(world: ptr[ecs_world_t], desc: const_ptr[ecs_
 
 struct ecs_array_desc_t:
     entity: ptr_uint
-    type_: ptr_uint
+    type: ptr_uint
     count: int
 
 external function ecs_array_init(world: ptr[ecs_world_t], desc: const_ptr[ecs_array_desc_t]) -> ecs_entity_t
 
 struct ecs_vector_desc_t:
     entity: ptr_uint
-    type_: ptr_uint
+    type: ptr_uint
 
 external function ecs_vector_init(world: ptr[ecs_world_t], desc: const_ptr[ecs_vector_desc_t]) -> ecs_entity_t
 
@@ -2260,7 +2260,7 @@ external function ecs_struct_get_nth_member(world: ptr[ecs_world_t], type_: ptr_
 
 struct ecs_opaque_desc_t:
     entity: ptr_uint
-    type_: EcsOpaque
+    type: EcsOpaque
 
 external function ecs_opaque_init(world: ptr[ecs_world_t], desc: const_ptr[ecs_opaque_desc_t]) -> ecs_entity_t
 

data/std/c/libuv.mt

@@ -466,14 +466,14 @@ external function uv_err_name_r(err: int, buf: ptr[char], buflen: ptr_uint) -> p
 
 struct uv_req_s = c"uv_req_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
 
 external function uv_shutdown(req: ptr[uv_shutdown_t], handle: ptr[uv_stream_t], cb: fn(arg0: ptr[uv_shutdown_t], arg1: int) -> void) -> int
 
 struct uv_shutdown_s = c"uv_shutdown_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
     handle: ptr[uv_stream_t]
     cb: fn(arg0: ptr[uv_shutdown_t], arg1: int) -> void
@@ -481,12 +481,12 @@ struct uv_shutdown_s = c"uv_shutdown_t":
 struct uv_handle_s = c"uv_handle_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_handle_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
 
 external function uv_handle_size(type_: uv_handle_type) -> ptr_uint
 external function uv_handle_get_type(handle: const_ptr[uv_handle_t]) -> uv_handle_type
@@ -512,12 +512,12 @@ external function uv_socketpair(type_: int, protocol: int, socket_vector: ptr[uv
 struct uv_stream_s = c"uv_stream_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_stream_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     write_queue_size: ptr_uint
     alloc_cb: fn(arg0: ptr[uv_handle_t], arg1: ptr_uint, arg2: ptr[uv_buf_t]) -> void
     read_cb: fn(arg0: ptr[uv_stream_t], arg1: ptr_int, arg2: const_ptr[uv_buf_t]) -> void
@@ -543,7 +543,7 @@ external function uv_try_write2(handle: ptr[uv_stream_t], bufs: const_ptr[uv_buf
 
 struct uv_write_s = c"uv_write_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
     cb: fn(arg0: ptr[uv_write_t], arg1: int) -> void
     send_handle: ptr[uv_stream_t]
@@ -563,12 +563,12 @@ external function uv_is_closing(handle: const_ptr[uv_handle_t]) -> int
 struct uv_tcp_s = c"uv_tcp_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_tcp_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     write_queue_size: ptr_uint
     alloc_cb: fn(arg0: ptr[uv_handle_t], arg1: ptr_uint, arg2: ptr[uv_buf_t]) -> void
     read_cb: fn(arg0: ptr[uv_stream_t], arg1: ptr_int, arg2: const_ptr[uv_buf_t]) -> void
@@ -602,7 +602,7 @@ external function uv_tcp_connect(req: ptr[uv_connect_t], handle: ptr[uv_tcp_t],
 
 struct uv_connect_s = c"uv_connect_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
     cb: fn(arg0: ptr[uv_connect_t], arg1: int) -> void
     handle: ptr[uv_stream_t]
@@ -624,12 +624,12 @@ type uv_udp_recv_cb = fn(arg0: ptr[uv_udp_t], arg1: ptr_int, arg2: const_ptr[uv_
 struct uv_udp_s = c"uv_udp_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_udp_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     send_queue_size: ptr_uint
     send_queue_count: ptr_uint
     alloc_cb: fn(arg0: ptr[uv_handle_t], arg1: ptr_uint, arg2: ptr[uv_buf_t]) -> void
@@ -640,7 +640,7 @@ struct uv_udp_s = c"uv_udp_t":
 
 struct uv_udp_send_s = c"uv_udp_send_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
     handle: ptr[uv_udp_t]
     cb: fn(arg0: ptr[uv_udp_send_t], arg1: int) -> void
@@ -679,12 +679,12 @@ external function uv_udp_get_send_queue_count(handle: const_ptr[uv_udp_t]) -> pt
 struct uv_tty_s = c"uv_tty_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_tty_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     write_queue_size: ptr_uint
     alloc_cb: fn(arg0: ptr[uv_handle_t], arg1: ptr_uint, arg2: ptr[uv_buf_t]) -> void
     read_cb: fn(arg0: ptr[uv_stream_t], arg1: ptr_int, arg2: const_ptr[uv_buf_t]) -> void
@@ -721,12 +721,12 @@ external function uv_guess_handle(file: int) -> uv_handle_type
 struct uv_pipe_s = c"uv_pipe_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_pipe_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     write_queue_size: ptr_uint
     alloc_cb: fn(arg0: ptr[uv_handle_t], arg1: ptr_uint, arg2: ptr[uv_buf_t]) -> void
     read_cb: fn(arg0: ptr[uv_stream_t], arg1: ptr_int, arg2: const_ptr[uv_buf_t]) -> void
@@ -758,12 +758,12 @@ external function uv_pipe_chmod(handle: ptr[uv_pipe_t], flags_: int) -> int
 struct uv_poll_s = c"uv_poll_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_poll_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     poll_cb: fn(arg0: ptr[uv_poll_t], arg1: int, arg2: int) -> void
     io_watcher: uv__io_s
 
@@ -781,12 +781,12 @@ external function uv_poll_stop(handle: ptr[uv_poll_t]) -> int
 struct uv_prepare_s = c"uv_prepare_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_prepare_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     prepare_cb: fn(arg0: ptr[uv_prepare_t]) -> void
     queue: uv__queue
 
@@ -797,12 +797,12 @@ external function uv_prepare_stop(prepare: ptr[uv_prepare_t]) -> int
 struct uv_check_s = c"uv_check_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_check_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     check_cb: fn(arg0: ptr[uv_check_t]) -> void
     queue: uv__queue
 
@@ -813,12 +813,12 @@ external function uv_check_stop(check: ptr[uv_check_t]) -> int
 struct uv_idle_s = c"uv_idle_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_idle_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     idle_cb: fn(arg0: ptr[uv_idle_t]) -> void
     queue: uv__queue
 
@@ -829,12 +829,12 @@ external function uv_idle_stop(idle: ptr[uv_idle_t]) -> int
 struct uv_async_s = c"uv_async_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_async_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     async_cb: fn(arg0: ptr[uv_async_t]) -> void
     queue: uv__queue
     pending: int
@@ -845,12 +845,12 @@ external function uv_async_send(async_: ptr[uv_async_t]) -> int
 struct uv_timer_s = c"uv_timer_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_timer_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     timer_cb: fn(arg0: ptr[uv_timer_t]) -> void
     node: uv_timer_s_node
     timeout: ptr_uint
@@ -867,7 +867,7 @@ external function uv_timer_get_due_in(handle: const_ptr[uv_timer_t]) -> ulong
 
 struct uv_getaddrinfo_s = c"uv_getaddrinfo_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
     loop: ptr[uv_loop_t]
     work_req: uv__work
@@ -883,13 +883,13 @@ external function uv_freeaddrinfo(ai: ptr[addrinfo]?) -> void
 
 struct uv_getnameinfo_s = c"uv_getnameinfo_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
     loop: ptr[uv_loop_t]
     work_req: uv__work
     getnameinfo_cb: fn(arg0: ptr[uv_getnameinfo_t], arg1: int, arg2: cstr, arg3: cstr) -> void
     storage: sockaddr_storage
-    flags_: int
+    flags: int
     host: array[char, 1025]
     service: array[char, 32]
     retcode: int
@@ -907,7 +907,7 @@ flags uv_stdio_flags: int
     UV_OVERLAPPED_PIPE = 64
 
 struct uv_stdio_container_t:
-    flags_: uv_stdio_flags
+    flags: uv_stdio_flags
     data: uv_stdio_container_t_data
 
 struct uv_process_options_t:
@@ -916,7 +916,7 @@ struct uv_process_options_t:
     args: ptr[ptr[char]]
     env: ptr[ptr[char]]
     cwd: cstr
-    flags_: uint
+    flags: uint
     stdio_count: int
     stdio: ptr[uv_stdio_container_t]
     uid: uint
@@ -935,12 +935,12 @@ flags uv_process_flags: int
 struct uv_process_s = c"uv_process_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_process_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     exit_cb: fn(arg0: ptr[uv_process_t], arg1: long, arg2: int) -> void
     pid: int
     queue: uv__queue
@@ -953,7 +953,7 @@ external function uv_process_get_pid(arg0: const_ptr[uv_process_t]) -> uv_pid_t
 
 struct uv_work_s = c"uv_work_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
     loop: ptr[uv_loop_t]
     work_cb: fn(arg0: ptr[uv_work_t]) -> void
@@ -1023,7 +1023,7 @@ enum uv_dirent_type_t: int
 
 struct uv_dirent_s = c"uv_dirent_t":
     name: cstr
-    type_: uv_dirent_type_t
+    type: uv_dirent_type_t
 
 external function uv_setup_args(argc: int, argv: ptr[ptr[char]]) -> ptr[ptr[char]]
 external function uv_get_process_title(buffer: ptr[char], size: ptr_uint) -> int
@@ -1142,7 +1142,7 @@ struct uv_dir_s = c"uv_dir_t":
 
 struct uv_fs_s = c"uv_fs_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
     fs_type: uv_fs_type
     loop: ptr[uv_loop_t]?
@@ -1153,7 +1153,7 @@ struct uv_fs_s = c"uv_fs_t":
     statbuf: uv_stat_t
     new_path: cstr
     file: int
-    flags_: int
+    flags: int
     mode: uint
     nbufs: uint
     bufs: ptr[uv_buf_t]
@@ -1217,12 +1217,12 @@ flags uv_fs_event: int
 struct uv_fs_event_s = c"uv_fs_event_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_fs_event_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     path: ptr[char]
     cb: fn(arg0: ptr[uv_fs_event_t], arg1: cstr, arg2: int, arg3: int) -> void
     watchers: uv__queue
@@ -1231,12 +1231,12 @@ struct uv_fs_event_s = c"uv_fs_event_t":
 struct uv_fs_poll_s = c"uv_fs_poll_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_fs_poll_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     poll_ctx: ptr[void]
 
 external function uv_fs_poll_init(loop: ptr[uv_loop_t], handle: ptr[uv_fs_poll_t]) -> int
@@ -1247,12 +1247,12 @@ external function uv_fs_poll_getpath(handle: ptr[uv_fs_poll_t], buffer: ptr[char
 struct uv_signal_s = c"uv_signal_t":
     data: ptr[void]
     loop: ptr[uv_loop_t]
-    type_: uv_handle_type
+    type: uv_handle_type
     close_cb: fn(arg0: ptr[uv_handle_t]) -> void
     handle_queue: uv__queue
     u: uv_signal_s_u
     next_closing: ptr[uv_handle_t]
-    flags_: uint
+    flags: uint
     signal_cb: fn(arg0: ptr[uv_signal_t], arg1: int) -> void
     signum: int
     tree_entry: uv_signal_s_tree_entry
@@ -1284,7 +1284,7 @@ external function uv_inet_pton(af: int, src: cstr, dst: ptr[void]) -> int
 
 struct uv_random_s = c"uv_random_t":
     data: ptr[void]
-    type_: uv_req_type
+    type: uv_req_type
     reserved: array[ptr[void], 6]
     loop: ptr[uv_loop_t]
     status: int
@@ -1356,7 +1356,7 @@ flags uv_thread_create_flags: int
     UV_THREAD_HAS_STACK_SIZE = 1
 
 struct uv_thread_options_t:
-    flags_: uint
+    flags: uint
     stack_size: ptr_uint
 
 external function uv_thread_create_ex(tid: ptr[uv_thread_t], params: const_ptr[uv_thread_options_t], entry: fn(arg0: ptr[void]) -> void, arg: ptr[void]) -> int
@@ -1370,7 +1370,7 @@ external function uv_thread_setname(name: cstr) -> int
 external function uv_thread_getname(tid: ptr[uv_thread_t], name: ptr[char], size: ptr_uint) -> int
 
 union uv_any_handle = c"union uv_any_handle":
-    async_: uv_async_s
+    async: uv_async_s
     check: uv_check_s
     fs_event: uv_fs_event_s
     fs_poll: uv_fs_poll_s
@@ -1406,7 +1406,7 @@ struct uv_loop_s = c"uv_loop_t":
     active_reqs: uv_loop_s_active_reqs
     internal_fields: ptr[void]
     stop_flag: uint
-    flags_: ptr_uint
+    flags: ptr_uint
     backend_fd: int
     pending_queue: uv__queue
     watcher_queue: uv__queue