[Xcb] [PATCH] Also track directly imported modules in a separate list

[Uli Schlachter]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 12.02.2014 23:22, Uli Schlachter wrote:
> On 12.02.2014 22:53, Keith Packard wrote:
>> This allows the generated header files to only include the directly
>> referenced header files, with the indirectly referenced header files
>> included by the directly referenced ones.
>> 
>> Signed-off-by: Keith Packard <keithp at keithp.com> ---
> 
> I don't normally dare to look at python code, but in this case:
> 
> Reviewed-by: Uli Schlachter <psychon at znc.in>

Since no one spoke up and complained:

Merged:
   d898fd3..4270141  master -> master

Let's see if we can also get the libxcb part done...

>> xcbgen/matcher.py | 2 ++ xcbgen/state.py   | 4 ++++ 2 files changed, 6
>> insertions(+)
>> 
>> diff --git a/xcbgen/matcher.py b/xcbgen/matcher.py index 6e45b23..bfa315e
>> 100644 --- a/xcbgen/matcher.py +++ b/xcbgen/matcher.py @@ -18,10 +18,12
>> @@ def import_(node, module, namespace): ''' # To avoid circular import
>> error from xcbgen import state +    module.import_level =
>> module.import_level + 1 new_file = join(namespace.dir, '%s.xml' %
>> node.text) new_root = parse(new_file).getroot() new_namespace =
>> state.Namespace(new_file) execute(module, new_namespace) +
>> module.import_level = module.import_level - 1 if not
>> module.has_import(node.text): module.add_import(node.text,
>> new_namespace)
>> 
>> diff --git a/xcbgen/state.py b/xcbgen/state.py index 52b8d8d..a6ad3a1
>> 100644 --- a/xcbgen/state.py +++ b/xcbgen/state.py @@ -65,6 +65,8 @@
>> class Module(object): self.output = output
>> 
>> self.imports = [] +        self.direct_imports = [] +
>> self.import_level = 0 self.types = {} self.events = {} self.errors = {} 
>> @@ -107,6 +109,8 @@ class Module(object):
>> 
>> # Keeps track of what's been imported so far. def add_import(self, name,
>> namespace): +        if self.import_level == 0: +
>> self.direct_imports.append((name, namespace.header)) 
>> self.imports.append((name, namespace.header))
>> 
>> def has_import(self, name):
>> 
> 
> 


- -- 
"Why make things difficult, when it is possible to make them cryptic
and totally illogical, with just a little bit more effort?" -- A. P. J.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBCAAGBQJTBRYgAAoJECLkKOvLj8sG0gwH+QF6BZac5pvie378OE948pvl
bOuXGTVSkVUfVzy5hf+Hm62wh5AdN/aR5Z/nD1lwlJ43O8hgiy9q5F+emp3zcXTO
EtMmoDk0m0vZuP7exCMaCJQ7rgK/nWWo/kLus2dcYZnpmU78RkLsBGFjohfP6vaV
VBji4tvE+qFtD5myyi548Kt20HjXF/CYMi4p65Yjhv6OmXf++Jar1ZukPYQK8RGT
fXz2sFPRTsD3mVX3QaggDLqxQKcdfE6i+0PTT9CEX32wx38r2/VsxDdzzE39S0I+
bXRXeLG5KIsKG9xNARYZJ+P6g68+1JuugTUvCz/h+QHe2+29oxWtiUcay4a9it4=
=y/rh
-----END PGP SIGNATURE-----