Remove redundant importUnrestricted syntax (fix axellang#46)

Author: jgrosso

resources/new-project-template/Setup.axel

@@ -1,4 +1,4 @@
 (import Distribution.Simple (defaultMain))
 
-(= main (IO Unit)
+(def main (IO Unit)
   (() defaultMain))

resources/new-project-template/app/Main.axel

@@ -1,6 +1,6 @@
 (module Main)
 
-(importUnrestricted Lib)
+(import Lib all)
 
-(= main (IO Unit)
-  (() someFunc))
+(def main (IO Unit)
+ (() someFunc))

resources/new-project-template/src/Lib.axel

@@ -1,4 +1,4 @@
 (module Lib)
 
-(= someFunc (IO Unit)
+(def someFunc (IO Unit)
   (() (putStrLn "someFunc")))

resources/new-project-template/test/Spec.axel

@@ -1,2 +1,2 @@
-(= main (IO Unit)
+(def main (IO Unit)
   (() (putStrLn "Test suite not yet implemented")))

src/Axel/AST.hs

@@ -256,7 +256,6 @@ data Statement ann
   | STypeclassInstance (TypeclassInstance ann)
   | STypeSignature (TypeSignature ann)
   | STypeSynonym (TypeSynonym ann)
-  | SUnrestrictedImport ann Identifier
   deriving (Data, Eq, Functor, Show)
 
 type Program ann = [Statement ann]
@@ -349,7 +348,6 @@ instance {-# OVERLAPPING #-} HasAnnotation (Statement ann) ann where
   getAnn (STypeclassInstance typeclassInstance) = getAnn typeclassInstance
   getAnn (STypeSignature typeSig) = getAnn typeSig
   getAnn (STypeSynonym typeSynonym) = getAnn typeSynonym
-  getAnn (SUnrestrictedImport ann' _) = ann'
 
 instance {-# OVERLAPPING #-} HasAnnotation (Parse.Expression ann) ann where
   getAnn :: Parse.Expression ann -> ann
@@ -405,7 +403,6 @@ instance ToHaskell SMStatement where
   toHaskell (STypeclassInstance x) = toHaskell x
   toHaskell (STypeSignature x) = toHaskell x
   toHaskell (STypeSynonym x) = toHaskell x
-  toHaskell stmt@(SUnrestrictedImport _ x) = mkHaskell stmt $ "import " <> x
 
 instance ToHaskell (TypeDefinition (Maybe SM.Expression)) where
   toHaskell :: TypeDefinition (Maybe SM.Expression) -> SM.Output

src/Axel/Denormalize.hs

@@ -15,7 +15,7 @@ import Axel.AST
           SMacroImport, SModuleDeclaration, SNewtypeDeclaration, SPragma,
           SQualifiedImport, SRawStatement, SRestrictedImport, STopLevel,
           STypeSignature, STypeSynonym, STypeclassDefinition,
-          STypeclassInstance, SUnrestrictedImport)
+          STypeclassInstance)
   , TopLevel(TopLevel)
   , TypeDefinition(ProperType, TypeConstructor)
   , alias
@@ -300,10 +300,3 @@ denormalizeStatement (STypeSynonym typeSynonym) =
         , denormalizeExpression (typeSynonym ^. alias)
         , denormalizeExpression (typeSynonym ^. definition)
         ]
-denormalizeStatement stmt@(SUnrestrictedImport _ identifier) =
-  let ann' = getAnn' stmt
-   in Parse.SExpression
-        ann'
-        [ Parse.Symbol ann' "importUnrestricted"
-        , Parse.Symbol ann' (T.unpack identifier)
-        ]

src/Axel/Haskell/Convert.hs

@@ -168,15 +168,13 @@ instance ToStmts HSE.ImportDecl where
                    Nothing -> unsupportedStmt stmt
             else case alias of
                    Nothing ->
-                     case importSpecListToExpr spec of
-                       AST.ImportAll _ ->
-                         AST.SUnrestrictedImport Nothing moduleId
-                       AST.ImportOnly _ imports ->
-                         AST.SRestrictedImport $
-                         AST.RestrictedImport
-                           Nothing
-                           moduleId
-                           (AST.ImportOnly Nothing imports)
+                     let importSpec =
+                           case importSpecListToExpr spec of
+                             AST.ImportAll _ -> AST.ImportAll Nothing
+                             AST.ImportOnly _ imports ->
+                               AST.ImportOnly Nothing imports
+                      in AST.SRestrictedImport $
+                         AST.RestrictedImport Nothing moduleId importSpec
                    Just _ -> unsupportedStmt stmt
     ]
     where

src/Axel/Normalize.hs

@@ -33,7 +33,7 @@ import Axel.AST
           SMacroImport, SModuleDeclaration, SNewtypeDeclaration, SPragma,
           SQualifiedImport, SRawStatement, SRestrictedImport, STopLevel,
           STypeSignature, STypeSynonym, STypeclassDefinition,
-          STypeclassInstance, SUnrestrictedImport)
+          STypeclassInstance)
   , TopLevel(TopLevel)
   , TypeDefinition(ProperType, TypeConstructor)
   , TypeSignature(TypeSignature)
@@ -275,8 +275,6 @@ normalizeStatement expr@(Parse.SExpression _ items) =
       SQualifiedImport <$>
       (QualifiedImport (Just expr) (T.pack moduleName) (T.pack alias) <$>
        normalizeImportSpec importSpec)
-    [Parse.Symbol _ "importUnrestricted", Parse.Symbol _ moduleName] ->
-      pure $ SUnrestrictedImport (Just expr) (T.pack moduleName)
     Parse.Symbol _ "instance":instanceName:defs ->
       let normalizedDefs =
             traverse

test/Axel/Test/ASTGen.hs

@@ -189,7 +189,6 @@ genStatement =
     , AST.STypeclassInstance <$> genTypeclassInstance
     , AST.STypeSignature <$> genTypeSignature
     , AST.STypeSynonym <$> genTypeSynonym
-    , AST.SUnrestrictedImport Nothing <$> genIdentifier
     ]
     [ AST.STopLevel <$> genTopLevel
     , AST.SFunctionDefinition <$> genFunctionDefinition

test/Axel/Test/Transpilation/syntax/ImportSyntax.axel_golden

@@ -1,4 +1,3 @@
-(importUnrestricted Quux)
 (import Foo all)
 (import Bar (foo bar (Baz baz)))
 (importq Bar Baz all)

test/Axel/Test/Transpilation/syntax/ImportSyntax.hs_golden

@@ -1,6 +1,5 @@
 import qualified Prelude as GHCPrelude
 import qualified Axel.Parse.AST as AST
-import Quux
 import Foo
 import Bar(foo,bar,Baz(baz))
 import qualified Bar as Baz