nexus_parser 1.1.3 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 93e9b7ced7b53e19e2cd33c72c433736058c4adcf7555dc6b43635c08f5dcea7
+  data.tar.gz: 4b9bce06037be960e29e1e4f02bbeef286f47a35e977384a5d451e1f0c3e3f91
+SHA512:
+  metadata.gz: 2297128f4ad470e7de1760996aaa712ed8bc691fee0a3cc8a59de54cf1b40bcc9d1cd6478049ae14f93b90ea208a93b6bc4872b76ecf8fc99221ea1b583f954d
+  data.tar.gz: 19615c9fcdc2469bf32e681ac3b81b1a4ca8f468a0154671573b73c0e54f247d78b075ee3a2a1d63a4ba21c0cd657dfe656f8140b8feed07ca54d93fadf1772a

data/.gitignore

@@ -18,4 +18,13 @@ coverage
 rdoc
 pkg
 
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
 ## PROJECT::SPECIFIC

data/LICENSE

@@ -1,20 +1,28 @@
-Copyright (c) 2009 mjy
+Copyright (c) 2008- Matt Yoder. All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Developed by: Matt Yoder, Species File Group, and Collaborators
+              University of Illinois
+              https://speciesfilegroup.org
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to
+do so, subject to the following conditions:
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimers.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimers in the documentation
+  and/or other materials provided with the distribution.
+* Neither the names of <NAME OF DEVELOPMENT GROUP>, <NAME OF INSTITUTION>,
+  nor the names of its contributors may be used to endorse or promote products
+  derived from this Software without specific prior written permission.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.

data/{README.rdoc → README.md}

@@ -1,8 +1,10 @@
-= nexus_parser
+# nexus_parser
+
+A Ruby lexer/parser for [nexus](https://en.wikipedia.org/wiki/Nexus_file) files, as used in phylogenetic analysis in taxonomy.
 
 See the test files for usage for now, lots of examples there.
 
-== Note on Patches/Pull Requests
+## Note on Patches/Pull Requests
  
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -10,8 +12,8 @@ See the test files for usage for now, lots of examples there.
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+* Make a pull request.
 
-== Copyright
+## License
 
-Copyright (c) 2010 Matt Yoder. See LICENSE for details.
+`nexus_parser` is open source and is now available under the [University of Illinois/NCSA Open Source License](https://en.wikipedia.org/wiki/University_of_Illinois/NCSA_Open_Source_License).

data/Rakefile

@@ -1,23 +1,9 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "nexus_parser"
-    gem.summary = %Q{A Nexus file format (phylogenetic inference) parser in Ruby.}
-    gem.description = %Q{A full featured and extensible Nexus file parser in Ruby. }
-    gem.email = "diapriid@gmail.com"
-    gem.homepage = "http://github.com/mjy/nexus_parser"
-    gem.authors = ["mjy"]
-    # gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -38,13 +24,11 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = NexusParser::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "nexus_parser #{version}"

data/lib/{lexer.rb → nexus_parser/lexer.rb}

@@ -8,8 +8,8 @@ class NexusParser::Lexer
     @input.gsub!(/\x0D/,"") # get rid of possible dos carrige returns
     @next_token = nil
   end
-  
-  # checks whether the next token is of the specified class. 
+
+  # checks whether the next token is of the specified class.
   def peek(token_class)
     token = read_next_token(token_class)
     return token.class == token_class
@@ -21,18 +21,18 @@ class NexusParser::Lexer
     token = read_next_token(token_class)
     @next_token = nil
     if token.class != token_class
-        raise(NexusParser::ParseError,"expected #{token_class.to_s} but received #{token.class.to_s} at #{@input[0..40]}...", caller)
+      raise(NexusParser::ParseError,"expected #{token_class.to_s} but received #{token.class.to_s} at #{@input[0..40]}...", caller)
     else
-        return token
+      return token
     end
   end
-  
+
   private
-   # read (and store) the next token from the input, if it has not already been read.
-   def read_next_token(token_class)
-      if @next_token
-         return @next_token
-      else
+  # read (and store) the next token from the input, if it has not already been read.
+  def read_next_token(token_class)
+    if @next_token
+      return @next_token
+    else
       # check for a match on the specified class first
       if match(token_class)
         return @next_token
@@ -42,19 +42,19 @@ class NexusParser::Lexer
           return @next_token if match(t)
         }
       end
-         # no match, either end of string or lex-error
-         if @input != ''
-             raise( NexusParser::ParseError, "Lex Error, unknown token at #{@input[0..10]}...", caller)
-         else
-            return nil
+      # no match, either end of string or lex-error
+      if @input != ''
+        raise( NexusParser::ParseError, "Lex Error, unknown token at #{@input[0..10]}...", caller)
+      else
+        return nil
       end
     end
   end
-  
+
   def match(token_class)
     if (m = token_class.regexp.match(@input))
       @next_token = token_class.new(m[1])
-       @input = @input[m.end(0)..-1]
+      @input = @input[m.end(0)..-1]
       return true
     else
       return false

data/lib/{parser.rb → nexus_parser/parser.rb}

@@ -8,7 +8,7 @@ class NexusParser::Parser
 
   def parse_file
     # nf = @builder.new_nexus_file # create new local NexusParser instance, nf
-    blks = []
+    # blks = []
     @lexer.pop(NexusParser::Tokens::NexusStart)
      
     while @lexer.peek(NexusParser::Tokens::BeginBlk)
@@ -127,7 +127,8 @@ class NexusParser::Parser
         break 
       else
         @lexer.pop(NexusParser::Tokens::Title) if @lexer.peek(NexusParser::Tokens::Title) # not used at present
-
+        @lexer.pop(NexusParser::Tokens::LinkLine) if @lexer.peek(NexusParser::Tokens::LinkLine) # trashing these for now
+        
         parse_dimensions if @lexer.peek(NexusParser::Tokens::Dimensions)
         parse_format if @lexer.peek(NexusParser::Tokens::Format) 
         
@@ -137,6 +138,7 @@ class NexusParser::Parser
     
         # handle "\s*OPTIONS MSTAXA = UNCERTAIN;\s\n" within a characters block (sticks in an infinite loop right now)
 
+
         @lexer.pop(NexusParser::Tokens::MesquiteIDs) if @lexer.peek(NexusParser::Tokens::MesquiteIDs) # trashing these for now
         @lexer.pop(NexusParser::Tokens::MesquiteBlockID) if @lexer.peek(NexusParser::Tokens::MesquiteBlockID) # trashing these for now
     
@@ -213,7 +215,7 @@ class NexusParser::Parser
         
         opts.update({:index => (index - 1), :name => name})
        
-        raise(NexusParser::ParseError, "Error parsing character state labels for (or around) character #{index -1}.") if !opts[:name]
+        raise(NexusParser::ParseError, "Error parsing character state labels for (or around) character #{index - 1}.") if !opts[:name]
         @builder.update_chr(opts)
       end     
 

data/lib/{tokens.rb → nexus_parser/tokens.rb}

@@ -1,9 +1,9 @@
 module NexusParser::Tokens
 
-  class Token 
+  class Token
     # this allows access the the class attribute regexp, without using a class variable
     class << self; attr_reader :regexp; end
-    attr_reader :value    
+    attr_reader :value
     def initialize(str)
       @value = str
     end
@@ -11,7 +11,7 @@ module NexusParser::Tokens
 
   # in ruby, \A is needed if you want to only match at the beginning of the string, we need this everywhere, as we're
   # moving along popping off
- 
+
   class NexusStart < Token
     @regexp = Regexp.new(/\A.*(\#nexus)\s*/i)
   end
@@ -21,7 +21,7 @@ module NexusParser::Tokens
   #   @regexp = Regexp.new(/\A\s*(\[[^\]]*\])\s*/i)
   #   def initialize(str)
   #     str = str[1..-2] # strip the []
-  #     str.strip!   
+  #     str.strip!
   #    @value = str
   #  end
   # end
@@ -31,20 +31,20 @@ module NexusParser::Tokens
   end
 
   class EndBlk < Token
-    @regexp = Regexp.new(/\A\s*([\s\n]*End[\s\n]*;[\s\n]*)/i)
+    @regexp = Regexp.new(/\A\s*([\s]*End[\s]*;[\s]*)/i)
   end
 
-  # label 
+  # label
   class AuthorsBlk < Token
-    @regexp = Regexp.new(/\A\s*(Authors;.*?END;)\s*/im) 
+    @regexp = Regexp.new(/\A\s*(Authors;.*?END;)\s*/im)
   end
 
-  # label 
+  # label
   class TaxaBlk < Token
     @regexp = Regexp.new(/\A\s*(\s*Taxa\s*;)\s*/i)
   end
 
-  # label 
+  # label
   class NotesBlk < Token
     @regexp = Regexp.new(/\A\s*(\s*Notes\s*;)\s*/i)
   end
@@ -66,9 +66,9 @@ module NexusParser::Tokens
     @regexp = Regexp.new(/\A\s*(format)\s*/i)
   end
 
-  # label 
+  # label
   class Taxlabels < Token
-     @regexp = Regexp.new(/\A\s*(\s*taxlabels\s*)\s*/i)
+    @regexp = Regexp.new(/\A\s*(\s*taxlabels\s*)\s*/i)
   end
 
   # same as ID
@@ -77,8 +77,8 @@ module NexusParser::Tokens
     def initialize(str)
       str.strip!
       str = str[1..-2] if str[0..0] == "'" # get rid of quote marks
-      str = str[1..-2] if str[0..0] == '"' 
-      str.strip! 
+      str = str[1..-2] if str[0..0] == '"'
+      str.strip!
       @value = str
     end
   end
@@ -87,15 +87,19 @@ module NexusParser::Tokens
     @regexp = Regexp.new(/\A\s*(characters\s*;)\s*/i)
   end
 
-  # note we grab EOL and ; here 
+  class LinkLine < Token
+    @regexp = Regexp.new(/\A\s*(link.*\s*;)\s*\n*/i)
+  end
+
+  # note we grab EOL and ; here
   class ValuePair < Token
-    @regexp = Regexp.new(/\A\s*([\w\d\_\&]+\s*=\s*((\'[^\']+\')|(\(.*\))|(\"[^\"]+\")|([^\s\n\t;]+)))[\s\n\t;]+/i) #  returns key => value hash for tokens like 'foo=bar' or foo = 'b a ar'
+    @regexp = Regexp.new(/\A\s*([\w]+\s*=\s*((\'[^\']+\')|(\(.*\))|(\"[^\"]+\")|([^\s;]+)))[\s;]+/i) #  returns key => value hash for tokens like 'foo=bar' or foo = 'b a ar'
     def initialize(str)
       str.strip!
       str = str.split(/=/)
       str[1].strip!
-      str[1] = str[1][1..-2] if str[1][0..0] == "'" 
-      str[1] = str[1][1..-2] if str[1][0..0] ==  "\"" 
+      str[1] = str[1][1..-2] if str[1][0..0] == "'"
+      str[1] = str[1][1..-2] if str[1][0..0] ==  "\""
       @value = {str[0].strip.downcase.to_sym => str[1].strip}
     end
   end
@@ -106,10 +110,10 @@ module NexusParser::Tokens
 
   class RowVec < Token
     @regexp = Regexp.new(/\A\s*(.+)\s*\n/i)
-     def initialize(str)
-       # meh! Ruby is simpler to read than Perl?
-       # handles both () and {} style multistates
-       s = str.split(/\(|\)|\}|\{/).collect{|s| s=~ /[\,|\s]/ ? s.split(/[\,|\s]/) : s}.inject([]){|sum, x| x.class == Array ? sum << x.delete_if {|y| y == "" } : sum + x.strip.split(//)}
+    def initialize(str)
+      # meh! Ruby is simpler to read than Perl?
+      # handles both () and {} style multistates
+      s = str.split(/\(|\)|\}|\{/).collect{|s| s=~ /[\,|\s]/ ? s.split(/[\,|\s]/) : s}.inject([]){|sum, x| x.class == Array ? sum << x.delete_if {|y| y == "" } : sum + x.strip.split(//)}
       @value = s
     end
   end
@@ -127,37 +131,37 @@ module NexusParser::Tokens
   end
 
   # unparsed blocks
-  
+
   class TreesBlk < Token
     @regexp = Regexp.new(/\A\s*(trees;.*?END;)\s*/im) # note the multi-line /m
   end
 
   class SetsBlk < Token
-    @regexp = Regexp.new(/\A\s*(sets;.*?END;)\s*/im) 
+    @regexp = Regexp.new(/\A\s*(sets;.*?END;)\s*/im)
   end
 
   class MqCharModelsBlk < Token
-    @regexp = Regexp.new(/\A\s*(MESQUITECHARMODELS;.*?END;)\s*/im) 
+    @regexp = Regexp.new(/\A\s*(MESQUITECHARMODELS;.*?END;)\s*/im)
   end
 
   class LabelsBlk < Token
-    @regexp = Regexp.new(/\A\s*(LABELS;.*?END;)\s*/im) 
+    @regexp = Regexp.new(/\A\s*(LABELS;.*?END;)\s*/im)
   end
 
   class AssumptionsBlk < Token
-    @regexp = Regexp.new(/\A\s*(ASSUMPTIONS;.*?END;)\s*/im) 
+    @regexp = Regexp.new(/\A\s*(ASSUMPTIONS;.*?END;)\s*/im)
   end
 
   class CodonsBlk < Token
-    @regexp = Regexp.new(/\A\s*(CODONS;.*?END;)\s*/im) 
+    @regexp = Regexp.new(/\A\s*(CODONS;.*?END;)\s*/im)
   end
 
   class MesquiteBlk < Token
-    @regexp = Regexp.new(/\A\s*(Mesquite;.*?END;)\s*/im) 
+    @regexp = Regexp.new(/\A\s*(Mesquite;.*?END;)\s*/im)
   end
 
   class BlkEnd < Token
-    @regexp = Regexp.new(/\A[\s\n]*(END;)\s*/i)
+    @regexp = Regexp.new(/\A[\s]*(END;)\s*/i)
   end
 
   class LBracket < Token
@@ -169,13 +173,13 @@ module NexusParser::Tokens
   end
 
   class LParen < Token
-      @regexp = Regexp.new('\A\s*(\()\s*')
+    @regexp = Regexp.new('\A\s*(\()\s*')
   end
 
   class RParen < Token
     @regexp = Regexp.new('\A\s*(\))\s*')
   end
- 
+
   class Equals < Token
     @regexp = Regexp.new('\A\s*(=)\s*')
   end
@@ -188,7 +192,7 @@ module NexusParser::Tokens
   class ID < Token
     @regexp = Regexp.new('\A\s*((\'[^\']+\')|(\w[^,:(); \t\n]*|_)+)\s*')
     def initialize(str)
-      str.strip! 
+      str.strip!
       str = str[1..-2] if str[0..0] == "'" # get rid of quote marks
       @value = str
     end
@@ -237,7 +241,7 @@ module NexusParser::Tokens
       NexusParser::Tokens::LabelsBlk,
       NexusParser::Tokens::TaxaBlk,
       NexusParser::Tokens::NotesBlk,
-      NexusParser::Tokens::Title, 
+      NexusParser::Tokens::Title,
       NexusParser::Tokens::Taxlabels,
       NexusParser::Tokens::Dimensions,
       NexusParser::Tokens::FileLbl,
@@ -259,11 +263,12 @@ module NexusParser::Tokens
       NexusParser::Tokens::RParen,
       NexusParser::Tokens::LBracket,
       NexusParser::Tokens::RBracket,
-      NexusParser::Tokens::Label, # must be before RowVec 
+      NexusParser::Tokens::Label, # must be before RowVec
       NexusParser::Tokens::RowVec,
+      NexusParser::Tokens::LinkLine,
       NexusParser::Tokens::ID # need to trash this
-    ]   
+    ]
   end
-  
+
 end
 

data/lib/nexus_parser/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module NexusParser
+  VERSION = "1.2.0"
+end

data/lib/nexus_parser.rb

@@ -8,12 +8,12 @@
 
 module NexusParser
 
-  require File.expand_path(File.join(File.dirname(__FILE__), 'tokens'))
-  require File.expand_path(File.join(File.dirname(__FILE__), 'parser'))
-  require File.expand_path(File.join(File.dirname(__FILE__), 'lexer'))
- 
-class NexusParser 
-  
+  require File.expand_path(File.join(File.dirname(__FILE__), 'nexus_parser', 'tokens'))
+  require File.expand_path(File.join(File.dirname(__FILE__), 'nexus_parser', 'parser'))
+  require File.expand_path(File.join(File.dirname(__FILE__), 'nexus_parser', 'lexer'))
+
+class NexusParser
+
   attr_accessor :taxa, :characters, :sets, :codings, :vars, :notes
 
   def initialize
@@ -26,7 +26,9 @@ class NexusParser
   end
 
   class Character
-    attr_accessor :name, :states, :notes
+    attr_accessor  :states, :notes
+    attr_writer :name
+
     def initialize
       @name = nil
       @states = {}
@@ -39,7 +41,7 @@ class NexusParser
         :name => ''
       }.merge!(options)
       return false if !@opt[:label]
-      
+
       @states.update(@opt[:label] => ChrState.new(@opt[:name]))
     end
 
@@ -49,7 +51,7 @@ class NexusParser
     end
 
     def name
-      ((@name == "") || (@name == nil)) ? "Undefined" : @name
+      ((@name == "") || (@name.nil?)) ? "Undefined" : @name
     end
   end
 
@@ -70,17 +72,20 @@ class NexusParser
     end
   end
 
-  class Coding 
-    # unfortunately we need this for notes  
-    attr_accessor :states, :notes
+  class Coding
+    # unfortunately we need this for notes
+    attr_accessor :notes
+    attr_writer :state 
+
     def initialize(options = {})
       @states = options[:states]
-      @notes = [] 
+      @notes = []
     end
 
     def states
-      @states.class == Array ? @states  :  [@states]
+      @states.class == Array ? @states : [@states]
     end
+    
   end
 
   class Note
@@ -98,7 +103,7 @@ class NexusParser
       else
         n = 'No text recovered, possible parsing error.'
       end
-      
+
       # THIS IS A HACK for handling the TF = (CM <note>) format, I assume there will be other params in the future beyond CM, at that point move processing to the parser
       if n[0..2] =~ /\A\s*\(\s*CM\s*/i
         n.strip!
@@ -107,7 +112,7 @@ class NexusParser
         n = n[2..-1] if n[0..1].downcase == "cm" # strip CM
         n.strip!
         n = n[1..-2] if n[0..0] == "'" # get rid of quote marks
-        n = n[1..-2] if n[0..0] == '"' 
+        n = n[1..-2] if n[0..0] == '"'
       end
       n.strip
     end
@@ -120,11 +125,11 @@ end
 class Builder
 
   def initialize
-    @nf = NexusParser.new 
+    @nf = NexusParser.new
   end
 
   def stub_taxon
-    @nf.taxa.push(NexusParser::Taxon.new) 
+    @nf.taxa.push(NexusParser::Taxon.new)
     return @nf.taxa.size
   end
 
@@ -138,11 +143,11 @@ class Builder
     @nf.characters.each_with_index do |c, i|
       @nf.codings[taxon_index.to_i] = [] if !@nf.codings[taxon_index.to_i]
       @nf.codings[taxon_index.to_i][i] = NexusParser::Coding.new(:states => rowvector[i])
-    
-      # !! we must update states for a given character if the state isn't found (not all states are referenced in description !! 
+
+      # !! we must update states for a given character if the state isn't found (not all states are referenced in description !!
 
       existing_states = @nf.characters[i].state_labels
-      
+
       new_states = rowvector[i].class == Array ? rowvector[i].collect{|s| s.to_s} :  [rowvector[i].to_s]
       new_states.delete("?") # we don't add this to the db
       new_states = new_states - existing_states
@@ -160,14 +165,12 @@ class Builder
     end
     @nf.vars.update(hash)
   end
-  
+
   def update_taxon(options = {})
-    
     @opt = {
       :name => ''
     }.merge!(options)
-    return false if !@opt[:index] 
-    
+    return false if !@opt[:index]
     (@nf.taxa[@opt[:index]].name = @opt[:name]) if @opt[:name]
   end
 
@@ -179,29 +182,29 @@ class Builder
     return false if !@opt[:index]
 
     @index = @opt[:index].to_i
-    
+
     # need to create the characters
-    
+
     raise(NexusParser::ParseError, "Can't update character of index #{@index}, it doesn't exist! This is a problem parsing the character state labels. Check the indices. It may be for this character \"#{@opt[:name]}\".") if !@nf.characters[@index]
 
     (@nf.characters[@index].name = @opt[:name]) if @opt[:name]
-  
+
     @opt.delete(:index)
     @opt.delete(:name)
-   
+
     # the rest have states
     @opt.keys.each do |k|
-      
+
       if (@nf.characters[@index].states != {}) && @nf.characters[@index].states[k] # state exists
-        
+
         ## !! ONLY HANDLES NAME, UPDATE TO HANDLE notes etc. when we get them ##
         update_state(@index, :index => k, :name => @opt[k])
-        
+
       else # doesn't, create it
         @nf.characters[@index].add_state(:label => k.to_s, :name => @opt[k])
       end
     end
-    
+
   end
 
   def update_state(chr_index, options = {})
@@ -220,11 +223,11 @@ class Builder
     case @opt[:type]
 
     # Why does mesquite differentiate b/w footnotes and annotations?!, apparently same data structure?
-    when 'TEXT' # a footnote 
+    when 'TEXT' # a footnote
       if @opt[:file]
        @nf.notes << NexusParser::Note.new(@opt)
-        
-      elsif  @opt[:taxon] && @opt[:character] # its a cell, parse this case         
+
+      elsif  @opt[:taxon] && @opt[:character] # its a cell, parse this case
         @nf.codings[@opt[:taxon].to_i - 1][@opt[:character].to_i - 1].notes = [] if !@nf.codings[@opt[:taxon].to_i - 1][@opt[:character].to_i - 1].notes
         @nf.codings[@opt[:taxon].to_i - 1][@opt[:character].to_i - 1].notes << NexusParser::Note.new(@opt)
 
@@ -232,7 +235,7 @@ class Builder
         @nf.taxa[@opt[:taxon].to_i - 1].notes << NexusParser::Note.new(@opt)
 
       elsif @opt[:character] && !@opt[:taxon]
-        
+
         @nf.characters[@opt[:character].to_i - 1].notes << NexusParser::Note.new(@opt)
       end
 
@@ -246,7 +249,7 @@ class Builder
         @nf.characters[@opt[:c].to_i - 1].notes << NexusParser::Note.new(@opt)
       end
     end
-    
+
   end
 
   def nexus_file
@@ -266,7 +269,7 @@ end # end module
 def parse_nexus_file(input)
   @input = input
   @input.gsub!(/\[[^\]]*\]/,'')  # strip out all comments BEFORE we parse the file
-  # quickly peek at the input, does this look like a Nexus file? 
+  # quickly peek at the input, does this look like a Nexus file?
   if !(@input =~ /\#Nexus/i) || !(@input =~ /Begin/i) || !(@input =~ /Matrix/i) || !(@input =~ /end\;/i)
     raise(NexusParser::ParseError, "File is missing at least some required headers, check formatting.", caller)
   end
@@ -274,7 +277,7 @@ def parse_nexus_file(input)
   builder = NexusParser::Builder.new
   lexer = NexusParser::Lexer.new(@input)
   NexusParser::Parser.new(lexer, builder).parse_file
-  
-  return builder.nexus_file  
+
+  return builder.nexus_file
 end