Changeset 22230 for v6

Timestamp:

09/12/08 20:17:52 (3 months ago)

Author:

pmurias

Message:

[smop] meta RI, it's only used by the IO RI `

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (1 diff)
• include/smop_lowlevel.h (modified) (3 diffs)
• include/smop_s1p.h (modified) (2 diffs)
• src/smop.c (modified) (1 diff)
• src/smop_internal.h (modified) (2 diffs)
• src/smop_lowlevel.sm0p (modified) (1 diff)
• src/smop_ri.c (added)
• src/smop_s1p_io.c (modified) (4 diffs)
• src/smop_s1p_root_namespace.c (modified) (1 diff)
• test/16_labels.sm0p (modified) (1 diff)
• test/17_sm0p.sm0p (modified) (1 diff)
• test/23_mold.sm0p (modified) (1 diff)

v6/smop/CMakeLists.txt

@@ -111 +111 @@
     src/smop_slime_frame.c
     src/smop_slime_node.c
+    src/smop_ri.c
 )
 

v6/smop/include/smop_lowlevel.h

@@ -5 +5 @@
 #include <smop.h>
 #include <smop_slime.h>
+#include <pthread.h>
 
 /* The lowlevel SMOP API is an additional API that is not included by
@@ -21 +22 @@
 extern void smop_lowlevel_destr();
 
+typedef struct SMOP_LOWLEVEL_INTERNAL {
+  int ref_cnt;
+  pthread_rwlock_t* rwlock;
+} SMOP_LOWLEVEL_INTERNAL;
+
 /* This function is the place from where every allocation should
  * happen.
@@ -36 +42 @@
  */
 extern SMOP__Object* smop_lowlevel_refcnt_inc(SMOP__Object* interpreter, SMOP__ResponderInterface* ri, SMOP__Object* value);
+
+SMOP__Object* SMOP__RI__create(
+  SMOP__Object* (*MESSAGE)  (SMOP__Object* interpreter,           
+                             SMOP__ResponderInterface* self,      
+                             SMOP__Object* identifier,            
+                             SMOP__Object* capture),              
+  SMOP__Object* (*REFERENCE)(SMOP__Object* interpreter,           
+                             SMOP__ResponderInterface* self,      
+                             SMOP__Object* object),               
+  SMOP__Object* (*RELEASE)  (SMOP__Object* interpreter,           
+                             SMOP__ResponderInterface* self,      
+                             SMOP__Object* object),
+  char *id
+); 
 
 /* This functions decrements the reference count of a value, it should

v6/smop/include/smop_s1p.h

@@ -6 +6 @@
 extern SMOP__Object* SMOP__S1P__Array;
 extern SMOP__Object* SMOP__S1P__Array_Iterator;
-extern SMOP__Object* SMOP__S1P__IO;
 extern SMOP__Object* SMOP__S1P__Str;
 extern SMOP__Object* SMOP__S1P__Hash;
@@ -42 +41 @@
 SMOP__Object* SMOP__S1P__Scalar_FETCH(SMOP__Object* object);
 SMOP__Object* SMOP__S1P__Scalar_STORE(SMOP__Object* object, SMOP__Object* new_value);
-SMOP__Object* SMOP__S1P__IO_create(void);
+SMOP__Object* SMOP__S1P__IO_create(SMOP__Object* interpreter);
 SMOP__Object* SMOP__S1P__Hash_create(void);
 SMOP__Object* SMOP__S1P__Array_create(void);

v6/smop/src/smop.c

@@ -37 +37 @@
                                              NULL, NULL));
 
+  SMOP_INTERNAL_DESTROY_SEQUENCE;
   SMOP_RELEASE(SMOP__INTPTR__InterpreterInstance,SMOP__GlobalInterpreter);
-  SMOP_INTERNAL_DESTROY_SEQUENCE;
   SMOP_INTERNAL_SHUTDOWN_SEQUENCE;
 }

v6/smop/src/smop_internal.h

@@ -21 +21 @@
      smop_native_int_init();          \
      smop_native_bool_init();         \
+     smop_ri_init();                  \
      smop_slime_frame_init();         \
      smop_slime_currentframe_init();  \
      smop_slime_node_init();          \
-     smop_slime_capturize_init();
+     smop_slime_capturize_init();     
 #define SMOP_INTERNAL_SHUTDOWN_SEQUENCE  \
      smop_slime_capturize_destr();       \
@@ -35 +36 @@
      smop_interpreter_destr();           \
      smop_lowlevel_destr();              \
+     smop_ri_destr();                    \
      smop_idconst_destr();
 

v6/smop/src/smop_lowlevel.sm0p

@@ -79 +79 @@
 #endif
 
-typedef struct SMOP_LOWLEVEL_INTERNAL {
-  int ref_cnt;
-  pthread_rwlock_t* rwlock;
-} SMOP_LOWLEVEL_INTERNAL;
 
 

v6/smop/src/smop_s1p_io.c

@@ -5 +5 @@
 #include <smop_s1p.h>
 
-SMOP__Object* SMOP__S1P__IO;
+static SMOP__Object* SMOP__S1P__IO;
 
 typedef struct smop_s1p_io_struct {
@@ -11 +11 @@
 } smop_s1p_io_struct;
 
-SMOP__Object* SMOP__S1P__IO_create(void) {
+SMOP__Object* SMOP__S1P__IO_create(SMOP__Object* interpreter) {
+    SMOP_REFERENCE(interpreter,SMOP__S1P__IO);
     SMOP__Object* ret = smop_lowlevel_alloc(sizeof(smop_s1p_io_struct));
     ret->RI = (SMOP__ResponderInterface*)SMOP__S1P__IO;
@@ -46 +47 @@
         }
 
-        SMOP_RELEASE(interpreter,obj);
-    }
+        SMOP_RELEASE(interpreter,obj); }
   } else if (identifier == SMOP__ID__new) {
-    SMOP__S1P__IO_create();
+    SMOP__S1P__IO_create(interpreter);
   } else if (identifier == SMOP__ID__DESTROYALL) {
+    SMOP_RELEASE(interpreter,SMOP__S1P__IO);
   } else {
     fprintf(stderr,"unkown method at S1P::IO\n");
@@ -62 +63 @@
 
 void smop_s1p_io_init() {
-  SMOP__S1P__IO = calloc(1,sizeof(SMOP__ResponderInterface));
-  ((SMOP__ResponderInterface*)SMOP__S1P__IO)->MESSAGE = smop_s1p_io_message;
-  ((SMOP__ResponderInterface*)SMOP__S1P__IO)->REFERENCE = smop_lowlevel_generic_reference;
-  ((SMOP__ResponderInterface*)SMOP__S1P__IO)->RELEASE = smop_lowlevel_generic_release;
-  ((SMOP__ResponderInterface*)SMOP__S1P__IO)->id = "Lowlevel io";
+  SMOP__S1P__IO = SMOP__RI__create(
+      smop_s1p_io_message,
+      smop_lowlevel_generic_reference,
+      smop_lowlevel_generic_release,
+      "Lowlevel io");
 }
 
 void smop_s1p_io_destr() {
-  free(SMOP__S1P__IO);
+  SMOP__ResponderInterface* ri = (SMOP__ResponderInterface*) SMOP__S1P__IO;
+  SMOP_RELEASE(SMOP__GlobalInterpreter,SMOP__S1P__IO);
 }
 

v6/smop/src/smop_s1p_root_namespace.c

@@ -26 +26 @@
   smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Hash",SMOP__S1P__Hash_create());
   smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Array",SMOP__S1P__Array_create());
-  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"$*OUT",SMOP__S1P__IO_create());
+  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"$*OUT",SMOP__S1P__IO_create(SMOP__GlobalInterpreter));
   //smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Code",SMOP__S1P__Code_create(SMOP__NATIVE__bool_false));
   SMOP__Object* mold = SMOP__Mold_create(0,(SMOP__Object*[]) { NULL },1,(int[]) { 0 });

v6/smop/test/16_labels.sm0p

@@ -19 +19 @@
   SMOP__Object* node = NULL;
 
-  SMOP__Object* io = SMOP__S1P__IO_create();
+  SMOP__Object* io = SMOP__S1P__IO_create(interpreter);
   node = q:sm0p {
     ;

v6/smop/test/17_sm0p.sm0p

@@ -19 +19 @@
   SMOP__Object* node = NULL;
 
-  SMOP__Object* io   = SMOP__S1P__IO_create();
+  SMOP__Object* io   = SMOP__S1P__IO_create(interpreter);
   node = q:sm0p {
     ;

v6/smop/test/23_mold.sm0p

@@ -20 +20 @@
   SMOP__Object* mold = SMOP__Mold_create(1,
     (SMOP__Object*[]) { /* constants */
-      SMOP__S1P__IO_create(), 
+      SMOP__S1P__IO_create(interpreter), 
       SMOP__NATIVE__idconst_create("print"), 
       SMOP__S1P__Str_create("ok 2 - simple method call works\n"),