Created new BaseSelector and moved SimpleSelector into a sealed subcl…

…ass.

ExCSS/ExCSS.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{26881075-3F64-4825-A6B5-EAA0D5419D20}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -57,9 +57,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>ExCSS.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -111,7 +108,6 @@
     <Compile Include="Model\Rules\MediaRule.cs" />
     <Compile Include="Model\Rules\NamespaceRule.cs" />
     <Compile Include="Model\Rules\PageRule.cs" />
-    <Compile Include="Model\Rules\RuleSet.cs" />
     <Compile Include="Model\Rules\StyleDeclaration.cs" />
     <Compile Include="Model\Rules\StyleRule.cs" />
     <Compile Include="Model\Rules\SupportsRule.cs" />
@@ -143,6 +139,8 @@
     <Compile Include="Model\Values\GenericFunction.cs" />
     <Compile Include="StylesheetReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Model\Rules\RuleSet.cs" />
+    <Compile Include="Model\Selector\BaseSelector.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

ExCSS/Model/ICssSelector.cs

@@ -2,6 +2,6 @@
 {
     interface ISupportsSelector
     {
-        SimpleSelector Selector { get; set; }
+        BaseSelector Selector { get; set; }
     }
 }

ExCSS/Model/Rules/PageRule.cs

@@ -7,7 +7,7 @@ namespace ExCSS
     public class PageRule : RuleSet, ISupportsSelector, ISupportsDeclarations
     {
         private readonly StyleDeclaration _declarations;
-        private SimpleSelector _selector;
+        private BaseSelector _selector;
         private string _selectorText;
 
         public PageRule() 
@@ -22,7 +22,7 @@ internal PageRule AppendRule(Property rule)
             return this;
         }
 
-        public SimpleSelector Selector
+        public BaseSelector Selector
         {
             get { return _selector; }
             set

ExCSS/Model/Rules/StyleRule.cs

@@ -8,7 +8,7 @@ namespace ExCSS
     public class StyleRule : RuleSet, ISupportsSelector, ISupportsDeclarations
     {
         private string _value;
-        private SimpleSelector _selector;
+        private BaseSelector _selector;
         private readonly StyleDeclaration _declarations;
 
         public StyleRule() : this( new StyleDeclaration())
@@ -20,7 +20,7 @@ public StyleRule(StyleDeclaration declarations)
             _declarations = declarations;
         }
 
-        public SimpleSelector Selector
+        public BaseSelector Selector
         {
             get { return _selector; }
             set

ExCSS/Model/Selector/BaseSelector.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace ExCSS
+{
+    public abstract class BaseSelector
+    {
+        public sealed override string ToString()
+        {
+            return ToString(false);
+        }
+
+        public abstract string ToString(bool friendlyFormat, int indentation = 0);
+    }
+}
+

ExCSS/Model/Selector/CombinatorSelector.cs

@@ -6,10 +6,10 @@ namespace ExCSS
 {
     public struct CombinatorSelector
     {
-        public SimpleSelector Selector;
+        public BaseSelector Selector;
         public Combinator Delimiter;
 
-        public CombinatorSelector(SimpleSelector selector, Combinator delimiter)
+        public CombinatorSelector(BaseSelector selector, Combinator delimiter)
         {
             Selector = selector;
             Delimiter = delimiter;

ExCSS/Model/Selector/ComplexSelector.cs

@@ -6,7 +6,7 @@
 // ReSharper disable once CheckNamespace
 namespace ExCSS
 {
-    public class ComplexSelector : SimpleSelector, IEnumerable<CombinatorSelector>
+    public class ComplexSelector : BaseSelector, IEnumerable<CombinatorSelector>
     {
         private readonly List<CombinatorSelector> _selectors;
 
@@ -15,7 +15,7 @@ public ComplexSelector()
             _selectors = new List<CombinatorSelector>();
         }
 
-        public ComplexSelector AppendSelector(SimpleSelector selector, Combinator combinator)
+        public ComplexSelector AppendSelector(BaseSelector selector, Combinator combinator)
         {
             _selectors.Add(new CombinatorSelector(selector, combinator));
             return this;
@@ -26,7 +26,7 @@ public IEnumerator<CombinatorSelector> GetEnumerator()
             return _selectors.GetEnumerator();
         }
 
-        internal void ConcludeSelector(SimpleSelector selector)
+        internal void ConcludeSelector(BaseSelector selector)
         {
             _selectors.Add(new CombinatorSelector { Selector = selector });
         }
@@ -41,7 +41,7 @@ IEnumerator IEnumerable.GetEnumerator()
             return ((IEnumerable)_selectors).GetEnumerator();
         }
 
-        public new string ToString(bool friendlyFormat, int indentation = 0)
+        public override string ToString(bool friendlyFormat, int indentation = 0)
         {
             var builder = new StringBuilder();
 

ExCSS/Model/Selector/FirstChildSelector.cs

@@ -1,7 +1,7 @@
 // ReSharper disable once CheckNamespace
 namespace ExCSS
 {
-    internal sealed class FirstChildSelector : SimpleSelector, IToString
+    internal sealed class FirstChildSelector : BaseSelector, IToString
     {
         FirstChildSelector()
         { }

ExCSS/Model/Selector/LastChildSelector.cs

@@ -1,7 +1,7 @@
 // ReSharper disable once CheckNamespace
 namespace ExCSS
 {
-    internal sealed class LastChildSelector : SimpleSelector, IToString
+    internal sealed class LastChildSelector : BaseSelector, IToString
     {
         LastChildSelector()
         { }

ExCSS/Model/Selector/NthChildSelector.cs

@@ -2,7 +2,7 @@
 // ReSharper disable once CheckNamespace
 namespace ExCSS
 {
-    internal abstract class NthChildSelector : SimpleSelector, IToString
+    internal abstract class NthChildSelector : BaseSelector, IToString
     {
         public int Step;
         public int Offset;
@@ -19,6 +19,6 @@ internal string FormatSelector(string functionName)
                 : string.Format(":{0}({1})", functionName, FunctionText);
         }
 
-        public new abstract string ToString(bool friendlyFormat, int indentation = 0);
+        public abstract override string ToString(bool friendlyFormat, int indentation = 0);
     }
 }

ExCSS/Model/Selector/SelectorFactory.cs

@@ -9,7 +9,7 @@ namespace ExCSS
     internal sealed class SelectorFactory
     {
         private SelectorOperation _selectorOperation;
-        private SimpleSelector _currentSelector;
+        private BaseSelector _currentSelector;
         private AggregateSelectorList _aggregateSelectorList;
         private ComplexSelector _complexSelector;
         private bool _hasCombinator;
@@ -24,7 +24,7 @@ internal SelectorFactory()
             ResetFactory();
         }
 
-        internal SimpleSelector Result
+        internal BaseSelector Result
         {
             get
             {
@@ -539,7 +539,7 @@ private void InsertCommaDelimited()
             _currentSelector = null;
         }
 
-        private void Insert(SimpleSelector selector)
+        private void Insert(BaseSelector selector)
         {
             if (_currentSelector != null)
             {
@@ -630,7 +630,7 @@ private void ParseDelimiter(Block token)
             }
         }
 
-        private SimpleSelector GetChildSelector<T>() where T : NthChildSelector, new()
+        private BaseSelector GetChildSelector<T>() where T : NthChildSelector, new()
         {
             var selector = new T();
 
@@ -698,7 +698,7 @@ private void ParseDelimiter(Block token)
             return selector;
         }
 
-        private static SimpleSelector GetPseudoSelector(Block token)
+        private static BaseSelector GetPseudoSelector(Block token)
         {
             switch (((SymbolBlock)token).Value)
             {

ExCSS/Model/Selector/SelectorList.cs

@@ -4,27 +4,27 @@
 // ReSharper disable once CheckNamespace
 namespace ExCSS
 {
-    public abstract class SelectorList : SimpleSelector, IEnumerable<SimpleSelector>
+    public abstract class SelectorList : BaseSelector, IEnumerable<BaseSelector>
     {
-        protected List<SimpleSelector> Selectors;
+        protected List<BaseSelector> Selectors;
 
         protected SelectorList()
         {
-            Selectors = new List<SimpleSelector>();
+            Selectors = new List<BaseSelector>();
         }
 
         public int Length 
         {
             get { return Selectors.Count; } 
         }
 
-        public SimpleSelector this[int index]
+        public BaseSelector this[int index]
         {
             get { return Selectors[index]; }
             set { Selectors[index] = value; }
         }
 
-        public SelectorList AppendSelector(SimpleSelector selector)
+        public SelectorList AppendSelector(BaseSelector selector)
         {
             Selectors.Add(selector);
             return this;
@@ -42,7 +42,7 @@ public SelectorList ClearSelectors()
             return this;
         }
 
-        public IEnumerator<SimpleSelector> GetEnumerator()
+        public IEnumerator<BaseSelector> GetEnumerator()
         {
             return Selectors.GetEnumerator();
         }

ExCSS/Model/Selector/SimpleSelector.cs

@@ -4,16 +4,11 @@
 
 namespace ExCSS
 {
-    public class SimpleSelector
+    public sealed class SimpleSelector : BaseSelector
     {
         private readonly string _code;
         internal static readonly SimpleSelector All = new SimpleSelector("*");
 
-        protected SimpleSelector()
-        {
-            //Leave _code = null
-        }
-
         public SimpleSelector(string selectorText)
         {
             _code = selectorText;
@@ -123,15 +118,8 @@ private static string GetValueAsString(string value)
             return "'" + value + "'";
         }
 
-        public sealed override string ToString()
-        {
-            return ToString(false);
-        }
-
-        public virtual string ToString(bool friendlyFormat, int indentation = 0)
+        public override string ToString(bool friendlyFormat, int indentation = 0)
         {
-            if (_code == null)
-                throw new InvalidOperationException();
             return _code;
         }
     }

ExCSS/Parser.cs

@@ -53,7 +53,7 @@ public StyleSheet Parse(string css)
             return _styleSheet;
         }
 
-        internal static SimpleSelector ParseSelector(string selector)
+        internal static BaseSelector ParseSelector(string selector)
         {
 			var tokenizer = new Lexer(new StylesheetReader(selector));
 			var tokens = tokenizer.Tokens;