Changeset 10932

Timestamp:

05/02/08 15:16:18 (5 years ago)

Author:

gyuque

Message:

selector specificity calculation

Location:

lang/actionscript/ascss/src

Files:

• SelectTest.swf (modified) (previous)
• css/CSSRuleData.as (modified) (2 diffs)
• css/CSSSelector.as (modified) (1 diff)
• css/CSSStyleSelector.as (modified) (5 diffs)

lang/actionscript/ascss/src/css/CSSRuleData.as

@@ -7 +7 @@
                 private var mRule:CSSStyleRule;
                 private var mSelector:CSSSelector;
+                private var mPosition:uint;
                 function CSSRuleData(pos:uint, r:CSSStyleRule, sel:CSSSelector, prev:CSSRuleData = null)
                 {
+                        mPosition = pos;
                         mSelector = sel;
                         mRule = r;
@@ -30 +32 @@
                         return mSelector;
                 }
+
+                public function get position():uint
+                {
+                        return mPosition;
+                }
         }
 }

lang/actionscript/ascss/src/css/CSSSelector.as

@@ -224 +224 @@
                         return m_relation;
                 }
+
+                public function get specificity():uint
+                {
+                        // FIXME: Pseudo-elements and pseudo-classes do not have the same specificity. This function
+                        // isn't quite correct.
+                        var s:int = (m_tag.localName == '*' ? 0 : 1);
+                        switch (m_match) {
+                        case Id:
+                                s += 0x10000;
+                                break;
+                        case Exact:
+                        case Class:
+                        case Set:
+                        case List:
+                        case Hyphen:
+                        case PseudoClass:
+                        case PseudoElement:
+                        case Contain:
+                        case Begin:
+                        case End:
+                                s += 0x100;
+                        case None:
+                                break;
+                        }
+                        
+                        if (m_tagHistory)
+                                s += m_tagHistory.specificity;
+                        
+                        // make sure it doesn't overflow
+                        return s & 0xffffff;
+                }
+
         }
 }

lang/actionscript/ascss/src/css/CSSStyleSelector.as

@@ -5 +5 @@
         public class CSSStyleSelector
         {
+                private static const FIRST:uint = 0;
+                private static const LAST:uint = 1;
                 private static var pseudoState:uint;
 
@@ -70 +72 @@
                 }
 
+                private function sortMatchedRules(start:uint, end:uint):void
+                {
+                        if (start >= end || ((end - start) == 1))
+                                return; // Sanity check.
+                        
+                        if ((end - start) <= 6) {
+                        }
+                }
+
                 public function matchRules(rules:CSSRuleSet, aRuleIndexes:Array /* first, last */):void
                 {
@@ -90 +101 @@
 
                         matchRulesForList(rules.getTagRules(mElement.localName), aRuleIndexes);
+
+                        // If we didn't match any rules, we're done.
+                        if (matchedRulesIsEmpty)
+                                return;
+
+                        // Sort the set of matched rules.
+                        sortMatchedRules(0, mMatchedRules.length);
+                }
+
+                private function get matchedRulesIsEmpty():Boolean
+                {
+                        return mMatchedRules.length < 1;
                 }
 
@@ -119 +142 @@
                                         } else {
                                                 // Update our first/last rule indices in the matched rules array.
-                                                aRuleIndexes[1] = mMatchedDecls.length + mMatchedRules.length;
-                                                if (aRuleIndexes[0] == -1)
-                                                        aRuleIndexes[0] = aRuleIndexes[1];
+                                                aRuleIndexes[LAST] = mMatchedDecls.length + mMatchedRules.length;
+                                                if (aRuleIndexes[FIRST] == -1)
+                                                        aRuleIndexes[FIRST] = aRuleIndexes[LAST];
                                                 
 SelectTest.puts("selector matched for <"+localName+">");
@@ -224 +247 @@
                         mMatchedDecls = [];
                 }
+
+                public static function greaterThan(r1:CSSRuleData, r2:CSSRuleData):Boolean
+                {
+                        var spec1:int = r1.selector.specificity;
+                        var spec2:int = r2.selector.specificity;
+                        return (spec1 == spec2) ? (r1.position > r2.position) : (spec1 > spec2); 
+                }
+
+                public static function lesseq(r1:CSSRuleData, r2:CSSRuleData):Boolean
+                {
+                        return !(r1 > r2);
+                }
         }
 }