Merge branch 'property-interp-fix-2' of https://github.com/seven-phases-max/less.js

Conflicts:
	lib/less/parser.js

Author: lukeapage

lib/less/parser.js

@@ -1500,8 +1500,9 @@ less.Parser = function Parser(env) {
                     important = this.important();
 
                     // a name returned by this.ruleProperty() is always an array of the form:
-                    // ["", "string-1", ..., "string-n", ""] or ["", "string-1", ..., "string-n", "+"]
-                    merge = name.pop && (name.pop() === "+");
+                    // [string-1, ..., string-n, ""] or [string-1, ..., string-n, "+"]
+                    // where each item is a tree.Keyword or tree.Variable
+                    merge = name.pop && (name.pop().value === "+");
 
                     if (value && this.end()) {
                         return new (tree.Rule)(name, value, important, merge, memo, env.currentFileInfo);
@@ -1929,7 +1930,7 @@ less.Parser = function Parser(env) {
                 }
             },
             ruleProperty: function () {
-                var c = current, name = [], index = [], length = 0;
+                var c = current, name = [], index = [], length = 0, s, k;
 
                 function match(re) {
                     var a = re.exec(c);
@@ -1945,13 +1946,18 @@ less.Parser = function Parser(env) {
                 while (match(/^((?:[\w-]+)|(?:@\{[\w-]+\}))/)); // !
                 if ((name.length > 1) && match(/^\s*(\+?)\s*:/)) {
                     // at last, we have the complete match now. move forward, 
-                    // convert @{var}s to tree.Variable(s) and return:
+                    // convert name particles to tree objects and return:
                     skipWhitespace(length);
-                    for (var k=0; k < name.length; k++) {
-                        if (name[k].charAt(0) === '@') {
-                            name[k] = new tree.Variable('@' + name[k].slice(2, -1), 
+                    if (name[0] === '') {
+                        name.shift();
+                        index.shift();
+                    }
+                    for (k = 0; k < name.length; k++) {
+                        s = name[k];
+                        name[k] = (s.charAt(0) !== '@')
+                            ? new(tree.Keyword)(s)
+                            : new(tree.Variable)('@' + s.slice(2, -1), 
                                 index[k], env.currentFileInfo);
-                        }
                     }
                     return name;
                 }

lib/less/tree/rule.js

@@ -30,11 +30,14 @@ tree.Rule.prototype = {
     },
     toCSS: tree.toCSS,
     eval: function (env) {
-        var strictMathBypass = false;
-        var name = this.name.map ? 
-            this.name.map( function(v) {
-                return v.eval ? v.eval(env).value : v;
-            }).join('') : this.name;
+        var strictMathBypass = false, name = this.name;    
+        if (typeof name !== "string") {
+            // expand 'primitive' name directly to get
+            // things faster (~10% for benchmark.less):
+            name = (name.length === 1) 
+                && (name[0] instanceof tree.Keyword)
+                    ? name[0].value : evalName(env, name);
+        }
         if (name === "font" && !env.strictMath) {
             strictMathBypass = true;
             env.strictMath = true;
@@ -47,9 +50,7 @@ tree.Rule.prototype = {
                               this.index, this.currentFileInfo, this.inline);
         }
         catch(e) {
-            if (e.index === undefined) {
-                e.index = this.index;
-            }
+            e.index = e.index || this.index;
             throw e;
         }
         finally {
@@ -67,4 +68,13 @@ tree.Rule.prototype = {
     }
 };
 
+function evalName(env, name) {
+    var value = "", i, n = name.length,
+        output = {add: function (s) {value += s;}};
+    for (i = 0; i < n; i++) {
+        name[i].eval(env).genCSS(env, output);
+    }
+    return value;
+}
+
 })(require('../tree'));

test/css/property-name-interp.css

@@ -1,4 +1,4 @@
-test {
+pi-test {
   border: 0;
   ufo-width: 50%;
   *-z-border: 1px dashed blue;
@@ -8,7 +8,13 @@ test {
   border-top-red-radius-: 3pt;
   global-local-mixer-property: strong;
 }
-test-merge {
+pi-test-merge {
   pre-property-ish: high, middle, low, base;
   pre-property-ish+: nice try dude;
 }
+pi-indirect-vars {
+  auto: auto;
+}
+pi-complex-values {
+  3px rgba(255, 255, 0, 0.5), 3.141592653589793 /* foo */3px rgba(255, 255, 0, 0.5), 3.141592653589793 /* foo */: none;
+}

test/less/property-name-interp.less

@@ -1,5 +1,5 @@
 
-test {
+pi-test {
     @prefix: ufo-;
     @a:    border;
     @bb:      top;
@@ -39,3 +39,15 @@ test {
         pre-property-ish@{subterfuge}: nice try dude;
     }
 }
+
+pi-indirect-vars {
+    @{p}: @p;
+    @p: @@a;
+    @a: b;
+    @b: auto;
+}
+
+pi-complex-values {
+    @{p}@{p}: none;
+    @p: (1 + 2px) fadeout(#ff0, 50%), pi() /* foo */;
+}