haml-more 0.4.0.c → 0.4.0.d

data/vendor/coffee-script/lib/grammar.js

@@ -561,4 +561,4 @@
   }, {
     debug: false
   });
-})();
+})();

data/vendor/coffee-script/lib/lexer.js

@@ -402,4 +402,4 @@
   lex.prototype.close_indentation = function close_indentation() {
     return this.outdent_token(this.indent);
   };
-})();
+})();

data/vendor/coffee-script/lib/narwhal.js

@@ -41,4 +41,4 @@
     return factories[topId] = factories[topId] || this.reload(topId, path);
   };
   require.loader.loaders.unshift([".coffee", loader]);
-})();
+})();

data/vendor/coffee-script/lib/nodes.js

@@ -1,5 +1,5 @@
 (function(){
-  var AccessorNode, ArrayNode, AssignNode, CallNode, ClosureNode, CodeNode, CommentNode, ExistenceNode, Expressions, ExtendsNode, ForNode, IDENTIFIER, IfNode, IndexNode, LiteralNode, Node, ObjectNode, OpNode, ParentheticalNode, PushNode, RangeNode, ReturnNode, SliceNode, SplatNode, TAB, TRAILING_WHITESPACE, ThrowNode, TryNode, ValueNode, WhileNode, compact, del, flatten, inherit, merge, statement;
+  var AccessorNode, ArrayNode, AssignNode, BaseNode, CallNode, ClosureNode, CodeNode, CommentNode, ExistenceNode, Expressions, ExtendsNode, ForNode, IDENTIFIER, IfNode, IndexNode, LiteralNode, ObjectNode, OpNode, ParentheticalNode, PushNode, RangeNode, ReturnNode, SliceNode, SplatNode, TAB, TRAILING_WHITESPACE, ThrowNode, TryNode, ValueNode, WhileNode, compact, del, flatten, inherit, merge, statement;
   var __hasProp = Object.prototype.hasOwnProperty;
   (typeof process !== "undefined" && process !== null) ? process.mixin(require('scope')) : (this.exports = this);
   // Some helper functions
@@ -90,12 +90,12 @@
   // generated code should be wrapped up in a closure. An options hash is passed
   // and cloned throughout, containing messages from higher in the AST,
   // information about the current scope, and indentation level.
-  Node = (exports.Node = function Node() {  });
+  BaseNode = (exports.BaseNode = function BaseNode() {  });
   // This is extremely important -- we convert JS statements into expressions
   // by wrapping them in a closure, only if it's possible, and we're not at
   // the top level of a block (which would be unnecessary), and we haven't
   // already been asked to return the result.
-  Node.prototype.compile = function compile(o) {
+  BaseNode.prototype.compile = function compile(o) {
     var closure, top;
     this.options = merge(o || {});
     this.indent = o.indent;
@@ -110,21 +110,21 @@
   };
   // Statements converted into expressions share scope with their parent
   // closure, to preserve JavaScript-style lexical scope.
-  Node.prototype.compile_closure = function compile_closure(o) {
+  BaseNode.prototype.compile_closure = function compile_closure(o) {
     this.indent = o.indent;
     o.shared_scope = o.scope;
     return ClosureNode.wrap(this).compile(o);
   };
   // If the code generation wishes to use the result of a complex expression
   // in multiple places, ensure that the expression is only ever evaluated once.
-  Node.prototype.compile_reference = function compile_reference(o) {
+  BaseNode.prototype.compile_reference = function compile_reference(o) {
     var compiled, reference;
     reference = new LiteralNode(o.scope.free_variable());
     compiled = new AssignNode(reference, this);
     return [compiled, reference];
   };
   // Quick short method for the current indentation level, plus tabbing in.
-  Node.prototype.idt = function idt(tabs) {
+  BaseNode.prototype.idt = function idt(tabs) {
     var _a, _b, _c, _d, i, idt;
     idt = (this.indent || '');
     _c = 0; _d = (tabs || 0);
@@ -134,7 +134,7 @@
     return idt;
   };
   // Does this node, or any of its children, contain a node of a certain kind?
-  Node.prototype.contains = function contains(block) {
+  BaseNode.prototype.contains = function contains(block) {
     var _a, _b, node;
     _a = this.children;
     for (_b = 0; _b < _a.length; _b++) {
@@ -142,14 +142,14 @@
       if (block(node)) {
         return true;
       }
-      if (node instanceof Node && node.contains(block)) {
+      if (node instanceof BaseNode && node.contains(block)) {
         return true;
       }
     }
     return false;
   };
   // toString representation of the node, for inspecting the parse tree.
-  Node.prototype.toString = function toString(idt) {
+  BaseNode.prototype.toString = function toString(idt) {
     var _a, _b, _c, child;
     idt = idt || '';
     return '\n' + idt + this.type + (function() {
@@ -162,24 +162,24 @@
     }).call(this).join('');
   };
   // Default implementations of the common node methods.
-  Node.prototype.unwrap = function unwrap() {
+  BaseNode.prototype.unwrap = function unwrap() {
     return this;
   };
-  Node.prototype.children = [];
-  Node.prototype.is_statement = function is_statement() {
+  BaseNode.prototype.children = [];
+  BaseNode.prototype.is_statement = function is_statement() {
     return false;
   };
-  Node.prototype.is_statement_only = function is_statement_only() {
+  BaseNode.prototype.is_statement_only = function is_statement_only() {
     return false;
   };
-  Node.prototype.top_sensitive = function top_sensitive() {
+  BaseNode.prototype.top_sensitive = function top_sensitive() {
     return false;
   };
-  Node.prototype.operation_sensitive = function operation_sensitive() {
+  BaseNode.prototype.operation_sensitive = function operation_sensitive() {
     return false;
   };
   // A collection of nodes, each one representing an expression.
-  Expressions = (exports.Expressions = inherit(Node, {
+  Expressions = (exports.Expressions = inherit(BaseNode, {
     type: 'Expressions',
     constructor: function constructor(nodes) {
       this.children = (this.expressions = compact(flatten(nodes || [])));
@@ -212,7 +212,7 @@
     },
     compile: function compile(o) {
       o = o || {};
-      return o.scope ? Node.prototype.compile.call(this, o) : this.compile_root(o);
+      return o.scope ? BaseNode.prototype.compile.call(this, o) : this.compile_root(o);
     },
     // Compile each expression in the Expressions body.
     compile_node: function compile_node(o) {
@@ -233,7 +233,7 @@
       o.scope = new Scope(null, this, null);
       code = o.globals ? this.compile_node(o) : this.compile_with_declarations(o);
       code = code.replace(TRAILING_WHITESPACE, '');
-      return o.no_wrap ? code : "(function(){\n" + code + "\n})();";
+      return o.no_wrap ? code : "(function(){\n" + code + "\n})();\n";
     },
     // Compile the expressions body, with declarations of all inner variables
     // pushed up to the top.
@@ -287,7 +287,7 @@
   statement(Expressions);
   // Literals are static values that can be passed through directly into
   // JavaScript without translation, eg.: strings, numbers, true, false, null...
-  LiteralNode = (exports.LiteralNode = inherit(Node, {
+  LiteralNode = (exports.LiteralNode = inherit(BaseNode, {
     type: 'Literal',
     constructor: function constructor(value) {
       this.value = value;
@@ -310,7 +310,7 @@
   }));
   LiteralNode.prototype.is_statement_only = LiteralNode.prototype.is_statement;
   // Return an expression, or wrap it in a closure and return it.
-  ReturnNode = (exports.ReturnNode = inherit(Node, {
+  ReturnNode = (exports.ReturnNode = inherit(BaseNode, {
     type: 'Return',
     constructor: function constructor(expression) {
       this.children = [(this.expression = expression)];
@@ -327,7 +327,7 @@
   }));
   statement(ReturnNode, true);
   // A value, indexed or dotted into, or vanilla.
-  ValueNode = (exports.ValueNode = inherit(Node, {
+  ValueNode = (exports.ValueNode = inherit(BaseNode, {
     type: 'Value',
     SOAK: " == undefined ? undefined : ",
     constructor: function constructor(base, properties) {
@@ -399,7 +399,7 @@
   }));
   // Pass through CoffeeScript comments into JavaScript comments at the
   // same position.
-  CommentNode = (exports.CommentNode = inherit(Node, {
+  CommentNode = (exports.CommentNode = inherit(BaseNode, {
     type: 'Comment',
     constructor: function constructor(lines) {
       this.lines = lines;
@@ -412,7 +412,7 @@
   statement(CommentNode);
   // Node for a function invocation. Takes care of converting super() calls into
   // calls against the prototype's function of the same name.
-  CallNode = (exports.CallNode = inherit(Node, {
+  CallNode = (exports.CallNode = inherit(BaseNode, {
     type: 'Call',
     constructor: function constructor(variable, args) {
       this.children = flatten([(this.variable = variable), (this.args = (args || []))]);
@@ -477,7 +477,7 @@
   }));
   // Node to extend an object's prototype with an ancestor object.
   // After goog.inherits from the Closure Library.
-  ExtendsNode = (exports.ExtendsNode = inherit(Node, {
+  ExtendsNode = (exports.ExtendsNode = inherit(BaseNode, {
     type: 'Extends',
     constructor: function constructor(child, parent) {
       this.children = [(this.child = child), (this.parent = parent)];
@@ -506,7 +506,7 @@
   statement(ExtendsNode);
   // A dotted accessor into a part of a value, or the :: shorthand for
   // an accessor into the object's prototype.
-  AccessorNode = (exports.AccessorNode = inherit(Node, {
+  AccessorNode = (exports.AccessorNode = inherit(BaseNode, {
     type: 'Accessor',
     constructor: function constructor(name, tag) {
       this.children = [(this.name = name)];
@@ -519,7 +519,7 @@
     }
   }));
   // An indexed accessor into a part of an array or object.
-  IndexNode = (exports.IndexNode = inherit(Node, {
+  IndexNode = (exports.IndexNode = inherit(BaseNode, {
     type: 'Index',
     constructor: function constructor(index, tag) {
       this.children = [(this.index = index)];
@@ -532,7 +532,7 @@
   }));
   // A range literal. Ranges can be used to extract portions (slices) of arrays,
   // or to specify a range for list comprehensions.
-  RangeNode = (exports.RangeNode = inherit(Node, {
+  RangeNode = (exports.RangeNode = inherit(BaseNode, {
     type: 'Range',
     constructor: function constructor(from, to, exclusive) {
       this.children = [(this.from = from), (this.to = to)];
@@ -577,7 +577,7 @@
   // An array slice literal. Unlike JavaScript's Array#slice, the second parameter
   // specifies the index of the end of the slice (just like the first parameter)
   // is the index of the beginning.
-  SliceNode = (exports.SliceNode = inherit(Node, {
+  SliceNode = (exports.SliceNode = inherit(BaseNode, {
     type: 'Slice',
     constructor: function constructor(range) {
       this.children = [(this.range = range)];
@@ -592,7 +592,7 @@
     }
   }));
   // An object literal.
-  ObjectNode = (exports.ObjectNode = inherit(Node, {
+  ObjectNode = (exports.ObjectNode = inherit(BaseNode, {
     type: 'Object',
     constructor: function constructor(props) {
       this.children = (this.objects = (this.properties = props || []));
@@ -639,7 +639,7 @@
     }
   }));
   // An array literal.
-  ArrayNode = (exports.ArrayNode = inherit(Node, {
+  ArrayNode = (exports.ArrayNode = inherit(BaseNode, {
     type: 'Array',
     constructor: function constructor(objects) {
       this.children = (this.objects = objects || []);
@@ -694,7 +694,7 @@
     }
   });
   // Setting the value of a local variable, or the value of an object property.
-  AssignNode = (exports.AssignNode = inherit(Node, {
+  AssignNode = (exports.AssignNode = inherit(BaseNode, {
     type: 'Assign',
     PROTO_ASSIGN: /^(\S+)\.prototype/,
     LEADING_DOT: /^\.(prototype\.)?/,
@@ -756,7 +756,7 @@
     // object literals to a value. Peeks at their properties to assign inner names.
     // See: http://wiki.ecmascript.org/doku.php?id=harmony:destructuring
     compile_pattern_match: function compile_pattern_match(o) {
-      var _a, _b, access_class, assigns, i, idx, obj, val, val_var;
+      var _a, _b, access_class, assigns, code, i, idx, obj, val, val_var;
       val_var = o.scope.free_variable();
       assigns = [this.idt() + val_var + ' = ' + this.value.compile(o) + ';'];
       o.top = true;
@@ -781,7 +781,11 @@
         }
         assigns.push(new AssignNode(obj, val).compile(o));
       }
-      return assigns.join("\n");
+      code = assigns.join("\n");
+      if (o.returns) {
+        code += '\n' + this.idt() + 'return ' + this.variable.compile(o) + ';';
+      }
+      return code;
     },
     compile_splice: function compile_splice(o) {
       var from, l, name, plus, range, to;
@@ -798,7 +802,7 @@
   }));
   // A function definition. The only node that creates a new Scope.
   // A CodeNode does not have any children -- they're within the new scope.
-  CodeNode = (exports.CodeNode = inherit(Node, {
+  CodeNode = (exports.CodeNode = inherit(BaseNode, {
     type: 'Code',
     constructor: function constructor(params, body, tag) {
       this.params = params;
@@ -865,7 +869,7 @@
   }));
   // A splat, either as a parameter to a function, an argument to a call,
   // or in a destructuring assignment.
-  SplatNode = (exports.SplatNode = inherit(Node, {
+  SplatNode = (exports.SplatNode = inherit(BaseNode, {
     type: 'Splat',
     constructor: function constructor(name) {
       if (!(name.compile)) {
@@ -890,7 +894,7 @@
   }));
   // A while loop, the only sort of low-level loop exposed by CoffeeScript. From
   // it, all other loops can be manufactured.
-  WhileNode = (exports.WhileNode = inherit(Node, {
+  WhileNode = (exports.WhileNode = inherit(BaseNode, {
     type: 'While',
     constructor: function constructor(condition, opts) {
       this.children = [(this.condition = condition)];
@@ -933,7 +937,7 @@
   statement(WhileNode);
   // Simple Arithmetic and logical operations. Performs some conversion from
   // CoffeeScript operations into their JavaScript equivalents.
-  OpNode = (exports.OpNode = inherit(Node, {
+  OpNode = (exports.OpNode = inherit(BaseNode, {
     type: 'Op',
     CONVERSIONS: {
       '==': '===',
@@ -1019,7 +1023,7 @@
     }
   }));
   // A try/catch/finally block.
-  TryNode = (exports.TryNode = inherit(Node, {
+  TryNode = (exports.TryNode = inherit(BaseNode, {
     type: 'Try',
     constructor: function constructor(attempt, error, recovery, ensure) {
       this.children = compact([(this.attempt = attempt), (this.recovery = recovery), (this.ensure = ensure)]);
@@ -1040,7 +1044,7 @@
   }));
   statement(TryNode);
   // Throw an exception.
-  ThrowNode = (exports.ThrowNode = inherit(Node, {
+  ThrowNode = (exports.ThrowNode = inherit(BaseNode, {
     type: 'Throw',
     constructor: function constructor(expression) {
       this.children = [(this.expression = expression)];
@@ -1052,7 +1056,7 @@
   }));
   statement(ThrowNode, true);
   // Check an expression for existence (meaning not null or undefined).
-  ExistenceNode = (exports.ExistenceNode = inherit(Node, {
+  ExistenceNode = (exports.ExistenceNode = inherit(BaseNode, {
     type: 'Existence',
     constructor: function constructor(expression) {
       this.children = [(this.expression = expression)];
@@ -1075,7 +1079,7 @@
     return '(typeof ' + first.compile(o) + ' !== "undefined" && ' + second.compile(o) + ' !== null)';
   };
   // An extra set of parentheses, specified explicitly in the source.
-  ParentheticalNode = (exports.ParentheticalNode = inherit(Node, {
+  ParentheticalNode = (exports.ParentheticalNode = inherit(BaseNode, {
     type: 'Paren',
     constructor: function constructor(expression) {
       this.children = [(this.expression = expression)];
@@ -1101,7 +1105,7 @@
   // into a for loop. Also acts as an expression, able to return the result
   // of the comprehenion. Unlike Python array comprehensions, it's able to pass
   // the current index of the loop as a second parameter.
-  ForNode = (exports.ForNode = inherit(Node, {
+  ForNode = (exports.ForNode = inherit(BaseNode, {
     type: 'For',
     constructor: function constructor(body, source, name, index) {
       var _a;
@@ -1199,7 +1203,7 @@
   // expression by pushing down requested returns to the expression bodies.
   // Single-expression IfNodes are compiled into ternary operators if possible,
   // because ternaries are first-class returnable assignable expressions.
-  IfNode = (exports.IfNode = inherit(Node, {
+  IfNode = (exports.IfNode = inherit(BaseNode, {
     type: 'If',
     constructor: function constructor(condition, body, else_body, tags) {
       this.condition = condition;
@@ -1325,4 +1329,4 @@
       return if_part + ' : ' + else_part;
     }
   }));
-})();
+})();

data/vendor/coffee-script/lib/optparse.js

@@ -1,21 +1,19 @@
 (function(){
   var LONG_FLAG, OPTIONAL, SHORT_FLAG, build_rule, build_rules, op, spaces;
   // Create an OptionParser with a list of valid options.
-  op = (exports.OptionParser = function OptionParser(rules) {
-    this.banner = 'Usage: [Options]';
+  op = (exports.OptionParser = function OptionParser(rules, banner) {
+    this.banner = banner || 'Usage: [Options]';
     this.options_title = 'Available options:';
     this.rules = build_rules(rules);
-    this.actions = {};
     return this;
   });
-  // Add a callback to fire when a particular option is encountered.
-  op.prototype.add = function add(value, callback) {
-    return this.actions[value] = callback;
-  };
   // Parse the argument array, calling defined callbacks, returning the remaining non-option arguments.
   op.prototype.parse = function parse(args) {
-    var _a, _b, arg, callback, is_option, results, rule, value;
-    results = [];
+    var _a, _b, arg, is_option, options, rule;
+    arguments = Array.prototype.slice.call(arguments, 0);
+    options = {
+      arguments: []
+    };
     args = args.concat([]);
     while (((arg = args.shift()))) {
       is_option = false;
@@ -23,20 +21,16 @@
       for (_b = 0; _b < _a.length; _b++) {
         rule = _a[_b];
         if (rule.letter === arg || rule.flag === arg) {
-          callback = this.actions[rule.name];
-          value = rule.argument && args.shift();
-          if (callback) {
-            callback(value);
-          }
+          options[rule.name] = rule.argument ? args.shift() : true;
           is_option = true;
           break;
         }
       }
       if (!(is_option)) {
-        results.push(arg);
+        options.arguments.push(arg);
       }
     }
-    return results;
+    return options;
   };
   // Return the help text for this OptionParser, for --help and such.
   op.prototype.help = function help() {
@@ -114,4 +108,4 @@
     }
     return builder.join('');
   };
-})();
+})();

data/vendor/coffee-script/lib/repl.js

@@ -29,4 +29,4 @@
   process.stdio.addListener('data', readline);
   process.stdio.open();
   print(prompt);
-})();
+})();

data/vendor/coffee-script/lib/rewriter.js

@@ -380,4 +380,4 @@
       });
     })(this));
   };
-})();
+})();

data/vendor/coffee-script/lib/scope.js

@@ -111,4 +111,4 @@
   Scope.prototype.compiled_assignments = function compiled_assignments() {
     return this.assigned_variables().join(', ');
   };
-})();
+})();

data/vendor/coffee-script/package.json

@@ -3,5 +3,5 @@
     "description":  "Unfancy JavaScript",
     "keywords":     ["javascript", "language"],
     "author":       "Jeremy Ashkenas",
-    "version":      "0.5.1"
+    "version":      "0.5.2"
 }