Hiroyuki Komatsu
komat****@users*****
2005年 1月 31日 (月) 03:30:56 JST
Index: prime/src/prime.src diff -u prime/src/prime.src:1.3.4.3 prime/src/prime.src:1.3.4.4 --- prime/src/prime.src:1.3.4.3 Thu Dec 9 23:51:43 2004 +++ prime/src/prime.src Mon Jan 31 03:30:56 2005 @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # # PRIME: PRedictive Input Method Editor -# $Id: prime.src,v 1.3.4.3 2004/12/09 14:51:43 komatsu Exp $ +# $Id: prime.src,v 1.3.4.4 2005/01/30 18:30:56 komatsu Exp $ # # Copyright (C) 2001 Satoru Takabayashi <sator****@namaz*****> # Copyright (C) 2002, 2003 Hiroyuki Komatsu <komat****@taiya*****> @@ -18,7 +18,7 @@ require 'getoptlong' require 'prime/prime' -require 'prime/session' +require 'prime/protocol' require 'prime/server' require "jcode" @@ -121,25 +121,25 @@ if @options['skk'] then tcp_port = @options['skk'].empty?() ? "1178" : @options['skk'] @options['tcp-server'] = tcp_port - session = SessionSKK.new(@prime, PRIME_VERSION) + protocol = PrimeProtocolSKK.new(@prime, PRIME_VERSION) elsif @options['pobox'] then tcp_port = @options['pobox'].empty?() ? "1179" : @options['pobox'] @options['tcp-server'] = tcp_port - session = SessionPOBox.new(@prime, PRIME_VERSION) + protocol = PrimeProtocolPOBox.new(@prime, PRIME_VERSION) else -# session = SessionPrime.new(@prime, PRIME_VERSION) - session = SessionPrime2.new(@prime, PRIME_VERSION) +# protocol = ProtocolPrime.new(@prime, PRIME_VERSION) + protocol = PrimeProtocolPrime2.new(@prime, PRIME_VERSION) end if @options['unix-socket'] then socket_path = @options['unix-socket'] - server = UnixSocketServer.new(session, socket_path) + server = UnixSocketServer.new(protocol, socket_path) elsif @options['tcp-server'] then tcp_port = (@options['tcp-server'].empty?() ? "1180" : @options['tcp-server']) - server = TaiyakiTCPServer.new(session, tcp_port) + server = TaiyakiTCPServer.new(protocol, tcp_port) else - server = StdioServer.new(session) + server = StdioServer.new(protocol) end if PRIME_ENV['debug'] then