Merge pull request #922 from AmpersandTarski/development

Release 3.16.0

.gitignore

@@ -37,3 +37,7 @@ miscellaneous/AmpersandBackup.jgfns
 /.ghci
 /ghcid.txt
 
+# Editor related #
+##################
+*.epp
+~$*

.travis.yml

@@ -81,7 +81,7 @@ matrix:
 
   allow_failures:
   # Temporarily, because cabal does not build, but stack does
-  # - name: "linux, cabal"
+  - name: "linux, cabal"
 
   # Nightly builds are allowed to fail
   - name: "linux, stack, latest"

AmpersandData/FormalAmpersand/.ampersand

@@ -0,0 +1 @@
+AST.adl

AmpersandData/FormalAmpersand/AST.adl

@@ -1,4 +1,4 @@
-CONTEXT Ampersand IN ENGLISH
+CONTEXT Ampersand IN ENGLISH
 --! It is allowed to change texts and/or the order of texts IF AND ONLY IF this is also done in the corresponding Haskell files !--
 INCLUDE "Concepts.adl"
 INCLUDE "AST.ifc"

ReleaseNotes.md

@@ -1,5 +1,10 @@
 # Release notes of Ampersand
 
+## v3.16.0 (8 april 2019) (few days before scedule)
+
+* New switch: --daemon. This enables automatic checking of your scripts as you type. Very nice in combination with the vscode extention [Ampersand (ADL) language support](https://marketplace.visualstudio.com/items?itemName=AmpersandTarski.language-ampersand).
+* [Issue #920](https://github.com/AmpersandTarski/Ampersand/issues/920) Warnings are generated for concepts/relations with names that are equal except for the caseing.
+
 ## v3.15.0 (15 march 2019)
 
 * Minor bugfixes and enhanced automatic build/release

ampersand.cabal

@@ -4,7 +4,7 @@ cabal-version: 2.0
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 0b4501250ab7f3452b32168e685f018708cb1cf0a529820a86b90789863e61e3
+-- hash: 5ae770bed7a224d836f792c5636a536e1743698abfa42aae8cbc8960b58521a5
 
 name:           ampersand
 version:        3.15.0
@@ -508,6 +508,14 @@ library
       Ampersand.Basics.BuildInfo_Generated
       Ampersand.Prototype.StaticFiles_Generated
   other-modules:
+      Ampersand.Daemon.Daemon
+      Ampersand.Daemon.Daemon.Daemon
+      Ampersand.Daemon.Daemon.Escape
+      Ampersand.Daemon.Daemon.Parser
+      Ampersand.Daemon.Daemon.Terminal
+      Ampersand.Daemon.Daemon.Types
+      Ampersand.Daemon.Daemon.Util
+      Ampersand.Daemon.Wait
       Ampersand.FSpec.FPA
       Ampersand.Output.FSpec2Excel
       Ampersand.Output.PredLogic
@@ -520,21 +528,25 @@ library
   hs-source-dirs:
       src/
   default-extensions: NoImplicitPrelude
-  ghc-options: -Wall
+  ghc-options: -Wall -Wcompat -Widentities
   build-depends:
       HStringTemplate ==0.8.*
     , MissingH ==1.4.*
     , QuickCheck ==2.11.*
     , SpreadsheetML ==0.1.*
     , aeson ==1.4.*
     , aeson-pretty ==0.8.*
+    , ansi-terminal ==0.8.*
     , base ==4.12.*
     , bytestring ==0.10.*
+    , cmdargs ==0.10.*
     , conduit ==1.3.*
     , containers ==0.6.*
     , data-default ==0.7.*
     , directory ==1.3.*
+    , extra >=1.6.6
     , filepath ==1.4.*
+    , fsnotify ==0.3.*
     , graphviz ==2999.20.*
     , hashable ==1.2.*
     , http-conduit ==2.3.*
@@ -545,8 +557,10 @@ library
     , pandoc-types ==1.17.*
     , parsec ==3.1.*
     , process ==1.6.*
+    , rio ==0.1.*
     , simple-sql-parser ==0.4.4
     , split ==0.2.*
+    , terminal-size ==0.3.*
     , text ==1.2.*
     , time ==1.8.*
     , utf8-string ==1.0.*
@@ -556,6 +570,12 @@ library
     , yaml-config ==0.4.*
     , zip-archive
     , zlib ==0.6.*
+  if os(windows)
+    build-depends:
+        Win32
+  else
+    build-depends:
+        unix
   default-language: Haskell2010
 
 executable ampPreProc
@@ -565,7 +585,7 @@ executable ampPreProc
   hs-source-dirs:
       app/AmpPreProc
   default-extensions: NoImplicitPrelude
-  ghc-options: -Wall -threaded
+  ghc-options: -Wall -Wcompat -Widentities -threaded
   build-depends:
       HStringTemplate ==0.8.*
     , MissingH ==1.4.*
@@ -574,13 +594,17 @@ executable ampPreProc
     , aeson ==1.4.*
     , aeson-pretty ==0.8.*
     , ampersand
+    , ansi-terminal ==0.8.*
     , base ==4.12.*
     , bytestring ==0.10.*
+    , cmdargs ==0.10.*
     , conduit ==1.3.*
     , containers ==0.6.*
     , data-default ==0.7.*
     , directory ==1.3.*
+    , extra >=1.6.6
     , filepath ==1.4.*
+    , fsnotify ==0.3.*
     , graphviz ==2999.20.*
     , hashable ==1.2.*
     , http-conduit ==2.3.*
@@ -591,8 +615,10 @@ executable ampPreProc
     , pandoc-types ==1.17.*
     , parsec ==3.1.*
     , process ==1.6.*
+    , rio ==0.1.*
     , simple-sql-parser ==0.4.4
     , split ==0.2.*
+    , terminal-size ==0.3.*
     , text ==1.2.*
     , time ==1.8.*
     , utf8-string ==1.0.*
@@ -602,6 +628,12 @@ executable ampPreProc
     , yaml-config ==0.4.*
     , zip-archive
     , zlib ==0.6.*
+  if os(windows)
+    build-depends:
+        Win32
+  else
+    build-depends:
+        unix
   if !(flag(buildAll))
     buildable: False
   default-language: Haskell2010
@@ -613,7 +645,7 @@ executable ampersand
   hs-source-dirs:
       app/Ampersand
   default-extensions: NoImplicitPrelude
-  ghc-options: -Wall -threaded
+  ghc-options: -Wall -Wcompat -Widentities -threaded
   build-depends:
       HStringTemplate ==0.8.*
     , MissingH ==1.4.*
@@ -622,13 +654,17 @@ executable ampersand
     , aeson ==1.4.*
     , aeson-pretty ==0.8.*
     , ampersand
+    , ansi-terminal ==0.8.*
     , base ==4.12.*
     , bytestring ==0.10.*
+    , cmdargs ==0.10.*
     , conduit ==1.3.*
     , containers ==0.6.*
     , data-default ==0.7.*
     , directory ==1.3.*
+    , extra >=1.6.6
     , filepath ==1.4.*
+    , fsnotify ==0.3.*
     , graphviz ==2999.20.*
     , hashable ==1.2.*
     , http-conduit ==2.3.*
@@ -639,8 +675,10 @@ executable ampersand
     , pandoc-types ==1.17.*
     , parsec ==3.1.*
     , process ==1.6.*
+    , rio ==0.1.*
     , simple-sql-parser ==0.4.4
     , split ==0.2.*
+    , terminal-size ==0.3.*
     , text ==1.2.*
     , time ==1.8.*
     , utf8-string ==1.0.*
@@ -650,6 +688,12 @@ executable ampersand
     , yaml-config ==0.4.*
     , zip-archive
     , zlib ==0.6.*
+  if os(windows)
+    build-depends:
+        Win32
+  else
+    build-depends:
+        unix
   default-language: Haskell2010
 
 test-suite ampersand-test
@@ -660,7 +704,7 @@ test-suite ampersand-test
   hs-source-dirs:
       app/Test
   default-extensions: NoImplicitPrelude
-  ghc-options: -Wall -threaded
+  ghc-options: -Wall -Wcompat -Widentities -threaded
   build-depends:
       HStringTemplate ==0.8.*
     , MissingH ==1.4.*
@@ -669,13 +713,17 @@ test-suite ampersand-test
     , aeson ==1.4.*
     , aeson-pretty ==0.8.*
     , ampersand
+    , ansi-terminal ==0.8.*
     , base ==4.12.*
     , bytestring ==0.10.*
+    , cmdargs ==0.10.*
     , conduit ==1.3.*
     , containers ==0.6.*
     , data-default ==0.7.*
     , directory ==1.3.*
+    , extra >=1.6.6
     , filepath ==1.4.*
+    , fsnotify ==0.3.*
     , graphviz ==2999.20.*
     , hashable ==1.2.*
     , http-conduit ==2.3.*
@@ -686,8 +734,10 @@ test-suite ampersand-test
     , pandoc-types ==1.17.*
     , parsec ==3.1.*
     , process ==1.6.*
+    , rio ==0.1.*
     , simple-sql-parser ==0.4.4
     , split ==0.2.*
+    , terminal-size ==0.3.*
     , text ==1.2.*
     , time ==1.8.*
     , utf8-string ==1.0.*
@@ -697,6 +747,12 @@ test-suite ampersand-test
     , yaml-config ==0.4.*
     , zip-archive
     , zlib ==0.6.*
+  if os(windows)
+    build-depends:
+        Win32
+  else
+    build-depends:
+        unix
   default-language: Haskell2010
 
 test-suite regression-test
@@ -707,7 +763,7 @@ test-suite regression-test
   hs-source-dirs:
       app/RegressionTest
   default-extensions: NoImplicitPrelude
-  ghc-options: -Wall -threaded
+  ghc-options: -Wall -Wcompat -Widentities -threaded
   build-depends:
       HStringTemplate ==0.8.*
     , MissingH ==1.4.*
@@ -716,13 +772,17 @@ test-suite regression-test
     , aeson ==1.4.*
     , aeson-pretty ==0.8.*
     , ampersand
+    , ansi-terminal ==0.8.*
     , base ==4.12.*
     , bytestring ==0.10.*
+    , cmdargs ==0.10.*
     , conduit ==1.3.*
     , containers ==0.6.*
     , data-default ==0.7.*
     , directory ==1.3.*
+    , extra >=1.6.6
     , filepath ==1.4.*
+    , fsnotify ==0.3.*
     , graphviz ==2999.20.*
     , hashable ==1.2.*
     , http-conduit ==2.3.*
@@ -733,8 +793,10 @@ test-suite regression-test
     , pandoc-types ==1.17.*
     , parsec ==3.1.*
     , process ==1.6.*
+    , rio ==0.1.*
     , simple-sql-parser ==0.4.4
     , split ==0.2.*
+    , terminal-size ==0.3.*
     , text ==1.2.*
     , time ==1.8.*
     , utf8-string ==1.0.*
@@ -744,4 +806,10 @@ test-suite regression-test
     , yaml-config ==0.4.*
     , zip-archive
     , zlib ==0.6.*
+  if os(windows)
+    build-depends:
+        Win32
+  else
+    build-depends:
+        unix
   default-language: Haskell2010