mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-22 00:50:09 +01:00
dc12fac5f8
* glib/dbus-gparser.c (struct Parser): Add in_annotation boolean. (parse_node, parse_interface, parse_method, parse_signal) (parse_property, parse_annotation): Lose if we're currently in an annotation. (parse_annotation): New function. (parser_start_element, parser_end_element): Handle annotation. (parse_method, parse_interface): Remove support for c_name attribute, switch to annotations. * glib/dbus-gidl.h (interface_info_get_binding_names) (method_info_get_binding_names) (interface_info_get_binding_name, method_info_get_binding_name) (interface_info_set_binding_name, method_info_set_binding_name): Remove. (interface_info_get_annotations, method_info_get_annotations) (interface_info_get_annotation, method_info_get_annotation) (interface_info_add_annotation, method_info_add_annotation): Prototype. * glib/dbus-gidl.c (struct InterfaceInfo): Substitute "annotations" for "bindings". (struct MethodInfo): Ditto. Straightfoward conversion of binding methods into annotation methods as prototyped. * glib/dbus-glib-tool.c (pretty_print): Print annotations. * glib/dbus-binding-tool-glib.h (DBUS_GLIB_ANNOTATION_C_SYMBOL): Define. * glib/dbus-binding-tool-glib.c (gather_marshallers, generate_glue): Use new annotation API. * doc/introspect.dtd: Fix a number of DTD syntax errors. Add annotation element. * doc/dbus-specification.xml: Discuss introspection annotations, include list of well-known annotations. * test/glib/test-service-glib.xml: Make validate against new DTD.
36 lines
1.2 KiB
DTD
36 lines
1.2 KiB
DTD
<!-- DTD for D-BUS Introspection data -->
|
|
<!-- (C) 2005-02-02 David A. Wheeler; released under the D-BUS licenses,
|
|
GNU GPL version 2 (or greater) and AFL 1.1 (or greater) -->
|
|
|
|
<!-- see D-BUS specification for documentation -->
|
|
|
|
<!ELEMENT node (interface*,node*)>
|
|
<!ATTLIST node name CDATA #REQUIRED>
|
|
|
|
<!ELEMENT interface (annotation*,method*,signal*,property*)>
|
|
<!ATTLIST interface name CDATA #REQUIRED>
|
|
|
|
<!ELEMENT method (annotation*,arg*)>
|
|
<!ATTLIST method name CDATA #REQUIRED>
|
|
|
|
<!ELEMENT arg EMPTY>
|
|
<!ATTLIST arg name CDATA #IMPLIED>
|
|
<!ATTLIST arg type CDATA #REQUIRED>
|
|
<!-- Method arguments SHOULD include "direction",
|
|
while signal and error arguments SHOULD not (since there's no point).
|
|
The DTD format can't express that subtlety. -->
|
|
<!ATTLIST arg direction (in|out) "in">
|
|
|
|
<!ELEMENT signal (arg,annotation)>
|
|
<!ATTLIST signal name CDATA #REQUIRED>
|
|
|
|
<!ELEMENT property (annotation)> <!-- AKA "attribute" -->
|
|
<!ATTLIST property name CDATA #REQUIRED>
|
|
<!ATTLIST property type CDATA #REQUIRED>
|
|
<!ATTLIST property access (read|write|readwrite) #REQUIRED>
|
|
|
|
<!ELEMENT annotation EMPTY> <!-- Generic metadata -->
|
|
<!ATTLIST annotation name CDATA #REQUIRED>
|
|
<!ATTLIST annotation value CDATA #REQUIRED>
|
|
|
|
|