mt-lang 0.3.31 → 0.3.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16833c6b95c7e580f12199a381802f47ac628b7252f4bc1647714098cbd4f824
-  data.tar.gz: 296b0547096ceee9d394edc13df6f042e2b8ed6d42c98b4745e1b39885407b85
+  metadata.gz: 0210a7132e7230d11f390c51bf60c7ff5a19b0d7716737b3ed5ac89b4a773842
+  data.tar.gz: 54d1170e9f9630b6747062b2ee8d285cb3b8cb83f5399469ba3b7908f81ad654
 SHA512:
-  metadata.gz: '080aa9b4ad981dce767373642fe8c81fef77bf4b4c364b60e2b5dc633e7e1a2f593187ebcc3903a15aebec587bd6989a844dfd8fd842fb8b61fc855a5ba9ce86'
-  data.tar.gz: b9c60e1298c8fb8195401875f3d77358965741c1537cb674696d71ca1b5ef8f8ce5289d7a4e3491bbca24bd485481d6fd65df531a975237c08da888539c30b9e
+  metadata.gz: 2ca666aaa8bceb581fbe3a54c315127a3dbe3bb1a7a122027d9af44f96c3095d352d3f10f65f3e4d31b4992bca017eca600e7216c16a9a71ec81f1d0fb8091a7
+  data.tar.gz: 6d143563d49aae6636133feaa6bac2b0bee00e468d972c48db3d665692624341f4d5cbbe880fe9ba91aa0aec7da0c253df1facc5d4c405ddcd44778e67ca7ca9

data/lib/milk_tea/base.rb

@@ -3,7 +3,7 @@
 require "pathname"
 
 module MilkTea
-  VERSION = "0.3.31"
+  VERSION = "0.3.32"
 
   def self.root
     @root ||= Pathname.new(File.expand_path("../..", __dir__))

data/lib/milk_tea/bindings/bindgen/emitter.rb

@@ -76,19 +76,12 @@ module MilkTea
           fields = Array(node["inner"]).select { |child| child["kind"] == "FieldDecl" }
           fields.each do |field|
             field_type = aggregate_field_type(field, owner_name: name, aggregate_node: node)
-            mt_name, = bindgen_field_name(emitted_name(aggregate_field_name(field, aggregate_node: node)))
+            mt_name = emitted_name(aggregate_field_name(field, aggregate_node: node))
             lines << "    #{mt_name}: #{field_type}"
           end
           lines
         end
 
-        def bindgen_field_name(name)
-          name = emitted_name(name)
-          return [name, nil] unless Token::KEYWORDS.key?(name)
-
-          ["#{name}_", nil]
-        end
-
         def bindgen_param_name(name)
           name = emitted_name(name)
           return [name, nil] unless generated_binding_name_conflict?(name)

data/lib/milk_tea/core/lexer.rb

@@ -324,7 +324,7 @@ module MilkTea
       newline_start = line_offset + line.length
       newline_end = has_newline ? (newline_start + 1) : newline_start
       if @grouping_depth.zero?
-        if Token::LINE_CONTINUATION_OPERATORS.include?(@tokens.last&.type)
+        if Token::LINE_CONTINUATION_OPERATORS.include?(@tokens.last&.type) && !trailing_is_member_access?
           @continuation_pending = true
         else
           @tokens << build_token(:newline, "\n", nil, line_number, line.length + 1, start_offset: newline_start, end_offset: newline_end)
@@ -345,6 +345,10 @@ module MilkTea
       1
     end
 
+    def trailing_is_member_access?
+      @tokens.last&.type == :is && @tokens[-2]&.type == :dot
+    end
+
     def emit_newline(line, line_number, line_offset, has_newline)
       newline_start = line_offset + line.bytesize
       newline_end = has_newline ? (newline_start + 1) : newline_start

data/lib/milk_tea/core/parser/declarations.rb

@@ -454,7 +454,7 @@ module MilkTea
         match(:async)
         match(:editable) if check(:editable)
         match(:static) if check(:static)
-        result = check(:function)
+        result = check(:function) && !check_next(:colon)
         @current = saved
         result
       end
@@ -468,11 +468,13 @@ module MilkTea
 
         visibility, visibility_token = parse_visibility
 
-        if match(:event)
+        if check(:event) && !check_next(:colon)
+          advance
           return [:event, parse_event_decl(visibility:, attributes: field_attributes)]
         end
 
-        if match(:struct)
+        if check(:struct) && !check_next(:colon)
+          advance
           return [:nested_type, parse_struct_decl(visibility:, attributes: field_attributes, inline_methods: false)]
         end
 
@@ -741,7 +743,10 @@ module MilkTea
       end
 
       def parse_visibility
-        return [:public, previous] if match(:public)
+        if check(:public) && !check_next(:colon)
+          advance
+          return [:public, previous]
+        end
 
         [:private, nil]
       end

data/std/c/box2d.mt

@@ -424,7 +424,7 @@ enum b2BodyType: int
     b2_bodyTypeCount = 3
 
 struct b2BodyDef:
-    type_: b2BodyType
+    type: b2BodyType
     position: b2Vec2
     rotation: b2Rot
     linearVelocity: b2Vec2

data/std/c/cgltf.mt

@@ -44,7 +44,7 @@ struct cgltf_file_options:
     user_data: ptr[void]
 
 struct cgltf_options:
-    type_: cgltf_file_type
+    type: cgltf_file_type
     json_token_count: ptr_uint
     memory: cgltf_memory_options
     file: cgltf_file_options
@@ -186,7 +186,7 @@ struct cgltf_buffer_view:
     offset: ptr_uint
     size: ptr_uint
     stride: ptr_uint
-    type_: cgltf_buffer_view_type
+    type: cgltf_buffer_view_type
     data: ptr[void]
     has_meshopt_compression: int
     meshopt_compression: cgltf_meshopt_compression
@@ -206,7 +206,7 @@ struct cgltf_accessor:
     name: ptr[char]
     component_type: cgltf_component_type
     normalized: int
-    type_: cgltf_type
+    type: cgltf_type
     offset: ptr_uint
     count: ptr_uint
     stride: ptr_uint
@@ -223,7 +223,7 @@ struct cgltf_accessor:
 
 struct cgltf_attribute:
     name: ptr[char]
-    type_: cgltf_attribute_type
+    type: cgltf_attribute_type
     index: int
     data: ptr[cgltf_accessor]
 
@@ -398,7 +398,7 @@ struct cgltf_material:
     extensions: ptr[cgltf_extension]
 
 struct cgltf_material_mapping:
-    variant_: ptr_uint
+    variant: ptr_uint
     material: ptr[cgltf_material]
     extras: cgltf_extras
 
@@ -416,7 +416,7 @@ struct cgltf_mesh_gpu_instancing:
     attributes_count: ptr_uint
 
 struct cgltf_primitive:
-    type_: cgltf_primitive_type
+    type: cgltf_primitive_type
     indices: ptr[cgltf_accessor]
     material: ptr[cgltf_material]
     attributes: ptr[cgltf_attribute]
@@ -471,7 +471,7 @@ struct cgltf_camera_orthographic:
 
 struct cgltf_camera:
     name: ptr[char]
-    type_: cgltf_camera_type
+    type: cgltf_camera_type
     data: cgltf_camera_data
     extras: cgltf_extras
     extensions_count: ptr_uint
@@ -481,7 +481,7 @@ struct cgltf_light:
     name: ptr[char]
     color: array[cgltf_float, 3]
     intensity: float
-    type_: cgltf_light_type
+    type: cgltf_light_type
     range: float
     spot_inner_cone_angle: float
     spot_outer_cone_angle: float

data/std/c/cjson.mt

@@ -8,7 +8,7 @@ struct cJSON:
     next: ptr[cJSON]
     prev: ptr[cJSON]
     child: ptr[cJSON]
-    type_: int
+    type: int
     valuestring: ptr[char]
     valueint: int
     valuedouble: double

data/std/c/curl.mt

@@ -29,7 +29,7 @@ struct curl_header = c"struct curl_header":
 
 struct curl_ws_frame = c"struct curl_ws_frame":
     age: int
-    flags_: int
+    flags: int
     offset: ptr_int
     bytesleft: ptr_int
     len: ptr_uint
@@ -69,7 +69,7 @@ struct curl_httppost = c"struct curl_httppost":
     contenttype: ptr[char]
     contentheader: ptr[curl_slist]
     more: ptr[curl_httppost]
-    flags_: ptr_int
+    flags: ptr_int
     showfilename: ptr[char]
     userp: ptr[void]
     contentlen: ptr_int
@@ -100,7 +100,7 @@ struct curl_fileinfo = c"struct curl_fileinfo":
     size: ptr_int
     hardlinks: ptr_int
     strings: curl_fileinfo_strings
-    flags_: uint
+    flags: uint
     b_data: ptr[char]
     b_size: ptr_uint
     b_used: ptr_uint
@@ -1069,8 +1069,8 @@ external function curl_url_strerror(error: int) -> cstr
 struct curl_easyoption = c"struct curl_easyoption":
     name: cstr
     id: CURLoption
-    type_: int
-    flags_: uint
+    type: int
+    flags: uint
 
 external function curl_easy_option_by_name(name: cstr) -> const_ptr[curl_easyoption]
 external function curl_easy_option_by_id(id: CURLoption) -> const_ptr[curl_easyoption]

data/std/c/enet.mt

@@ -213,7 +213,7 @@ type ENetPacketFreeCallback = fn(arg0: ptr[ENetPacket]) -> void
 
 struct ENetPacket:
     referenceCount: ptr_uint
-    flags_: uint
+    flags: uint
     data: ptr[enet_uint8]
     dataLength: ptr_uint
     freeCallback: fn(arg0: ptr[ENetPacket]) -> void
@@ -327,7 +327,7 @@ struct ENetPeer:
     outgoingSendReliableCommands: ENetList
     outgoingCommands: ENetList
     dispatchedCommands: ENetList
-    flags_: ushort
+    flags: ushort
     reserved: ushort
     incomingUnsequencedGroup: ushort
     outgoingUnsequencedGroup: ushort
@@ -389,7 +389,7 @@ enum ENetEventType: int
     ENET_EVENT_TYPE_RECEIVE = 3
 
 struct ENetEvent:
-    type_: ENetEventType
+    type: ENetEventType
     peer: ptr[ENetPeer]
     channelID: ubyte
     data: uint

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