citrus-compiler 0.8.1 → 0.8.2

data/README.rdoc

@@ -32,14 +32,14 @@ As you can see, very ruby-like.
 
 Citrus requires the following libraries:
 
-* LLVM 2.8 compiled with shared libraries
+* LLVM 2.9 compiled with shared libraries
   * On Mac OS X, the quickest way is to use `brew install llvm --shared`
   * On Linux, there are usually pre-compiled packages
 * Ruby
 * Treetop
 * Ruby LLVM (currently building the source from Jeremy's next branch is required)
 
-Everything except LLVM is installed when running `gem install citrus-compiler`
+Everything except LLVM (and presently, ruby-llvm) is installed when running `gem install citrus-compiler`
 
 == Running
 

data/lib/citrus/compiler/generator.rb

@@ -22,13 +22,15 @@ module Citrus
     end
     
     def range(first, last, full)
-      ival = INT.from_i(-1)
+      ival = nil
       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)
+      iteration = @builder.alloca(INT)
+      @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)
@@ -37,7 +39,8 @@ module Citrus
         gw.builder.store(gw.equate(:+, val, gw.number(1)), iteration)
         gw.builder.store(gw.equate(:+, ival, gw.number(1)), index)
       end
-      return Array.new(ary, :length => self.equate(:+, ival, self.number(1))) 
+      ival = @builder.load(index)
+      return Array.new(ary, :length => ival) 
     end
     
     def string(value)
@@ -56,6 +59,10 @@ module Citrus
       BOOL.from_i(value ? 1 : 0)
     end
     
+    def negate(value)
+      @builder.neg(value)
+    end
+    
     def not(value)
       @builder.not(value)
     end

data/lib/citrus/exceptions.rb

@@ -1,31 +1,37 @@
 module Citrus  
-  class SyntaxError < RuntimeError  
+  class SyntaxError < ScriptError  
     def initialize
       line = $parser.failure_line
       col = $parser.failure_column
       str = $parser.input.lines.to_a[line-1]
       str = str.slice(col-1, str.length).delete($/)
       str = "file end" if str.empty?
-      puts $parser.failure_reason
       super("Unexpected #{str} at #{line}:#{col}.")
     end 
   end
   
-  class NameError < RuntimeError  
+  class StandardError < RuntimeError
+    def initialize(message)
+      line = $parser.input.line_of($pindex)
+      col = $parser.input.column_of($pindex)
+      super("#{message} at #{line}:#{col}.")
+    end
+  end
+  
+  class NameError < StandardError  
     def initialize(name, index=nil, ff=false)
-      index ||= $parser.input.index(name)
-      line = $parser.input.line_of(index)
-      col = $parser.input.column_of(index)
-      super("Undefined #{ff ? "" : "local variable or "}function '#{name}' at #{line}:#{col}.")
+      super("Undefined #{ff ? "" : "local variable or "}function '#{name}")
     end 
   end
   
   class NotFoundError < StandardError
     def initialize(file)
-      super("No such file or directory - #{file}.")
+      super("No such file or directory - #{file}")
     end
   end
   
+  class ArgumentError < StandardError; end
+  
   def self.error(error)
     puts("#{error.message} (#{error.class.to_s.split('::').last})")
     exit(1)

data/lib/citrus/nodes.rb

@@ -5,6 +5,7 @@ module Citrus
     end
     
     def codegen(context)
+      $pindex = self.interval.first
     end
   end
   Node = Treetop::Runtime::SyntaxNode
@@ -53,6 +54,18 @@ module Citrus
     end
   end
   
+  class Neg < Node
+    def codegen(g)
+      g.negate(object.codegen(g))
+    end
+  end
+  
+  class Not < Node
+    def codegen(g)
+      g.not(object.codegen(g))
+    end
+  end
+  
   class Require < Node
     def codegen(g)
       file = string.value
@@ -72,7 +85,7 @@ module Citrus
       begin
         g.call(func.value, *arg_values)
       rescue
-        Citrus.error(NameError.new(func.value, self.interval.first, true))
+        Citrus.error(NameError.new(func.value, true))
       end
     end
   end
@@ -124,7 +137,8 @@ module Citrus
       fb = g.block do |gb|
         else_expressions.each { |e| e.codegen(gb) }
       end
-      g.condition(condition.codegen(g).last, tb, fb, elfs)
+      cond = condition.is_a?(Expression) ? condition.codegen(g).last : condition.codegen(g)
+      g.condition(cond, tb, fb, elfs)
     end
   end
   
@@ -194,7 +208,7 @@ module Citrus
         begin
           g.call(value)
         rescue NoMethodError
-          Citrus.error(NameError.new(value, self.interval.first))
+          Citrus.error(NameError.new(value))
         end
       end
     end
@@ -208,6 +222,11 @@ module Citrus
   
   class RangeNode < Node
     def codegen(g)
+      fval = first.codegen(g)
+      lval = last.codegen(g).last
+      unless LLVM::Type(fval) == INT.type && LLVM::Type(lval) == INT.type
+        Citrus.error(ArgumentError.new("Bad value for range"))
+      end
       g.range(first.codegen(g), last.codegen(g).last, self.full?)
     end
   end

metadata

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