ifmapper 0.8.5 → 0.9

data/lib/IFMapper/TADSWriter.rb

@@ -0,0 +1,360 @@
+
+
+class TADSWriter
+
+
+
+  DIRECTIONS = [
+    'north',
+    'northeast',
+    'east',
+    'southeast',
+    'south',
+    'southwest',
+    'west',
+    'northwest',
+  ]
+
+  OTHERDIRS = [
+    '',
+    'up',
+    'down',
+    'in',
+    'out',
+  ]
+
+
+  def get_door_tag(e, r = nil)
+    dirA  = e.roomA.exits.index(e)
+    dirB  = e.roomB.exits.rindex(e)
+    name  = Room::DIRECTIONS[dirA] + "_" + Room::DIRECTIONS[dirB]
+    name << "_door"
+    tag = get_tag(e, name)
+    tag += 'B' if r and r == e.roomB and e.dir == Connection::BOTH
+    return tag
+  end
+
+  def new_tag(elem, str)
+    tag = str.dup
+
+    # Invalid tag characters, replaced with _
+    tag.gsub!(/[\s"'\/\\\-#\,.:;!\?\n\(\)]/,'_')
+ 
+    tag.gsub!(/__/, '')                  # remove reduntant __ repetitions
+    tag.sub!(/^([\d]+)_?(.*)/, '\2\1')   # No numbers allowed at start of tag
+   # tag.downcase!                        # All tags are lowercase
+
+    
+
+    tag = tag[0..31]                     # Max. 32 chars. in tag
+
+    # tag cannot be keyword (Doorway, Room, Class, etc)
+    if tag =~ @keyword
+      tag << '1'
+    end
+
+    if @tags.values.include?(tag)
+      idx  = 2
+      root = tag[0..29]  # to leave room for number
+      while @tags.values.include?(tag)
+	tag = "#{root}#{idx}"
+	idx += 1
+      end
+    end
+
+    if elem.kind_of?(String)
+      @tags[tag] = tag
+    else
+      @tags[elem] = tag
+    end
+
+    return tag
+  end
+
+
+
+  def get_tag(elem, name = elem.name)
+    return @tags[elem] if @tags[elem]
+    return new_tag(elem, name)
+  end
+
+
+
+  def wrap_text(text, width = 74, indent = 79 - width)
+    return 'UNDER CONSTRUCTION' if not text or text == ''
+    str = TADSWriter::quote( text.dup )
+
+    if text.size > width
+      r   = ''
+      while str
+	idx = str.rindex(/[ -]/, width)
+	unless idx
+	  idx = str.index(/[ -]/, width)
+	  idx = str.size unless idx
+	end
+	r << str[0..idx]
+	str = str[idx+1..-1]
+	r << "\n" << ' ' * indent if str
+      end
+      return r
+    else
+      return str
+    end
+  end
+
+
+  #
+  # Take a text and quote it for TADS's double/single-quote text areas.
+  #
+  def self.quote(text)
+    str = text.dup
+    # Quote special characters
+    str.gsub!(/"/, '\"')
+    str.gsub!(/'/, "\\\\'")
+    return str
+  end
+
+
+  def objects(r)
+    room = get_tag(r)
+    objs = r.objects.split("\n")
+    objs.each { |o|
+
+      tag = new_tag(o, o)
+      name = TADSWriter::quote(o)
+
+      classname = 'Thing'
+
+      # If name begins with uppercase, assume it is an NPC
+      if name =~ /[A-Z]/
+	classname = 'Person'
+      end
+
+      @f.print <<"EOF"
+
+#{tag} : #{classname} '#{name}' '#{name}' 
+      @#{room}
+      "#{name} is UNDER CONSTRUCTION."
+;
+EOF
+    }
+
+
+  end
+
+
+
+  def door(e)
+    tag = get_door_tag(e)
+    
+    b = nil
+    destination = ''
+    if e.dir == Connection::BOTH
+      a = e.roomA
+      t = e.exitAtext
+      b = e.roomB
+    elsif e.dir == Connection::AtoB
+      a = e.roomA
+      destination = "\n    destination = #{get_tag(e.roomB)}"
+      t = e.exitAtext
+    elsif e.dir == Connection::BtoA
+      a = e.roomB
+      destination = "\n    destination = #{get_tag(e.roomA)}"
+      t = e.exitBtext
+    end
+
+    roomA = get_tag(a)
+
+    dirA  = a.exits.index(e)
+    if t > 0
+      dirA = dirAern = ''
+    else
+      d       = DIRECTIONS[dirA]
+      dirA    = "#{d} "
+      dirAern = "#{d}ern "
+    end
+
+    prop = ''
+    if e.type == Connection::LOCKED_DOOR
+      prop = 'LockableWithKey, '
+    elsif e.type == Connection::CLOSED_DOOR
+    end
+
+
+    @f.puts <<"EOF"
+
+// Door connecting #{e}
+#{tag} : #{prop}Door '#{dirA}#{dirAern}door' '#{dirAern}door'
+    location = #{roomA}#{destination}
+;
+EOF
+
+    if b
+      roomB = get_tag(b)
+      dirB  = b.exits.rindex(e)
+      if e.exitBtext > 0
+	dirB = dirBern = ''
+      else
+	d       = DIRECTIONS[dirB]
+	dirB    = "#{d} "
+	dirBern = "#{d}ern "
+      end
+
+      @f.puts <<"EOF"
+
+#{tag}B : #{prop}Door -> #{tag} '#{dirB}#{dirBern}door' '#{dirBern}door'
+    location = #{roomB}
+;
+
+EOF
+    end
+
+  end
+
+
+  def room(r)
+    tag = get_tag(r)
+    name = TADSWriter::quote(r.name)
+    dark = r.darkness ? "Dark" : ""
+    @f.puts <<-"EOF"
+
+//-------------------- #{r.name}
+#{tag} : #{dark}Room '#{name}'
+    \"#{wrap_text(r.desc)}\"
+EOF
+
+    # Now, handle exits...
+    r.exits.each_with_index { |e, dir|
+      next if (not e) or e.stub? or e.type == Connection::SPECIAL
+      if e.roomB == r
+	next if e.dir == Connection::AtoB
+	text = e.exitBtext
+	a    = e.roomB
+	b    = e.roomA
+      else
+	next if e.dir == Connection::BtoA
+	text = e.exitAtext
+	a    = e.roomA
+	b    = e.roomB
+      end
+      @f.print '    '
+      if text == 0
+	@f.print "#{DIRECTIONS[dir]} = "
+      else
+	@f.print "#{OTHERDIRS[text]} = "
+      end
+      if e.type == Connection::CLOSED_DOOR or
+	  e.type == Connection::LOCKED_DOOR
+	@f.puts get_door_tag(e, r )
+      else
+	@f.puts get_tag(b)
+      end
+    }
+    @f.puts ";"
+
+    objects(r)
+  end
+
+
+
+  def section(sect, idx)
+    @f = File.open("#@root-#{idx}.t", "w")
+    @f.puts '//' + '=' * 78
+    @f.puts "// Section: #{sect.name} "
+    @f.puts '//' + '=' * 78
+    sect.rooms.each { |r|
+      room(r)
+    }
+    
+    @f.puts 
+    @f.puts '//' + '-' * 78
+    @f.puts '//  Doorways'
+    @f.puts '//' + '-' * 78
+    sect.connections.each { |e|
+      next if (e.type != Connection::LOCKED_DOOR and
+	       e.type != Connection::CLOSED_DOOR)
+      door(e)
+    }
+    @f.close
+  end
+
+
+
+  def start
+    @f = File.open("#@root.t", "w")
+    @f.puts '#charset "us-ascii"'
+    @f.puts
+    @f.puts '//' + '=' * 78
+
+    story = TADSWriter::quote(@map.name)
+    story = 'Untitled' if story == ''
+    today = Date.today
+
+    start_location = ''
+    if @map.sections.size > 0 and @map.sections[0].rooms[0]
+      r   = @map.sections[0].rooms[0]
+      tag = get_tag(r)
+      start_location = "location = #{tag}"
+    end
+
+    @f.puts <<"EOF"
+
+#include <adv3.h>
+#include <en_us.h>
+
+versionInfo: GameID
+    name = '#{story}'
+    byline = '#{@map.creator}'
+    version = '1.0'
+    release = '#{today}'
+;
+
+me: Actor
+    #{start_location}
+;
+
+gameMain: GameMainDef
+    initialPlayerChar = me
+;
+
+EOF
+    @f.puts '//' + '=' * 78
+    @f.puts "// Object classes"
+
+    @f.puts '//' + '=' * 78
+    @f.puts "// Map sections"
+    @map.sections.each_index { |idx|
+      @f.puts "#include \"#@base-#{idx}.t\""
+    }
+    @f.close
+
+    @map.sections.each_with_index { |sect, idx|
+      section(sect, idx)
+    }
+  end
+
+
+  def initialize(map, fileroot)
+    @tags = {}
+    @root = fileroot
+    @base = File.basename(@root)
+    @map = map
+
+    keywords = [
+      'Door',
+      'class',
+      'include',
+      'DarkRoom',
+      'Room',
+      'Thing',
+      'case',
+      'match',
+      'Platform',
+    ] + DIRECTIONS
+
+    @keyword = /^#{keywords.join('|')}$/i
+    start
+  end
+
+
+end

data/lib/IFMapper/TranscriptReader.rb

@@ -24,10 +24,12 @@ class TranscriptReader
   TAKE     = /^(take|get)\s+(a\s+|the\s+)?(.*)/i
   DROP     = /^(drop|leave)\s+()/i
   STARTUP  = /(^[A-Z]+$|Copyright|\([cC]\)\s*\d|Trademark|Release|Version|[Ss]erial [Nn]umber|Written by)/
-  DARKNESS = /^dark(ness)?$|It is pitch black/i
+  DARKNESS = /^dark(ness)?$|In the dark|It is pitch black/i
   DEAD     = /(You die|You have died|You are dead)/i
   YES      = /^y(es)/i
 
+  THEN     = /\bthen\b/i
+
   # Compass direction command -> direction mapping.
   DIRMAP = {
     "n" => 0, "north" => 0, "ne" => 1, "northeast" => 1,
@@ -45,8 +47,20 @@ class TranscriptReader
   # Direction list in order of positioning preference.
   DIRLIST = [ 0, 4, 2, 6, 1, 3, 5, 7 ]
 
+  # No exit replies
+  NO_EXIT = [
+    /you\s+can't\s+go\s+that\s+way/i,
+    /doorways\s+lead\s+/i,
+    /that's\s+a\s+wall/i,
+  ]
+
+  # Closed exit replies
+  CLOSED_EXIT = [
+    /door\s+is\s+closed/i,
+  ]
+
   NAME_REMOVE   = /(\s+\(.+\)|,\s+[io]n\s+.+)/ # remove things like (on the bed)
-  NAME_INVALID  = /[\[\]!\.\?\000]/
+  NAME_INVALID  = /[:;\[\]!\.\?\000]/
   SALUTATIONS   = /\b(Mr|Mr?s|Miss|Jr|Sr)\./
   NAME_MAXWORDS = 20
   NAME_MAXUNCAP = 4  # so that lowercase room/end will be accepted
@@ -54,9 +68,15 @@ class TranscriptReader
   # Default room description recognition parameters.
   DESC_MINWORDS = 10
 
+  # Ignore these words when matching words in description
+  # To avoid cases, like:  An open gate  vs.  A closed gate
+  DESC_IGNORE   = /(?:an|a|open(ed)?|closed?)/i
+
+
+  RESTORE_OK  = /\b(Ok|completed?)\b/
 
   ## Change this to non-dil to print out debugging info
-  @@debug = nil
+  @@debug = 1
 
   def debug(*msg)
     if @@debug
@@ -64,14 +84,21 @@ class TranscriptReader
     end
   end
 
+  ## 
+  THE = '\b(the|a|your|some)\b'
+
+  ARTICLE = /^#{THE}\s+/i
+
   ## Possible nessages indicating get/take succeeded
   TAKE_OK = [ 
     /taken/i,
     /you\s+pick\s+up\s+the\s+?/i,
     /you\s+now\s+have\s+(got\s+)?/i,
+    /you\s+(grab|pick|take)\s+#{THE}\s+\w+/i
   ]
 
-  IT = /^(it|them)$/
+  IT = /^(it|them)$/i
+
 
   #
   # Handle a take action
@@ -90,10 +117,11 @@ class TranscriptReader
 	next if cmd == 'get' and o == 'up'
 	o = @last_obj if o =~ IT
 	next if not o
+	o.sub!(ARTICLE, '')
 	status = move[:reply].to_s
 	TAKE_OK.each { |re|
 	  if status =~ re and not @objects.has_key?(o) and
-	      not @here.objects =~ /#{o}/
+	      not @here.objects =~ /\b#{o}\b/
 	    @here.objects << endl << o << "\n"
 	    @objects[o] = 1
 	    @last_obj = o
@@ -106,8 +134,9 @@ class TranscriptReader
 	  o, status = reply.split(':')
 	  next if not status
 	  o = @last_obj if o =~ IT
+	  o.sub!(ARTICLE, '')
 	  if o and not @objects.has_key?(o) and
-	      not @here.objects =~ /#{o}/
+	      not @here.objects =~ /\b#{o}\b/
 	    @here.objects << endl << o << "\n"
 	    @objects[o] = 1
 	    @last_obj = o
@@ -164,7 +193,7 @@ class TranscriptReader
     # to the east
     /to\s+the\s+#{DIR}\b/i,
     # paths lead west and north
-    /(run|lead|wander|winds)\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i, 
+    /(run|bears|lead|wander|winds)\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i, 
     # east-west corridor
     /[\.\s+]#{DIR}[\/-]#{DIR}\b/i, 
     # East is the postoffice
@@ -172,7 +201,7 @@ class TranscriptReader
     # Directly north
     /\bDirectly\s+#{DIR}/i,
     # continues|lies|etc... east
-    /(runs|leads|heads|opens|winds|continues|branches|lies|wanders|bends|curves)\s+#{DIR}\b/i,
+    /(runs|bears|leads|heads|opens|winds|continues|branches|lies|wanders|bends|curves)\s+#{DIR}\b/i,
     /(running|leading|heading|opening|branching|lying|wandering|looking|bending)\s+#{DIR}\b/i,
   ]
 
@@ -190,9 +219,6 @@ class TranscriptReader
     return if not desc
     exits = []
 
-    # Remove \n from descriptions
-    desc.gsub(/\n/, ' ')
-
     # Now, start searching for stuff
 
     # First try the special directions...
@@ -257,6 +283,11 @@ class TranscriptReader
 	@moves.pop
       else
 	move = { }
+
+	# Replace all 'THEN' in command for periods
+	cmd.sub!(THEN, '.')
+	cmd.sub!(/\s*\.+\s*/, '.') # and multiple periods for just one
+
 	move[:cmd]   = cmd
 	move[:reply] = reply
 	@moves << move
@@ -290,7 +321,7 @@ class TranscriptReader
       end
 
       if cmd =~ RESTORE
-	if move[:reply] =~ /Ok/
+	if move[:reply].join() =~ RESTORE_OK
 	  @here = nil
 	  tele = 1
 	else
@@ -305,6 +336,7 @@ class TranscriptReader
       startup = false
       rooms = []
       move[:reply].each { |r|
+	puts "LINE: #{r}"
 	tele = 1 if r =~ DEAD
 
 	if r =~ STARTUP
@@ -328,28 +360,37 @@ class TranscriptReader
 	if not roomflag and r !~ BLANK and room_name(r)
 	  debug "set roomflag with #{r}"
 	  roomflag = true
+	  desc_gap = false
 	  name = r
+	  desc = ''
 	  next
 	end
 
-	break if roomflag and desc_gap and r =~ BLANK
-
-	desc_gap = true if roomflag and r =~ BLANK
+	if not desc_gap and roomflag and r =~ BLANK and desc == ''
+	  desc_gap = true
+	  next
+	end
 
 
 	if roomflag and r !~ BLANK
+	  puts "ADD TO DESC: #{r}"
 	  desc << r << "\n"
+	  next
 	end
 
-	if r =~ BLANK and roomflag # and desc != ''
-
+	if r =~ BLANK and roomflag
+	  puts "DONE DESC"
 	  if desc.count("\n") == 1 and desc =~ /\?$/
 	    # A "What next?" type of prompt, not a room description
 	    desc = ''
 	  end
-	  desc = nil if desc == ''
+	  if desc == ''
+	    desc = nil
+	  else
+	    desc.gsub!(/\n/, ' ')
+	  end
 
-	  puts "name: #{name}  tele:#{tele}"
+	  puts "DESC: #{desc}"
 	  rooms << {
 	    :name => name,
 	    :desc => desc,
@@ -377,7 +418,41 @@ class TranscriptReader
 	take(move, objs)
       end
 	
-      next unless move[:rooms]
+      if not move[:rooms]
+	# Check if a moving command failed
+	if cmd =~ GO
+	  dir = $3
+	  # See if a stub direction exits in that direction
+	  if @here and DIRMAP[dir] then
+	    dir = DIRMAP[dir]
+	    next unless @here[dir]
+
+	    if @here[dir].stub?
+	      # Check if reply was that there's no exit there.
+	      NO_EXIT.each { |re|
+		if move[:reply][0] =~ re
+		  # If so, remove it... automapper got it wrong.  Not an exit.
+		  @map.delete_connection(@here[dir])
+		  break
+		end
+	      }
+	    end
+
+	    # Check if there is a closed door
+	    if @here[dir].type == Connection::FREE
+	      CLOSED_EXIT.each { |re|
+		if move[:reply][0] =~ re
+		  # If so, flag it
+		  @here[dir].type = Connection::CLOSED_DOOR
+		  break
+		end
+	      }
+	    end
+	  end
+	end
+	next
+      end
+
       move[:rooms].each { |room|
 	name = room[:name]
 	debug "SECTION: #{@map.section}"
@@ -415,7 +490,11 @@ class TranscriptReader
 	# If it is a look command or we don't know where we are yet,
 	# set current room.
 	if move[:look] or not @here
-	  @here = find_room(name, desc)
+	  if move[:look] and name =~ DARKNESS
+	    @here = find_room(name, desc) unless @here.darkness
+	  else
+	    @here = find_room(name, desc)
+	  end
 	  @here = new_room(move, name, desc) unless @here
 	  @here.selected = true
 	  next
@@ -423,6 +502,10 @@ class TranscriptReader
 
 	cmd.sub!(GO, '')
 	dir = $3
+
+	# Swallow everything until next command (separated by .)
+	cmd.sub!(/.*\./, '')
+
 	debug "MOVED IN DIRECTION: #{dir}  CMD LEFT:#{cmd}"
 	if not cmd
 	  debug "Oops... run out of commands."
@@ -469,10 +552,11 @@ class TranscriptReader
 	  dir = DIRMAP[dir]
 	elsif ODIRMAP[dir]
 	  go  = ODIRMAP[dir]
+	  debug "#{dir} move #{go}"
 	  dir = choose_dir(@here, there, go)
 	else
 	  # special move --- teleport/death/etc.
-	  dir = choose_dir(@here, there)
+	  dir = choose_dir(@here, there, 0)
 	end
 	debug "MOVED IN DIR INDEX: #{dir}"
 
@@ -482,7 +566,7 @@ class TranscriptReader
 	  @here = new_room(move, name, desc, dir, @here, go)
 	else
 	  # Visited before -- new link
-	  break unless new_link(move, @here, there, dir, go)
+	  new_link(move, @here, there, dir, go)
 	  @here = there
 	end
       }
@@ -493,6 +577,7 @@ class TranscriptReader
     if @map.kind_of?(FXMap)
       @map.clear_selection
       @here.selected = true if @here
+      @map.create_pathmap
       @map.zoom = @map.zoom
       @map.center_view_on_room(@here) if @here
       @map.verify_integrity
@@ -516,12 +601,22 @@ class TranscriptReader
 	  # Try substring match
 	  score += 5 if room.desc.index(desc)
 	  
+	  # If we have a room where both name and desc match,
+	  # we get a better score than just description only.
+	  # This is to help, for example, Trinity, where two rooms have
+	  # the exact description but different name.
+	  score += 1 if room.name == name and score > 0
+
 	  # If still no luck, try first N words
 	  if score == 0
 	    dwords = room.desc.split(' ')
 	    words  = desc.split(' ')
 	    match  = true
 	    0.upto(DESC_MINWORDS) { |i|
+	      # Ignore some words (like open/close, which may just mean
+	      # some doors changed state)
+	      next if words[i] =~ DESC_IGNORE
+
 	      if words[i] != dwords[i]
 		match = false
 		break
@@ -547,7 +642,11 @@ class TranscriptReader
       @map.fit
       @map.section = best[1]
     end
-    best[0].desc = desc if not best[0].desc and desc
+    puts "DESC: #{desc} RDESC:#{best[0].desc}"
+    if desc and (not best[0].desc or best[0].desc == '')
+      best[0].desc = desc
+      puts "CHANGED: #{best[0].desc}"
+    end
     return best[0]
   end
     
@@ -555,6 +654,9 @@ class TranscriptReader
   # Determine if line corresponds to a room name
   #
   def room_name(line)
+    # Check if user/game has created a room with that name already
+    return true if find_room(line, nil)
+
     # Remove unwanted stuff line (on the bed)
     line.sub!(NAME_REMOVE, '')
 
@@ -661,9 +763,12 @@ class TranscriptReader
 	end
       end
       if c == nil
-	c = @map.new_connection( from, dir, r )
-	c.exitAtext = go if go
-	c.dir = Connection::AtoB
+	begin
+	  c = @map.new_connection( from, dir, r )
+	  c.exitAtext = go if go
+	  c.dir = Connection::AtoB
+	rescue Section::ConnectionError
+	end
       end
     end
 
@@ -699,7 +804,7 @@ class TranscriptReader
       dx, dy = Room::DIR_TO_VECTOR[idx]
       @map.shift(x, y, -dx, -dy)
     else
-      raise "Warning.  Cannot shift connection."
+      debug "Warning.  Cannot shift connection."
     end
   end
 
@@ -753,10 +858,15 @@ class TranscriptReader
 	    to.darkness = true
 	    c = nil
 	  else
-	    debug "*** CANNOT AUTOMAP --- MAZE ***"
-	    dir = Room::DIRECTIONS[dir]
-	    @map.cannot_automap "Maze detected.\n'#{from}' #{dir} leads to '#{c.roomB}',\nnot to this '#{to}'."
-	    self.stop
+	    if c.exitAtext != 0
+	      shift_link(from, dir)
+	      c = nil
+	    else
+	      debug "*** CANNOT AUTOMAP --- MAZE ***"
+	      dir = Room::DIRECTIONS[dir]
+	      @map.cannot_automap "Maze detected.\n'#{from}' #{dir} leads to '#{c.roomB}',\nnot to this '#{to}'."
+	    end
+	    # self.stop
 	    return nil
 	  end
 	else
@@ -812,13 +922,12 @@ class TranscriptReader
     end
 
     if not c
-      # No link exists -- create new one
+      # No link exists -- create new one.  
       begin
 	c = @map.new_connection( from, dir, to, odir )
 	c.exitAtext = go if go
 	c.dir = Connection::AtoB
-      rescue => e
-	$stderr.puts e
+      rescue Section::ConnectionError
       end
     end
 
@@ -828,6 +937,8 @@ class TranscriptReader
 
   # Choose a direction to represent up/down/in/out.
   def choose_dir(a, b, go = nil, exitB = nil)
+    # Don't add a new connection if we already have a normal connection
+    # to the room and we are moving up/down/etc.
     if go
       rgo = go % 2 == 0? go - 1 : go + 1
       debug "#{Connection::EXIT_TEXT[go]} <=> #{Connection::EXIT_TEXT[rgo]}"
@@ -836,13 +947,11 @@ class TranscriptReader
 	next if not e
 	roomA = e.roomA
 	roomB = e.roomB
-	if roomA == a and roomB == b and 
-	    (e.exitBtext == rgo or e.exitAtext == go)
-	  e.exitAtext = go
+	if roomA == a and roomB == b
+	  e.exitAtext = go if e.exitBtext == rgo
 	  return idx
-	elsif roomB == a and roomA == b and (e.exitAtext == rgo or
-					     e.exitBtext == go)
-	  e.exitBtext = go
+	elsif roomB == a and roomA == b
+	  e.exitBtext = go if e.exitAtext == rgo
 	  return idx
 	end
       }
@@ -917,19 +1026,28 @@ class TranscriptReader
     @here     = nil
     @section  = -1
     @last_obj = nil
-  end
 
-  def start
     @f = File.open(@file, 'r')
+    while line = @f.gets
+      break if PROMPT =~ line
+    end
     parse
+  end
+
+  # Step one user command at a time
+  def step
+    begin
+      parse_line(@f.gets)
+    rescue => e
+      $stderr.puts e
+      $stderr.puts e.backtrace
+    end
+  end
+
+  def start
     @t = Thread.new { 
       loop do
-	begin
-	  parse_line(@f.gets)
-	rescue => e
-	  puts e
-	  puts e.backtrace
-	end
+	self.step
 	Thread.pass
       end
     }