homunculus - npm Package Compare versions

Comparing version 0.6.5 to 0.6.6

package.json

 {
   "name": "homunculus",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "A lexer&parser by Javascript",
@@ -5,0 +5,0 @@ "maintainers": [

src/parser/css/Parser.js

@@ -420,3 +420,3 @@ var IParser = require('../Parser');
       else {
-        node.add(this.value(true));
+        node.add(this.value(null, true));
       }
@@ -633,6 +633,7 @@ if(this.look && this.look.content() == ',') {
     node.add(k);
+    name = k.first().token().content().toLowerCase();
     if(needValue(k)
       || this.look && this.look.content() == ':') {
       node.add(this.match(':'));
-      node.add(this.value(noC));
+      node.add(this.value(name, noC));
     }
@@ -668,3 +669,3 @@ while(this.look && this.look.type() == Token.HACK) {
   },
-  value: function(noComma) {
+  value: function(name, noComma) {
     var node = new Node(Node.VALUE);
@@ -771,2 +772,5 @@ if(!this.look) {
           }
+          else if(name == 'font') {
+            node.add(this.addexpr(undefined, null, true));
+          }
           else {
@@ -882,2 +886,5 @@ node.add(this.addexpr());
             }
+            else if(name == 'font') {
+              node.add(this.addexpr(undefined, null, true));
+            }
             else {
@@ -1242,3 +1249,3 @@ node.add(this.addexpr());
   },
-  addexpr: function(accepts, noUnit) {
+  addexpr: function(accepts, noUnit, noMtpl) {
     if(accepts && !Array.isArray(accepts)) {
@@ -1254,3 +1261,3 @@ accepts = [accepts];
     var node = new Node(Node.ADDEXPR);
-    var mtplexpr = this.mtplexpr(accepts, noUnit);
+    var mtplexpr = this.mtplexpr(accepts, noUnit, noMtpl);
     if(this.look && ['+', '-'].indexOf(this.look.content()) != -1) {
@@ -1261,3 +1268,3 @@ node.add(mtplexpr);
           this.match(),
-          this.mtplexpr(accepts, noUnit)
+          this.mtplexpr(accepts, noUnit, noMtpl)
         );
@@ -1274,6 +1281,6 @@ if(!noUnit && this.look && this.look.type() == Token.UNITS) {
   },
-  mtplexpr: function(accepts, noUnit) {
+  mtplexpr: function(accepts, noUnit, noMtpl) {
     var node = new Node(Node.MTPLEXPR);
     var prmrexpr = this.prmrexpr(accepts, noUnit);
-    if(this.look && ['*', '/'].indexOf(this.look.content()) != -1) {
+    if(!noMtpl && this.look && ['*', '/'].indexOf(this.look.content()) != -1) {
       node.add(prmrexpr);
@@ -1280,0 +1287,0 @@ while(this.look && ['*', '/'].indexOf(this.look.content()) != -1) {

web/parser/css/Parser.js

@@ -420,3 +420,3 @@ define(function(require, exports, module) {var IParser = require('../Parser');
       else {
-        node.add(this.value(true));
+        node.add(this.value(null, true));
       }
@@ -633,6 +633,7 @@ if(this.look && this.look.content() == ',') {
     node.add(k);
+    name = k.first().token().content().toLowerCase();
     if(needValue(k)
       || this.look && this.look.content() == ':') {
       node.add(this.match(':'));
-      node.add(this.value(noC));
+      node.add(this.value(name, noC));
     }
@@ -668,3 +669,3 @@ while(this.look && this.look.type() == Token.HACK) {
   },
-  value: function(noComma) {
+  value: function(name, noComma) {
     var node = new Node(Node.VALUE);
@@ -771,2 +772,5 @@ if(!this.look) {
           }
+          else if(name == 'font') {
+            node.add(this.addexpr(undefined, null, true));
+          }
           else {
@@ -882,2 +886,5 @@ node.add(this.addexpr());
             }
+            else if(name == 'font') {
+              node.add(this.addexpr(undefined, null, true));
+            }
             else {
@@ -1242,3 +1249,3 @@ node.add(this.addexpr());
   },
-  addexpr: function(accepts, noUnit) {
+  addexpr: function(accepts, noUnit, noMtpl) {
     if(accepts && !Array.isArray(accepts)) {
@@ -1254,3 +1261,3 @@ accepts = [accepts];
     var node = new Node(Node.ADDEXPR);
-    var mtplexpr = this.mtplexpr(accepts, noUnit);
+    var mtplexpr = this.mtplexpr(accepts, noUnit, noMtpl);
     if(this.look && ['+', '-'].indexOf(this.look.content()) != -1) {
@@ -1261,3 +1268,3 @@ node.add(mtplexpr);
           this.match(),
-          this.mtplexpr(accepts, noUnit)
+          this.mtplexpr(accepts, noUnit, noMtpl)
         );
@@ -1274,6 +1281,6 @@ if(!noUnit && this.look && this.look.type() == Token.UNITS) {
   },
-  mtplexpr: function(accepts, noUnit) {
+  mtplexpr: function(accepts, noUnit, noMtpl) {
     var node = new Node(Node.MTPLEXPR);
     var prmrexpr = this.prmrexpr(accepts, noUnit);
-    if(this.look && ['*', '/'].indexOf(this.look.content()) != -1) {
+    if(!noMtpl && this.look && ['*', '/'].indexOf(this.look.content()) != -1) {
       node.add(prmrexpr);
@@ -1280,0 +1287,0 @@ while(this.look && ['*', '/'].indexOf(this.look.content()) != -1) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

16389

increased by0.09%

Worsened metrics

Total package byte prevSize

555549

decreased by-0.36%

No dependency changes