Commit: fd5fbab09273fa440075895004141974f1e21d4a - ruby-gtk3 (git)

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

Commit MetaInfo

• Revision: fd5fbab09273fa440075895004141974f1e21d4a (tree)
• Time: 2015-05-30 16:55:47
• Author: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

assorted fixes(27)

Change Summary

• modified: lib/ninix/communicate.rb
• modified: lib/ninix/sakura.rb
• modified: lib/ninix/script.rb
• modified: lib/ninix/sstplib.rb

Incremental Difference

--- a/lib/ninix/communicate.rb
+++ b/lib/ninix/communicate.rb
@@ -125,13 +125,13 @@ module Communicate
         end
         refs = refs.join('\x01')
         Logging::Logging.debug("NOTIFY OTHER: " \
-                               + on_other_event + ", " \
-                               + name + ", " \
-                               + self_name + ", " \
-                               + flags + ", " \
-                               + event + ", " \
-                               + script + ", " \
-                               + refs)
+                               + on_other_event.to_s + ", " \
+                               + name.to_s + ", " \
+                               + selfname.to_s + ", " \
+                               + flags.to_s + ", " \
+                               + event.to_s + ", " \
+                               + script.to_s + ", " \
+                               + refs.to_s)
         args = [name, selfname, flags, event, script, refs]
       else # XXX: should not reach here
         return

--- a/lib/ninix/sakura.rb
+++ b/lib/ninix/sakura.rb
@@ -279,10 +279,10 @@ module Sakura
       path = File.join(get_prefix(), 'HISTORY')
       begin
         open(path, 'w') do |file|
-          file.write("time, ", @ghost_time.to_s, "\n")
-          file.write("vanished_count, ", @vanished_count.to_s, "\n")
+          file.write("time, " + @ghost_time.to_s + "\n")
+          file.write("vanished_count, " + @vanished_count.to_s + "\n")
         end
-      rescue #except IOError as e:
+      rescue IOError => e
         #code, message = e.args
         Logging::Logging.error('cannot write ' + path)
       end
@@ -293,13 +293,13 @@ module Sakura
       begin
         open(path, 'w') do |file|
           if @balloon_directory != nil
-            file.write("balloon_directory, ", @balloon_directory, "\n")
+            file.write("balloon_directory, " + @balloon_directory + "\n")
           end
           if @shell_directory != nil
-            file.write("shell_directory, ", @shell_directory, "\n")
+            file.write("shell_directory, " + @shell_directory + "\n")
           end
         end
-      rescue #except IOError as e:
+      rescue IOError => e
         #code, message = e.args
         Logging::Logging.error('cannot write ' + path)
       end
@@ -316,23 +316,23 @@ module Sakura
             if not line.include?(',')
               next
             end
-            key, value = line.split(',', 1)
+            key, value = line.split(',', 2)
             key = key.strip()
             if key == 'time'
               begin
                 ghost_time = value.strip().to_i
-              rescue #except:
+              rescue
                 #pass
               end
             elsif key == 'vanished_count'
               begin
                 ghost_vanished_count = value.strip().to_i
-              rescue #except:
+              rescue
                 #pass
               end
             end
           end
-        rescue #except IOError as e:
+        rescue IOError => e
           #code, message = e.args
           Logging::Logging.error('cannot read ' + path)
           @ghost_time = ghost_time
@@ -355,7 +355,7 @@ module Sakura
             if not line.include?(',')
               next
             end
-            key, value = line.split(',', 1)
+            key, value = line.split(',', 2)
             if key.strip() == 'balloon_directory'
               balloon_directory = value.strip()
             end
@@ -363,7 +363,7 @@ module Sakura
               shell_directory = value.strip()
             end
           end
-        rescue #except IOError as e:
+        rescue IOError => e
           #code, message = e.args
           Logging::Logging.error('cannot read ' + path)
         end
@@ -1212,12 +1212,11 @@ module Sakura
         script, communication = [default, nil]
       end
       if not script.empty? or (script.empty? and event != 'OnSecondChange')
-        t = Time.new.localtime.to_a
-        m = MONTH_NAMES[t[4] - 1]
-        ## FIXME
-        #Logging::Logging.debug(
-        #  '\n[{0:02d}/{1}/{2:d}:{3:02d}:{4:02d}:{5:02d} {6:+05d}]'.format(
-        #  t[2], m, t[0], t[3], t[4], t[5], (- time.timezone / 36).to_i))
+        t = Time.new.localtime
+        m = MONTH_NAMES[t.month - 1]
+        Logging::Logging.debug(
+          sprintf("\n[%02d/%s/%d:%02d:%02d:%02d %+05d]",
+                  t.day, m, t.year, t.hour, t.min, t.sec, t.utc_offset / 36))
         Logging::Logging.debug('Event: ' + event)
         for n in 0..arglist.length-1
           value = arglist[n]
@@ -1380,7 +1379,7 @@ module Sakura
         color_r = [0, [255, color_r.to_i].min].max
         color_g = [0, [255, color_g.to_i].min].max
         color_b = [0, [255, color_b.to_i].min].max
-      rescue #except:
+      rescue
         #pass
       else
         background = [color_r, color_g, color_b]
@@ -1392,7 +1391,7 @@ module Sakura
         color_r = [0, [255, color_r.to_i].min].max
         color_g = [0, [255, color_g.to_i].min].max
         color_b = [0, [255, color_b.to_i].min].max
-      rescue #except:
+      rescue
         #pass
       else
         foreground = [color_r, color_g, color_b]
@@ -1945,16 +1944,13 @@ module Sakura
       @script_position = 0
       while true
         begin
-          #@processed_script.extend(@script_parser.parse(script))
-          @processed_script =  @script_parser.parse(script)
+          @processed_script.concat(@script_parser.parse(script))
           break
-        rescue #except ninix.script.ParserError as e:
-          #logging.error('-' * 50)
-          #logging.error('{0}'.format(e)) # 'UTF-8'
-          #done, script = e
-          #@processed_script.extend(done)
-        #else
-        #  break
+        rescue Script::ParserError => e
+          Logging::Logging.error('-' * 50)
+          Logging::Logging.error(e.format) # 'UTF-8'
+          done, script = e.get_item
+          @processed_script.concat(done)
         end
       end
       @script_mode = BROWSE_MODE
@@ -1964,6 +1960,9 @@ module Sakura
       @quick_session = false
       set_synchronized_session(:list => [], :reset => true)
       @balloon.hide_all()
+      if @processed_script.empty?
+        return
+      end
       node = @processed_script[0]
       if node[0] == Script::SCRIPT_TAG and node[1] == '\C'
         @processed_script.shift
@@ -1999,7 +1998,7 @@ module Sakura
     def __yen_p(args)
       begin
         chr_id = args[0].to_i
-      rescue #except:
+      rescue ArgumentError
         return
       end
       if chr_id >= 0
@@ -2089,7 +2088,7 @@ module Sakura
       else
         begin
           balloon_id = (args[0].to_i / 2).to_i
-        rescue #except ValueError:
+        rescue ArgumentError
           balloon_id = 0
         else
           @balloon.set_balloon(@script_side, balloon_id)
@@ -2100,7 +2099,7 @@ module Sakura
     def __yen__b(args)
       begin
         filename, x, y = expand_meta(args[0]).split(',')
-      rescue #except:
+      rescue ArgumentError
         filename, param = expand_meta(args[0]).split(',')
         #assert param == 'inline'
         x, y = 0, 0 ## FIXME
@@ -2132,7 +2131,7 @@ module Sakura
     def __set_weight(value, unit)
       begin
         amount = value.to_i * unit - 0.01
-      rescue #except ValueError:
+      rescue ArgumentError
         amount = 0
       end
       if amount > 0
@@ -2237,7 +2236,7 @@ module Sakura
     def __yen_i(args)
       begin
         actor_id = args[0].to_i
-      rescue #except ValueError:
+      rescue ArgumentError
         #pass
       else
         @surface.invoke(@script_side, actor_id)
@@ -2272,7 +2271,7 @@ module Sakura
     def __yen_and(args)
       begin
         text = CGI.unescape_html("&" + args[0].to_s + ";")
-      rescue #except:
+      rescue ArgumentError
         text = nil
       end
       if text == nil
@@ -2284,7 +2283,7 @@ module Sakura
     def __yen__m(args)
       begin
         num = args[0].to_i(16)
-      rescue #except ValueError:
+      rescue ArgumentError
         num = 0
       end
       if 0x20 <= num and num <= 0x7e
@@ -2569,7 +2568,7 @@ module Sakura
         begin
           x = args[2].to_i
           y = args[3].to_i
-        rescue #except:
+        rescue ArgumentError
           #pass
         else
           @surface.set_balloon_offset(@script_side, [x, y])
@@ -2598,7 +2597,7 @@ module Sakura
           @audio_player.set_state(Gst::State::NULL)
           begin
             track = args[2].to_i
-          rescue #except:
+          rescue ArgumentError
             return
           end
           @audio_player.set_property(
@@ -2920,7 +2919,7 @@ module Sakura
       end
       begin
         @sstp_handle.send([data, '\n'].join(''))
-      rescue #except socket.error:
+      rescue SystemCallError => e
         #pass
       end
     end
@@ -2941,7 +2940,7 @@ module Sakura
       ##logging.debug('close_sstp_handle()')
       begin
         @sstp_handle.close()
-      rescue #except socket.error
+      rescue SystemCallError => e
         #pass
       end
       @sstp_handle = nil

--- a/lib/ninix/script.rb
+++ b/lib/ninix/script.rb
@@ -28,75 +28,72 @@ module Script
   TEXT_META   = 1
   TEXT_STRING = 2
 
-#  class ParserError < Exception
-#
-#    def initialize(message, error: 'strict',
-#                   script: nil, src: nil, column: nil, length: nil, skip: nil)
-#      if not ['strict', 'loose'].include?(error)
-#        raise ValueError('unknown error scheme: {0}'.format(str(error)))
-#      end
-#      @message = message
-#      @error = error
-#      @script = script or []
-#      @src = src or ''
-#      @column = column
-#      @length = length or 0
-#      @skip = skip or 0
-#    end
-#
-#    def __getitem__(n)
-#      if n == 0
-#        if @error == 'strict'
-#          return []
-#        else
-#          return @script
-#        end
-#      elsif n == 1
-#        if @error == 'strict' or @column == nil
-#          return ''
-#        else
-#          return @src[@column + @skip, @src.length]
-#        end
-#      else
-#        raise IndexError('tuple index out of range')
-#      end
-#    end
-#
-#    def __str__
-#      if @column != nil
-#        column = @column
-#        if not @src.empty?
-#          dump = [@src[:column],
-#                  '\x1b[7m',
-#                  (@src[column, column + @length] or ' '),
-#                  '\x1b[m',
-#                  @src[column + @length, @src.length]].join('')
-#        else
-#          dump = ''
-#        end
-#      else
-#        column = '??'
-#        dump = @src
-#      end
-#      return 'ParserError: column {0}: {1}\n{2}'.format(column, @message, dump)
-#    end
-#  end
+  class ParserError < StandardError
+
+    def initialize(
+          error: 'strict',
+          script: nil, src: nil, column: nil, length: nil, skip: nil)
+      if not ['strict', 'loose'].include?(error)
+        raise ValueError('unknown error scheme: {0}'.format(str(error)))
+      end
+      @error = error
+      @script = script or []
+      @src = src or ''
+      @column = column
+      @length = length or 0
+      @skip = skip or 0
+    end
+
+    def get_item
+      if @error == 'strict'
+        done = []
+      else
+        done = @script
+      end
+      if @error == 'strict' or @column == nil
+        script = ''
+      else
+        script = @src[@column + @skip, @src.length]
+      end
+      return done, script
+    end
+
+    def format
+      if @column != nil
+        column = @column
+        if not @src.empty?
+          dump = [@src[0..@column-1],
+                  '\x1b[7m',
+                  (@src[column, @length] or ' '),
+                  '\x1b[m',
+                  @src[column+@[e-mail]-1]].join('')
+        else
+          dump = ''
+        end
+      else
+        column = '??'
+        dump = @src
+      end
+      return 'ParserError: column ' + column.to_s + ': ' + message + "\n" + dump
+    end
+  end
 
   class Parser
 
     def initialize(error: 'strict')
       if not ['strict', 'loose'].include?(error)
-#        raise ValueError('unknown error scheme: {0}'.format(str(error)))
+        raise ArgumentError('unknown error scheme: ' + error.to_s)
       end
       @error = error
     end
 
     def perror(msg, position: 'column', skip: nil)
+      print("PERROR: ", msg, "\n")
       if not ['column', 'eol'].include?(position)
-#        raise ValueError('unknown position scheme: ', position.to_s)
+        raise ArgumentError('unknown position scheme: ', position.to_s)
       end
       if not ['length', 'rest', nil].include?(skip)
-#        raise ValueError('unknown skip scheme: ', skip.to_s)
+        raise ArgumentError('unknown skip scheme: ', skip.to_s)
       end
       if position == 'column'
         column = @column
@@ -113,9 +110,14 @@ module Script
         length = 0
         skip = 0
       end
-#      return ParserError(msg, :error => @error,
-#                         :script => @script, :src => @src, :column => column, :lenght => length, :skip => skip)
-      return "" # XXX
+      raise ParserError.new( \
+                             :error => @error, \
+                             :script => @script, \
+                             :src => @src, \
+                             :column => column, \
+                             :length => length, \
+                             :skip => skip \
+                           ), msg
     end
 
     def tokenize(s)
@@ -137,11 +139,9 @@ module Script
           if match != nil and match.begin(0) == pos
             break
           end
-#        else
-#          raise RuntimeError('should not reach here')
         end
-        if match == nil ## FIXME
-#          raise RuntimeError('should not reach here')
+        if not match
+          raise RuntimeError('should not reach here')
         end
         tokens << [token, match.to_s]
         pos += match.to_s.length
@@ -152,8 +152,8 @@ module Script
     def next_token
       begin
         token, lexeme = @tokens.shift
-      rescue # except IndexError:
-#        raise perror('unexpected end of script', :position => 'eol')
+      rescue IndexError
+        perror('unexpected end of script', :position => 'eol')
       end
       if token == nil
         return "", ""
@@ -187,12 +187,12 @@ module Script
           if not text.empty?
             @script << [SCRIPT_TEXT, text, @column]
           end
-#          raise perror('unknown tag', :skip => 'length')
+          perror('unknown tag', :skip => 'length')
         elsif token == TOKEN_STRING and lexeme == '%'
           string_chunks << lexeme
           text << [TEXT_STRING, string_chunks.join('')]
           @script << [SCRIPT_TEXT, text, @column]
-#          raise perror('unknown meta string', :skip => 'length')
+          perror('unknown meta string', :skip => 'length')
           return []
         end
         if [TOKEN_NUMBER, TOKEN_OPENED_SBRA,
@@ -281,11 +281,11 @@ module Script
           if not @tokens.empty? and @tokens[0][0] == TOKEN_OPENED_SBRA
             args = split_params(read_sbra_text())
             if args.length != 2
-#              raise perror('wrong number of arguments', :skip => 'length')
+              perror('wrong number of arguments', :skip => 'length')
               return []
             end
             if args[1].length != 1 or not args[1][0][1]
-#              raise perror('syntax error (expected an ID)', :skip => 'length')
+              perror('syntax error (expected an ID)', :skip => 'length')
               return []
             end
             arg1 = args[0]
@@ -322,7 +322,7 @@ module Script
           end
           @script << [SCRIPT_TAG, lexeme] + args + [@column, ]
         else
-#          raise perror('unknown tag ({0})'.format(lexeme), :skip => 'length')
+          perror('unknown tag (' + lexeme + ')', :skip => 'length')
           return []
         end
         if anchor != nil
@@ -332,6 +332,7 @@ module Script
           else
             @script << [SCRIPT_TAG, '\_a', @column]
           end
+## FIXME
 #          anchor.script = @script
 #          raise anchor
           return []
@@ -349,7 +350,7 @@ module Script
     def read_number
       token, number = next_token()
       if token != TOKEN_NUMBER
-#        raise perror('syntax error (expected a number)')
+        perror('syntax error (expected a number)')
       end
       return number
     end
@@ -357,15 +358,15 @@ module Script
     def read_sbra_number
       token, lexeme = next_token()
       if token != TOKEN_OPENED_SBRA
-#        raise perror('syntax error (expected a square bracket)')
+        perror('syntax error (expected a square bracket)')
       end
       token, number = next_token()
       if token != TOKEN_NUMBER
-#        raise perror('syntax error (expected a number)', :skip => 'length')
+        perror('syntax error (expected a number)', :skip => 'length')
       end
       token, lexeme = next_token()
       if token != TOKEN_CLOSED_SBRA
-#        raise perror('syntax error (expected a square bracket)', :skip => 'length')
+        perror('syntax error (expected a square bracket)', :skip => 'length')
       end
       return number
     end
@@ -373,12 +374,12 @@ module Script
     def read_sbra_id
       text = read_sbra_text()
       if text.length != 1
-        #raise perror('syntax error (expected a single ID)', :skip => 'length')
+        perror('syntax error (expected a single ID)', :skip => 'length')
         return []
       end
       begin
         sbra_id = text[0][1].to_i.to_s
-      rescue #  except:
+      rescue
         # pass
       else
         return sbra_id
@@ -389,7 +390,7 @@ module Script
     def read_sbra_text
       token, lexeme = next_token()
       if token != TOKEN_OPENED_SBRA
-#        raise perror('syntax error (expected a square bracket)')
+        perror('syntax error (expected a square bracket)')
       end
       text = []
       string_chunks = []
@@ -411,9 +412,10 @@ module Script
         elsif token == TOKEN_META
           text << [TEXT_META, lexeme]
         else
-          #raise perror('syntax error (wrong type of argument)', :skip => 'length')
+          perror('syntax error (wrong type of argument)', :skip => 'length')
           return []
         end
+## FIXME
 #      else
 #        raise perror('unexpected end of script', :position => 'eol')
       end

--- a/lib/ninix/sstplib.rb
+++ b/lib/ninix/sstplib.rb
@@ -141,7 +141,7 @@ module SSTPLib
       begin
         sock_domain, remote_port, remote_hostname, remote_ip = @fp.peeraddr
         return remote_hostname
-      rescue #except:
+      rescue
         return 'localhost'
       end
     end
@@ -151,9 +151,8 @@ module SSTPLib
                      'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
       t = Time.now.localtime
       m = month_names[t.month - 1]
-      ## FIXME ##
-      return t'{0:02d}/{1}/{2:d}:{3:02d}:{4:02d}:{5:02d} {6:+05d}'.format(
-               t[2], m, t[0], t[3], t[4], t[5], (-time.timezone / 36).to_i)
+      return sprintf('%02d/%s/%d:%02d:%02d:%02d %+05d',
+                     t.day, m, t.year, t.hour, t.min, t.sec, t.utc_offset / 36)
     end
   end
 end