mt-lang 0.3.27 → 0.3.28

data/lib/milk_tea/base.rb

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

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

@@ -369,7 +369,7 @@ module MilkTea
         AST::AttributeDecl.new(name: name_token.lexeme, targets:, params:, visibility:, line:, column: name_token.column)
       end
 
-      def parse_struct_decl(packed: false, alignment: nil, visibility: :private, attributes: [])
+      def parse_struct_decl(packed: false, alignment: nil, visibility: :private, attributes: [], inline_methods: true)
         line = previous.line
         name_token = consume_name("expected struct name")
         name = name_token.lexeme
@@ -377,13 +377,32 @@ module MilkTea
         implements = parse_implements_clause
         c_name = parse_optional_c_name
         packed, alignment = parse_struct_layout_attributes(attributes) if attributes.any?
-        members = parse_recoverable_block do
-          parse_struct_member
+        receiver_type_param_names = type_params.map(&:name)
+        members = with_type_param_names(receiver_type_param_names) do
+          parse_recoverable_block do
+            parse_struct_member
+          end
         end
         fields = members.filter_map { |kind, member| member if kind == :field }
         events = members.filter_map { |kind, member| member if kind == :event }
         nested_types = members.filter_map { |kind, member| member if kind == :nested_type }
-        AST::StructDecl.new(name:, type_params:, implements:, c_name:, fields:, events:, nested_types:, attributes:, packed:, alignment:, visibility:, lifetime_params:, line:, column: name_token.column)
+        methods = members.filter_map { |kind, member| member if kind == :method }
+        struct_decl = AST::StructDecl.new(name:, type_params:, implements:, c_name:, fields:, events:, nested_types:, attributes:, packed:, alignment:, visibility:, lifetime_params:, line:, column: name_token.column)
+
+        if inline_methods && methods.any?
+          type_ref_args = type_params.map do |tp|
+            AST::TypeArgument.new(
+              value: AST::TypeRef.new(name: AST::QualifiedName.new(parts: [tp.name]), arguments: [], nullable: false, line: tp.line, column: tp.column),
+              line: tp.line,
+              column: tp.column,
+            )
+          end
+          type_ref = AST::TypeRef.new(name: AST::QualifiedName.new(parts: [name]), arguments: type_ref_args, nullable: false, line: name_token.line, column: name_token.column)
+          extending_block = AST::ExtendingBlock.new(type_name: type_ref, methods:, line: name_token.line, column: name_token.column)
+          [struct_decl, extending_block]
+        else
+          struct_decl
+        end
       end
 
       def parse_struct_decl_params
@@ -429,8 +448,24 @@ module MilkTea
         [lifetime_params, type_params]
       end
 
+      def check_method_start?
+        saved = @current
+        match(:public)
+        match(:async)
+        match(:editable) if check(:editable)
+        match(:static) if check(:static)
+        result = check(:function)
+        @current = saved
+        result
+      end
+
       def parse_struct_member
         field_attributes = parse_attribute_applications
+
+        if check_method_start?
+          return [:method, parse_method_def(attributes: field_attributes)]
+        end
+
         visibility, visibility_token = parse_visibility
 
         if match(:event)
@@ -438,7 +473,7 @@ module MilkTea
         end
 
         if match(:struct)
-          return [:nested_type, parse_struct_decl(visibility:, attributes: field_attributes)]
+          return [:nested_type, parse_struct_decl(visibility:, attributes: field_attributes, inline_methods: false)]
         end
 
         raise error(visibility_token, "public is only allowed on struct events") if visibility == :public

data/lib/milk_tea/core/parser.rb

@@ -154,13 +154,23 @@ module MilkTea
       until eof?
         if errors
           begin
-            declarations << parse_declaration
+            result = parse_declaration
+            if result.is_a?(Array)
+              declarations.concat(result)
+            else
+              declarations << result
+            end
           rescue ParseError => e
             errors << e
             synchronize_to_top_level_boundary
           end
         else
-          declarations << parse_declaration
+          result = parse_declaration
+          if result.is_a?(Array)
+            declarations.concat(result)
+          else
+            declarations << result
+          end
         end
         skip_newlines
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mt-lang
 version: !ruby/object:Gem::Version
-  version: 0.3.27
+  version: 0.3.28
 platform: ruby
 authors:
 - Long (Teefan) Tran
@@ -149,9 +149,7 @@ files:
 - docs/index.html
 - docs/language-design.md
 - docs/language-manual.md
-- docs/self-host-contract.md
-- docs/self-host-plan.md
-- docs/self-host-progress.md
+- docs/self-hosted-compiler-plan.md
 - lib/milk_tea.rb
 - lib/milk_tea/base.rb
 - lib/milk_tea/bindings.rb
@@ -627,7 +625,7 @@ metadata:
   homepage_uri: https://teefan.github.io/mt-lang/
   source_code_uri: https://github.com/teefan/mt-lang
 post_install_message: |
-  Milk Tea 0.3.27 installed!
+  Milk Tea 0.3.28 installed!
 
   System requirements:
     - A C compiler (gcc or clang) must be available on PATH