96f3b9e · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Fix nested parameters blocks

commit96f3b9ed3f21571e7f806374d36b35355f0c60b1 authorEdwin Brady <ecb10@st-andrews.ac.uk> dateThu 1 Nov 2012, 14:12 (14 years ago) parent6d7a6aa

3 files changed+4−2

unifiedsplit

CHANGELOG+1

@@ -15,6 +15,7 @@ User visible changes:

1515Internal changes:

1616

1717* Separate inlining methods at compile-time and run-time

18+* Fixed nested parameters blocks

1819

1920New in 0.9.5:

2021-------------

src/Core/CoreParser.hs+1

@@ -42,6 +42,7 @@ idrisLexer = (PTok.makeTokenParser idrisDef) { PTok.whiteSpace = lexWS }

4242

4343lexer = idrisLexer

4444

45+-- Taken from Parsec source code

4546lexWS = skipMany (simpleSpace <|> oneLineComment <|> multiLineComment <?> "")

4647 where

4748

src/Idris/AbsSyntax.hs+2−2

@@ -522,8 +522,8 @@ expandParamsD ist dec ps ns (PData syn fc co pd) = PData syn fc co (expandPData

522522 else PDatadecl n (expandParams dec ps ns ty) (map econ cons)

523523 econ (n, t, fc) = (dec n, piBindp expl ps (expandParams dec ps ns t), fc)

524524expandParamsD ist dec ps ns (PParams f params pds)

525− = PParams f (map (mapsnd (expandParams dec ps ns)) params)

526− (map (expandParamsD ist dec ps ns) pds)

525+ = PParams f (ps ++ map (mapsnd (expandParams dec ps ns)) params) pds

526+-- (map (expandParamsD ist dec ps ns) pds)

527527expandParamsD ist dec ps ns (PClass info f cs n params decls)

528528 = PClass info f

529529 (map (expandParams dec ps ns) cs)