equal
deleted
inserted
replaced
457 |
457 |
458 /* resolve implicit theory dependencies */ |
458 /* resolve implicit theory dependencies */ |
459 |
459 |
460 def resolve_dependencies[A]( |
460 def resolve_dependencies[A]( |
461 models: Iterable[Document.Model], |
461 models: Iterable[Document.Model], |
462 theories: List[(Document.Node.Name, Position.T)] |
462 theories: List[Document.Node.Name] |
463 ): List[Document.Node.Name] = { |
463 ): List[Document.Node.Name] = { |
464 val model_theories = |
464 val model_theories = |
465 (for (model <- models.iterator if model.is_theory) |
465 (for (model <- models.iterator if model.is_theory) |
466 yield (model.node_name, Position.none)).toList |
466 yield (model.node_name, Position.none)).toList |
467 |
467 |
468 val thy_files1 = dependencies(model_theories ::: theories).theories |
468 val thy_files1 = |
|
469 dependencies(model_theories ::: theories.map((_, Position.none))).theories |
469 |
470 |
470 val thy_files2 = |
471 val thy_files2 = |
471 (for { |
472 (for { |
472 model <- models.iterator if !model.is_theory |
473 model <- models.iterator if !model.is_theory |
473 thy_name <- make_theory_name(model.node_name) |
474 thy_name <- make_theory_name(model.node_name) |