fancy 0.9.0 → 0.10.0

data/lib/parser/ext/parser.h

@@ -0,0 +1,135 @@
+/* A Bison parser, made by GNU Bison 2.7.  */
+
+/* Bison interface for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2012 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.  */
+
+#ifndef YY_YY_USERS_BAKKDOOR_PROJECTS_FANCY_FANCY_LIB_PARSER_EXT_PARSER_H_INCLUDED
+# define YY_YY_USERS_BAKKDOOR_PROJECTS_FANCY_FANCY_LIB_PARSER_EXT_PARSER_H_INCLUDED
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* 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,
+     LEFTHASH = 267,
+     RIGHTHASH = 268,
+     STAB = 269,
+     ARROW = 270,
+     THIN_ARROW = 271,
+     COMMA = 272,
+     SEMI = 273,
+     NL = 274,
+     COLON = 275,
+     RETURN_LOCAL = 276,
+     RETURN = 277,
+     TRY = 278,
+     CATCH = 279,
+     FINALLY = 280,
+     RETRY = 281,
+     SUPER = 282,
+     CLASS = 283,
+     DEF = 284,
+     DOT = 285,
+     DOLLAR = 286,
+     EQUALS = 287,
+     MATCH = 288,
+     CASE = 289,
+     IDENTIFIER = 290,
+     SELECTOR = 291,
+     RUBY_SEND_OPEN = 292,
+     RUBY_OPER_OPEN = 293,
+     CONSTANT = 294,
+     INTEGER_LITERAL = 295,
+     HEX_LITERAL = 296,
+     OCT_LITERAL = 297,
+     BIN_LITERAL = 298,
+     DOUBLE_LITERAL = 299,
+     STRING_LITERAL = 300,
+     MULTI_STRING_LITERAL = 301,
+     SYMBOL_LITERAL = 302,
+     REGEX_LITERAL = 303,
+     OPERATOR = 304,
+     BACKTICK_LITERAL = 305
+   };
+#endif
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+/* Line 2065 of yacc.c  */
+#line 18 "/Users/bakkdoor/projects/fancy/fancy/lib/parser/ext/parser.y"
+
+  VALUE object;
+  ID    symbol;
+
+
+/* Line 2065 of yacc.c  */
+#line 113 "/Users/bakkdoor/projects/fancy/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;
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (VALUE self);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+#endif /* !YY_YY_USERS_BAKKDOOR_PROJECTS_FANCY_FANCY_LIB_PARSER_EXT_PARSER_H_INCLUDED  */

data/lib/parser/ext/parser.y

@@ -86,6 +86,8 @@ extern char *yytext;
 %type <object>          operator
 %type  <object>         selector
 
+%type  <object>         def
+
 
 %type  <object>         identifier
 %type  <object>         any_identifier
@@ -116,14 +118,10 @@ extern char *yytext;
 %type  <object>         return_local_statement
 %type  <object>         return_statement
 
-%type  <object>         def
-
 %type  <object>         const_identifier
 %type  <object>         class_def
 %type  <object>         class_no_super
 %type  <object>         class_super
-%type  <object>         class_method_w_args
-%type  <object>         class_method_no_args
 
 %type  <object>         method_def
 %type  <object>         method_args
@@ -132,8 +130,8 @@ extern char *yytext;
 %type  <object>         method_arg_default
 %type  <object>         method_w_args
 %type  <object>         method_no_args
-%type  <object>         operator_def
-%type  <object>         class_operator_def
+%type  <object>         method_spec
+%type  <object>         operator_spec
 
 %type  <object>         message_send
 %type  <object>         unary_send
@@ -321,9 +319,6 @@ const_identifier: constant {
                 }
                 ;
 
-def:            DEF { $$ = rb_intern("public"); }
-                ;
-
 class_no_super: CLASS const_identifier expression_block {
                   $$ = rb_funcall(self, rb_intern("ast:class:parent:body:"), 4, INT2NUM(yylineno), $2, Qnil, $3);
                 }
@@ -340,103 +335,86 @@ class_super:    CLASS const_identifier COLON const_identifier expression_block {
                 }
                 ;
 
-method_def:     method_w_args
-                | method_no_args
-                | class_method_w_args
-                | class_method_no_args
-                | operator_def
-                | class_operator_def
-                ;
-
-method_arg:     selector identifier {
-                  $$ = rb_funcall(self, rb_intern("ast:param:var:"), 3, INT2NUM(yylineno), $1, $2);
+def:            DEF { 
+                  $$ = rb_intern("def:");
                 }
                 ;
 
-method_args:    method_arg {
-                  $$ = rb_funcall(self, rb_intern("ast:concat:"), 2, INT2NUM(yylineno), $1);
-                }
-                | method_args method_arg {
-                  $$ = rb_funcall(self, rb_intern("ast:concat:into:"), 3, INT2NUM(yylineno), $2, $1);
-                }
-                | 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_def:     def method_spec {
+                  $$ = rb_funcall(self, rb_intern("ast:define:method:on:"), 4, INT2NUM(yylineno), $1, $2, Qnil);
                 }
-                ;
-
-method_arg_default: selector identifier LPAREN space exp space RPAREN {
-                  $$ = rb_funcall(self, rb_intern("ast:param:var:default:"), 4, INT2NUM(yylineno), $1, $2, $5);
+                | def any_identifier method_spec {
+                  $$ = rb_funcall(self, rb_intern("ast:define:method:on:"), 4, INT2NUM(yylineno), $1, $3, $2);
+                } 
+                | any_identifier def method_spec {
+                  $$ = rb_funcall(self, rb_intern("ast:define:method:on:"), 4, INT2NUM(yylineno), $2, $3, $1);
                 }
                 ;
 
-method_args_default: method_arg_default {
-                  $$ = rb_funcall(self, rb_intern("ast:concat:"), 2, INT2NUM(yylineno), $1);
-                }
-                | method_args_default space method_arg_default {
-                  $$ = rb_funcall(self, rb_intern("ast:concat:into:"), 3, INT2NUM(yylineno), $3, $1);
-                }
+method_spec:      operator_spec
+                | method_w_args
+                | method_no_args
                 ;
 
-method_w_args:  def method_args expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:method:expand:access:"), 4, INT2NUM(yylineno), $2, $3, $1);
+method_w_args:  method_args expression_block {
+                  $$ = rb_funcall(self, rb_intern("ast:method_spec:expand:"), 3, INT2NUM(yylineno), $1, $2);
                 }
-                | def method_args {
-                  $$ = rb_funcall(self, rb_intern("ast:method:expand:access:"), 4, INT2NUM(yylineno), $2, Qnil, $1);
+                | method_args {
+                  $$ = rb_funcall(self, rb_intern("ast:method_spec:expand:"), 3, INT2NUM(yylineno), $1, Qnil);
                 }
                 ;
 
 
-method_no_args: def identifier expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:method:body:access:"), 4, INT2NUM(yylineno), $2, $3, $1);
+method_no_args: identifier expression_block {
+                  $$ = rb_funcall(self, rb_intern("ast:method_spec:body:"), 3, INT2NUM(yylineno), $1, $2);
                 }
-                | def identifier {
-                  $$ = rb_funcall(self, rb_intern("ast:method:body:access:"), 4, INT2NUM(yylineno), $2, Qnil, $1);
+                | identifier {
+                  $$ = rb_funcall(self, rb_intern("ast:method_spec:body:"), 3, INT2NUM(yylineno), $1, Qnil);
                 }
                 ;
 
-
-class_method_w_args: def any_identifier method_args expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:method:expand:access:owner:"), 5, INT2NUM(yylineno), $3, $4, $1, $2);
+operator_spec:   operator identifier expression_block {
+                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:body:"), 4, INT2NUM(yylineno), $1, $2, $3);
+                }
+                | LBRACKET identifier RBRACKET expression_block {
+                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:body:"), 4,
+                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]"), $2, $4);
                 }
-                | def any_identifier method_args {
-                  $$ = rb_funcall(self, rb_intern("ast:method:expand:access:owner:"), 5, INT2NUM(yylineno), $3, Qnil, $1, $2);
+                | LBRACKET identifier RBRACKET COLON identifier expression_block {
+                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:arg:body:"), 5,
+                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]:"), $2, $5, $6);
                 }
                 ;
 
-class_method_no_args: def any_identifier identifier expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:method:body:access:owner:"), 5, INT2NUM(yylineno), $3, $4, $1, $2);
-                }
-                | def any_identifier identifier {
-                  $$ = rb_funcall(self, rb_intern("ast:method:body:access:owner:"), 5, INT2NUM(yylineno), $3, Qnil, $1, $2);
+method_arg:     selector identifier {
+                  $$ = rb_funcall(self, rb_intern("ast:param:var:"), 3, INT2NUM(yylineno), $1, $2);
                 }
                 ;
 
-operator_def:   def operator identifier expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:body:access:"), 5, INT2NUM(yylineno), $2, $3, $4, $1);
+method_args:    method_arg {
+                  $$ = rb_funcall(self, rb_intern("ast:concat:"), 2, INT2NUM(yylineno), $1);
                 }
-                | def LBRACKET identifier RBRACKET expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:body:access:"), 5,
-                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]"), $3, $5, $1);
+                | method_args method_arg {
+                  $$ = rb_funcall(self, rb_intern("ast:concat:into:"), 3, INT2NUM(yylineno), $2, $1);
                 }
-                | def LBRACKET identifier RBRACKET COLON identifier expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:arg:body:access:"), 6,
-                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]:"), $3, $6, $7, $1);
+                | 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);
                 }
                 ;
 
-class_operator_def: def any_identifier operator identifier expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:body:access:owner:"), 6, INT2NUM(yylineno), $3, $4, $5, $1, $2);
+method_arg_default: selector identifier LPAREN space exp space RPAREN {
+                  $$ = rb_funcall(self, rb_intern("ast:param:var:default:"), 4, INT2NUM(yylineno), $1, $2, $5);
                 }
-                | def any_identifier LBRACKET identifier RBRACKET expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:body:access:owner:"), 6,
-                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]"), $4, $6, $1, $2);
+                ;
+
+method_args_default: method_arg_default {
+                  $$ = rb_funcall(self, rb_intern("ast:concat:"), 2, INT2NUM(yylineno), $1);
                 }
-                | def any_identifier LBRACKET identifier RBRACKET COLON identifier expression_block {
-                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:arg:body:access:owner:"), 7,
-                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]:"), $4, $7, $8, $1, $2);
+                | method_args_default space method_arg_default {
+                  $$ = rb_funcall(self, rb_intern("ast:concat:into:"), 3, INT2NUM(yylineno), $3, $1);
                 }
                 ;
 

data/lib/parser/methods.fy

@@ -250,14 +250,22 @@ class Fancy {
       }
     }
 
-    def ast: line oper: op arg: arg body: body access: access ('public) owner: owner (nil) {
+    def ast: line oper: op arg: arg body: body {
       margs = [ast: line param: op var: arg]
-      ast: line method: margs body: body access: access owner: owner
+      ast: line method_spec: margs body: body
     }
 
-    def ast: line oper: op arg: arg1 arg: arg2 body: body access: access ('public) owner: owner (nil) {
+    def ast: line oper: op arg: arg1 arg: arg2 body: body {
       margs = [SelectorVarDefault new(op, arg1, nil), SelectorVarDefault new(ast: line identifier: "", arg2, nil)]
-      ast: line method: margs body: body access: access owner: owner
+      ast: line method_spec: margs body: body
+    }
+
+    def ast: line define: define method: spec on: receiver {
+      ary = []
+      Array(spec) each: |spec| {
+        ary << $ ast: (spec line) method: (spec margs) body: (spec body) access: 'public owner: receiver
+      }
+      AST ExpressionList new: line list: ary
     }
 
     def ast: line method: margs body: body access: access ('public) owner: owner (nil) {
@@ -283,13 +291,17 @@ class Fancy {
       }
     }
 
-    def ast: line method: margs expand: body access: access ('public) owner: owner (nil) {
+    def ast: line method_spec: margs expand: body {
       defs = []
       method: margs delegators: |sel fwd| {
-        defs << $ ast: line method: sel body: fwd access: access owner: owner
+        defs << $ ast: line method_spec: sel body: fwd
       }
-      defs << $ ast: line method: margs body: body access: access owner: owner
-      AST ExpressionList new: line list: defs
+      defs << $ ast: line method_spec: margs body: body
+      defs
+    }
+
+    def ast: line method_spec: margs body: body {
+      AST MethodSpec new: line margs: margs body: body
     }
 
     def ast: line block: body {

data/lib/parser/parse_error.fy

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

data/lib/range.fy

@@ -23,6 +23,6 @@ class Range {
     @return @String@ representation of @self.
     """
 
-    "(" ++ @start ++ ".." ++ @end ++ ")"
+    "(#{@start}..#{@end})"
   }
 }

data/lib/rbx.fy

@@ -18,6 +18,7 @@ require: "rbx/integer"
 require: "rbx/fixnum"
 require: "rbx/float"
 require: "rbx/bignum"
+require: "rbx/scopes"
 require: "rbx/block"
 require: "rbx/tuple"
 require: "rbx/range"

data/lib/rbx/block.fy

@@ -96,15 +96,3 @@ class Block {
     Proc new(&self)
   }
 }
-
-class Rubinius VariableScope {
-  forwards_unary_ruby_methods
-
-  def receiver {
-    @self
-  }
-
-  def receiver: recv {
-    @self = recv
-  }
-}

data/lib/rbx/class.fy

@@ -1,5 +1,5 @@
 class Class {
-  ruby_aliases: [ 'superclass, '===, 'ancestors, 'instance_methods, 'methods, 'to_s ]
+  ruby_aliases: [ 'superclass, '===, 'ancestors, 'instance_methods, 'methods, 'to_s, 'constants ]
 
   def new {
     """

data/lib/rbx/compiled_method.fy

@@ -29,3 +29,7 @@ class Rubinius CompiledMethod {
     defined_line
   }
 }
+
+class Rubinius CompiledCode {
+  forwards_unary_ruby_methods
+}

data/lib/{eval.fy → rbx/eval.fy}

@@ -1,4 +1,4 @@
-require: "compiler"
+require: "../compiler"
 
 def Fancy eval: code binding: binding (nil) file: file ("(fancy-eval)") line: line (1) {
   """
@@ -10,8 +10,8 @@ def Fancy eval: code binding: binding (nil) file: file ("(fancy-eval)") line: li
 
   binding if_nil: {
     binding = Binding setup(Rubinius VariableScope of_sender(),
-                        Rubinius CompiledMethod of_sender(),
-                        Rubinius StaticScope of_sender())
+                            Rubinius CompiledMethod of_sender(),
+                            Rubinius StaticScope of_sender())
   }
 
   # The compiled method