fancy 0.3.1 → 0.3.2

data/boot/rbx-compiler/parser/Makefile

@@ -0,0 +1,162 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = /Users/backtype/projects/fancy/boot/rbx-compiler/parser
+topdir = /Users/backtype/projects/rubinius/vm/capi/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/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-darwin10.5.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-darwin10.5.0
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = 
+LIBRUBYARG_SHARED = 
+LIBRUBYARG_STATIC = 
+
+RUBY_EXTCONF_H = 
+cflags   = 
+optflags = 
+debugflags = 
+warnflags = 
+CFLAGS   =  -fPIC -ggdb3 -O2 -fPIC 
+INCFLAGS = -I. -I. -I/Users/backtype/projects/rubinius/vm/capi/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-1.2.3dev
+arch = x86_64-darwin10.5.0
+sitearch = x86_64-darwin10.5.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 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+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

data/ruby_lib/fancy.rb

@@ -2,24 +2,7 @@ base = File.dirname(__FILE__)
 require File.expand_path("../boot/fancy_ext", base)
 require File.expand_path("../boot/load", base)
 
-do_retry = true
-begin
-  Fancy::CodeLoader.load_compiled_file File.expand_path("../lib/boot", base)
-rescue RuntimeError => e
-  # need to bootstrap first time
-  if e.message =~ /File not found (.*)lib\/boot.fyc/
-    if do_retry
-      puts "Fancy hasn't been bootstrapped yet. Doing that now.\n\n"
-      `cd #{base}/../ && rbx -S rake clean && rbx -S rake`
-      do_retry = false
-      retry
-    else
-      raise e
-    end
-  else
-    raise e
-  end
-end
+Fancy::CodeLoader.load_compiled_file File.expand_path("../lib/boot", base)
 
 # Remove the bootstrapping code loader
 bcl = Fancy.send :remove_const, :CodeLoader
@@ -32,11 +15,25 @@ Fancy::CodeLoader.push_loadpath File.expand_path("../lib", base)
 Fancy::CodeLoader.load_compiled_file File.expand_path("../lib/eval", base)
 
 class Object
-  def fy(hash_or_name)
-    if hash_or_name.is_a? Hash
-      self.send("#{hash_or_name.keys.join(':')}:", *hash_or_name.values)
+  def fancy_message_args name_and_args
+    method_name = []
+    args = []
+    name_and_args.each_with_index do |a, i|
+      if i % 2 == 0
+        method_name << a
+      else
+        args << a
+      end
+    end
+    return [method_name.join(":") + ":", args]
+  end
+
+  def fy(*array_or_name)
+    if array_or_name.size > 1
+      message_name, args = fancy_message_args array_or_name
+      self.send(message_name, *args)
     else
-      self.send(":#{hash_or_name}")
+      self.send(":#{array_or_name}")
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fancy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Christopher Bertels
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -08:00
+date: 2011-03-08 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -153,6 +153,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
@@ -257,6 +258,7 @@ files:
 - doc/features.md
 - boot/code_loader.rb
 - boot/compile.fy
+- boot/compiler/parser/ext/fancy_parser.bundle
 - boot/fancy_ext/block_env.rb
 - boot/fancy_ext/class.rb
 - boot/fancy_ext/console.rb
@@ -300,6 +302,7 @@ files:
 - 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