Merge pull request #55 from ihrwein/f/fix-logic-error

patter: fix has_more_tokens()
ihrwein · Aug 19, 2015 · c231de5 · c231de5
2 parents b4b3bf7 + 25571f8
commit c231de5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/matcher/pattern/pattern.rs b/src/matcher/pattern/pattern.rs
@@ -78,7 +78,7 @@ impl Pattern {
     }
 
     pub fn has_more_tokens(&self) -> bool {
-        self.pattern.is_empty()
+        !self.pattern.is_empty()
     }
 
     pub fn pop_test_message(&mut self) -> Option<TestMessage> {

diff --git a/src/matcher/trie/trie.rs b/src/matcher/trie/trie.rs
@@ -11,7 +11,7 @@ pub struct ParserTrie {
 macro_rules! insert_recurse {
     ($node:expr, $pattern:expr) => {
         {
-            if $pattern.has_more_tokens() {
+            if !$pattern.has_more_tokens() {
                 $node.set_pattern($pattern);
                 $node
             } else {
@@ -27,7 +27,7 @@ impl ParserTrie {
     }
 
     pub fn insert(&mut self, pattern: Pattern) -> &mut TrieOperations {
-        if pattern.has_more_tokens() {
+        if !pattern.has_more_tokens() {
             &mut self.root
         } else {
             ParserTrie::insert_pattern(&mut self.root, pattern)