dhscanner-ast 0.1.0.1 → 0.1.0.2

raw patch · 2 files changed

+6/−27 lines, 2 filesdep ~aesondep ~basedep ~containersPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: aeson, base, containers

API changes (from Hackage documentation)

- Ast: ExpField :: ExpFieldContent -> Exp

- Ast: ExpFieldContent :: Exp -> FieldName -> Location -> ExpFieldContent

- Ast: ExpSubscript :: ExpSubscriptContent -> Exp

- Ast: ExpSubscriptContent :: Exp -> Exp -> Location -> ExpSubscriptContent

- Ast: [expFieldLhs] :: ExpFieldContent -> Exp

- Ast: [expFieldLocation] :: ExpFieldContent -> Location

- Ast: [expFieldName] :: ExpFieldContent -> FieldName

- Ast: [expSubscriptIdx] :: ExpSubscriptContent -> Exp

- Ast: [expSubscriptLhs] :: ExpSubscriptContent -> Exp

- Ast: [expSubscriptLocation] :: ExpSubscriptContent -> Location

- Ast: data ExpFieldContent

- Ast: data ExpSubscriptContent

- Ast: instance Data.Aeson.Types.FromJSON.FromJSON Ast.ExpFieldContent

- Ast: instance Data.Aeson.Types.FromJSON.FromJSON Ast.ExpSubscriptContent

- Ast: instance Data.Aeson.Types.ToJSON.ToJSON Ast.ExpFieldContent

- Ast: instance Data.Aeson.Types.ToJSON.ToJSON Ast.ExpSubscriptContent

- Ast: instance GHC.Classes.Eq Ast.ExpFieldContent

- Ast: instance GHC.Classes.Eq Ast.ExpSubscriptContent

- Ast: instance GHC.Classes.Ord Ast.ExpFieldContent

- Ast: instance GHC.Classes.Ord Ast.ExpSubscriptContent

- Ast: instance GHC.Generics.Generic Ast.ExpFieldContent

- Ast: instance GHC.Generics.Generic Ast.ExpSubscriptContent

- Ast: instance GHC.Show.Show Ast.ExpFieldContent

- Ast: instance GHC.Show.Show Ast.ExpSubscriptContent

- Ast: VarFieldContent :: ExpVarContent -> FieldName -> Location -> VarFieldContent

+ Ast: VarFieldContent :: Exp -> FieldName -> Location -> VarFieldContent

- Ast: VarSubscriptContent :: ExpVarContent -> Exp -> Location -> VarSubscriptContent

+ Ast: VarSubscriptContent :: Exp -> Exp -> Location -> VarSubscriptContent

- Ast: [varFieldLhs] :: VarFieldContent -> ExpVarContent

+ Ast: [varFieldLhs] :: VarFieldContent -> Exp

- Ast: [varSubscriptLhs] :: VarSubscriptContent -> ExpVarContent

+ Ast: [varSubscriptLhs] :: VarSubscriptContent -> Exp

Files

dhscanner-ast.cabal +4/−4
src/Ast.hs +2/−23

dhscanner-ast.cabal view

@@ -22,7 +22,7 @@     and models both of them as plain sequential code blocks. Every file has exactly one ast that represents it.
     Non Haskell parogrammers note: The ast is /immutable/ (like everything else in Haskell ...)
 
-version:            0.1.0.1
+version:            0.1.0.2
 license:            GPL-3.0-only
 license-file:       LICENSE
 author:             OrenGitHub
@@ -47,9 +47,9 @@         Location
 
     build-depends:
-        aeson >= 2.2.3 && < 2.3,
-        base >= 4.17.2 && < 4.18,
-        containers >= 0.6.7 && < 0.7
+        aeson < 2.3,
+        base < 4.19,
+        containers < 0.7
 
     hs-source-dirs:
         src

src/Ast.hs view

@@ -65,10 +65,8 @@    | ExpVar ExpVarContent
    | ExpBool ExpBoolContent
    | ExpCall ExpCallContent
-   | ExpField ExpFieldContent
    | ExpBinop ExpBinopContent
    | ExpLambda ExpLambdaContent
-   | ExpSubscript ExpSubscriptContent
    deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
 data Stmt
@@ -300,29 +298,10 @@      }
      deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
 
-data ExpFieldContent
-   = ExpFieldContent
-     {
-         expFieldLhs :: Exp,
-         expFieldName :: Token.FieldName,
-         expFieldLocation :: Location
-     }
-     deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
-
-data ExpSubscriptContent
-   = ExpSubscriptContent
-     {
-         expSubscriptLhs :: Exp,
-         expSubscriptIdx :: Exp,
-         expSubscriptLocation :: Location
-     }
-     deriving ( Show, Eq, Ord, Generic, ToJSON, FromJSON )
-
-
 data VarFieldContent
    = VarFieldContent
      {
-         varFieldLhs :: ExpVarContent,
+         varFieldLhs :: Exp,
          varFieldName :: Token.FieldName,
          varFieldLocation :: Location
      }
@@ -338,7 +317,7 @@ data VarSubscriptContent
    = VarSubscriptContent
      {
-         varSubscriptLhs :: ExpVarContent,
+         varSubscriptLhs :: Exp,
          varSubscriptIdx :: Exp,
          varSubscriptLocation :: Location
      }