citrus-compiler 0.8.2 → 0.8.3

data/README.rdoc

@@ -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, Array, and Range types
+* Integer, Float, String, Symbol, 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:

data/example/simple.ct

@@ -31,7 +31,7 @@ def iterate
   iteration = 10
   while iteration >= 0
     printf("%d ", iteration)
-    iteration = iteration - 1
+    iteration -= 1
   end
   puts("")
   array = ["lift", "off", "and", "away"]

data/lib/citrus/compiler/array.rb

@@ -1,6 +1,7 @@
 module Citrus
   class Array
     
+    attr_writer :length
     attr_accessor :pointer
     
     def self.create(values, builder)
@@ -12,16 +13,16 @@ module Citrus
       self.new(ary)
     end
     
-    def initialize(pointer, props={})
+    def initialize(pointer, length=nil)
       @pointer = pointer
-      @length = props[:length]
+      @length = length
     end
     
     def length
       unless @length.nil?
         return @length
       else
-        return INT.from_i(LLVM::C.LLVMGetArrayLength(LLVM::Type(@pointer).element_type))
+        return @length = INT.from_i(LLVM::C.LLVMGetArrayLength(LLVM::Type(@pointer).element_type))
       end
     end
   

data/lib/citrus/compiler/block.rb

@@ -17,6 +17,10 @@ module Citrus
       return @generator.locals
     end
     
+    def method_missing(symbol, *args, &block)
+      @generator.send(symbol, *args, &block)
+    end
+    
     private
     
     def build_block

data/lib/citrus/compiler/generator.rb

@@ -28,9 +28,7 @@ module Citrus
       @builder.store(first, iteration)
       index = @builder.alloca(INT)
       @builder.store(INT.from_i(0), index)
-      ib = @builder.insert_block
       self.preploop(:while)
-      lb = @builder.insert_block
       self.while(self.compare(full ? :<= : :<, @builder.load(iteration), last)) do |gw|
         ival = gw.builder.load(index)
         val = gw.builder.load(iteration)
@@ -40,7 +38,7 @@ module Citrus
         gw.builder.store(gw.equate(:+, ival, gw.number(1)), index)
       end
       ival = @builder.load(index)
-      return Array.new(ary, :length => ival) 
+      return Array.new(ary, ival) 
     end
     
     def string(value)
@@ -123,8 +121,16 @@ module Citrus
     end
     
     def assign_index(name, index, value)
-      ary = self.load(name).pointer
-      ptr = @builder.gep(ary, [INT.from_i(0), index])
+      ary = self.load(name)
+      length = @builder.alloca(INT)
+      @builder.store(ary.length, length)
+      tb = self.block do |gb|
+        gb.builder.store(gb.equate(:+, index, gb.number(1)), length)
+      end
+      cond = gb.compare(:<=, ary.length, index)
+      self.condition(cond, tb.bb, self.block.bb)
+      ary.length = @builder.load(length)
+      ptr = @builder.gep(ary.pointer, [INT.from_i(0), index])
       @builder.store(value, ptr)
     end
     
@@ -226,7 +232,7 @@ module Citrus
     def case(val, cases, elseblock)
       ncases = {}
       for pair in cases
-        ncases[pair[0].bb] = pair[1]
+        ncases[pair[0]] = pair[1].bb
       end
       switch = @builder.switch(val, elseblock.bb, ncases)
       @basic_block = self.block.bb

data/lib/citrus/compiler/variable.rb

@@ -2,7 +2,7 @@ module Citrus
   class Variable
     
     attr_reader :type
-    #attr_reader :pointer
+    attr_reader :pointer
     
     def initialize(value, builder)
       @value = nil

data/lib/citrus/nodes.rb

@@ -26,19 +26,32 @@ module Citrus
   
   class Assign < Node
     def codegen(g)
-      g.assign(var.value, expression.codegen(g).last)
+      val = expression.codegen(g).last
+      unless op.value.empty?
+        val = g.equate(op.value, g.load(var.value), expression.codegen(g).last)
+      end
+      g.assign(var.value, val)
     end
   end
   
   class GlobalEq < Node
     def codegen(g)
-      g.assign_global(globalvar.value, expression.codegen(g).last)
+      val = expression.codegen(g).last
+      unless op.value.empty?
+        val = g.load_index(op.value, g.load_global(globalvar.value), expression.codegen(g).last)
+      end
+      g.assign_global(globalvar.value, val)
     end
   end
   
   class IndexEq < Node
     def codegen(g)
-      g.assign_index(index.var.value, index.expression.codegen(g).last, expression.codegen(g).last)
+      val = expression.codegen(g).last
+      unless op.value.empty?
+        ival = g.load_index(index.var.value, index.expression.codegen(g).last)
+        val = g.equate(op.value, ival, expression.codegen(g).last)
+      end
+      g.assign_index(index.var.value, index.expression.codegen(g).last, val)
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: citrus-compiler
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Mac Malone
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 Z
+date: 2011-05-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop