Merge pull request #17 from ihrwein/f/clone

Matcher: implement Clone trait

src/matcher/mod.rs

@@ -9,6 +9,7 @@ use grammar::parser;
 use grammar::parser::ParseError;
 use self::trie::ParserTrie;
 
+#[derive(Clone)]
 pub struct Matcher {
     parser: ParserTrie
 }

src/matcher/trie/node/literal.rs

@@ -5,7 +5,7 @@ use matcher::trie::node::{Node, ParserNode};
 use matcher::trie::TrieOperations;
 use parsers::Parser;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct LiteralNode {
     literal: String,
     has_value: bool,

src/matcher/trie/node/node.rs

@@ -12,7 +12,7 @@ pub enum TokenType {
     Literal(String)
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Node {
     literal_children: SortedVec<LiteralNode>,
     parser_children: Vec<ParserNode>

src/matcher/trie/node/parser.rs

@@ -75,3 +75,12 @@ impl TrieOperations for ParserNode {
         self.node.as_mut().unwrap().insert_parser(parser)
     }
 }
+
+impl Clone for ParserNode {
+    fn clone(&self) -> ParserNode {
+        ParserNode{
+            parser: self.parser.boxed_clone(),
+            node: self.node.clone()
+        }
+    }
+}

src/matcher/trie/trie.rs

@@ -2,7 +2,7 @@ use matcher::trie::node::{Node, TokenType};
 use matcher::trie::node::{CompiledPattern};
 use matcher::trie::TrieOperations;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct ParserTrie {
     root: Node,
 }

src/parsers/base.rs

@@ -1,4 +1,4 @@
-#[derive(Hash, Debug)]
+#[derive(Clone, Hash, Debug)]
 pub struct ParserBase {
     name: String
 }

src/parsers/greedy.rs

@@ -1,7 +1,7 @@
 use std::hash::{SipHasher, Hash, Hasher};
 use super::{ParserBase, Parser, ObjectSafeHash};
 
-#[derive(Debug, Hash)]
+#[derive(Clone, Debug, Hash)]
 pub struct GreedyParser {
     base: ParserBase,
     end_string: Option<String>
@@ -49,6 +49,10 @@ impl Parser for GreedyParser {
     fn name(&self) -> &str {
         self.base.name()
     }
+
+    fn boxed_clone(&self) -> Box<Parser> {
+        Box::new(self.clone())
+    }
 }
 
 #[cfg(test)]

src/parsers/int.rs

@@ -2,7 +2,7 @@ use std::hash::{SipHasher, Hash, Hasher};
 
 use parsers::{Parser, ObjectSafeHash, SetParser, HasOptionalParameter, OptionalParameter};
 
-#[derive(Debug, Hash)]
+#[derive(Clone, Debug, Hash)]
 pub struct IntParser {
     delegate: SetParser
 }
@@ -34,6 +34,10 @@ impl Parser for IntParser {
     fn name(&self) -> &str {
         self.delegate.name()
     }
+
+    fn boxed_clone(&self) -> Box<Parser> {
+        Box::new(self.clone())
+    }
 }
 
 impl ObjectSafeHash for IntParser {

src/parsers/length_checked.rs

@@ -1,6 +1,6 @@
 use parsers::{HasOptionalParameter, OptionalParameter, ParserBase};
 
-#[derive(Hash, Debug)]
+#[derive(Clone, Hash, Debug)]
 pub struct LengthCheckedParserBase {
     base: ParserBase,
     min_length: Option<usize>,

src/parsers/mod.rs

@@ -18,9 +18,9 @@ pub trait ObjectSafeHash {
 pub trait Parser: Debug + ObjectSafeHash {
     fn parse<'a, 'b>(&'a self, value: &'b str) -> Option<(&'a str, &'b str)>;
     fn name(&self) -> &str;
+    fn boxed_clone(&self) -> Box<Parser>;
 }
 
-
 pub trait HasOptionalParameter {
     fn set_optional_params<'a>(&mut self, params: &Vec<OptionalParameter<'a>>) -> bool;
 }

src/parsers/set.rs

@@ -4,7 +4,7 @@ use std::hash::{SipHasher, Hash, Hasher};
 
 use parsers::{Parser, ObjectSafeHash, LengthCheckedParserBase, HasOptionalParameter, OptionalParameter};
 
-#[derive(Debug, Hash)]
+#[derive(Clone, Debug, Hash)]
 pub struct SetParser {
     character_set: BTreeSet<u8>,
     base: LengthCheckedParserBase
@@ -66,6 +66,10 @@ impl Parser for SetParser {
     fn name(&self) -> &str {
         self.base.name()
     }
+
+    fn boxed_clone(&self) -> Box<Parser> {
+        Box::new(self.clone())
+    }
 }
 
 impl ObjectSafeHash for SetParser {

src/utils/sortedvec.rs

@@ -1,6 +1,6 @@
 use std::cmp::Ordering;
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct SortedVec<T> {
     array: Vec<T>
 }