# HG changeset patch
# User jlaskey
# Date 1377262585 10800
# Node ID e2d94d0327603247e8bd98397d796ba607c0acd2
# Parent  badc919cd621c8c37a3a9fac53e3616ddb71c4a7
8020946: TokenType#toString returned null
Reviewed-by: hannesw, lagergren
Contributed-by: james.laskey@oracle.com

diff -r badc919cd621 -r e2d94d032760 src/jdk/nashorn/internal/parser/TokenType.java
--- a/src/jdk/nashorn/internal/parser/TokenType.java	Fri Aug 23 14:16:16 2013 +0200
+++ b/src/jdk/nashorn/internal/parser/TokenType.java	Fri Aug 23 09:56:25 2013 -0300
@@ -284,7 +284,7 @@
 
     @Override
     public String toString() {
-        return name;
+        return getNameOrType();
     }
 
     static {