[前][次][番号順一覧][スレッド一覧]

ruby-changes:22753

From: naruse <ko1@a...>
Date: Sat, 25 Feb 2012 16:09:01 +0900 (JST)
Subject: [ruby-changes:22753] naruse:r34802 (trunk): suppress warnings.

naruse	2012-02-25 16:08:47 +0900 (Sat, 25 Feb 2012)

  New Revision: 34802

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34802

  Log:
    suppress warnings.

  Modified files:
    trunk/enc/depend
    trunk/ext/extmk.rb
    trunk/ext/ripper/tools/generate.rb

Index: enc/depend
===================================================================
--- enc/depend	(revision 34801)
+++ enc/depend	(revision 34802)
@@ -38,7 +38,7 @@
 % cleanobjs << "$*.def" if deffile
 % rule_subst = CONFIG["RULE_SUBST"] || "%s"
 % transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s"
-% transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "") % ""
+% transvpath_prefix = rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || ""
 % if File::ALT_SEPARATOR
 %   pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")}
 % else
@@ -99,7 +99,7 @@
 
 <%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%>
 %     src = [*IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}]
-<%=transvpath % "#{e}.c"%>: <%= src.map {|e| transvpath % "#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
+<%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
 %   end
 
 % end
@@ -150,8 +150,8 @@
 	$(Q)$(RM) enc/unicode/name2ctype.h
 	-$(Q)$(RMDIR) enc/unicode<%=@ignore_error%>
 % end
-% workdirs.reverse_each do|dir|
-	-$(Q)$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
+% workdirs.reverse_each do|d|
+	-$(Q)$(RMDIR) <%=pathrep[d]%><%=@ignore_error%>
 % end
 
 clean-srcs:
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 34801)
+++ ext/extmk.rb	(revision 34802)
@@ -190,7 +190,6 @@
 	# ignore
       ensure
 	rm_f "conftest*"
-	config = $0
 	$0 = $PROGRAM_NAME
       end
     end
@@ -424,7 +423,7 @@
 ext_prefix = "#{$top_srcdir}/ext"
 exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
 withes, withouts = %w[--with --without].collect {|w|
-  if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
+  if !(w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
     nil
   elsif (w = w.grep(String)).empty?
     proc {true}
@@ -617,20 +616,20 @@
     end
     mf.puts
     targets = %w[all install static install-so install-rb clean distclean realclean]
-    targets.each do |target|
-      mf.puts "#{target}: $(extensions:/.=/#{target})"
+    targets.each do |tgt|
+      mf.puts "#{tgt}: $(extensions:/.=/#{tgt})"
     end
     mf.puts
     mf.puts "all: #{rubies.join(' ')}"
     mf.puts "#{rubies.join(' ')}: $(extensions:/.=/all)"
-    rubies.each do |target|
-      mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@"
+    rubies.each do |tgt|
+      mf.puts "#{tgt}:\n\t$(Q)$(MAKE) $(MFLAGS) $@"
     end
     mf.puts
-    exec = config_string("exec") {|s| s + " "}
-    targets.each do |target|
+    exec = config_string("exec") {|str| str + " "}
+    targets.each do |tgt|
       exts.each do |d|
-        mf.puts "#{d[0..-2]}#{target}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)"
+        mf.puts "#{d[0..-2]}#{tgt}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)"
       end
     end
   end
Index: ext/ripper/tools/generate.rb
===================================================================
--- ext/ripper/tools/generate.rb	(revision 34801)
+++ ext/ripper/tools/generate.rb	(revision 34802)
@@ -6,7 +6,6 @@
   mode = nil
   ids1src = nil
   ids2src = nil
-  template = nil
   output = nil
 
   parser = @parser = OptionParser.new

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]