#416 redesign elementRequiresAlloc to requiresAlloc

cortoproject · Dec 2, 2015 · 4410592 · 4410592
1 parent 5a88db5
commit 4410592
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 131 deletions.
diff --git a/packages/corto/lang/include/corto__api.h b/packages/corto/lang/include/corto__api.h
@@ -2288,9 +2288,13 @@ CORTO_LANG_EXPORT corto_function* corto_vtableAppend(corto_vtable *seq, corto_fu
 CORTO_LANG_EXPORT corto_function* corto_vtableAppendAlloc(corto_vtable *seq);
 CORTO_LANG_EXPORT void corto_vtableSize(corto_vtable *seq, corto_uint32 length);
 CORTO_LANG_EXPORT void corto_vtableClear(corto_vtable *seq);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+#define corto_resultIterForeach(iter, elem) \
+while(corto_iterHasNext(&elem##_iter) ? corto_result *elem;\
+elem = *(corto_result*)(corto_word)corto_iterNext(&iter), TRUE : FALSE)
+
+
+    #ifdef __cplusplus
+    }
+    #endif
+    #endif
 
diff --git a/packages/corto/lang/include/corto_collection.h b/packages/corto/lang/include/corto_collection.h
@@ -28,12 +28,12 @@ CORTO_LANG_EXPORT corto_bool _corto_collection_compatible(corto_collection _this
 CORTO_LANG_EXPORT corto_bool _corto_collection_compatible_v(corto_collection _this, corto_type type);
 #define corto_collection_compatible_v(_this, type) _corto_collection_compatible_v(corto_collection(_this), corto_type(type))
 
-CORTO_LANG_EXPORT corto_bool _corto_collection_elementRequiresAlloc(corto_collection _this);
-#define corto_collection_elementRequiresAlloc(_this) _corto_collection_elementRequiresAlloc(corto_collection(_this))
-
 CORTO_LANG_EXPORT corto_int16 _corto_collection_init(corto_collection _this);
 #define corto_collection_init(_this) _corto_collection_init(corto_collection(_this))
 
+CORTO_LANG_EXPORT corto_bool _corto_collection_requiresAlloc(corto_type elementType);
+#define corto_collection_requiresAlloc(elementType) _corto_collection_requiresAlloc(corto_type(elementType))
+
 CORTO_LANG_EXPORT corto_uint32 _corto_collection_size(corto_any _this);
 #define corto_collection_size(_this) _corto_collection_size(_this)
 

diff --git a/packages/corto/lang/src/corto.c b/packages/corto/lang/src/corto.c
@@ -423,7 +423,7 @@ static corto_string CORTO_BUILD = __DATE__ " " __TIME__;
     SSO_OP_OBJ(op, collection_max);\
     SSO_OP_OBJ(op, collection_castable_);\
     SSO_OP_OBJ(op, collection_compatible_);\
-    SSO_OP_OBJ(op, collection_elementRequiresAlloc_);\
+    SSO_OP_OBJ(op, collection_requiresAlloc);\
     SSO_OP_OBJ(op, collection_init_);\
     SSO_OP_OBJ(op, collection_size);\
     /* iterator */\

diff --git a/packages/corto/lang/src/corto__bootstrap.h b/packages/corto/lang/src/corto__bootstrap.h
@@ -801,7 +801,7 @@ CORTO_CLASS_O(collection, type, CORTO_LOCAL | CORTO_READONLY, NULL, CORTO_DECLAR
     CORTO_MEMBER_O(collection, max, uint32, CORTO_GLOBAL);
     CORTO_METHOD_O(collection, castable, "(type type)", bool, TRUE, corto_collection_castable_v);
     CORTO_METHOD_O(collection, compatible, "(type type)", bool, TRUE, corto_collection_compatible_v);
-    CORTO_METHOD_O(collection, elementRequiresAlloc, "()", bool, FALSE, corto_collection_elementRequiresAlloc);
+    CORTO_FUNCTION_O(collection, requiresAlloc, "(type elementType)", bool, corto_collection_requiresAlloc);
     CORTO_METHOD_O(collection, init, "()", int16, FALSE, corto_collection_init);
     CORTO_METAPROCEDURE_O(collection, size, "()", uint32, FALSE, corto_collection_size);
 

diff --git a/packages/corto/lang/src/corto__wrapper.c b/packages/corto/lang/src/corto__wrapper.c
@@ -83,7 +83,7 @@ corto_uint32 _corto_class_allocSize(corto_class this) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "allocSize()");
     }
-    corto_assert(_methodId, "virtual method 'allocSize()' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'allocSize()' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -218,7 +218,7 @@ corto_bool _corto_collection_castable(corto_collection this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "castable(type type)");
     }
-    corto_assert(_methodId, "virtual method 'castable(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'castable(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -249,7 +249,7 @@ corto_bool _corto_collection_compatible(corto_collection this, corto_type type)
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "compatible(type type)");
     }
-    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -267,18 +267,17 @@ void __corto_collection_compatible_v(corto_function f, void *result, void *args)
         corto_type(*(corto_type*)((intptr_t)args + sizeof(void*))));
 }
 
-void __corto_collection_elementRequiresAlloc(corto_function f, void *result, void *args) {
+void __corto_collection_init(corto_function f, void *result, void *args) {
     CORTO_UNUSED(f);
     CORTO_UNUSED(args);
-    *(corto_bool*)result = _corto_collection_elementRequiresAlloc(
+    *(corto_int16*)result = _corto_collection_init(
         corto_collection(*(void**)args));
 }
 
-void __corto_collection_init(corto_function f, void *result, void *args) {
+void __corto_collection_requiresAlloc(corto_function f, void *result, void *args) {
     CORTO_UNUSED(f);
-    CORTO_UNUSED(args);
-    *(corto_int16*)result = _corto_collection_init(
-        corto_collection(*(void**)args));
+    *(corto_bool*)result = _corto_collection_requiresAlloc(
+        corto_type(*(corto_type*)args));
 }
 
 void __corto_collection_size(corto_function f, void *result, void *args) {
@@ -314,7 +313,7 @@ corto_bool _corto_delegate_castable(corto_delegate this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "castable(type type)");
     }
-    corto_assert(_methodId, "virtual method 'castable(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'castable(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -345,7 +344,7 @@ corto_bool _corto_delegate_compatible(corto_delegate this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "compatible(type type)");
     }
-    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -389,7 +388,7 @@ void _corto_dispatcher_post(corto_dispatcher this, corto_event e) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "post(event e)");
     }
-    corto_assert(_methodId, "virtual method 'post(event e)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'post(event e)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -447,7 +446,7 @@ void _corto_event_handle(corto_event this) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "handle()");
     }
-    corto_assert(_methodId, "virtual method 'handle()' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'handle()' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -540,7 +539,7 @@ corto_bool _corto_interface_compatible(corto_interface this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "compatible(type type)");
     }
-    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -593,7 +592,7 @@ corto_member _corto_interface_resolveMember(corto_interface this, corto_string n
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "resolveMember(string name)");
     }
-    corto_assert(_methodId, "virtual method 'resolveMember(string name)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'resolveMember(string name)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -644,7 +643,7 @@ void _corto_invokeEvent_handle(corto_invokeEvent this) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "handle()");
     }
-    corto_assert(_methodId, "virtual method 'handle()' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'handle()' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -674,7 +673,7 @@ corto_bool _corto_iterator_castable(corto_iterator this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "castable(type type)");
     }
-    corto_assert(_methodId, "virtual method 'castable(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'castable(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -705,7 +704,7 @@ corto_bool _corto_iterator_compatible(corto_iterator this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "compatible(type type)");
     }
-    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -851,7 +850,7 @@ void _corto_observableEvent_handle(corto_observableEvent this) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "handle()");
     }
-    corto_assert(_methodId, "virtual method 'handle()' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'handle()' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -925,7 +924,7 @@ corto_bool _corto_primitive_castable(corto_primitive this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "castable(type type)");
     }
-    corto_assert(_methodId, "virtual method 'castable(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'castable(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -956,7 +955,7 @@ corto_bool _corto_primitive_compatible(corto_primitive this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "compatible(type type)");
     }
-    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1078,7 +1077,7 @@ void _corto_replicator_onDeclare(corto_replicator this, corto_object observable)
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "onDeclare(object observable)");
     }
-    corto_assert(_methodId, "virtual method 'onDeclare(object observable)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'onDeclare(object observable)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1107,7 +1106,7 @@ void _corto_replicator_onDelete(corto_replicator this, corto_object observable)
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "onDelete(object observable)");
     }
-    corto_assert(_methodId, "virtual method 'onDelete(object observable)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'onDelete(object observable)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1136,7 +1135,7 @@ void _corto_replicator_onInvoke(corto_replicator this, corto_object instance, co
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "onInvoke(object instance,function proc,octetseq args)");
     }
-    corto_assert(_methodId, "virtual method 'onInvoke(object instance,function proc,octetseq args)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'onInvoke(object instance,function proc,octetseq args)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1168,7 +1167,7 @@ corto_resultIter _corto_replicator_onRequest(corto_replicator this, corto_object
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "onRequest(object parent,string expr)");
     }
-    corto_assert(_methodId, "virtual method 'onRequest(object parent,string expr)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'onRequest(object parent,string expr)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1199,7 +1198,7 @@ void _corto_replicator_onUpdate(corto_replicator this, corto_object observable)
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "onUpdate(object observable)");
     }
-    corto_assert(_methodId, "virtual method 'onUpdate(object observable)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'onUpdate(object observable)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1267,7 +1266,7 @@ corto_bool _corto_struct_castable(corto_struct this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "castable(type type)");
     }
-    corto_assert(_methodId, "virtual method 'castable(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'castable(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1298,7 +1297,7 @@ corto_bool _corto_struct_compatible(corto_struct this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "compatible(type type)");
     }
-    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1343,7 +1342,7 @@ corto_member _corto_struct_resolveMember(corto_struct this, corto_string name) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "resolveMember(string name)");
     }
-    corto_assert(_methodId, "virtual method 'resolveMember(string name)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'resolveMember(string name)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1388,7 +1387,7 @@ corto_uint32 _corto_type_allocSize(corto_type this) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "allocSize()");
     }
-    corto_assert(_methodId, "virtual method 'allocSize()' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'allocSize()' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1419,7 +1418,7 @@ corto_bool _corto_type_castable(corto_type this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "castable(type type)");
     }
-    corto_assert(_methodId, "virtual method 'castable(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'castable(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);
@@ -1471,7 +1470,7 @@ corto_bool _corto_type_compatible(corto_type this, corto_type type) {
     if (!_methodId) {
         _methodId = corto_interface_resolveMethodId(_abstract, "compatible(type type)");
     }
-    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in abstract '%s'", corto_nameof(_abstract));
+    corto_assert(_methodId, "virtual method 'compatible(type type)' not found in interface '%s'", corto_nameof(_abstract));
 
     /* Lookup method-object. */
     _method = corto_interface_resolveMethodById(_abstract, _methodId);