Merge branch 'master' into v0.6.0

# Conflicts:
#	src/ifcparse/Ifc4-latebound.cpp
#	src/ifcparse/Ifc4.cpp
#	src/ifcparse/Ifc4.h
#	src/ifcparse/Ifc4enum.h
This commit is contained in:
Thomas Krijnen
2019-01-20 14:27:09 +01:00
5 changed files with 1610 additions and 1302 deletions
+1
View File
@@ -178,6 +178,7 @@ cache_file = sys.argv[1] + ".cache.dat"
if os.path.exists(cache_file):
with open(cache_file, "rb") as f:
mapping = pickle.load(f)
schema = mapping.schema
else:
from pyparsing import *
from nodes import *
+2 -1
View File
@@ -109,7 +109,8 @@ __attribute__((optnone))
try:
declared_type = get_declared_type(type, emitted)
except UnmetDependenciesException:
print("Unmet", repr(name))
# @todo?
# print("Unmet", repr(name))
return False
statements.append(' %(schema_name)s_%(name)s_type = new type_declaration("%(name)s", %%(index_in_schema_%(name)s)d, %(declared_type)s);' % locals())