fancy 0.3.0 → 0.3.1

data/lib/parser/ext/parser.h

@@ -0,0 +1,118 @@
+/* A Bison parser, made by GNU Bison 2.4.3.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2009, 2010 Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     LPAREN = 258,
+     RPAREN = 259,
+     FUTURE_SEND = 260,
+     ASYNC_SEND = 261,
+     AT_LCURLY = 262,
+     LCURLY = 263,
+     RCURLY = 264,
+     LBRACKET = 265,
+     RBRACKET = 266,
+     LHASH = 267,
+     RHASH = 268,
+     STAB = 269,
+     ARROW = 270,
+     THIN_ARROW = 271,
+     COMMA = 272,
+     SEMI = 273,
+     NL = 274,
+     COLON = 275,
+     RETURN_LOCAL = 276,
+     RETURN = 277,
+     REQUIRE = 278,
+     TRY = 279,
+     CATCH = 280,
+     FINALLY = 281,
+     RETRY = 282,
+     SUPER = 283,
+     PRIVATE = 284,
+     PROTECTED = 285,
+     CLASS = 286,
+     DEF = 287,
+     DOT = 288,
+     DOLLAR = 289,
+     EQUALS = 290,
+     MATCH = 291,
+     CASE = 292,
+     IDENTIFIER = 293,
+     SELECTOR = 294,
+     RUBY_SEND_OPEN = 295,
+     RUBY_OPER_OPEN = 296,
+     CONSTANT = 297,
+     INTEGER_LITERAL = 298,
+     HEX_LITERAL = 299,
+     OCT_LITERAL = 300,
+     BIN_LITERAL = 301,
+     DOUBLE_LITERAL = 302,
+     STRING_LITERAL = 303,
+     MULTI_STRING_LITERAL = 304,
+     SYMBOL_LITERAL = 305,
+     REGEX_LITERAL = 306,
+     OPERATOR = 307
+   };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 1685 of yacc.c  */
+#line 18 "/Users/backtype/projects/fancy/lib/parser/ext/parser.y"
+
+  VALUE object;
+  ID    symbol;
+
+
+
+/* Line 1685 of yacc.c  */
+#line 110 "/Users/backtype/projects/fancy/lib/parser/ext/parser.h"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+extern YYSTYPE yylval;
+
+

data/lib/parser/ext/parser.y

@@ -24,6 +24,8 @@ extern char *yytext;
 
 %token                  LPAREN
 %token                  RPAREN
+%token                  FUTURE_SEND
+%token                  ASYNC_SEND
 %token                  AT_LCURLY
 %token                  LCURLY
 %token                  RCURLY
@@ -419,6 +421,18 @@ unary_send:     exp identifier {
                 | unary_send identifier {
                   $$ = rb_funcall(self, rb_intern("ast:send:to:"), 3, INT2NUM(yylineno), $2, $1);
                 }
+                | exp FUTURE_SEND identifier {
+                  $$ = rb_funcall(self, rb_intern("ast:future_send:to:"), 3, INT2NUM(yylineno), $3, $1);
+                }
+                | unary_send FUTURE_SEND identifier {
+                  $$ = rb_funcall(self, rb_intern("ast:future_send:to:"), 3, INT2NUM(yylineno), $3, $1);
+                }
+                | exp ASYNC_SEND identifier {
+                  $$ = rb_funcall(self, rb_intern("ast:async_send:to:"), 3, INT2NUM(yylineno), $3, $1);
+                }
+                | unary_send ASYNC_SEND identifier {
+                  $$ = rb_funcall(self, rb_intern("ast:async_send:to:"), 3, INT2NUM(yylineno), $3, $1);
+                }
                 ;
 
 operator_send:  exp operator arg_exp {
@@ -434,6 +448,26 @@ operator_send:  exp operator arg_exp {
                 | operator arg_exp {
                   $$ = rb_funcall(self, rb_intern("ast:oper:arg:"), 3, INT2NUM(yylineno), $1, $2);
                 }
+                | exp FUTURE_SEND operator arg_exp {
+                  $$ = rb_funcall(self, rb_intern("ast:future_oper:arg:to:"), 4, INT2NUM(yylineno), $3, $4, $1);
+                }
+                | exp FUTURE_SEND operator DOT space arg_exp {
+                  $$ = rb_funcall(self, rb_intern("ast:future_oper:arg:to:"), 4, INT2NUM(yylineno), $3, $6, $1);
+                }
+                | exp FUTURE_SEND LBRACKET exp RBRACKET {
+                  $$ = rb_funcall(self, rb_intern("ast:future_oper:arg:to:"), 4,
+                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]"), $4, $1);
+                }
+                | exp ASYNC_SEND operator arg_exp {
+                  $$ = rb_funcall(self, rb_intern("ast:async_oper:arg:to:"), 4, INT2NUM(yylineno), $3, $4, $1);
+                }
+                | exp ASYNC_SEND operator DOT space arg_exp {
+                  $$ = rb_funcall(self, rb_intern("ast:async_oper:arg:to:"), 4, INT2NUM(yylineno), $3, $6, $1);
+                }
+                | exp ASYNC_SEND LBRACKET exp RBRACKET {
+                  $$ = rb_funcall(self, rb_intern("ast:async_oper:arg:to:"), 4,
+                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]"), $4, $1);
+                }
                 ;
 
 message_send:   unary_send
@@ -444,6 +478,12 @@ message_send:   unary_send
                 | send_args {
                   $$ = rb_funcall(self, rb_intern("ast:send:"), 2, INT2NUM(yylineno), $1);
                 }
+                | exp FUTURE_SEND send_args {
+                  $$ = rb_funcall(self, rb_intern("ast:future_send:to:"), 3, INT2NUM(yylineno), $3, $1);
+                }
+                | exp ASYNC_SEND send_args {
+                  $$ = rb_funcall(self, rb_intern("ast:async_send:to:"), 3, INT2NUM(yylineno), $3, $1);
+                }
                 ;
 
 send_args:      selector arg_exp {
@@ -576,7 +616,7 @@ string_literal: STRING_LITERAL {
                   $$ = fy_terminal_node(self, "ast:string:");
                 }
                 | MULTI_STRING_LITERAL {
-                  $$ = fy_terminal_node(self, "ast:string:");
+                  $$ = fy_terminal_node(self, "ast:multi_line_string:");
                 }
                 ;
 symbol_literal: SYMBOL_LITERAL {
@@ -702,8 +742,8 @@ key_value_list: exp space ARROW space exp {
                 }
                 ;
 
-match_expr:     MATCH exp THIN_ARROW LCURLY space match_body space RCURLY {
-                  $$ = rb_funcall(self, rb_intern("ast:match_expr:body:"), 3, INT2NUM(yylineno), $2, $6);
+match_expr:     MATCH exp LCURLY space match_body space RCURLY {
+                  $$ = rb_funcall(self, rb_intern("ast:match_expr:body:"), 3, INT2NUM(yylineno), $2, $5);
                 }
                 ;
 

data/lib/parser/methods.fy

@@ -1,5 +1,9 @@
+require: "parse_error"
+
 class Fancy {
   class Parser {
+    SelectorVarDefault = Struct.new('selector, 'variable, 'default)
+    SelectorValue = Struct new('selector, 'value)
 
     def self parse_file: filename line: line (1) {
       new: filename line: line . parse_file . script
@@ -60,7 +64,7 @@ class Fancy {
 
     def ast: line string: text {
       str = text from: 1 to: -2
-      match str -> {
+      match str {
         # OK, I know this is ugly. But it works for now, so let's just go with it.
         # TODO: Clean this up or make it simpler...
 
@@ -89,6 +93,10 @@ class Fancy {
       }
     }
 
+    def ast: line multi_line_string: string {
+      ast: line string: (string from: 2 to: -3)
+    }
+
     def ast: line array: expr_ary {
       AST ArrayLiteral new: line array: expr_ary
     }
@@ -137,11 +145,11 @@ class Fancy {
     }
 
     def ast: line param: selector var: variable default: default (nil) {
-      Struct.new('selector, 'variable, 'default) new(selector, variable, default)
+      SelectorVarDefault new(selector, variable, default)
     }
 
     def ast: line send: selector arg: value ary: ary ([]) {
-      ary << $ Struct new('selector, 'value) new(selector, value)
+      ary << $ SelectorValue new(selector, value)
     }
 
     def ast: line oper: oper arg: arg to: receiver (AST Self new: line) {
@@ -149,6 +157,16 @@ class Fancy {
       ast: line send: message to: receiver
     }
 
+    def ast: line future_oper: oper arg: arg to: receiver {
+      oper_send = ast: line oper: oper arg: arg to: receiver
+      AST FutureSend new: line message_send: oper_send
+    }
+
+    def ast: line async_oper: oper arg: arg to: receiver {
+      oper_send = ast: line oper: oper arg: arg to: receiver
+      AST AsyncSend new: line message_send: oper_send
+    }
+
     def ast: line send: message to: receiver (AST Self new: line) ruby: ruby (nil) {
       args = ruby if_do: {
         unless: receiver do: {
@@ -171,6 +189,16 @@ class Fancy {
       AST MessageSend new: line message: name to: receiver args: args
     }
 
+    def ast: line future_send: message to: receiver ruby: ruby (nil) {
+      message_send = ast: line send: message to: receiver ruby: ruby
+      AST FutureSend new: line message_send: message_send
+    }
+
+    def ast: line async_send: message to: receiver ruby: ruby (nil) {
+      message_send = ast: line send: message to: receiver ruby: ruby
+      AST AsyncSend new: line message_send: message_send
+    }
+
     def method_name: margs {
       margs map: |a| { a selector() string } . join("")
     }
@@ -192,7 +220,7 @@ class Fancy {
 
           doc = AST StringLiteral new: line value: ("Forward to message " ++ target)
           body = AST ExpressionList new: line  list: [doc, forward]
-          block call: [[required, body]]
+          block call: [required, body]
         }
       }
     }
@@ -285,13 +313,12 @@ class Fancy {
     }
 
     def ast: line parse_error: text {
-      ("Parse error near `" ++ text ++ "' at line " ++ line ++ " at " ++ @filename) . raise!
+      ParseError new: line message: text filename: @filename . raise!
     }
 
     def ast: line file_error: text {
-      ("File error `" ++ text ++ "' while trying to parse " ++ @filename) . raise!
+      ("File error '" ++ text ++ "' while trying to parse " ++ @filename) . raise!
     }
-
   }
 }
 

data/lib/parser/parse_error.fy

@@ -0,0 +1,10 @@
+class Fancy {
+  class Parser {
+    class ParseError : StdError {
+      read_slots: ['line, 'filename]
+      def initialize: @line message: @message filename: @filename {
+        initialize: $ "Parse error near '" ++ @message ++ "' at line " ++ @line ++ " in " ++ @filename
+      }
+    }
+  }
+}

data/lib/proxy.fy

@@ -0,0 +1,16 @@
+class ProxyReceiver : BasicObject {
+  """
+  A ProxyReceiver is an object which proxies all message sends to it to 2 other objects.
+  It will send each message first to its @proxy instance variable and then to the @obj instance variable.
+  """
+
+  def initialize: @proxy for: @obj {
+  }
+
+  def unknown_message: msg with_params: params {
+    @proxy send: msg params: params
+    @obj send: msg params: params
+  }
+}
+
+Proxy = ProxyReceiver

data/lib/rbx.fy

@@ -35,3 +35,6 @@ require: "rbx/name_error"
 require: "rbx/no_method_error"
 require: "rbx/match_data"
 require: "rbx/thread"
+require: "rbx/fiber"
+require: "rbx/date"
+require: "rbx/time"

data/lib/rbx/array.fy

@@ -8,6 +8,8 @@ class Array {
   ruby_alias: 'sort
   ruby_alias: 'pop
   ruby_alias: 'last
+  ruby_alias: 'shuffle
+  ruby_alias: 'inspect
 
   def Array new: size with: default {
     "Creates a new Array with a given size and default-value."
@@ -27,12 +29,13 @@ class Array {
     arr each: |x| {
       self << x
     }
+    self
   }
 
   def includes?: obj {
     "Indicates, if an Array includes a given value."
 
-    self include?(obj)
+    include?(obj)
   }
 
   def clone {
@@ -45,7 +48,12 @@ class Array {
   }
 
   def each: block {
-    "Calls a given Block with each element in the Array."
+    """
+    @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] }
@@ -53,12 +61,14 @@ class Array {
   }
 
   def remove_at: index {
-    """Removes an element at a given index.
-     If given an Array of indices, removes all the elements with these indices.
-     Returns the deleted object if an index was given, the last deleted object for an Array given."""
+    """
+    Removes an element at a given index.
+    If given an Array of indices, removes all the elements with these indices.
+    Returns the deleted object if an index was given, the last deleted object for an Array given.
+    """
 
     if: (index is_a?: Fixnum) then: {
-      deleted = self at: index
+      deleted = at: index
       delete_at(index)
       return deleted
     } else: {
@@ -66,7 +76,7 @@ class Array {
         count = 0
         deleted_values = []
         index each: |idx| {
-          deleted_values << (self at: (idx - count))
+          deleted_values << (at: (idx - count))
           delete_at(idx - count)
           count = count + 1
         }
@@ -77,39 +87,34 @@ class Array {
   }
 
   def at: idx {
-    "Returns the element in the Array at a given index."
+    """
+    @idx Index for value to retrieve.
+    @return Value with the given index (if available), or @nil.
+
+    Returns the element in the @Array@ at a given index.
+    """
 
     ruby: '[] args: [idx]
   }
 
   def at: idx put: obj {
-    "Inserts a given object at a given index (position) in the Array."
-
-    ruby: '[]= args: [idx, obj]
-  }
-
-  def first {
-    "Returns the first element in the Array."
-    at: 0
-  }
-
-  def second {
-    "Returns the second element in the Array"
-    at: 1
-  }
+    """
+    @idx Index to set a value for.
+    @obj Value (object) to be set at the given index.
+    @return @obj
 
-  def third {
-    "Returns the third element in the Array"
-    at: 2
-  }
+    Inserts a given object at a given index (position) in the Array.
+    """
 
-  def fourth {
-    "Returns the fourth element in the Array"
-    at: 3
+    ruby: '[]= args: [idx, obj]
   }
 
   def each_with_index: block {
-    "Iterate over all elements in Array. Calls a given Block with each element and its index."
+    """
+    @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| {
@@ -119,12 +124,22 @@ class Array {
   }
 
   def index: item {
-    "Returns the index of an item (or nil, if it isn't in the Array)."
+    """
+    @item Item/Value for which the index is requested within an @Array@.
+    @return Index of the value passed in within the @Array@, or @nil, if value not present.
+
+    Returns the index of an item (or nil, if it isn't in the @Array@).
+    """
     index(item)
   }
 
   def indices_of: item {
-    "Returns an Array of all indices of this item. Empty Array if item does not occur."
+    """
+    @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| {
@@ -136,38 +151,61 @@ class Array {
   }
 
   def from: from to: to {
-    "Returns sub-array starting at from: and going 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 = self size + from
+      from = size + from
     }
     if: (to < 0) then: {
-      to = self size + to
+      to = size + to
     }
     subarr = []
     from upto: to do_each: |i| {
-      subarr << (self at: i)
+      subarr << (at: i)
     }
     subarr
   }
 
   def last: count {
-    "Returns new Array with last n elements specified."
+    """
+    @count Number of last elements to get from an @Array@.
+    @return @Array@ with up to @count size of last elements in @self.
+
+    Returns new Array with last n elements specified.
+    """
     last(count)
   }
 
   def any?: block {
-    "Takes condition-block and returns true if any element meets it."
+    """
+    @block Predicate @Block@ to be called for each element until it returns @true for any one of them.
+    @return @true if any element in @self yields @true for @block, @false otherwise.
+
+    Takes condition-block and returns @true if any element meets it.
+    """
     any?(&block)
   }
 
   def all?: block {
-    "Takes condition-block and returns true if all elements meet it."
+    """
+    @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.
+    """
     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.
     """
@@ -183,7 +221,7 @@ class Array {
 
   def select_with_index: block {
     """
-    Same as select, just gets also called with an additional argument
+    Same as select:, just gets also called with an additional argument
     for each element's index value.
     """