소스 검색

bugfix: generate empty extension objects

Leon Urbas 11 년 전
부모
커밋
0c667787f0
2개의 변경된 파일9개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 1
      tests/check_namespace.c
  2. 8 8
      tool/generate_builtin.py

+ 1 - 1
tests/check_namespace.c

@@ -89,7 +89,7 @@ int main (void) {
 	int number_failed =0;
 	Suite *s = namespace_suite ();
 	SRunner *sr = srunner_create (s);
-	srunner_set_fork_status(sr,CK_NOFORK);
+	// srunner_set_fork_status(sr,CK_NOFORK);
 	srunner_run_all (sr, CK_NORMAL);
 	number_failed += srunner_ntests_failed (sr);
 	srunner_free (sr);

+ 8 - 8
tool/generate_builtin.py

@@ -139,14 +139,14 @@ def createStructured(element):
     # else:
     #    print ("type " + name + " is new UA_Builtin with "),
     print("typedef struct T_" + name + " {", end='\n', file=fh)
-    if len(valuemap) > 0:
-        for n,t in valuemap.iteritems():
-            if t.find("**") != -1:
-	        print("\t" + "UA_Int32 " + n + "Size;", end='\n', file=fh)
-            print("\t" + "UA_" + t + " " + n + ";", end='\n', file=fh)
-    else:
-        print("\t/* null record */", end='\n', file=fh)
-        print("\tUA_Int32 NullRecord; /* avoiding warnings */", end='\n', file=fh)
+    if len(valuemap) == 0:
+        typename = stripTypename(element.get("BaseType"))
+        childname = camlCase2CCase(typename)
+        valuemap[childname] = typename 
+    for n,t in valuemap.iteritems():
+        if t.find("**") != -1:
+            print("\t" + "UA_Int32 " + n + "Size;", end='\n', file=fh)
+        print("\t" + "UA_" + t + " " + n + ";", end='\n', file=fh)
     print("} " + name + ";", end='\n', file=fh)
 
     print("UA_Int32 " + name + "_calcSize(" + name + " const* ptr);", end='\n', file=fh)