diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | common.mk | 19 | ||||
| -rw-r--r-- | golf_prelude.rb | 7 | ||||
| -rw-r--r-- | goruby.c | 3 | ||||
| -rw-r--r-- | main.c | 3 | ||||
| -rw-r--r-- | tool/compile_prelude.rb | 3 |
6 files changed, 40 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Tue Dec 25 16:04:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * trunk/common.mk, goruby.c, golf_prelude.rb: for golfers. + + * trunk/main.c (main): hook for embedding applications. + + * trunk/tool/compile_prelude.rb: can change initialize function name. + Tue Dec 25 15:59:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * encoding.c (rb_enc_register): do not use based_encoding to check if @@ -14,7 +14,8 @@ LIBRUBY_EXTS = ./.libruby-with-ext.time RDOCOUT = $(EXTOUT)/rdoc DMYEXT = dmyext.$(OBJEXT) -MAINOBJ = main.$(OBJEXT) +NORMALMAINOBJ = main.$(OBJEXT) revision.$(OBJEXT) +MAINOBJ = $(NORMALMAINOBJ) EXTOBJS = DLDOBJS = $(DMYEXT) @@ -79,6 +80,8 @@ OBJS = dln.$(OBJEXT) \ prelude.$(OBJEXT) \ $(COMMONOBJS) +GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) + SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --extout="$(EXTOUT)" \ --make="$(MAKE)" \ @@ -99,7 +102,13 @@ all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) encs @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) prog: $(PROGRAM) $(WPROGRAM) -miniruby$(EXEEXT): config.status $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) +miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) + +GORUBY = go$(RUBY_INSTALL_NAME) +golf: $(LIBRUBY) $(GOLFOBJS) + $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program + +program: $(PROGRAM) $(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP) @@ -600,6 +609,9 @@ blockinlining.$(OBJEXT): {$(VPATH)}blockinlining.c \ id.$(OBJEXT): {$(VPATH)}id.c {$(VPATH)}ruby.h miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c {$(VPATH)}ruby.h {$(VPATH)}vm_core.h prelude.$(OBJEXT): {$(VPATH)}prelude.c {$(VPATH)}ruby.h {$(VPATH)}vm_core.h +golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c {$(VPATH)}ruby.h {$(VPATH)}vm_core.h +goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c {$(VPATH)}ruby.h {$(VPATH)}config.h \ + {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h \ {$(VPATH)}oniguruma.h {$(VPATH)}config.h {$(VPATH)}defines.h @@ -650,10 +662,13 @@ miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) $(MINIRUBY) -I$(srcdir) -I$(srcdir)/lib -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $@ +golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb + $(BASERUBY) -I$(srcdir) -I$(srcdir)/lib -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/golf_prelude.rb $@ prereq: incs srcs preludes preludes: {$(VPATH)}miniprelude.c +preludes: {$(srcdir)}golf_prelude.c docs: $(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT) diff --git a/golf_prelude.rb b/golf_prelude.rb new file mode 100644 index 0000000000..347d316cc7 --- /dev/null +++ b/golf_prelude.rb @@ -0,0 +1,7 @@ +class Object + def method_missing m, *a, &b + r = /^#{m}/ + t = (methods + private_methods).sort.find{|e|r=~e} + t ? __send__(t, *a, &b) : super + end +end diff --git a/goruby.c b/goruby.c new file mode 100644 index 0000000000..d16ea11d5e --- /dev/null +++ b/goruby.c @@ -0,0 +1,3 @@ +void Init_golf(void); +#define RUBY_MAIN_INIT() Init_golf() +#include "main.c" @@ -33,6 +33,9 @@ main(int argc, char **argv, char **envp) { RUBY_INIT_STACK; ruby_init(); +#ifdef RUBY_MAIN_INIT + RUBY_MAIN_INIT(); +#endif return ruby_run_node(ruby_options(argc, argv)); } } diff --git a/tool/compile_prelude.rb b/tool/compile_prelude.rb index 60d56fba64..2ffccc0d93 100644 --- a/tool/compile_prelude.rb +++ b/tool/compile_prelude.rb @@ -8,6 +8,7 @@ $:.unshift(File.expand_path("../..", __FILE__)) preludes = ARGV.dup outfile = preludes.pop +init_name = outfile[/\w+(?=_prelude.c\z)/] || 'prelude' C_ESC = { "\\" => "\\\\", @@ -72,7 +73,7 @@ static const char prelude_code<%=i%>[] = % } void -Init_prelude(void) +Init_<%=init_name%>(void) { % lines_list.each_with_index {|(setup_lines, lines), i| rb_iseq_eval(rb_iseq_compile( |