lib/parser.rb in nexus_parser-1.1.3 vs lib/parser.rb in nexus_parser-1.1.4
- old
+ new
@@ -125,18 +125,20 @@
if @lexer.peek(NexusParser::Tokens::EndBlk) # we're at the end of the block, exit after geting rid of the semi-colon
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)
parse_chr_state_labels if @lexer.peek(NexusParser::Tokens::CharStateLabels)
parse_matrix if @lexer.peek(NexusParser::Tokens::Matrix)
# 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
false