fancy 0.3.3 → 0.4.0

data/lib/package.fy

@@ -25,9 +25,14 @@ class Fancy Package {
   """
 
   ENV_PACKAGE_DIR_VAR = "FANCY_PACKAGE_DIR"
+  DEFAULT_FANCY_ROOT = ENV["HOME"] ++ "/.fancy"
+  DEFAULT_PACKAGES_PATH = DEFAULT_FANCY_ROOT ++ "/packages"
+  DEFAULT_PACKAGES_LIB_PATH = DEFAULT_PACKAGES_PATH ++ "/lib"
 
   def self install: package_name {
     """
+    @package_name Name of package to install.
+
     Installs a package with a given name.
     Expects package_name to be a string in the form of:
         user/repo
@@ -38,22 +43,40 @@ class Fancy Package {
   }
 
   def self uninstall: package_name {
+    """
+    @package_name Name of package to uninstall.
+
+    Uninstalls a package with a given name (if installed).
+    """
+
     Uninstaller new: package_name . run
   }
 
   def self list_packages {
+    """
+    Lists (prints) all installed packages on this system.
+    """
+
     Fancy Package List new: package_list_file . println
   }
 
   def self root_dir {
+    """
+    @return Fancy Package root install dir.
+    """
+
     if: (ENV[ENV_PACKAGE_DIR_VAR]) then: |path| {
       return path
     } else: {
-      return Fancy Package Installer DEFAULT_PACKAGES_PATH
+      return DEFAULT_PACKAGES_PATH
     }
   }
 
   def self package_list_file {
+    """
+    @return Path to installed_packages.txt @File@ on system.
+    """
+
     "#{self root_dir}/installed_packages.txt"
   }
 

data/lib/package/installer.fy

@@ -13,10 +13,6 @@ class Fancy Package {
 
     """
 
-    DEFAULT_FANCY_ROOT = ENV["HOME"] ++ "/.fancy"
-    DEFAULT_PACKAGES_PATH = DEFAULT_FANCY_ROOT ++ "/packages"
-    DEFAULT_PACKAGES_LIB_PATH = DEFAULT_PACKAGES_PATH ++ "/lib"
-
     def initialize: @package_name version: @version ("latest") install_path: @install_path (ENV["FANCY_PACKAGE_DIR"]) {
       """
       Creates a new @Package Installer@ for a given package name, an
@@ -37,11 +33,11 @@ class Fancy Package {
       }
 
       @install_path if_nil: {
-        @install_path = DEFAULT_PACKAGES_PATH
-        Directory create!: DEFAULT_FANCY_ROOT
-        Directory create!: DEFAULT_PACKAGES_PATH
-        Directory create!: DEFAULT_PACKAGES_LIB_PATH
-        Directory create!: $ DEFAULT_PACKAGES_PATH ++ "/downloads"
+        @install_path = Fancy Package DEFAULT_PACKAGES_PATH
+        Directory create!: $ Fancy Package DEFAULT_FANCY_ROOT
+        Directory create!: $ Fancy Package DEFAULT_PACKAGES_PATH
+        Directory create!: $ Fancy Package DEFAULT_PACKAGES_LIB_PATH
+        Directory create!: $ Fancy Package DEFAULT_PACKAGES_PATH ++ "/downloads"
       }
 
       @download_path = @install_path ++ "/downloads"

data/lib/package/specification.fy

@@ -15,7 +15,7 @@ class Fancy Package {
 
       block call_with_receiver: self
 
-      @@specs at: @package_name put: self
+      @@specs[@package_name]: self
     }
 
     def dependencies: dependencies {
@@ -52,7 +52,7 @@ class Fancy Package {
       "name=#{@package_name} version=#{@version} url=https://github.com/#{@gh_user}/#{@package_name}"
     }
 
-    def self [] package_name {
+    def self [package_name] {
       @@specs[package_name]
     }
 

data/lib/parser/ext/lexer.lex

@@ -16,7 +16,7 @@ lower           [a-z]
 letter          [A-Za-z]
 special         [-+?!=*/^><%&~]
 special_under   ({special}|"_")
-operator        ({special}+|"||"{special_under}*)
+operator        ({special}+|" | "|"||"{special_under}*)
 int_lit 	[-+]?{digit}({digit}|_{digit})*
 double_lit      {int_lit}\.{digit}+
 hex_lit         0[xX]{hexdigit}+
@@ -42,23 +42,22 @@ thin_arrow      "->"
 delimiter       [ \n\r\t\(\)]
 return_local    "return_local"
 return          "return"
-require         "require:"
 try             "try"
 catch           "catch"
 finally         "finally"
 retry           "retry"
 super           "super"
-private         "private"
-protected       "protected"
 self            "self"
 match           "match"
 case            "case"
 identifier      @?@?({lower}|[_&*])({letter}|{digit}|{special_under})*
+label           @{identifier}@
+goto_           "goto"
 selector        ({letter}|[_&*])({letter}|{digit}|{special_under})*":"
 constant        {capital}({letter}|{digit}|{special_under})*
 nested_constant ({constant}::)+{constant}
-symbol_lit      \'({identifier}|{operator}|{constant}|:|"[]")+
-ruby_send_open  {identifier}{lparen}
+symbol_lit      \'({identifier}|{operator}|{constant}|:|"[]"|"|")+
+ruby_send_open  ({constant}|{identifier}){lparen}
 ruby_oper_open  {operator}{lparen}
 regexp_lit      "/".*"/"
 comma           ,
@@ -118,8 +117,8 @@ escaped_newline "\\".*\n
 {rcurly}        { return RCURLY; }
 {lbracket}      { return LBRACKET; }
 {rbracket}      { return RBRACKET; }
-{lhash}         { return LHASH; }
-{rhash}         { return RHASH; }
+{lhash}         { return LEFTHASH; }
+{rhash}         { return RIGHTHASH; }
 {stab}          { return STAB; }
 {arrow}         { return ARROW; }
 {thin_arrow}    { return THIN_ARROW; }
@@ -130,14 +129,11 @@ escaped_newline "\\".*\n
                 }
 {return_local}  { return RETURN_LOCAL; }
 {return}        { return RETURN; }
-{require}       { return REQUIRE; }
 {try}           { return TRY; }
 {catch}         { return CATCH; }
 {finally}       { return FINALLY; }
 {retry}         { return RETRY; }
 {super}         { return SUPER; }
-{private}       { return PRIVATE; }
-{protected}     { return PROTECTED; }
 {self}          {
                   yylval.object = rb_str_new2(yytext);
                   return IDENTIFIER;
@@ -148,6 +144,14 @@ escaped_newline "\\".*\n
 {case}          {
                   return CASE;
                 }
+{goto_}         {
+                  yylval.object = rb_str_new2(yytext);
+                  return GOTO;
+                }
+{label}         {
+                  yylval.object = rb_str_new2(yytext);
+                  return LABEL;
+                }
 {identifier}    {
                   yylval.object = rb_str_new2(yytext);
                   return IDENTIFIER;

data/lib/parser/ext/parser.y

@@ -31,8 +31,8 @@ extern char *yytext;
 %token                  RCURLY
 %token                  LBRACKET
 %token                  RBRACKET
-%token                  LHASH
-%token                  RHASH
+%token                  LEFTHASH
+%token                  RIGHTHASH
 %token                  STAB
 %token                  ARROW
 %token                  THIN_ARROW
@@ -42,14 +42,11 @@ extern char *yytext;
 %token                  COLON
 %token                  RETURN_LOCAL
 %token                  RETURN
-%token                  REQUIRE
 %token                  TRY
 %token                  CATCH
 %token                  FINALLY
 %token                  RETRY
 %token                  SUPER
-%token                  PRIVATE
-%token                  PROTECTED
 %token                  CLASS
 %token                  DEF
 %token                  DOT
@@ -58,6 +55,8 @@ extern char *yytext;
 %token                  MATCH
 %token                  CASE
 %token                  IDENTIFIER
+%token                  GOTO
+%token                  LABEL
 %token                  SELECTOR
 %token                  RUBY_SEND_OPEN
 %token                  RUBY_OPER_OPEN
@@ -91,6 +90,9 @@ extern char *yytext;
 
 
 %type  <object>         identifier
+%type  <object>         goto_statement
+%type  <object>         label_literal
+%type  <object>         label_statement
 %type  <object>         any_identifier
 %type  <object>         constant
 %type  <object>         literal_value
@@ -118,7 +120,6 @@ extern char *yytext;
 %type  <object>         identifier_list
 %type  <object>         return_local_statement
 %type  <object>         return_statement
-%type  <object>         require_statement
 
 %type  <object>         def
 
@@ -209,6 +210,7 @@ expression_block: LCURLY space expression_list space RCURLY {
                 }
                 ;
 
+
 partial_expression_block: AT_LCURLY space expression_list space RCURLY {
                    $$ = $3;
                 }
@@ -217,7 +219,23 @@ partial_expression_block: AT_LCURLY space expression_list space RCURLY {
 statement:      assignment
                 | return_local_statement
                 | return_statement
-                | require_statement
+                | label_statement
+                | goto_statement
+                ;
+
+label_literal: LABEL {
+                  $$ = fy_terminal_node(self, "ast:string_value:");
+                }
+                ;
+
+label_statement: label_literal {
+                  $$ = rb_funcall(self, rb_intern("ast:label:"), 2, INT2NUM(yylineno), $1);
+                }
+                ;
+
+goto_statement: GOTO label_literal {
+                  $$ = rb_funcall(self, rb_intern("ast:goto:"), 2, INT2NUM(yylineno), $2);
+                }
                 ;
 
 primary:        any_identifier
@@ -265,7 +283,8 @@ constant:       CONSTANT {
 
 selector:       SELECTOR {
                   $$ = fy_terminal_node(self, "ast:identifier:");
-                };
+                }
+                ;
 
 identifier:     IDENTIFIER {
                   $$ = fy_terminal_node(self, "ast:identifier:");
@@ -306,12 +325,6 @@ return_statement: RETURN exp {
                 }
                 ;
 
-require_statement: REQUIRE string_literal {
-                  $$ = rb_funcall(self, rb_intern("ast:require_:"), 2, INT2NUM(yylineno), $2);
-                }
-                | REQUIRE any_identifier {
-                  $$ = rb_funcall(self, rb_intern("ast:require_:"), 2, INT2NUM(yylineno), $2);
-                }
                 ;
 
 class_def:      class_no_super
@@ -326,19 +339,23 @@ const_identifier: constant {
                 }
                 ;
 
-def:            DEF PRIVATE { $$ = rb_intern("private"); }
-                | DEF PROTECTED { $$ = rb_intern("protected"); }
-                | DEF { $$ = rb_intern("public"); }
+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);
                 }
+                | CLASS const_identifier {
+                  $$ = rb_funcall(self, rb_intern("ast:class:parent:"), 3, INT2NUM(yylineno), $2, Qnil);
+                }
                 ;
 
 class_super:    CLASS const_identifier COLON const_identifier expression_block {
                   $$ = rb_funcall(self, rb_intern("ast:class:parent:body:"), 4, INT2NUM(yylineno), $2, $4, $5);
                 }
+                | CLASS const_identifier COLON const_identifier {
+                  $$ = rb_funcall(self, rb_intern("ast:class:parent:"), 3, INT2NUM(yylineno), $2, $4);
+                }
                 ;
 
 method_def:     method_w_args
@@ -384,40 +401,60 @@ method_args_default: method_arg_default {
 method_w_args:  def method_args expression_block {
                   $$ = rb_funcall(self, rb_intern("ast:method:expand:access:"), 4, INT2NUM(yylineno), $2, $3, $1);
                 }
+                | def method_args {
+                  $$ = rb_funcall(self, rb_intern("ast:method:expand:access:"), 4, INT2NUM(yylineno), $2, Qnil, $1);
+                }
                 ;
 
 
 method_no_args: def identifier expression_block {
                   $$ = rb_funcall(self, rb_intern("ast:method:body:access:"), 4, INT2NUM(yylineno), $2, $3, $1);
                 }
+                | def identifier {
+                  $$ = rb_funcall(self, rb_intern("ast:method:body:access:"), 4, INT2NUM(yylineno), $2, Qnil, $1);
+                }
                 ;
 
 
 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);
                 }
+                | def any_identifier method_args {
+                  $$ = rb_funcall(self, rb_intern("ast:method:expand:access:owner:"), 5, INT2NUM(yylineno), $3, Qnil, $1, $2);
+                }
                 ;
 
 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);
+                }
                 ;
 
 operator_def:   def operator identifier expression_block {
                   $$ = rb_funcall(self, rb_intern("ast:oper:arg:body:access:"), 5, INT2NUM(yylineno), $2, $3, $4, $1);
                 }
-                | def LBRACKET RBRACKET identifier expression_block {
+                | 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:", "[]"), $4, $5, $1);
+                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]"), $3, $5, $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);
                 }
                 ;
 
 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);
                 }
-                | def any_identifier LBRACKET RBRACKET identifier expression_block {
+                | 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:", "[]"), $5, $6, $1, $2);
+                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]"), $4, $6, $1, $2);
+                }
+                | 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);
                 }
                 ;
 
@@ -451,6 +488,10 @@ operator_send:  exp operator arg_exp {
                   $$ = rb_funcall(self, rb_intern("ast:oper:arg:to:"), 4,
                                   INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]"), $3, $1);
                 }
+                | exp LBRACKET exp RBRACKET COLON arg_exp {
+                  $$ = rb_funcall(self, rb_intern("ast:oper:arg:arg:to:"), 5,
+                                  INT2NUM(yylineno), fy_terminal_node_from(self, "ast:identifier:", "[]:"), $3, $6, $1);
+                }
                 | operator arg_exp {
                   $$ = rb_funcall(self, rb_intern("ast:oper:arg:"), 3, INT2NUM(yylineno), $1, $2);
                 }
@@ -484,6 +525,12 @@ message_send:   unary_send
                 | send_args {
                   $$ = rb_funcall(self, rb_intern("ast:send:"), 2, INT2NUM(yylineno), $1);
                 }
+                | unary_send FUTURE_SEND send_args {
+                  $$ = rb_funcall(self, rb_intern("ast:future_send:to:"), 3, INT2NUM(yylineno), $3, $1);
+                }
+                | unary_send ASYNC_SEND send_args {
+                  $$ = rb_funcall(self, rb_intern("ast:async_send:to:"), 3, INT2NUM(yylineno), $3, $1);
+                }
                 | exp FUTURE_SEND send_args {
                   $$ = rb_funcall(self, rb_intern("ast:future_send:to:"), 3, INT2NUM(yylineno), $3, $1);
                 }
@@ -698,10 +745,10 @@ empty_array:    LBRACKET space RBRACKET {
                 }
                 ;
 
-hash_literal:   LHASH space key_value_list space RHASH {
+hash_literal:   LEFTHASH space key_value_list space RIGHTHASH {
                   $$ = rb_funcall(self, rb_intern("ast:hash:"), 2, INT2NUM(yylineno), $3);
                 }
-                | LHASH space RHASH {
+                | LEFTHASH space RIGHTHASH {
                   $$ = rb_funcall(self, rb_intern("ast:hash:"), 2, INT2NUM(yylineno), Qnil);
                 }
                 ;

data/lib/parser/methods.fy

@@ -74,20 +74,19 @@ class Fancy {
           interpol_str = matches[2]
           suffix = matches[3]
 
-          binding = AST MessageSend new: line message: (ast: line identifier: "binding") to: (AST Self new: line) args: (AST RubyArgs new: line args: [])
-          evalstr = AST StringLiteral new: line value: interpol_str
-          msg = ast: line identifier: "eval:binding:"
-          binding_send = AST MessageSend new: line message: msg to: (ast: line identifier: "Fancy") \
-                                         args: (AST MessageArgs new: line args: [evalstr, binding])
-
           prefix_str = ast: line string: (" " + prefix + " ") # hack, pre- & append " " since it gets removed
           suffix_str = ast: line string: (" " + suffix + " ")
+          interpol_ast = AST StringInterpolation new: line code: interpol_str
           # create messagesend to concatenate:
           concat_ident = ast: line identifier: "++"
-          concat_prefix_send = AST MessageSend new: line message: concat_ident to: prefix_str args: (AST MessageArgs new: line args: [binding_send])
-          concat_suffix_send = AST MessageSend new: line message: concat_ident to: concat_prefix_send args: (AST MessageArgs new: line args: [suffix_str])
+          interpol_send = AST MessageSend new: line message: concat_ident to: prefix_str args: (AST MessageArgs new: line args: [interpol_ast])
+
+          # don't concatenate suffix if it's empty..
+          unless: (suffix == "") do: {
+            interpol_send = AST MessageSend new: line message: concat_ident to: interpol_send args: (AST MessageArgs new: line args: [suffix_str])
+          }
 
-          concat_suffix_send # this shall get returned, yo
+          interpol_send # this shall get returned, yo
         case _ ->
           AST StringLiteral new: line value: str
       }
@@ -164,6 +163,13 @@ class Fancy {
       ast: line send: message to: receiver
     }
 
+    def ast: line oper: oper arg: arg1 arg: arg2 to: receiver (AST Self new: line) {
+      m1 = SelectorValue new(oper, arg1)
+      m2 = SelectorValue new(ast: line identifier: "", arg2)
+      message = [m1, m2]
+      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
@@ -248,6 +254,11 @@ class Fancy {
       ast: line method: margs body: body access: access owner: owner
     }
 
+    def ast: line oper: op arg: arg1 arg: arg2 body: body access: access ('public) owner: owner (nil) {
+      margs = [SelectorVarDefault new(op, arg1, nil), SelectorVarDefault new(ast: line identifier: "", arg2, nil)]
+      ast: line method: margs body: body access: access owner: owner
+    }
+
     def ast: line method: margs body: body access: access ('public) owner: owner (nil) {
       if: (margs is_a?(AST Identifier)) then: {
         args = AST MethodArgs new: line args: []
@@ -296,11 +307,7 @@ class Fancy {
       AST BlockLiteral new: line args: args body: body
     }
 
-    def ast: line require_: file {
-      AST Require new: line file: file
-    }
-
-    def ast: line class: name parent: parent body: body {
+    def ast: line class: name parent: parent body: body (AST ExpressionList new: line) {
       AST ClassDef new: line name: name parent: parent body: body
     }
 
@@ -330,6 +337,18 @@ class Fancy {
       AST RubyArgs new: line args: args block: block
     }
 
+    def ast: line string_value: string {
+      string
+    }
+
+    def ast: line goto: label_name {
+      AST Goto new: line label_name: label_name
+    }
+
+    def ast: line label: label {
+      AST Label new: line name: label
+    }
+
     def ast: line parse_error: text {
       ParseError new: line message: text filename: @filename . raise!
     }