stylus-source 0.21.1 → 0.21.2

data/VERSION

@@ -1 +1 @@
-0.21.1
+0.21.2

data/vendor/History.md

@@ -1,4 +1,9 @@
 
+0.21.2 / 2011-12-22 
+==================
+
+  * Fixed literal / within function call. Closes #432
+
 0.21.1 / 2011-12-20 
 ==================
 

data/vendor/lib/middleware.js

@@ -131,7 +131,7 @@ module.exports = function(options){
 
       // Compile to cssPath
       function compile() {
-        if (debug) log('read', stylusPath);
+        if (debug) log('read', cssPath);
         fs.readFile(stylusPath, 'utf8', function(err, str){
           if (err) return error(err);
           var style = options.compile(str, stylusPath);

data/vendor/lib/parser.js

@@ -1158,8 +1158,10 @@ Parser.prototype = {
     if ('url' == this.peek().val.name) return this.url();
     var name = this.expect('function').val.name;
     this.state.push('function arguments');
+    this.parens++;
     var args = this.args();
     this.expect(')');
+    this.parens--;
     this.state.pop();
     return new nodes.Call(name, args);
   },

data/vendor/lib/stylus.js

@@ -24,7 +24,7 @@ exports = module.exports = render;
  * Library version.
  */
 
-exports.version = '0.21.1';
+exports.version = '0.21.2';
 
 /**
  * Expose nodes.

data/vendor/lib/visitor/evaluator.js

@@ -51,6 +51,7 @@ var Evaluator = module.exports = function Evaluator(root, options) {
   this.options = options;
   this.calling = []; // TODO: remove, use stack
   this.importStack = [];
+  this.return = 0;
 };
 
 /**
@@ -252,8 +253,7 @@ Evaluator.prototype.visitFunction = function(fn){
  */
 
 Evaluator.prototype.visitEach = function(each){
-  var _ = this.return;
-  this.return = true;
+  this.return++;
   var expr = utils.unwrap(this.visit(utils.unwrap(each.expr)))
     , len = expr.nodes.length
     , val = new nodes.Ident(each.val)
@@ -262,7 +262,7 @@ Evaluator.prototype.visitEach = function(each){
     , block = this.currentBlock
     , vals = []
     , body;
-  this.return = _;
+  this.return--;
 
   each.block.scope = false;
   for (var i = 0; i < len; ++i) {
@@ -317,13 +317,12 @@ Evaluator.prototype.visitCall = function(call){
   if ('expression' == fn.nodeName) fn = fn.first;
 
   // Evaluate arguments
-  var _ = this.return;
-  this.return = true;
+  this.return++;
   var args = this.visit(call.args);
   for (var key in call.args.map) {
     call.args.map[key] = this.visit(call.args.map[key]);
   }
-  this.return = _;
+  this.return--;
 
   // Built-in
   if (fn.fn) {
@@ -356,10 +355,9 @@ Evaluator.prototype.visitIdent = function(ident){
     return val ? this.visit(val) : ident;
   // Assign  
   } else {
-    var _ = this.return;
-    this.return = true;
+    this.return++;
     ident.val = this.visit(ident.val);
-    this.return = _;
+    this.return--;
     this.currentScope.add(ident);
     return ident.val;
   }
@@ -373,13 +371,12 @@ Evaluator.prototype.visitBinOp = function(binop){
   // Special-case "is defined" pseudo binop
   if ('is defined' == binop.op) return this.isDefined(binop.left);
 
-  var _ = this.return;
-  this.return = true;
+  this.return++;
   // Visit operands
   var op = binop.op
     , left = this.visit(binop.left)
     , right = this.visit(binop.right);
-  this.return = _;
+  this.return--;
 
   // HACK: ternary
   var val = binop.val
@@ -485,14 +482,13 @@ Evaluator.prototype.visitProperty = function(prop){
     return ret;
   // Regular property
   } else {
-    var _ = this.return;
-    this.return = true;
+    this.return++;
     prop.name = name;
     prop.literal = true;
     this.property = prop;
     prop.expr = this.visit(prop.expr);
     delete this.property;
-    this.return = _;
+    this.return--;
     return prop;
   }
 };
@@ -542,13 +538,12 @@ Evaluator.prototype.visitBlock = function(block){
 
 Evaluator.prototype.visitIf = function(node){
   var ret
-    , _ = this.return
     , block = this.currentBlock
     , negate = node.negate;
 
-  this.return = true;
+  this.return++;
   var ok = this.visit(node.cond).first.toBoolean();
-  this.return = _;
+  this.return--;
 
   // Evaluate body
   if (negate) {
@@ -593,8 +588,7 @@ Evaluator.prototype.visitIf = function(node){
  */
 
 Evaluator.prototype.visitImport = function(imported){
-  var _ = this.return;
-  this.return = true;
+  this.return++;
 
   var root = this.root
     , Parser = require('../parser')
@@ -603,7 +597,7 @@ Evaluator.prototype.visitImport = function(imported){
     , found
     , literal;
 
-  this.return = _;
+  this.return--;
 
   // url() passed
   if ('url' == path.name) return imported;

data/vendor/package.json

@@ -1,6 +1,6 @@
 {   "name": "stylus"
   , "description": "Robust, expressive, and feature-rich CSS superset"
-  , "version": "0.21.1"
+  , "version": "0.21.2"
   , "author": "TJ Holowaychuk <tj@vision-media.ca>"
   , "keywords": ["css", "parser", "style", "stylesheets", "jade", "language"]
   , "repository": "git://github.com/learnboost/stylus"

data/vendor/test/cases/regression.432.css

@@ -0,0 +1,5 @@
+body {
+  foo: 4px;
+  foo: foo(4);
+  foo: 4px;
+}

data/vendor/test/cases/regression.432.styl

@@ -0,0 +1,4 @@
+body
+  foo: unit(16 / 4, px)
+  foo: foo(16 / 4)
+  foo: (16/4)px

data/vendor/testing/test.styl

@@ -10,13 +10,7 @@
 //   h1[title]
 //     background: brown
 
-html:lang(en) a
-  foo: 'bar'
-
-html:lang(en) a {
-  foo: 'bar';
-}
-
-ul li:nth-child(2) a {
-  foo: 'bar';
-}
+body
+  foo: unit(16 / 4, px)
+  foo: foo(16 / 4)
+  foo: (16/4)px

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus-source
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000 Z
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies: []
 description: Robust, expressive, and feature-rich CSS superset. This gem packages
   up stylus for use with the stylus gem.
@@ -560,6 +560,8 @@ files:
 - vendor/test/cases/regression.415.styl
 - vendor/test/cases/regression.420.css
 - vendor/test/cases/regression.420.styl
+- vendor/test/cases/regression.432.css
+- vendor/test/cases/regression.432.styl
 - vendor/test/cases/regression.440.css
 - vendor/test/cases/regression.440.styl
 - vendor/test/cases/regression.449.css