equal
deleted
inserted
replaced
114 |
114 |
115 /* parsing */ |
115 /* parsing */ |
116 |
116 |
117 private case class Session_Entry( |
117 private case class Session_Entry( |
118 name: String, |
118 name: String, |
119 reset: Boolean, |
119 this_name: Boolean, |
120 order: Int, |
120 order: Int, |
121 path: Option[String], |
121 path: Option[String], |
122 parent: Option[String], |
122 parent: Option[String], |
123 description: String, |
123 description: String, |
124 options: List[Options.Spec], |
124 options: List[Options.Spec], |
194 else entry.name |
194 else entry.name |
195 } |
195 } |
196 else |
196 else |
197 entry.parent match { |
197 entry.parent match { |
198 case Some(parent_name) if queue1.defined(parent_name) => |
198 case Some(parent_name) if queue1.defined(parent_name) => |
199 if (entry.reset) entry.name |
199 if (entry.this_name) entry.name |
200 else parent_name + "-" + entry.name |
200 else parent_name + "-" + entry.name |
201 case _ => error("Bad parent session") |
201 case _ => error("Bad parent session") |
202 } |
202 } |
203 |
203 |
204 val path = |
204 val path = |