Skip to content

Improve error messages for str pattern matching #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Improve error messages for str pattern matching #142

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e8e9b2
Show location on "variable #n is out of scope" errors
anka-213 May 31, 2022
29f3b2a
Add more detailed stack trace on internal errs
anka-213 May 31, 2022
03970f8
Make the "Pattern match string" error cover more cases
anka-213 May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/compiler/GF/Compile/Compute/Concrete.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import Data.List (findIndex,intersect,nub,elemIndex,(\\)) --,isInfixOf
import GF.Text.Pretty
import qualified Data.Map as Map
import Debug.Trace(trace)
import GHC.Stack (HasCallStack)

-- * Main entry points

Expand Down Expand Up @@ -497,10 +498,10 @@ vtrace loc arg res = trace (render (hang (pv arg) 4 ("->"<+>pv res))) res
-- Left i -> "variable #" <> pp i <+> "is out of scope"

-- | Convert a value back to a term
value2term :: GLocation -> [Ident] -> Value -> Term
value2term :: HasCallStack => GLocation -> [Ident] -> Value -> Term
value2term = value2term' False

value2term' :: Bool -> p -> [Ident] -> Value -> Term
value2term' :: HasCallStack => Bool -> GLocation -> [Ident] -> Value -> Term
value2term' stop loc xs v0 =
case v0 of
VApp pre vs -> applyMany (Q (cPredef,predefName pre)) vs
Expand Down Expand Up @@ -536,9 +537,10 @@ value2term' stop loc xs v0 =
v2txs = value2term' stop loc
v2t' x f = v2txs (x:xs) (bind f (gen xs))

var :: HasCallStack => Int -> Term
var j
| j<length xs = Vr (reverse xs !! j)
| otherwise = error ("variable #"++show j++" is out of scope")
| otherwise = bugloc loc ("variable #"++show j++" is out of scope")


pushs xs e = foldr push e xs
Expand Down Expand Up @@ -584,7 +586,11 @@ mf <# mx = ap mf mx

both f (x,y) = (,) # f x <# f y

bugloc :: (HasCallStack, Pretty a, Pretty b) => L a -> b -> c
bugloc loc s = ppbug $ ppL loc s

bug :: (HasCallStack, Pretty a) => a -> b
bug msg = ppbug msg

ppbug :: (HasCallStack, Pretty a) => a -> b
ppbug doc = error $ render $ hang "Internal error in Compute.Concrete:" 4 doc