Changeset 15743 for lang/actionscript

Timestamp:

07/13/08 16:39:58 (4 months ago)

Author:

gyuque

Message:

supported important!

Location:

lang/actionscript/ascss/src/css

Files:

• ASCSS.asy (modified) (2 diffs)
• CSSLexer.as (modified) (2 diffs)
• CSSStyleSelector.as (modified) (3 diffs)
• Document.as (modified) (2 diffs)
• IPropertyExtension.as (modified) (1 diff)

lang/actionscript/ascss/src/css/ASCSS.asy

@@ -2142 +2142 @@
                                 break;
                         }
+                        valid_primitive = (id == 0 && validUnit(val, U_FInteger, false));
+                        break;
+
                         /* nobreak */
                 case CSSPropertyID.CSSPropertyOrphans:                    // <integer> | inherit
@@ -2298 +2301 @@
                                 if (mPropertyExtension.isValidPrimitiveValue(propId, val, id, mPropExtHost))
                                         valid_primitive = true;
+
+                                if (!valid_primitive && mPropertyExtension.isColorValue(propId))
+                                {
+                            parsedValue = parseColor();
+                            if (parsedValue != null)
+                                valueList.next();
+                                }
                         }
                         break;

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

@@ -54 +54 @@
                 public static const RX_URL2:String = "url\\([ \t\r\n\f]*" +RX_URL+ "[ \t\r\n\f]*\\)"
 
+                private static const mRxImportant:RegExp   = /^![ \\t\\r\\n\\f]*important/
+                private static const mRxIntnum:RegExp      = /^[0-9]+$/
                 private static const mRxIncludes:RegExp    = /^~=/
                 private static const mRxDashMatch:RegExp   = /^\|=/
@@ -195 +197 @@
                         }
                         else if ((rxr = mRxNum.exec(mCurSource)) != null)
+                        {
                                 kw = PARSER.FLOATTOKEN;
+                                mTokBody = rxr[0].toString();
+                                advance = mTokBody.length;
+
+                                if ((rxr = mRxIntnum.exec(rxr[0])) != null)
+                                        kw = PARSER.INTEGER;
+                        }
+                        else if ((rxr = mRxImportant.exec(mCurSource)) != null)
+                                kw = PARSER.IMPORTANT_SYM;
                         else if ((rxr = mRxIdent.exec(mCurSource)) != null)
                                 kw = PARSER.IDENT;

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

@@ -197 +197 @@
                         if (startIndex == -1)
                                 return;
+
                         var i:int;
                         for (i = startIndex; i <= endIndex; i++) {
@@ -312 +313 @@
                 }
 
-                private function get matchedRulesIsEmpty():Boolean
+                public function get matchedRulesIsEmpty():Boolean
                 {
                         return mMatchedRules.length < 1;
@@ -354 +355 @@
 Exl.puts("selector '"+ rule.selector.selectorText +"' matched for <"+localName+">");
 }*/
+
                                                 // Add this rule to our list of matched rules.
                                                 addMatchedRule(d);

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

@@ -1 +1 @@
 package css
 {
-        import cssdom.IASCSSDocument
+        import cssdom.*;
         public interface Document
         {
@@ -11 +11 @@
                 function setUsesDescendantRules(b:Boolean):void;
                 function setUsesFirstLineRules(b:Boolean):void;
+                function getElementById(id:String):IASCSSElement;
 
 /*

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

@@ -3 +3 @@
         public interface IPropertyExtension
         {
+                function isColorValue(aPropID:int):Boolean;
                 function isValidPrimitiveValue(aPropID:int, aValue:Value, aValueId:int, aHost:IPropertyExtensionHost):Boolean;
         }