Merge pull request #39 from github/move-grammar-datatypes-to-the-parser-packages

Move grammar datatypes to the language packages

Author: robrix

semantic.cabal

@@ -187,11 +187,9 @@ library
                      -- Language-specific grammar/syntax types, & assignments
                      , Language.Markdown.Assignment
                      , Language.Markdown.Syntax
-                     , Language.Go.Grammar
                      , Language.Go.Assignment
                      , Language.Go.Syntax
                      , Language.Go.Type
-                     , Language.Haskell.Grammar
                      , Language.Haskell.Assignment
                      , Language.Haskell.Syntax
                      , Language.Haskell.Syntax.Constructor
@@ -200,17 +198,14 @@ library
                      , Language.Haskell.Syntax.Pattern
                      , Language.Haskell.Syntax.QuasiQuote
                      , Language.Haskell.Syntax.Type
-                     , Language.JSON.Grammar
                      , Language.JSON.Assignment
                      , Language.JSON.PrettyPrint
                      , Language.MiniRuby.Assignment
                      , Language.MiniPython.Assignment
-                     , Language.Ruby.Grammar
                      , Language.Ruby.Assignment
                      , Language.Ruby.PrettyPrint
                      , Language.Ruby.Syntax
                      , Language.TypeScript.Assignment
-                     , Language.TypeScript.Grammar
                      , Language.TypeScript.Resolution
                      , Language.TypeScript.Syntax
                      , Language.TypeScript.Syntax.Import
@@ -219,14 +214,11 @@ library
                      , Language.TypeScript.Syntax.TypeScript
                      , Language.TypeScript.Syntax.Types
                      , Language.PHP.Assignment
-                     , Language.PHP.Grammar
                      , Language.PHP.Syntax
                      , Language.Python.Assignment
-                     , Language.Python.Grammar
                      , Language.Python.PrettyPrint
                      , Language.Python.Syntax
                      , Language.Java.Assignment
-                     , Language.Java.Grammar
                      , Language.Java.Syntax
                      , Numeric.Exts
                      -- Parser glue

src/Language/Go/Assignment.hs

@@ -23,10 +23,10 @@ import qualified Data.Syntax.Literal as Literal
 import qualified Data.Syntax.Statement as Statement
 import qualified Data.Syntax.Type as Type
 import qualified Data.Term as Term
-import           Language.Go.Grammar as Grammar
 import           Language.Go.Syntax as Go.Syntax hiding (runeLiteral, labelName)
 import           Language.Go.Type as Go.Type
 import Data.ImportPath (importPath, defaultAlias)
+import           TreeSitter.Go as Grammar
 
 type Syntax =
   '[ Comment.Comment

src/Language/Go/Grammar.hs

@@ -23,8 +23,8 @@ import qualified Data.Syntax.Literal as Literal
 import qualified Data.Syntax.Statement as Statement
 import qualified Data.Syntax.Type as Type
 import qualified Data.Term as Term
-import           Language.Haskell.Grammar as Grammar
 import qualified Language.Haskell.Syntax as Syntax
+import           TreeSitter.Haskell as Grammar
 
 type Syntax = '[
     Comment.Comment

src/Language/Haskell/Assignment.hs

@@ -13,9 +13,9 @@ import Data.Location
 import qualified Data.Syntax as Syntax
 import qualified Data.Syntax.Literal as Literal
 import qualified Data.Term as Term
-import Language.JSON.Grammar as Grammar
 import Prologue
 import Text.Parser.Combinators
+import TreeSitter.JSON as Grammar
 
 type Syntax =
   [ Literal.Null

src/Language/Haskell/Grammar.hs

@@ -36,8 +36,8 @@ import qualified Data.Syntax.Literal as Literal
 import qualified Data.Syntax.Statement as Statement
 import qualified Data.Syntax.Type as Type
 import qualified Data.Term as Term
-import           Language.Java.Grammar as Grammar
 import qualified Language.Java.Syntax as Java.Syntax
+import           TreeSitter.Java as Grammar
 
 type Syntax =
   '[ Comment.Comment

src/Language/JSON/Assignment.hs

@@ -33,8 +33,8 @@ import qualified Data.Syntax.Literal as Literal
 import qualified Data.Syntax.Statement as Statement
 import qualified Data.Syntax.Type as Type
 import qualified Data.Term as Term
-import           Language.Python.Grammar as Grammar
 import           Prologue
+import           TreeSitter.Python as Grammar
 
 
 -- | The type of Python syntax.