mt-lang 0.3.25 → 0.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f58e86ded14f2bb125795f1fb69dcc8b8cdf9efabefd16b0cadcea79abfa3e1c
-  data.tar.gz: a12aa6d13c9b6984dad4490ee2fca6f2fab650a1230db8d8316c35e5a731c17b
+  metadata.gz: 95066d5ccb69388c431a7b4b963853211c3ef57d8e776de1f8468ecdc983899b
+  data.tar.gz: 83a55caa84c9d54eda5b104727ce0ee4615b4780270d14d0cea4d2001b2fe9fd
 SHA512:
-  metadata.gz: 91f27e591ae0a185e9e6b8cc1a7d7b947bf75a36c9e032273f6651c362e9a925c633df2df1d85965ed17557a62786e344e6f470640d7f2865457a9f28664d5bc
-  data.tar.gz: 6e61277967b9a06ce34f13b84ca5597318f2ebfd7143d1d697ef9eb67db7a6f027e3a53597b827e77e04b18720a65272aa13eb6a03efad78d715fa608913a992
+  metadata.gz: a6e8f3cf4ed18ec8cd2bdbfbb8ee458f7662546619f31c55bb00123d22bb9150888e405a692cbeea9c67b10bad2e3c82c621efae9992223e1d0c9bd51281f0a2
+  data.tar.gz: 7cb61c0021e8864897a5b23077dadf54586bf11b11a546ec9b19cbb59083dce4c60d7c8bd996c39380d1a80ea266a364008a1a3f2e3fba7f362ad57c2d97c1d0

data/lib/milk_tea/base.rb

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

data/lib/milk_tea/core/lowering/utils.rb

@@ -1099,10 +1099,9 @@ module MilkTea
 
       def c_local_name(name)
         return "value" unless name
-        identifier = sanitize_identifier(name)
-        return "#{identifier}_" if c_reserved_identifier?(identifier)
+        return "#{name}_" if c_reserved_identifier?(name)
 
-        identifier
+        name
       end
 
       def c_reserved_identifier?(identifier)

data/lib/milk_tea/tooling/cli/commands/bindgen.rb

@@ -4,7 +4,7 @@ module MilkTea
   class CLI
     module CommandBindgen
       def bindgen_command
-        BindgenCLI.start(@argv, out: @out, err: @err, help_printer: method(:print_bindgen_help))
+        BindgenCLI.start(@argv, out: @out, err: @err, help_printer: ->(io) { print_subcommand_help("bindgen", io) })
       end
     end
   end

data/lib/milk_tea/tooling/cli/commands/check.rb

@@ -19,10 +19,10 @@ module MilkTea
 
         resolution = extract_resolution_flags!
         input_paths = @argv.dup
-        return 1 unless ensure_known_source_operands!("check", input_paths)
+        return 1 unless validate_source_operands("check", input_paths)
 
         paths = expand_source_paths(input_paths)
-        return 0 if print_no_source_files_if_empty(paths, input_paths)
+        return 0 if warn_if_no_source_files(paths, input_paths)
 
         ensure_current_lockfiles!(paths) if resolution[:frozen]
 
@@ -38,12 +38,12 @@ module MilkTea
             diagnostics.each do |d|
               same_file = !d.respond_to?(:path) || d.path.nil? || File.expand_path(d.path) == main_abs
               source = same_file ? main_source : nil
-              @err.puts(ErrorFormatter.format(d, source:, color: error_color?(@err)))
+              @err.puts(ErrorFormatter.format(d, source:, color: use_color?(@err)))
             end
             closure_errors.each do |d|
               same_file = !d.respond_to?(:path) || d.path.nil? || File.expand_path(d.path) == main_abs
               source = same_file ? main_source : nil
-              @err.puts(ErrorFormatter.format(d, source:, color: error_color?(@err)))
+              @err.puts(ErrorFormatter.format(d, source:, color: use_color?(@err)))
             end
             all_diagnostics.concat(diagnostics)
             all_diagnostics.concat(closure_errors)
@@ -74,7 +74,7 @@ module MilkTea
       end
 
       def check_single_reporting_all(path, locked: false)
-        loader = make_module_loader(path, locked:, platform: ModuleLoader.default_host_platform)
+        loader = create_module_loader(path, locked:, platform: ModuleLoader.default_host_platform)
         resolved_path = File.expand_path(path)
 
         result = loader.check_program_collecting(path)

data/lib/milk_tea/tooling/cli/commands/debug.rb

@@ -12,7 +12,7 @@ module MilkTea
 
         resolution = extract_resolution_flags!
         input_paths = @argv.dup
-        return 1 unless ensure_known_source_operands!("debug", input_paths)
+        return 1 unless validate_source_operands("debug", input_paths)
 
         path = expand_source_paths(input_paths).first
         unless path
@@ -37,7 +37,7 @@ module MilkTea
 
         if ast && parse_errors.empty?
           begin
-            loader = make_module_loader(path, locked: resolution[:locked], platform: ModuleLoader.default_host_platform)
+            loader = create_module_loader(path, locked: resolution[:locked], platform: ModuleLoader.default_host_platform)
             loader_ast = loader.load_file(resolved_path)
 
             import_result = loader.send(:imported_modules_for_ast_collecting_errors, loader_ast, importer_path: resolved_path)
@@ -69,7 +69,7 @@ module MilkTea
         @out.puts(text)
         0
       rescue MilkTea::LexError => e
-        @err.puts(ErrorFormatter.format(e, color: error_color?(@err)))
+        @err.puts(ErrorFormatter.format(e, color: use_color?(@err)))
         1
       end
     end

data/lib/milk_tea/tooling/cli/commands/deps.rb

@@ -8,7 +8,7 @@ module MilkTea
           @argv,
           out: @out,
           err: @err,
-          help_printer: method(:print_deps_help),
+          help_printer: ->(io) { print_subcommand_help("deps", io) },
           services: package_services,
         )
       end

data/lib/milk_tea/tooling/cli/commands/emit_c.rb

@@ -19,7 +19,7 @@ module MilkTea
 
         resolution = extract_resolution_flags!
         input_paths = @argv.dup
-        return 1 unless ensure_known_source_operands!("emit-c", input_paths)
+        return 1 unless validate_source_operands("emit-c", input_paths)
 
         program_paths = input_paths.map { |p| resolve_program_path(p) }
         return 1 if program_paths.include?(nil)
@@ -28,7 +28,7 @@ module MilkTea
 
         multiple = program_paths.length > 1
         program_paths.each_with_index do |path, index|
-          program = make_module_loader(path, locked: resolution[:locked], platform: ModuleLoader.default_host_platform).check_program(path)
+          program = create_module_loader(path, locked: resolution[:locked], platform: ModuleLoader.default_host_platform).check_program(path)
           if multiple
             @out.puts("/* --- #{path} --- */")
           end

data/lib/milk_tea/tooling/cli/commands/format.rb

@@ -17,7 +17,7 @@ module MilkTea
         end
 
         paths = expand_source_paths(input_paths)
-        return 0 if print_no_source_files_if_empty(paths, input_paths)
+        return 0 if warn_if_no_source_files(paths, input_paths)
 
         multiple_sources = input_paths.length > 1 || input_paths.any? { |path| File.directory?(path) }
         if multiple_sources
@@ -39,7 +39,7 @@ module MilkTea
         elapsed_ms = start_time ? ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) * 1000.0).round(1) : nil
 
         rc = if options[:check]
-          announce_file_action(path, "format-check")
+          log_action(path, "format-check")
           if result.changed
             info("needs formatting #{path}")
             1
@@ -48,7 +48,7 @@ module MilkTea
             0
           end
         elsif options[:write]
-          announce_file_action(path, "format-write")
+          log_action(path, "format-write")
           if result.changed
             File.write(path, result.formatted_source)
             info("formatted #{path}")
@@ -70,7 +70,7 @@ module MilkTea
         if options[:check]
           needs_fmt = []
           paths.each do |p|
-            announce_file_action(p, "format-check")
+            log_action(p, "format-check")
             format_profile = options[:profile] ? Linter::Profile.new : nil
             start_time = options[:profile] ? Process.clock_gettime(Process::CLOCK_MONOTONIC) : nil
             result = Formatter.check_source(read_source_file(p), path: p, mode: options[:mode], max_line_length: options[:max_line_length], profile: format_profile)
@@ -91,7 +91,7 @@ module MilkTea
         # --write
         changed = 0
         paths.each do |p|
-          announce_file_action(p, "format-write")
+          log_action(p, "format-write")
           format_profile = options[:profile] ? Linter::Profile.new : nil
           start_time = options[:profile] ? Process.clock_gettime(Process::CLOCK_MONOTONIC) : nil
           result = Formatter.check_source(read_source_file(p), path: p, mode: options[:mode], max_line_length: options[:max_line_length], profile: format_profile)
@@ -136,7 +136,7 @@ module MilkTea
               options[:mode] = :tidy
             when "--max-line-length"
               value = @argv.shift
-              return missing_option_value(option) unless value
+              return reject_missing_option_value(option) unless value
 
               line_length = Integer(value, exception: false)
               unless line_length && line_length.positive?

data/lib/milk_tea/tooling/cli/commands/lint.rb

@@ -91,7 +91,7 @@ module MilkTea
         if fix
           lint_profiles = []
           paths.each do |p|
-            announce_file_action(p, "lint-fix")
+            log_action(p, "lint-fix")
             source = read_source_file(p)
             if ignore_generated && generated_source?(source)
               @out.puts("ignored generated #{p}")
@@ -124,7 +124,7 @@ module MilkTea
 
         lint_profiles = []
         all_warnings = paths.flat_map do |p|
-          announce_file_action(p, "lint")
+          log_action(p, "lint")
           source = read_source_file(p)
           next [] if ignore_generated && generated_source?(source)
 
@@ -238,7 +238,7 @@ module MilkTea
 
       def lint_sema_facts_for(source, path, locked: false)
         ast = Parser.parse(source, path: path)
-        imported_modules = make_module_loader(path, locked:, platform: ModuleLoader.default_host_platform).imported_modules_for_ast(ast, importer_path: path)
+        imported_modules = create_module_loader(path, locked:, platform: ModuleLoader.default_host_platform).imported_modules_for_ast(ast, importer_path: path)
         SemanticAnalyzer.tooling_snapshot(ast, imported_modules: imported_modules, path: path).facts
       rescue MilkTea::LexError, MilkTea::ParseError, SemanticError, ModuleLoadError
         nil

data/lib/milk_tea/tooling/cli/commands/lower.rb

@@ -24,16 +24,16 @@ module MilkTea
 
         resolution = extract_resolution_flags!
         input_paths = @argv.dup
-        return 1 unless ensure_known_source_operands!("lower", input_paths)
+        return 1 unless validate_source_operands("lower", input_paths)
 
         paths = expand_source_paths(input_paths)
-        return 0 if print_no_source_files_if_empty(paths, input_paths)
+        return 0 if warn_if_no_source_files(paths, input_paths)
 
         ensure_current_lockfiles!(paths) if resolution[:frozen]
 
         multiple = paths.length > 1
         paths.each_with_index do |path, index|
-          program = make_module_loader(path, locked: resolution[:locked], platform: ModuleLoader.default_host_platform).check_program(path)
+          program = create_module_loader(path, locked: resolution[:locked], platform: ModuleLoader.default_host_platform).check_program(path)
           if multiple
             @out.puts("# --- #{path} ---") unless sexpr
           end

data/lib/milk_tea/tooling/cli/commands/parse.rb

@@ -24,16 +24,16 @@ module MilkTea
 
         resolution = extract_resolution_flags!
         input_paths = @argv.dup
-        return 1 unless ensure_known_source_operands!("parse", input_paths)
+        return 1 unless validate_source_operands("parse", input_paths)
 
         paths = expand_source_paths(input_paths)
-        return 0 if print_no_source_files_if_empty(paths, input_paths)
+        return 0 if warn_if_no_source_files(paths, input_paths)
 
         ensure_current_lockfiles!(paths) if resolution[:frozen]
 
         multiple = paths.length > 1
         paths.each_with_index do |path, index|
-          ast = make_module_loader(path, locked: resolution[:locked], platform: ModuleLoader.default_host_platform).load_file(path)
+          ast = create_module_loader(path, locked: resolution[:locked], platform: ModuleLoader.default_host_platform).load_file(path)
           if multiple
             @out.puts("# --- #{path} ---") unless sexpr
           end

data/lib/milk_tea/tooling/cli/commands/test.rb

@@ -263,7 +263,7 @@ module MilkTea
           .select { |diagnostic| !diagnostic.respond_to?(:severity) || diagnostic.severity == :error }
           .map { |diagnostic| ErrorFormatter.format(diagnostic, color: false) }
       rescue StandardError => e
-        raise unless handled_cli_error?(e)
+        raise unless known_cli_error?(e)
 
         [ErrorFormatter.format(e, color: false)]
       end
@@ -271,10 +271,10 @@ module MilkTea
       def run_test_file_guarded(file, options:, locked:)
         run_test_file(file, options:, locked:)
       rescue StandardError => e
-        raise unless handled_cli_error?(e)
+        raise unless known_cli_error?(e)
 
         @err.puts("FAILED - #{file} (build error)")
-        @err.puts(ErrorFormatter.format(e, color: error_color?(@err)))
+        @err.puts(ErrorFormatter.format(e, color: use_color?(@err)))
         1
       end
 

data/lib/milk_tea/tooling/cli/commands/toolchain.rb

@@ -8,7 +8,7 @@ module MilkTea
           @argv,
           out: @out,
           err: @err,
-          help_printer: method(:print_toolchain_help),
+          help_printer: ->(io) { print_subcommand_help("toolchain", io) },
         )
       end
     end

data/lib/milk_tea/tooling/cli.rb

@@ -140,9 +140,9 @@ module MilkTea
         1
       end
     rescue StandardError => e
-      raise unless handled_cli_error?(e)
+      raise unless known_cli_error?(e)
 
-      @err.puts(ErrorFormatter.format(e, color: error_color?(@err)))
+      @err.puts(ErrorFormatter.format(e, color: use_color?(@err)))
       1
     end
 
@@ -231,13 +231,13 @@ module MilkTea
           i += 1
         when "--color"
           value = @argv[i + 1]
-          return invalid_color(value) unless valid_color?(value)
+          return reject_invalid_color(value) unless valid_color?(value)
 
           @color = value.to_sym
           i += 2
         when /\A--color=(.*)\z/
           value = ::Regexp.last_match(1)
-          return invalid_color(value) unless valid_color?(value)
+          return reject_invalid_color(value) unless valid_color?(value)
 
           @color = value.to_sym
           i += 1
@@ -254,12 +254,12 @@ module MilkTea
       %w[auto always never].include?(value)
     end
 
-    def invalid_color(value)
+    def reject_invalid_color(value)
       @err.puts("--color must be auto, always, or never#{value ? " (got #{value})" : ''}")
       false
     end
 
-    def error_color?(io)
+    def use_color?(io)
       case @color
       when :always then true
       when :never then false
@@ -296,27 +296,27 @@ module MilkTea
         case option
         when "-o", "--output"
           value = @argv.shift
-          return missing_option_value(option) unless value
+          return reject_missing_option_value(option) unless value
 
           options[:output_path] = value
         when "--cc"
           value = @argv.shift
-          return missing_option_value(option) unless value
+          return reject_missing_option_value(option) unless value
 
           options[:cc] = value
         when "--keep-c"
           value = @argv.shift
-          return missing_option_value(option) unless value
+          return reject_missing_option_value(option) unless value
 
           options[:keep_c_path] = value
         when "--profile"
           value = @argv.shift
-          return missing_option_value(option) unless value
+          return reject_missing_option_value(option) unless value
 
           options[:profile] = value
         when "--platform"
           value = @argv.shift
-          return missing_option_value(option) unless value
+          return reject_missing_option_value(option) unless value
 
           options[:platform] = value
         when "--bundle"
@@ -339,7 +339,7 @@ module MilkTea
           options[:timings] = true
         when "--kind"
           value = @argv.shift
-          return missing_option_value(option) unless value
+          return reject_missing_option_value(option) unless value
 
           options[:kind] = case value
                            when "executable", "exe", "bin" then :executable
@@ -375,7 +375,7 @@ module MilkTea
       options
     end
 
-    def ensure_known_source_operands!(command, operands)
+    def validate_source_operands(command, operands)
       return true unless operands.any? { |arg| arg.start_with?("-") }
 
       @err.puts("unexpected argument(s) for #{command}: #{operands.join(' ')}")
@@ -393,7 +393,7 @@ module MilkTea
       end.uniq
     end
 
-    def print_no_source_files_if_empty(paths, input_paths)
+    def warn_if_no_source_files(paths, input_paths)
       return false unless paths.empty?
 
       label = input_paths.length == 1 ? input_paths.first : input_paths.join(", ")
@@ -401,17 +401,17 @@ module MilkTea
       true
     end
 
-    def missing_option_value(option)
+    def reject_missing_option_value(option)
       @err.puts("missing value for #{option}")
       print_usage(@err)
       nil
     end
 
-    def handled_cli_error?(error)
-      handled_error_classes.any? { |klass| error.is_a?(klass) }
+    def known_cli_error?(error)
+      known_error_classes.any? { |klass| error.is_a?(klass) }
     end
 
-    def handled_error_classes
+    def known_error_classes
       classes = [LexError, ParseError, ModuleLoadError, SemanticError, LoweringError, CBackendError, BuildError, RunError, FormatterError, PackageManifestError, PackageManifestEditorError, PackageGraphError, PackageLockError, PackageSourceResolverError, PackageSourceFetcherError, PackageRegistryStoreError, PackageRegistryMetadataProviderError, PackageDependencySolverError, PackageVersionError, ProjectScaffoldError]
       classes << BindgenError if MilkTea.const_defined?(:BindgenError, false)
       classes << UpstreamSources::Error if MilkTea.const_defined?(:UpstreamSources, false)
@@ -438,13 +438,13 @@ module MilkTea
       "lint-fix" => "fixing",
     }.freeze
 
-    def announce_file_action(path, action)
+    def log_action(path, action)
       return unless @verbose
 
       @out.puts("#{ACTION_LABELS.fetch(action, action)} #{path}")
     end
 
-    def make_module_loader(path = nil, locked: false, platform: nil)
+    def create_module_loader(path = nil, locked: false, platform: nil)
       ModuleLoader.new(module_roots: module_roots_for(path, locked:), package_graph: package_graph_for(path, locked:), source_overrides: @source_overrides, platform:)
     end
 
@@ -858,20 +858,8 @@ module MilkTea
       end
     end
 
-    def print_toolchain_help(io)
-      print_command_help("toolchain", io)
-    end
-
-    def print_deps_help(io)
-      print_command_help("deps", io)
-    end
-
-    def print_bindgen_help(io)
-      print_command_help("bindgen", io)
-    end
-
-    def print_cache_help(io)
-      print_command_help("cache", io)
+    def print_subcommand_help(subcommand, io)
+      print_command_help(subcommand, io)
     end
 
     def print_usage(io)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mt-lang
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.3.26
 platform: ruby
 authors:
 - Long (Teefan) Tran
@@ -624,7 +624,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.25 installed!
+  Milk Tea 0.3.26 installed!
 
   System requirements:
     - A C compiler (gcc or clang) must be available on PATH