qapi-types: Split generate_fwd_builtin() off generate_fwd_struct()
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
		
							parent
							
								
									ae0a7a1090
								
							
						
					
					
						commit
						c5ecd7e18f
					
				@ -12,8 +12,7 @@
 | 
				
			|||||||
from ordereddict import OrderedDict
 | 
					from ordereddict import OrderedDict
 | 
				
			||||||
from qapi import *
 | 
					from qapi import *
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def generate_fwd_struct(name, builtin_type=False):
 | 
					def generate_fwd_builtin(name):
 | 
				
			||||||
    if builtin_type:
 | 
					 | 
				
			||||||
    return mcgen('''
 | 
					    return mcgen('''
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct %(name)sList
 | 
					typedef struct %(name)sList
 | 
				
			||||||
@ -28,6 +27,7 @@ typedef struct %(name)sList
 | 
				
			|||||||
                 type=c_type(name),
 | 
					                 type=c_type(name),
 | 
				
			||||||
                 name=name)
 | 
					                 name=name)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					def generate_fwd_struct(name):
 | 
				
			||||||
    return mcgen('''
 | 
					    return mcgen('''
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct %(name)s %(name)s;
 | 
					typedef struct %(name)s %(name)s;
 | 
				
			||||||
@ -332,7 +332,7 @@ exprs = parse_schema(input_file)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
 | 
					fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
 | 
				
			||||||
for typename in builtin_types.keys():
 | 
					for typename in builtin_types.keys():
 | 
				
			||||||
    fdecl.write(generate_fwd_struct(typename, builtin_type=True))
 | 
					    fdecl.write(generate_fwd_builtin(typename))
 | 
				
			||||||
fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
 | 
					fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
for expr in exprs:
 | 
					for expr in exprs:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user