fancy 0.4.0 → 0.5.0

data/lib/block.fy

@@ -16,13 +16,14 @@ class Block {
 
   def while_false: block {
     """
-    Executes a given Block while self evals to nil
+    Executes a given @Block@ while self evals to @nil or @false.
+
     Example:
-      i = 0
-      { i >= 10 } while_false: {
-        i println
-        i = i + 1
-      }
+          i = 0
+          { i >= 10 } while_false: {
+            i println
+            i = i + 1
+          }
     """
 
     { call not } while_true: block
@@ -30,26 +31,19 @@ class Block {
 
   alias_method: 'while_nil: for: 'while_false:
 
-  def while_true: work {
+  def while_true: block {
     """
-    @work @Block@ to call while @self yields @true.
+    @block @Block@ to call while @self yields @true.
 
-    Calls @work while calling @self yields a @true-ish value.
+    Calls @block while calling @self yields a @true-ish value.
     """
 
     try {
-      brk = { return nil }
-      loop() {
-        try {
-          call if_true: work else: brk
-        } catch Fancy NextIteration => ex {
-          ex result
-        }
-      }
-    } catch Fancy BreakIteration => ex {
-      return ex result
-    } catch Fancy StopIteration => ex {
-      return ex result
+      while_true_impl: block
+    } catch Fancy BreakIteration => b {
+      return b result
+    } catch Fancy StopIteration => s {
+      return s result
     }
   }
 
@@ -90,7 +84,7 @@ class Block {
     Short-circuiting || (boolean OR).
     """
 
-    if: call then: |val| {
+    call if_true: |val| {
       return val
     } else: other_block
   }
@@ -102,7 +96,7 @@ class Block {
     Calls @self if @obj is true-ish.
     """
 
-    if: obj then: self
+    obj if_true: self
   }
 
   def unless: obj {
@@ -112,7 +106,7 @@ class Block {
     Opposite of Block#if:. Calls @self if @obj is false-ish.
     """
 
-    unless: obj do: self
+    obj if_true: { nil } else: self
   }
 
   def === val {

data/lib/boot.fy

@@ -30,7 +30,6 @@ require: "integer"
 require: "enumerator"
 require: "file"
 require: "directory"
-require: "fancy_spec"
 require: "hash"
 require: "set"
 require: "symbol"
@@ -46,6 +45,7 @@ require: "struct"
 # version holds fancy's version number
 require: "version"
 require: "argv"
+require: "vars"
 
 require: "documentation"
 

data/lib/class.fy

@@ -14,9 +14,9 @@ class Class {
 
     Defines a slot reader method with a given name.
     E.g. for a slotname @count it will define the following method:
-        def count {
-          get_slot: 'count
-        }
+          def count {
+            get_slot: 'count
+          }
     """
 
     define_method: slotname with: {
@@ -30,9 +30,9 @@ class Class {
 
     Defines a slot writer method with a given name.
     E.g. for a slotname @count it will define the following method:
-        def count: c {
-          set_slot: 'count value: c
-        }
+          def count: c {
+            set_slot: 'count value: c
+          }
     """
 
     define_method: (slotname to_s + ":") with: |val| {

data/lib/compiler/ast.fy

@@ -39,5 +39,4 @@ require: "ast/range"
 require: "ast/match"
 require: "ast/try_catch"
 require: "ast/return"
-require: "ast/goto"
 require: "ast/string_interpolation"

data/lib/compiler/ast/assign.fy

@@ -92,4 +92,29 @@ class Fancy AST {
       Rubinius AST ConstantAssignment new(@line, name, value) bytecode(g)
     }
   }
+
+  class DynamicVariable {
+    def bytecode: g assign: value {
+      pos(g)
+      var = DynamicVariable new: @line string: @string
+      dva = DynamicVariableAssign new: @line varname: var value: value in: (NilLiteral new: @line)
+      dva bytecode: g
+    }
+  }
+
+  class DynamicVariableAssign : Node {
+    def initialize: @line varname: @varname value: @value in: @block {
+       @varname = @varname varname
+    }
+
+    def bytecode: g {
+      pos(g)
+
+      ms = MessageSend new: @line \
+                       message: (Identifier from: "let:be:in:" line: @line) \
+                       to: (Self new: @line) \
+                       args: (MessageArgs new: @line args: [@varname, @value, @block])
+      ms bytecode: g
+    }
+  }
 }

data/lib/compiler/ast/block.fy

@@ -1,5 +1,6 @@
 class Fancy AST {
   class BlockLiteral : Rubinius AST Iter {
+    read_slot: 'body
     def initialize: @line args: @args body: @body (NilLiteral new: line) partial: @partial (false) {
       if: (@body empty?) then: {
         @body unshift_expression: $ NilLiteral new: @line

data/lib/compiler/ast/identifier.fy

@@ -48,6 +48,7 @@ class Fancy AST {
         case /^[A-Z]/ -> Constant
         case /^@@/ -> ClassVariable
         case /^@/ -> InstanceVariable
+        case /^\*/ -> DynamicVariable
         case _ -> Identifier
       }
       type new: line string: string
@@ -118,4 +119,19 @@ class Fancy AST {
       scoped bytecode(g)
     }
   }
+
+  class DynamicVariable : Identifier {
+    read_slot: 'varname
+    def initialize: @line string: @string {
+      @varname = SymbolLiteral new: @line value: @string
+    }
+
+    def bytecode: g {
+      thread = Identifier from: "Thread" line: @line
+      thread bytecode: g
+      g send('current, 0, false)
+      @varname bytecode: g
+      g send(':[], 1, false)
+    }
+  }
 }

data/lib/compiler/ast/literals.fy

@@ -89,7 +89,11 @@ class Fancy AST {
   }
 
   class SymbolLiteral : Rubinius AST SymbolLiteral {
+    read_slot: 'value
     def initialize: line value: value { initialize(line, value) }
+    def string {
+      value
+    }
     def bytecode: g {
       pos(g)
       bytecode(g)

data/lib/compiler/ast/message_send.fy

@@ -2,6 +2,16 @@ class Fancy AST {
   class MessageSend : Node {
     read_write_slots: ['name, 'receiver, 'args]
 
+    # fast instructions to be used if possible
+    FastOps = <[
+      ':+ => 'meta_send_op_plus,
+      ':- => 'meta_send_op_minus,
+      ':== => 'meta_send_op_equal,
+      ':=== => 'meta_send_op_tequal,
+      ':< => 'meta_send_op_lt,
+      ':> => 'meta_send_op_gt
+    ]>
+
     def initialize: @line message: @name to: @receiver (Self new: @line) args: @args (MessageArgs new: @line) {
     }
 
@@ -49,7 +59,12 @@ class Fancy AST {
         if: ruby_block? then: {
           g send_with_block(sym, @args size, false)
         } else: {
-          g send(sym, @args size, false)
+          # use fast instruction, if available.
+          if: (FastOps[sym]) then: |op| {
+            g __send__(op, g find_literal(sym))
+          } else: {
+            g send(sym, @args size, false)
+          }
         }
       }
     }

data/lib/enumerable.fy

@@ -34,7 +34,7 @@ class FancyEnumerable {
 
     Joins a collection with a @String@ between each element, returning a new @String@.
 
-        \"hello, world\” join: \"-\" # => \"h-e-l-l-o-,- -w-o-r-l-d\"
+          \"hello, world\" join: \"-\" # => \"h-e-l-l-o-,- -w-o-r-l-d\"
     """
 
     s = ""
@@ -59,13 +59,15 @@ class FancyEnumerable {
         return true
       }
     }
-    nil
+    false
   }
 
   def all?: condition {
     """
-    Similar to @FancyEnumerable#any?:@ just checking for all elements.
-    Indicates, if all elements meet the condition.
+    @block Predicate @Block@ to be called for each element until it returns @false for any one of them.
+    @return @true if all elements in @self yield @true for @block, @false otherwise.
+
+    Takes condition-block and returns @true if all elements meet it.
     """
 
     each: |x| {
@@ -162,7 +164,7 @@ class FancyEnumerable {
     as long as they meet the given condition block.
 
     Example:
-        [1,2,3,4,5] take_while: |x| { x < 4 } # => [1,2,3]
+          [1,2,3,4,5] take_while: |x| { x < 4 } # => [1,2,3]
     """
 
     coll = []
@@ -183,7 +185,7 @@ class FancyEnumerable {
     as long as they meet the given condition block.
 
     Example:
-        [1,2,3,4,5] drop_while: |x| { x < 4 } # => [4,5]
+          [1,2,3,4,5] drop_while: |x| { x < 4 } # => [4,5]
     """
 
     coll = []
@@ -210,7 +212,7 @@ class FancyEnumerable {
     @return First @amount elements of @self in an @Array@.
 
     Example:
-        [1,2,3,4] take: 2 # => [1,2]
+          [1,2,3,4] take: 2 # => [1,2]
     """
 
     i = 0
@@ -226,7 +228,7 @@ class FancyEnumerable {
     @return An @Array@ of all but the first @amount elements in @self.
 
     Example:
-        [1,2,3,4,5] drop: 2 # => [3,4,5]
+          [1,2,3,4,5] drop: 2 # => [3,4,5]
     """
 
     i = 0
@@ -242,7 +244,7 @@ class FancyEnumerable {
     value and an initial value.
 
     Example:
-        [1,2,3] reduce: |sum val| { sum + val } init_val: 0 # => 6
+          [1,2,3] reduce: |sum val| { sum + val } init_val: 0 # => 6
     """
 
     acc = init_val
@@ -258,7 +260,7 @@ class FancyEnumerable {
     and the reducing block as second parameter.
 
     Example:
-        [1,2,3] inject: 0 into: |sum val| { sum + val } # => 6
+          [1,2,3] inject: 0 into: |sum val| { sum + val } # => 6
     """
 
     reduce: block init_val: val
@@ -271,7 +273,7 @@ class FancyEnumerable {
     Returns a new Array with all unique values (double entries are skipped).
 
     Example:
-        [1,2,1,2,3] uniq # => [1,2,3]
+          [1,2,1,2,3] uniq # => [1,2,3]
     """
 
     uniq_vals = []
@@ -339,7 +341,7 @@ class FancyEnumerable {
     Returns a new @Array@ with all values removed that are @nil ( return @true on @nil? ).
 
     Example:
-        [1,2,nil,3,nil] compact # => [1,2,3]
+          [1,2,nil,3,nil] compact # => [1,2,3]
     """
 
     reject: |x| { x nil? }
@@ -357,10 +359,10 @@ class FancyEnumerable {
     @selection_block defaults to @identity.
 
     Examples:
-        [1,2,5,3,4] superior_by: '> # => 5
-        [1,2,5,3,4] superior_by: '< # => 1
-        [[1,2], [2,3,4], [], [1]] superior_by: '> taking: 'size # => [2,3,4]
-        [[1,2], [2,3,4], [-1]] superior_by: '< taking: 'first # => [-1]
+          [1,2,5,3,4] superior_by: '> # => 5
+          [1,2,5,3,4] superior_by: '< # => 1
+          [[1,2], [2,3,4], [], [1]] superior_by: '> taking: 'size # => [2,3,4]
+          [[1,2], [2,3,4], [-1]] superior_by: '< taking: 'first # => [-1]
     """
 
 
@@ -430,7 +432,7 @@ class FancyEnumerable {
     @return @Array@ of @Array@s, partitioned by equal return values of calling @block with each element
 
     Example:
-        0 upto: 10 . partition_by: @{< 3}  # => [[0, 1, 2], [3, 4, 5, 6, 7, 8, 9, 10]]
+          0 upto: 10 . partition_by: |x| { x < 3 }  # => [[0, 1, 2], [3, 4, 5, 6, 7, 8, 9, 10]]
     """
     last = block call: [first]
     coll = []
@@ -480,7 +482,7 @@ class FancyEnumerable {
     @return @Array@ of @Array@s with a max size of @size (grouped).
 
     Example usage:
-        [1,2,3,4,5] in_groups_of: 3 # => [[1,2,3],[4,5]]
+          [1,2,3,4,5] in_groups_of: 3 # => [[1,2,3],[4,5]]
     """
 
     groups = []
@@ -503,4 +505,29 @@ class FancyEnumerable {
 
     groups
   }
+
+  def reverse {
+    """
+    @return @self in reverse order.
+
+    Returns @self in reverse order.
+    This only makes sense for collections that have an ordering.
+    In either case, it simply converts @self to an @Array@ and returns it in reversed order.
+    """
+
+    rev = self to_a
+    rev reverse
+  }
+
+  def reverse_each: block {
+    """
+    @block @Block@ to be called for each element in reverse order.
+    @return @self
+
+    Runs @block for each element on reversed version of self.
+    If @self is not a sorted collection, no guarantees about the reverse order can be given.
+    """
+
+    reverse each: block
+  }
 }

data/lib/enumerator.fy

@@ -31,12 +31,12 @@ class FancyEnumerator {
     It will move the internal position forward (compared to e.g. #peek, which doesn't).
 
     Example:
-        a = [1,2,3]
-        e = a to_enum
-        e next # => 1
-        e next # => 2
-        e next # => 3
-        e next # => raises Fancy StopIteration
+          a = [1,2,3]
+          e = a to_enum
+          e next # => 1
+          e next # => 2
+          e next # => 3
+          e next # => raises Fancy StopIteration
     """
 
     if: @peeked then: {
@@ -70,15 +70,15 @@ class FancyEnumerator {
     raised.
 
     Example:
-        a = [1,2,3]
-        e = a to_enum
-        e next p #=> 1
-        e peek p #=> 2
-        e peek p #=> 2
-        e peek p #=> 2
-        e next p #=> 2
-        e next p #=> 3
-        e next p #=> raises Fancy StopIteration
+          a = [1,2,3]
+          e = a to_enum
+          e next p #=> 1
+          e peek p #=> 2
+          e peek p #=> 2
+          e peek p #=> 2
+          e next p #=> 2
+          e next p #=> 3
+          e next p #=> raises Fancy StopIteration
     """
 
     unless: @peeked do: {

data/lib/false_class.fy

@@ -27,6 +27,14 @@ class FalseClass {
     then_block call: [self]
   }
 
+  def if_nil: then_block {
+    nil
+  }
+
+  def if_nil: then_block else: else_block {
+    else_block call: [self]
+  }
+
   def false? {
     "Returns @true."
     true