src/Pure/ML/ml_compiler_polyml.ML
author wenzelm
Thu, 16 Jul 2015 16:30:43 +0200
changeset 60732 18299765542e
parent 60731 4ac4b314d93c
child 60744 4eba53a0ac3d
permissions -rw-r--r--
clarified boundary cases of completion;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
47980
c81801f881b3 simplified Poly/ML setup -- 5.3.0 is now the common base-line;
wenzelm
parents: 45666
diff changeset
     1
(*  Title:      Pure/ML/ml_compiler_polyml.ML
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
     3
56303
4cc3f4db3447 clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents: 56281
diff changeset
     4
Runtime compilation and evaluation -- Poly/ML version.
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
     5
*)
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
     6
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
     7
structure ML_Compiler: ML_COMPILER =
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
     8
struct
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
     9
56281
03c3d1a7c3b8 proper configuration option "ML_print_depth";
wenzelm
parents: 56275
diff changeset
    10
open ML_Compiler;
03c3d1a7c3b8 proper configuration option "ML_print_depth";
wenzelm
parents: 56275
diff changeset
    11
03c3d1a7c3b8 proper configuration option "ML_print_depth";
wenzelm
parents: 56275
diff changeset
    12
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    13
(* parse trees *)
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    14
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    15
fun report_parse_tree redirect depth space parse_tree =
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    16
  let
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    17
    val is_visible =
38720
7f8bc335e203 ML_Context.eval: produce antiquotation environment preferably in invisible context, to avoid displaced report messages from ML_Compiler;
wenzelm
parents: 38228
diff changeset
    18
      (case Context.thread_data () of
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    19
        SOME context => Context_Position.is_visible_generic context
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    20
      | NONE => true);
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    21
    fun is_reported pos = is_visible andalso Position.is_reported pos;
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    22
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    23
    fun reported_types loc types =
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    24
      let val pos = Exn_Properties.position_of loc in
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    25
        is_reported pos ?
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    26
          let
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    27
            val xml =
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    28
              PolyML.NameSpace.displayTypeExpression (types, depth, space)
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    29
              |> pretty_ml |> Pretty.from_ML |> Pretty.string_of
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    30
              |> Output.output |> YXML.parse_body;
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    31
          in cons (pos, fn () => Markup.ML_typing, fn () => YXML.string_of_body xml) end
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    32
      end;
38720
7f8bc335e203 ML_Context.eval: produce antiquotation environment preferably in invisible context, to avoid displaced report messages from ML_Compiler;
wenzelm
parents: 38228
diff changeset
    33
44737
03a5ba7213cf bulk reports for improved message throughput;
wenzelm
parents: 43710
diff changeset
    34
    fun reported_entity kind loc decl =
58991
92b6f4e68c5a more careful ML source positions, for improved PIDE markup;
wenzelm
parents: 56618
diff changeset
    35
      let
92b6f4e68c5a more careful ML source positions, for improved PIDE markup;
wenzelm
parents: 56618
diff changeset
    36
        val pos = Exn_Properties.position_of loc;
92b6f4e68c5a more careful ML source positions, for improved PIDE markup;
wenzelm
parents: 56618
diff changeset
    37
        val def_pos = Exn_Properties.position_of decl;
92b6f4e68c5a more careful ML source positions, for improved PIDE markup;
wenzelm
parents: 56618
diff changeset
    38
      in
92b6f4e68c5a more careful ML source positions, for improved PIDE markup;
wenzelm
parents: 56618
diff changeset
    39
        (is_reported pos andalso pos <> def_pos) ?
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    40
          let
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    41
            fun markup () =
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    42
              (Markup.entityN, (Markup.kindN, kind) :: Position.def_properties_of def_pos);
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    43
          in cons (pos, markup, fn () => "") end
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    44
      end;
41503
a7462e442e35 refined report_parse_tree: reverse reports happen to produce proper type information for inlined @{term}, @{typ} etc.;
wenzelm
parents: 41501
diff changeset
    45
60731
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    46
    fun reported_completions loc names =
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    47
      let val pos = Exn_Properties.position_of loc in
60732
18299765542e clarified boundary cases of completion;
wenzelm
parents: 60731
diff changeset
    48
        if is_reported pos andalso not (null names) then
60731
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    49
          let
60732
18299765542e clarified boundary cases of completion;
wenzelm
parents: 60731
diff changeset
    50
            val completion = Completion.names pos (map (fn a => (a, ("ML", a))) names);
60731
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    51
            val xml = Completion.encode completion;
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    52
          in cons (pos, fn () => Markup.completion, fn () => YXML.string_of_body xml) end
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    53
        else I
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    54
      end;
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    55
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    56
    fun reported loc (PolyML.PTtype types) = reported_types loc types
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    57
      | reported loc (PolyML.PTdeclaredAt decl) = reported_entity Markup.ML_defN loc decl
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    58
      | reported loc (PolyML.PTopenedAt decl) = reported_entity Markup.ML_openN loc decl
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    59
      | reported loc (PolyML.PTstructureAt decl) = reported_entity Markup.ML_structureN loc decl
44737
03a5ba7213cf bulk reports for improved message throughput;
wenzelm
parents: 43710
diff changeset
    60
      | reported _ (PolyML.PTnextSibling tree) = reported_tree (tree ())
03a5ba7213cf bulk reports for improved message throughput;
wenzelm
parents: 43710
diff changeset
    61
      | reported _ (PolyML.PTfirstChild tree) = reported_tree (tree ())
60731
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    62
      | reported loc pt =
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    63
          (case ML_Parse_Tree.completions pt of
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    64
            SOME names => reported_completions loc names
4ac4b314d93c additional ML parse tree components for Poly/ML 5.5.3, or later;
wenzelm
parents: 60730
diff changeset
    65
          | NONE => I)
44737
03a5ba7213cf bulk reports for improved message throughput;
wenzelm
parents: 43710
diff changeset
    66
    and reported_tree (loc, props) = fold (reported loc) props;
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    67
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    68
    val persistent_reports = reported_tree parse_tree [];
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    69
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    70
    fun output () =
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    71
      persistent_reports
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    72
      |> map (fn (pos, markup, text) => Position.reported_text pos (markup ()) (text ()))
56333
38f1422ef473 support bulk messages consisting of small string segments, which are more healthy to the Poly/ML RTS and might prevent spurious GC crashes such as MTGCProcessMarkPointers::ScanAddressesInObject;
wenzelm
parents: 56305
diff changeset
    73
      |> Output.report;
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    74
  in
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    75
    if not (null persistent_reports) andalso redirect andalso Multithreading.enabled ()
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    76
    then
56305
wenzelm
parents: 56304
diff changeset
    77
      Execution.print
60610
f52b4b0c10c4 improved scheduling for urgent tasks, using farm of replacement threads (may lead to factor 2 overloading, but CPUs are usually hyperthreaded);
wenzelm
parents: 59110
diff changeset
    78
        {name = "ML_Compiler.report", pos = Position.thread_data (), pri = Task_Queue.urgent_pri}
f52b4b0c10c4 improved scheduling for urgent tasks, using farm of replacement threads (may lead to factor 2 overloading, but CPUs are usually hyperthreaded);
wenzelm
parents: 59110
diff changeset
    79
        output
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    80
    else output ()
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    81
  end;
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    82
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    83
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    84
(* eval ML source tokens *)
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    85
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
    86
fun eval (flags: flags) pos toks =
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    87
  let
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    88
    val _ = Secure.secure_mltext ();
56618
874bdedb2313 added command 'SML_export' and 'SML_import' for exchange of toplevel bindings;
wenzelm
parents: 56333
diff changeset
    89
    val space = ML_Env.name_space {SML = #SML flags, exchange = #exchange flags}
56265
785569927666 discontinued Toplevel.debug in favour of system option "exception_trace";
wenzelm
parents: 55837
diff changeset
    90
    val opt_context = Context.thread_data ();
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    91
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    92
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    93
    (* input *)
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
    94
50911
ee7fe4230642 more explicit treatment of (optional) exception properties, notably for "serial" -- avoid conflict with startPosition = offset;
wenzelm
parents: 50910
diff changeset
    95
    val location_props = op ^ (YXML.output_markup (":", #props (Position.dest pos)));
31437
70309dc3deac removed unused location_of;
wenzelm
parents: 31434
diff changeset
    96
59110
8a78c7cb5b14 some special cases for official SML, to treat Isabelle symbols like raw characters;
wenzelm
parents: 58991
diff changeset
    97
    val input_explode =
8a78c7cb5b14 some special cases for official SML, to treat Isabelle symbols like raw characters;
wenzelm
parents: 58991
diff changeset
    98
      if #SML flags then String.explode
8a78c7cb5b14 some special cases for official SML, to treat Isabelle symbols like raw characters;
wenzelm
parents: 58991
diff changeset
    99
      else maps (String.explode o Symbol.esc) o Symbol.explode;
8a78c7cb5b14 some special cases for official SML, to treat Isabelle symbols like raw characters;
wenzelm
parents: 58991
diff changeset
   100
41501
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   101
    val input_buffer =
59110
8a78c7cb5b14 some special cases for official SML, to treat Isabelle symbols like raw characters;
wenzelm
parents: 58991
diff changeset
   102
      Unsynchronized.ref (toks |> map (`(input_explode o ML_Lex.check_content_of)));
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   103
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   104
    fun get () =
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   105
      (case ! input_buffer of
41501
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   106
        (c :: cs, tok) :: rest => (input_buffer := (cs, tok) :: rest; SOME c)
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   107
      | ([], _) :: rest => (input_buffer := rest; SOME #" ")
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   108
      | [] => NONE);
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   109
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   110
    fun get_pos () =
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   111
      (case ! input_buffer of
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   112
        (_ :: _, tok) :: _ => ML_Lex.pos_of tok
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   113
      | ([], tok) :: _ => ML_Lex.end_pos_of tok
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   114
      | [] => Position.none);
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   115
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   116
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   117
    (* output channels *)
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   118
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   119
    val writeln_buffer = Unsynchronized.ref Buffer.empty;
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   120
    fun write s = Unsynchronized.change writeln_buffer (Buffer.add s);
54389
a4051679a7bf tuned message;
wenzelm
parents: 54387
diff changeset
   121
    fun output_writeln () = writeln (trim_line (Buffer.content (! writeln_buffer)));
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   122
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   123
    val warnings = Unsynchronized.ref ([]: string list);
39231
25c345302a17 avoid mixing of static and runtime errors in compiler output, to accomodate Proof General;
wenzelm
parents: 39230
diff changeset
   124
    fun warn msg = Unsynchronized.change warnings (cons msg);
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   125
    fun output_warnings () = List.app warning (rev (! warnings));
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   126
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   127
    val error_buffer = Unsynchronized.ref Buffer.empty;
39231
25c345302a17 avoid mixing of static and runtime errors in compiler output, to accomodate Proof General;
wenzelm
parents: 39230
diff changeset
   128
    fun err msg = Unsynchronized.change error_buffer (Buffer.add msg #> Buffer.add "\n");
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   129
    fun flush_error () = writeln (Buffer.content (! error_buffer));
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   130
    fun raise_error msg = error (Buffer.content (Buffer.add msg (! error_buffer)));
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   131
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   132
    fun message {message = msg, hard, location = loc, context = _} =
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   133
      let
56303
4cc3f4db3447 clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents: 56281
diff changeset
   134
        val pos = Exn_Properties.position_of loc;
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   135
        val txt =
49828
5631ee099293 more basic ML compiler messages -- avoid conflict of 638cefe3ee99 and cb7264721c91 concerning Protocol.message_positions;
wenzelm
parents: 48992
diff changeset
   136
          (if hard then "ML error" else "ML warning") ^ Position.here pos ^ ":\n" ^
5631ee099293 more basic ML compiler messages -- avoid conflict of 638cefe3ee99 and cb7264721c91 concerning Protocol.message_positions;
wenzelm
parents: 48992
diff changeset
   137
          Pretty.string_of (Pretty.from_ML (pretty_ml msg));
39231
25c345302a17 avoid mixing of static and runtime errors in compiler output, to accomodate Proof General;
wenzelm
parents: 39230
diff changeset
   138
      in if hard then err txt else warn txt end;
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   139
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   140
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   141
    (* results *)
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   142
56303
4cc3f4db3447 clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents: 56281
diff changeset
   143
    val depth = ML_Options.get_print_depth ();
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   144
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   145
    fun apply_result {fixes, types, signatures, structures, functors, values} =
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   146
      let
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   147
        fun display disp x =
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   148
          if depth > 0 then
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   149
            (disp x |> pretty_ml |> Pretty.from_ML |> Pretty.string_of |> write; write "\n")
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   150
          else ();
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   151
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   152
        fun apply_fix (a, b) =
40799
d44c87988a24 ML results: enter before printing (cf. Poly/ML SVN 1218);
wenzelm
parents: 39507
diff changeset
   153
          (#enterFix space (a, b); display PolyML.NameSpace.displayFix (a, b));
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   154
        fun apply_type (a, b) =
40799
d44c87988a24 ML results: enter before printing (cf. Poly/ML SVN 1218);
wenzelm
parents: 39507
diff changeset
   155
          (#enterType space (a, b); display PolyML.NameSpace.displayType (b, depth, space));
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   156
        fun apply_sig (a, b) =
40799
d44c87988a24 ML results: enter before printing (cf. Poly/ML SVN 1218);
wenzelm
parents: 39507
diff changeset
   157
          (#enterSig space (a, b); display PolyML.NameSpace.displaySig (b, depth, space));
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   158
        fun apply_struct (a, b) =
40799
d44c87988a24 ML results: enter before printing (cf. Poly/ML SVN 1218);
wenzelm
parents: 39507
diff changeset
   159
          (#enterStruct space (a, b); display PolyML.NameSpace.displayStruct (b, depth, space));
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   160
        fun apply_funct (a, b) =
40799
d44c87988a24 ML results: enter before printing (cf. Poly/ML SVN 1218);
wenzelm
parents: 39507
diff changeset
   161
          (#enterFunct space (a, b); display PolyML.NameSpace.displayFunct (b, depth, space));
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   162
        fun apply_val (a, b) =
40799
d44c87988a24 ML results: enter before printing (cf. Poly/ML SVN 1218);
wenzelm
parents: 39507
diff changeset
   163
          (#enterVal space (a, b); display PolyML.NameSpace.displayVal (b, depth, space));
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   164
      in
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   165
        List.app apply_fix fixes;
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   166
        List.app apply_type types;
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   167
        List.app apply_sig signatures;
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   168
        List.app apply_struct structures;
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   169
        List.app apply_funct functors;
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   170
        List.app apply_val values
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   171
      end;
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   172
39231
25c345302a17 avoid mixing of static and runtime errors in compiler output, to accomodate Proof General;
wenzelm
parents: 39230
diff changeset
   173
    exception STATIC_ERRORS of unit;
39230
184507f6e8d0 ML_Compiler.eval: discontinued extra "Static Errors" of raw Poly/ML;
wenzelm
parents: 39228
diff changeset
   174
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   175
    fun result_fun (phase1, phase2) () =
31477
ae1a00e1a2f6 added exn_message (formerly in toplevel.ML);
wenzelm
parents: 31475
diff changeset
   176
     ((case phase1 of
ae1a00e1a2f6 added exn_message (formerly in toplevel.ML);
wenzelm
parents: 31475
diff changeset
   177
        NONE => ()
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
   178
      | SOME parse_tree => report_parse_tree (#redirect flags) depth space parse_tree);
31477
ae1a00e1a2f6 added exn_message (formerly in toplevel.ML);
wenzelm
parents: 31475
diff changeset
   179
      (case phase2 of
39231
25c345302a17 avoid mixing of static and runtime errors in compiler output, to accomodate Proof General;
wenzelm
parents: 39230
diff changeset
   180
        NONE => raise STATIC_ERRORS ()
31477
ae1a00e1a2f6 added exn_message (formerly in toplevel.ML);
wenzelm
parents: 31475
diff changeset
   181
      | SOME code =>
33603
3713a5208671 generalized Runtime.toplevel_error wrt. output function;
wenzelm
parents: 33538
diff changeset
   182
          apply_result
3713a5208671 generalized Runtime.toplevel_error wrt. output function;
wenzelm
parents: 33538
diff changeset
   183
            ((code
56303
4cc3f4db3447 clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents: 56281
diff changeset
   184
              |> Runtime.debugging opt_context
4cc3f4db3447 clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents: 56281
diff changeset
   185
              |> Runtime.toplevel_error (err o Runtime.exn_message)) ())));
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   186
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   187
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   188
    (* compiler invocation *)
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   189
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   190
    val parameters =
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   191
     [PolyML.Compiler.CPOutStream write,
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   192
      PolyML.Compiler.CPNameSpace space,
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   193
      PolyML.Compiler.CPErrorMessageProc message,
41501
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   194
      PolyML.Compiler.CPLineNo (the_default 0 o Position.line_of o get_pos),
b5ad6b0d6d7c ML compiler: more careful treatment of input tokens -- trailing space ensures proper separation and end position (cf. 82c1e348bc18, 08240feb69c7);
wenzelm
parents: 41484
diff changeset
   195
      PolyML.Compiler.CPLineOffset (the_default 0 o Position.offset_of o get_pos),
31437
70309dc3deac removed unused location_of;
wenzelm
parents: 31434
diff changeset
   196
      PolyML.Compiler.CPFileName location_props,
56303
4cc3f4db3447 clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents: 56281
diff changeset
   197
      PolyML.Compiler.CPPrintDepth ML_Options.get_print_depth,
31475
85e864045497 report_parse_tree: ML_open, ML_struct;
wenzelm
parents: 31437
diff changeset
   198
      PolyML.Compiler.CPCompilerResultFun result_fun,
60730
02c2860fcf30 added option ML_debugger;
wenzelm
parents: 60610
diff changeset
   199
      PolyML.Compiler.CPPrintInAlphabeticalOrder false] @
02c2860fcf30 added option ML_debugger;
wenzelm
parents: 60610
diff changeset
   200
     ml_debugger_parameters (ML_Options.debugger_enabled opt_context);
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   201
    val _ =
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   202
      (while not (List.null (! input_buffer)) do
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   203
        PolyML.compiler (get, parameters) ())
39232
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   204
      handle exn =>
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   205
        if Exn.is_interrupt exn then reraise exn
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   206
        else
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   207
          let
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   208
            val exn_msg =
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   209
              (case exn of
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   210
                STATIC_ERRORS () => ""
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   211
              | Runtime.TOPLEVEL_ERROR => ""
56303
4cc3f4db3447 clarified Isabelle/ML bootstrap, such that Execution does not require ML_Compiler;
wenzelm
parents: 56281
diff changeset
   212
              | _ => "Exception- " ^ Pretty.string_of (Exn_Output.pretty exn) ^ " raised");
39232
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   213
            val _ = output_warnings ();
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   214
            val _ = output_writeln ();
69c6d3e87660 more abstract treatment of interrupts in structure Exn -- hardly ever need to mention Interrupt literally;
wenzelm
parents: 39231
diff changeset
   215
          in raise_error exn_msg end;
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   216
  in
56304
40274e4f5ebf redirect ML_Compiler reports more directly: only the (big) parse tree report is deferred via Execution.print (NB: this does not work for asynchronous "diag" commands);
wenzelm
parents: 56303
diff changeset
   217
    if #verbose flags then (output_warnings (); flush_error (); output_writeln ())
39228
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   218
    else ()
cb7264721c91 ML_Compiler.eval: more careful printing of messages and regular output, trying to accomodate Poly/ML, Proof General, Isabelle/Scala/jEdit at the same time;
wenzelm
parents: 39227
diff changeset
   219
  end;
31333
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   220
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   221
end;
fcd010617e6c added structure ML_Compiler: runtime compilation, with advanced version for Poly/ML 5.3 (formerly ML_Test);
wenzelm
parents:
diff changeset
   222