8 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,15 @@
 Sun Oct 19 12:28:01 2008 James Edward Gray II <[email protected]>
 * test/csv/*: Renamed tc_* files to test_* to fit in within Ruby's
@@ -185,16 +185,16 @@ $(srcdir)/configure: $(srcdir)/configure.in
 # * GNU make v.s. HP-UX make	# HP-UX make invokes the action if lex.c and keywords has same mtime.
 # * svn checkout generate a file with mtime as current time
 # * XFS has a mtime with fractional part
-lex.c: keywords
 @\
-	if cmp -s $(srcdir)/lex.c.src $?; then \
 set -x; \
 cp $(srcdir)/lex.c.blt $@; \
 else \
 set -x; \
 gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > [email protected] && \
 mv [email protected] $@ && \
- cp $? $(srcdir)/lex.c.src && \
 cp $@ $(srcdir)/lex.c.blt; \
 fi
@@ -496,7 +496,7 @@ pack.$(OBJEXT): {$(VPATH)}pack.c $(RUBY_H_INCLUDES)
 parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) \
 {$(VPATH)}node.h $(ENCODING_H_INCLUDES) $(ID_H_INCLUDES) \
 {$(VPATH)}regenc.h {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \
- {$(VPATH)}keywords {$(VPATH)}id.c
 proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
 $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
 {$(VPATH)}debug.h
@@ -605,7 +605,7 @@ INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 INSNS2VMOPT = --srcdir="$(srcdir)"
-$(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h
 @$(RM) $(PROGRAM)
 $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
@@ -106,8 +106,8 @@ class RubyVM
 load_insns_def opts[:"insns.def"] || 'insns.def'
- load_opt_operand_def opts[:"opope.def"] || 'opt_operand.def'
- load_insn_unification_def opts[:"unif.def"] || 'opt_insn_unif.def'
 make_stackcaching_insns if vm_opt?('STACK_CACHING')
 end
@@ -1326,8 +1326,8 @@ class RubyVM
 def self.def_options(opt)
 opts = {
 :"insns.def" => 'insns.def',
- :"opope.def" => 'opt_operand.def',
- :"unif.def" => 'opt_insn_unif.def',
 }
 opt.on("-Dname", /\AOPT_(\w+)\z/, "enable VM option") {|s, v|