update the numeric lexical definition of css3.0

Author: neraliu

src/css-parser.3.js

@@ -36,7 +36,6 @@ ident		\-?{nmstart}{nmchar}* 					/* escaped - */
 vendor          [\-_]{h}"-"{h}
 name		{nmchar}+
 num		[0-9]+(\.[0-9]+)?|"."[0-9]+                             /* num		[0-9]+|[0-9]*"."[0-9]+ */
-// num		[0-9]+(\.[0-9]+)?([eE][+\-][0-9])?|"."[0-9]+([eE][+\-][0-9])?
 string		{string1}|{string2}
 badstring       {badstring1}|{badstring2}
 badcomment      {badcomment1}|{badcomment2}

src/l/css.21.l

@@ -36,8 +36,7 @@ comment		\/\*[^*]*\*+([^/*][^*]*\*+)*\/
 ident		\-?{nmstart}{nmchar}* 					/* escaped - */
 vendor          [\-_]{h}"-"{h}
 name		{nmchar}+
-/* TODO: the <number-token> pattern has been changed in CSS 3.0 */
-num             [0-9]+(\.[0-9]+)?|"."[0-9]+                             /* num          [0-9]+|[0-9]*"."[0-9]+ */
+num             [0-9]+(\.[0-9]+)?([eE][+\-][0-9])?|"."[0-9]+([eE][+\-][0-9])?
 string		{string1}|{string2}
 badstring       {badstring1}|{badstring2}
 badcomment      {badcomment1}|{badcomment2}
@@ -112,6 +111,10 @@ Z		"Z"|"z"|\\"0"{0,4}("5a"|"7a")(\r\n|[ \t\r\n\f])?|\\[z]
 
 "#"{name}		{return 'HASH';}
 
+// this is very tricky, as we support DIMENSION in the term production
+// it takes precedence before all other numeric definition.
+{num}{ident}		{return 'DIMENSION';}
+
 {num}{E}{M}		{return 'EMS';}					
 {num}{E}{X}		{return 'EXS';}					
 {num}{P}{X}		{return 'LENGTH';}				
@@ -127,7 +130,6 @@ Z		"Z"|"z"|\\"0"{0,4}("5a"|"7a")(\r\n|[ \t\r\n\f])?|\\[z]
 {num}{S}		{return 'TIME';} 				
 {num}{H}{Z}		{return 'FREQ';} 				
 {num}{K}{H}{Z}		{return 'FREQ';} 				
-{num}{ident}		{return 'DIMENSION';}
 
 {num}"%"		{return 'PERCENTAGE';}
 {num}			{return 'NUMBER';}

src/l/css.3.l

@@ -117,10 +117,6 @@ var css21TestPatterns = [
         result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: "1.0" } ] } ] } },
     { css: "e { border: .3; }",
         result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: ".3" } ] } ] } },
-/* TODO: need to support scientific notation
-    { css: "e { border: 1e+1; }",
-        result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: "1e+1" } ] } ] } },
-*/
     { css: "e { border: +1; }",
         result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: "+1" } ] } ] } },
     { css: "e { border: -1; }",
@@ -271,10 +267,6 @@ var css21TestPatterns = [
         result: { rulesets: [ { selector: 'e', declaration: [ { key: '-moz-opacity', value: '0.6' }, 
                                                               { key: '-khtml-opacity', value: '0.6' }, 
                                                               { key: 'opacity', value: '0.6' } ] } ] } },
-/*
-    { css: "e { border: 1-ident; }",
-        result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: '1 -ident' } ] } ] } },
-*/
 ];
 exports.css21TestPatterns = css21TestPatterns;
 
@@ -295,12 +287,15 @@ var css21InvalidTestPatterns = [
     { css: "element:  ident { color: red; text-align: center; }" }, /* no space between element_name and ident */
 
     { css: "e { border: 1ident; }" },
+    { css: "e { border: 1-ident; }" },
     { css: "e { color: function(); }" }, /* function must have expr as argument */
 
     /* {escape} \\[^\r\n\f0-9a-fA-F] */
     { css: "\\\r { color: red; text-align: center; }" },
     { css: "\\\n { color: red; text-align: center; }" },
     { css: "\\\f { color: red; text-align: center; }" },
+
+    { css: "e { border: 1e+1; }" },
 ];
 exports.css21InvalidTestPatterns = css21InvalidTestPatterns;
 
@@ -532,6 +527,23 @@ var css3TestPatterns = [
                                                                                                                                  ] } ] } ] } },
     */
 
+    { css: "e { border: 1; }",
+        result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: "1" } ] } ] } },
+    { css: "e { border: 1.0; }",
+        result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: "1.0" } ] } ] } },
+    { css: "e { border: .3; }",
+        result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: ".3" } ] } ] } },
+    { css: "e { border: +1; }",
+        result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: "+1" } ] } ] } },
+    { css: "e { border: -1; }",
+        result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: "-1" } ] } ] } },
+    { css: "e { border: 1ident; }",
+        result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: '1ident' } ] } ] } },
+    /* TODO: bug?
+    { css: "e { border: 1-ident; }",
+        result: { rulesets: [ { selector: 'e', declaration: [ { key: 'border', value: '1-ident' } ] } ] } },
+    */
+
     { css: "@media screen { p { font-family: verdana, sans-serif; font-size: 17px; } }",
         result: { medias: { mediaqueries: [ { prefix: '', media_type: 'screen', expression: '' } ], rulesets: [ { "selector": "p", "declaration": [ { key: "font-family", value: "verdana ,sans-serif" }, { key: "font-size", value: "17px" } ] } ] }, } },
     { css: "@media screen, tv { p { font-family: verdana, sans-serif; font-size: 17px; } }",