Fix issue with output of complex with invalid notation (#298)

* Fix issue with output of complex with invalid notation coming from complex.h * Update json.cpp
arras-energy · Aug 26, 2019 · e5c7acc · e5c7acc
1 parent ef8b34b
commit e5c7acc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/gldcore/complex.h b/gldcore/complex.h
@@ -228,6 +228,16 @@ inline DEPRECATED double complex_set_ang(C,D) {}; // TODO
 	// Method: Notation
 	inline CNOTATION & Notation(void) /**< access to notation */
 	{
+		switch (f)
+		{
+		case A:
+		case I:
+		case J:
+		case R:
+			break;
+		default:
+			f = I;
+		}
 		return f;
 	};
 

diff --git a/gldcore/json.cpp b/gldcore/json.cpp
@@ -155,7 +155,7 @@ int GldJsonWriter::write_classes(FILE *fp)
 		if ( oclass->has_runtime ) TUPLE("runtime","%s",oclass->runtime);
 		if ( oclass->pmap != NULL )
 			len += write(",");
-		for ( prop = oclass->pmap ; prop != NULL ; prop=(prop->next?prop->next:(prop->oclass->parent?prop->oclass->parent->pmap:NULL)) )
+		for ( prop = oclass->pmap ; prop != NULL && prop->oclass == oclass ; prop=prop->next ) // note: do not output parent classes properties
 		{
 			KEYWORD *key;
 			const char *ptype = class_get_property_typename(prop->ptype);