src/Pure/System/scala.scala
author wenzelm
Sat, 23 May 2020 10:54:04 +0200
changeset 71865 3882df6a4a93
parent 71864 bfc120aa737a
child 71868 06ec50d9fc0a
permissions -rw-r--r--
tuned message;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
71849
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
     1
/*  Title:      Pure/System/scala.scala
43744
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
     2
    Author:     Makarius
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
     3
71849
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
     4
Support for Scala at runtime.
43744
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
     5
*/
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
     6
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
     7
package isabelle
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
     8
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
     9
71864
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    10
import java.lang.reflect.{Modifier, InvocationTargetException}
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    11
import java.io.{File => JFile, StringWriter, PrintWriter}
56730
e723f041b6d0 tuned signature -- separate pool for JFuture tasks, which can be canceled;
wenzelm
parents: 56667
diff changeset
    12
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    13
import scala.util.matching.Regex
71850
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    14
import scala.tools.nsc.GenericRunnerSettings
71864
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    15
import scala.tools.nsc.interpreter.IMain
43744
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
    16
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
    17
71849
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
    18
object Scala
43744
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
    19
{
71864
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    20
  /* compiler */
71850
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    21
71864
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    22
  object Compiler
71850
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    23
  {
71864
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    24
    def classpath(jar_dirs: List[JFile]): String =
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    25
    {
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    26
      def find_jars(dir: JFile): List[String] =
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    27
        File.find_files(dir, file => file.getName.endsWith(".jar")).
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    28
          map(File.absolute_name)
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    29
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    30
      val class_path =
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    31
        for {
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    32
          prop <- List("scala.boot.class.path", "java.class.path")
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    33
          path = System.getProperty(prop, "") if path != "\"\""
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    34
          elem <- space_explode(JFile.pathSeparatorChar, path)
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    35
        } yield elem
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    36
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    37
      (class_path ::: jar_dirs.flatMap(find_jars)).mkString(JFile.pathSeparator)
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    38
    }
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    39
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    40
    type Settings = scala.tools.nsc.Settings
71850
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    41
71864
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    42
    def settings(
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    43
      error: String => Unit = Exn.error,
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    44
      jar_dirs: List[JFile] = Nil): Settings =
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    45
    {
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    46
      val settings = new GenericRunnerSettings(error)
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    47
      settings.classpath.value = classpath(jar_dirs)
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    48
      settings
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    49
    }
71850
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    50
71864
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    51
    def toplevel(settings: Settings, source: String): List[String] =
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    52
    {
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    53
      val out = new StringWriter
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    54
      val interp = new IMain(settings, new PrintWriter(out))
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    55
      val rep = new interp.ReadEvalPrint
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    56
      val ok = interp.withLabel("\u0001") { rep.compile(source) }
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    57
      out.close
71850
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    58
71864
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    59
      val Error = """(?s)^\S* error: (.*)$""".r
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    60
      val errors =
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    61
        space_explode('\u0001', Library.strip_ansi_color(out.toString)).
71865
3882df6a4a93 tuned message;
wenzelm
parents: 71864
diff changeset
    62
          collect({ case Error(msg) => "Scala error: " + Library.trim_line(msg) })
71864
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    63
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    64
      if (!ok && errors.isEmpty) List("Error") else errors
bfc120aa737a clarified signature;
wenzelm
parents: 71862
diff changeset
    65
    }
71850
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    66
  }
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    67
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    68
f640380aaf86 clarified signature;
wenzelm
parents: 71849
diff changeset
    69
71849
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
    70
  /** invoke JVM method via Isabelle/Scala **/
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
    71
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    72
  /* method reflection */
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    73
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    74
  private val Ext = new Regex("(.*)\\.([^.]*)")
43744
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
    75
  private val STRING = Class.forName("java.lang.String")
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
    76
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    77
  private def get_method(name: String): String => String =
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    78
    name match {
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    79
      case Ext(class_name, method_name) =>
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    80
        val m =
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    81
          try { Class.forName(class_name).getMethod(method_name, STRING) }
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    82
          catch {
43751
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    83
            case _: ClassNotFoundException | _: NoSuchMethodException =>
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    84
              error("No such method: " + quote(name))
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    85
          }
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    86
        if (!Modifier.isStatic(m.getModifiers)) error("Not at static method: " + m.toString)
43751
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    87
        if (m.getReturnType != STRING) error("Bad method return type: " + m.toString)
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    88
43751
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    89
        (arg: String) => {
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    90
          try { m.invoke(null, arg).asInstanceOf[String] }
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    91
          catch {
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    92
            case e: InvocationTargetException if e.getCause != null =>
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    93
              throw e.getCause
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    94
          }
8c7f69f1825b proper InvocationTargetException.getCause for indirect exceptions;
wenzelm
parents: 43748
diff changeset
    95
        }
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    96
      case _ => error("Malformed method name: " + quote(name))
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    97
    }
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    98
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
    99
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   100
  /* method invocation */
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   101
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   102
  object Tag extends Enumeration
43744
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
   103
  {
65638
wenzelm
parents: 65220
diff changeset
   104
    val NULL, OK, ERROR, FAIL, INTERRUPT = Value
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   105
  }
43744
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
   106
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   107
  def method(name: String, arg: String): (Tag.Value, String) =
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   108
    Exn.capture { get_method(name) } match {
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   109
      case Exn.Res(f) =>
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   110
        Exn.capture { f(arg) } match {
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   111
          case Exn.Res(null) => (Tag.NULL, "")
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   112
          case Exn.Res(res) => (Tag.OK, res)
56667
65e84b0ef974 more abstract Exn.Interrupt and POSIX return code;
wenzelm
parents: 56387
diff changeset
   113
          case Exn.Exn(Exn.Interrupt()) => (Tag.INTERRUPT, "")
44158
fe6d1ae7a065 clarified Exn.message;
wenzelm
parents: 43751
diff changeset
   114
          case Exn.Exn(e) => (Tag.ERROR, Exn.message(e))
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   115
        }
44158
fe6d1ae7a065 clarified Exn.message;
wenzelm
parents: 43751
diff changeset
   116
      case Exn.Exn(e) => (Tag.FAIL, Exn.message(e))
43748
c70bd78ec83c JVM method invocation service via Scala layer;
wenzelm
parents: 43744
diff changeset
   117
    }
43744
2c7e1565b4a3 some support to invoke Scala methods under program control;
wenzelm
parents:
diff changeset
   118
}
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   119
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   120
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   121
/* protocol handler */
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   122
71849
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
   123
class Scala extends Session.Protocol_Handler
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   124
{
65219
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   125
  private var session: Session = null
61561
f35786faee6c prefer Isabelle/Scala Future;
wenzelm
parents: 61556
diff changeset
   126
  private var futures = Map.empty[String, Future[Unit]]
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   127
65219
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   128
  override def init(init_session: Session): Unit =
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   129
    synchronized { session = init_session }
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   130
65220
wenzelm
parents: 65219
diff changeset
   131
  override def exit(): Unit = synchronized
wenzelm
parents: 65219
diff changeset
   132
  {
wenzelm
parents: 65219
diff changeset
   133
    for ((id, future) <- futures) cancel(id, future)
wenzelm
parents: 65219
diff changeset
   134
    futures = Map.empty
wenzelm
parents: 65219
diff changeset
   135
  }
wenzelm
parents: 65219
diff changeset
   136
71849
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
   137
  private def fulfill(id: String, tag: Scala.Tag.Value, res: String): Unit =
56387
d92eb5c3960d more general prover operations;
wenzelm
parents: 56385
diff changeset
   138
    synchronized
d92eb5c3960d more general prover operations;
wenzelm
parents: 56385
diff changeset
   139
    {
d92eb5c3960d more general prover operations;
wenzelm
parents: 56385
diff changeset
   140
      if (futures.isDefinedAt(id)) {
71849
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
   141
        session.protocol_command("Scala.fulfill", id, tag.id.toString, res)
56387
d92eb5c3960d more general prover operations;
wenzelm
parents: 56385
diff changeset
   142
        futures -= id
d92eb5c3960d more general prover operations;
wenzelm
parents: 56385
diff changeset
   143
      }
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   144
    }
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   145
65219
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   146
  private def cancel(id: String, future: Future[Unit])
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   147
  {
61561
f35786faee6c prefer Isabelle/Scala Future;
wenzelm
parents: 61556
diff changeset
   148
    future.cancel
71849
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
   149
    fulfill(id, Scala.Tag.INTERRUPT, "")
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   150
  }
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   151
65219
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   152
  private def invoke_scala(msg: Prover.Protocol_Output): Boolean = synchronized
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   153
  {
54442
c39972ddd672 more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents: 52582
diff changeset
   154
    msg.properties match {
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   155
      case Markup.Invoke_Scala(name, id) =>
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   156
        futures += (id ->
61561
f35786faee6c prefer Isabelle/Scala Future;
wenzelm
parents: 61556
diff changeset
   157
          Future.fork {
71849
265bbad3d6af clarified modules;
wenzelm
parents: 71673
diff changeset
   158
            val (tag, result) = Scala.method(name, msg.text)
65219
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   159
            fulfill(id, tag, result)
56730
e723f041b6d0 tuned signature -- separate pool for JFuture tasks, which can be canceled;
wenzelm
parents: 56667
diff changeset
   160
          })
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   161
        true
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   162
      case _ => false
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   163
    }
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   164
  }
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   165
65219
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   166
  private def cancel_scala(msg: Prover.Protocol_Output): Boolean = synchronized
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   167
  {
54442
c39972ddd672 more specific Protocol_Output: empty message.body, main content via bytes/text;
wenzelm
parents: 52582
diff changeset
   168
    msg.properties match {
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   169
      case Markup.Cancel_Scala(id) =>
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   170
        futures.get(id) match {
65219
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   171
          case Some(future) => cancel(id, future)
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   172
          case None =>
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   173
        }
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   174
        true
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   175
      case _ => false
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   176
    }
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   177
  }
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   178
65219
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   179
  val functions =
ed4b47b8c7dc misc tuning and simplification;
wenzelm
parents: 64442
diff changeset
   180
    List(
71673
88dfbc382a3d clarified signature;
wenzelm
parents: 71601
diff changeset
   181
      Markup.Invoke_Scala.name -> invoke_scala,
88dfbc382a3d clarified signature;
wenzelm
parents: 71601
diff changeset
   182
      Markup.Cancel_Scala.name -> cancel_scala)
52111
1fd184eaa310 explicit management of Session.Protocol_Handlers, with protocol state and functions;
wenzelm
parents: 49470
diff changeset
   183
}