move VARcreate and ENTITYcreate to factory.c

cshorler · cshorler · commit 18f81e18983f · 2020-07-21T16:01:10.000+01:00
diff --git a/src/express/entity.c b/src/express/entity.c
@@ -285,27 +285,6 @@ Variable ENTITYresolve_attr_ref( Entity e, Symbol * grp_ref, Symbol * attr_ref )
     return attr;
 }
 
-/**
-** low-level function for type Entity
-**
-** \note The attribute list of a new entity is defined as an
-**  empty list; all other aspects of the entity are initially
-**  undefined (i.e., have appropriate NULL values).
-*/
-Entity ENTITYcreate( Symbol * sym ) {
-    Scope s = SCOPEcreate( OBJ_ENTITY );
-
-    s->u.entity = ENTITY_new();
-    s->u.entity->attributes = LISTcreate();
-    s->u.entity->inheritance = ENTITY_INHERITANCE_UNINITIALIZED;
-
-    /* it's so useful to have a type hanging around for each entity */
-    s->u.entity->type = TYPEcreate_name( sym );
-    s->u.entity->type->u.type->body = TYPEBODYcreate( entity_ );
-    s->u.entity->type->u.type->body->entity = s;
-    return( s );
-}
-
 /**
  * currently, this is only used by USEresolve
  * low-level function for type Entity
diff --git a/src/express/factory.c b/src/express/factory.c
@@ -103,3 +103,41 @@ Symbol * SYMBOLcreate( char * name, int line, const char * filename ) {
                                */
     return sym;
 }
+
+/**
+** low-level function for type Entity
+**
+** \note The attribute list of a new entity is defined as an
+**  empty list; all other aspects of the entity are initially
+**  undefined (i.e., have appropriate NULL values).
+*/
+Entity ENTITYcreate( Symbol * sym ) {
+    Scope s = SCOPEcreate( OBJ_ENTITY );
+
+    s->u.entity = ENTITY_new();
+    s->u.entity->attributes = LISTcreate();
+    s->u.entity->inheritance = ENTITY_INHERITANCE_UNINITIALIZED;
+
+    /* it's so useful to have a type hanging around for each entity */
+    s->u.entity->type = TYPEcreate_name( sym );
+    s->u.entity->type->u.type->body = TYPEBODYcreate( entity_ );
+    s->u.entity->type->u.type->body->entity = s;
+    return( s );
+}
+
+/**  VARcreate
+** \param name name of variable to create
+** \param type type of new variable
+** \return the Variable created
+** Create and return a new variable.
+**
+** \note The reference class of the variable is, by default,
+**      dynamic.  Special flags associated with the variable
+**      (e.g., optional) are initially false.
+*/
+Variable VARcreate( Expression name, Type type ) {
+    Variable v = VAR_new();
+    v->name = name;
+    v->type = type;
+    return v;
+}
diff --git a/src/express/variable.c b/src/express/variable.c
@@ -120,20 +120,3 @@ extern char * VARget_simple_name( Variable v ) {
     }
     return EXPget_name( e );
 }
-
-/**  VARcreate
-** \param name name of variable to create
-** \param type type of new variable
-** \return the Variable created
-** Create and return a new variable.
-**
-** \note The reference class of the variable is, by default,
-**      dynamic.  Special flags associated with the variable
-**      (e.g., optional) are initially false.
-*/
-Variable VARcreate( Expression name, Type type ) {
-    Variable v = VAR_new();
-    v->name = name;
-    v->type = type;
-    return v;
-}
