fixes from code review

Author: helixbass

lib/coffeescript/grammar.js

@@ -838,9 +838,9 @@ grammar =
     o 'Expression ^        Expression',         -> new Op $2, $1, $3
     o 'Expression |        Expression',         -> new Op $2, $1, $3
     o 'Expression &&       Expression',         -> new Op $2, $1, $3
-    o 'Expression LEADING_&& Expression',       -> new Op $2, $1, $3
+    o 'Expression LEADING_AND Expression',      -> new Op $2, $1, $3
     o 'Expression ||       Expression',         -> new Op $2, $1, $3
-    o 'Expression LEADING_|| Expression',       -> new Op $2, $1, $3
+    o 'Expression LEADING_OR Expression',       -> new Op $2, $1, $3
     o 'Expression BIN?     Expression',         -> new Op $2, $1, $3
     o 'Expression RELATION Expression',         ->
       if $2.charAt(0) is '!'
@@ -884,8 +884,8 @@ operators = [
   ['left',      '&']
   ['left',      '^']
   ['left',      '|']
-  ['left',      '&&', 'LEADING_&&']
-  ['left',      '||', 'LEADING_||']
+  ['left',      '&&', 'LEADING_AND']
+  ['left',      '||', 'LEADING_OR']
   ['left',      'BIN?']
   ['nonassoc',  'INDENT', 'OUTDENT']
   ['right',     'YIELD']

lib/coffeescript/lexer.js

@@ -1301,7 +1301,13 @@ POSSIBLY_DIVISION   = /// ^ /=?\s ///
 # Other regexes.
 HERECOMMENT_ILLEGAL = /\*\//
 
+# When appearing at the beginning of a line, suppresses TERMINATOR and INDENT
+# tokens. So unless the line is outdented, the line's tokens will appear (in the
+# unrewritten token stream) to be a continuation of the previous line
 LINE_CONTINUER      = /// ^ \s* (?: , | \??\.(?![.\d]) | \??:: ) ///
+
+# When appearing at the beginning of an indented line, causes a TERMINATOR token
+# to be generated rather than an INDENT
 INDENT_SUPPRESSOR   = /// ^ \s* (?: and\s+(?!:)\S | or\s+(?!:)\S | && | \|\| ) ///
 
 STRING_INVALID_ESCAPE = ///

lib/coffeescript/parser.js

@@ -662,12 +662,12 @@ exports.Rewriter = class Rewriter
       @detectEnd i + 1, condition, action
       return 1
 
-  # Convert TERMINATOR followed by && or || into a single LEADING_&& or
-  # LEADING_|| token to disambiguate grammar.
+  # Convert TERMINATOR followed by && or || into a single LEADING_AND or
+  # LEADING_OR token to disambiguate grammar.
   tagLeadingLogical: ->
     @scanTokens (token, i, tokens) ->
       return 1 unless token[0] is 'TERMINATOR' and tokens.length >= i + 2 and (operatorToken = tokens[i + 1])[0] in ['&&', '||']
-      token[0] = "LEADING_#{operatorToken[0]}"
+      token[0] = "LEADING_#{if operatorToken[0] is '&&' then 'AND' else 'OR'}"
       token[1] = operatorToken[1]
       token[2].last_line = operatorToken[2].last_line
       token[2].last_column = operatorToken[2].last_column