Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/vis12/src/compiler/typechecker/typechecker.sml
ViewVC logotype

Diff of /branches/vis12/src/compiler/typechecker/typechecker.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2169, Sat Feb 23 13:24:04 2013 UTC revision 2170, Sat Feb 23 13:41:17 2013 UTC
# Line 208  Line 208 
208   *)   *)
209          (* try to match candidates while allowing type coercions *)          (* try to match candidates while allowing type coercions *)
210            fun tryMatchCandidates [] = err(cxt, [            fun tryMatchCandidates [] = err(cxt, [
211                    S "unable to resolve overloaded operator \"", A rator, S "\"\n",                    S "unable to resolve overloaded operator ", A rator, S "\n",
212                    S "  argument type is: ", TYS argTys, S "\n"                    S "  argument type is: ", TYS argTys, S "\n"
213                  ])                  ])
214              | tryMatchCandidates (x::xs) = let              | tryMatchCandidates (x::xs) = let
# Line 779  Line 779 
779                           of FunctionScope(ty', f) => (case coerceType(ty', ty, e')                           of FunctionScope(ty', f) => (case coerceType(ty', ty, e')
780                                 of SOME e' => (AST.S_Return e', env)                                 of SOME e' => (AST.S_Return e', env)
781                                  | NONE => err(cxt, [                                  | NONE => err(cxt, [
782                                        S "type of return expression does not match function ",                                        S "type of return expression does not match return type of function ",
783                                        A f, S "'s return type\n",                                        A f, S "\n",
784                                        S "  expected: ", TY ty', S "\n",                                        S "  expected: ", TY ty', S "\n",
785                                        S "  but found: ", TY ty                                        S "  but found: ", TY ty
786                                      ])                                      ])

Legend:
Removed from v.2169  
changed lines
  Added in v.2170

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0