提交: 42eb7713b9711e468de385c55048835f2a975c41 - ruby-gtk3 (git)

Ruby GTK3移行後のメインリポジトリ

Commit MetaInfo

• 修訂: 42eb7713b9711e468de385c55048835f2a975c41 (tree)
• 時間: 2015-11-08 15:08:58
• 作者: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

misc fixes

Change Summary

• modified: ChangeLog
• modified: lib/ninix/dll/aya.rb
• modified: lib/ninix/dll/bln.rb
• modified: lib/ninix/dll/misaka.rb
• modified: lib/ninix/menu.rb
• modified: lib/ninix/seriko.rb

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sun November 8 2015   Shyouzou Sugitani <[e-mail]>
+	* Ruby移行以降の修正で漏れがあったもの対応.
+
 Tue November 3 2015   Shyouzou Sugitani <[e-mail]>
 	* Ruby移行以降の修正で漏れがあったもの対応.
 

--- a/lib/ninix/dll/aya.rb
+++ b/lib/ninix/dll/aya.rb
@@ -558,7 +558,7 @@ module Aya
                  "Value: " + result.to_s + "\r\n\r\n".encode('CP932', :invalid => :replace, :undef => :replace)
         return result
       else
-        return result.encode('CP932', :invalid => :replace, :undef => :replac)
+        return result.encode('CP932', :invalid => :replace, :undef => :replace)
       end
     end
   end

--- a/lib/ninix/dll/bln.rb
+++ b/lib/ninix/dll/bln.rb
@@ -101,7 +101,7 @@ module Bln
       for name in @blns.keys
         data, bln = @blns[name]
         for bln_id in bln.keys
-          if bln[bln_id]
+          if bln[bln_id] != nil
             bln[bln_id].destroy()
             bln.delete(bln_id)
           end
@@ -117,7 +117,7 @@ module Bln
         for name in @blns.keys
           data, bln = @blns[name]
           for bln_id in bln.keys
-            if bln[bln_id]
+            if bln[bln_id] != nil
               bln[bln_id].reset_scale()
             end
           end
@@ -448,7 +448,7 @@ module Bln
       @processed_text = ''
       @text = ''
       @script_wait = nil
-      @quick_session = 0
+      @quick_session = false
       @script_parser = Script::Parser.new(:error => 'loose')
       begin
         @processed_script = @script_parser.parse(@script)
@@ -548,14 +548,14 @@ module Bln
         x = left + ((scrn_w - w) / 2).to_i
         y = top + scrn_h - h
       elsif @position == 'sakura'
-        if @direction # right
+        if @direction == 1 # right
           x = s0_x + s0_w
         else
           x = s0_x - w
         end
         y = s0_y
       elsif @position == 'kero'
-        if @direction # right
+        if @direction == 1 # right
           x = s1_x + s1_w
         else
           x = s1_x - w
@@ -587,7 +587,7 @@ module Bln
       @processed_text = ''
       @text = ''
       @script_wait = nil
-      @quick_session = 0
+      @quick_session = false
       begin
         @processed_script = @script_parser.parse(@script)
       rescue Script::ParserError => e
@@ -682,7 +682,7 @@ module Bln
     end
 
     def do_idle_tasks
-      if not @window
+      if @window == nil
         return nil
       end
       s0_shown = get_sakura_status('SurfaceSakura_Shown')
@@ -710,7 +710,7 @@ module Bln
             (@position == 'kero' and not s1_shown) or \
             (@position == 'sakurab' and not b0_shown) or \
             (@position == 'kerob' and not b1_shown) or \
-            (@nooverlap and not @talking and sakura_talking)
+            (@nooverlap == 1 and not @talking and sakura_talking)
             destroy()
             return nil
           end
@@ -723,21 +723,21 @@ module Bln
         end
       end
       if @visible
-        if @life_time
+        if @life_time != nil
           if Time.now - @start_time >= @life_time * 0.001 and \
             not (not @processed_script.empty? or not @processed_text.empty?)
             destroy()
             return nil
           end
         end
-        if @action
+        if @action != nil
           if  @action['method'] == 'sinwave'
             offset = @action['ref1'] \
                      * Math.sin(2.0 * Math::PI \
                                 * (((Time.now - \
                                      @start_time) * 1000).to_i \
                                    % @action['ref2']).to_f / @action['ref2'])
-            if @action['ref0']
+            if @action['ref0'] == 1
               @action_y = offset.to_i
             else
               @action_x = offset.to_i
@@ -783,7 +783,7 @@ module Bln
       cr.set_operator(Cairo::OPERATOR_SOURCE)
       cr.paint()
       cr.set_operator(Cairo::OPERATOR_OVER) # restore default
-      if @layout
+      if @layout != nil
         cr.set_source_rgb(*@fontcolor)
         cr.move_to(@left.to_i, @top.to_i)
         cr.show_pango_layout(@layout)
@@ -821,7 +821,7 @@ module Bln
           @text = [@text, "\n"].join("")
           draw_text(@text)
         elsif name == '\w'
-          if args
+          if args != nil
             begin
               amount = Integer(args[0]) * 0.05 - 0.01
             rescue
@@ -834,7 +834,7 @@ module Bln
             @script_wait = Time.now + amount
           end
         elsif name == '\b'
-          if args
+          if args != nil
             begin
               amount = Integer(args[0])
             rescue
@@ -905,7 +905,7 @@ module Bln
          @y_root != nil
         x_delta = (event.x_root - @x_root).to_i
         y_delta = (event.y_root - @y_root).to_i
-        if event.state & Gdk::ModifierType::BUTTON1_MASK
+        if event.state & Gdk::ModifierType::BUTTON1_MASK != 0
           if @dragmove_horizontal
             @x += x_delta
           end
@@ -938,11 +938,11 @@ module Bln
 
     def destroy
       @visible = false
-      if @window
+      if @window != nil
         @window.destroy()
         @window = nil
       end
-      if @timeout_id
+      if @timeout_id != nil
         GLib::Source.remove(@timeout_id)
         @timeout_id = nil
       end

--- a/lib/ninix/dll/misaka.rb
+++ b/lib/ninix/dll/misaka.rb
@@ -85,7 +85,7 @@ module Misaka
     open(path) do |f|
       while true
         line = f.gets
-        if not line
+        if line == nil
           break
         end
         line = line.strip()
@@ -99,7 +99,7 @@ module Misaka
           end
           while true
             line = f.gets
-            if not line
+            if line == nil
               Misaka.syntax_error('unexpected end of file', path)
             end
             line = line.strip()
@@ -198,7 +198,7 @@ module Misaka
       while pos < end_
         if column == 0
           match = Re_comment.match(data[pos..-1])
-          if match
+          if match != nil
             column = column + match[0].length
             pos += match.end(0)
             next
@@ -207,7 +207,7 @@ module Misaka
         break_flag = false
         for token, pattern in Patterns
           match = pattern.match(data[pos..-1])
-          if match
+          if match != nil
             lexeme = match[0]
             if token == TOKEN_TEXT and \
               lexeme.start_with?('"') and lexeme.end_with?('"')
@@ -295,7 +295,7 @@ module Misaka
     end
 
     def skip_line
-      while @buffer
+      while not @buffer.empty?
         token, lexeme = pop()
         if token == TOKEN_NEWLINE
           break
@@ -394,7 +394,7 @@ module Misaka
           break
         end
       end
-      if not buf
+      if buf.empty?
         Misaka.syntax_error('null identifier',
                             @path, @lexer.get_position())
       end
@@ -446,7 +446,7 @@ module Misaka
           break
         end
         sentence = get_sentence()
-        if not sentence
+        if sentence == nil
           next
         end
         sentences << sentence
@@ -536,10 +536,10 @@ module Misaka
         end
       end
       # strip whitespace at the beginning and/or end of line
-      if buf and is_whitespace(buf[0])
+      if not buf.empty? and is_whitespace(buf[0])
         buf.delete_at(0)
       end
-      if buf and is_whitespace(buf[-1])
+      if not buf.empty? and is_whitespace(buf[-1])
         buf.delete_at(-1)
       end
       return buf
@@ -568,10 +568,10 @@ module Misaka
         end
       end
       # strip whitespace at the beginning and/or end of line
-      if buf and is_whitespace(buf[0])
+      if not buf.empty? and is_whitespace(buf[0])
         buf.delete_at(0)
       end
-      if buf and is_whitespace(buf[-1])
+      if not buf.empty? and is_whitespace(buf[-1])
         buf.delete_at(-1)
       end
       return buf
@@ -748,10 +748,10 @@ module Misaka
         end
       end
       # strip whitespace at the beginning and/or end of line
-      if buf and is_whitespace(buf[0])
+      if not buf.empty? and is_whitespace(buf[0])
         buf.delete_at(0)
       end
-      if buf and is_whitespace(buf[-1])
+      if not buf.empty? and is_whitespace(buf[-1])
         buf.delete_at(-1)
       end
       return buf
@@ -1094,7 +1094,7 @@ module Misaka
     end
 
     def get
-      if not @list
+      if @list.empty?
         return nil
       end
       return @list.sample
@@ -1114,7 +1114,7 @@ module Misaka
     end
 
     def get
-      if not @list
+      if @list.empty?
         return nil
       end
       if @indexes.empty?
@@ -1136,7 +1136,7 @@ module Misaka
     end
 
     def get
-      if not @list
+      if @list.empty?
         return nil
       end
       if @indexes.empty?
@@ -1164,7 +1164,7 @@ module Misaka
     end
 
     def pop
-      if not @list
+      if @list.empty?
         return nil
       end
       i = Array([e-mail]-1).sample
@@ -1181,7 +1181,7 @@ module Misaka
           buf << i
         end
       end
-      if not buf
+      if buf.empty?
         return nil
       end
       i = buf.sample
@@ -1351,7 +1351,7 @@ module Misaka
       variables = []
       constants = []
       for name, parameters, sentences in dic
-        if not sentences
+        if sentences == nil
           next
         elsif name == '$_Variable'
           variables |= sentences
@@ -1407,7 +1407,7 @@ module Misaka
                 'misaka.rb: malformed database (ignored)')
               break
             end
-            if not line
+            if line == nil
               break
             end
             header = strip_newline(line).split(nil, -1)
@@ -1482,7 +1482,7 @@ module Misaka
     def request(req_string)
       header = req_string.split(/\r?\n/, 0)
       line = header.shift
-      if line
+      if line != nil
         line = line.force_encoding(@charset).encode('utf-8', :invalid => :replace, :undef => :replace).strip()
         req_list = line.split(nil, -1)
         if req_list.length >= 2
@@ -1524,7 +1524,7 @@ module Misaka
         refs = []
         while true
           ref = get_ref(n)
-          if ref
+          if ref != nil
             refs << ref
           else
             break
@@ -1580,7 +1580,7 @@ module Misaka
                   script.encode(@charset, :invalid => :replace, :undef => :replace),
                   "\r\n"].join('')
       to = eval_variable([[NODE_TEXT, '$to']])
-      if to
+      if to != nil
         @variable.delete('$to')
         response = [response,
                     "Reference0: ",
@@ -1730,7 +1730,7 @@ module Misaka
       elsif name == '$lastsentence'
         result = @communicate[1]
       elsif name == '$otherghostlist'
-        if @otherghost
+        if not @otherghost.empty?
           ghost = @otherghost.sample
           result = ghost[0]
         else
@@ -2023,7 +2023,7 @@ module Misaka
     end
 
     def exec_choice(args)
-      if not args
+      if args.empty?
         return ''
       end
       return expand_args(args.sample)
@@ -2057,7 +2057,7 @@ module Misaka
           namelist << name
         end
       end
-      if not namelist
+      if namelist.empty?
         return ''
       end
       keylist = []
@@ -2073,7 +2073,7 @@ module Misaka
           keylist << key
         end
       end
-      if not keylist
+      if keylist.empty?
         return ''
       end
       return eval_variable([[NODE_TEXT, keylist.sample]])
@@ -2087,7 +2087,7 @@ module Misaka
     end
 
     def exec_backup(args)
-      if not args
+      if args.empty?
         save_database()
       end
       return ''
@@ -2192,7 +2192,7 @@ module Misaka
         return ''
       end
       buf = expand_args(args[0])
-      if not buf
+      if buf.empty?
         return ''
       else
         return buf[0]
@@ -2204,7 +2204,7 @@ module Misaka
         return ''
       end
       buf = expand_args(args[0])
-      if not buf
+      if buf.empty?
         return ''
       else
         return buf[-1]
@@ -2262,7 +2262,7 @@ module Misaka
       end
       buf0 = expand_args(args[0])
       buf1 = expand_args(args[1])
-      if buf0 and buf1 and buf0[-1] == buf1[0]
+      if not buf0.empty? and not buf1.empty? and buf0[-1] == buf1[0]
         return 'true'
       else
         return 'false'
@@ -2272,7 +2272,7 @@ module Misaka
     def exec_append(args)
       if args.length == 2
         name = expand_args(args[0])
-        if name and name.start_with?('$')
+        if not name.empty? and name.start_with?('$')
           if @variable.include?(name)
             value_type, value = @variable[name]
           else
@@ -2321,11 +2321,11 @@ module Misaka
         return ''
       end
       src_name = expand_args(args[0])
-      if not (src_name and src_name.start_with?('$'))
+      if not (not src_name.empty? and src_name.start_with?('$'))
         return ''
       end
       new_name = expand_args(args[1])
-      if not (new_name and new_name.start_with?('$'))
+      if not (not new_name.empty? and new_name.start_with?('$'))
         return ''
       end
       source = nil
@@ -2390,7 +2390,7 @@ module Misaka
     end
 
     def exec_insentence(args)
-      if not args
+      if args.empty?
         return ''
       end
       s = expand_args(args[0])
@@ -2495,7 +2495,7 @@ module Misaka
     end
 
     def exec_inlastsentence(args)
-      if not args
+      if args.empty?
         return ''
       end
       s = @communicate[1]
@@ -2537,7 +2537,7 @@ module Misaka
         end
         for line in header
           line = line.force_encoding(@charset).encode('utf-8', :invalid => :replace, :undef => :replace).strip()
-          if not line
+          if line.empty?
             next
           end
           if not line.include?(':')
@@ -2546,7 +2546,7 @@ module Misaka
           key, value = line.split(':', 2)
           key.strip!
           value.strip!
-          if key
+          if not key.empty?
             saori_header << key
             saori_value[key] = value
           end
@@ -2560,12 +2560,12 @@ module Misaka
     end
 
     def load_saori(args)
-      if not args
+      if args.empty?
         return ''
       end
       result = @saori_library.load(expand_args(args[0]),
                                    @misaka_dir)
-      if not result
+      if result == 0
         return ''
       else
         result.to_s
@@ -2573,11 +2573,11 @@ module Misaka
     end
 
     def unload_saori(args)
-      if not args
+      if args.empty?
         return ''
       end
       result = @saori_library.unload(expand_args(args[0]))
-      if not result
+      if result == 0
         return ''
       else
         return result.to_s
@@ -2587,7 +2587,7 @@ module Misaka
     def exec_isghostexists(args)
       result = 'false'
       if args.length != 1
-        if @otherghost.length
+        if @otherghost.length > 0
           result = 'true'
           @variable['$to'] = [TYPE_SCHOLAR,
                               @otherghost.sample[0]]
@@ -2654,7 +2654,7 @@ module Misaka
       top_dir = File.join(top_dir, head)
       if not @saori_list.include?(name)
         module_ = @saori.request(name)
-        if module_
+        if module_ != nil
           @saori_list[name] = module_
         end
       end
@@ -2665,7 +2665,7 @@ module Misaka
     end
 
     def unload(name=nil)
-      if name
+      if name != nil
         name = File.split(name.gsub('\\', '/'))[-1] # XXX: don't encode here
         if @saori_list.include?(name)
           @saori_list[name].unload()
@@ -2682,7 +2682,7 @@ module Misaka
     def request(name, req)
       result = '' # FIXME
       name = File.split(name.gsub('\\', '/'))[-1] # XXX: don't encode here
-      if name and @saori_list.include?(name)
+      if not name.empty? and @saori_list.include?(name)
         result = @saori_list[name].request(req)
       end
       return result

--- a/lib/ninix/menu.rb
+++ b/lib/ninix/menu.rb
@@ -183,7 +183,7 @@ module Menu
           set_stylecontext(i, *a)
         end
         submenu = item.submenu
-        if submenu
+        if submenu != nil
           submenu.signal_connect('realize') do |i, *a|
             set_stylecontext(i, *a)
           end
@@ -293,7 +293,7 @@ module Menu
         for _ in @__mayuna_menu.length..index 
           @__mayuna_menu << nil
         end
-        if mayuna_menu[side]
+        if mayuna_menu[side] != nil
           @__mayuna_menu[index] = Gtk::Menu.new()
           item = Gtk::TearoffMenuItem.new()
           item.show()
@@ -363,14 +363,14 @@ module Menu
           else
             name_list = @__ui[key][0][side]
           end
-          if name_list # caption
+          if not name_list.empty? # caption
             for name in name_list
               caption = @parent.handle_request('GET', 'getstring', name)
-              if caption
+              if caption != nil and not caption.empty?
                 break
               end
             end
-            if caption
+            if caption != nil and not caption.empty?
               caption = __modify_shortcut(caption)
               if caption == __cut_mnemonic(caption)
                 caption = [caption, @__ui[key][1]].join('')
@@ -384,7 +384,7 @@ module Menu
         else
           name_list = @__ui[key][2][side]
         end
-        if name_list and !name_list.empty? # visible
+        if name_list != nil and not name_list.empty? # visible
           for name in name_list
             visible = @parent.handle_request('GET', 'getstring', name)
             if visible != nil
@@ -407,7 +407,7 @@ module Menu
       for key in @__menu_list.keys
         item = @ui_manager.get_widget(['/popup/', key].join(''))
         submenu = item.submenu
-        if submenu
+        if submenu != nil
           submenu.unrealize()
         end
       end
@@ -447,7 +447,7 @@ module Menu
       for key in @__menu_list.keys
         item = @ui_manager.get_widget(['/popup/', key].join(''))
         visible = @__menu_list[key]['visible']
-        if item
+        if item != nil
           if visible
             item.show()
           else
@@ -463,7 +463,7 @@ module Menu
       #assert @__menu_list.include?(name)
       #assert isinstance(caption, str)
       item = @ui_manager.get_widget(['/popup/', name].join(''))
-      if item
+      if item != nil
         label = item.get_children()[0]
         label.set_text_with_mnemonic(caption)
       end
@@ -479,7 +479,7 @@ module Menu
       if side >= 1
         __set_visible('Portal', false)
       else
-        if portal
+        if portal != nil and not portal.empty?
           menu = Gtk::Menu.new()
           portal_list = portal.split(2.chr, 0)
           for site in portal_list
@@ -503,7 +503,7 @@ module Menu
                   'GET', 'get_prefix')
                 filename = entry[2].downcase
                 tail = File.extname(filename)
-                if not tail
+                if tail.empty?
                   for ext in ['.png', '.jpg', '.gif']
                     filename = [filename, ext].join('')
                     banner = File.join(
@@ -555,7 +555,7 @@ module Menu
     end
 
     def __set_recommend_menu(recommend)
-      if recommend
+      if recommend != nil and not recommend.empty?
         menu = Gtk::Menu.new()
         recommend_list = recommend.split(2.chr, 0)
         for site in recommend_list
@@ -578,7 +578,7 @@ module Menu
               base_path = @parent.handle_request('GET', 'get_prefix')
               filename = entry[2].downcase
               tail = File.extname(filename)
-              if not tail
+              if tail.empty?
                 for ext in ['.png', '.jpg', '.gif']
                   filename = [filename, ext].join('')
                   banner = File.join(
@@ -760,7 +760,7 @@ module Menu
         ghost_menu = Gtk::Menu.new()
         for items in @parent.handle_request('GET', 'get_ghost_menus')
           item = items[path]
-          if item.parent
+          if item.parent != nil
             item.reparent(ghost_menu)
           else
             ghost_menu << item
@@ -789,7 +789,7 @@ module Menu
     def create_meme_menu(menuitem)
       menu = Gtk::Menu.new()
       for item in menuitem.values()
-        if item.parent
+        if item.parent != nil
           item.reparent(menu)
         else
           menu << item

--- a/lib/ninix/seriko.rb
+++ b/lib/ninix/seriko.rb
@@ -626,7 +626,7 @@ module Seriko
       else
         return [] ## should not reach here
       end
-      if not match
+      if match == nil
         next
       end
       if version == 1 and not re_seriko_interval_value.match(value)
@@ -691,7 +691,7 @@ module Seriko
           else
             match = re_seriko2_pattern.match(pattern)
           end
-          if not match
+          if match == nil
             raise ('unsupported pattern: ' + pattern)
           end
           if version == 1
@@ -700,12 +700,12 @@ module Seriko
             method = match[3]
           else
             method = match[1]
-            if not match[2]
+            if match[2] == nil
               surface = 0
             else
               surface = match[2].to_i.to_s
             end
-            if not match[3]
+            if match[3] == nil
               interval = 0
             else
               interval = match[3].to_i.abs
@@ -745,12 +745,12 @@ module Seriko
               x = 0
               y = 0
             else
-              if not match[4]
+              if match[4] == nil
                 x = 0
               else
                 x = match[4].to_i
               end
-              if not match[5]
+              if match[5] == nil
                 y = 0
               else
                 y = match[5].to_i
@@ -802,17 +802,17 @@ module Seriko
       else
         match1 = re_mayuna_interval.match(key)
         match2 = re_mayuna2_interval.match(key)
-        if match1
+        if match1 != nil
           version = 1
           match = match1
-        elsif match2
+        elsif match2 != nil
           version = 2
           match = match2
         else
           next
         end
       end
-      if not match
+      if match == nil
         next
       end
       if version == 1 and not re_mayuna_interval_value.match(value)
@@ -846,7 +846,7 @@ module Seriko
           else
             match = re_mayuna2_pattern.match(pattern)
           end
-          if not match
+          if match == nil
             raise ('unsupported pattern: ' + pattern)
           end
           if version == 1
@@ -865,12 +865,12 @@ module Seriko
               x = 0
               y = 0
             else
-              if not match[4]
+              if match[4] == nil
                 x = 0
               else
                 x = match[4].to_i
               end
-              if not match[5]
+              if match[5] == nil
                 y = 0
               else
                 y = match[5].to_i