fancy 0.4.0 → 0.5.0

data/lib/fancy_spec.fy

@@ -20,9 +20,9 @@ class FancySpec {
     Factory method for creating FancySpec instances.
     Calls @block with the new FancySpec instance as the receiver, then runs it.
 
-        FancySpec describe: MyTestClass with: {
-          # test cases using it:for:when: here.
-        }
+          FancySpec describe: MyTestClass with: {
+            # test cases using it:for:when: here.
+          }
     """
 
     spec = FancySpec new: test_obj
@@ -34,9 +34,9 @@ class FancySpec {
     """
     Similar to FancySpec##describe:with: but also taking an explicit @test_obj.
 
-        FancySpec describe: \"My cool class\" for: MyCoolClass with: {
-          # test cases using it:for:when: here.
-        }
+          FancySpec describe: \"My cool class\" for: MyCoolClass with: {
+            # test cases using it:for:when: here.
+          }
     """
 
     spec = FancySpec new: description test_obj: test_obj
@@ -49,12 +49,12 @@ class FancySpec {
     @spec_info_string Info @String@ related to the test case defined in @spec_block.
     @spec_block @Block@ that holds the testcase's code (including assertions).
 
-    Example usage:
-        it: \"should be an empty Array\" when: {
-          arr = [1,2,3]
-          3 times: { arr pop }
-          arr empty? is == true
-        }
+    Example:
+          it: \"should be an empty Array\" when: {
+            arr = [1,2,3]
+            3 times: { arr pop }
+            arr empty? is == true
+          }
     """
 
     test = SpecTest new: spec_info_string block: spec_block
@@ -67,12 +67,12 @@ class FancySpec {
     @method_name Name of Method that this testcase is related to.
     @spec_block @Block@ that holds the testcase's code (including assertions).
 
-    Example usage:
-        it: \"should be an empty Array\" with: 'empty? when: {
-          arr = [1,2,3]
-          3 times: { arr pop }
-          arr empty? is == true
-        }
+    Example:
+          it: \"should be an empty Array\" with: 'empty? when: {
+            arr = [1,2,3]
+            3 times: { arr pop }
+            arr empty? is == true
+          }
     """
 
     test = SpecTest new: spec_info_string block: spec_block
@@ -175,7 +175,7 @@ class FancySpec {
       @@current
     }
 
-    def SpecTest print_failures {
+    def SpecTest print_failures: start_time {
       @@failed_positive each: |test_obj failed_tests| {
         failed_tests each: |t| {
           Console newline
@@ -193,7 +193,7 @@ class FancySpec {
       }
 
       Console newline
-      "Ran #{@@total_tests} tests (#{@@total_expectations} expectations) with #{@@failed_count} failures." println
+      "Ran #{@@total_tests} tests (#{@@total_expectations} expectations) with #{@@failed_count} failures in #{Time now - start_time} seconds." println
       if: (@@failed_count > 0) then: {
         System exit: 1
       } else: {

data/lib/future.fy

@@ -1,54 +1,71 @@
 class FutureSend {
-  read_slots: [ 'fail_reason, 'receiver, 'message, 'params ]
+  read_slots: [ 'receiver, 'message, 'params ]
   def initialize: @actor receiver: @receiver message: @message with_params: @params ([]) {
-    @waiting_threads = []
+    @completed_mutex = Mutex new
+    @condvar = ConditionVariable new
+    @completed = false
+    @failed = false
     @actor ! ('future, (@message, @params), self)
   }
 
   def failed: @fail_reason {
-    synchronized: {
+    @completed_mutex synchronize: {
       @completed = true
       @failed = true
       completed!
     }
   }
 
-  def completed: @value {
-    synchronized: {
+  def completed: value {
+    @completed_mutex synchronize: {
+      @value = value
       @completed = true
       completed!
     }
   }
 
   def completed! {
-    @waiting_threads each: 'run
-    @waiting_threads = []
+    @condvar broadcast
   }
 
   private: 'completed!
 
   def completed? {
-    synchronized: {
-      return @completed
+    completed = false
+    @completed_mutex synchronize: {
+      completed = @completed
     }
+    return completed true?
   }
 
   def failed? {
-    synchronized: {
-      return @failed
+    failed = false
+    @completed_mutex synchronize: {
+      failed = @failed
     }
+    return failed true?
+  }
+
+  def failure {
+    @completed_mutex synchronize: {
+      if: @failed then: {
+        return @fail_reason
+      } else: {
+        @condvar wait: @completed_mutex
+      }
+    }
+    return @fail_reason
   }
 
   def value {
-    if: completed? then: {
-      return @value
-    } else: {
-      synchronized: {
-        @waiting_threads << (Thread current)
+    @completed_mutex synchronize: {
+      if: @completed then: {
+        return @value
+      } else: {
+        @condvar wait: @completed_mutex
       }
-      Thread stop
-      return @value
     }
+    return @value
   }
 
   def send_future: message with_params: params {

data/lib/hash.fy

@@ -98,8 +98,8 @@ class Hash {
     @keys Collection of keys to get the values for.
     @return @Array@ of all values for the given keys.
 
-    Example usage:
-      <['foo => 1, 'bar => 2, 'baz => 42]> values_at: ('foo, 'baz) # => [1, 42]
+    Example:
+          <['foo => 1, 'bar => 2, 'baz => 42]> values_at: ('foo, 'baz) # => [1, 42]
     """
 
     keys map: |k| { at: k }

data/lib/integer.fy

@@ -3,22 +3,6 @@ class Integer {
   Base class for integer values in Fancy.
   """
 
-  def times: block {
-    """
-    @block @Block@ to be called with each number between 0 and @self.
-    @return @self
-
-    Calls a given @Block@ with each number between 0 and @self.
-    """
-
-    tmp = 0
-    while: { tmp < self } do: {
-      block call: [tmp]
-      tmp = tmp + 1
-    }
-    self
-  }
-
   def times: block offset: offset {
     """
     @block @Block@ to be called with each number between @offset and @self.
@@ -28,7 +12,7 @@ class Integer {
     Similar to #times: but starts at a given offset.
     """
 
-    self times: |i| {
+    times: |i| {
       block call: [i + offset]
     }
   }

data/lib/iteration.fy

@@ -5,20 +5,20 @@ class Fancy {
     It is rescued by Block#loop.
 
     Example:
-        10 times: |i| {
-            i println
-            if: (i == 3) then: {
-              Fancy BreakIteration new raise!
-            }
-        }
-        \"Done!\" println
+          10 times: |i| {
+              i println
+              if: (i == 3) then: {
+                Fancy BreakIteration new raise!
+              }
+          }
+          \"Done!\" println
 
     Produces:
-        0
-        1
-        2
-        3
-        Done!
+          0
+          1
+          2
+          3
+          Done!
     """
 
     read_slots: ['result]
@@ -41,16 +41,16 @@ class Fancy {
     It is rescued by Block#loop.
 
     Example:
-        {
-          'Hello println
-          Fancy StopIteration new raise!
-          'World println
-        } loop
-        'Done! println
+          {
+            'Hello println
+            Fancy StopIteration new raise!
+            'World println
+          } loop
+          'Done! println
 
     Produces:
-        Hello
-        Done!
+          Hello
+          Done!
     """
 
     def initialize { @result = nil }
@@ -60,23 +60,23 @@ class Fancy {
       """
       Returns the return value of the iterator.
 
-          o = Object new
-          def o each: block {
-            block call: [1]
-            block call: [2]
-            block call: [3]
-            100
-          }
+            o = Object new
+            def o each: block {
+              block call: [1]
+              block call: [2]
+              block call: [3]
+              100
+            }
 
-          e = o to_enum
-          e next p #=> 1
-          e next p #=> 2
-          e next p #=> 3
-          try {
-            e next
-          } catch Fancy StopIteration => ex {
-            ex result p #=> 100
-          }
+            e = o to_enum
+            e next p #=> 1
+            e next p #=> 2
+            e next p #=> 3
+            try {
+              e next
+            } catch Fancy StopIteration => ex {
+              ex result p #=> 100
+            }
       """
 
       @result

data/lib/object.fy

@@ -29,23 +29,23 @@ class Object {
   def println {
     """
     Same as:
-        Console println: self
+          Console println: self
 
     Prints @self on @STDOUT, followed by a newline.
     """
 
-    Console println: to_s
+    *stdout* println: to_s
   }
 
   def print {
     """
     Same as:
-        Console print: self
+          Console print: self
 
     Prints @self on STDOUT.
     """
 
-    Console print: to_s
+    *stdout* print: to_s
   }
 
   def != other {
@@ -219,7 +219,7 @@ class Object {
   def if: cond then: block {
     """
     Same as:
-        cond if_true: block
+          cond if_true: block
     """
 
     cond if_true: block
@@ -228,7 +228,7 @@ class Object {
   def if: cond then: then_block else: else_block {
     """
     Same as:
-        cond if_true: then_block else: else_block
+          cond if_true: then_block else: else_block
     """
 
     cond if_true: then_block else: else_block
@@ -237,7 +237,7 @@ class Object {
   def while: cond_block do: body_block {
     """
     Same as:
-      cond_block while_do: body_block
+          cond_block while_do: body_block
     """
 
     cond_block while_do: body_block
@@ -246,7 +246,7 @@ class Object {
   def until: cond_block do: body_block {
     """
     Same as:
-      cond_block until_do: body_block
+          cond_block until_do: body_block
     """
 
     cond_block until_do: body_block
@@ -275,7 +275,7 @@ class Object {
   def unless: cond do: block {
     """
     Same as:
-      cond if_true: { nil } else: block
+          cond if_true: { nil } else: block
     """
 
     cond if_true: { nil } else: block
@@ -284,7 +284,7 @@ class Object {
   def unless: cond do: block else: else_block {
     """
     Same as:
-      cond if_true: else_block else: block
+          cond if_true: else_block else: block
     """
 
     cond if_true: else_block else: block
@@ -338,11 +338,11 @@ class Object {
     Returns @value after calling @block with it.
     Useful for returning some object after using it, e.g.:
 
-        # this will return [1,2]
-        returning: [] do: |arr| {
-          arr << 1
-          arr << 2
-        }
+          # this will return [1,2]
+          returning: [] do: |arr| {
+            arr << 1
+            arr << 2
+          }
     """
 
     val = value
@@ -357,10 +357,9 @@ class Object {
     Returns a @RespondsToProxy@ for @self that forwards any messages
     only if @self responds to them.
 
-    Example usage:
-
-        # only send 'some_message: if object responds to it:
-        object if_responds? some_message: some_parameter
+    Example:
+          # only send 'some_message: if object responds to it:
+          object if_responds? some_message: some_parameter
     """
 
     RespondsToProxy new: self
@@ -370,9 +369,9 @@ class Object {
     """
     This is the default implementation for backtick: which gets called when using the backtick syntax.
     For example:
-        `cat README`
+          `cat README`
     Gets translated to the following message send:
-        self backtick: \"cat README\"
+          self backtick: \"cat README\"
     Which allows for custom implementations of the backtick: method, if needed.
     This default implementation works the same way as in Ruby, Perl or Bash.
     It returns the output of running the given string on the command line as a @String@.
@@ -570,23 +569,25 @@ class Object {
   def do: block {
     """
     @block @Block@ to be called in the context of @self.
+    @return @self.
 
     Helper method that calls @block with @self as the receiver.
     This allows message cascading like code, e.g.:
 
-        some_complex_object do: {
-          method_1: arg1
-          method_2: arg2
-          method_3: arg3
-        }
+          some_complex_object do: {
+            method_1: arg1
+            method_2: arg2
+            method_3: arg3
+          }
 
-        # this is the same as:
-        some_complex_object method_1: arg1
-        some_complex_object method_2: arg2
-        some_complex_object method_3: arg3
+          # this is the same as:
+          some_complex_object method_1: arg1
+          some_complex_object method_2: arg2
+          some_complex_object method_3: arg3
     """
 
     block call_with_receiver: self
+    self
   }
 
   def slots {
@@ -608,4 +609,38 @@ class Object {
 
     Thread sleep: seconds
   }
+
+  def let: var_name be: value in: block (nil) {
+    """
+    @var_name @Symbol@ that represents the name of the dynamic variable to be set.
+    @value Value for the variable.
+    @block @Block@ in which @var_name will be dynamically bound to @value.
+    @return Returns @value
+
+    Dynamically rebinds @var_name as dynamic variable with @value as the value within @block.
+
+    Example:
+          File open: \"/tmp/output.txt\" modes: ['write] with: |f| {
+            let: '*stdout* be: f in: {
+              \"hello, world!\" println # writes it to file not STDOUT
+            }
+          }
+    """
+
+    { return value } unless: var_name
+    unless: block do: {
+      Thread current[var_name]: value
+      return value
+    }
+
+    oldval = Thread current[var_name]
+    retval = nil
+    try {
+      Thread current[var_name]: value
+      retval = block call
+    } finally {
+      Thread current[var_name]: oldval
+      return retval
+    }
+  }
 }