fancy 0.5.0 → 0.6.0

data/lib/main.fy

@@ -7,7 +7,7 @@
 if: (ARGV size == 1) then: {
   ARGV for_options: ["-v", "--version"] do: {
     "Fancy " ++ FANCY_VERSION println
-    "(C) 2010, 2011 Christopher Bertels <chris@fancy-lang.org>" println
+    "(C) 2010, 2011, 2012 Christopher Bertels <chris@fancy-lang.org>" println
     System exit
   }
 
@@ -24,6 +24,7 @@ if: (ARGV size == 1) then: {
      "",
      "Fancy package management:",
      "  install   [packagename] Install a Fancy package with a given name to $FANCYPACK_DIR",
+     "  install   --deps        Install dependencies specified in .fancypack file (expected in current directory).",
      "  uninstall [packagename] Uninstall a Fancy package with a given name from $FANCYPACK_DIR"] println
     System exit # quit when running --help
   }
@@ -59,7 +60,10 @@ ARGV for_option: "-cv" do: {
 }
 
 ARGV for_option: "install" do: |package_name| {
-  Fancy Package install: package_name
+  match package_name {
+    case "--deps" -> Fancy Package install_dependencies
+    case _ -> Fancy Package install: package_name
+  }
   System exit
 }
 

data/lib/message_sink.fy

@@ -0,0 +1,19 @@
+class Fancy {
+  class MessageSink : BasicObject {
+    """
+    A MessageSink just swallows all messages that are sent to it.
+    """
+
+    def unknown_message: m with_params: p {
+      """
+      @m Message sent to @self.
+      @p @Array@ of parameters sent along with @m.
+      @return @self.
+
+      Catches all messages and arguments and simply always returns @self.
+      """
+
+      self
+    }
+  }
+}

data/lib/number.fy

@@ -39,6 +39,25 @@ class Number {
     self
   }
 
+  def upto: num in_steps_of: steps do: block {
+    """
+    @num Maximum @Number@ to call @block with.
+    @steps @Number@ of numbers to skip each step.
+    @block A @Block@ that should be called every @steps steps between @self and @num.
+    @return @self
+
+    Calls @block every @steps steps between @self and @num with the current @Number@.
+    Expects @num to be greater or equal to @self.
+    """
+
+    i = self
+    while: { i <= num } do: {
+      block call: [i]
+      i = i + steps
+    }
+    self
+  }
+
   def downto: num {
     """
     @num @Number@ to create an @Array@ down to.
@@ -75,6 +94,25 @@ class Number {
     self
   }
 
+  def downto: num in_steps_of: steps do: block {
+    """
+    @num Minimum @Number@ to call @block with.
+    @steps @Number@ of numbers to skip each step.
+    @block A @Block@ that should be called every @steps steps between @self and @num.
+    @return @self
+
+    Calls @block every @steps steps between @self and @num with the current @Number@.
+    Expects @num to be smaller or equal to @self.
+    """
+
+    i = self
+    while: { i >= num } do: {
+      block call: [i]
+      i = i - steps
+    }
+    self
+  }
+
   def squared {
     """
     @return Squared value of @self.
@@ -95,6 +133,16 @@ class Number {
     self + self
   }
 
+  def cubed {
+    """
+    @return Cubed value of @self.
+
+    Returns the cubed value of a Number.
+    """
+
+    self ** 3
+  }
+
   def abs {
     """
     @return Absolute (positive) value of @self.

data/lib/object.fy

@@ -29,9 +29,9 @@ class Object {
   def println {
     """
     Same as:
-          Console println: self
+          *stdout* println: self
 
-    Prints @self on @STDOUT, followed by a newline.
+    Prints @self on @*stdout*, followed by a newline.
     """
 
     *stdout* println: to_s
@@ -40,9 +40,9 @@ class Object {
   def print {
     """
     Same as:
-          Console print: self
+          *stdout* print: self
 
-    Prints @self on STDOUT.
+    Prints @self on @*stdout*.
     """
 
     *stdout* print: to_s
@@ -149,19 +149,19 @@ class Object {
 
   def to_enum {
     """
-    @return @FancyEnumerator@ for @self using 'each: for iteration.
+    @return @Fancy::Enumerator@ for @self using 'each: for iteration.
     """
 
-    FancyEnumerator new: self
+    Fancy Enumerator new: self
   }
 
   def to_enum: iterator {
     """
     @iterator Message to use for iteration on @self.
-    @return @FancyEnumerator@ for @self using @iterator for iteration.
+    @return @Fancy::Enumerator@ for @self using @iterator for iteration.
     """
 
-    FancyEnumerator new: self with: iterator
+    Fancy Enumerator new: self with: iterator
   }
 
   def and: other {
@@ -539,11 +539,28 @@ class Object {
   }
 
   def copy_slots: slots from: object {
+    """
+    @slots @Fancy::Enumerable@ of slot names to copy from @object.
+    @object Target @Object@ to copy slots from.
+
+    Copies slots from @object to @self.
+    """
+
     slots each: |s| {
       set_slot: s value: (object get_slot: s)
     }
   }
 
+  def copy_slots_from: object {
+    """
+    @object @Object@ to copy slots from.
+
+    Copies all slots from @object to @self.
+    """
+
+    copy_slots: (object slots) from: object
+  }
+
   def get_slots: slots {
     """
     @slots @Array@ of slot names to retrieve from @self.
@@ -590,14 +607,24 @@ class Object {
     self
   }
 
+  def tap: block {
+    """
+    @block @Block@ to be called with @self.
+    @return @self.
+
+    Calls a given @Block@ with @self before returning @self.
+    """
+
+    block call: [self]
+    self
+  }
+
   def slots {
     """
-    @return @Set@ of slot names that @self has.
+    @return @Array@ of slot names that @self has.
     """
 
-    Set new: $ instance_variables map: |s| {
-      s rest to_sym
-    }
+    instance_variables map: @{ rest to_sym }
   }
 
   def sleep: seconds {
@@ -620,7 +647,7 @@ class Object {
     Dynamically rebinds @var_name as dynamic variable with @value as the value within @block.
 
     Example:
-          File open: \"/tmp/output.txt\" modes: ['write] with: |f| {
+          File write: \"/tmp/output.txt\" with: |f| {
             let: '*stdout* be: f in: {
               \"hello, world!\" println # writes it to file not STDOUT
             }
@@ -638,9 +665,34 @@ class Object {
     try {
       Thread current[var_name]: value
       retval = block call
+    } catch Exception => e {
+      e raise!
     } finally {
       Thread current[var_name]: oldval
       return retval
     }
   }
+
+  def with_output_to: filename do: block {
+    """
+    @filename Filename of file to write to.
+    @block @Block@ to be executed with *stdout* being bound to the output file.
+
+    Opens @filename and rebinds `*stdout*` to it within @block.
+
+    Example:
+          with_output_to: \"/tmp/hello_world.txt\" do: {
+            \"hello\" println
+            \"world\" println
+          }
+    This writes
+          hello
+          world
+    to /tmp/hello_world.txt
+    """
+
+    File write: filename with: |f| {
+      let: '*stdout* be: f in: block
+    }
+  }
 }

data/lib/package.fy

@@ -1,4 +1,5 @@
 require: "package/installer"
+require: "package/dependency_installer"
 require: "package/uninstaller"
 require: "package/dependency"
 require: "package/specification"
@@ -29,7 +30,7 @@ class Fancy Package {
   DEFAULT_PACKAGES_PATH = DEFAULT_FANCY_ROOT ++ "/packages"
   DEFAULT_PACKAGES_LIB_PATH = DEFAULT_PACKAGES_PATH ++ "/lib"
 
-  def self install: package_name {
+  def self install: package_name version: version ('latest) {
     """
     @package_name Name of package to install.
 
@@ -39,7 +40,16 @@ class Fancy Package {
     Which would get the package code from github.com/user/repo
     """
 
-    Installer new: package_name . run
+    Installer new: package_name version: version . run
+  }
+
+  def self install_dependencies {
+    """
+    Installs dependencies found in .fancypack file in the current directory.
+    If no .fancypack file is found, fails and quits.
+    """
+
+    DependencyInstaller new run
   }
 
   def self uninstall: package_name {

data/lib/package/dependency.fy

@@ -20,5 +20,18 @@ class Fancy Package {
 
     def initialize: @gem_name version: @version ('latest) {
     }
+
+    def install {
+      """
+      Installs the RubyDependency (a RubyGem) via rbx -S gem on the system.
+      """
+
+      match @version {
+        case 'latest ->
+          System do: "rbx gem install #{@gem_name}"
+        case _ ->
+          System do: "rbx gem install -v=#{@version} #{@gem_name}"
+      }
+    }
   }
 }

data/lib/package/dependency_installer.fy

@@ -0,0 +1,27 @@
+class Fancy {
+  class Package {
+    class DependencyInstaller {
+      def run {
+        packfile = Dir glob("*.fancypack") first
+        unless: packfile do: {
+          *stderr* println: "No .fancypack file found. Quitting."
+          return nil
+        }
+
+        require: packfile
+
+        spec_name = packfile split: ".fancypack" . first
+        if: (Specification[spec_name]) then: |s| {
+          s dependencies each: |dep| {
+            "Installing dependency: #{dep name} (#{dep version})" println
+            Fancy Package install: (dep name) version: (dep version)
+          }
+          s rubygem_dependencies each: |dep| {
+            "Installing Ruby dependency: #{dep gem_name} (#{dep version})" println
+            dep install
+         }
+        }
+      }
+    }
+  }
+}

data/lib/package/installer.fy

@@ -13,10 +13,10 @@ class Fancy Package {
 
     """
 
-    def initialize: @package_name version: @version ("latest") install_path: @install_path (ENV["FANCY_PACKAGE_DIR"]) {
+    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
-      optional version (default is 'latest') and an optional
+      optional version (default is 'latest) and an optional
       installation path (default is the standard installation path for
       Fancy packages).
       """
@@ -50,7 +50,7 @@ class Fancy Package {
       """
 
       filename = nil
-      if: (@version == "latest") then: {
+      if: (@version == 'latest) then: {
         if: latest_tag then: |tag| {
           @version = tag
         } else: {
@@ -200,13 +200,7 @@ class Fancy Package {
         Package install: dep
       }
 
-      spec rubygem_dependencies each: |dep| {
-        if: (dep version == 'latest) then: {
-          System do: $ "rbx gem install " ++ (dep gem_name)
-        } else: {
-          System do: $ "rbx gem install -v=" ++ (dep version) ++ " " ++ (dep gem_name)
-        }
-      }
+      spec rubygem_dependencies each: |dep| { dep install }
     }
   }
 }

data/lib/package/uninstaller.fy

@@ -1,9 +1,7 @@
 class Fancy Package {
   class Uninstaller {
     """
-
-    @Fancy Package@ Uninstaller.
-
+    @Fancy::Package@ Uninstaller.
     """
 
     def initialize: @package_name {

data/lib/parser/ext/lexer.lex

@@ -2,7 +2,7 @@
 #include "ruby.h"
 #include "parser.h"
 
-int yyerror(char *s);
+int yyerror(VALUE self, char *s);
 %}
 
 %option yylineno
@@ -54,7 +54,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}|{constant}|:|"[]"|"|")+
+symbol_lit      \'({identifier}|{operator}|{constant}|:|"[]"|"|"|".")+
 ruby_send_open  ({constant}|{identifier}){lparen}
 ruby_oper_open  {operator}{lparen}
 regexp_lit      "/".*"/"
@@ -186,5 +186,10 @@ escaped_newline "\\".*\n
 {escaped_newline} {}
 [\n]		{ return NL; }
 
-.		{ fprintf(stderr, "SCANNER %d", yyerror("")); exit(1);	}
+.		{
+  fprintf(stderr, "Invalid token: %s\n", yytext);
+  VALUE fancy = rb_const_get(rb_cObject, rb_intern("Fancy"));
+  VALUE parser = rb_const_get(fancy, rb_intern("Parser"));
+  yyerror(parser, yytext);
+}
 

data/lib/parser/ext/parser.y

@@ -273,6 +273,9 @@ identifier:     IDENTIFIER {
                 | CLASS {
                   $$ = fy_terminal_node_from(self, "ast:identifier:", "class");
                 }
+                | RETURN {
+                  $$ = fy_terminal_node_from(self, "ast:identifier:", "return");
+                }
                 ;
 
 any_identifier: const_identifier
@@ -821,7 +824,7 @@ VALUE fy_terminal_node_from(VALUE self, char* method, char* text) {
 
 int yyerror(VALUE self, char *s)
 {
-  rb_funcall(self, rb_intern("ast:parse_error:"), 2, INT2NUM(yylineno), rb_str_new2(yytext));
+  rb_funcall(self, rb_intern("ast:parse_error:"), 2, INT2NUM(yylineno), rb_str_new2(s));
   return 1;
 }
 

data/lib/parser/methods.fy

@@ -13,9 +13,13 @@ class Fancy {
       new: filename line: line . parse_string: code . script
     }
 
+    def self ast: line parse_error: text {
+      ParseError new: line message: text filename: (Thread current['__fancy__parser__filename__]) . raise!
+    }
+
     read_write_slots: ['filename, 'line, 'script]
 
-    def initialize: @filename line: @line { }
+    def initialize: @filename line: @line { Thread current['__fancy__parser__filename__]: @filename }
 
     def body: body {
       @script = AST Script new: @line file: @filename body: body
@@ -69,7 +73,7 @@ class Fancy {
         # TODO: Clean this up or make it simpler...
 
         # this case handles string interpolation
-        case /(.*)#{(.*)}(.*)/ -> |matches|
+        case /(.*)#{(.*)}(.*)/m -> |matches|
           prefix = matches[1]
           interpol_str = matches[2]
           suffix = matches[3]
@@ -78,7 +82,7 @@ class Fancy {
           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_ident = ast: line identifier: "<<"
           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..