Changeset 22915 for v6

Timestamp:

11/07/08 23:13:54 (2 months ago)

Author:

pmurias

Message:

[smop]
removed SLIME
commented out slime using tests
commented out test 1 as it tests slightly inlegal things and is duplicated by higher level stuff
test 4 fails as we are doing DESTROYALL incorrectly now

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (4 diffs)
• include/smop_lowlevel.h (modified) (1 diff)
• include/smop_s1p.h (modified) (1 diff)
• include/smop_slime.h (deleted)
• src/internal.h (modified) (2 diffs)
• src/lowlevel.sm0p (modified) (6 diffs)
• src/slime_capturize.c (deleted)
• src/slime_currentframe.c (deleted)
• src/slime_frame.c (deleted)
• src/slime_node.c (deleted)

v6/smop/CMakeLists.txt

@@ -1 +1 @@
 project (smop)
+#SET( CMAKE_C_FLAGS "-O0 -g3 -DSMOP_LOWLEVEL_MEM_TRACE -DSMOP_HUNT_NULLS" )
 SET( CMAKE_C_FLAGS "-O0 -g3 -DSMOP_LOWLEVEL_MEM_TRACE" )
 #SET( CMAKE_C_FLAGS "-O0 -g3 -DSMOP_LOWLEVEL_MEM_TRACE -DSMOP_LOWLEVEL_MEM_DEBUG -DSMOP_MOLD_DEBUG -DSMOP_SLIME_DEBUG" )
@@ -151 +152 @@
     src/s1p_ritest.c
     src/s1p_hash_bvalue.c
-    src/slime_capturize.c
-    src/slime_currentframe.c
-    src/slime_frame.c
-    src/slime_node.c
     src/ri.c
     src/proto.c
@@ -166 +163 @@
 INCLUDE (FindThreads)
 foreach (test_file
-    test/01_smop_lowlevel.c
-    test/02_stack.sm0p
+
+    # SLIME tests
+    #test/09_threads.sm0p
+    #test/02_stack.sm0p
+    #test/12_p6opaque.sm0p
+    #test/16_labels.sm0p
+    #test/17_sm0p.sm0p
+
+    # v6-sm0p
+    #test/14_p6opaque_methods.sm0p
+    #test/22_smop_s1p_attribute.sm0p
+    #test/28_pure_prototype_how.sm0p
+
+    #test/01_smop_lowlevel.c
+
     test/03_const_identifier.c
     test/04_interpreter.c
@@ -175 +185 @@
     test/07_native_int.c
     test/08_native_uint.c
-    test/09_threads.sm0p
     test/10_lowlevel_methods.c
-    test/12_p6opaque.sm0p
-    test/14_p6opaque_methods.sm0p
     test/15_hash.p6
-    test/16_labels.sm0p
-    test/17_sm0p.sm0p
     test/18_root_namespace.p6
     test/19_array.p6
     test/20_smop_s1p_ccode.c
     test/21_code.m0ld
-    test/22_smop_s1p_attribute.sm0p
     test/23_mold.sm0p
     test/24_m0ld.m0ld
     test/25_lexical_scope.p6
     test/27_default_block_signature.p6
-    test/28_pure_prototype_how.sm0p
     test/29_bind_capture_signature.p6
     test/30_array_map.m0ld

v6/smop/include/smop_lowlevel.h

@@ -4 +4 @@
 
 #include <smop.h>
-#include <smop_slime.h>
 #include <pthread.h>
 

v6/smop/include/smop_s1p.h

@@ -64 +64 @@
 
 #define ___CONST_IDENTIFIER_ONLY___ \
+    if (SMOP_RI(identifier) != SMOP_RI(SMOP__ID__new)) {\
+        fprintf("%s\n",SMOP_RI(SMOP__ID__new)->id);\
+    }\
     assert(SMOP_RI(identifier) == SMOP_RI(SMOP__ID__new))
 

v6/smop/src/internal.h

@@ -22 +22 @@
      smop_native_bool_init();         \
      smop_ri_init();                  \
-     smop_proto_init();               \
-     smop_slime_frame_init();         \
-     smop_slime_currentframe_init();  \
-     smop_slime_node_init();          \
-     smop_slime_capturize_init();     
+     smop_proto_init();               
 #define SMOP_INTERNAL_SHUTDOWN_SEQUENCE  \
-     smop_slime_capturize_destr();       \
-     smop_slime_node_destr();            \
-     smop_slime_currentframe_destr();    \
-     smop_slime_frame_destr();           \
      smop_native_int_destr();            \
      smop_native_bool_destr();           \
@@ -143 +135 @@
 void smop_interpreter_init();
 void smop_interpreter_destr(); 
-void smop_slime_frame_init();
-void smop_slime_frame_destr();
-void smop_slime_currentframe_init();
-void smop_slime_currentframe_destr();
-void smop_slime_node_init();
-void smop_slime_node_destr();
-void smop_slime_capturize_init();
-void smop_slime_capturize_destr();
 void smop_native_bool_init();
 void smop_native_bool_destr();

v6/smop/src/lowlevel.sm0p

@@ -105 +105 @@
 
 
-SMOP__Object* SMOP__LOWLEVEL__Operators;
-
-static SMOP__Object* lowlevelop_message(SMOP__Object* interpreter,
-                                        SMOP__ResponderInterface* self,
-                                        SMOP__Object* identifier,
-                                        SMOP__Object* capture) {
-  if (identifier == SMOP__ID__free) {
-    SMOP_DISPATCH(interpreter,SMOP__SLIME__CurrentFrame,SMOP__ID__free,
-                  SMOP__NATIVE__capture_create(interpreter,SMOP__SLIME__CurrentFrame,NULL,NULL));
-#ifdef SMOP_LOWLEVEL_MEM_TRACE
-    smop_mem_trace_del(capture);
-#endif
-    smop_lowlevel_free(capture);
-  } else {
-    SMOP_RELEASE(interpreter,capture);
-  }
-  return SMOP__NATIVE__bool_false;
-}
 
 static SMOP__Object* lowlevelop_reference(SMOP__Object* interpreter, SMOP__ResponderInterface* responder, SMOP__Object* obj) {
@@ -133 +115 @@
 
 void smop_lowlevel_init() {
-  SMOP__LOWLEVEL__Operators = malloc(sizeof(SMOP__ResponderInterface));
-  ((SMOP__ResponderInterface*)SMOP__LOWLEVEL__Operators)->RI = NULL;
-  ((SMOP__ResponderInterface*)SMOP__LOWLEVEL__Operators)->MESSAGE = lowlevelop_message;
-  ((SMOP__ResponderInterface*)SMOP__LOWLEVEL__Operators)->REFERENCE = lowlevelop_reference;
-  ((SMOP__ResponderInterface*)SMOP__LOWLEVEL__Operators)->RELEASE = lowlevelop_release;
-  ((SMOP__ResponderInterface*)SMOP__LOWLEVEL__Operators)->id = "SMOP Lowlevel Operator";
-
 #ifdef SMOP_LOWLEVEL_MEM_TRACE
   trace_list_alloc = 1024;
@@ -158 +133 @@
   free(trace_list);
 #endif
-  free(SMOP__LOWLEVEL__Operators);
 }
 
@@ -181 +155 @@
 
       if ((SMOP__Object*)SMOP_RI(value) == SMOP__INTPTR__InterpreterInstance ||
-          (SMOP__Object*)SMOP_RI(value) == SMOP__SLIME__Frame ||
-          (SMOP__Object*)SMOP_RI(value) == SMOP__SLIME__Node ||
-          (SMOP__Object*)SMOP_RI(value) == SMOP__SLIME__Capturize ||
           (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__capture ||
           (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__int ||
@@ -200 +171 @@
       smop_lowlevel_free(value);
     } else if ((SMOP__Object*)SMOP_RI(value) == SMOP__INTPTR__InterpreterInstance ||
-               (SMOP__Object*)SMOP_RI(value) == SMOP__SLIME__Frame ||
-               (SMOP__Object*)SMOP_RI(value) == SMOP__SLIME__Node ||
-               (SMOP__Object*)SMOP_RI(value) == SMOP__SLIME__Capturize ||
                (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__capture ||
                (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__int ||
@@ -215 +183 @@
 
     } else {
-      // This is where the continuation will be manipulated as described in the .h file.
-      SMOP__Object* current = SMOP_DISPATCH(interpreter, SMOP_RI(interpreter), SMOP__ID__continuation,
-                                            SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,interpreter),NULL,NULL));
-      SMOP__Object* continuation = NULL;
-      continuation = q:sm0p {
-        ;
-        $value.DESTROYALL($value);
-        $SMOP__SLIME__CurrentFrame.$SMOP__ID__forget();
-        $SMOP__LOWLEVEL__Operators.$SMOP__ID__free(|$value);
-        $interpreter.goto(|$current);
-      };
-      SMOP_DISPATCH(interpreter, SMOP_RI(interpreter), SMOP__ID__goto,  continuation);
+       SMOP_DISPATCH(interpreter, SMOP_RI(value), SMOP__ID__DESTROYALL, SMOP__NATIVE__capture_create(interpreter,value,NULL,NULL));
+#ifdef SMOP_LOWLEVEL_MEM_TRACE
+      smop_mem_trace_del(value);
+#endif
+
+      smop_lowlevel_free(value);
     }
     return NULL;