Merge branch 'power-operator' of git://github.com/charliesome/coffee-script into more-math-operators

Conflicts:
	src/nodes.coffee
	test/operators.coffee

lib/coffee-script/grammar.js

@@ -559,6 +559,8 @@
         return new Op('-', $1, $3);
       }), o('Expression MATH     Expression', function() {
         return new Op($2, $1, $3);
+      }), o('Expression **       Expression', function() {
+        return new Op($2, $1, $3);
       }), o('Expression SHIFT    Expression', function() {
         return new Op($2, $1, $3);
       }), o('Expression COMPARE  Expression', function() {
@@ -586,7 +588,7 @@
     ]
   };
 
-  operators = [['left', '.', '?.', '::', '?::'], ['left', 'CALL_START', 'CALL_END'], ['nonassoc', '++', '--'], ['left', '?'], ['right', 'UNARY'], ['left', 'MATH'], ['left', '+', '-'], ['left', 'SHIFT'], ['left', 'RELATION'], ['left', 'COMPARE'], ['left', 'LOGIC'], ['nonassoc', 'INDENT', 'OUTDENT'], ['right', '=', ':', 'COMPOUND_ASSIGN', 'RETURN', 'THROW', 'EXTENDS'], ['right', 'FORIN', 'FOROF', 'BY', 'WHEN'], ['right', 'IF', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS'], ['right', 'POST_IF']];
+  operators = [['left', '.', '?.', '::', '?::'], ['left', 'CALL_START', 'CALL_END'], ['nonassoc', '++', '--'], ['left', '?'], ['right', 'UNARY'], ['right', '**'], ['left', 'MATH'], ['left', '+', '-'], ['left', 'SHIFT'], ['left', 'RELATION'], ['left', 'COMPARE'], ['left', 'LOGIC'], ['nonassoc', 'INDENT', 'OUTDENT'], ['right', '=', ':', 'COMPOUND_ASSIGN', 'RETURN', 'THROW', 'EXTENDS'], ['right', 'FORIN', 'FOROF', 'BY', 'WHEN'], ['right', 'IF', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS'], ['right', 'POST_IF']];
 
   tokens = [];
 

lib/coffee-script/lexer.js

@@ -830,7 +830,7 @@
 
   HEREDOC = /^("""|''')([\s\S]*?)(?:\n[^\n\S]*)?\1/;
 
-  OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>])\2=?|\?(\.|::)|\.{2,3})/;
+  OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>])\2=?|\?(\.|::)|\.{2,3}|\*\*)/;
 
   WHITESPACE = /^[^\n\S]+/;
 

lib/coffee-script/nodes.js

@@ -2288,6 +2288,9 @@
       if (this.operator === '?') {
         return this.compileExistence(o);
       }
+      if (this.operator === '**') {
+        return this.compilePower(o);
+      }
       answer = [].concat(this.first.compileToFragments(o, LEVEL_OP), this.makeCode(' ' + this.operator + ' '), this.second.compileToFragments(o, LEVEL_OP));
       if (o.level <= LEVEL_OP) {
         return answer;
@@ -2344,6 +2347,14 @@
       return this.joinFragmentArrays(parts, '');
     };
 
+    Op.prototype.compilePower = function(o) {
+      var left, parts, right;
+      left = this.first.compileToFragments(o, LEVEL_OP);
+      right = this.second.compileToFragments(o, LEVEL_OP);
+      parts = [this.makeCode('Math.pow('), left, this.makeCode(', '), right, this.makeCode(')')];
+      return this.joinFragmentArrays(parts, '');
+    };
+
     Op.prototype.toString = function(idt) {
       return Op.__super__.toString.call(this, idt, this.constructor.name + ' ' + this.operator);
     };