diff options
| -rw-r--r-- | data/schemata/interface_definition.rnc | 9 | ||||
| -rw-r--r-- | data/schemata/interface_definition.rng | 10 | ||||
| -rw-r--r-- | src/reference_tree.ml | 5 |
3 files changed, 2 insertions, 22 deletions
diff --git a/data/schemata/interface_definition.rnc b/data/schemata/interface_definition.rnc index 913123c..fc063ac 100644 --- a/data/schemata/interface_definition.rnc +++ b/data/schemata/interface_definition.rnc @@ -24,14 +24,7 @@ # Interface definition starts with interfaceDefinition tag that may contain node tags start = element interfaceDefinition { - extendsAttr?, node* -} - -# Interface definitions may extend other definitions -# In this case you specify a whitespace-separated path -extendsAttr = attribute extends -{ - text + node* } # node tag may contain node, leafNode, or tagNode tags diff --git a/data/schemata/interface_definition.rng b/data/schemata/interface_definition.rng index a1330ee..596b4d9 100644 --- a/data/schemata/interface_definition.rng +++ b/data/schemata/interface_definition.rng @@ -28,22 +28,12 @@ <!-- Interface definition starts with interfaceDefinition tag that may contain node tags --> <start> <element name="interfaceDefinition"> - <optional> - <ref name="extendsAttr"/> - </optional> <zeroOrMore> <ref name="node"/> </zeroOrMore> </element> </start> <!-- - Interface definitions may extend other definitions - In this case you specify a whitespace-separated path - --> - <define name="extendsAttr"> - <attribute name="extends"/> - </define> - <!-- node tag may contain node, leafNode, or tagNode tags Those are intermediate configuration nodes that may only contain other nodes and must not have values diff --git a/src/reference_tree.ml b/src/reference_tree.ml index 29b4265..b717d19 100644 --- a/src/reference_tree.ml +++ b/src/reference_tree.ml @@ -115,10 +115,7 @@ let load_from_xml reftree file = let xml_to_reftree xml reftree = match xml with | Xml.Element ("interfaceDefinition", attrs, children) -> - let basepath = - try Pcre.split (Xml.attrib xml "extends") - with _ -> [] - in List.fold_left (insert_from_xml basepath) reftree children + List.fold_left (insert_from_xml []) reftree children | _ -> raise (Bad_interface_definition "Should start with <interfaceDefinition>") in try |