Merge pull request #1254 from AmpersandTarski/bugfix/Issue1253

fixes #1253

ReleaseNotes.md

@@ -1,6 +1,6 @@
 # Release notes of Ampersand
 
-## Unreleased changes
+## v4.6.0 (22 November 2021)
 
 * [Issue #prototype/69 ](https://github.com/AmpersandTarski/prototype/issues/69 )Auxiliary work to facilitate the implementation of the new Angular frontend. 
 * [Issue #425](https://github.com/AmpersandTarski/Ampersand/issues/425) Add check on release notes for every pull request
@@ -10,8 +10,8 @@
   * Added CLI option: --(no-)frontend to specify if the compiler must generate frontend files (default enabled)
   * Added CLI option: --(no-)backend to specify if the compiler must generate backend config files (default enabled)
   * Added CLI option: --(no-)check-compiler-version to specify if compiler must check prototype framework compatibility (default enabled)
-
 * [Issue #1231](https://github.com/AmpersandTarski/Ampersand/issues/1231) Enable the generation of a logical data model (graphic) where the entities are grouped per pattern.
+* [Issue #1253](https://github.com/AmpersandTarski/Ampersand/issues/1253) Bugfix 'ampersand: No match in record selector aavtxt'
 
 ## v4.5.0 (11 November 2021)
 

ampersand.cabal

@@ -3,8 +3,6 @@ cabal-version: 2.0
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 4b27a9ba6b432d561dc818be2ed86859f42ed8da7bb77cbe1d0d4f209c69dd01
 
 name:           ampersand
 version:        4.5.0
@@ -19,9 +17,9 @@ maintainer:     [email protected]
 copyright:      Stef Joosten
 license:        GPL
 license-file:   LICENSE
+build-type:     Custom
 tested-with:
     GHC == 8.10.4
-build-type:     Custom
 extra-source-files:
     LICENSE
     ReleaseNotes.md
@@ -111,15 +109,15 @@ extra-source-files:
     testing/Sentinel/Tests/ShouldFail/Session.adl
     testing/Sentinel/Tests/ShouldFail/singletontest.adl
     testing/Sentinel/Tests/ShouldFail/testinfo.yaml
-    testing/Sentinel/Tests/ShouldSucceed/Bug337_FatalONE.adl
-    testing/Sentinel/Tests/ShouldSucceed/Issue233.adl
-    testing/Sentinel/Tests/ShouldSucceed/Issue280.adl
-    testing/Sentinel/Tests/ShouldSucceed/Issue751.adl
-    testing/Sentinel/Tests/ShouldSucceed/Issue853.adl
+    testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/Bug337_FatalONE.adl
+    testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/Issue233.adl
+    testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/Issue280.adl
+    testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/Issue751.adl
+    testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/Issue853.adl
     testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/testinfo.yaml
+    testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/Ticket580.adl
     testing/Sentinel/Tests/ShouldSucceed/OnlyValidation/ViewAnnotationCheck.adl
     testing/Sentinel/Tests/ShouldSucceed/testinfo.yaml
-    testing/Sentinel/Tests/ShouldSucceed/Ticket580.adl
     testing/StillUnsupported/Bug335_Kl0Kl1.adl
     testing/StillUnsupported/Issue166.adl
     testing/StillUnsupported/Issue166_2.adl

package.yaml

@@ -1,5 +1,5 @@
 name:           ampersand
-version:        4.5.0
+version:        4.6.0
 author:         Stef Joosten
 maintainer:     [email protected]
 synopsis:       Toolsuite for automated design of enterprise information systems.

src/Ampersand/FSpec/ToFSpec/ADL2FSpec.hs

@@ -120,7 +120,7 @@ makeFSpec env context
      apply_viol_text :: Rule -> AAtomPair -> Text
      apply_viol_text rule violPair
       = case rrviol rule of
-          Nothing -> "(" <> aavtxt (apLeft violPair) <> ", " <> aavtxt (apRight violPair) <> ")"
+          Nothing -> "(" <> showA (apLeft violPair) <> ", " <> showA (apRight violPair) <> ")"
           Just pv -> pairsegs
             where
               pairsegs :: Text
@@ -132,7 +132,7 @@ makeFSpec env context
               totext (PairViewExp _ Tgt expr) = lrToText apRight expr
               lrToText :: (AAtomPair -> AAtomValue) -> Expression -> Text
               lrToText g expr
-               = case fmap (aavtxt.apRight) . toList . Set.filter (\ap->g violPair==apLeft ap) . pairsinexpr $ expr
+               = case fmap (showA.apRight) . toList . Set.filter (\ap->g violPair==apLeft ap) . pairsinexpr $ expr
                  of [h]  -> h
                     []   -> ""
                     xs   -> "{" <> T.intercalate ", " xs <> "}"