Changeset 15881 for lang/actionscript

Timestamp:

07/16/08 03:24:11 (4 months ago)

Author:

gyuque

Message:

updated demo

Location:

lang/actionscript/ascss/src

Files:

• KyotoDemo.as (modified) (2 diffs)
• KyotoDemo.swf (modified) (previous)
• css/CSSStyleSelector.as (modified) (2 diffs)
• cssdom/IASCSSElement.as (modified) (1 diff)
• cssdom/XMLElementWrapper.as (modified) (3 diffs)
• kyotodemo/XMLDocument.as (modified) (1 diff)

lang/actionscript/ascss/src/KyotoDemo.as

@@ -348 +348 @@
 
 
-                private static const rxStartTag:RegExp = /<[-_a-zA-Z0-9]+[^>]*>/
-                private static const rxEndTag:RegExp = /<\/[-_a-zA-Z0-9]+[^>]*>/
+                private static const rxStartTag:RegExp = /^<[-_a-zA-Z0-9]+[^>]*>/
+                private static const rxEndTag:RegExp = /^<\/[-_a-zA-Z0-9]+[^>]*>/
                 private static const rxEmptyTag:RegExp = /\/[ \t]*>/
 
-                private static const rxCommentStart:RegExp = /<!--/
+                private static const rxCommentStart:RegExp = /^<!--/
                 private static const rxCommentEnd:RegExp = /-->/
 
@@ -374 +374 @@
                         var fwd:String;
                         for (;;) {
+                                curpos = src.indexOf('<', curpos);
+                                if (curpos < 0) break;
+
                                 fwd = src.substring(curpos);
 

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

@@ -584 +584 @@
                                                 break;
                                         }
+
+                                        case CSSSelector.PseudoLastChild:
+                                        {
+                                                // last-child matches the last child that is an element
+                                                if (e.parentNode && e.parentNode.isElementNode) {
+                                                        result = false;
+//                                                      if (parentNode->isFinishedParsingChildren()) {
+                                                                n = e.nextSibling;
+                                                                while (n && !n.isElementNode)
+                                                                        n = n.nextSibling;
+                                                                if (!n)
+                                                                        result = true;
+//                                                      }
+/*
+                                                        if (!m_collectRulesOnly) {
+                                                                RenderStyle* childStyle = (m_element == e) ? m_style : e->renderStyle();
+                                                                RenderStyle* parentStyle = (m_element == e) ? m_parentStyle : parentNode->renderStyle();
+                                                                if (parentStyle)
+                                                                        parentStyle->setChildrenAffectedByLastChildRules();
+                                                                if (result && childStyle)
+                                                                        childStyle->setLastChildState();
+                                                        }
+*/
+                                                        return result;
+                                                }
+                                                break;
+                                        }
                                 }
                                 return false;
@@ -589 +616 @@
 
                         return true;
+                }
+
+                public static function matchNth(count:int, a:int, b:int):Boolean
+                {
+                    if (a == 0)
+                        return count == b;
+                    else if (a > 0) {
+                        if (count < b)
+                            return false;
+                        return (count - b) % a == 0;
+                    } else {
+                        if (count > b)
+                            return false;
+                        return (b - count) % (-a) == 0;
+                    }
                 }
 

lang/actionscript/ascss/src/cssdom/IASCSSElement.as

@@ -12 +12 @@
                 function get parentNode():IASCSSElement;
                 function get previousSibling():IASCSSElement;
+                function get nextSibling():IASCSSElement;
                 function getAttributeQ(qn:QualifiedName):String
                 function get document():IASCSSDocument

lang/actionscript/ascss/src/cssdom/XMLElementWrapper.as

@@ -12 +12 @@
                 private var mElement:XML;
                 private var mParent:XMLElementWrapper;
-                private var mPreviousSibling:XMLElementWrapper;
+                private var mPreviousSibling:XMLElementWrapper = null;
+                private var mNextSibling:XMLElementWrapper = null;
                 private var mChildren:Array;
                 private var mClassNames:ClassNames;
@@ -83 +84 @@
                                 var ch_w:XMLElementWrapper = createFor(ch, d);
                                 ch_w.parent = wrapper;
-                                ch_w.setPreviousSibling(prev);
+                                if (prev)
+                                        prev.chainNextSibling(ch_w);
 
                                 if (!wrapper.mChildren)
@@ -138 +140 @@
                 }
 
-                public function setPreviousSibling(s:XMLElementWrapper):void
-                {
-                        mPreviousSibling = s;
+                public function get nextSibling():IASCSSElement
+                {
+                        return mNextSibling;
+                }
+
+                public function chainNextSibling(nxt:XMLElementWrapper):void
+                {
+                        nxt.mPreviousSibling = this;
+                        mNextSibling = nxt;
                 }
 

lang/actionscript/ascss/src/kyotodemo/XMLDocument.as

@@ -77 +77 @@
                                 if (chdata)
                                 {
-                                        chdata.wrapper.setPreviousSibling(prevsib_chdata ? prevsib_chdata.wrapper : null);
+                                        if (prevsib_chdata)
+                                                prevsib_chdata.wrapper.chainNextSibling(chdata.wrapper);
                                         prevsib_chdata = chdata;
                                 }