Merge pull request IfcOpenShell#1 from aothms/master

yorikvanhavre · yorikvanhavre · commit ed5f879b9fb1 · 2012-10-30T04:47:28.000-07:00
diff --git a/src/ifcexpressparser/IfcExpressParser.py b/src/ifcexpressparser/IfcExpressParser.py
@@ -543,7 +543,7 @@ def __str__(self):
 namespace %(schema)s {
 """%{'schema_upper':schema_version.upper(),'schema':schema_version}
 
-simple_enumerations = sorted(simple_types)
+simple_enumerations = sorted(selectable_simple_types)
 entity_enumerations = sorted(entity_names)
 all_enumerations = simple_enumerations + entity_enumerations
 
@@ -613,6 +613,11 @@ def __str__(self):
             print >>h_file, c
 
 print >>h_file, "void InitStringMap();"
+print >>h_file, "void InitAttributeCountMap();"
+print >>h_file, "void InitAttributeIndexMap();"
+print >>h_file, "void InitAttributeTypeMap();"
+print >>h_file, "void InitAttributeNameMap();"
+print >>h_file, "void InitAttributeOptionalMap();"
 print >>h_file, "IfcSchemaEntity SchemaEntity(IfcAbstractEntityPtr e = 0);"
 
 print >>h_file, "}\n\n#endif"
@@ -661,10 +666,6 @@ def __str__(self):
 string_map,attribute_count_map,attribute_index_map,attribute_name_map,attribute_optional_map,attribute_type_map = [""]*6
 print >>cpp2_file, "void InitDescriptorMap() {"
 print >>cpp2_file, "    IfcEntityDescriptor* current;"
-for k,v in simple_types.items():
-    if k in enumerations or k in selections: continue
-    print >>cpp2_file, "    current = entity_descriptor_map[Type::%s] = new IfcEntityDescriptor(Type::%s,0);"%(k,k)
-    print >>cpp2_file, "    current->add(\"wrappedValue\",false,%s);"%(v.type_enum())
 rt_entities = set()
 while True:
     todo = [e for e in entities if e.class_name not in rt_entities]
diff --git a/src/ifcparse/Ifc2x3-rt.cpp b/src/ifcparse/Ifc2x3-rt.cpp
diff --git a/src/ifcparse/Ifc2x3.cpp b/src/ifcparse/Ifc2x3.cpp
diff --git a/src/ifcparse/Ifc2x3enum.h b/src/ifcparse/Ifc2x3enum.h
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
@@ -353,7 +353,7 @@ TokenArgument::TokenArgument(const Token& t) {
 }
 
 EntityArgument::EntityArgument(Ifc2x3::Type::Enum ty, const Token& t) {
-	entity = new Ifc::IfcUntypedEntity(new Entity(0,t.first->file,t.second));
+	entity = new IfcUtil::IfcArgumentSelect(ty,new TokenArgument(t));
 }
 
 // 
@@ -371,10 +371,11 @@ ArgumentList::ArgumentList(Tokens* t, std::vector<unsigned int>& ids) {
 			if ( TokenFunc::isDatatype(next) ) {
 				t->Next();
 				try {
-					Push ( new EntityArgument(Ifc2x3::Type::ALL,next) ); //Ifc2x3::Type::FromString(TokenFunc::asString(next)),t->Next()) );
+					Push ( new EntityArgument(Ifc2x3::Type::FromString(TokenFunc::asString(next)),t->Next()) );
 				} catch ( IfcException& e ) {
 					Logger::Message(Logger::LOG_ERROR,e.what());
 				}
+				t->Next();
 			} else {
 				Push ( new TokenArgument(next) );
 			}
@@ -492,7 +493,22 @@ EntityArgument::operator IfcEntities() const { throw IfcException("Argument is n
 unsigned int EntityArgument::Size() const { return 1; }
 ArgumentPtr EntityArgument::operator [] (unsigned int i) const { throw IfcException("Argument is not a list of arguments"); }
 std::string EntityArgument::toString(bool upper) const { 
-	return entity->entity->toString(upper);
+	ArgumentPtr arg = entity->wrappedValue();
+	IfcParse::TokenArgument* token_arg = dynamic_cast<IfcParse::TokenArgument*>(arg);
+	const bool is_string = TokenFunc::isString(token_arg->token);
+	std::string token_string = token_arg ? (is_string 
+		? TokenFunc::asString(token_arg->token) 
+		: TokenFunc::toString(token_arg->token))
+		: std::string();
+	std::string dt = Ifc2x3::Type::ToString(entity->type());
+	if ( upper ) {
+		for (std::string::iterator p = dt.begin(); p != dt.end(); ++p ) *p = toupper(*p);
+		if (is_string) token_string = IfcWrite::IfcCharacterEncoder(token_string);
+	} else {
+		token_string.insert(token_string.begin(),'\'');
+		token_string.push_back('\'');
+	}
+	return dt + "(" + token_string + ")";
 }
 //return entity->entity->toString(); }
 bool EntityArgument::isNull() const { return false; }
@@ -583,10 +599,7 @@ std::string Entity::toString(bool upper) {
 	if ( upper ) {
 		for (std::string::iterator p = dt.begin(); p != dt.end(); ++p ) *p = toupper(*p);
 	}
-	if (_id) {
-		ss << "#" << _id << "=";
-	}
-	ss << dt << args->toString(upper);
+	ss << "#" << _id << "=" << dt << args->toString(upper);
 	return ss.str();
 }
 
diff --git a/src/ifcparse/IfcParse.h b/src/ifcparse/IfcParse.h
@@ -162,7 +162,7 @@ namespace IfcParse {
 	///                        =====================   =====================
 	class EntityArgument : public Argument {
 	private:		
-		Ifc::IfcUntypedEntity* entity;		
+		IfcUtil::IfcArgumentSelect* entity;		
 	public:
 		EntityArgument(Ifc2x3::Type::Enum ty, const Token& t);
 		~EntityArgument();
diff --git a/src/ifcparse/IfcUntypedEntity.cpp b/src/ifcparse/IfcUntypedEntity.cpp
@@ -61,12 +61,6 @@ void Ifc::IfcUntypedEntity::invalid_argument(unsigned int i, const std::string&
 	const std::string arg_name = Ifc2x3::Type::GetAttributeName(_type,i);
 	throw IfcException(t + " is not a valid type for '" + arg_name + "'");
 }
-void Ifc::IfcUntypedEntity::setArgument(unsigned int i) {
-	bool is_optional = Ifc2x3::Type::GetAttributeOptional(_type, i);
-	if (is_optional) {
-		writable_entity()->setArgument(i);
-	} else invalid_argument(i,"NONE");
-}
 void Ifc::IfcUntypedEntity::setArgument(unsigned int i, int v) {
 	IfcUtil::ArgumentType arg_type = Ifc2x3::Type::GetAttributeType(_type,i);
 	if (arg_type == Argument_INT) {
diff --git a/src/ifcparse/IfcUntypedEntity.h b/src/ifcparse/IfcUntypedEntity.h
@@ -27,7 +27,6 @@ namespace Ifc {
 		const char* getArgumentName(unsigned int i) const;
 		unsigned getArgumentIndex(const std::string& a) const;
 
-		void setArgument(unsigned int iz);
 		void setArgument(unsigned int i, int v);
 		void setArgument(unsigned int i, bool v);
 		void setArgument(unsigned int i, double v);
diff --git a/src/ifcwrap/IfcPython.i b/src/ifcwrap/IfcPython.i
@@ -37,12 +37,12 @@
 %rename("get_argument_type") getArgumentType;
 %rename("get_argument_name") getArgumentName;
 %rename("get_argument_index") getArgumentIndex;
-%rename("_set_argument") setArgument;
+%rename("set_argument") setArgument;
 %rename("__repr__") toString;
 %rename("Entity") IfcUntypedEntity;
 
 %typemap(out) IfcEntities {
-	const unsigned size = $1 ? $1->Size() : 0;
+	const unsigned size = $1->Size();
 	$result = PyList_New(size);
 	for (unsigned i = 0; i < size; ++i) {
 		PyObject *o = SWIG_NewPointerObj(SWIG_as_voidptr((*$1)[i]), SWIGTYPE_p_Ifc__IfcUntypedEntity, 0);
@@ -54,7 +54,6 @@
 	const Argument& arg = *($1.second);
 	const ArgumentType type = $1.first;
 	if (arg.isNull()) {
-		Py_INCREF(Py_None);
 		$result = Py_None;
 	} else {
 	switch(type) {
@@ -150,11 +149,6 @@
 	}
 }
 
-%extend Ifc::IfcUntypedEntity {
-	%pythoncode %{
-	set_argument = lambda self,x,y: self._set_argument(x) if y is None else self._set_argument(x,y)
-	%}
-}
 
 namespace std {
    %template(Ints) vector<int>;
diff --git a/src/ifcwrap/Interface.h b/src/ifcwrap/Interface.h
@@ -3,8 +3,6 @@
 #include <map>
 #include <fstream>
 
-namespace Ifc { class IfcUntypedEntity; }
-
 #include "../ifcparse/IfcUtil.h"
 #include "../ifcparse/Ifc2x3.h"
 
@@ -28,7 +26,6 @@ namespace Ifc {
 		const char* getArgumentName(unsigned int i) const;
 		unsigned getArgumentIndex(const std::string& a) const;
 
-		void setArgument(unsigned int i);
 		void setArgument(unsigned int i, int v);
 		void setArgument(unsigned int i, bool v);
 		void setArgument(unsigned int i, double v);
