fancy 0.3.2 → 0.3.3

data/lib/package/installer.fy

@@ -168,7 +168,7 @@ class Fancy Package {
       If no @.fancypack file is found, raise an error.
       """
 
-      Dir glob(installed_path ++ "/*.fancypack") first if_do: |fpackfile| {
+      Dir glob(installed_path ++ "/*.fancypack") first if_true: |fpackfile| {
         require: fpackfile
       }
 

data/lib/parser/ext/lexer.lex

@@ -23,6 +23,7 @@ hex_lit         0[xX]{hexdigit}+
 bin_lit         0[bB]{bindigit}+
 oct_lit         0[oO]{octdigit}+
 string_lit      L?\"(\\.|[^\\"])*\"
+backtick_lit    L?`(\\.|[^`])*`
 multiline_string L?\"\"\"(\\.|[^\\"])*\"\"\"
 lparen          \(
 rparen          \)
@@ -56,7 +57,7 @@ identifier      @?@?({lower}|[_&*])({letter}|{digit}|{special_under})*
 selector        ({letter}|[_&*])({letter}|{digit}|{special_under})*":"
 constant        {capital}({letter}|{digit}|{special_under})*
 nested_constant ({constant}::)+{constant}
-symbol_lit      \'({identifier}|{operator}|:|"[]")+
+symbol_lit      \'({identifier}|{operator}|{constant}|:|"[]")+
 ruby_send_open  {identifier}{lparen}
 ruby_oper_open  {operator}{lparen}
 regexp_lit      "/".*"/"
@@ -100,6 +101,10 @@ escaped_newline "\\".*\n
                   yylval.object = rb_str_new2(yytext);
                   return STRING_LITERAL;
                 }
+{backtick_lit}	{
+                  yylval.object = rb_str_new2(yytext);
+                  return BACKTICK_LITERAL;
+                }
 {multiline_string} {
                   yylval.object = rb_str_new2(yytext);
                   return MULTI_STRING_LITERAL;

data/lib/parser/ext/parser.y

@@ -73,6 +73,7 @@ extern char *yytext;
 %token                  SYMBOL_LITERAL
 %token                  REGEX_LITERAL
 %token                  OPERATOR
+%token                  BACKTICK_LITERAL
 
 %left                   DOT
 %right                  DOLLAR
@@ -159,6 +160,8 @@ extern char *yytext;
 %type  <object>         match_body
 %type  <object>         match_clause
 
+%type  <object>         backtick_literal
+
 %%
 
 programm:       /*empty*/
@@ -360,6 +363,9 @@ method_args:    method_arg {
                 | method_args method_args_default {
                   $$ = rb_funcall(self, rb_intern("ast:concat:into:"), 3, INT2NUM(yylineno), $2, $1);
                 }
+                | method_args_default {
+                  $$ = rb_funcall(self, rb_intern("ast:concat:"), 2, INT2NUM(yylineno), $1);
+                }
                 ;
 
 method_arg_default: selector identifier LPAREN space exp space RPAREN {
@@ -534,6 +540,12 @@ ruby_send:      exp ruby_send_open ruby_args {
                 | ruby_send_open ruby_args {
                   $$ = rb_funcall(self, rb_intern("ast:send:to:ruby:"), 4, INT2NUM(yylineno), $1, Qnil, $2);
                 }
+                | exp FUTURE_SEND ruby_send_open ruby_args {
+                  $$ = rb_funcall(self, rb_intern("ast:future_send:to:ruby:"), 4, INT2NUM(yylineno), $3, $1, $4);
+                }
+                | exp ASYNC_SEND ruby_send_open ruby_args {
+                  $$ = rb_funcall(self, rb_intern("ast:async_send:to:ruby:"), 4, INT2NUM(yylineno), $3, $1, $4);
+                }
                 ;
 
 /*
@@ -659,6 +671,7 @@ literal_value:  integer_literal
                 | block_literal
                 | tuple_literal
                 | range_literal
+                | backtick_literal
                 ;
 
 array_literal:  empty_array {
@@ -714,6 +727,11 @@ range_literal:  LPAREN exp DOT DOT exp RPAREN {
                 }
                 ;
 
+backtick_literal: BACKTICK_LITERAL {
+                  $$ = fy_terminal_node(self, "ast:backtick:");
+                }
+                ;
+
 block_args:     block_args_with_comma
                 | block_args_without_comma
                 ;

data/lib/parser/methods.fy

@@ -97,6 +97,13 @@ class Fancy {
       ast: line string: (string from: 2 to: -3)
     }
 
+    def ast: line backtick: backtick_string {
+      str = ast: line string: backtick_string
+      selector = (ast: line identifier: "backtick:")
+      args = AST MessageArgs new: line args: [str]
+      AST MessageSend new: line message: selector to: (AST Self new: line) args: args
+    }
+
     def ast: line array: expr_ary {
       AST ArrayLiteral new: line array: expr_ary
     }
@@ -140,7 +147,7 @@ class Fancy {
     }
 
     def ast: line assign: rvalue to: lvalue many: many (false) {
-      ast = many if_do: { AST MultipleAssignment } else: { AST Assignment }
+      ast = many if_true: { AST MultipleAssignment } else: { AST Assignment }
       ast new: line var: lvalue value: rvalue
     }
 
@@ -168,7 +175,7 @@ class Fancy {
     }
 
     def ast: line send: message to: receiver (AST Self new: line) ruby: ruby (nil) {
-      args = ruby if_do: {
+      args = ruby if_true: {
         unless: receiver do: {
           receiver = AST Self new: line
         }
@@ -211,6 +218,10 @@ class Fancy {
         (margs size - idx) times: |pos| {
           required = margs from: 0 to: (idx + pos - 1)
           default = margs from: (idx + pos) to: -1
+          only_default_args = default size == (margs size)
+          if: only_default_args then: {
+            required = []
+          }
           params = required map: |r| { r variable() } . + $ default map: |d| { d default() }
 
           forward = AST MessageSend new: line \
@@ -220,6 +231,13 @@ class Fancy {
 
           doc = AST StringLiteral new: line value: ("Forward to message " ++ target)
           body = AST ExpressionList new: line  list: [doc, forward]
+
+          # use base method name (e.g. "foo:" -> "foo") for the method to be generated
+          # if there are no more arguments left (only default args left)
+          if: only_default_args then: {
+            required = AST Identifier from: (margs first selector() string from: 0 to: -2) line: line
+          }
+
           block call: [required, body]
         }
       }

data/lib/proxy.fy

@@ -8,9 +8,26 @@ class ProxyReceiver : BasicObject {
   }
 
   def unknown_message: msg with_params: params {
-    @proxy send: msg params: params
-    @obj send: msg params: params
+    @proxy send_message: msg with_params: params
+    @obj send_message: msg with_params: params
   }
 }
 
-Proxy = ProxyReceiver
+Proxy = ProxyReceiver
+
+class RespondsToProxy : BasicObject {
+  """
+  A RespondsToProxy is a Proxy that forwards any message sent to it to it's @target instance variable
+  only if it responds to that message. Any messages that @target doesn't respond to simply won't be sent
+  and @nil will be returned.
+  """
+
+  def initialize: @target {
+  }
+
+  def unknown_message: msg with_params: params {
+    if: (@target responds_to?: msg) then: {
+      @target send_message: msg with_params: params
+    }
+  }
+}

data/lib/rbx.fy

@@ -11,7 +11,6 @@ require: "rbx/class"
 require: "rbx/console"
 require: "rbx/array"
 require: "rbx/hash"
-require: "rbx/false_class"
 require: "rbx/string"
 require: "rbx/symbol"
 require: "rbx/integer"

data/lib/rbx/array.fy

@@ -10,6 +10,7 @@ class Array {
   ruby_alias: 'last
   ruby_alias: 'shuffle
   ruby_alias: 'inspect
+  ruby_alias: 'shift
 
   def Array new: size with: default {
     "Creates a new Array with a given size and default-value."
@@ -17,49 +18,12 @@ class Array {
     Array new(size, default)
   }
 
-  def Array new: size {
-    "Creates a new Array with a given size (default value is nil)."
-
-    Array new: size with: nil
-  }
-
-  def append: arr {
-    "Appends another Array onto this one."
-
-    arr each: |x| {
-      self << x
-    }
-    self
-  }
-
   def includes?: obj {
     "Indicates, if an Array includes a given value."
 
     include?(obj)
   }
 
-  def clone {
-    "Clones (shallow copy) the Array."
-    new = []
-    each: |x| {
-      new << x
-    }
-    new
-  }
-
-  def each: block {
-    """
-    @block @Block@ to be called for each element in @self.
-    @return Return value of calling @block on the last item in @self.
-
-    Calls a given @Block@ with each element in the @Array@.
-    """
-
-    val = nil
-    each() |x| { val = block call: [x] }
-    val
-  }
-
   def remove_at: index {
     """
     Removes an element at a given index.
@@ -94,7 +58,7 @@ class Array {
     Returns the element in the @Array@ at a given index.
     """
 
-    ruby: '[] args: [idx]
+    at(idx)
   }
 
   def at: idx put: obj {
@@ -105,24 +69,9 @@ class Array {
 
     Inserts a given object at a given index (position) in the Array.
     """
-
     ruby: '[]= args: [idx, obj]
   }
 
-  def each_with_index: block {
-    """
-    @block @Block@ to be called with each element and its inde in the @Array@.
-
-    Iterate over all elements in Array. Calls a given Block with each element and its index.
-    """
-
-    i = 0
-    each: |x| {
-      block call: [x, i]
-      i = i + 1
-    }
-  }
-
   def index: item {
     """
     @item Item/Value for which the index is requested within an @Array@.
@@ -133,44 +82,6 @@ class Array {
     index(item)
   }
 
-  def indices_of: item {
-    """
-    @item Item/Value for which a list of indices is requested within an @Array@.
-    @return @Array@ of all indices for a given value within an @Array@ (possibly empty).
-
-    Returns an Array of all indices of this item. Empty Array if item does not occur.
-    """
-
-    tmp = []
-    each_with_index: |obj, idx| {
-      if: (item == obj) then: {
-        tmp << idx
-      }
-    }
-    tmp
-  }
-
-  def from: from to: to {
-    """
-    @from Start index for sub-array.
-    @to End index ofr sub-array.
-
-    Returns sub-array starting at from: and going to to:
-    """
-
-    if: (from < 0) then: {
-      from = size + from
-    }
-    if: (to < 0) then: {
-      to = size + to
-    }
-    subarr = []
-    from upto: to do_each: |i| {
-      subarr << (at: i)
-    }
-    subarr
-  }
-
   def last: count {
     """
     @count Number of last elements to get from an @Array@.
@@ -201,39 +112,6 @@ class Array {
     all?(&block)
   }
 
-  def select: block {
-    """
-    @block Predicate @Block@ to be used as filter.
-    @return @Array@ of all the elements for which @block doesn't yield @false or @nil.
-
-    Returns a new Array with all the elements in self that yield a
-    true-ish value when called with the given Block.
-    """
-
-    tmp = []
-    each: |x| {
-      if: (block call: [x]) then: {
-        tmp << x
-      }
-    }
-    return tmp
-  }
-
-  def select_with_index: block {
-    """
-    Same as select:, just gets also called with an additional argument
-    for each element's index value.
-    """
-
-    tmp = []
-    each_with_index: |obj idx| {
-      if: (block call: [obj, idx]) then: {
-        tmp << [obj, idx]
-      }
-    }
-    tmp
-  }
-
   def reject: block {
     """
     Returns a new Array with all the elements which yield nil or false
@@ -257,19 +135,7 @@ class Array {
     join(join_str)
   }
 
-  def sum {
-    """
-    Calculates the sum of all the elements in the Enumerable
-    (assuming them to be Numbers (implementing '+' & '*')).
-    """
-
-    reduce: |x y| { x + y } init_val: 0
-  }
-
-  def product {
-    """Calculates the product of all the elements in the Enumerable
-      (assuming them to be Numbers (implementing '+' & '*'))."""
-
-    reduce: |x y| { x * y } init_val: 1
+  def unshift: value {
+    unshift(value)
   }
 }

data/lib/rbx/block.fy

@@ -30,6 +30,30 @@ class Block {
     """
     @top_scope receiver: recv
   }
+
+  def call_with_receiver: receiver {
+    call_under(receiver, method() scope())
+  }
+
+  def call: args with_receiver: receiver {
+    call_under(receiver, method() scope(), *args)
+  }
+
+  def loop {
+    wrapper = {
+      try {
+        call
+      } catch (Fancy NextIteration) => ex {
+        ex return_value
+      }
+    }
+
+    try {
+      loop(&wrapper)
+    } catch (Fancy BreakIteration) => ex {
+      return ex return_value
+    }
+  }
 }
 
 class Rubinius VariableScope {
@@ -40,4 +64,4 @@ class Rubinius VariableScope {
   def receiver: recv {
     @self = recv
   }
-}
+}

data/lib/rbx/class.fy

@@ -44,6 +44,20 @@ class Class {
     new(superclass, &body_block)
   }
 
+  def initialize {
+    """
+    Initializes a @Class@ with @Object@ set as superclass (default superclass).
+    """
+    initialize: Object
+  }
+
+  def initialize: superclass {
+    """
+    Initializes a @Class@ with a superclass.
+    """
+    initialize(superclass)
+  }
+
   def define_method: name with: block {
     """
     @name Name of the method to be defined.
@@ -128,4 +142,11 @@ class Class {
 
     alias_method(message_name: new_method_name, message_name: old_method_name)
   }
+
+  def alias_method: new_method_name for_ruby: ruby_method_name {
+    """
+    Creates a method alias for a Ruby method.
+    """
+    alias_method(message_name: new_method_name, ruby_method_name)
+  }
 }