X-Git-Url: http://git.hcoop.net/bpt/mlt.git/blobdiff_plain/16abb0f9dc821395f7644328a98d75a4aa97e83e..dca24e575234607464f4f4a3ed1d8c55bcb27730:/src/mlt.sml diff --git a/src/mlt.sml b/src/mlt.sml index b853295..099cae3 100644 --- a/src/mlt.sml +++ b/src/mlt.sml @@ -34,8 +34,8 @@ struct val errorTy = Types.WILDCARDty - val ppstream = PrettyPrint.mk_ppstream {consumer = TextIO.print, flush = fn () => TextIO.flushOut TextIO.stdOut, - linewidth = 80} + (*val ppstream = PrettyPrint.mk_ppstream {consumer = TextIO.print, flush = fn () => TextIO.flushOut TextIO.stdOut, + linewidth = 80}*) datatype unify = ExpUn of exp @@ -83,6 +83,8 @@ struct (case StaticEnv.look (env, Symbol.varSymbol v) of Bindings.CONbind (Types.DATACON {typ, ...}) => #1 (TypesUtil.instantiatePoly typ) | _ => raise Fail "Unexpected binding in lookVal") + + fun lookCon (env, v, pos) = (lookCon' (env, v)) handle ModuleUtil.Unbound _ => (error (SOME pos, "Unbound constructor " ^ v); errorTy) @@ -129,21 +131,21 @@ struct Unify.unifyTy (t1, t2) (*end*) handle Unify.Unify msg => - (PrettyPrint.begin_block ppstream PrettyPrint.CONSISTENT 0; - PrettyPrint.add_string ppstream "Error unifying"; - PrettyPrint.add_break ppstream (1, 0); - PrettyPrint.begin_block ppstream PrettyPrint.CONSISTENT 5; + ((*PrettyPrint.openBox ppstream (PrettyPrint.Abs 0); + PrettyPrint.string ppstream "Error unifying"; + PrettyPrint.newline ppstream; + PrettyPrint.openBox ppstream (PrettyPrint.Abs 5); PPType.ppType env ppstream t1; - PrettyPrint.end_block ppstream; - PrettyPrint.add_break ppstream (1, 0); - PrettyPrint.add_string ppstream "and"; - PrettyPrint.add_break ppstream (1, 0); - PrettyPrint.begin_block ppstream PrettyPrint.CONSISTENT 5; + PrettyPrint.closeBox ppstream; + PrettyPrint.newline ppstream; + PrettyPrint.string ppstream "and"; + PrettyPrint.newline ppstream; + PrettyPrint.openBox ppstream (PrettyPrint.Abs 5); PPType.ppType env ppstream t2; - PrettyPrint.end_block ppstream; - PrettyPrint.end_block ppstream; - PrettyPrint.add_break ppstream (1, 0); - PrettyPrint.flush_ppstream ppstream; + PrettyPrint.closeBox ppstream; + PrettyPrint.closeBox ppstream; + PrettyPrint.newline ppstream; + PrettyPrint.flushStream ppstream;*) error (SOME pos, Unify.failMessage msg ^ " for " ^ (case e of ExpUn e => Tree.expString e | PatUn p => "")))