diff options
| author | krangelov <kr.angelov@gmail.com> | 2021-02-26 14:59:18 +0100 |
|---|---|---|
| committer | krangelov <kr.angelov@gmail.com> | 2021-02-26 14:59:18 +0100 |
| commit | ba3e09cc38d0b70a2e3d5bf7e302e5781c501ec3 (patch) | |
| tree | 78c6a3d1a1d5039927cad33371c2a484d52590b6 | |
| parent | 8fbfc0b4a91a4582ebc0491de81fc6822bdca452 (diff) | |
| parent | 173fca7f125e84736e3d1cfe5b1b2e0b8d729141 (diff) | |
Merge branch 'master' of https://github.com/GrammaticalFramework/gf-core
| -rw-r--r-- | .github/workflows/build-all-versions.yml | 4 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/GeneratePMCFG.hs | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/build-all-versions.yml b/.github/workflows/build-all-versions.yml index df71f0ac0..46bd05b23 100644 --- a/.github/workflows/build-all-versions.yml +++ b/.github/workflows/build-all-versions.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v2 if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - uses: actions/setup-haskell@v1.1.1 + - uses: actions/setup-haskell@v1.1.4 id: setup-haskell-cabal name: Setup Haskell with: @@ -73,7 +73,7 @@ jobs: - uses: actions/checkout@v2 if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - uses: actions/setup-haskell@v1.1 + - uses: actions/setup-haskell@v1.1.4 name: Setup Haskell Stack with: # ghc-version: ${{ matrix.ghc }} diff --git a/src/compiler/GF/Compile/GeneratePMCFG.hs b/src/compiler/GF/Compile/GeneratePMCFG.hs index 35c25cc0d..ab6476b31 100644 --- a/src/compiler/GF/Compile/GeneratePMCFG.hs +++ b/src/compiler/GF/Compile/GeneratePMCFG.hs @@ -622,7 +622,9 @@ ppbug msg = error completeMsg where originalMsg = render $ hang "Internal error in GeneratePMCFG:" 4 msg completeMsg = - unlines [originalMsg + case render msg of -- the error message for pattern matching a runtime string + "descend (CStr 0,CNil,CProj (LIdent (Id {rawId2utf8 = \"s\"})) CNil)" + -> unlines [originalMsg -- add more helpful output ,"" ,"1) Check that you are not trying to pattern match a /runtime string/." ," These are illegal:" @@ -633,5 +635,6 @@ ppbug msg = error completeMsg ,"2) Not about pattern matching? Submit a bug report and we update the error message." ," https://github.com/GrammaticalFramework/gf-core/issues" ] + _ -> originalMsg -- any other message: just print it as is ppU = ppTerm Unqualified |