No need for a distinct IMPORT_FROM, we can recycle the FROM token name

Author: GeoffreyBooth

src/grammar.coffee

@@ -353,7 +353,7 @@ grammar =
 
   Import: [
     o 'IMPORT String',                          -> new Module 'import', null, $2
-    o 'IMPORT ImportClause IMPORT_FROM String', -> new Module 'import', $2, $4
+    o 'IMPORT ImportClause FROM String',        -> new Module 'import', $2, $4
   ]
 
   ImportClause: [
@@ -366,7 +366,7 @@ grammar =
   Export: [
     o 'EXPORT ExportClause',                    -> new Module 'export', $2
     o 'EXPORT EXPORT_DEFAULT Expression',       -> new Module 'export', $3, null, yes
-    o 'EXPORT ExportClause IMPORT_FROM String', -> new Module 'export', $2, $4
+    o 'EXPORT ExportClause FROM String',        -> new Module 'export', $2, $4
   ]
 
   ExportClause: [

src/lexer.coffee

@@ -116,7 +116,7 @@ exports.Lexer = class Lexer
       @token 'FROM', id
       return id.length
     if id is 'from' and (@seenImport or @seenExport)
-      @token 'IMPORT_FROM', id
+      @token 'FROM', id
       return id.length
     if id is 'as' and @seenImport
       @token 'IMPORT_AS', id