citrus-compiler 0.8.0 → 0.8.1

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Author::	Mac Malone
 License::	See LICENSE
-Copyright::	Copyright (c) 2010 Mac Malone
+Copyright::	Copyright (c) 2011 Mac Malone
 
 Citrus is a simple dynamically typed linear language written in Ruby, Treetop, and LLVM. It is meant to be an example of how to write a basic compiler.
 
@@ -10,7 +10,7 @@ Being linear, it could be called very c-like, but it has been written to have a
 
 * Dynamically typed
 * Extremely ruby-like syntax
-* Integer, Float, String, Boolean, and Array types
+* Integer, Float, String, Boolean, Array, and Range types
 * Easy integration of C functions into the API
 
 It's prime examples are in the example directory, but here is an excerpt from factorial.ct:
@@ -37,9 +37,9 @@ Citrus requires the following libraries:
   * On Linux, there are usually pre-compiled packages
 * Ruby
 * Treetop
-* Ruby LLVM 2.9.1
+* Ruby LLVM (currently building the source from Jeremy's next branch is required)
 
-Everything except LLVM is installed when running `gem install citrus`
+Everything except LLVM is installed when running `gem install citrus-compiler`
 
 == Running
 

data/example/simple.ct

@@ -39,6 +39,10 @@ def iterate
     printf("%s ", iteration)
   end
   puts("")
+  for iteration in 1..5
+    printf("%d ", iteration)
+  end
+  puts("")
 end
 
 def handle(err)

data/lib/citrus/compiler.rb

@@ -1,4 +1,5 @@
 require "citrus/compiler/generator"
+require "citrus/compiler/array"
 require "citrus/compiler/block"
 require "citrus/compiler/function"
 require "citrus/compiler/variable"

data/lib/citrus/compiler/array.rb

@@ -0,0 +1,29 @@
+module Citrus
+  class Array
+    
+    attr_accessor :pointer
+    
+    def self.create(values, builder)
+      ary = builder.alloca(LLVM::Array(LLVM::Type(values.first), values.size))
+      for index in 0...values.size
+        ptr = builder.gep(ary, [INT.from_i(0), INT.from_i(index)])
+        builder.store(values[index], ptr)
+      end
+      self.new(ary)
+    end
+    
+    def initialize(pointer, props={})
+      @pointer = pointer
+      @length = props[:length]
+    end
+    
+    def length
+      unless @length.nil?
+        return @length
+      else
+        return INT.from_i(LLVM::C.LLVMGetArrayLength(LLVM::Type(@pointer).element_type))
+      end
+    end
+  
+  end
+end

data/lib/citrus/compiler/generator.rb

@@ -18,12 +18,26 @@ module Citrus
     end
     
     def array(values)
-      ary = @builder.alloca(LLVM::Array(LLVM::Type(values.first), values.size))
-      for index in 0...values.size
-        ptr = @builder.gep(ary, [INT.from_i(0), INT.from_i(index)])
-        @builder.store(values[index], ptr)
+      return Array.create(values, @builder)
+    end
+    
+    def range(first, last, full)
+      ival = INT.from_i(-1)
+      ary = @builder.alloca(LLVM::Array(INT, 0))
+      iteration = builder.alloca(INT)
+      builder.store(first, iteration)
+      index = builder.alloca(INT)
+      builder.store(INT.from_i(0), index)
+      self.preploop(:while)
+      self.while(self.compare(full ? :<= : :<, @builder.load(iteration), last)) do |gw|
+        ival = gw.builder.load(index)
+        val = gw.builder.load(iteration)
+        ptr = gw.builder.gep(ary, [INT.from_i(0), ival])
+        gw.builder.store(val, ptr)
+        gw.builder.store(gw.equate(:+, val, gw.number(1)), iteration)
+        gw.builder.store(gw.equate(:+, ival, gw.number(1)), index)
       end
-      return ary
+      return Array.new(ary, :length => self.equate(:+, ival, self.number(1))) 
     end
     
     def string(value)
@@ -102,7 +116,7 @@ module Citrus
     end
     
     def assign_index(name, index, value)
-      ary = @locals[name].value(@builder)
+      ary = self.load(name).pointer
       ptr = @builder.gep(ary, [INT.from_i(0), index])
       @builder.store(value, ptr)
     end
@@ -163,11 +177,11 @@ module Citrus
     end
     
     def load_index(ary, index)
-      @builder.load(@builder.gep(ary, [INT.from_i(0), index]))
+      @builder.load(@builder.gep(ary.pointer, [INT.from_i(0), index]))
     end
     
     def function(name, args)
-      GlobalFunctions.add(name, args) { |g| yield g }
+      return GlobalFunctions.add(name, args) { |g| yield g }
     end
     
     def declare(name, args, ret, varargs = false)
@@ -177,7 +191,7 @@ module Citrus
     end
     
     def block
-      Block.new(@module, @function, self) { |g| yield g if block_given? }
+      return Block.new(@module, @function, self) { |g| yield g if block_given? }
     end
     
     def condition(cond, thenblock, elseblock, elsifs=[])
@@ -276,8 +290,7 @@ module Citrus
       @builder.position_at_end(@basic_block)
       self.resolve_conflict("for", generator, self)
       @basic_block = self.block.bb
-      size = LLVM::C.LLVMGetArrayLength(LLVM::Type(indices).element_type)
-      cond = self.compare(:<, self.load("for"), self.number(size))
+      cond = self.compare(:<, self.load("for"), indices.length)
       @builder.cond(cond, generator.basic_block, @basic_block)
       @builder.position_at_end(@basic_block)
     end

data/lib/citrus/compiler/variable.rb

@@ -2,15 +2,48 @@ module Citrus
   class Variable
     
     attr_reader :type
-    attr_reader :pointer
+    #attr_reader :pointer
     
     def initialize(value, builder)
-      @type = LLVM::Type(value)
+      @value = nil
+      if value.is_a?(Citrus::Array)
+        @value = value
+        @type = LLVM::Type(value.pointer)
+      else
+        @type = LLVM::Type(value)
+      end
+      build_initialize(value, builder)
+    end
+    
+    def assign(value, builder)
+      if value.is_a?(Citrus::Array)
+        @value = value
+        @type = LLVM::Type(value.pointer)
+      end
+      build_assign(value, builder)
+    end
+    
+    def value(builder)
+      val = build_load(builder)
+      return @value.nil? ? val : @value
+    end
+    
+    private
+    
+    def build_initialize(value, builder)
+      if value.is_a?(Citrus::Array)
+        @pointer = value.pointer
+        return
+      end
       @pointer = builder.alloca(@type)
       builder.store(value, @pointer)
     end
     
-    def assign(value, builder)
+    def build_assign(value, builder)
+      if value.is_a?(Citrus::Array)
+        @pointer = value.pointer
+        return
+      end
       type = LLVM::Type(value)
       unless type == @type
         @type = type
@@ -19,7 +52,7 @@ module Citrus
       builder.store(value, @pointer)
     end
     
-    def value(builder)
+    def build_load(builder)
       builder.load(@pointer)
     end
   
@@ -30,17 +63,30 @@ module Citrus
     def initialize(name, value, mod, builder)
       @name = name
       @module = mod
-      @type = LLVM::Type(value)
+      super(value, builder)   
+    end
+    
+    private
+    
+    def build_initialize(value, builder)
       @pointer = @module.globals.add(@type, @name)
-      @pointer.initializer = value
+      if value.is_a?(Citrus::Array)
+        @pointer.initializer = value.pointer
+      else
+        @pointer.initializer = value
+      end
     end
     
-    def assign(value, builder)
-      @type = LLVM::Type(value)
-      builder.store(value, @pointer)
+    def build_assign(value, builder)
+      if value.is_a?(Citrus::Array)
+        builder.store(value.pointer, @pointer)
+      else
+        @type = LLVM::Type(value)
+        builder.store(value, @pointer)
+      end
     end
     
-    def value(builder)
+    def build_load(builder)
       builder.load(@module.globals.named(@name))
     end
   

data/lib/citrus/core.rb

@@ -1,9 +1,9 @@
 require "rubygems"
 
-=begin # Custom LLVM Loading (for me only)
+if File.directory?("#{File.dirname(__FILE__)}/../llvm-2.9") # Custom LLVM Loading (for me only)
 require "llvm/load"
 LLVM.load("#{File.dirname(__FILE__)}/../llvm-2.9")
-=end
+end
 
 require 'llvm/core'
 require 'llvm/execution_engine'

data/lib/citrus/nodes.rb

@@ -206,6 +206,12 @@ module Citrus
     end
   end
   
+  class RangeNode < Node
+    def codegen(g)
+      g.range(first.codegen(g), last.codegen(g).last, self.full?)
+    end
+  end
+  
   class StringNode < Node
     def codegen(g)
       g.string(value)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: citrus-compiler
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Mac Malone
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 Z
+date: 2011-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
@@ -33,22 +33,6 @@ dependencies:
         version: 1.4.9
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-llvm
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 2
-        - 9
-        - 1
-        version: 2.9.1
-  type: :runtime
-  version_requirements: *id002
 description: 
 email: 
 executables: []
@@ -59,6 +43,7 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
+- lib/citrus/compiler/array.rb
 - lib/citrus/compiler/block.rb
 - lib/citrus/compiler/function.rb
 - lib/citrus/compiler/generator.rb