Skip to content

Commit

Permalink
Error message tinker
Browse files Browse the repository at this point in the history
  • Loading branch information
Edwin Brady committed Jan 24, 2012
1 parent ae4be75 commit 8baaa42
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,7 @@
New in 0.9.1:

* dsl notation

0.1.x to 0.9.0: 0.1.x to 0.9.0:


Complete rewrite. User visible changes: Complete rewrite. User visible changes:
Expand Down
4 changes: 2 additions & 2 deletions idris.cabal
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: idris Name: idris
Version: 0.9.0 Version: 0.9.1
License: BSD3 License: BSD3
License-file: LICENSE License-file: LICENSE
Author: Edwin Brady Author: Edwin Brady
Expand All @@ -8,7 +8,7 @@ Homepage: http://www.idris-lang.org/


Stability: Beta Stability: Beta
Category: Compilers/Interpreters, Dependent Types Category: Compilers/Interpreters, Dependent Types
Synopsis: Dependently Typed Functional Programming Language Synopsis: Functional Programming Language with Dependent Types
Description: Idris is a general purpose language with full dependent types. Description: Idris is a general purpose language with full dependent types.
It is compiled, with eager evaluation. It is compiled, with eager evaluation.
Dependent types allow types to be predicated on values, Dependent types allow types to be predicated on values,
Expand Down
9 changes: 6 additions & 3 deletions src/Idris/Delaborate.hs
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -64,9 +64,12 @@ delab' ist tm fullname = de [] tm


pshow :: IState -> Err -> String pshow :: IState -> Err -> String
pshow i (Msg s) = s pshow i (Msg s) = s
pshow i (CantUnify x y e s) = "Can't unify " ++ show (delab i x) pshow i (CantUnify x y e s)
++ " with " ++ show (delab i y) = "Can't unify " ++ show (delab i x)
-- ++ "\n\t(" ++ pshow i e ++ ")" ++ " with " ++ show (delab i y) ++
case e of
Msg "" -> ""
_ -> "\n\nSpecifically:\n\t " ++ pshow i e
pshow i (NotInjective p x y) = "Can't verify injectivity of " ++ show (delab i p) ++ pshow i (NotInjective p x y) = "Can't verify injectivity of " ++ show (delab i p) ++
" when unifying " ++ show (delab i x) ++ " and " ++ " when unifying " ++ show (delab i x) ++ " and " ++
show (delab i y) show (delab i y)
Expand Down
2 changes: 1 addition & 1 deletion tutorial/examples/Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
check: .PHONY check: .PHONY
rm *.ibc rm -f *.ibc
for x in *.idr ; do \ for x in *.idr ; do \
echo "Checking $$x"; \ echo "Checking $$x"; \
idris --check $$x; \ idris --check $$x; \
Expand Down

0 comments on commit 8baaa42

Please sign in to comment.