equal
deleted
inserted
replaced
31 { |
31 { |
32 /* stack operations */ |
32 /* stack operations */ |
33 |
33 |
34 def buffer(): mutable.ListBuffer[Entry] = new mutable.ListBuffer[Entry] |
34 def buffer(): mutable.ListBuffer[Entry] = new mutable.ListBuffer[Entry] |
35 var stack: List[(Int, String, mutable.ListBuffer[Entry])] = |
35 var stack: List[(Int, String, mutable.ListBuffer[Entry])] = |
36 List((0, node_name.theory, buffer())) |
36 List((0, node_name.toString, buffer())) |
37 |
37 |
38 @tailrec def close(level: Int => Boolean) |
38 @tailrec def close(level: Int => Boolean) |
39 { |
39 { |
40 stack match { |
40 stack match { |
41 case (lev, name, body) :: (_, _, body2) :: rest if level(lev) => |
41 case (lev, name, body) :: (_, _, body2) :: rest if level(lev) => |
258 span: List[Token]): Command.Blobs = |
258 span: List[Token]): Command.Blobs = |
259 { |
259 { |
260 val files = span_files(syntax, span) |
260 val files = span_files(syntax, span) |
261 files.map(file => { |
261 files.map(file => { |
262 // FIXME proper thy_load append |
262 // FIXME proper thy_load append |
263 val file_name = Document.Node.Name(name.dir + file, name.dir, "") |
263 val file_name = Document.Node.Name(name.master_dir + file) |
264 (file_name, all_blobs.get(file_name).map(_.sha1_digest)) |
264 (file_name, all_blobs.get(file_name).map(_.sha1_digest)) |
265 }) |
265 }) |
266 } |
266 } |
267 |
267 |
268 |
268 |