Merge pull request #16 from TyOverby/derive-eq

Derive Eq and PartialEq for the two state structs [ DO NOT MERGE ]
trishume · Jul 19, 2016 · 408b992 · 408b992
2 parents 7981ad3 + 6e9ccb9
commit 408b992
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/parsing/parser.rs b/src/parsing/parser.rs
@@ -23,13 +23,13 @@ use fnv::FnvHasher;
 ///
 /// **Note:** Caching is for advanced users who have tons of time to maximize performance or want to do so eventually.
 /// It is not recommended that you try caching the first time you implement highlighting.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ParseState {
     stack: Vec<StateLevel>,
     first_line: bool,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 struct StateLevel {
     context: ContextPtr,
     prototype: Option<ContextPtr>,

diff --git a/src/parsing/syntax_definition.rs b/src/parsing/syntax_definition.rs
@@ -21,7 +21,7 @@ pub type ContextPtr = Rc<RefCell<Context>>;
 /// Some useful public fields are the `name` field which is a human readable
 /// name to display in syntax lists, and the `hidden` field which means hide
 /// this syntax from any lists because it is for internal use.
-#[derive(Clone, Debug, RustcEncodable, RustcDecodable)]
+#[derive(Clone, Debug, RustcEncodable, RustcDecodable, Eq, PartialEq)]
 pub struct SyntaxDefinition {
     pub name: String,
     pub file_extensions: Vec<String>,
@@ -35,7 +35,7 @@ pub struct SyntaxDefinition {
     pub contexts: HashMap<String, ContextPtr>,
 }
 
-#[derive(Debug, RustcEncodable, RustcDecodable)]
+#[derive(Debug, RustcEncodable, RustcDecodable, Eq, PartialEq)]
 pub struct Context {
     pub meta_scope: Vec<Scope>,
     pub meta_content_scope: Vec<Scope>,
@@ -51,7 +51,7 @@ pub struct Context {
     pub patterns: Vec<Pattern>,
 }
 
-#[derive(Debug, RustcEncodable, RustcDecodable)]
+#[derive(Debug, RustcEncodable, RustcDecodable, Eq, PartialEq)]
 pub enum Pattern {
     Match(MatchPattern),
     Include(ContextReference),
@@ -66,7 +66,7 @@ pub struct MatchIter {
     index_stack: Vec<usize>,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct MatchPattern {
     pub has_captures: bool,
     pub regex_str: String,
@@ -84,7 +84,7 @@ pub struct LinkerLink {
     pub link: Weak<RefCell<Context>>,
 }
 
-#[derive(Debug, RustcEncodable, RustcDecodable)]
+#[derive(Debug, RustcEncodable, RustcDecodable, Eq, PartialEq)]
 pub enum ContextReference {
     Named(String),
     ByScope {
@@ -99,7 +99,7 @@ pub enum ContextReference {
     Direct(LinkerLink),
 }
 
-#[derive(Debug, RustcEncodable, RustcDecodable)]
+#[derive(Debug, RustcEncodable, RustcDecodable, Eq, PartialEq)]
 pub enum MatchOperation {
     Push(Vec<ContextReference>),
     Set(Vec<ContextReference>),
@@ -276,6 +276,15 @@ impl Decodable for MatchPattern {
     }
 }
 
+impl Eq for LinkerLink {}
+
+impl PartialEq for LinkerLink {
+    fn eq(&self, other: &LinkerLink) -> bool {
+        self.link.upgrade() == other.link.upgrade()
+    }
+}
+
+
 /// Just panics, we can't do anything with linked up syntaxes
 impl Encodable for LinkerLink {
     fn encode<S: Encoder>(&self, _: &mut S) -> Result<(), S::Error> {