fancy 0.3.3 → 0.4.0

data/lib/block.fy

@@ -28,27 +28,38 @@ class Block {
     { call not } while_true: block
   }
 
-  def while_nil: block {
-    "Same as Block#while_false:"
-
-    while_false: block
-  }
+  alias_method: 'while_nil: for: 'while_false:
 
   def while_true: work {
-    {
-      call if_true: |val| {
-        work call: [val]
-      } else: {
-        break
+    """
+    @work @Block@ to call while @self yields @true.
+
+    Calls @work 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
+        }
       }
-    } loop
+    } catch Fancy BreakIteration => ex {
+      return ex result
+    } catch Fancy StopIteration => ex {
+      return ex result
+    }
   }
 
   alias_method: 'while_do: for: 'while_true:
 
   def until_do: block {
     """
-    Calls a given Block as long as @self returns @nil or @false.
+    @block @Block@ to be called while @self yields @nil or @false.
+
+    Calls a given Block as long as @self yields @nil or @false.
     """
 
     self while_false: block
@@ -56,6 +67,8 @@ class Block {
 
   def until: block {
     """
+    @block Condition @Block@ to be called to determine if @self should be called.
+
     Calls @self while @block yields @nil or @false.
     """
 
@@ -83,13 +96,21 @@ class Block {
   }
 
   def if: obj {
-    "Calls itself if the given object is true-ish."
+    """
+    @obj Condition object to determine if @self should be called.
+
+    Calls @self if @obj is true-ish.
+    """
 
     if: obj then: self
   }
 
   def unless: obj {
-    "Opposite of Block#if:. Calls itself if the given object is false-ish."
+    """
+    @obj Condition object to determine if @self should not be called.
+
+    Opposite of Block#if:. Calls @self if @obj is false-ish.
+    """
 
     unless: obj do: self
   }
@@ -104,4 +125,8 @@ class Block {
 
     call: [val]
   }
+
+  def Block name {
+    "Block"
+  }
 }

data/lib/boot.fy

@@ -22,9 +22,11 @@ require: "number"
 require: "enumerable"
 require: "string"
 require: "array"
+require: "range"
 require: "tuple"
 require: "block"
 require: "iteration"
+require: "integer"
 require: "enumerator"
 require: "file"
 require: "directory"

data/lib/class.fy

@@ -6,6 +6,8 @@ class Class {
   or Smalltalk.
   """
 
+  forwards_unary_ruby_methods
+
   def define_slot_reader: slotname {
     """
     @slotname Name of the slot to define a getter method for.

data/lib/compiler/ast.fy

@@ -36,7 +36,8 @@ require: "ast/block"
 require: "ast/class_def"
 require: "ast/tuple_literal"
 require: "ast/range"
-require: "ast/require"
 require: "ast/match"
 require: "ast/try_catch"
 require: "ast/return"
+require: "ast/goto"
+require: "ast/string_interpolation"

data/lib/compiler/ast/assign.fy

@@ -1,7 +1,7 @@
 class Fancy AST {
-
   class Assignment : Node {
-    def initialize: @line var: @lvalue value: @rvalue { }
+    def initialize: @line var: @lvalue value: @rvalue {
+    }
 
     def bytecode: g {
       pos(g)
@@ -92,5 +92,4 @@ class Fancy AST {
       Rubinius AST ConstantAssignment new(@line, name, value) bytecode(g)
     }
   }
-
 }

data/lib/compiler/ast/async_send.fy

@@ -5,21 +5,7 @@ class Fancy AST {
 
     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
+      @message_send redirect_via: 'send_async:with_params: . bytecode: g
     }
   }
 }

data/lib/compiler/ast/class_def.fy

@@ -1,6 +1,7 @@
 class Fancy AST {
   class ClassDef : Rubinius AST Class {
-    def initialize: @line name: @name parent: @parent body: @body {
+    def initialize: @line name: @name parent: @parent body: @body (ExpressionList new: @line) {
+      { @body = ExpressionList new: @line } unless: @body
       name = nil
       if: (@name is_a?: NestedConstant) then: {
         name = @name scoped

data/lib/compiler/ast/expression_list.fy

@@ -1,8 +1,9 @@
 class Fancy AST {
-
   class ExpressionList : Node {
-    read_slots: ['expressions]
-    def initialize: @line list: @expressions ([]) {}
+    read_slot: 'expressions
+
+    def initialize: @line list: @expressions ([]) {
+    }
 
     def unshift_expression: expression {
       @expressions unshift(expression)
@@ -41,7 +42,5 @@ class Fancy AST {
         @expressions shift()
       }
     }
-
   }
-
 }

data/lib/compiler/ast/future_send.fy

@@ -5,16 +5,7 @@ class Fancy AST {
 
     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
+      @message_send redirect_via: 'send_future:with_params: . bytecode: g
     }
   }
 }

data/lib/compiler/ast/goto.fy

@@ -0,0 +1,46 @@
+class Rubinius Generator {
+  def ip: @ip
+  def ip {
+    @ip
+  }
+}
+
+class Fancy AST {
+  class Label : Node {
+    @@registry = <[]>
+    def Label [name] {
+      @@registry[name]
+    }
+    def Label [name]: label {
+      @@registry[name]: label
+    }
+
+    def initialize: @line name: @name
+    def bytecode: g {
+      pos(g)
+      label = Label[@name]
+      unless: label do: {
+        label = g new_label()
+        Label[@name]: label
+      }
+      tmp = g ip
+      g ip: (tmp + 2)
+      label set!()
+      g ip: tmp
+      g push_nil()
+    }
+  }
+
+  class Goto : Node {
+    def initialize: @line label_name: @label_name
+    def bytecode: g {
+      pos(g)
+      label = Label[@label_name]
+      unless: label do: {
+        label = g new_label()
+        Label[@label_name]: label
+      }
+      g goto(label)
+    }
+  }
+}

data/lib/compiler/ast/identifier.fy

@@ -1,8 +1,7 @@
 class Fancy AST {
-
   class Identifier : Node {
     read_slots: ['string, 'line]
-    read_write_slots: ['ruby_ident]
+    read_write_slot: 'ruby_ident
 
     @@gen_ident_start = 0
 
@@ -18,7 +17,11 @@ class Fancy AST {
       Identifier from: ("______gen_ident______" ++ @@gen_ident_start) line: line
     }
 
-    def initialize: @line string: @string ruby_ident: @ruby_ident (false) {}
+    def initialize: @line string: @string ruby_ident: @ruby_ident (false) {
+      match @string {
+        case /^ | $/ -> @string = "|"
+      }
+    }
 
     def name {
       @string to_sym()
@@ -53,9 +56,9 @@ class Fancy AST {
     def bytecode: g {
       pos(g)
       match @string {
-        case "true" -> g push_true()
-        case "false" -> g push_false()
-        case "nil" -> g push_nil()
+        # case "true" -> g push_true()
+        # case "false" -> g push_false()
+        # case "nil" -> g push_nil()
         case _ ->
           if: (g state() scope() search_local(name)) then: {
             Rubinius AST LocalVariableAccess new(@line, name) bytecode(g)
@@ -115,5 +118,4 @@ class Fancy AST {
       scoped bytecode(g)
     }
   }
-
 }

data/lib/compiler/ast/literals.fy

@@ -44,7 +44,7 @@ class Fancy AST {
   }
 
   class CurrentLine : Node {
-    def initialize: @line {}
+    def initialize: @line { }
     def bytecode: g {
       pos(g)
       FixnumLiteral new: @line value: @line . bytecode: g
@@ -79,6 +79,13 @@ class Fancy AST {
       pos(g)
       bytecode(g)
     }
+    def method_name: receiver ruby_send: ruby_send {
+      if: ruby_send then: {
+        'self
+       } else: {
+         ':self
+       }
+    }
   }
 
   class SymbolLiteral : Rubinius AST SymbolLiteral {

data/lib/compiler/ast/match.fy

@@ -1,10 +1,8 @@
 class Fancy AST {
-
   class Match : Node {
     def initialize: @line expr: @expr body: @clauses {
     }
 
-
     def bytecode: g set_match_args: clause {
       "Generates bytecode for setting match clause arguments, if needed"
 
@@ -66,10 +64,22 @@ class Fancy AST {
       clause_labels each_with_index: |label i| {
         label set!()
         g pop()
+
+        # set any new locals created in the match clause body to nil afterwards
+        # so they're only visible in the current clause body.
+        detected_locals = g detected_locals()
+
         @clauses[i] body bytecode: g
 
+        new_detected_locals = g detected_locals()
+        new_detected_locals - detected_locals times: |i| {
+          g push_nil()
+          g set_local(i + detected_locals)
+          g pop()
+        }
+
         # set match_arg locals slot to nil, so they're only visible
-        # within the case body
+        # within the match clause body
         @match_arg_vars each: |marg_var| {
           g push_nil()
           g set_local(marg_var slot())
@@ -85,6 +95,7 @@ class Fancy AST {
 
   class MatchClause : Node {
     read_slots: ['expr, 'body, 'match_args]
+
     def initialize: @line expr: @expr body: @body args: @match_args {
       if: (@expr kind_of?: Identifier) then: {
         if: (@expr string == "_") then: {
@@ -94,5 +105,4 @@ class Fancy AST {
       @match_args = @match_args map: 'name
     }
   }
-
 }

data/lib/compiler/ast/message_send.fy

@@ -1,18 +1,45 @@
 class Fancy AST {
-
   class MessageSend : Node {
     read_write_slots: ['name, 'receiver, 'args]
-    def initialize: @line message: @name to: @receiver args: @args { }
+
+    def initialize: @line message: @name to: @receiver (Self new: @line) args: @args (MessageArgs new: @line) {
+    }
+
+    def redirect_via: redirect_message {
+      message_name = SymbolLiteral new: @line value: (@name string to_sym)
+      orig_args = ArrayLiteral new: @line array: $ @args args
+      args = MessageArgs new: @line args: $ [message_name, orig_args]
+
+      ms = MessageSend new: @line \
+                       message: (Identifier from: (redirect_message to_s) line: @line) \
+                       to: @receiver \
+                       args: args
+    }
 
     def bytecode: g {
       pos(g)
       if: (@receiver is_a?: Super) then: {
         SuperSend new: @line message: @name args: @args . bytecode: g
       } else: {
+
+        # check if we might have a block invocation using block(x,y) syntax.
+        if: ruby_send? then: {
+          if: (@receiver is_a?: Self) then: {
+            if: (g state() scope() search_local(@name name)) then: {
+              @name bytecode: g
+              args = ArrayLiteral new: @line array: (@args args)
+              args bytecode: g
+              g send('call:, 1, false)
+              return nil
+            }
+          }
+        }
+
         @receiver bytecode: g
         @args bytecode: g
         pos(g)
         { g allow_private() } if: (@receiver is_a?: Self)
+
         sym = @name method_name: @receiver ruby_send: ruby_send?
         if: has_splat? then: {
           { g push_nil() } unless: ruby_block?
@@ -41,8 +68,10 @@ class Fancy AST {
   }
 
   class MessageArgs : Node {
-    read_slots: ['args]
-    def initialize: @line args: @args { }
+    read_slot: 'args
+
+    def initialize: @line args: @args ([]) {
+    }
 
     def bytecode: g {
       pos(g)
@@ -70,7 +99,7 @@ class Fancy AST {
 
 
   class RubyArgs : MessageArgs {
-    def initialize: @line args: @args block: @block (nil) {
+    def initialize: @line args: @args ([]) block: @block (nil) {
       { @args = @args array } unless: (@args is_a?: Array)
       @block if_nil: {
         if: (@args last kind_of?: Identifier) then: {
@@ -106,5 +135,4 @@ class Fancy AST {
       @splat nil? not
     }
   }
-
 }