1.1c8

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

8 files changed, 1 insertions, 528 deletions

diff --git a/sample/ruby-mode.el b/sample/ruby-mode.el
index f4c5ce98f0..254851b782 100644
--- a/sample/ruby-mode.el
+++ b/sample/ruby-mode.el
@@ -592,7 +592,7 @@ An end of a defun is found by moving forward from the beginning of one."
      ("[^$\\?]\\('[^\\']*\\(\\\\\\(.\\|\n\\)[^\\']*\\)*'\\)" 1 string)
      ("[^$\\?]\\(`[^\\`]*\\(\\\\\\(.\\|\n\\)[^\\`]*\\)*`\\)" 1 string)
      ("^\\s *#.*$" nil comment)
-     ("[^$@?\\]\\(#[^$@{].*$\\)" 1 comment)
+     ("[^$@?\\]\\(#[^$@{\n].*$\\)" 1 comment)
      ("[^a-zA-Z_]\\(\\?\\(\\\\[CM]-\\)*.\\)" 1 string)
      ("^\\s *\\(require\\|load\\).*$" nil include)
      ("^\\s *\\(include\\|alias\\|undef\\).*$" nil decl)
diff --git a/sample/tkbiff.rb b/sample/tkbiff.rb
deleted file mode 100644
index d2d7bf7beb..0000000000
--- a/sample/tkbiff.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-#! /usr/local/bin/ruby
-
-if ARGV[0] != '-d'
-  unless $DEBUG
-    exit if fork
-  end
-else
-  ARGV.shift
-end
-
-if ARGV.length == 0
-  if ENV['MAIL']
-    $spool = ENV['MAIL']
-  else  
-    $spool = '/usr/spool/mail/' + ENV['USER']
-  end
-else 
-  $spool = ARGV[0]
-end
-
-require "parsedate"
-require "base64"
-
-include ParseDate
-
-class Mail
-  def Mail.new(f)
-    if !f.kind_of?(IO)
-      f = open(f, "r")
-      me = super
-      f.close
-    else
-      me = super
-    end
-    return me
-  end
-
-  def initialize(f)
-    @header = {}
-    @body = []
-    while f.gets()
-      $_.chop!
-      next if /^From /	# skip From-line  
-      break if /^$/		# end of header
-      if /^(\S+):\s*(.*)/
-	@header[attr = $1.capitalize] = $2
-      elsif attr
-	sub(/^\s*/, '')
-	@header[attr] += "\n" + $_
-      end
-    end
-
-    return if ! $_
-
-    while f.gets()
-      break if /^From /
-      @body.push($_)
-    end
-  end
-
-  def header
-    return @header
-  end
-
-  def body
-    return @body
-  end
-
-end
-
-require "tkscrollbox"
-
-$top = TkRoot.new
-$top.withdraw
-$list = TkScrollbox.new($top) {
-  relief 'raised'
-  width 80
-  height 8
-  setgrid 'yes'
-  pack
-}
-TkButton.new($top) {
-  text 'Dismiss'
-  command proc {$top.withdraw}
-  pack('fill'=>'both','expand'=>'yes')
-}
-$top.bind "Control-c", proc{exit}
-$top.bind "Control-q", proc{exit}
-$top.bind "space", proc{exit}
-
-$spool_size = 0
-$check_time = Time.now
-
-def check
-  $check_time = Time.now
-  size = File.size($spool)
-  if size and size != $spool_size
-    $spool_size = size
-    pop_up if size > 0
-  end
-  Tk.after 5000, proc{check}
-end
-
-if defined? Thread
-  Thread.start do
-    loop do
-      sleep 600
-      if Time.now - $check_time > 200
-	Tk.after 5000, proc{check}
-      end
-    end
-  end
-end
-
-def pop_up
-  outcount = 0;
-  $list.delete 0, 'end'
-  f = open($spool, "r")
-  while !f.eof?
-    mail = Mail.new(f)
-    date, from, subj =  mail.header['Date'], mail.header['From'], mail.header['Subject']
-    next if !date
-    y = m = d = 0
-    y, m, d = parsedate(date) if date
-    from = "sombody@somewhere" if ! from
-    subj = "(nil)" if ! subj
-    from = decode_b(from)
-    subj = decode_b(subj)
-    $list.insert 'end', format('%-02d/%02d/%02d [%-28.28s] %s',y,m,d,from,subj)
-    outcount += 1
-  end
-  f.close
-  if outcount == 0
-    $list.insert 'end', "You have no mail."
-  else
-    $list.see 'end'
-  end
-  $top.deiconify
-  Tk.after 2000, proc{$top.withdraw}
-end
-
-$list.insert 'end', "You have no mail."
-check
-Tk.after 2000, proc{$top.withdraw}
-begin
-  Tk.mainloop
-rescue
-  `echo #$! > /tmp/tkbiff`
-end
diff --git a/sample/tkbrowse.rb b/sample/tkbrowse.rb
deleted file mode 100644
index 882f0a489b..0000000000
--- a/sample/tkbrowse.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/local/bin/ruby
-#
-# This script generates a directory browser, which lists the working
-# directory and allows you to open files or subdirectories by
-# double-clicking.
-
-# Create a scrollbar on the right side of the main window and a listbox
-# on the left side.
-
-require "tkscrollbox"
-
-# The procedure below is invoked to open a browser on a given file;  if the
-# file is a directory then another instance of this program is invoked; if
-# the file is a regular file then the Mx editor is invoked to display
-# the file.
-
-$dirlist = {}
-
-def browsedir (dir)
-  if $dirlist.key? dir
-    $dirlist[dir]
-  else
-    top = if $dirlist.size > 0 then TkToplevel.new else nil end
-    list = TkScrollbox.new(top) {
-      relief 'raised'
-      width 20
-      height 20
-      setgrid 'yes'
-      pack
-    }
-    list.insert 'end', *`ls #{dir}`.split
-
-    # Set up bindings for the browser.
-
-    list.focus
-    list.bind "Control-q", proc{exit}
-    list.bind "Control-c", proc{exit}
-    list.bind "Control-p", proc{
-      print "selection <", TkSelection.get, ">\n"
-    }
-
-    list.bind "Double-Button-1", proc{
-      for i in TkSelection.get.split
-	print "clicked ", i, "\n"
-	browse dir, i
-      end
-    }
-    $dirlist[dir] = list
-  end
-end
-
-def browse (dir, file)
-  file="#{dir}/#{file}"
-  if File.directory? file
-    browsedir(file)
-  else
-    if File.file? file
-      if ENV['EDITOR']
-	system format("%s %s&", ENV['EDITOR'], file)
-      else
-	system "xedit #{file}&"
-      end
-    else
-      STDERR.print "\"#{file}\" isn't a directory or regular file"
-    end
-  end
-end
-
-# Fill the listbox with a list of all the files in the directory (run
-# the "ls" command to get that information).
-
-if ARGV.length>0 
-  dir = ARGV[0]
-else
-  dir="."
-end
-
-browsedir(dir)
-Tk.mainloop
diff --git a/sample/tkdialog.rb b/sample/tkdialog.rb
deleted file mode 100644
index e83e16d0a8..0000000000
--- a/sample/tkdialog.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /usr/local/bin/ruby
-require "tk"
-
-root = TkFrame.new
-top = TkFrame.new(root) {
-  relief 'raised'
-  border 1
-}
-msg = TkMessage.new(top) {
-  text "File main.c hasn't been saved to disk since \
-it was last modified.  What should I do?" 
-  justify 'center'
-  aspect 200
-  font '-Adobe-helvetica-medium-r-normal--*-240*'
-  pack('padx'=>5, 'pady'=>5, 'expand'=>'yes')
-}
-top.pack('fill'=>'both')
-root.pack
-
-bot = TkFrame.new(root) {
-  relief 'raised'
-  border 1
-}
-
-TkFrame.new(bot) { |left|
-  relief 'sunken'
-  border 1
-  pack('side'=>'left', 'expand'=>'yes', 'padx'=>10, 'pady'=> 10)
-  TkButton.new(left) {
-    text "Save File"
-    command "quit 'save'"
-    pack('expand'=>'yes','padx'=>6,'pady'=> 6)
-    top.bind "Enter", proc{state 'active'}
-    msg.bind "Enter", proc{state 'active'}
-    bot.bind "Enter", proc{state 'active'}
-    top.bind "Leave", proc{state 'normal'}
-    msg.bind "Leave", proc{state 'normal'}
-    bot.bind "Leave", proc{state 'normal'}
-    Tk.root.bind "ButtonRelease-1", proc{quit 'save'}
-    Tk.root.bind "Return", proc{quit 'save'}
-  }
-}
-TkButton.new(bot) {
-  text "Quit Anyway"
-  command "quit 'quit'"
-  pack('side'=>'left', 'expand'=>'yes', 'padx'=>10)
-}
-TkButton.new(bot) {
-  text "Return To Editor"
-  command "quit 'return'"
-  pack('side'=>'left', 'expand'=>'yes', 'padx'=>10)
-}
-bot.pack
-root.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
-
-def quit(button)
-  print "aaa\n"
-  print "You pressed the \"#{button}\" button;  bye-bye!\n"
-  exit
-end
-
-Tk.mainloop
diff --git a/sample/tkfrom.rb b/sample/tkfrom.rb
deleted file mode 100644
index ba0e547799..0000000000
--- a/sample/tkfrom.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-#! /usr/local/bin/ruby
-
-require "parsedate"
-require "base64"
-
-include ParseDate
-
-class Mail
-  def Mail.new(f)
-    if !f.kind_of?(IO)
-      f = open(f, "r")
-      me = super(f)
-      f.close
-    else
-      me = super
-    end
-    return me
-  end
-
-  def initialize(f)
-    @header = {}
-    @body = []
-    while f.gets()
-      $_.chop!
-      next if /^From /		# skip From-line  
-      break if /^$/		# end of header
-      if /^(\S+):\s*(.*)/
-	@header[attr = $1.capitalize] = $2
-      elsif attr
-	sub(/^\s*/, '')
-	@header[attr] += "\n" + $_
-      end
-    end
-
-    return if ! $_
-
-    while f.gets()
-      break if /^From /
-      @body.push($_)
-    end
-  end
-
-  def header
-    return @header
-  end
-
-  def body
-    return @body
-  end
-
-end
-
-if ARGV.length == 0
-  if ENV['MAIL']
-    ARGV[0] = ENV['MAIL']
-  elsif ENV['USER']
-    ARGV[0] = '/usr/spool/mail/' + ENV['USER']
-  elsif ENV['LOGNAME']
-    ARGV[0] = '/usr/spool/mail/' + ENV['LOGNAME']
-  end
-end
-
-require "tk"
-list = scroll = nil
-TkFrame.new{|f|
-  list = TkListbox.new(f) {
-    yscroll proc{|idx|
-	scroll.set *idx
-    }
-    relief 'raised'
-#    geometry "80x5"
-    width 80
-    height 5
-    setgrid 'yes'
-    pack('side'=>'left','fill'=>'both','expand'=>'yes')
-  }
-  scroll = TkScrollbar.new(f) {
-    command proc{|idx|
-      list.yview *idx
-    }
-    pack('side'=>'right','fill'=>'y')
-  }
-  pack
-}
-root = Tk.root
-TkButton.new(root) {
-  text 'Dismiss'
-  command proc {exit}
-  pack('fill'=>'both','expand'=>'yes')
-}
-root.bind "Control-c", proc{exit}
-root.bind "Control-q", proc{exit}
-root.bind "space", proc{exit}
-
-$outcount = 0;
-for file in ARGV
-  next if File.exist?(file)
-  atime = File.atime(file)
-  mtime = File.mtime(file)
-  f = open(file, "r")
-  begin
-    until f.eof
-      mail = Mail.new(f)
-      date = mail.header['Date']
-      next unless date
-      from = mail.header['From']
-      subj = mail.header['Subject']
-      y = m = d = 0
-      y, m, d = parsedate(date) if date
-      from = "sombody@somewhere" unless from
-      subj = "(nil)" unless subj
-      from = decode_b(from)
-      subj = decode_b(subj)
-      list.insert 'end', format('%-02d/%02d/%02d [%-28.28s] %s',y,m,d,from,subj)
-      $outcount += 1
-    end
-  ensure
-    f.close
-    File.utime(atime, mtime, file)
-    list.see 'end'
-  end
-end
-
-limit = 10000
-if $outcount == 0
-  list.insert 'end', "You have no mail."
-  limit = 2000
-end
-Tk.after limit, proc{
-  exit
-}
-Tk.mainloop
diff --git a/sample/tkhello.rb b/sample/tkhello.rb
deleted file mode 100644
index 5188fe1c8c..0000000000
--- a/sample/tkhello.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require "tk"
-
-TkButton.new(nil, 
-	     'text' => 'hello',
-	     'command' => proc{print "hello\n"}).pack('fill'=>'x')
-TkButton.new(nil,
-	     'text' => 'quit',
-	     'command' => 'exit').pack('fill'=>'x')
-
-Tk.mainloop
diff --git a/sample/tkline.rb b/sample/tkline.rb
deleted file mode 100644
index 2406b0749f..0000000000
--- a/sample/tkline.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-require "tkclass"
-
-$tkline_init = FALSE
-def start_random
-  return if $tkline_init
-  $tkline_init = TRUE
-  if defined? Thread
-    Thread.start do
-      loop do
-	sleep 2
-	Line.new($c, rand(400), rand(200), rand(400), rand(200))
-      end
-    end
-  end
-end
-
-$c = Canvas.new
-$c.pack
-$start_x = start_y = 0
-
-def do_press(x, y)
-  $start_x = x
-  $start_y = y
-  $current_line = Line.new($c, x, y, x, y)
-  start_random
-end
-def do_motion(x, y)
-  if $current_line
-    $current_line.coords $start_x, $start_y, x, y
-  end
-end
-
-def do_release(x, y)
-  if $current_line
-    $current_line.coords $start_x, $start_y, x, y
-    $current_line.fill 'black'
-    $current_line = nil
-  end
-end
-
-$c.bind("1", proc{|e| do_press e.x, e.y})
-$c.bind("B1-Motion", proc{|x, y| do_motion x, y}, "%x %y")
-$c.bind("ButtonRelease-1", proc{|x, y| do_release x, y}, "%x %y")
-Tk.mainloop
diff --git a/sample/tktimer.rb b/sample/tktimer.rb
deleted file mode 100644
index 34377e2f39..0000000000
--- a/sample/tktimer.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/local/bin/ruby
-# This script generates a counter with start and stop buttons.
-
-require "tk"
-$label = TkLabel.new {
-  text '0.00'
-  relief 'raised'
-  width 10
-  pack('side'=>'bottom', 'fill'=>'both')
-}
-
-TkButton.new {
-  text 'Start'
-  command proc {
-    if $stopped
-      $stopped = FALSE
-      tick
-    end
-  }
-  pack('side'=>'left','fill'=>'both','expand'=>'yes')
-}
-TkButton.new {
-  text 'Stop'
-  command proc{
-    exit if $stopped
-    $stopped = TRUE
-  }
-  pack('side'=>'right','fill'=>'both','expand'=>'yes')
-}
-
-$seconds=0
-$hundredths=0
-$stopped=TRUE
-
-def tick
-  if $stopped then return end
-  Tk.after 50, proc{tick}
-  $hundredths+=5
-  if $hundredths >= 100
-    $hundredths=0
-    $seconds+=1
-  end
-  $label.text format("%d.%02d", $seconds, $hundredths)
-end
-
-root = Tk.root
-root.bind "Control-c", proc{root.destroy}
-root.bind "Control-q", proc{root.destroy}
-Tk.root.focus
-Tk.mainloop