# HG changeset patch # User paulson # Date 824486164 -3600 # Node ID 7f693bb0d7dd50c3d33f0b133f8b48b20c3a15b3 # Parent 20d9811f1fd1c10d73c99352f285162ee1a8ea9d Elimination of fully-functorial style. Type tactic changed to a type abbrevation (from a datatype). Constructor tactic and function apply deleted. diff -r 20d9811f1fd1 -r 7f693bb0d7dd src/Pure/Syntax/printer.ML --- a/src/Pure/Syntax/printer.ML Fri Feb 16 14:38:49 1996 +0100 +++ b/src/Pure/Syntax/printer.ML Fri Feb 16 16:56:04 1996 +0100 @@ -6,41 +6,31 @@ *) signature PRINTER0 = -sig + sig val show_brackets: bool ref val show_sorts: bool ref val show_types: bool ref val show_no_free_types: bool ref -end; + end; signature PRINTER = -sig + sig include PRINTER0 - structure Symtab: SYMTAB - structure SynExt: SYN_EXT - local open SynExt SynExt.Ast in - val term_to_ast: (string -> (term list -> term) option) -> term -> ast - val typ_to_ast: (string -> (term list -> term) option) -> typ -> ast - type prtab - val empty_prtab: prtab - val extend_prtab: prtab -> xprod list -> prtab - val merge_prtabs: prtab -> prtab -> prtab - val pretty_term_ast: bool -> prtab -> (string -> (ast list -> ast) option) - -> ast -> Pretty.T - val pretty_typ_ast: bool -> prtab -> (string -> (ast list -> ast) option) - -> ast -> Pretty.T - end -end; + val term_to_ast: (string -> (term list -> term) option) -> term -> Ast.ast + val typ_to_ast: (string -> (term list -> term) option) -> typ -> Ast.ast + type prtab + val empty_prtab: prtab + val extend_prtab: prtab -> SynExt.xprod list -> prtab + val merge_prtabs: prtab -> prtab -> prtab + val pretty_term_ast: bool -> prtab -> (string -> (Ast.ast list -> Ast.ast) option) + -> Ast.ast -> Pretty.T + val pretty_typ_ast: bool -> prtab -> (string -> (Ast.ast list -> Ast.ast) option) + -> Ast.ast -> Pretty.T + end; -functor PrinterFun(structure Symtab: SYMTAB and TypeExt: TYPE_EXT - and SynTrans: SYN_TRANS sharing TypeExt.SynExt = SynTrans.Parser.SynExt) - : PRINTER = +structure Printer : PRINTER = struct - -structure Symtab = Symtab; -structure SynExt = TypeExt.SynExt; -open SynTrans.Parser.Lexicon SynExt.Ast SynExt TypeExt SynTrans; - +open Lexicon Ast SynExt TypeExt SynTrans; (** options for printing **)