[ fix #356 ] trust the user's "layout toplevel" declaration

BNFC · Jun 5, 2021 · 78fb571 · 78fb571
1 parent 3265143
commit 78fb571
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 4 deletions.
diff --git a/source/CHANGELOG.md b/source/CHANGELOG.md
@@ -11,7 +11,7 @@ Andreas Abel <andreas.abel@gu.se>  (unreleased)
 ## Bug fixes and small improvements
 
 * Haskell-GADT: generated code is warning free [#346]
-* Haskell: fixes in layout preprocessor [#343,#344,#345,#352,#353,#356]
+* Haskell: fixes in layout preprocessor [#343,#344,#345,#352,#353]
 * Haskell: print `[Char]` correctly, removed method `prtList` [#359]
 * Haskell: added missing import [#368], regression introduced in 2.9.1 by [#331]
 * C: fixed a space leak when parsing from a string in memory [#347]

diff --git a/source/src/BNFC/Backend/Haskell.hs b/source/src/BNFC/Backend/Haskell.hs
@@ -401,7 +401,7 @@ testfile opts cf = unlines $ concat $
       | lay     = unwords [ "resolveLayout", show useTopLevelLayout, "$ myLexer", atom]
       | True    = unwords [ "myLexer", atom]
     (hasTopLevelLayout, layoutKeywords, _) = layoutPragmas cf
-    useTopLevelLayout = isJust hasTopLevelLayout && isList topType
+    useTopLevelLayout = isJust hasTopLevelLayout
 
 
 runStd xml myLLexer = unlines $ concat

diff --git a/testing/regression-tests/194_layout/test.cf b/testing/regression-tests/194_layout/test.cf
@@ -10,7 +10,6 @@ TySig.    Decl ::= Ident ":" Ident                       ;
 separator Decl ";"        ;
 
 layout "where", "private" ;
-layout toplevel           ;  -- this should have no effect since the entrypoint is not a list
 
 comment "--"              ;
 comment "{-" "-}"         ;
diff --git a/testing/regression-tests/356_LayoutSnocList/bad01.in b/testing/regression-tests/356_LayoutSnocList/bad01.in
@@ -0,0 +1 @@
+1 2 3
diff --git a/testing/regression-tests/356_LayoutSnocList/good01.in b/testing/regression-tests/356_LayoutSnocList/good01.in
@@ -0,0 +1,3 @@
+1
+2
+3
diff --git a/testing/regression-tests/356_LayoutSnocList/test.cf b/testing/regression-tests/356_LayoutSnocList/test.cf
@@ -0,0 +1,7 @@
+-- Andreas, 2021-06-05, issue #356.
+-- Layout should also with snoc-lists, in particular top-level layout.
+
+layout toplevel;
+
+Nil.  Ints ::= ;
+Snoc. Ints ::= Ints Integer ";" ;
diff --git a/testing/src/ParameterizedTests.hs b/testing/src/ParameterizedTests.hs
@@ -85,7 +85,10 @@ currentRegressionTest = makeTestSuite "Current parameterized test" $
 -- | Layout currently only works for Haskell (even Agda) and Haskell/GADT.
 layoutTest :: Test
 layoutTest = makeTestSuite "Layout parsing test" $ concat
-  [ map (`makeTestCase` ("regression-tests" </> "194_layout")) $
+  [ map (`makeTestCase` ("regression-tests" </> "356_LayoutSnocList")) $
+    [ haskellParameters
+    ]
+  , map (`makeTestCase` ("regression-tests" </> "194_layout")) $
     [ haskellGADTParameters
     , haskellAgdaParameters
     ]