equal
deleted
inserted
replaced
190 |
190 |
191 tree match { |
191 tree match { |
192 case XML.Elem(Markup(Markup.ENTITY, props), body) => |
192 case XML.Elem(Markup(Markup.ENTITY, props), body) => |
193 val name = Markup.Name.unapply(props) getOrElse err() |
193 val name = Markup.Name.unapply(props) getOrElse err() |
194 val xname = Markup.XName.unapply(props) getOrElse err() |
194 val xname = Markup.XName.unapply(props) getOrElse err() |
195 val pos = props.filter({ case (a, _) => Markup.POSITION_PROPERTIES(a) && a != Markup.ID }) |
195 val pos = props.filter(p => Markup.position_property(p) && p._1 != Markup.ID) |
196 val id = Position.Id.unapply(props) |
196 val id = Position.Id.unapply(props) |
197 val serial = Markup.Serial.unapply(props) getOrElse err() |
197 val serial = Markup.Serial.unapply(props) getOrElse err() |
198 (Entity(kind, name, xname, pos, id, serial), body) |
198 (Entity(kind, name, xname, pos, id, serial), body) |
199 case _ => err() |
199 case _ => err() |
200 } |
200 } |