fancy 0.3.0 → 0.3.1

data/lib/boot.fy

@@ -1,4 +1,4 @@
-# boot.fnc
+# boot.fy
 # This file gets loaded & run by Fancy automatically.
 # It loads in Fancy's standard library & core classes.
 
@@ -31,6 +31,11 @@ require: "set"
 require: "symbol"
 require: "method"
 require: "stack"
+require: "proxy"
+require: "thread_pool"
+require: "fiber"
+require: "fiber_pool"
+require: "future"
 
 # version holds fancy's version number
 require: "version"
@@ -38,4 +43,4 @@ require: "argv"
 
 require: "documentation"
 
-require: "package.fy"
+require: "package.fy"

data/lib/class.fy

@@ -50,6 +50,16 @@ class Class {
     }
   }
 
+  def read_slot: slotname {
+    """
+    @slotname Name of slot to define a getter method for.
+
+    Defines a slot reader method for a given slotname.
+    """
+
+    define_slot_reader: slotname
+  }
+
   def write_slots: slots {
     """
     @slots @Array@ of slotnames to define setter methods for.
@@ -62,6 +72,16 @@ class Class {
     }
   }
 
+  def write_slot: slotname {
+    """
+    @slotname Name of slot to define a setter method for.
+
+    Defines a slot writer method for a given slotname.
+    """
+
+    define_slot_writer: slotname
+  }
+
   def read_write_slots: slots {
     """
     @slots @Array@ of slotnames to define getter & setter methods for.
@@ -75,6 +95,17 @@ class Class {
     }
   }
 
+  def read_write_slot: slotname {
+    """
+    @slotname Name of slot to define getter & setter methods for.
+
+    Defines slot reader & writer methods for a given slotname.
+    """
+
+    define_slot_reader: slotname
+    define_slot_writer: slotname
+  }
+
   def subclass?: class_obj {
     """
     @class_obj Class object to check for, if @self is a subclass of @class_obj.
@@ -87,8 +118,8 @@ class Class {
       true
     } else: {
       # take care of Object class, as Object is its own superclass
-      unless: (self superclass nil?) do: {
-        self superclass subclass?: class_obj
+      unless: (superclass nil?) do: {
+        superclass subclass?: class_obj
       }
     }
   }

data/lib/compiler/ast.fy

@@ -25,6 +25,8 @@ require: "ast/script"
 require: "ast/expression_list"
 require: "ast/identifier"
 require: "ast/message_send"
+require: "ast/future_send"
+require: "ast/async_send"
 require: "ast/method_def"
 require: "ast/singleton_method_def"
 require: "ast/super"

data/lib/compiler/ast/assign.fy

@@ -54,7 +54,7 @@ class Fancy AST {
       @idents each_with_index: |ident idx| {
         var = ident
         value = MultipleAssignmentExpr new: @line index: idx
-        match ident string -> {
+        match ident string {
           case /^\*/ ->
             value = SplatAssignmentExpr new: @line start_index: idx
             var = Identifier from: (ident string rest) line: (ident line)
@@ -68,28 +68,28 @@ class Fancy AST {
   class Identifier {
     def bytecode: g assign: value {
       pos(g)
-      Rubinius AST LocalVariableAssignment new(@line, self name, value) bytecode(g)
+      Rubinius AST LocalVariableAssignment new(@line, name, value) bytecode(g)
     }
   }
 
   class InstanceVariable {
     def bytecode: g assign: value {
       pos(g)
-      Rubinius AST InstanceVariableAssignment new(@line, self name, value) bytecode(g)
+      Rubinius AST InstanceVariableAssignment new(@line, name, value) bytecode(g)
     }
   }
 
   class ClassVariable {
     def bytecode: g assign: value {
       pos(g)
-      Rubinius AST ClassVariableAssignment new(@line, self name, value) bytecode(g)
+      Rubinius AST ClassVariableAssignment new(@line, name, value) bytecode(g)
     }
   }
 
   class Constant {
     def bytecode: g assign: value {
       pos(g)
-      Rubinius AST ConstantAssignment new(@line, self name, value) bytecode(g)
+      Rubinius AST ConstantAssignment new(@line, name, value) bytecode(g)
     }
   }
 

data/lib/compiler/ast/async_send.fy

@@ -0,0 +1,25 @@
+class Fancy AST {
+  class AsyncSend : Node {
+    def initialize: @line message_send: @message_send {
+    }
+
+    def bytecode: g {
+      pos(g)
+
+      body = ExpressionList new: @line list: [@message_send]
+      block = BlockLiteral new: @line args: (BlockArgs new: @line) body: body
+
+      fiber = MessageSend new: @line \
+                          message: (Identifier from: "new:" line: @line) \
+                          to: (Identifier from: "Fiber" line: @line) \
+                          args: (MessageArgs new: @line args: [block])
+
+      schedule_send = MessageSend new: @line \
+                                  message: (Identifier from: "add:" line: @line) \
+                                  to: (Identifier from: "Scheduler" line: @line) \
+                                  args: (MessageArgs new: @line args: [fiber])
+
+      schedule_send bytecode: g
+    }
+  }
+}

data/lib/compiler/ast/block.fy

@@ -24,12 +24,12 @@ class Fancy AST {
         # an identifier, use that as the message name in a send to
         # self and use the result as the receiver value for the rest.
         new_receiver = Identifier from: (@args args first to_s) line: @line
-        match first_expr -> {
+        match first_expr {
           case Identifier ->
             @body expressions shift()
             @body unshift_expression: $ MessageSend new: @line message: first_expr to: (new_receiver) args: (MessageArgs new: @line args: [])
           case MessageSend ->
-            match first_expr receiver -> {
+            match first_expr receiver {
               case Self ->
                 first_expr receiver: new_receiver
               case Identifier ->
@@ -72,7 +72,7 @@ class Fancy AST {
     }
 
     def required_args {
-      self total_args
+      total_args
     }
 
     def create_locals: block {

data/lib/compiler/ast/future_send.fy

@@ -0,0 +1,20 @@
+class Fancy AST {
+  class FutureSend : Node {
+    def initialize: @line message_send: @message_send {
+    }
+
+    def bytecode: g {
+      pos(g)
+
+      body = ExpressionList new: @line list: [@message_send]
+      block = BlockLiteral new: @line args: (BlockArgs new: @line) body: body
+
+      future_send = MessageSend new: @line \
+                                message: (Identifier from: "new:" line: @line) \
+                                to: (Identifier from: "Future" line: @line) \
+                                args: (MessageArgs new: @line args: [block])
+
+      future_send bytecode: g
+    }
+  }
+}

data/lib/compiler/ast/identifier.fy

@@ -37,7 +37,7 @@ class Fancy AST {
     }
 
     def self from: string line: line filename: filename (nil) {
-      type = match string -> {
+      type = match string {
         case "__FILE__" -> return CurrentFile new: line filename: filename
         case "__LINE__" -> return CurrentLine new: line
         case "self" -> return Self new: line
@@ -52,11 +52,17 @@ class Fancy AST {
 
     def bytecode: g {
       pos(g)
-      match @string -> {
+      match @string {
         case "true" -> g push_true()
         case "false" -> g push_false()
         case "nil" -> g push_nil()
-        case _ -> Rubinius AST LocalVariableAccess new(@line, self name) bytecode(g)
+        case _ ->
+          if: (g state() scope() search_local(name)) then: {
+            Rubinius AST LocalVariableAccess new(@line, name) bytecode(g)
+          } else: {
+            ms = MessageSend new: @line message: self to: (Self new: @line) args: (MessageArgs new: @line args: [])
+            ms bytecode: g
+          }
       }
     }
   }
@@ -65,7 +71,7 @@ class Fancy AST {
     def initialize: @line string: @string {}
     def bytecode: g {
       pos(g)
-      Rubinius AST InstanceVariableAccess new(@line, self name) bytecode(g)
+      Rubinius AST InstanceVariableAccess new(@line, name) bytecode(g)
     }
   }
 
@@ -73,7 +79,7 @@ class Fancy AST {
     def initialize: @line string: @string {}
     def bytecode: g {
       pos(g)
-      Rubinius AST ClassVariableAccess new(@line, self name) bytecode(g)
+      Rubinius AST ClassVariableAccess new(@line, name) bytecode(g)
     }
   }
 
@@ -81,7 +87,7 @@ class Fancy AST {
     def initialize: @line string: @string {}
     def bytecode: g {
       pos(g)
-      Rubinius AST ConstantAccess new(@line, self name) bytecode(g)
+      Rubinius AST ConstantAccess new(@line, name) bytecode(g)
     }
   }
 
@@ -106,7 +112,7 @@ class Fancy AST {
 
     def bytecode: g {
       pos(g)
-      self scoped bytecode(g)
+      scoped bytecode(g)
     }
   }
 

data/lib/compiler/ast/match.fy

@@ -5,6 +5,37 @@ class Fancy AST {
     }
 
 
+    def bytecode: g set_match_args: clause {
+      "Generates bytecode for setting match clause arguments, if needed"
+
+      g dup()
+      skip_create_locals_label = g new_label()
+      g gif(skip_create_locals_label)
+
+      # if match_arg is given, get a localvar slot and set the
+      # result of the === call to it
+      if: (clause match_args first) then: |marg| {
+        match_arg_var = g state() scope() new_local(marg)
+        @match_arg_vars << match_arg_var
+        g set_local(match_arg_var slot())
+      }
+
+      # for any remaining match arguments, set their values to
+      # whatever matcher[idx] returns (should be the matched data)
+      clause match_args rest each_with_index: |match_arg idx| {
+        idx = idx + 1 # we only want from index 1 onwards
+        g dup() # dup the matcher object
+        match_arg_var = g state() scope() new_local(match_arg)
+        @match_arg_vars << match_arg_var
+        FixnumLiteral new: @line value: idx . bytecode: g
+        g send('at:, 1)
+        g set_local(match_arg_var slot())
+        g pop()
+      }
+
+      skip_create_locals_label set!()
+    }
+
     def bytecode: g {
       pos(g)
 
@@ -25,28 +56,7 @@ class Fancy AST {
         c expr bytecode: g
         g swap()
         g send(':===, 1)
-
-        # if match_arg is given, get a localvar slot and set the
-        # result of the === call to it
-        if: (c match_args first) then: |marg| {
-          match_arg_var = g state() scope() new_local(marg)
-          @match_arg_vars << match_arg_var
-          g set_local(match_arg_var slot())
-        }
-
-        # for any remaining match arguments, set their values to
-        # whatever matcher[idx] returns (should be the matched data)
-        c match_args rest each_with_index: |match_arg idx| {
-          idx = idx + 1 # we only want from index 1 onwards
-          g dup() # dup the matcher object
-          match_arg_var = g state() scope() new_local(match_arg)
-          @match_arg_vars << match_arg_var
-          FixnumLiteral new: @line value: idx . bytecode: g
-          g send('at:, 1)
-          g set_local(match_arg_var slot())
-          g pop()
-        }
-
+        bytecode: g set_match_args: c
         g git(clause_labels[i])
       }
       g pop()

data/lib/compiler/ast/message_send.fy

@@ -13,13 +13,13 @@ class Fancy AST {
         @args bytecode: g
         pos(g)
         { g allow_private() } if: (@receiver is_a?: Self)
-        sym = @name method_name: @receiver ruby_send: (self ruby_send?)
-        if: (self has_splat?) then: {
-          { g push_nil() } unless: $ self ruby_block?
+        sym = @name method_name: @receiver ruby_send: ruby_send?
+        if: has_splat? then: {
+          { g push_nil() } unless: ruby_block?
           g send_with_splat(sym, @args size, false)
           return nil
         }
-        if: (self ruby_block?) then: {
+        if: ruby_block? then: {
           g send_with_block(sym, @args size, false)
         } else: {
           g send(sym, @args size, false)

data/lib/compiler/ast/method_def.fy

@@ -3,7 +3,7 @@ class Fancy AST {
   class MethodDef : Rubinius AST Define {
     def initialize: @line name: @name args: @arguments body: @body access: @access {
       @name = @name method_name: nil
-      self generate_ivar_assignment
+      generate_ivar_assignment
 
       if: (@body empty?) then: {
         @body unshift_expression: $ NilLiteral new: @line

data/lib/compiler/ast/script.fy

@@ -23,7 +23,7 @@ class Fancy AST {
     def bytecode: g {
       pos(g)
       try {
-        self push_script
+        push_script
 
         # docs, code = body.expressions.partition do |s|
         #   s.kind_of?(Rubinius::AST::StringLiteral)
@@ -44,7 +44,7 @@ class Fancy AST {
         # documentation.
         # TODO: implement file documentation here.
       } finally {
-        self pop_script
+        pop_script
       }
     }
   }

data/lib/compiler/ast/super.fy

@@ -10,6 +10,7 @@ class Fancy AST {
       pos(g)
       @args bytecode: g
       name = @name method_name: nil
+      g push_block()
       g send_super(name, @args size)
     }
   }

data/lib/compiler/compiler.fy

@@ -63,6 +63,8 @@ class Fancy {
       }
       try {
         compiler run()
+      } catch Fancy Parser ParseError => e {
+        e raise!
       } catch Exception => e {
         compiler_error("Error trying to compile " ++ file, e)
       }

data/lib/documentation.fy

@@ -62,23 +62,23 @@ class Fancy Documentation {
       Append docstring to the documentation for obj.
       If obj has no documentation, one is created for it.
     """
-    doc = self for: obj
+    doc = for: obj
     doc if_do: {
       doc docs << docstring
     } else: {
-      doc  = self for: obj is: docstring
+      doc  = for: obj is: docstring
     }
     doc
   }
 
   def self formatter: name {
     "Obtain a formatter by the given name. Returns a callable object"
-    self formatters at: name
+    formatters at: name
   }
 
   def self formatter: name is: callable {
     "Register a callable object as formatter under name."
-    self formatters at: name put: callable
+    formatters at: name put: callable
   }
 
   def self formatters {

data/lib/enumerable.fy

@@ -154,7 +154,7 @@ class FancyEnumerable {
 
   def take: amount {
     i = 0
-    self take_while: {
+    take_while: {
       i = i + 1
       i <= amount
     }
@@ -162,7 +162,7 @@ class FancyEnumerable {
 
   def drop: amount {
     i = 0
-    self drop_while: {
+    drop_while: {
       i = i + 1
       i <= amount
     }
@@ -178,6 +178,13 @@ class FancyEnumerable {
     acc
   }
 
+  def inject: val into: block {
+    """
+    Same as reduce:init_val: but taking the initial value as first and the reducing block as second parameter.
+    """
+    reduce: block init_val: val
+  }
+
   def uniq {
     "Returns a new Array with all unique values (double entries are skipped)."
 
@@ -202,11 +209,11 @@ class FancyEnumerable {
 
   def empty? {
     "Indicates, if the Enumerable is empty (has no elements)."
-    self size == 0
+    size == 0
   }
 
   def first {
-    self each: |x| {
+    each: |x| {
       return x
     }
   }
@@ -230,7 +237,7 @@ class FancyEnumerable {
   def superior_by: comparison_block {
     "Returns the superiour element in the @Enumerable that has met the given comparison block with all other elements."
 
-    retval = self first
+    retval = first
     each: |x| {
       if: (comparison_block call: [x, retval]) then: {
         retval = x
@@ -250,10 +257,10 @@ class FancyEnumerable {
   }
 
   def partition_by: block {
-    last = block call: [self first]
+    last = block call: [first]
     coll = []
     tmp_coll = []
-    self each: |x| {
+    each: |x| {
       tmp = block call: [x]
       if: (tmp != last) then: {
         coll << tmp_coll