Changeset 9656 for lang/actionscript/ascss/src

Timestamp:

04/18/08 02:25:19 (5 years ago)

Author:

gyuque

Message:

ascss: parser for number values

Location:

lang/actionscript/ascss/src/css

Files:

• ASCSS.asy (modified) (4 diffs)
• CSSPrimitiveValue.as (modified) (5 diffs)
• ParseValue.as (modified) (1 diff)

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

@@ -1433 +1433 @@
 }
 
+
+// units for parsed value
+public static const U_FUnknown:uint   = 0x0000;
+public static const U_FInteger:uint   = 0x0001;
+public static const U_FNumber:uint    = 0x0002;  // Real Numbers
+public static const U_FPercent:uint   = 0x0004;
+public static const U_FLength:uint    = 0x0008;
+public static const U_FAngle:uint     = 0x0010;
+public static const U_FTime:uint      = 0x0020;
+public static const U_FFrequency:uint = 0x0040;
+public static const U_FRelative:uint  = 0x0100;
+public static const U_FNonNeg:uint    = 0x0200;
+
 private function parseValue(propId:int, important:Boolean):Boolean
 {
@@ -1449 +1462 @@
 
         switch(propId) {
+                case CSSPropertyID.CSSPropertyBottom:               // <length> | <percentage> | auto | inherit
+                case CSSPropertyID.CSSPropertyLeft:                 // <length> | <percentage> | auto | inherit
+                case CSSPropertyID.CSSPropertyRight:                // <length> | <percentage> | auto | inherit
+                case CSSPropertyID.CSSPropertyTop:                  // <length> | <percentage> | auto | inherit
+                case CSSPropertyID.CSSPropertyMarginTop:           //// <margin-width> | inherit
+                case CSSPropertyID.CSSPropertyMarginRight:         //   Which is defined as
+                case CSSPropertyID.CSSPropertyMarginBottom:        //   <length> | <percentage> | auto | inherit
+                case CSSPropertyID.CSSPropertyMarginLeft:          ////
+                case CSSPropertyID.CSSPropertyWebkitMarginStart:
+                if (id == CSSValueKeywords.CSSValueAuto)
+                        valid_primitive = true;
+                else
+                        valid_primitive = (id == 0 && validUnit(val, U_FLength|U_FPercent, mStrict));
+                break;
+
+
                 case CSSPropertyID.CSSPropertyBackgroundColor:     // <color> | inherit
                 case CSSPropertyID.CSSPropertyBorderTopColor:     // <color> | inherit
@@ -1482 +1511 @@
         }
 
-    if (valid_primitive) {
-        if (id != 0)
-            parsedValue = CSSPrimitiveValue.newId(id);
+        if (valid_primitive) {
+                if (id != 0)
+                        parsedValue = CSSPrimitiveValue.newId(id);
+                else if (val.unit >= CSSPrimitiveValue.CSS_NUMBER && val.unit <= CSSPrimitiveValue.CSS_KHZ)
+                        parsedValue = CSSPrimitiveValue.newUnitNumber(val.fValue, val.unit);
 /*
         else if (value->unit == CSSPrimitiveValue::CSS_STRING)
             parsedValue = new CSSPrimitiveValue(value->string, (CSSPrimitiveValue::UnitTypes) value->unit);
-        else if (value->unit >= CSSPrimitiveValue::CSS_NUMBER && value->unit <= CSSPrimitiveValue::CSS_KHZ)
-            parsedValue = new CSSPrimitiveValue(value->fValue, (CSSPrimitiveValue::UnitTypes) value->unit);
         else if (value->unit >= Value::Q_EMS)
             parsedValue = new CSSQuirkPrimitiveValue(value->fValue, CSSPrimitiveValue::CSS_EMS);
@@ -1504 +1533 @@
 
         return false;
+}
+
+private function validUnit(aValue:ParseValue, aUnitFlags:uint, aStrict:Boolean):Boolean
+{
+        if ((aUnitFlags & U_FNonNeg) != 0 && aValue.fValue < 0)
+                return false;
+
+    var b:Boolean = false;
+    switch(aValue.unit) {
+    case CSSPrimitiveValue.CSS_NUMBER:
+                b = (aUnitFlags & U_FNumber) != 0;
+                if (!b && ((aUnitFlags & (U_FLength | U_FAngle)) != 0 && (aValue.fValue == 0 || !aStrict))) {
+                        aValue.unit = ((aUnitFlags & U_FLength) !=0 ) ? CSSPrimitiveValue.CSS_PX : CSSPrimitiveValue.CSS_DEG;
+                        b = true;
+                }
+                if (!b && (aUnitFlags & U_FInteger) != 0 && aValue.isInt)
+                        b = true;
+                break;
+        case CSSPrimitiveValue.CSS_PERCENTAGE:
+                b = (aUnitFlags & U_FPercent) != 0;
+                break;
+        case ParseValue.Q_EMS:
+        case CSSPrimitiveValue.CSS_EMS:
+        case CSSPrimitiveValue.CSS_EXS:
+        case CSSPrimitiveValue.CSS_PX:
+        case CSSPrimitiveValue.CSS_CM:
+        case CSSPrimitiveValue.CSS_MM:
+        case CSSPrimitiveValue.CSS_IN:
+        case CSSPrimitiveValue.CSS_PT:
+        case CSSPrimitiveValue.CSS_PC:
+                b = (aUnitFlags & U_FLength) != 0;
+                break;
+        case CSSPrimitiveValue.CSS_MS:
+        case CSSPrimitiveValue.CSS_S:
+                b = (aUnitFlags & U_FTime) != 0;
+                break;
+        case CSSPrimitiveValue.CSS_DEG:
+        case CSSPrimitiveValue.CSS_RAD:
+        case CSSPrimitiveValue.CSS_GRAD:
+                b = (aUnitFlags & U_FAngle) != 0;
+                break;
+        case CSSPrimitiveValue.CSS_HZ:
+        case CSSPrimitiveValue.CSS_KHZ:
+        case CSSPrimitiveValue.CSS_DIMENSION:
+    default:
+        break;
+        }
+
+        return b;
 }
 

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

@@ -11 +11 @@
                 public static const CSS_CM:int         = 6;
                 public static const CSS_MM:int         = 7;
+                public static const CSS_IN:int         = 8;
+                public static const CSS_PT:int         = 9;
+                public static const CSS_PC:int         = 10;
+                public static const CSS_DEG:int        = 11;
+                public static const CSS_RAD:int        = 12;
+                public static const CSS_GRAD:int       = 13;
+                public static const CSS_MS:int         = 14;
+                public static const CSS_S:int          = 15;
+                public static const CSS_HZ:int         = 16;
+                public static const CSS_KHZ:int        = 17;
+                public static const CSS_DIMENSION:int  = 18;
+                public static const CSS_STRING:int     = 19;
+                public static const CSS_URI:int        = 20;
                 public static const CSS_IDENT:int      = 21;
                 public static const CSS_RGBCOLOR:int   = 25;
@@ -30 +43 @@
                 }
 
+                public static function newUnitNumber(n:Number, u:int):CSSPrimitiveValue
+                {
+                        var val:CSSPrimitiveValue = new CSSPrimitiveValue();
+                        val.mType = u;
+                        val.mNumValue = n;
+
+                        return val;
+                }
+
                 public override function dump():String
                 {
@@ -38 +60 @@
                         else if (mType == CSS_IDENT)
                                 ret += " IDENT " + mIdentValue;
+                        else if (mType == CSS_NUMBER)
+                                ret += " NUMBER " + mNumValue;
 
                         return ret;
@@ -45 +69 @@
                 private var mRGBColorValue:uint;
                 private var mIdentValue:int;
+                private var mNumValue:Number;
 
                 public function get primitiveType():int
                 {
                         return mType;
+                }
+
+                public function getNumberValue():Number
+                {
+                        return mNumValue;
                 }
 
@@ -70 +100 @@
                         switch(t)
                         {
+                        case CSS_UNKNOWN:  return "unknown";
                         case CSS_RGBCOLOR: return "RGB";
                         case CSS_IDENT:    return "IDENT";
-                        default:           return "unknown";
+                        case CSS_NUMBER:   return "NUMBER";
+                        case CSS_PERCENTAGE: return "PERCENT";
+                        case CSS_EMS:      return "em";
+                        case CSS_EXS:      return "ex";
+                        case CSS_PX:       return "px";
+                        default:           return "error ("+t+")";
                         }
                 }

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

@@ -3 +3 @@
         public class ParseValue
         {
+                public static const Operator:uint = 0x100000;
+                public static const Function:uint = 0x100001;
+                public static const Q_EMS:uint    = 0x100002;
+
                 function ParseValue(aId:int, aUnit:int)
                 {