fancy 0.5.0 → 0.6.0

data/tests/object.fy

@@ -217,7 +217,16 @@ FancySpec describe: Object with: {
     }
   }
 
-  it: "returns a set of its slot names" with: 'slots when: {
+  it: "calls a given block with the receiver before returning itself" with: 'tap: when: {
+    10 + 2 tap: |x| {
+      x is: 12
+      x is_a?: Number . is: true
+    } . is: 12
+
+    "foo" + "bar" tap: @{ is: "foobar"; * 2 is: "foobarfoobar" } . is: "foobar"
+  }
+
+  it: "returns an array of its slot names" with: 'slots when: {
     class GotSlots {
       def initialize {
         @x, @y = 1, 2
@@ -227,8 +236,46 @@ FancySpec describe: Object with: {
       }
     }
     gs = GotSlots new
-    gs slots is: $ Set[['x, 'y]]
+    Set[gs slots] is: $ Set[['x, 'y]]
     gs set_another_slot
-    gs slots is: $ Set[['x,'y,'z]]
+    Set[gs slots] is: $ Set[['x,'y,'z]]
+  }
+
+  it: "copies a given list of slots from one object to another" with: 'copy_slots:from: when: {
+    o1 = { slot1: "foo" slot2: "bar" } to_object
+    o2 = {} to_object
+    o2 copy_slots: ['slot1] from: o1
+    o2 slots includes?: 'slot1 . is: true
+    o2 get_slot: 'slot1 == (o1 slot1) is: true
+  }
+
+  it: "copies all slots from one object to another" with: 'copy_slots_from: when: {
+    o1 = { slot1: "foo" slot2: "bar" } to_object
+    o2 = {} to_object
+    o2 slots is: []
+    o2 copy_slots_from: o1
+    o2 slots includes?: 'slot1 . is: true
+    o2 slots includes?: 'slot2 . is: true
+    o2 slots is: $ o1 slots
+    o2 get_slot: 'slot1 == (o1 slot1) is: true
+    o2 get_slot: 'slot2 == (o1 slot2) is: true
+  }
+
+  it: "returns itself when return is send as a message" with: 'return when: {
+    def foo: array {
+      array each: @{ return }
+    }
+    foo: [1,2,3] . is: 1
+
+    def bar: array values: vals {
+      array each: |x| {
+        vals << x
+        x return
+      }
+    }
+
+    v = []
+    bar: [1,2,3] values: v . is: 1
+    v is: [1]
   }
 }

data/tests/string.fy

@@ -20,16 +20,16 @@ FancySpec describe: String with: {
     "hello, world"[[2,5]] . is: "llo,"
   }
 
-  it: "returns the upcased string" with: 'upcase when: {
-    "hello, world" upcase is: "HELLO, WORLD"
+  it: "returns the uppercased string" with: 'uppercase when: {
+    "hello, world" uppercase is: "HELLO, WORLD"
   }
 
-  it: "returns the downcased string" with: 'downcase when: {
-    "HELLO, WORLD" downcase is: "hello, world"
+  it: "returns the lowercased string" with: 'lowercase when: {
+    "HELLO, WORLD" lowercase is: "hello, world"
   }
 
-  it: "returns the same string by down- and upcasing in a row" when: {
-    "HELLO, WORLD" downcase upcase is: "HELLO, WORLD"
+  it: "returns the same string by lower- and uppercasing in a row" when: {
+    "HELLO, WORLD" lowercase uppercase is: "HELLO, WORLD"
   }
 
   it: "iterates over each character in a string" with: 'each: when: {
@@ -74,7 +74,7 @@ FancySpec describe: String with: {
     x = "'foo" eval
     x is: 'foo
     "3 + 4" eval is: 7
-    "'foo to_s upcase" eval is: "FOO"
+    "'foo to_s uppercase" eval is: "FOO"
     "33.33" eval is: 33.33
   }
 
@@ -97,7 +97,16 @@ FancySpec describe: String with: {
     x = "world"
     "hello, #{x}!!" is: "hello, world!!"
 
-    "hello, #{x}, Fancy #{'rocks to_s upcase}!!" is: "hello, world, Fancy ROCKS!!"
+    "hello, #{x}, Fancy #{'rocks to_s uppercase}!!" is: "hello, world, Fancy ROCKS!!"
+  }
+
+  it: "supports string interpolation with multi-line strings" when: {
+    str = """
+    the next line contains 7:
+#{3 + 4}
+"""
+    str lines size is: 3
+    str lines last is: "7"
   }
 
   it: "returns the String as a Symbol" with: 'to_sym when: {
@@ -152,8 +161,8 @@ FancySpec describe: String with: {
   }
 
   it: "returns an enumerator for its all bytes (fixnum ascii values)" with: 'bytes when: {
-    "foo" bytes class is: FancyEnumerator
-    "" bytes class is: FancyEnumerator
+    "foo" bytes class is: Fancy Enumerator
+    "" bytes class is: Fancy Enumerator
   }
 
   it: "returns a joined string using FancyEnumerable#join:" for: 'join: when: {

data/tests/symbol.fy

@@ -27,4 +27,9 @@ FancySpec describe: Symbol with: {
     x = true
     if: x then: 'foo else: 'bar . is: "foo"
   }
+
+  it: "returns self" with: 'to_sym when: {
+    'foo to_sym is: 'foo
+    'bar to_sym is: 'bar
+  }
 }

data/tests/tuple.fy

@@ -37,6 +37,13 @@ FancySpec describe: Tuple with: {
     { Tuple new: 2 } does_not raise: ArgumentError
   }
 
+  it: "creates tuples dynamically" with: 'with_values when: {
+    Tuple with_values: [1,2,3] . is: (1,2,3)
+    Tuple with_values: ["foo",'bar,42] . is: ("foo", 'bar, 42)
+    Tuple with_values: ('hello, 'world) . is: ('hello, 'world)
+    Tuple with_values: "test" . is: ("t","e","s","t")
+  }
+
   it: "runs a Block for each element" with: 'each: when: {
     sum = 0
     vals = []

data/tools/fancy-mode.el

@@ -14,6 +14,8 @@
     ("[0-9]+" . 'font-lock-variable-name-face)
     ;; floats
     ("[0-9]+\.[0-9]+" 'font-lock-variable-name-face)
+    ;; dynamic vars
+    ("\*[a-zA-Z0-9_-]+\*" . font-lock-reference-face)
     ;; variables & pseudo variables
     ("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(super\\|nil\\|self\\|true\\|false\\)\\>" 2 font-lock-variable-name-face)
     ;; variable names
@@ -23,7 +25,7 @@
     ;; method definitions
     ("^\\s *def\\s +\\([^( \t\n]+\\)" 1 font-lock-function-name-face)
     ;; message selectors
-    (" \\<[A-z][A-z0-9_-+?!=*/^><%]*:" . font-lock-function-name-face)
+    ("\\<[A-z][A-z0-9_-+?!=*/^><%]*:" . font-lock-function-name-face)
     ;; operators
     ("\\([-+*/~,<>=&!?%^]+ \\)" 1 'font-lock-function-name-face)
      ;; general delimited string
@@ -39,6 +41,8 @@
 (add-to-list 'auto-mode-alist '("\\.fy\\'" . fancy-mode))
 (add-to-list 'auto-mode-alist '("\\.fancypack\\'" . fancy-mode))
 
+(add-to-list 'interpreter-mode-alist '("fancy" . fancy-mode))
+
 ;; Ignore .fyc (compiled fancy bytecode) files
 (add-to-list 'completion-ignored-extensions ".fyc")
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fancy
 version: !ruby/object:Gem::Version 
-  hash: 1694540110752149318
+  hash: 2770122483358164876
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Christopher Bertels
@@ -15,8 +15,7 @@ autorequire:
 bindir: ruby_lib
 cert_chain: []
 
-date: 2011-10-05 00:00:00 -07:00
-default_executable: 
+date: 2012-01-25 00:00:00 Z
 dependencies: []
 
 description: |
@@ -60,8 +59,10 @@ files:
 - lib/boot.fy
 - lib/class.fy
 - lib/compiler.fy
+- lib/contracts.fy
 - lib/directory.fy
 - lib/documentation.fy
+- lib/dynamic_slot_object.fy
 - lib/enumerable.fy
 - lib/enumerator.fy
 - lib/eval.fy
@@ -70,14 +71,15 @@ files:
 - lib/fdoc.fy
 - lib/fdoc_hook.fy
 - lib/fiber.fy
-- lib/fiber_pool.fy
 - lib/file.fy
 - lib/future.fy
 - lib/hash.fy
+- lib/html.fy
 - lib/integer.fy
 - lib/iteration.fy
+- lib/kvo.fy
 - lib/main.fy
-- lib/method.fy
+- lib/message_sink.fy
 - lib/nil_class.fy
 - lib/number.fy
 - lib/object.fy
@@ -86,11 +88,14 @@ files:
 - lib/proxy.fy
 - lib/range.fy
 - lib/rbx.fy
+- lib/remote_object.fy
 - lib/set.fy
 - lib/stack.fy
 - lib/string.fy
+- lib/stringio.fy
 - lib/struct.fy
 - lib/symbol.fy
+- lib/system.fy
 - lib/thread_pool.fy
 - lib/true_class.fy
 - lib/tuple.fy
@@ -101,6 +106,7 @@ files:
 - lib/compiler/compiler.fy
 - lib/compiler/stages.fy
 - lib/package/dependency.fy
+- lib/package/dependency_installer.fy
 - lib/package/installer.fy
 - lib/package/list.fy
 - lib/package/specification.fy
@@ -129,6 +135,7 @@ files:
 - lib/rbx/io.fy
 - lib/rbx/match_data.fy
 - lib/rbx/method.fy
+- lib/rbx/module.fy
 - lib/rbx/mutex.fy
 - lib/rbx/name_error.fy
 - lib/rbx/no_method_error.fy
@@ -168,13 +175,7 @@ files:
 - lib/parser/ext/ext.c
 - lib/parser/ext/ext.h
 - lib/parser/ext/extconf.rb
-- lib/parser/ext/fancy_parser.bundle
-- lib/parser/ext/lexer.c
-- lib/parser/ext/lexer.h
 - lib/parser/ext/lexer.lex
-- lib/parser/ext/Makefile
-- lib/parser/ext/parser.c
-- lib/parser/ext/parser.h
 - lib/parser/ext/parser.y
 - lib/parser/ext/README
 - tests/argv.fy
@@ -191,8 +192,11 @@ files:
 - tests/fixnum.fy
 - tests/future.fy
 - tests/hash.fy
+- tests/html.fy
+- tests/kvo.fy
 - tests/method.fy
 - tests/nil_class.fy
+- tests/number.fy
 - tests/object.fy
 - tests/pattern_matching.fy
 - tests/range.fy
@@ -210,6 +214,7 @@ files:
 - bin/fyi
 - bin/ifancy
 - bin/fspec
+- examples/99bottles.fy
 - examples/actor_bunnies.fy
 - examples/actors.fy
 - examples/actors_primitive.fy
@@ -224,6 +229,8 @@ files:
 - examples/call_with_receiver.fy
 - examples/class.fy
 - examples/closures.fy
+- examples/conditions_exceptions.fy
+- examples/conditions_parsing.fy
 - examples/constant_access.fy
 - examples/default_args.fy
 - examples/define_methods.fy
@@ -242,6 +249,7 @@ files:
 - examples/future_composition.fy
 - examples/futures.fy
 - examples/game_of_life.fy
+- examples/greeter.fy
 - examples/hashes.fy
 - examples/hello_world.fy
 - examples/html_generator.fy
@@ -316,12 +324,7 @@ files:
 - boot/rbx-compiler/parser/fancy_parser.bundle
 - boot/rbx-compiler/parser/fancy_parser.c
 - boot/rbx-compiler/parser/fancy_parser.h
-- boot/rbx-compiler/parser/lexer.c
-- boot/rbx-compiler/parser/lexer.h
 - boot/rbx-compiler/parser/lexer.lex
-- boot/rbx-compiler/parser/Makefile
-- boot/rbx-compiler/parser/parser.c
-- boot/rbx-compiler/parser/parser.h
 - boot/rbx-compiler/parser/parser.rb
 - boot/rbx-compiler/parser/parser.y
 - boot/rbx-compiler/parser/Rakefile
@@ -347,8 +350,6 @@ files:
 - boot/rbx-compiler/compiler/ast/super.rb
 - boot/rbx-compiler/compiler/ast/try_catch_block.rb
 - boot/rbx-compiler/compiler/ast/tuple_literal.rb
-- boot/compiler/parser/ext/fancy_parser.bundle
-has_rdoc: true
 homepage: http://www.fancy-lang.org
 licenses: 
 - BSD
@@ -378,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fancy
-rubygems_version: 1.5.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: The Fancy Programming Language

data/boot/rbx-compiler/parser/Makefile

@@ -1,156 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = /Users/backtype/projects/fancy/boot/rbx-compiler/parser
-topdir = /Users/backtype/projects/rubinius/vm/capi/18/include
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/Users/backtype/projects/rubinius
-exec_prefix = $(prefix)
-install_prefix = $(DESTDIR)
-includedir = $(prefix)/include
-bindir = $(DESTDIR)/Users/backtype/projects/rubinius/bin
-sysconfdir = $(prefix)/etc
-localedir = $(datarootdir)/locale
-rubylibdir = $(DESTDIR)/Users/backtype/projects/rubinius/lib/site
-sitedir = $(DESTDIR)/Users/backtype/projects/rubinius/lib/site
-oldincludedir = $(DESTDIR)/usr/include
-libexecdir = $(exec_prefix)/libexec
-rubyhdrdir = $(DESTDIR)/Users/backtype/projects/rubinius/vm/capi/18/include
-libdir = $(exec_prefix)/lib
-dvidir = $(docdir)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-psdir = $(docdir)
-infodir = $(datarootdir)/info
-datadir = $(datarootdir)
-archdir = $(DESTDIR)/Users/backtype/projects/rubinius/lib/site/x86_64-darwin11.0.0
-sharedstatedir = $(prefix)/com
-localstatedir = $(prefix)/var
-pdfdir = $(docdir)
-htmldir = $(docdir)
-datarootdir = $(prefix)/share
-sbindir = $(exec_prefix)/sbin
-sitelibdir = $(DESTDIR)/Users/backtype/projects/rubinius/lib/site
-mandir = $(datarootdir)/man
-sitearchdir = $(DESTDIR)/Users/backtype/projects/rubinius/lib/site/x86_64-darwin11.0.0
-
-CC = gcc
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = 
-LIBRUBYARG_SHARED = 
-LIBRUBYARG_STATIC = 
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fPIC -ggdb3 -fPIC -O2 
-INCFLAGS = -I. -I. -I/Users/backtype/projects/rubinius/vm/capi/18/include -I/Users/backtype/projects/fancy/boot/rbx-compiler/parser
-DEFS     = 
-CPPFLAGS =  
-CXXFLAGS = $(CFLAGS) 
-ldflags  = 
-dldflags = 
-archflag = 
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = gcc -dynamic -bundle -undefined suppress -flat_namespace
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = rbx
-RUBY_SO_NAME = rubinius-2.0.0dev
-arch = x86_64-darwin11.0.0
-sitearch = x86_64-darwin11.0.0
-ruby_version = 1.8
-ruby = /Users/backtype/projects/rubinius/bin/rbx
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_STATIC) -lfl   
-SRCS = fancy_parser.c lexer.c parser.c
-OBJS = fancy_parser.o lexer.o parser.o
-TARGET = fancy_parser
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h