t-ruby 0.0.42 → 0.0.43

data/lib/t_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TRuby
-  VERSION = "0.0.42"
+  VERSION = "0.0.43"
 end

data/lib/t_ruby/watcher.rb

@@ -33,6 +33,7 @@ module TRuby
       @error_count = 0
       @file_count = 0
       @use_colors = $stdout.tty?
+      @file_diagnostics = {} # Cache diagnostics per file for incremental updates
 
       # Enhanced features
       @incremental = incremental
@@ -138,48 +139,27 @@ module TRuby
     def compile_all
       @error_count = 0
       @file_count = 0
-      errors = []
+      @file_diagnostics = {} # Reset diagnostics cache on full compile
 
       trb_files = find_trb_files
       rb_files = find_rb_files
       all_files = trb_files + rb_files
       @file_count = all_files.size
 
-      if @incremental && @cross_file_check
-        # Use enhanced incremental compiler with cross-file checking
-        result = @incremental_compiler.compile_all_with_checking(trb_files)
-        errors = result[:errors].map { |e| format_error(e[:file], e[:error] || e[:message]) }
-        @error_count = errors.size
-        @stats[:total_compilations] += trb_files.size
-
-        # Also compile .rb files
-        rb_files.each do |file|
-          result = compile_file(file)
-          errors.concat(result[:errors]) if result[:errors].any?
-        end
-      elsif @parallel && all_files.size > 1
-        # Parallel compilation
-        results = @parallel_processor.process_files(all_files) do |file|
-          compile_file(file)
-        end
-        results.each do |result|
-          errors.concat(result[:errors]) if result[:errors]&.any?
-        end
-      else
-        # Sequential compilation
-        all_files.each do |file|
-          result = compile_file(file)
-          errors.concat(result[:errors]) if result[:errors].any?
-        end
+      # Use unified compile_with_diagnostics for all files
+      # Note: compile_file increments @stats[:total_compilations] internally
+      all_files.each do |file|
+        result = compile_file(file)
+        # Cache diagnostics per file
+        @file_diagnostics[file] = result[:diagnostics] || []
       end
 
-      print_errors(errors)
+      all_diagnostics = @file_diagnostics.values.flatten
+      print_errors(all_diagnostics)
       print_summary
     end
 
     def compile_files_incremental(files)
-      @error_count = 0
-      errors = []
       compiled_count = 0
 
       if @incremental
@@ -187,7 +167,8 @@ module TRuby
           if @incremental_compiler.needs_compile?(file)
             @stats[:total_compilations] += 1
             result = compile_file_with_ir(file)
-            errors.concat(result[:errors]) if result[:errors].any?
+            # Update cached diagnostics for this file
+            @file_diagnostics[file] = result[:diagnostics] || []
             compiled_count += 1
           else
             @stats[:incremental_hits] += 1
@@ -199,56 +180,59 @@ module TRuby
         if @cross_file_check && @incremental_compiler.cross_file_checker
           check_result = @incremental_compiler.cross_file_checker.check_all
           check_result[:errors].each do |e|
-            errors << format_error(e[:file], e[:message])
+            # Add cross-file errors (these are not file-specific)
+            @file_diagnostics[:cross_file] ||= []
+            @file_diagnostics[:cross_file] << create_diagnostic_from_cross_file_error(e)
           end
         end
       else
         files.each do |file|
           result = compile_file(file)
-          errors.concat(result[:errors]) if result[:errors].any?
+          # Update cached diagnostics for this file
+          @file_diagnostics[file] = result[:diagnostics] || []
           compiled_count += 1
         end
       end
 
+      # Collect all diagnostics from cache (includes unchanged files' errors)
+      all_diagnostics = @file_diagnostics.values.flatten
+
+      # Update error count from all cached diagnostics
+      @error_count = all_diagnostics.size
+
       @file_count = compiled_count
-      print_errors(errors)
+      print_errors(all_diagnostics)
       print_summary
       print_watching_message
     end
 
     def compile_file_with_ir(file)
-      result = { file: file, errors: [], success: false }
+      # Use unified compile_with_diagnostics from Compiler (same as compile_file)
+      # This ensures incremental compile returns the same diagnostics as full compile
+      compile_result = @compiler.compile_with_diagnostics(file)
 
-      begin
-        @incremental_compiler.compile_with_ir(file)
-        result[:success] = true
-      rescue ArgumentError => e
-        @error_count += 1
-        result[:errors] << format_error(file, e.message)
-      rescue StandardError => e
-        @error_count += 1
-        result[:errors] << format_error(file, e.message)
-      end
+      # Update incremental compiler's file hash to track changes
+      @incremental_compiler&.update_file_hash(file)
 
-      result
+      {
+        file: file,
+        diagnostics: compile_result[:diagnostics],
+        success: compile_result[:success],
+      }
     end
 
     def compile_file(file)
-      result = { file: file, errors: [], success: false }
+      # Use unified compile_with_diagnostics from Compiler
+      compile_result = @compiler.compile_with_diagnostics(file)
 
-      begin
-        @compiler.compile(file)
-        result[:success] = true
-        @stats[:total_compilations] += 1
-      rescue ArgumentError => e
-        @error_count += 1
-        result[:errors] << format_error(file, e.message)
-      rescue StandardError => e
-        @error_count += 1
-        result[:errors] << format_error(file, e.message)
-      end
+      @error_count += compile_result[:diagnostics].size
+      @stats[:total_compilations] += 1
 
-      result
+      {
+        file: file,
+        diagnostics: compile_result[:diagnostics],
+        success: compile_result[:success],
+      }
     end
 
     def find_trb_files
@@ -284,9 +268,15 @@ module TRuby
       files.uniq
     end
 
-    def format_error(file, message)
-      # Parse error message for line/column info if available
-      # Format: file:line:col - error TRB0001: message
+    # Create a Diagnostic for cross-file check errors
+    def create_diagnostic_from_cross_file_error(error)
+      file = error[:file]
+      source = File.exist?(file) ? File.read(file) : nil
+      create_generic_diagnostic(file, error[:message], source)
+    end
+
+    # Create a generic Diagnostic for standard errors
+    def create_generic_diagnostic(file, message, source = nil)
       line = 1
       col = 1
 
@@ -295,23 +285,25 @@ module TRuby
         line = ::Regexp.last_match(1).to_i
       end
 
-      {
-        file: file,
-        line: line,
-        col: col,
+      source_line = source&.split("\n")&.at(line - 1)
+
+      Diagnostic.new(
+        code: "TR0001",
         message: message,
-      }
+        file: relative_path(file),
+        line: line,
+        column: col,
+        source_line: source_line
+      )
     end
 
-    def print_errors(errors)
-      errors.each do |error|
+    def print_errors(diagnostics)
+      return if diagnostics.empty?
+
+      formatter = DiagnosticFormatter.new(use_colors: @use_colors)
+      diagnostics.each do |diagnostic|
         puts
-        # TypeScript-style error format: file:line:col - error TSXXXX: message
-        location = "#{colorize(:cyan,
-                               relative_path(error[:file]))}:#{colorize(:yellow,
-                                                                        error[:line])}:#{colorize(:yellow,
-                                                                                                  error[:col])}"
-        puts "#{location} - #{colorize(:red, "error")} #{colorize(:gray, "TRB0001")}: #{error[:message]}"
+        puts formatter.format(diagnostic)
       end
     end
 

data/lib/t_ruby.rb

@@ -10,18 +10,21 @@ require_relative "t_ruby/config"
 require_relative "t_ruby/string_utils"
 require_relative "t_ruby/ir"
 require_relative "t_ruby/parser_combinator"
+require_relative "t_ruby/scanner"
 require_relative "t_ruby/smt_solver"
 
 # Basic components
 require_relative "t_ruby/type_alias_registry"
 require_relative "t_ruby/heredoc_detector"
-require_relative "t_ruby/body_parser"
 require_relative "t_ruby/parser"
 require_relative "t_ruby/union_type_parser"
 require_relative "t_ruby/generic_type_parser"
 require_relative "t_ruby/intersection_type_parser"
 require_relative "t_ruby/type_erasure"
 require_relative "t_ruby/error_handler"
+require_relative "t_ruby/diagnostic"
+require_relative "t_ruby/diagnostic_formatter"
+require_relative "t_ruby/error_reporter"
 require_relative "t_ruby/declaration_generator"
 require_relative "t_ruby/compiler"
 require_relative "t_ruby/lsp_server"
@@ -51,4 +54,15 @@ require_relative "t_ruby/docs_example_verifier"
 require_relative "t_ruby/docs_badge_generator"
 
 module TRuby
+  # Parse error for T-Ruby source code
+  class ParseError < StandardError
+    attr_reader :line, :column, :source
+
+    def initialize(message, line: nil, column: nil, source: nil)
+      @line = line
+      @column = column
+      @source = source
+      super(message)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - Y. Fred Kim
@@ -38,7 +38,6 @@ files:
 - lib/t_ruby.rb
 - lib/t_ruby/ast_type_inferrer.rb
 - lib/t_ruby/benchmark.rb
-- lib/t_ruby/body_parser.rb
 - lib/t_ruby/bundler_integration.rb
 - lib/t_ruby/cache.rb
 - lib/t_ruby/cli.rb
@@ -47,11 +46,14 @@ files:
 - lib/t_ruby/config.rb
 - lib/t_ruby/constraint_checker.rb
 - lib/t_ruby/declaration_generator.rb
+- lib/t_ruby/diagnostic.rb
+- lib/t_ruby/diagnostic_formatter.rb
 - lib/t_ruby/doc_generator.rb
 - lib/t_ruby/docs_badge_generator.rb
 - lib/t_ruby/docs_example_extractor.rb
 - lib/t_ruby/docs_example_verifier.rb
 - lib/t_ruby/error_handler.rb
+- lib/t_ruby/error_reporter.rb
 - lib/t_ruby/generic_type_parser.rb
 - lib/t_ruby/heredoc_detector.rb
 - lib/t_ruby/intersection_type_parser.rb
@@ -60,8 +62,55 @@ files:
 - lib/t_ruby/package_manager.rb
 - lib/t_ruby/parser.rb
 - lib/t_ruby/parser_combinator.rb
+- lib/t_ruby/parser_combinator/combinators/alternative.rb
+- lib/t_ruby/parser_combinator/combinators/chain_left.rb
+- lib/t_ruby/parser_combinator/combinators/choice.rb
+- lib/t_ruby/parser_combinator/combinators/flat_map.rb
+- lib/t_ruby/parser_combinator/combinators/label.rb
+- lib/t_ruby/parser_combinator/combinators/lookahead.rb
+- lib/t_ruby/parser_combinator/combinators/many.rb
+- lib/t_ruby/parser_combinator/combinators/many1.rb
+- lib/t_ruby/parser_combinator/combinators/map.rb
+- lib/t_ruby/parser_combinator/combinators/not_followed_by.rb
+- lib/t_ruby/parser_combinator/combinators/optional.rb
+- lib/t_ruby/parser_combinator/combinators/sep_by.rb
+- lib/t_ruby/parser_combinator/combinators/sep_by1.rb
+- lib/t_ruby/parser_combinator/combinators/sequence.rb
+- lib/t_ruby/parser_combinator/combinators/skip_right.rb
+- lib/t_ruby/parser_combinator/declaration_parser.rb
+- lib/t_ruby/parser_combinator/dsl.rb
+- lib/t_ruby/parser_combinator/parse_error.rb
+- lib/t_ruby/parser_combinator/parse_result.rb
+- lib/t_ruby/parser_combinator/parser.rb
+- lib/t_ruby/parser_combinator/primitives/end_of_input.rb
+- lib/t_ruby/parser_combinator/primitives/fail.rb
+- lib/t_ruby/parser_combinator/primitives/lazy.rb
+- lib/t_ruby/parser_combinator/primitives/literal.rb
+- lib/t_ruby/parser_combinator/primitives/pure.rb
+- lib/t_ruby/parser_combinator/primitives/regex.rb
+- lib/t_ruby/parser_combinator/primitives/satisfy.rb
+- lib/t_ruby/parser_combinator/token/expression_parser.rb
+- lib/t_ruby/parser_combinator/token/statement_parser.rb
+- lib/t_ruby/parser_combinator/token/token_alternative.rb
+- lib/t_ruby/parser_combinator/token/token_body_parser.rb
+- lib/t_ruby/parser_combinator/token/token_declaration_parser.rb
+- lib/t_ruby/parser_combinator/token/token_dsl.rb
+- lib/t_ruby/parser_combinator/token/token_label.rb
+- lib/t_ruby/parser_combinator/token/token_many.rb
+- lib/t_ruby/parser_combinator/token/token_many1.rb
+- lib/t_ruby/parser_combinator/token/token_map.rb
+- lib/t_ruby/parser_combinator/token/token_matcher.rb
+- lib/t_ruby/parser_combinator/token/token_optional.rb
+- lib/t_ruby/parser_combinator/token/token_parse_result.rb
+- lib/t_ruby/parser_combinator/token/token_parser.rb
+- lib/t_ruby/parser_combinator/token/token_sep_by.rb
+- lib/t_ruby/parser_combinator/token/token_sep_by1.rb
+- lib/t_ruby/parser_combinator/token/token_sequence.rb
+- lib/t_ruby/parser_combinator/token/token_skip_right.rb
+- lib/t_ruby/parser_combinator/type_parser.rb
 - lib/t_ruby/ruby_version.rb
 - lib/t_ruby/runtime_validator.rb
+- lib/t_ruby/scanner.rb
 - lib/t_ruby/smt_solver.rb
 - lib/t_ruby/string_utils.rb
 - lib/t_ruby/type_alias_registry.rb