diff options
| author | hallgren <hallgren@chalmers.se> | 2013-12-06 15:43:34 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2013-12-06 15:43:34 +0000 |
| commit | a98f4aa4be7b72a310a8b5826e3cc82c7edb8f40 (patch) | |
| tree | a46830579656e347dc6dda7bdd0970e643f6387f /src/compiler/GF/Grammar | |
| parent | e2fe50e5859cb6ef359c1a08e3bceb3080cd2159 (diff) | |
Show relative file paths in error messages
This is to avoid one trivial reason for failures in the test suite.
Diffstat (limited to 'src/compiler/GF/Grammar')
| -rw-r--r-- | src/compiler/GF/Grammar/Parser.y | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/compiler/GF/Grammar/Parser.y b/src/compiler/GF/Grammar/Parser.y index 028da18c6..6f7f5854e 100644 --- a/src/compiler/GF/Grammar/Parser.y +++ b/src/compiler/GF/Grammar/Parser.y @@ -116,9 +116,7 @@ ModDef (extends,with,content) = $4 (opens,jments,opts) = case content of { Just c -> c; Nothing -> ([],[],noOptions) } jments <- mapM (checkInfoType mtype) jments - defs <- case buildAnyTree id jments of - Ok x -> return x - Bad msg -> fail (optDecode opts msg) + defs <- buildAnyTree id jments return (id, ModInfo mtype mstat opts extends with opens [] "" Nothing defs) } ModHeader :: { SourceModule } @@ -614,12 +612,6 @@ Posn happyError :: P a happyError = fail "syntax error" --- Quick fix to render error messages from UTF-8-encoded source files correctly. -optDecode opts = - {-if map toLower (getEncoding opts) `elem` ["utf8","utf-8"] - then decodeString - else-} id - mkListId,mkConsId,mkBaseId :: Ident -> Ident mkListId = prefixIdent "List" mkConsId = prefixIdent "Cons" |