carbon-core 0.1.1 → 0.2.0

data/lib/carbon/tacky/builder.rb

@@ -288,12 +288,9 @@ module Carbon
         _call(:_null, type)
       end
 
-      def typeof(value)
-        _call(:_typeof, value)
-      end
-
-      def mcall(mod, name, *params)
-        _call(:_mcall, mod, name, *params)
+      def deref(type)
+        fail
+        _call(:_deref, type)
       end
 
       # Creates an instruction, and returns a reference to that instruction.

data/lib/carbon/tacky/context.rb

@@ -41,13 +41,11 @@ module Carbon
       # @return [Concrete::Build]
       attr_reader :build
 
-      # (see Concrete::Build#types)
-      attr_reader :types
-      def_delegator :@build, :types
+      # (see Concrete::Build#items)
+      attr_reader :items
+      def_delegator :@build, :items
 
-      # (see Concrete::Build#functions)
-      attr_reader :functions
-      def_delegator :@build, :functions
+      def_delegator :@build, :fetch
 
       # Returns the function that this is being built for.
       #
@@ -68,10 +66,6 @@ module Carbon
         @params = []
         freeze
       end
-
-      def find(name)
-        name.function? ? functions.fetch(name).last : types.fetch(name).last
-      end
     end
   end
 end

data/lib/carbon/tacky/function.rb

@@ -10,30 +10,6 @@ module Carbon
     #
     # @api semiprivate
     class Function
-      # A mutable counter for giving out instruction ids.  This makes it so
-      # that _all_ instruction ids are unique for every function.
-      #
-      # @api private
-      class Counter
-        # The value.
-        # @return [::Numeric]
-        attr_reader :value
-
-        # Initialize the counter.
-        #
-        # @param value [::Numeric] The initial value of the counter.
-        def initialize(value = 0)
-          @value = value
-        end
-
-        # Increments the counter by one, and returns the new value.
-        #
-        # @return [::Numeric]
-        def increment
-          @value += 1
-        end
-      end
-
       # The basic blocks of the function.  The first block is expected to be
       # the entry block; the rest can be in any order.
       #

data/lib/carbon/tacky/instruction.rb

@@ -1,8 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
-#
+
 require "carbon/tacky/instruction/generation"
-require "carbon/tacky/instruction/typeof"
 
 module Carbon
   module Tacky
@@ -10,7 +9,6 @@ module Carbon
     # structures.  Each instruction performs some sort of action.
     class Instruction < Value
       include Instruction::Generation
-      include Instruction::Typeof
       # Instructions that can be represented by this class that can have a
       # name parameter.
       #
@@ -66,9 +64,8 @@ module Carbon
       def call(context, block)
         case @instruction
         when "_null"   then generate_null(context, block)
-        when "_mcall"  then generate_mcall(context, block)
         when "_sizeof" then generate_sizeof(context, block)
-        when "_typeof" then generate_typeof(context, block)
+        when "_deref"  then generate_deref(context, block)
         else generate_normal(context, block)
         end
       end

data/lib/carbon/tacky/instruction/generation.rb

@@ -3,10 +3,9 @@
 
 module Carbon
   module Tacky
-    class Instruction  < Value
+    class Instruction < Value
       # Generation logic for instructions.
       module Generation
-
       private
 
         # Generates a "normal" instruction.  It maps the parameters, then sends
@@ -18,7 +17,7 @@ module Carbon
         # @return [::LLVM::Value] The result of the llvm instruction.
         def generate_normal(context, block)
           params = mapped_parameters(context)
-          value = nil
+          value = :_
 
           block.build { |b| value = b.public_send(@instruction, *params) }
           value
@@ -26,64 +25,43 @@ module Carbon
 
         def generate_null(context, _block)
           params = mapped_parameters(context)
-          context.find(params.first).null
+          params.first.null
         end
 
         def generate_sizeof(context, _block)
           params = mapped_parameters(context)
-          context.find(params.first).size
-        end
-
-        def generate_typeof(context, block)
-          context.find(typeof_value(@parameters.first, context))
-        end
-
-        # [Concrete::Type, String | Symbol, *Value]
-        def generate_mcall(context, block)
-          mod, name = @parameters[0..1]
-          types = @parameters[2..-1].map { |p| typeof_value(p, context) }
-          fname = mod.call(name, types)
-          item, func = context.functions.fetch(fname)
-          params = @parameters[2..-1].map { |p| mapped_parameter(p, context) }
-          result = nil
-
-          block.build { |b| result = b.call(func, *params) }
-          context.type(result, item.return)
+          params.first.size
         end
 
-        # [Value, String | Symbol, *Value]
-        def generate_ucall(context, block)
-          mod = typeof_value(@parameters[0], context, block)
-          name = @parameters[1]
-          types = @parameters[2..-1].map { |p| typeof_value(p, context) }
-          fname = mod.call(name, [mod, *types])
-          item, func = context.functions.fetch(fname)
-          params = [@parameters[0], *@parameters[2..-1]]
-            .map { |p| mapped_parameter(p, context) }
-          result = nil
-
-          block.build { |b| result = b.call(func, params) }
-          concrete.type(result, item.return)
+        def generate_deref(context, _block)
+          mapped_parameter(@parameters.first, context).element_type
         end
 
         def mapped_parameters(context)
           @parameters.map { |p| mapped_parameter(p, context) }
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
+        def typeof_value(value, context)
+          case value
+          when Concrete::Type
+            value.sub(context.generics)
+          when Tacky::Typed, Tacky::Parameter
+            value.type.sub(context.generics)
+          else fail ArgumentError, "Cannot typeof #{value.class}"
+          end
+        end
+
         def mapped_parameter(param, context)
           case param
-          when Concrete::Type   then context.find(param)
+          when Concrete::Type
+            context.fetch(param.sub(context.generics)).last
           when Tacky::Reference then context.instructions.fetch(param.id)
           when Tacky::Parameter then context.params.fetch(param.value)
           when Tacky::Typed     then mapped_parameter(param.value, context)
-          when ::Integer then LLVM.Int(param)
-          when ::Float then LLVM.Float(param)
-          when ::String then param
+          when ::Integer, ::Float, ::String, ::LLVM::Value then param
           else fail ArgumentError, "Unexpected parameter #{param.class}"
           end
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
       end
     end
   end

data/lib/carbon/tacky/value.rb

@@ -4,8 +4,6 @@
 module Carbon
   module Tacky
     # A "value."  A value can be a parameter, a reference, or a number.
-    #
-    # @todo TODO: Figure out if I still need this.
     class Value
       # The name of the value.  This can be set in order to make the resulting
       # LLVM IR pretty.

data/lib/carbon/version.rb

@@ -5,5 +5,5 @@ module Carbon
   # The version of Carbon.
   #
   # @return [::String]
-  VERSION = "0.1.1".freeze
+  VERSION = "0.2.0".freeze
 end

data/scripts/test.rb

@@ -9,11 +9,9 @@ require "pry"
 require "pry/rescue"
 require "carbon"
 
-Pry.rescue do
-  index = Carbon::Core.finalize
-  add = index.fetch("Carbon::UInt32.+(Carbon::UInt32, Carbon::Int32)")
-  build = Carbon::Concrete::Build.new(index.build(add), index)
+index = Carbon::Core.finalize
+add = index.fetch("Carbon::UInt32.+(Carbon::UInt32, Carbon::Int32)")
+build = Carbon::Concrete::Build.new(index.build(add), index)
 
-  build.call
-  puts build.module
-end
+build.call
+puts build.module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carbon-core
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -119,6 +120,8 @@ files:
 - lib/carbon/concrete/index.rb
 - lib/carbon/concrete/item.rb
 - lib/carbon/concrete/item/base.rb
+- lib/carbon/concrete/item/class.rb
+- lib/carbon/concrete/item/class/element.rb
 - lib/carbon/concrete/item/data.rb
 - lib/carbon/concrete/item/function.rb
 - lib/carbon/concrete/item/internal.rb
@@ -144,21 +147,23 @@ files:
 - lib/carbon/core/integer/sign.rb
 - lib/carbon/core/integer/type.rb
 - lib/carbon/core/integer/zero.rb
+- lib/carbon/core/main.rb
 - lib/carbon/core/pointer.rb
 - lib/carbon/core/pointer/access.rb
 - lib/carbon/core/pointer/cast.rb
 - lib/carbon/core/pointer/math.rb
 - lib/carbon/core/pointer/memory.rb
 - lib/carbon/core/pointer/type.rb
+- lib/carbon/core/void.rb
+- lib/carbon/counter.rb
+- lib/carbon/errors.rb
 - lib/carbon/tacky.rb
 - lib/carbon/tacky/block.rb
 - lib/carbon/tacky/builder.rb
 - lib/carbon/tacky/context.rb
 - lib/carbon/tacky/function.rb
 - lib/carbon/tacky/instruction.rb
-- lib/carbon/tacky/instruction/dependencies.rb
 - lib/carbon/tacky/instruction/generation.rb
-- lib/carbon/tacky/instruction/typeof.rb
 - lib/carbon/tacky/parameter.rb
 - lib/carbon/tacky/reference.rb
 - lib/carbon/tacky/typed.rb

data/lib/carbon/tacky/instruction/dependencies.rb

@@ -1,33 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module Carbon
-  module Tacky
-    class Instruction < Value
-      module Dependencies
-        def dependencies
-          case @instruction
-          when "_mcall"  then dependencies_mcall
-          when "_ucall"  then dependencies_ucall
-          when "_typeof" then dependencies_typeof
-          else dependencies_normal
-          end
-        end
-
-      private
-
-        def dependencies_mcall
-          deps = Set.new
-          mod = @parameters[0]
-          types = @parameters[2..-1].map { }
-          @function = mod.call(@parameters[1])
-          deps << @parameters[0]
-        end
-
-        def dependencies_normal
-          @parameters.select { |p| p.is_a?(Concrete::Type) }.inject(Set.new, :<<)
-        end
-      end
-    end
-  end
-end

data/lib/carbon/tacky/instruction/typeof.rb

@@ -1,25 +0,0 @@
-# encoding: utf-8
-# frozen_string_literal: true
-
-module Carbon
-  module Tacky
-    class Instruction < Value
-      module Typeof
-        # rubocop:disable Metrics/CyclomaticComplexity
-        def typeof_value(value, context)
-          case value
-          when Concrete::Type   then value
-          when Tacky::Reference then fail NotImplementedError
-          when Tacky::Parameter then context.function.params[value.value].type
-          when Tacky::Typed     then value.type
-          when ::Integer        then Carbon::Type("Carbon::Int32")
-          when ::Float          then Carbon::Type("Carbon::Float")
-          when ::String         then Carbon::Type("Carbon::String")
-          else fail ArgumentError, "Cannot typeof #{value.class}"
-          end
-        end
-        # rubocop:enable Metrics/CyclomaticComplexity
-      end
-    end
-  end
-end