diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-18 22:30:13 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-18 22:30:13 +0000 |
| commit | c2091e37ec2fd62e82f5aa69e8d147e0c329cdff (patch) | |
| tree | ec3599801897bc1eff805ce1c07137b32e5e4019 | |
| parent | b7be78d774daf5b9a9fdd63e6d20e30309b9efa0 (diff) | |
* keywords, lex.c.src, opt_insn_unif.def, opt_operand.def: moved rarely changed
input files for code generators into defs/ directory.
* Makefile.in (lex.c): followed keywords and lex.c.src.
* common.mk (parser.o): followed keywords.
(INSNS): followed opt_*.def
* tools/instruction.rb: followed opt_*.def.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | defs/keywords (renamed from keywords) | 0 | ||||
| -rw-r--r-- | defs/lex.c.src (renamed from lex.c.src) | 0 | ||||
| -rw-r--r-- | defs/opt_insn_unif.def (renamed from opt_insn_unif.def) | 0 | ||||
| -rw-r--r-- | defs/opt_operand.def (renamed from opt_operand.def) | 0 | ||||
| -rw-r--r-- | tool/instruction.rb | 8 |
8 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,15 @@ +Sun Oct 19 07:25:08 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * keywords, lex.c.src, opt_insn_unif.def, opt_operand.def: moved rarely changed + input files for code generators into defs/ directory. + + * Makefile.in (lex.c): followed keywords and lex.c.src. + + * common.mk (parser.o): followed keywords. + (INSNS): followed opt_*.def + + * tools/instruction.rb: followed opt_*.def. + Sun Oct 19 12:28:01 2008 James Edward Gray II <jeg2@ruby-lang.org> * test/csv/*: Renamed tc_* files to test_* to fit in within Ruby's diff --git a/Makefile.in b/Makefile.in index 8b4ad30549..eece91ed6e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 +lex.c: defs/keywords @\ - if cmp -s $(srcdir)/lex.c.src $?; then \ + if cmp -s $(srcdir)/defs/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,$$ $? > $@.tmp && \ mv $@.tmp $@ && \ - cp $? $(srcdir)/lex.c.src && \ + cp $? $(srcdir)/defs/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 + {$(VPATH)}defs/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 +$(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def @$(RM) $(PROGRAM) $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ diff --git a/keywords b/defs/keywords index f0d82a7667..f0d82a7667 100644 --- a/keywords +++ b/defs/keywords diff --git a/lex.c.src b/defs/lex.c.src index f0d82a7667..f0d82a7667 100644 --- a/lex.c.src +++ b/defs/lex.c.src diff --git a/opt_insn_unif.def b/defs/opt_insn_unif.def index 1ac613dbea..1ac613dbea 100644 --- a/opt_insn_unif.def +++ b/defs/opt_insn_unif.def diff --git a/opt_operand.def b/defs/opt_operand.def index 5ca1d74028..5ca1d74028 100644 --- a/opt_operand.def +++ b/defs/opt_operand.def diff --git a/tool/instruction.rb b/tool/instruction.rb index 5e5eb0b78a..7ecc84b26f 100644 --- a/tool/instruction.rb +++ b/tool/instruction.rb @@ -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' + load_opt_operand_def opts[:"opope.def"] || 'defs/opt_operand.def' + load_insn_unification_def opts[:"unif.def"] || 'defs/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', + :"opope.def" => 'defs/opt_operand.def', + :"unif.def" => 'defs/opt_insn_unif.def', } opt.on("-Dname", /\AOPT_(\w+)\z/, "enable VM option") {|s, v| |