CSSOM primitive improvements

Author: FlorianRappl

CHANGELOG.md

@@ -14,6 +14,7 @@ Released on Sunday, May 12 2019.
 - Opened CSSOM, e.g., declared `ICssFunctionValue` `public` (#24)
 - Introduced special converter for the `src` declaration (#25)
 - Fixed bug regarding CSS grid serialization (#27)
+- Added `DefaultRenderDevice` implementation
 
 # 0.10.1
 

src/AngleSharp.Css.Tests/Rules/CssSupports.cs

@@ -1,7 +1,6 @@
 namespace AngleSharp.Css.Tests.Rules
 {
     using AngleSharp.Css.Dom;
-    using AngleSharp.Css.Tests.Mocks;
     using NUnit.Framework;
     using static CssConstructionFunctions;
 

src/AngleSharp.Css/Parser/CssBuilder.cs

@@ -5,7 +5,6 @@ namespace AngleSharp.Css.Parser
     using AngleSharp.Dom;
     using AngleSharp.Text;
     using System;
-    using System.Collections.Generic;
 
     /// <summary>
     /// See http://dev.w3.org/csswg/css-syntax/#parsing for details.
@@ -598,10 +597,7 @@ private void JumpToDeclEnd(ref CssToken current)
             }
         }
 
-        private CssToken NextToken()
-        {
-            return _tokenizer.Get();
-        }
+        private CssToken NextToken() => _tokenizer.Get();
 
         private void CollectTrivia(ref CssToken token)
         {
@@ -625,10 +621,8 @@ private void SkipDeclarations(CssToken token)
             JumpToRuleEnd(ref token);
         }
 
-        private void RaiseErrorOccurred(CssParseError code, TextPosition position)
-        {
+        private void RaiseErrorOccurred(CssParseError code, TextPosition position) =>
             _tokenizer.RaiseErrorOccurred(code, position);
-        }
 
         #endregion
 

src/AngleSharp.Css/Values/Primitives/Constant.cs

@@ -5,7 +5,7 @@ namespace AngleSharp.Css.Values
     /// <summary>
     /// Represents a selected CSS enum value.
     /// </summary>
-    struct Constant<T> : ICssPrimitiveValue
+    struct Constant<T> : ICssPrimitiveValue, IEquatable<Constant<T>>
     {
         #region Fields
 
@@ -42,5 +42,31 @@ public Constant(String key, T data)
         public String CssText => _key;
 
         #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Checks for equality against the given constant.
+        /// </summary>
+        /// <param name="other">The other constant to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public Boolean Equals(Constant<T> other) => Object.Equals(other.Value, Value);
+
+        /// <summary>
+        /// Checks for equality against the given object.
+        /// Only matches if the provided object is also a constant.
+        /// </summary>
+        /// <param name="obj">The object to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public override Boolean Equals(Object obj) =>
+            obj is Constant<T> constant ? Equals(constant) : false;
+
+        /// <summary>
+        /// Gets the computed hash code of the constant.
+        /// </summary>
+        /// <returns>The hash code of the object.</returns>
+        public override Int32 GetHashCode() => _data.GetHashCode();
+
+        #endregion
     }
 }

src/AngleSharp.Css/Values/Primitives/CounterDefinition.cs

@@ -1,11 +1,12 @@
 namespace AngleSharp.Css.Values
 {
+    using AngleSharp.Text;
     using System;
 
     /// <summary>
     /// Represents a CSS counter.
     /// </summary>
-    struct CounterDefinition : ICssPrimitiveValue
+    struct CounterDefinition : ICssPrimitiveValue, IEquatable<CounterDefinition>
     {
         #region Fields
 
@@ -55,5 +56,35 @@ public CounterDefinition(String identifier, String listStyle, String separator)
         public String DefinedSeparator => _separator;
 
         #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Checks the two counter definitions for equality.
+        /// </summary>
+        /// <param name="other">The other counter to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public Boolean Equals(CounterDefinition other) =>
+            CounterIdentifier.Is(other.CounterIdentifier) &&
+            ListStyle.Is(other.ListStyle) &&
+            DefinedSeparator.Is(other.DefinedSeparator);
+
+        /// <summary>
+        /// Checks for equality against the given object, if
+        /// the provided object is no coutner definition the
+        /// result is false.
+        /// </summary>
+        /// <param name="obj">The object to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public override Boolean Equals(Object obj) =>
+            obj is CounterDefinition cd ? Equals(cd) : false;
+
+        /// <summary>
+        /// Gets the hash code of the object.
+        /// </summary>
+        /// <returns>The computed hash code.</returns>
+        public override Int32 GetHashCode() => CssText.GetHashCode();
+
+        #endregion
     }
 }

src/AngleSharp.Css/Values/Primitives/CounterValue.cs

@@ -1,11 +1,12 @@
 namespace AngleSharp.Css.Values
 {
+    using AngleSharp.Text;
     using System;
 
     /// <summary>
     /// Sets a CSS counter.
     /// </summary>
-    struct CounterValue : ICssPrimitiveValue
+    struct CounterValue : ICssPrimitiveValue, IEquatable<CounterValue>
     {
         #region Fields
 
@@ -47,5 +48,32 @@ public CounterValue(String name, Int32 value)
         public Int32 Value => _value;
 
         #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Checks the two counter values for equality.
+        /// </summary>
+        /// <param name="other">The other counter to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public Boolean Equals(CounterValue other) => Name.Is(other.Name) && Value == other.Value;
+
+        /// <summary>
+        /// Checks for equality against the given object,
+        /// if the provided object is no counter vlaue the
+        /// result is false.
+        /// </summary>
+        /// <param name="obj">The object to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public override Boolean Equals(Object obj) =>
+            obj is CounterValue cv ? Equals(cv) : false;
+
+        /// <summary>
+        /// Gets the hash code of the object.
+        /// </summary>
+        /// <returns>The computed hash code.</returns>
+        public override Int32 GetHashCode() => CssText.GetHashCode();
+
+        #endregion
     }
 }

src/AngleSharp.Css/Values/Primitives/Identifier.cs

@@ -1,11 +1,12 @@
 namespace AngleSharp.Css.Values
 {
+    using AngleSharp.Text;
     using System;
 
     /// <summary>
     /// Represents a CSS identifier value.
     /// </summary>
-    struct Identifier : ICssPrimitiveValue
+    struct Identifier : ICssPrimitiveValue, IEquatable<Identifier>
     {
         #region Fields
 
@@ -39,5 +40,32 @@ public Identifier(String text)
         public String CssText => _text;
 
         #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Checks the two identifiers for equality.
+        /// </summary>
+        /// <param name="other">The other identifier to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public Boolean Equals(Identifier other) => Value.Is(other.Value);
+
+        /// <summary>
+        /// Checks for equality against the given object, if
+        /// the provided object is no identifier the result is
+        /// false.
+        /// </summary>
+        /// <param name="obj">The object to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public override Boolean Equals(Object obj) =>
+            obj is Identifier ident ? Equals(ident) : false;
+
+        /// <summary>
+        /// Gets the hash code of the object.
+        /// </summary>
+        /// <returns>The computed hash code.</returns>
+        public override Int32 GetHashCode() => _text.GetHashCode();
+
+        #endregion
     }
 }

src/AngleSharp.Css/Values/Primitives/Label.cs

@@ -6,7 +6,7 @@ namespace AngleSharp.Css.Values
     /// <summary>
     /// Represents a CSS label ("string") value.
     /// </summary>
-    struct Label : ICssPrimitiveValue
+    struct Label : ICssPrimitiveValue, IEquatable<Label>
     {
         #region Fields
 
@@ -40,5 +40,32 @@ public Label(String value)
         public String CssText => _value.CssString();
 
         #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Checks the two labels for equality.
+        /// </summary>
+        /// <param name="other">The other label to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public Boolean Equals(Label other) => Value.Is(other.Value);
+
+        /// <summary>
+        /// Checks for equality against the given object,
+        /// if the provided object is no label the result
+        /// is false.
+        /// </summary>
+        /// <param name="obj">The object to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public override Boolean Equals(Object obj) =>
+            obj is Label label ? Equals(label) : false;
+
+        /// <summary>
+        /// Gets the hash code of the object.
+        /// </summary>
+        /// <returns>The computed hash code.</returns>
+        public override Int32 GetHashCode() => _value.GetHashCode();
+
+        #endregion
     }
 }

src/AngleSharp.Css/Values/Primitives/LineNames.cs

@@ -1,16 +1,23 @@
 namespace AngleSharp.Css.Values
 {
+    using AngleSharp.Text;
     using System;
     using System.Collections.Generic;
     using System.Linq;
 
     /// <summary>
     /// Represents a CSS line names definition.
     /// </summary>
-    struct LineNames : ICssPrimitiveValue
+    struct LineNames : ICssPrimitiveValue, IEquatable<LineNames>
     {
+        #region Fields
+
         private readonly String[] _names;
 
+        #endregion
+
+        #region ctor
+
         /// <summary>
         /// Creates a new line names definition.
         /// </summary>
@@ -20,6 +27,10 @@ public LineNames(IEnumerable<String> names)
             _names = names.ToArray();
         }
 
+        #endregion
+
+        #region Properties
+
         /// <summary>
         /// Gets the contained line names.
         /// </summary>
@@ -29,5 +40,36 @@ public LineNames(IEnumerable<String> names)
         /// Gets the CSS text representation.
         /// </summary>
         public String CssText => $"[{String.Join(" ", _names)}]";
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Checks the two line names for equality.
+        /// </summary>
+        /// <param name="other">The other names to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public Boolean Equals(LineNames other) =>
+            Names.Length == other.Names.Length &&
+            Names.Zip(other.Names, (a, b) => a.Is(b)).All(matches => matches);
+
+        /// <summary>
+        /// Checks for equality against the given object, if
+        /// the provided object are no line names the result is
+        /// false.
+        /// </summary>
+        /// <param name="obj">The object to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public override Boolean Equals(Object obj) =>
+            obj is LineNames names ? Equals(names) : false;
+
+        /// <summary>
+        /// Gets the hash code of the object.
+        /// </summary>
+        /// <returns>The computed hash code.</returns>
+        public override Int32 GetHashCode() => CssText.GetHashCode();
+
+        #endregion
     }
 }

src/AngleSharp.Css/Values/Primitives/Quote.cs

@@ -6,7 +6,7 @@ namespace AngleSharp.Css.Values
     /// <summary>
     /// Represents a CSS quote.
     /// </summary>
-    struct Quote : ICssPrimitiveValue
+    struct Quote : ICssPrimitiveValue, IEquatable<Quote>
     {
         #region Fields
 
@@ -48,5 +48,32 @@ public Quote(String open, String close)
         public String CssText => String.Concat(_open.CssString(), " ", _close.CssString());
 
         #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Checks the two quotes for equality.
+        /// </summary>
+        /// <param name="other">The other quote to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public Boolean Equals(Quote other) => Open.Is(other.Open) && Close.Is(other.Close);
+
+        /// <summary>
+        /// Checks for equality against the given object,
+        /// if the provided object is no quote the result
+        /// is false.
+        /// </summary>
+        /// <param name="obj">The object to check against.</param>
+        /// <returns>True if both are equal, otherwise false.</returns>
+        public override Boolean Equals(Object obj) =>
+            obj is Quote quote ? Equals(quote) : false;
+
+        /// <summary>
+        /// Gets the hash code of the object.
+        /// </summary>
+        /// <returns>The computed hash code.</returns>
+        public override Int32 GetHashCode() => CssText.GetHashCode();
+
+        #endregion
     }
 }