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

SCM Repository

[diderot] Diff of /branches/vis15/src/compiler/simplify/simplify.sml
ViewVC logotype

Diff of /branches/vis15/src/compiler/simplify/simplify.sml

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

revision 4426, Wed Aug 17 20:00:23 2016 UTC revision 4428, Wed Aug 17 23:24:30 2016 UTC
# Line 40  Line 40 
40      fun error ({errStrm, gEnv}, msg) = Error.error (errStrm, msg)      fun error ({errStrm, gEnv}, msg) = Error.error (errStrm, msg)
41      fun warning ({errStrm, gEnv}, msg) = Error.warning (errStrm, msg)      fun warning ({errStrm, gEnv}, msg) = Error.warning (errStrm, msg)
42    
43        fun imageTyToString (dim, shp) = String.concat[
44                "image(", Int.toString dim, ")[", String.concatWithMap "," Int.toString shp, "]"
45              ]
46    
47    (* convert a Types.ty to a SimpleTypes.ty *)    (* convert a Types.ty to a SimpleTypes.ty *)
48      fun cvtTy ty = (case ty      fun cvtTy ty = (case ty
49             of Ty.T_Var(Ty.TV{bind, ...}) => (case !bind             of Ty.T_Var(Ty.TV{bind, ...}) => (case !bind
# Line 398  Line 402 
402                            case NrrdInfo.getInfo (#errStrm cxt, nrrd)                            case NrrdInfo.getInfo (#errStrm cxt, nrrd)
403                             of SOME nrrdInfo => (case II.fromNrrd(nrrdInfo, dim, shape)                             of SOME nrrdInfo => (case II.fromNrrd(nrrdInfo, dim, shape)
404                                   of NONE => (                                   of NONE => (
405    (* FIXME: produce more informative error message (use imageTyToString) *)
406                                        error (cxt, [                                        error (cxt, [
407                                            "nrrd file \"", nrrd, "\" does not have expected type"                                            "nrrd file \"", nrrd, "\" does not have expected type"
408                                          ]);                                          ]);
# Line 585  Line 590 
590                                case NrrdInfo.getInfo (#errStrm cxt, nrrd)                                case NrrdInfo.getInfo (#errStrm cxt, nrrd)
591                                 of SOME nrrdInfo => (case II.fromNrrd(nrrdInfo, dim, shape)                                 of SOME nrrdInfo => (case II.fromNrrd(nrrdInfo, dim, shape)
592                                       of NONE => (                                       of NONE => (
593    (* FIXME: produce more informative error message *)
594                                            error (cxt, [                                            error (cxt, [
595                                                "proxy input file \"", nrrd,                                                "proxy input file \"", nrrd,
596                                                "\" does not have expected type"                                                "\" does not have expected type"

Legend:
Removed from v.4426  
changed lines
  Added in v.4428

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