Update js files.

lib/coffee-script/grammar.js

@@ -15,7 +15,6 @@
     action = (match = unwrap.exec(action)) ? match[1] : "(" + action + "())";
     action = action.replace(/\bnew /g, '$&yy.');
     action = action.replace(/\b(?:Block\.wrap|extend)\b/g, 'yy.$&');
-<<<<<<< HEAD
     addLocationDataFn = function(first, last) {
       if (!last) {
         return "yy.addLocationDataFn(@" + first + ")";
@@ -25,11 +24,8 @@
     };
     action = action.replace(/LOCDATA\(([0-9]*)\)/g, addLocationDataFn('$1'));
     action = action.replace(/LOCDATA\(([0-9]*),\s*([0-9]*)\)/g, addLocationDataFn('$1', '$2'));
-    return [patternString, "$$ = " + (addLocationDataFn(1, patternCount)) + "(" + action + ");", options];
-=======
     action = action.replace(/\b(Op|Value\.create)\b/g, 'yy.$&');
-    return [patternString, "$$ = " + action + ";", options];
->>>>>>> upstream/master
+    return [patternString, "$$ = " + (addLocationDataFn(1, patternCount)) + "(" + action + ");", options];
   };
 
   grammar = {
@@ -99,17 +95,10 @@
       o('ObjAssignable', function() {
         return Value.create($1);
       }), o('ObjAssignable : Expression', function() {
-<<<<<<< HEAD
-        return new Assign(LOCDATA(1)(new Value($1)), $3, 'object');
+        return new Assign(LOCDATA(1)(Value.create($1)), $3, 'object');
       }), o('ObjAssignable :\
        INDENT Expression OUTDENT', function() {
-        return new Assign(LOCDATA(1)(new Value($1)), $4, 'object');
-=======
-        return new Assign(Value.create($1), $3, 'object');
-      }), o('ObjAssignable :\
-       INDENT Expression OUTDENT', function() {
-        return new Assign(Value.create($1), $4, 'object');
->>>>>>> upstream/master
+        return new Assign(LOCDATA(1)(Value.create($1)), $4, 'object');
       }), o('Comment')
     ],
     ObjAssignable: [o('Identifier'), o('AlphaNumeric'), o('ThisProperty')],
@@ -291,11 +280,7 @@
     ],
     ThisProperty: [
       o('@ Identifier', function() {
-<<<<<<< HEAD
-        return new Value(LOCDATA(1)(new Literal('this')), [LOCDATA(2)(new Access($2))], 'this');
-=======
-        return Value.create(new Literal('this'), [new Access($2)], 'this');
->>>>>>> upstream/master
+        return Value.create(LOCDATA(1)(new Literal('this')), [LOCDATA(2)(new Access($2))], 'this');
       })
     ],
     Array: [
@@ -362,11 +347,7 @@
       o('CATCH Identifier Block', function() {
         return [$2, $3];
       }), o('CATCH Object Block', function() {
-<<<<<<< HEAD
-        return [LOCDATA(2)(new Value($2)), $3];
-=======
-        return [Value.create($2), $3];
->>>>>>> upstream/master
+        return [LOCDATA(2)(Value.create($2)), $3];
       })
     ],
     Throw: [
@@ -429,11 +410,7 @@
     ForBody: [
       o('FOR Range', function() {
         return {
-<<<<<<< HEAD
-          source: LOCDATA(2)(new Value($2))
-=======
-          source: Value.create($2)
->>>>>>> upstream/master
+          source: LOCDATA(2)(Value.create($2))
         };
       }), o('ForStart ForSource', function() {
         $2.own = $1.own;

lib/coffee-script/rewriter.js

@@ -213,12 +213,8 @@
         if (!(callObject || (prev != null ? prev.spaced : void 0) && (prev.call || (_ref2 = prev[0], __indexOf.call(IMPLICIT_FUNC, _ref2) >= 0)) && (__indexOf.call(IMPLICIT_CALL, tag) >= 0 || !(token.spaced || token.newLine) && __indexOf.call(IMPLICIT_UNSPACED_CALL, tag) >= 0))) {
           return 1;
         }
-<<<<<<< HEAD
-        tokens.splice(i, 0, this.generate('CALL_START', '('));
-=======
         callIndex = i;
         tokens.splice(i, 0, this.generate('CALL_START', '(', token[2]));
->>>>>>> upstream/master
         this.detectEnd(i + 1, condition, action);
         if (prev[0] === '?') {
           prev[0] = 'FUNC_EXIST';