Merge branch 'master' of github.com:jashkenas/coffeescript into 2

jashkenas · Dec 27, 2016 · 5cf8256 · 5cf8256
2 parents f0e884d + 0a6aeef
commit 5cf8256
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -2077,7 +2077,8 @@ exports.Op = class Op extends Base
 
   compileFloorDivision: (o) ->
     floor = new Value new IdentifierLiteral('Math'), [new Access new PropertyName 'floor']
-    div = new Op '/', @first, @second
+    second = if @second.isComplex() then new Parens @second else @second
+    div = new Op '/', @first, second
     new Call(floor, [div]).compileToFragments o
 
   compileModulo: (o) ->

diff --git a/test/error_messages.coffee b/test/error_messages.coffee
@@ -416,7 +416,7 @@ test "#3795: invalid escapes", ->
   assertErrorFormat '''
     ///a \\u002 0 space///
   ''', '''
-    [stdin]:1:6: error: invalid escape sequence \\u002 
+    [stdin]:1:6: error: invalid escape sequence \\u002 \n\
     ///a \\u002 0 space///
          ^\^^^^^
   '''

diff --git a/test/operators.coffee b/test/operators.coffee
@@ -330,7 +330,7 @@ test "floor division operator", ->
 
 test "floor division operator compound assignment", ->
   a = 7
-  a //= 2
+  a //= 1 + 1
   eq 3, a
 
 test "modulo operator", ->
-Original file line number
+Diff line change
@@ Expand Up / @@ -330,7 +330,7 @@ test "floor division operator", -> @@
     test "floor division operator compound assignment", ->
       a = 7
-      a //= 2
+      a //= 1 + 1
       eq 3, a
     test "modulo operator", ->
@@ Expand Down @@