carbon-core 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df956cb1d06f05220b2f44f38aac8279b6238d3a
-  data.tar.gz: fd88b72d02ccd3d2706e750c43c061a4572196c9
+  metadata.gz: d19855dccc09339b3aab63ae8189dd7d2c8be42d
+  data.tar.gz: e83a47d93719cea99bc46e972ee5cc2be8d23ab9
 SHA512:
-  metadata.gz: 71426b13ade11afea88c848cb15b4cbabea156b5162c516f1f53d96a57d02b8a4dd56754d522d53f7826891c3f229084e735287895ce89c61b0336945962c82b
-  data.tar.gz: be6a57e2bbf58f024b808cb4f530e55d99221e8c8fd9a614bce8d6069edba375ff8368f28203c3095c3a7113ddd7f63d3bdf322cf904ff443fa80c001c568e23
+  metadata.gz: d167ad893b767cbe85fbece99c690f71b824c3847070122c162bb64559ccbc567ebd4c7ebdb4596c3a211f069cfe14caf8e60428f328736c2eaae631ebd5a1b0
+  data.tar.gz: d01280b2758d932ded3fb9399f009fbaa968ae115cbf69b415a2aaadb59926f809f96105cf876fbec474aa131ed814a5cc7d6fdccb1e1dc748b02fc936257bde

data/.gitignore

@@ -7,7 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-/core.rb
 /prof/
-/scripts/
+/.vagrant/
 *.clib

data/Vagrantfile

@@ -0,0 +1,83 @@
+# encoding: utf-8
+# frozen_string_literal: true
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "terrywang/archlinux"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 3000, host: 3000
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  config.vm.provider "virtualbox" do |vb|
+    # Display the VirtualBox GUI when booting the machine
+    # vb.gui = true
+
+    # Customize the amount of memory on the VM:
+    vb.memory = "1024"
+  end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   sudo apt-get update
+  #   sudo apt-get install -y apache2
+  # SHELL
+
+  config.vm.provision "shell", inline: <<-SHELL
+    sudo pacman --noconfirm -Syyu git fish base-devel libyaml openssl zlib llvm35
+    sudo usermod -s /usr/bin/fish vagrant
+  SHELL
+
+  config.vm.provision "shell", privileged: false, name: "ruby", inline: <<-SHELL
+    mkdir -p ~/.config/fish
+    echo "set -x PATH ~/.gem/ruby/2.3.0/bin \\\$PATH" >> ~/.config/fish/config.fish
+  SHELL
+end

data/carbon.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_dependency "base58", "~> 0.1"
-  spec.add_dependency "msgpack", "~> 1.0"
+  spec.add_dependency "oj", "~> 2.17"
   spec.add_dependency "ice_nine", "~> 0.11"
 end

data/lib/carbon.rb

@@ -9,8 +9,6 @@ require "concurrent"
 require "llvm"
 require "llvm/core"
 require "carbon/version"
-require "carbon/tacky"
-require "carbon/concrete"
 
 # Carbon.  The language.
 module Carbon
@@ -44,11 +42,14 @@ module Carbon
     encoded.scan(/.{1,9}/).join("-").freeze
   end
 
+  require "carbon/concrete"
+
   # A Boolean type for Carbon.  This is used as a handy shortcut.
   #
   # @api private
   # @return [Carbon::Concrete::Type]
   Boolean = Carbon::Type("Carbon::Boolean")
 
+  require "carbon/tacky"
   require "carbon/core"
 end

data/lib/carbon/concrete/build.rb

@@ -20,7 +20,7 @@ module Carbon
       # The functions that have been defined.  This is a mapping of the
       # {Concrete::Type} to the `LLVM::Function` that was defined.
       #
-      # @return [{Concrete::Type => ::LLVM::Function}]
+      # @return [{Concrete::Type => (Concrete::Item, ::LLVM::Function)}]
       attr_reader :functions
 
       # The LLVM module that is being used for compilation.

data/lib/carbon/concrete/index.rb

@@ -37,8 +37,8 @@ module Carbon
       #   on the index.  See {#id}.
       def initialize(data = {})
         @items = Concurrent::Hash.new.merge(data.fetch(:items, {}))
-        @mutex = Mutex.new
         @id = data.fetch(:id) { id }
+        mutex
       end
 
       # @overload fetch(name, default = CANARY)
@@ -71,7 +71,7 @@ module Carbon
       #   @raise [KeyError] If the key doesn't match an item and neither a
       #     block nor the second argument were passed.
       def fetch(*options, &block)
-        @mutex.synchronize { @items.fetch(*options, &block) }
+        mutex.synchronize { @items.fetch(*options, &block) }
       end
 
       # @overload [](key)
@@ -87,7 +87,7 @@ module Carbon
       #   @return [::Object] The item, if it exists;
       #   @return [nil] Otherwise.
       def [](*options)
-        @mutex.synchronize { @items[*options] }
+        mutex.synchronize { @items[*options] }
       end
 
       # @overload key?(key)
@@ -102,7 +102,7 @@ module Carbon
       #   @param key [::Object] The key of the item to check.
       #   @return [::Boolean] Whether the key exists or not.
       def key?(*options)
-        @mutex.synchronize { @items.key?(*options) }
+        mutex.synchronize { @items.key?(*options) }
       end
 
       # Returns all of the keys in the index.  The keys and the array itself
@@ -113,7 +113,7 @@ module Carbon
       #   index.keys # => ["Carbon::Boolean", "Carbon::Integer"]
       # @return [<::String>] The keys in the index.
       def keys
-        @mutex.synchronize { @items.keys.deep_freeze! }
+        mutex.synchronize { @items.keys.deep_freeze! }
       end
 
       # Returns all of the values (actual items) in the index.  The items, and
@@ -124,7 +124,7 @@ module Carbon
       #   index.values.map(&:class) # => [Carbon::Concrete::Item::Internal, ...]
       # @return [<Item::Base>] The values in the index.
       def values
-        @mutex.synchornize { @items.values.freeze }
+        mutex.synchornize { @items.values.freeze }
       end
 
       # The digest of the ID.  This uses the SHA256 base58 digest of the items
@@ -149,7 +149,7 @@ module Carbon
       #     # => {"Carbon::Integer" => #<Carbon::Concrete::Item::Base>}
       # @return [{::String => Item::Base}] The items of the index.
       def items
-        @mutex.synchronize { @items.dup.deep_freeze! }
+        mutex.synchronize { @items.dup.deep_freeze! }
       end
 
       # Adds a defined item to the index.  The item just has to respond to
@@ -173,7 +173,7 @@ module Carbon
       # @return [self]
       def add(item)
         return merge(item) if item.is_a?(Index)
-        @mutex.synchronize do
+        mutex.synchronize do
           @items[item.intern] = item
           clear!
         end
@@ -192,12 +192,32 @@ module Carbon
       # @param index [Index] The index to merge.
       # @return [self]
       def merge(index)
-        @mutex.synchronize do
+        mutex.synchronize do
           @items.merge(index.items)
           clear!
         end
       end
 
+      # Finalizes the index.  This should only be used when all of the items
+      # defined on the index are defined.  For libraries, this is the
+      # culmination of everything in the library.
+      #
+      # @note
+      #   This freezes the item list for the index.  This prevents modification
+      #   for this instance of the index.
+      # @return [self]
+      def finalize
+        mutex.synchronize do
+          items = @items.map do |key, value|
+            [key, value.define(self)]
+          end.to_h
+
+          @items = items.freeze
+        end
+
+        self
+      end
+
       # Used only for {#define}.  This maps item "names" to the classes that
       # represent them.
       #
@@ -269,7 +289,7 @@ module Carbon
       # @yield [dep] Multiple times, each with a dependency.
       # @yieldparam dep [Request] A request.
       def build(item)
-        @mutex.lock
+        mutex.lock
         fail ArgumentError, "Passed item cannot be generic" if \
           item.generics.any?
         return to_enum(:build, item) unless block_given?
@@ -277,11 +297,15 @@ module Carbon
 
         build_from_request(request, &Proc.new)
       ensure
-        @mutex.unlock
+        mutex.unlock
       end
 
     private
 
+      def mutex
+        @_mutex ||= ::Mutex.new
+      end
+
       # rubocop:disable Metrics/MethodLength
       def build_from_request(request)
         components = to_enum(:each_strongly_connected_component_from, request)
@@ -289,10 +313,10 @@ module Carbon
           fail TSort::Cyclic, "cyclic dependencies: #{group.join(', ')}" if \
             group.size > 1
           begin
-            @mutex.unlock
+            mutex.unlock
             yield group.first
           ensure
-            @mutex.lock
+            mutex.lock
           end
         end
       end

data/lib/carbon/concrete/item/base.rb

@@ -117,6 +117,17 @@ module Carbon
           fail NotImplementedError, "Could not build #{self.class}"
         end
 
+        # Performs modification to the item.  This is done after _all_ items
+        # are loaded into the index, so that an item can load outside
+        # information if need be.
+        #
+        # @param index [Concrete::Index] The index.
+        # @return [Concrete::Item::Base] A modified version of the item, or
+        #   self.
+        def define(index)
+          self
+        end
+
         # Modifies the dependencies of this item so that they conform to the
         # given request.  This should resolve all of our dependencies so that
         # they no longer hold any sort of generic class.

data/lib/carbon/concrete/item/function.rb

@@ -21,6 +21,9 @@ module Carbon
       #   attributes on this class will also be frozen, as well.
       class Function
         include Base
+        attr_reader :return
+        attr_reader :definition
+
 
         # (see Item::Base.from)
         def self.from(type)
@@ -46,6 +49,15 @@ module Carbon
           deep_freeze!
         end
 
+        def define(index)
+          if @definition.is_a?(::Proc)
+            Function.from(func)
+              .merge(definition: @definition.call(index), return: @return)
+          else
+            self
+          end
+        end
+
         # (see Base#call)
         def call(build, generics)
           value = case @definition
@@ -70,7 +82,7 @@ module Carbon
           ret = build.types.fetch(@return.sub(generics)).last
           func = build.module.functions.add(full, params, ret)
           @definition.call(func, build, generics)
-          build.functions[full] = func
+          build.functions[full] = [self, func]
         end
         # rubocop:enable Metrics/AbcSize
 

data/lib/carbon/core.rb

@@ -42,7 +42,7 @@ module Carbon
     def self.finalize
       Core::Integer.define_integer
       Core::Pointer.define_pointer
-      index
+      index.finalize
     end
 
     def self.find

data/lib/carbon/core/integer/cast.rb

@@ -63,19 +63,19 @@ module Carbon
         end
 
         def upcast_signed(entry, this, to)
-          entry.ret(entry.sext(this, to))
+          entry.ret(entry.sext(this, to).as(this.type))
         end
 
         def upcast_unsigned(entry, this, to)
-          entry.ret(entry.zext(this, to))
+          entry.ret(entry.zext(this, to).as(this.type))
         end
 
         def downcast(entry, this, to)
-          entry.ret(entry.trunc(this, to))
+          entry.ret(entry.trunc(this, to).as(this.type))
         end
 
         def sidecast(entry, this, to)
-          entry.ret(entry.int_cast(this, to))
+          entry.ret(entry.int_cast(this, to).as(this.type))
         end
       end
     end

data/lib/carbon/core/integer/math.rb

@@ -121,7 +121,7 @@ module Carbon
           params[0].name, params[1].name = %w(self other)
           this, other = force_same_cast(params, entry, left, right)
           icmp = COMP_OPERATIONS_MAP.fetch(left.sign, op)
-          entry.ret(entry.icmp(icmp, this, other))
+          entry.ret(entry.icmp(icmp, this, other).as(Carbon::Boolean))
         end
 
         def define_math_definition(left, right, op, definition)
@@ -130,6 +130,7 @@ module Carbon
           params[0].name, params[1].name = %w(self other)
           this, other = force_same_cast(params, entry, left, right)
           result = perform_operation(entry, [this, other], left, op)
+            .as(this.type)
           return_original_size(entry, result, left, right)
         end
 
@@ -179,18 +180,18 @@ module Carbon
         end
 
         def force_same_cast(params, entry, left, right)
-          lcall, rcall = find_size(left, right)
-          [entry.call(lcall, params[0]),
-            entry.call(rcall, params[1])]
+          dest = destination_size([left, right])
+          lcall, rcall =
+            [left, right].map { |p| p.name.call(dest.cast, [p.name]) }
+          [entry.call(lcall, params[0]).as(dest.name),
+            entry.call(rcall, params[1]).as(dest.name)]
         end
 
-        def find_size(left, right)
-          sign = left.sign
-          size = [left.size, right.size].max
-          fname = sign == :unsigned ? "to-uint#{size}" : "to-int#{size}"
+        def destination_size(params)
+          sign = params[0].sign
+          size = params.map(&:size).max
 
-          [left.name.call(fname, [left.name]),
-            right.name.call(fname, [right.name])]
+          Int.find(size: size, sign: sign)
         end
       end
     end