crystal i

spec/compiler/semantic/primitives_spec.cr

@@ -212,18 +212,6 @@ describe "Semantic: primitives" do
       "expected Primitive argument to be a symbol literal"
   end
 
-  it "errors if @[Primitive] method has body" do
-    assert_error %(
-      struct Int32
-        @[Primitive(:binary)]
-        def +(other : Int32) : Int32
-          1
-        end
-      end
-      ),
-      "method marked as Primitive must have an empty body"
-  end
-
   pending_win32 "types va_arg primitive" do
     assert_type(%(
       struct VaList

src/compiler/crystal/codegen/llvm_id.cr

@@ -30,12 +30,17 @@ module Crystal
 
     def initialize(program)
       @ids = {} of Type => {Int32, Int32}
+      @id_to_type = {} of Int32 => Type
       @id_to_metaclass = {} of Int32 => Int32
       @next_id = 0
       assign_id(program.object)
       assign_id_to_metaclass(program.object)
     end
 
+    def type_from_id(id : Int32)
+      @id_to_type[id]
+    end
+
     def type_id(type : TypeDefType)
       type_id(type.typedef)
     end
@@ -156,6 +161,7 @@ module Crystal
     end
 
     private def put_id(type, min, max)
+      @id_to_type[max] = type
       @ids[type] = {min, max}
     end
 

src/compiler/crystal/codegen/llvm_typer.cr

@@ -362,7 +362,7 @@ module Crystal
     end
 
     private def create_llvm_struct_type(type : Type, wants_size)
-      raise "BUG: called llvm_struct_type for #{type}"
+      raise "BUG: called llvm_struct_type for #{type} (#{type.class})"
     end
 
     def llvm_embedded_type(type, wants_size = false)

src/compiler/crystal/command.cr

@@ -21,7 +21,9 @@ class Crystal::Command
         docs                     generate documentation
         env                      print Crystal environment information
         eval                     eval code from args or standard input
+        i/interactive            starts interactive Crystal
         play                     starts Crystal playground server
+        repl                     launch a repl
         run (default)            build and run program
         spec                     build and run specs (in spec directory)
         tool                     run a tool
@@ -64,7 +66,7 @@ class Crystal::Command
     when !command
       puts USAGE
       exit
-    when "init".starts_with?(command)
+    when command == "init"
       options.shift
       init
     when "build".starts_with?(command)
@@ -95,7 +97,10 @@ class Crystal::Command
       options.shift
       use_crystal_opts
       eval
-    when "run".starts_with?(command)
+    when command == "i" || command == "interactive"
+      options.shift
+      repl
+    when command == "run"
       options.shift
       use_crystal_opts
       run_command(single_file: false)

src/compiler/crystal/command/repl.cr

@@ -0,0 +1,48 @@
+# Implementation of the `crystal repl` command
+
+class Crystal::Command
+  private def repl
+    decompile = false
+    trace = false
+    stats = false
+
+    OptionParser.parse(options) do |opts|
+      opts.banner = "Usage: crystal repl [options] [files]\n\nOptions:"
+
+      opts.on("-d", "--decompile", "Show decompilation") do
+        decompile = true
+      end
+
+      opts.on("-s", "--status", "Show time taken to execute") do
+        stats = true
+      end
+
+      opts.on("-t", "--trace", "Trace execution") do
+        trace = true
+      end
+
+      opts.on("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+    end
+
+    repl = Repl.new(
+      decompile: decompile,
+      decompile_defs: false,
+      trace: trace,
+      stats: stats,
+    )
+
+    if options.empty?
+      repl.run
+    else
+      filename = options.shift
+      unless File.file?(filename)
+        error "File '#{filename}' doesn't exist"
+      end
+
+      repl.run_file(filename, options)
+    end
+  end
+end

src/compiler/crystal/repl/c.cr

@@ -0,0 +1,109 @@
+require "../types"
+require "./value"
+require "./repl"
+
+module Crystal
+  class Type
+    def ffi_type
+      raise "BUG: missing ffi_type for #{self} (#{self.class})"
+    end
+  end
+
+  class IntegerType
+    def ffi_type
+      case kind
+      when :i8  then FFI::Type.sint8
+      when :u8  then FFI::Type.uint8
+      when :i16 then FFI::Type.sint16
+      when :u16 then FFI::Type.uint16
+      when :i32 then FFI::Type.sint32
+      when :u32 then FFI::Type.uint32
+      when :i64 then FFI::Type.sint64
+      when :u64 then FFI::Type.uint64
+      when :f32 then FFI::Type.float
+      when :f64 then FFI::Type.double
+      else
+        raise "BUG: missing ffi_type for #{self} (#{self.class})"
+      end
+    end
+  end
+
+  class FloatType
+    def ffi_type
+      case kind
+      when :f32 then FFI::Type.float
+      when :f64 then FFI::Type.double
+      else
+        raise "BUG: missing ffi_type for #{self} (#{self.class})"
+      end
+    end
+  end
+
+  class EnumType
+    def ffi_type
+      base_type.ffi_type
+    end
+  end
+
+  class PointerInstanceType
+    def ffi_type
+      FFI::Type.pointer
+    end
+  end
+
+  class ProcInstanceType
+    def ffi_type
+      FFI::Type.pointer
+    end
+
+    def ffi_call_interface
+      FFI::CallInterface.new(
+        abi: FFI::ABI::DEFAULT,
+        args: arg_types.map(&.ffi_type),
+        return_type: return_type.ffi_type,
+      )
+    end
+  end
+
+  class NilType
+    def ffi_type
+      # Nil is used to pass a null pointer
+      FFI::Type.pointer
+    end
+  end
+
+  class NoReturnType
+    def ffi_type
+      FFI::Type.void
+    end
+  end
+
+  class TypeDefType
+    def ffi_type
+      typedef.ffi_type
+    end
+  end
+
+  class NonGenericClassType
+    def ffi_type
+      FFI::Type.struct(all_instance_vars.map do |name, var|
+        var.type.ffi_type
+      end)
+    end
+  end
+
+  class StaticArrayInstanceType
+    def ffi_type
+      element_ffi_type = element_type.ffi_type
+      FFI::Type.struct(
+        Array.new(size.as(NumberLiteral).value.to_i, element_ffi_type)
+      )
+    end
+  end
+end
+
+struct Crystal::Repl::Value
+  def ffi_value(pointer : Pointer(Void)) : Nil
+    pointer.as(Void**).value = @pointer
+  end
+end