NamedImports work now and can be mixed with Identifiers as well

I think I'm getting a hang of how it's supposed to work. 🙌

What works now, as you can see in all the tests that are not commented out and
should run through:

```coffee
import foo
import bar from lib
import { foo } from lib
import { foo as boo, bar } from lib
import { foo, bar } from lib
```

Author: Alexander Pánek

src/grammar.coffee

@@ -139,14 +139,6 @@ grammar =
     o 'IDENTIFIER',                             -> new IdentifierLiteral $1
   ]
 
-  IdentifierList: [
-    o 'Identifier',                                                     -> [$1]
-    o 'IdentifierList , Identifier',                                    -> $1.concat $3
-    o 'IdentifierList OptComma TERMINATOR Identifier',                  -> $1.concat $4
-    o 'INDENT IdentifierList OptComma OUTDENT',                         -> $2
-    o 'IdentifierList OptComma INDENT IdentifierList OptComma OUTDENT', -> $1.concat $4
-  ]
-
   Property: [
     o 'PROPERTY',                               -> new PropertyName $1
   ]
@@ -360,13 +352,27 @@ grammar =
   ]
 
   NamedImports: [
-    o '{ }',                          -> new IdentifierList []
-    o '{ IdentifierList OptComma }',  -> new IdentifierList $2
+    o '{ }',                      -> new ImportsList []
+    o '{ ImportsList OptComma }', -> new ImportsList $2
   ]
 
   ImportClause: [
     o 'NamedImports'
+    o 'ImportSpecifier'
+    o '* IMPORT_AS Identifier'
+  ]
+
+  ImportSpecifier: [
     o 'Identifier'
+    o 'Identifier IMPORT_AS Identifier', -> new ImportSpecifier $1, $3
+  ]
+
+  ImportsList: [
+    o 'ImportSpecifier',                                          -> [$1]
+    o 'ImportsList , ImportSpecifier',                            -> $1.concat $3
+    o 'ImportsList OptComma TERMINATOR ImportSpecifier',          -> $1.concat $4
+    o 'INDENT ImportsList OptComma OUTDENT',                      -> $2
+    o 'ImportsList OptComma INDENT ImportsList OptComma OUTDENT', -> $1.concat $4
   ]
 
   Import: [

src/nodes.coffee

@@ -1253,7 +1253,7 @@ exports.Import = class Import extends Base
     code.push @makeCode(';')
     code
 
-exports.IdentifierList = class IdentifierList extends Base
+exports.ImportsList = class ImportsList extends Base
   constructor: (identifiers) ->
     @identifiers = identifiers or []
 
@@ -1280,6 +1280,14 @@ exports.IdentifierList = class IdentifierList extends Base
 
     code
 
+exports.ImportSpecifier = class ImportSpecifier extends Base
+  constructor: (@original, @alias) ->
+
+  children: ['from', 'as']
+
+  compileNode: (o) ->
+    return [@makeCode("#{@original.value} as #{@alias.value}")]
+
 #### Assign
 
 # The **Assign** is used to assign a local variable to value, or to set the

test/modules.coffee

@@ -31,20 +31,25 @@ test "module import test, syntax #2", ->
   output = "import { foo } from 'lib';"
   eq toJS(input), output
 
-# test "module import test, syntax #3", ->
-#   input = "import { default as foo } from 'lib'"
-#   output = "import { default as foo } from 'lib';"
-#   eq toJS(input), output
+test "module import test, syntax #3", ->
+  input = "import { bar as foo } from 'lib'"
+  output = "import { bar as foo } from 'lib';"
+  eq toJS(input), output
 
-# test "module import test, syntax #4", ->
-#   input = "import { square, diag } from 'lib'"
-#   output = "import { square, diag } from 'lib';"
-#   eq toJS(input), output
+test "module import test, syntax #3", ->
+  input = "import { oof, bar as foo } from 'lib'"
+  output = "import { oof, bar as foo } from 'lib';"
+  eq toJS(input), output
 
-# test "module import test, syntax #5", ->
-#   input = "import { foo } from 'lib' # with a comment"
-#   output = "import { foo } from 'lib' ;"
-#   eq toJS(input), output
+test "module import test, syntax #4", ->
+  input = "import { square, diag } from 'lib'"
+  output = "import { square, diag } from 'lib';"
+  eq toJS(input), output
+
+test "module import test, syntax #5", ->
+  input = "import { foo } from 'lib' # with a comment"
+  output = "import { foo } from 'lib';"
+  eq toJS(input), output
 
 # test "module export test, syntax #1", ->
 #   input = "export default mixin"