tmail 1.2.3.1 → 1.2.6

data/lib/tmail/mailbox.rb

@@ -364,9 +364,10 @@ module TMail
     end
 
     def fromline2time( line )
-      m = /\AFrom \S+ \w+ (\w+) (\d+) (\d+):(\d+):(\d+) (\d+)/.match(line) \
-              or return nil
+      m = /\AFrom \S+ \w+ (\w+) (\d+) (\d+):(\d+):(\d+) (\d+)/.match(line) or return nil
       Time.local(m[6].to_i, m[1], m[2].to_i, m[3].to_i, m[4].to_i, m[5].to_i)
+    rescue
+      nil
     end
 
   end   # UNIXMbox

data/lib/tmail/net.rb

@@ -78,7 +78,9 @@ module TMail
     end
 
     def add_message_id( fqdn = nil )
-      self.message_id = ::TMail::new_message_id(fqdn)
+      unless @message_id_enforced
+        self.message_id = ::TMail::new_message_id(fqdn)
+      end
     end
 
     def add_date

data/lib/tmail/parser.rb

@@ -1,461 +1,10 @@
-#:stopdoc:
+#
 # DO NOT MODIFY!!!!
 # This file is automatically generated by racc 1.4.5
-# from racc grammer file "parser.y".
-#
-#
-# parser.rb: generated by racc (runtime embedded)
-#
-###### racc/parser.rb begin
-unless $".index 'racc/parser.rb'
-$".push 'racc/parser.rb'
-
-self.class.module_eval <<'..end racc/parser.rb modeval..id8076474214', 'racc/parser.rb', 1
-#
-# $Id: parser.rb,v 1.7 2005/11/20 17:31:32 aamine Exp $
+# from racc grammer file "lib/tmail/parser.y".
 #
-# Copyright (c) 1999-2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the same terms of ruby.
-#
-# As a special exception, when this code is copied by Racc
-# into a Racc output file, you may use that output file
-# without restriction.
-#
-
-unless defined?(NotImplementedError)
-  NotImplementedError = NotImplementError
-end
-
-module Racc
-  class ParseError < StandardError; end
-end
-unless defined?(::ParseError)
-  ParseError = Racc::ParseError
-end
-
-module Racc
-
-  unless defined?(Racc_No_Extentions)
-    Racc_No_Extentions = false
-  end
-
-  class Parser
-
-    Racc_Runtime_Version = '1.4.5'
-    Racc_Runtime_Revision = '$Revision: 1.7 $'.split[1]
-
-    Racc_Runtime_Core_Version_R = '1.4.5'
-    Racc_Runtime_Core_Revision_R = '$Revision: 1.7 $'.split[1]
-    begin
-      require 'racc/cparse'
-    # Racc_Runtime_Core_Version_C  = (defined in extention)
-      Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2]
-      unless new.respond_to?(:_racc_do_parse_c, true)
-        raise LoadError, 'old cparse.so'
-      end
-      if Racc_No_Extentions
-        raise LoadError, 'selecting ruby version of racc runtime core'
-      end
-
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_c
-      Racc_YY_Parse_Method         = :_racc_yyparse_c
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_C
-      Racc_Runtime_Type            = 'c'
-    rescue LoadError
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
-      Racc_YY_Parse_Method         = :_racc_yyparse_rb
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_R
-      Racc_Runtime_Type            = 'ruby'
-    end
-
-    def Parser.racc_runtime_type
-      Racc_Runtime_Type
-    end
-
-    private
-
-    def _racc_setup
-      @yydebug = false unless self.class::Racc_debug_parser
-      @yydebug = false unless defined?(@yydebug)
-      if @yydebug
-        @racc_debug_out = $stderr unless defined?(@racc_debug_out)
-        @racc_debug_out ||= $stderr
-      end
-      arg = self.class::Racc_arg
-      arg[13] = true if arg.size < 14
-      arg
-    end
-
-    def _racc_init_sysvars
-      @racc_state  = [0]
-      @racc_tstack = []
-      @racc_vstack = []
-
-      @racc_t = nil
-      @racc_val = nil
-
-      @racc_read_next = true
-
-      @racc_user_yyerror = false
-      @racc_error_status = 0
-    end
 
-    ###
-    ### do_parse
-    ###
-
-    def do_parse
-      __send__(Racc_Main_Parsing_Routine, _racc_setup(), false)
-    end
-
-    def next_token
-      raise NotImplementedError, "#{self.class}\#next_token is not defined"
-    end
-
-    def _racc_do_parse_rb(arg, in_debug)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-
-      _racc_init_sysvars
-      tok = act = i = nil
-      nerr = 0
-
-      catch(:racc_end_parse) {
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            if @racc_read_next
-              if @racc_t != 0   # not EOF
-                tok, @racc_val = next_token()
-                unless tok      # EOF
-                  @racc_t = 0
-                else
-                  @racc_t = (token_table[tok] or 1)   # error token
-                end
-                racc_read_token(@racc_t, tok, @racc_val) if @yydebug
-                @racc_read_next = false
-              end
-            end
-            i += @racc_t
-            unless i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-          else
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-        end
-      }
-    end
-
-    ###
-    ### yyparse
-    ###
-
-    def yyparse(recv, mid)
-      __send__(Racc_YY_Parse_Method, recv, mid, _racc_setup(), true)
-    end
-
-    def _racc_yyparse_rb(recv, mid, arg, c_debug)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-
-      _racc_init_sysvars
-      tok = nil
-      act = nil
-      i = nil
-      nerr = 0
-
-      catch(:racc_end_parse) {
-        until i = action_pointer[@racc_state[-1]]
-          while act = _racc_evalact(action_default[@racc_state[-1]], arg)
-            ;
-          end
-        end
-        recv.__send__(mid) do |tok, val|
-          unless tok
-            @racc_t = 0
-          else
-            @racc_t = (token_table[tok] or 1)   # error token
-          end
-          @racc_val = val
-          @racc_read_next = false
-
-          i += @racc_t
-          unless i >= 0 and
-                 act = action_table[i] and
-                 action_check[i] == @racc_state[-1]
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-
-          while not (i = action_pointer[@racc_state[-1]]) or
-                not @racc_read_next or
-                @racc_t == 0   # $
-            unless i and i += @racc_t and
-                   i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-            while act = _racc_evalact(act, arg)
-              ;
-            end
-          end
-        end
-      }
-    end
-
-    ###
-    ### common
-    ###
-
-    def _racc_evalact(act, arg)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-      nerr = 0   # tmp
-
-      if act > 0 and act < shift_n
-        #
-        # shift
-        #
-        if @racc_error_status > 0
-          @racc_error_status -= 1 unless @racc_t == 1   # error token
-        end
-        @racc_vstack.push @racc_val
-        @racc_state.push act
-        @racc_read_next = true
-        if @yydebug
-          @racc_tstack.push @racc_t
-          racc_shift @racc_t, @racc_tstack, @racc_vstack
-        end
-
-      elsif act < 0 and act > -reduce_n
-        #
-        # reduce
-        #
-        code = catch(:racc_jump) {
-          @racc_state.push _racc_do_reduce(arg, act)
-          false
-        }
-        if code
-          case code
-          when 1 # yyerror
-            @racc_user_yyerror = true   # user_yyerror
-            return -reduce_n
-          when 2 # yyaccept
-            return shift_n
-          else
-            raise '[Racc Bug] unknown jump code'
-          end
-        end
-
-      elsif act == shift_n
-        #
-        # accept
-        #
-        racc_accept if @yydebug
-        throw :racc_end_parse, @racc_vstack[0]
-
-      elsif act == -reduce_n
-        #
-        # error
-        #
-        case @racc_error_status
-        when 0
-          unless arg[21]    # user_yyerror
-            nerr += 1
-            on_error @racc_t, @racc_val, @racc_vstack
-          end
-        when 3
-          if @racc_t == 0   # is $
-            throw :racc_end_parse, nil
-          end
-          @racc_read_next = true
-        end
-        @racc_user_yyerror = false
-        @racc_error_status = 3
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            i += 1   # error token
-            if  i >= 0 and
-                (act = action_table[i]) and
-                action_check[i] == @racc_state[-1]
-              break
-            end
-          end
-          throw :racc_end_parse, nil if @racc_state.size <= 1
-          @racc_state.pop
-          @racc_vstack.pop
-          if @yydebug
-            @racc_tstack.pop
-            racc_e_pop @racc_state, @racc_tstack, @racc_vstack
-          end
-        end
-        return act
-
-      else
-        raise "[Racc Bug] unknown action #{act.inspect}"
-      end
-
-      racc_next_state(@racc_state[-1], @racc_state) if @yydebug
-
-      nil
-    end
-
-    def _racc_do_reduce(arg, act)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-      state = @racc_state
-      vstack = @racc_vstack
-      tstack = @racc_tstack
-
-      i = act * -3
-      len       = reduce_table[i]
-      reduce_to = reduce_table[i+1]
-      method_id = reduce_table[i+2]
-      void_array = []
-
-      tmp_t = tstack[-len, len] if @yydebug
-      tmp_v = vstack[-len, len]
-      tstack[-len, len] = void_array if @yydebug
-      vstack[-len, len] = void_array
-      state[-len, len]  = void_array
-
-      # tstack must be updated AFTER method call
-      if use_result
-        vstack.push __send__(method_id, tmp_v, vstack, tmp_v[0])
-      else
-        vstack.push __send__(method_id, tmp_v, vstack)
-      end
-      tstack.push reduce_to
-
-      racc_reduce(tmp_t, reduce_to, tstack, vstack) if @yydebug
-
-      k1 = reduce_to - nt_base
-      if i = goto_pointer[k1]
-        i += state[-1]
-        if i >= 0 and (curstate = goto_table[i]) and goto_check[i] == k1
-          return curstate
-        end
-      end
-      goto_default[k1]
-    end
-
-    def on_error(t, val, vstack)
-      raise ParseError, sprintf("\nparse error on value %s (%s)",
-                                val.inspect, token_to_str(t) || '?')
-    end
-
-    def yyerror
-      throw :racc_jump, 1
-    end
-
-    def yyaccept
-      throw :racc_jump, 2
-    end
-
-    def yyerrok
-      @racc_error_status = 0
-    end
-
-    #
-    # for debugging output
-    #
-
-    def racc_read_token(t, tok, val)
-      @racc_debug_out.print 'read    '
-      @racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
-      @racc_debug_out.puts val.inspect
-      @racc_debug_out.puts
-    end
-
-    def racc_shift(tok, tstack, vstack)
-      @racc_debug_out.puts "shift   #{racc_token2str tok}"
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_reduce(toks, sim, tstack, vstack)
-      out = @racc_debug_out
-      out.print 'reduce '
-      if toks.empty?
-        out.print ' <none>'
-      else
-        toks.each {|t| out.print ' ', racc_token2str(t) }
-      end
-      out.puts " --> #{racc_token2str(sim)}"
-          
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_accept
-      @racc_debug_out.puts 'accept'
-      @racc_debug_out.puts
-    end
-
-    def racc_e_pop(state, tstack, vstack)
-      @racc_debug_out.puts 'error recovering mode: pop token'
-      racc_print_states state
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_next_state(curstate, state)
-      @racc_debug_out.puts  "goto    #{curstate}"
-      racc_print_states state
-      @racc_debug_out.puts
-    end
-
-    def racc_print_stacks(t, v)
-      out = @racc_debug_out
-      out.print '        ['
-      t.each_index do |i|
-        out.print ' (', racc_token2str(t[i]), ' ', v[i].inspect, ')'
-      end
-      out.puts ' ]'
-    end
-
-    def racc_print_states(s)
-      out = @racc_debug_out
-      out.print '        ['
-      s.each {|st| out.print ' ', st }
-      out.puts ' ]'
-    end
-
-    def racc_token2str(tok)
-      self.class::Racc_token_to_s_table[tok] or
-          raise "[Racc Bug] can't convert token #{tok} to string"
-    end
-
-    def token_to_str(t)
-      self.class::Racc_token_to_s_table[t]
-    end
-
-  end
-
-end
-..end racc/parser.rb modeval..id8076474214
-end
-###### racc/parser.rb end
+require 'racc/parser'
 
 
 #
@@ -476,14 +25,49 @@ module TMail
 
   class Parser < Racc::Parser
 
-module_eval <<'..end parser.y modeval..id7b0b3dccb7', 'parser.y', 340
+module_eval <<'..end lib/tmail/parser.y modeval..id2dd1c7d21d', 'lib/tmail/parser.y', 340
 
   include TextUtils
 
   def self.parse( ident, str, cmt = nil )
+    str = special_quote_address(str) if ident.to_s =~ /M?ADDRESS/
     new.parse(ident, str, cmt)
   end
 
+  def self.special_quote_address(str) #:nodoc:
+    # Takes a string which is an address and adds quotation marks to special
+    # edge case methods that the RACC parser can not handle.
+    #
+    # Right now just handles two edge cases:
+    #
+    # Full stop as the last character of the display name:
+    #   Mikel L. <mikel@me.com>
+    # Returns:
+    #   "Mikel L." <mikel@me.com>
+    #
+    # Unquoted @ symbol in the display name:
+    #   mikel@me.com <mikel@me.com>
+    # Returns:
+    #   "mikel@me.com" <mikel@me.com>
+    #
+    # Any other address not matching these patterns just gets returned as is.
+    case
+    # This handles the missing "" in an older version of Apple Mail.app
+    # around the display name when the display name contains a '@'
+    # like 'mikel@me.com <mikel@me.com>'
+    # Just quotes it to: '"mikel@me.com" <mikel@me.com>'
+    when str =~ /\A([^"].+@.+[^"])\s(<.*?>)\Z/
+      return "\"#{$1}\" #{$2}"
+    # This handles cases where 'Mikel A. <mikel@me.com>' which is a trailing
+    # full stop before the address section.  Just quotes it to
+    # '"Mikel A." <mikel@me.com>'
+    when str =~ /\A(.*?\.)\s(<.*?>)\s*\Z/
+      return "\"#{$1}\" #{$2}"
+    else
+      str
+    end
+  end
+
   MAILP_DEBUG = false
 
   def initialize
@@ -516,10 +100,10 @@ module_eval <<'..end parser.y modeval..id7b0b3dccb7', 'parser.y', 340
   end
   
   def on_error( t, val, vstack )
-    raise SyntaxError, "parse error on token #{racc_token2str t}"
+    raise TMail::SyntaxError, "parse error on token #{racc_token2str t}"
   end
 
-..end parser.y modeval..id7b0b3dccb7
+..end lib/tmail/parser.y modeval..id2dd1c7d21d
 
 ##### racc 1.4.5 generates ###
 
@@ -639,109 +223,109 @@ racc_reduce_n = 109
 racc_shift_n = 167
 
 racc_action_table = [
-   -70,   -69,    23,    25,   145,   146,    29,    31,   105,   106,
-    16,    17,    20,    22,   136,    27,   -70,   -69,    32,   101,
-   -70,   -69,   153,   100,   113,   115,   -70,   -69,   -70,   109,
-    75,    23,    25,   101,   154,    29,    31,   142,   143,    16,
-    17,    20,    22,   107,    27,    23,    25,    32,    98,    29,
-    31,    96,    94,    16,    17,    20,    22,    78,    27,    23,
-    25,    32,   112,    29,    31,    74,    91,    16,    17,    20,
-    22,    88,   117,    92,    81,    32,    23,    25,    80,   123,
-    29,    31,   100,   125,    16,    17,    20,    22,   126,    23,
-    25,   109,    32,    29,    31,    91,   128,    16,    17,    20,
-    22,   129,    27,    23,    25,    32,   101,    29,    31,   101,
-   130,    16,    17,    20,    22,    79,    52,    23,    25,    32,
-    78,    29,    31,   133,    78,    16,    17,    20,    22,    77,
-    23,    25,    75,    32,    29,    31,    65,    62,    16,    17,
-    20,    22,   139,    23,    25,   101,    32,    29,    31,    60,
-   100,    16,    17,    20,    22,    44,    27,   101,   147,    32,
-    23,    25,   120,   148,    29,    31,   151,   152,    16,    17,
-    20,    22,    42,    27,   156,   158,    32,    23,    25,   120,
-    40,    29,    31,    15,   163,    16,    17,    20,    22,    40,
-    27,    23,    25,    32,    68,    29,    31,   165,   166,    16,
-    17,    20,    22,   nil,    27,    23,    25,    32,   nil,    29,
-    31,    74,   nil,    16,    17,    20,    22,   nil,    23,    25,
+   -69,   130,   -70,    23,    25,   153,    94,    29,    31,   142,
+   143,    16,    17,    20,    22,    98,   -69,   154,   -70,    32,
+   -69,   107,   -70,   145,   146,    78,   -69,    91,   -70,    75,
+   -70,    23,    25,   120,    88,    29,    31,   105,   106,    16,
+    17,    20,    22,    81,    27,    23,    25,    32,   112,    29,
+    31,    96,    80,    16,    17,    20,    22,   117,    27,    23,
+    25,    32,    79,    29,    31,    78,   123,    16,    17,    20,
+    22,   100,    27,    23,    25,    32,   125,    29,    31,   113,
+   115,    16,    17,    20,    22,   126,    23,    25,   101,    32,
+    29,    31,    91,   128,    16,    17,    20,    22,   129,    27,
+    23,    25,    32,   101,    29,    31,   101,    75,    16,    17,
+    20,    22,    77,    52,    23,    25,    32,    65,    29,    31,
+   133,    78,    16,    17,    20,    22,    62,    23,    25,   136,
+    32,    29,    31,    60,    44,    16,    17,    20,    22,   139,
+    23,    25,   101,    32,    29,    31,   101,   100,    16,    17,
+    20,    22,   100,    27,    23,    25,    32,   101,    29,    31,
+   147,   148,    16,    17,    20,    22,   151,    23,    25,   152,
+    32,    29,    31,    74,    42,    16,    17,    20,    22,   156,
+   158,    92,    40,    32,    23,    25,    15,    68,    29,    31,
+   163,    40,    16,    17,    20,    22,   165,    27,    23,    25,
+    32,   166,    29,    31,   nil,   nil,    16,    17,    20,    22,
+   nil,    27,    23,    25,    32,   nil,    29,    31,   nil,   nil,
+    16,    17,    20,    22,   nil,    23,    25,   nil,    32,    29,
+    31,   nil,   nil,    16,    17,    20,    22,   nil,    23,    25,
    nil,    32,    29,    31,   nil,   nil,    16,    17,    20,    22,
    nil,    23,    25,   nil,    32,    29,    31,   nil,   nil,    16,
-    17,    20,    22,   nil,    23,    25,   nil,    32,    29,    31,
-   nil,   nil,    16,    17,    20,    22,   nil,    23,    25,   nil,
-    32,    29,    31,   nil,   nil,    16,    17,    20,    22,   nil,
-    27,    23,    25,    32,   nil,    29,    31,   nil,   nil,    16,
-    17,    20,    22,   nil,    23,    25,   nil,    32,    29,    31,
-   nil,   nil,    16,    17,    20,    22,   nil,    23,    25,   nil,
-    32,    29,    31,   nil,   nil,    16,    17,    20,    22,   nil,
-    84,    25,   nil,    32,    29,    31,   nil,    87,    16,    17,
-    20,    22,     4,     6,     7,     8,     9,    10,    11,    12,
-    13,     1,     2,     3,    84,    25,   nil,   nil,    29,    31,
+    17,    20,    22,   nil,    27,   nil,   nil,    32,    23,    25,
+   120,   nil,    29,    31,   nil,   nil,    16,    17,    20,    22,
+   nil,    27,    23,    25,    32,   nil,    29,    31,   nil,   nil,
+    16,    17,    20,    22,   nil,    23,    25,   109,    32,    29,
+    31,    74,   nil,    16,    17,    20,    22,   nil,    84,    25,
+   nil,    32,    29,    31,   nil,    87,    16,    17,    20,    22,
+    84,    25,   nil,   109,    29,    31,   nil,    87,    16,    17,
+    20,    22,    84,    25,   nil,   nil,    29,    31,   nil,    87,
+    16,    17,    20,    22,    84,    25,   nil,   nil,    29,    31,
    nil,    87,    16,    17,    20,    22,    84,    25,   nil,   nil,
     29,    31,   nil,    87,    16,    17,    20,    22,    84,    25,
    nil,   nil,    29,    31,   nil,    87,    16,    17,    20,    22,
-    84,    25,   nil,   nil,    29,    31,   nil,    87,    16,    17,
-    20,    22,    84,    25,   nil,   nil,    29,    31,   nil,    87,
-    16,    17,    20,    22,    84,    25,   nil,   nil,    29,    31,
-   nil,    87,    16,    17,    20,    22 ]
+     4,     6,     7,     8,     9,    10,    11,    12,    13,     1,
+     2,     3,    84,    25,   nil,   nil,    29,    31,   nil,    87,
+    16,    17,    20,    22 ]
 
 racc_action_check = [
-    75,    28,    68,    68,   136,   136,    68,    68,    72,    72,
-    68,    68,    68,    68,   126,    68,    75,    28,    68,    67,
-    75,    28,   143,    66,    86,    86,    75,    28,    75,    75,
-    28,     3,     3,    86,   143,     3,     3,   134,   134,     3,
-     3,     3,     3,    73,     3,   151,   151,     3,    62,   151,
-   151,    60,    56,   151,   151,   151,   151,    51,   151,    52,
-    52,   151,    80,    52,    52,    52,    50,    52,    52,    52,
-    52,    45,    89,    52,    42,    52,    71,    71,    41,    96,
-    71,    71,    97,    98,    71,    71,    71,    71,   100,     7,
-     7,   101,    71,     7,     7,   102,   104,     7,     7,     7,
-     7,   105,     7,     8,     8,     7,   108,     8,     8,   111,
-   112,     8,     8,     8,     8,    40,     8,     9,     9,     8,
-    36,     9,     9,   117,   121,     9,     9,     9,     9,    33,
-    10,    10,    70,     9,    10,    10,    13,    12,    10,    10,
-    10,    10,   130,     2,     2,   131,    10,     2,     2,    11,
-   135,     2,     2,     2,     2,     6,     2,   138,   139,     2,
-    90,    90,    90,   140,    90,    90,   141,   142,    90,    90,
-    90,    90,     5,    90,   147,   150,    90,   127,   127,   127,
-     4,   127,   127,     1,   156,   127,   127,   127,   127,   158,
-   127,    26,    26,   127,    26,    26,    26,   162,   163,    26,
-    26,    26,    26,   nil,    26,    27,    27,    26,   nil,    27,
-    27,    27,   nil,    27,    27,    27,    27,   nil,   154,   154,
-   nil,    27,   154,   154,   nil,   nil,   154,   154,   154,   154,
-   nil,   122,   122,   nil,   154,   122,   122,   nil,   nil,   122,
-   122,   122,   122,   nil,    76,    76,   nil,   122,    76,    76,
-   nil,   nil,    76,    76,    76,    76,   nil,    38,    38,   nil,
-    76,    38,    38,   nil,   nil,    38,    38,    38,    38,   nil,
-    38,    55,    55,    38,   nil,    55,    55,   nil,   nil,    55,
-    55,    55,    55,   nil,    94,    94,   nil,    55,    94,    94,
-   nil,   nil,    94,    94,    94,    94,   nil,    59,    59,   nil,
-    94,    59,    59,   nil,   nil,    59,    59,    59,    59,   nil,
-   114,   114,   nil,    59,   114,   114,   nil,   114,   114,   114,
-   114,   114,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,    77,    77,   nil,   nil,    77,    77,
-   nil,    77,    77,    77,    77,    77,    44,    44,   nil,   nil,
-    44,    44,   nil,    44,    44,    44,    44,    44,   113,   113,
-   nil,   nil,   113,   113,   nil,   113,   113,   113,   113,   113,
-    88,    88,   nil,   nil,    88,    88,   nil,    88,    88,    88,
-    88,    88,    74,    74,   nil,   nil,    74,    74,   nil,    74,
-    74,    74,    74,    74,   129,   129,   nil,   nil,   129,   129,
-   nil,   129,   129,   129,   129,   129 ]
+    28,   112,    75,    71,    71,   143,    56,    71,    71,   134,
+   134,    71,    71,    71,    71,    62,    28,   143,    75,    71,
+    28,    73,    75,   136,   136,    51,    28,    50,    75,    28,
+    75,   127,   127,   127,    45,   127,   127,    72,    72,   127,
+   127,   127,   127,    42,   127,     3,     3,   127,    80,     3,
+     3,    60,    41,     3,     3,     3,     3,    89,     3,   151,
+   151,     3,    40,   151,   151,    36,    96,   151,   151,   151,
+   151,    97,   151,    55,    55,   151,    98,    55,    55,    86,
+    86,    55,    55,    55,    55,   100,     7,     7,    86,    55,
+     7,     7,   102,   104,     7,     7,     7,     7,   105,     7,
+     8,     8,     7,   108,     8,     8,   111,    70,     8,     8,
+     8,     8,    33,     8,     9,     9,     8,    13,     9,     9,
+   117,   121,     9,     9,     9,     9,    12,    10,    10,   126,
+     9,    10,    10,    11,     6,    10,    10,    10,    10,   130,
+     2,     2,   131,    10,     2,     2,    67,   135,     2,     2,
+     2,     2,    66,     2,   122,   122,     2,   138,   122,   122,
+   139,   140,   122,   122,   122,   122,   141,    52,    52,   142,
+   122,    52,    52,    52,     5,    52,    52,    52,    52,   147,
+   150,    52,     4,    52,    26,    26,     1,    26,    26,    26,
+   156,   158,    26,    26,    26,    26,   162,    26,    68,    68,
+    26,   163,    68,    68,   nil,   nil,    68,    68,    68,    68,
+   nil,    68,    59,    59,    68,   nil,    59,    59,   nil,   nil,
+    59,    59,    59,    59,   nil,   154,   154,   nil,    59,   154,
+   154,   nil,   nil,   154,   154,   154,   154,   nil,    94,    94,
+   nil,   154,    94,    94,   nil,   nil,    94,    94,    94,    94,
+   nil,    38,    38,   nil,    94,    38,    38,   nil,   nil,    38,
+    38,    38,    38,   nil,    38,   nil,   nil,    38,    90,    90,
+    90,   nil,    90,    90,   nil,   nil,    90,    90,    90,    90,
+   nil,    90,    76,    76,    90,   nil,    76,    76,   nil,   nil,
+    76,    76,    76,    76,   nil,    27,    27,    76,    76,    27,
+    27,    27,   nil,    27,    27,    27,    27,   nil,   114,   114,
+   nil,    27,   114,   114,   nil,   114,   114,   114,   114,   114,
+    44,    44,   nil,   114,    44,    44,   nil,    44,    44,    44,
+    44,    44,    74,    74,   nil,   nil,    74,    74,   nil,    74,
+    74,    74,    74,    74,   113,   113,   nil,   nil,   113,   113,
+   nil,   113,   113,   113,   113,   113,   129,   129,   nil,   nil,
+   129,   129,   nil,   129,   129,   129,   129,   129,    88,    88,
+   nil,   nil,    88,    88,   nil,    88,    88,    88,    88,    88,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,    77,    77,   nil,   nil,    77,    77,   nil,    77,
+    77,    77,    77,    77 ]
 
 racc_action_pointer = [
-   320,   152,   129,    17,   165,   172,   137,    75,    89,   103,
-   116,   135,   106,   105,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   177,   191,     1,   nil,
-   nil,   nil,   nil,   109,   nil,   nil,    94,   nil,   243,   nil,
-    99,    64,    74,   nil,   332,    52,   nil,   nil,   nil,   nil,
-    50,    31,    45,   nil,   nil,   257,    36,   nil,   nil,   283,
-    22,   nil,    16,   nil,   nil,   nil,    -3,   -10,   -12,   nil,
-   103,    62,    -8,    15,   368,     0,   230,   320,   nil,   nil,
-    47,   nil,   nil,   nil,   nil,   nil,     4,   nil,   356,    50,
-   146,   nil,   nil,   nil,   270,   nil,    65,    56,    52,   nil,
-    57,    62,    79,   nil,    68,    81,   nil,   nil,    77,   nil,
-   nil,    80,    96,   344,   296,   nil,   nil,   108,   nil,   nil,
-   nil,    98,   217,   nil,   nil,   nil,   -19,   163,   nil,   380,
-   128,   116,   nil,   nil,    14,   124,   -26,   nil,   128,   141,
-   148,   141,   152,     7,   nil,   nil,   nil,   160,   nil,   nil,
-   149,    31,   nil,   nil,   204,   nil,   167,   nil,   174,   nil,
-   nil,   nil,   169,   184,   nil,   nil,   nil ]
+   378,   155,   126,    31,   167,   174,   116,    72,    86,   100,
+   113,   119,    95,    86,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   170,   281,     0,   nil,
+   nil,   nil,   nil,    92,   nil,   nil,    39,   nil,   237,   nil,
+    46,    38,    43,   nil,   306,    15,   nil,   nil,   nil,   nil,
+    11,    -1,   153,   nil,   nil,    59,   -10,   nil,   nil,   198,
+    22,   nil,   -17,   nil,   nil,   nil,   126,   117,   184,   nil,
+    78,   -11,    21,    -7,   318,     2,   268,   378,   nil,   nil,
+    33,   nil,   nil,   nil,   nil,   nil,    59,   nil,   354,    35,
+   254,   nil,   nil,   nil,   224,   nil,    52,    45,    45,   nil,
+    54,   nil,    76,   nil,    65,    78,   nil,   nil,    74,   nil,
+   nil,    77,   -13,   330,   294,   nil,   nil,   105,   nil,   nil,
+   nil,    95,   140,   nil,   nil,   nil,    96,    17,   nil,   342,
+   125,   113,   nil,   nil,   -14,   121,    -7,   nil,   128,   143,
+   146,   141,   154,   -10,   nil,   nil,   nil,   165,   nil,   nil,
+   154,    45,   nil,   nil,   211,   nil,   173,   nil,   176,   nil,
+   nil,   nil,   168,   187,   nil,   nil,   nil ]
 
 racc_action_default = [
   -109,  -109,  -109,  -109,   -14,  -109,   -20,  -109,  -109,  -109,
@@ -958,79 +542,79 @@ Racc_debug_parser = false
 
  # reduce 0 omitted
 
-module_eval <<'.,.,', 'parser.y', 16
+module_eval <<'.,.,', 'lib/tmail/parser.y', 16
   def _reduce_1( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 17
+module_eval <<'.,.,', 'lib/tmail/parser.y', 17
   def _reduce_2( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 18
+module_eval <<'.,.,', 'lib/tmail/parser.y', 18
   def _reduce_3( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 19
+module_eval <<'.,.,', 'lib/tmail/parser.y', 19
   def _reduce_4( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 20
+module_eval <<'.,.,', 'lib/tmail/parser.y', 20
   def _reduce_5( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 21
+module_eval <<'.,.,', 'lib/tmail/parser.y', 21
   def _reduce_6( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 22
+module_eval <<'.,.,', 'lib/tmail/parser.y', 22
   def _reduce_7( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 23
+module_eval <<'.,.,', 'lib/tmail/parser.y', 23
   def _reduce_8( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 24
+module_eval <<'.,.,', 'lib/tmail/parser.y', 24
   def _reduce_9( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 25
+module_eval <<'.,.,', 'lib/tmail/parser.y', 25
   def _reduce_10( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 26
+module_eval <<'.,.,', 'lib/tmail/parser.y', 26
   def _reduce_11( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 27
+module_eval <<'.,.,', 'lib/tmail/parser.y', 27
   def _reduce_12( val, _values)
  val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 36
+module_eval <<'.,.,', 'lib/tmail/parser.y', 36
   def _reduce_13( val, _values)
                   t = Time.gm(val[3].to_i, val[2], val[1].to_i, 0, 0, 0)
                   (t + val[4] - val[5]).localtime
@@ -1041,14 +625,14 @@ module_eval <<'.,.,', 'parser.y', 36
 
  # reduce 15 omitted
 
-module_eval <<'.,.,', 'parser.y', 45
+module_eval <<'.,.,', 'lib/tmail/parser.y', 45
   def _reduce_16( val, _values)
                   (val[0].to_i * 60 * 60) +
                   (val[2].to_i * 60)
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 51
+module_eval <<'.,.,', 'lib/tmail/parser.y', 51
   def _reduce_17( val, _values)
                   (val[0].to_i * 60 * 60) +
                   (val[2].to_i * 60) +
@@ -1056,13 +640,13 @@ module_eval <<'.,.,', 'parser.y', 51
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 56
+module_eval <<'.,.,', 'lib/tmail/parser.y', 56
   def _reduce_18( val, _values)
                   timezone_string_to_unixtime(val[0])
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 61
+module_eval <<'.,.,', 'lib/tmail/parser.y', 61
   def _reduce_19( val, _values)
                   val
   end
@@ -1070,7 +654,7 @@ module_eval <<'.,.,', 'parser.y', 61
 
  # reduce 20 omitted
 
-module_eval <<'.,.,', 'parser.y', 67
+module_eval <<'.,.,', 'lib/tmail/parser.y', 67
   def _reduce_21( val, _values)
                   val[1]
   end
@@ -1078,25 +662,25 @@ module_eval <<'.,.,', 'parser.y', 67
 
  # reduce 22 omitted
 
-module_eval <<'.,.,', 'parser.y', 73
+module_eval <<'.,.,', 'lib/tmail/parser.y', 73
   def _reduce_23( val, _values)
                   val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 79
+module_eval <<'.,.,', 'lib/tmail/parser.y', 79
   def _reduce_24( val, _values)
                   join_domain(val[0])
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 83
+module_eval <<'.,.,', 'lib/tmail/parser.y', 83
   def _reduce_25( val, _values)
                   join_domain(val[2])
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 87
+module_eval <<'.,.,', 'lib/tmail/parser.y', 87
   def _reduce_26( val, _values)
                   join_domain(val[0])
   end
@@ -1104,19 +688,19 @@ module_eval <<'.,.,', 'parser.y', 87
 
  # reduce 27 omitted
 
-module_eval <<'.,.,', 'parser.y', 93
+module_eval <<'.,.,', 'lib/tmail/parser.y', 93
   def _reduce_28( val, _values)
                   val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 98
+module_eval <<'.,.,', 'lib/tmail/parser.y', 98
   def _reduce_29( val, _values)
                   []
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 103
+module_eval <<'.,.,', 'lib/tmail/parser.y', 103
   def _reduce_30( val, _values)
                   val[0].push val[2]
                   val[0]
@@ -1125,13 +709,13 @@ module_eval <<'.,.,', 'parser.y', 103
 
  # reduce 31 omitted
 
-module_eval <<'.,.,', 'parser.y', 109
+module_eval <<'.,.,', 'lib/tmail/parser.y', 109
   def _reduce_32( val, _values)
                   val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 113
+module_eval <<'.,.,', 'lib/tmail/parser.y', 113
   def _reduce_33( val, _values)
                   val[1]
   end
@@ -1139,19 +723,19 @@ module_eval <<'.,.,', 'parser.y', 113
 
  # reduce 34 omitted
 
-module_eval <<'.,.,', 'parser.y', 119
+module_eval <<'.,.,', 'lib/tmail/parser.y', 119
   def _reduce_35( val, _values)
                   val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 125
+module_eval <<'.,.,', 'lib/tmail/parser.y', 125
   def _reduce_36( val, _values)
                   val[0].spec
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 129
+module_eval <<'.,.,', 'lib/tmail/parser.y', 129
   def _reduce_37( val, _values)
                   val[0].spec
   end
@@ -1159,7 +743,7 @@ module_eval <<'.,.,', 'parser.y', 129
 
  # reduce 38 omitted
 
-module_eval <<'.,.,', 'parser.y', 136
+module_eval <<'.,.,', 'lib/tmail/parser.y', 136
   def _reduce_39( val, _values)
                   val[1]
   end
@@ -1179,19 +763,19 @@ module_eval <<'.,.,', 'parser.y', 136
 
  # reduce 46 omitted
 
-module_eval <<'.,.,', 'parser.y', 146
+module_eval <<'.,.,', 'lib/tmail/parser.y', 146
   def _reduce_47( val, _values)
  [ Address.new(nil, nil) ]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 152
+module_eval <<'.,.,', 'lib/tmail/parser.y', 152
   def _reduce_48( val, _values)
                   val
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 157
+module_eval <<'.,.,', 'lib/tmail/parser.y', 157
   def _reduce_49( val, _values)
                   val[0].push val[2]
                   val[0]
@@ -1202,13 +786,13 @@ module_eval <<'.,.,', 'parser.y', 157
 
  # reduce 51 omitted
 
-module_eval <<'.,.,', 'parser.y', 165
+module_eval <<'.,.,', 'lib/tmail/parser.y', 165
   def _reduce_52( val, _values)
                   val
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 170
+module_eval <<'.,.,', 'lib/tmail/parser.y', 170
   def _reduce_53( val, _values)
                   val[0].push val[2]
                   val[0]
@@ -1219,7 +803,7 @@ module_eval <<'.,.,', 'parser.y', 170
 
  # reduce 55 omitted
 
-module_eval <<'.,.,', 'parser.y', 178
+module_eval <<'.,.,', 'lib/tmail/parser.y', 178
   def _reduce_56( val, _values)
                   val[1].phrase = Decoder.decode(val[0])
                   val[1]
@@ -1228,38 +812,38 @@ module_eval <<'.,.,', 'parser.y', 178
 
  # reduce 57 omitted
 
-module_eval <<'.,.,', 'parser.y', 185
+module_eval <<'.,.,', 'lib/tmail/parser.y', 185
   def _reduce_58( val, _values)
                   AddressGroup.new(val[0], val[2])
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 185
+module_eval <<'.,.,', 'lib/tmail/parser.y', 185
   def _reduce_59( val, _values)
  AddressGroup.new(val[0], [])
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 188
+module_eval <<'.,.,', 'lib/tmail/parser.y', 188
   def _reduce_60( val, _values)
  val[0].join('.')
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 189
+module_eval <<'.,.,', 'lib/tmail/parser.y', 189
   def _reduce_61( val, _values)
  val[0] << ' ' << val[1].join('.')
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 196
+module_eval <<'.,.,', 'lib/tmail/parser.y', 196
   def _reduce_62( val, _values)
                   val[2].routes.replace val[1]
                   val[2]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 200
+module_eval <<'.,.,', 'lib/tmail/parser.y', 200
   def _reduce_63( val, _values)
                   val[1]
   end
@@ -1267,25 +851,25 @@ module_eval <<'.,.,', 'parser.y', 200
 
  # reduce 64 omitted
 
-module_eval <<'.,.,', 'parser.y', 203
+module_eval <<'.,.,', 'lib/tmail/parser.y', 203
   def _reduce_65( val, _values)
  [ val[1].join('.') ]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 204
+module_eval <<'.,.,', 'lib/tmail/parser.y', 204
   def _reduce_66( val, _values)
  val[0].push val[3].join('.'); val[0]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 206
+module_eval <<'.,.,', 'lib/tmail/parser.y', 206
   def _reduce_67( val, _values)
  Address.new( val[0], val[2] )
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 207
+module_eval <<'.,.,', 'lib/tmail/parser.y', 207
   def _reduce_68( val, _values)
  Address.new( val[0], nil )
   end
@@ -1293,19 +877,19 @@ module_eval <<'.,.,', 'parser.y', 207
 
  # reduce 69 omitted
 
-module_eval <<'.,.,', 'parser.y', 210
+module_eval <<'.,.,', 'lib/tmail/parser.y', 210
   def _reduce_70( val, _values)
  val[0].push ''; val[0]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 213
+module_eval <<'.,.,', 'lib/tmail/parser.y', 213
   def _reduce_71( val, _values)
  val
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 222
+module_eval <<'.,.,', 'lib/tmail/parser.y', 222
   def _reduce_72( val, _values)
                   val[1].times do
                     val[0].push ''
@@ -1315,13 +899,13 @@ module_eval <<'.,.,', 'parser.y', 222
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 224
+module_eval <<'.,.,', 'lib/tmail/parser.y', 224
   def _reduce_73( val, _values)
  val
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 233
+module_eval <<'.,.,', 'lib/tmail/parser.y', 233
   def _reduce_74( val, _values)
                   val[1].times do
                     val[0].push ''
@@ -1331,15 +915,15 @@ module_eval <<'.,.,', 'parser.y', 233
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 234
+module_eval <<'.,.,', 'lib/tmail/parser.y', 234
   def _reduce_75( val, _values)
  0
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 235
+module_eval <<'.,.,', 'lib/tmail/parser.y', 235
   def _reduce_76( val, _values)
- 1
+ val[0] + 1
   end
 .,.,
 
@@ -1359,20 +943,20 @@ module_eval <<'.,.,', 'parser.y', 235
 
  # reduce 84 omitted
 
-module_eval <<'.,.,', 'parser.y', 253
+module_eval <<'.,.,', 'lib/tmail/parser.y', 253
   def _reduce_85( val, _values)
                   val[1] = val[1].spec
                   val.join('')
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 254
+module_eval <<'.,.,', 'lib/tmail/parser.y', 254
   def _reduce_86( val, _values)
  val
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 255
+module_eval <<'.,.,', 'lib/tmail/parser.y', 255
   def _reduce_87( val, _values)
  val[0].push val[2]; val[0]
   end
@@ -1380,70 +964,70 @@ module_eval <<'.,.,', 'parser.y', 255
 
  # reduce 88 omitted
 
-module_eval <<'.,.,', 'parser.y', 258
+module_eval <<'.,.,', 'lib/tmail/parser.y', 258
   def _reduce_89( val, _values)
  val[0] << ' ' << val[1]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 265
+module_eval <<'.,.,', 'lib/tmail/parser.y', 265
   def _reduce_90( val, _values)
                   val.push nil
                   val
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 269
+module_eval <<'.,.,', 'lib/tmail/parser.y', 269
   def _reduce_91( val, _values)
                   val
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 274
+module_eval <<'.,.,', 'lib/tmail/parser.y', 274
   def _reduce_92( val, _values)
                   [ val[0].to_i, val[2].to_i ]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 279
+module_eval <<'.,.,', 'lib/tmail/parser.y', 279
   def _reduce_93( val, _values)
                   [ val[0].downcase, val[2].downcase, decode_params(val[3]) ]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 283
+module_eval <<'.,.,', 'lib/tmail/parser.y', 283
   def _reduce_94( val, _values)
                   [ val[0].downcase, nil, decode_params(val[1]) ]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 288
+module_eval <<'.,.,', 'lib/tmail/parser.y', 288
   def _reduce_95( val, _values)
                   {}
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 293
+module_eval <<'.,.,', 'lib/tmail/parser.y', 293
   def _reduce_96( val, _values)
                   val[0][ val[2].downcase ] = ('"' + val[4].to_s + '"')
                   val[0]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 298
+module_eval <<'.,.,', 'lib/tmail/parser.y', 298
   def _reduce_97( val, _values)
                   val[0][ val[2].downcase ] = val[4]
                   val[0]
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 303
+module_eval <<'.,.,', 'lib/tmail/parser.y', 303
   def _reduce_98( val, _values)
                   val[0].downcase
   end
 .,.,
 
-module_eval <<'.,.,', 'parser.y', 308
+module_eval <<'.,.,', 'lib/tmail/parser.y', 308
   def _reduce_99( val, _values)
                   [ val[0].downcase, decode_params(val[1]) ]
   end