Merge branch 'GrammaticalFramework:master' into master

smucclaw · Oct 4, 2023 · 2acf677 · 2acf677
2 parents d7a8728 + 7d9015e
commit 2acf677
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/build-all-versions.yml b/.github/workflows/build-all-versions.yml
@@ -95,8 +95,7 @@ jobs:
 
     - name: Build
       run: |
-        stack build --system-ghc --stack-yaml stack-ghc${{ matrix.ghc }}.yaml
-        # stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks
+        stack build --test --no-run-tests --system-ghc --stack-yaml stack-ghc${{ matrix.ghc }}.yaml
 
     - name: Test
       run: |

diff --git a/.github/workflows/build-binary-packages.yml b/.github/workflows/build-binary-packages.yml
@@ -14,8 +14,8 @@ jobs:
     strategy:
       matrix:
         os:
-        - ubuntu-18.04
         - ubuntu-20.04
+        - ubuntu-22.04
 
     runs-on: ${{ matrix.os }}
 

diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml
@@ -13,15 +13,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-18.04, macos-10.15]
+        os: [ubuntu-latest, macos-latest]
 
     steps:
     - uses: actions/checkout@v1
 
     - uses: actions/setup-python@v1
       name: Install Python
       with:
-        python-version: '3.7'
+        python-version: '3.x'
 
     - name: Install cibuildwheel
       run: |
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/setup-python@v2
         name: Install Python
         with:
-          python-version: '3.7'
+          python-version: '3.x'
 
       - name: Build sdist
         run: cd src/runtime/python && python setup.py sdist

diff --git a/src/compiler/GF/Compile/GetGrammar.hs b/src/compiler/GF/Compile/GetGrammar.hs
@@ -42,11 +42,12 @@ getSourceModule opts file0 =
      raw <- liftIO $ keepTemp tmp
    --ePutStrLn $ "1 "++file0
      (optCoding,parsed) <- parseSource opts pModDef raw
+     let indentLines = unlines . map ("   "++) . lines
      case parsed of
        Left (Pn l c,msg) -> do file <- liftIO $ writeTemp tmp
                                cwd <- getCurrentDirectory
                                let location = makeRelative cwd file++":"++show l++":"++show c
-                               raise (location++":\n   "++msg)
+                               raise (location++":\n" ++ indentLines msg)
        Right (i,mi0) ->
          do liftIO $ removeTemp tmp
             let mi =mi0 {mflags=mflags mi0 `addOptions` opts, msrc=file0}

diff --git a/testsuite/compiler/update/ArrityCheck.gfs.gold b/testsuite/compiler/update/ArrityCheck.gfs.gold
@@ -2,7 +2,8 @@
 
 testsuite/compiler/update/ArrityCheck.gf:6:1:
    conflicting information in module ArrityCheck
-    fun f : Int -> Int -> Int ;
-    def f 0 = \x -> x ;
-and
-    def f 1 1 = 0 ;
+       fun f : Int -> Int -> Int ;
+       def f 0 = \x -> x ;
+   and
+       def f 1 1 = 0 ;
+