ats-format 0.2.0.0 → 0.2.0.1

raw patch · 3 files changed

+8/−7 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• ats-format.cabal +1/−1
• src/Language/ATS.hs +3/−3
• src/Language/ATS/Parser.y +4/−3

@@ -1,5 +1,5 @@ name:                ats-format-version:             0.2.0.0+version:             0.2.0.1 synopsis:            A source-code formatter for ATS description:         An opinionated source-code formatter for [ATS](http://www.ats-lang.org/). homepage:            https://hub.darcs.net/vmchale/ats-format#readme

@@ -43,15 +43,15 @@                     , exec                     ) where +import           Data.Maybe               (catMaybes) import           Language.ATS.Exec import           Language.ATS.Lexer import           Language.ATS.Parser import           Language.ATS.PrettyPrint import           Language.ATS.Types-import Data.Maybe (catMaybes)  getDependencies :: ATS -> [FilePath] getDependencies (ATS ds) = catMaybes (g <$> ds)     where g (Staload _ s) = Just s-          g (Include s) = Just s-          g _ = Nothing+          g (Include s)   = Just s+          g _             = Nothing

@@ -178,7 +178,7 @@     exp { Operator $$ "**" }     mod { Keyword $$ KwMod }     fixAt { Keyword $$ KwFixAt }-    lambdaAt { Keyword $$ KwLambdaAt }+    lamAt { Keyword $$ KwLambdaAt }     infixr { FixityTok $$ "infixr" }     infixl { FixityTok $$ "infixr" }     prefix { FixityTok $$ "prefix" }@@ -422,6 +422,7 @@               | let ATS in Expression lineComment {% Left $ Expected (token_posn $5) "end" (take 2 $ to_string $5) }               | let ATS in Expression extern {% Left $ Expected $5 "end" "extern" }               | let ATS in Expression fun {% Left $ Expected $5 "end" "fun" }+              | let ATS in Expression vtypedef {% Left $ Expected $5 "end" "vtypedef" }               | if Expression then Expression else else {% Left $ Expected $6 "Expression" "else" }  -- | Parse a termetric@@ -651,8 +652,8 @@             | val Pattern eq Expression { Val (get_addendum $1) Nothing $2 $4 }             | var Pattern eq Expression { Var Nothing $2 (Just $4) Nothing }             | var Pattern colon Type { Var (Just $4) $2 Nothing Nothing }-            | var Pattern eq fixAt IdentifierOr openParen Args closeParen Signature Type plainArrow Expression { Var Nothing $2 (Just $ FixAt $5 undefined) Nothing }-            | var Pattern eq lambdaAt openParen Args closeParen Signature Type plainArrow Expression { Var Nothing $2 (Just $ LambdaAt (undefined)) Nothing }+            | var Pattern eq fixAt IdentifierOr StackFunction { Var Nothing $2 (Just $ FixAt $5 $6) Nothing }+            | var Pattern eq lamAt StackFunction { Var Nothing $2 (Just $ LambdaAt $5) Nothing }             | prval Pattern eq Expression { PrVal $2 $4 }             | praxi PreFunction { Func $1 (Praxi $2) }             | primplmnt Implementation { ProofImpl $2 }