From: BT Templeton Date: Thu, 10 Feb 2011 15:26:24 +0000 (-0500) Subject: updated for SML/NJ 110.72 X-Git-Url: http://git.hcoop.net/bpt/mlt.git/commitdiff_plain/8a545f7dadb9b5c88c85acb50d9ebf0d23ba5312 updated for SML/NJ 110.72 * src/mlt.sml: Pass [] as the last argument to ModuleUtil.getStr. Use PrettyPrintNew instead of PrettyPrint. * src/sources.cm: Import the compiler library. --- diff --git a/src/mlt.sml b/src/mlt.sml index 099cae3..2600fa4 100644 --- a/src/mlt.sml +++ b/src/mlt.sml @@ -100,7 +100,7 @@ struct errorStrct) fun getStr (STRCT {elements, eenv, ...}, v, pos) = - (case ModuleUtil.getStr (elements, eenv, Symbol.strSymbol v, Access.nullAcc, II.Null) of + (case ModuleUtil.getStr (elements, eenv, Symbol.strSymbol v, Access.nullAcc, []) of (Modules.STR {rlzn = {entities, ...}, sign = Modules.SIG {elements, ...}, ...}, _) => STRCT {elements = elements, eenv = entities} | _ => raise Fail "Unexpected spec in getStr") @@ -184,7 +184,7 @@ struct let val sym = Symbol.strSymbol v in - (case ModuleUtil.getStr (elements, eenv, sym, Access.nullAcc, II.Null) of + (case ModuleUtil.getStr (elements, eenv, sym, Access.nullAcc, []) of (str as Modules.STR {rlzn = {entities, ...}, sign = Modules.SIG {elements, ...}, ...}, _) => (elements, entities, str) | _ => raise Fail "Unexpected spec in resolveStructure") @@ -210,7 +210,7 @@ struct end fun tyToString (STATE {env, ...}) ty = - PrettyPrint.pp_to_string 65535 (PPType.ppType env) ty + PrettyPrintNew.pp_to_string 65535 (PPType.ppType env) ty fun printFn (state as STATE {config, env, ...}) ty = let diff --git a/src/sources.cm b/src/sources.cm index 9f6ab0e..751467d 100644 --- a/src/sources.cm +++ b/src/sources.cm @@ -27,6 +27,7 @@ is $/ml-yacc-lib.cm $smlnj/compiler/current.cm + $smlnj/viscomp/basics.cm ../settings.sml