Changeset 22511

Timestamp:

10/05/08 11:58:38 (7 weeks ago)

Author:

pmurias

Message:

[smop] reverted 22507 as it create segfaults, and after trying to get it to work i belive that plugging it into the loading sequence in smop_internal.h unnesesarly complex and frail

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (2 diffs)
• include/smop_s1p.h (modified) (1 diff)
• src/smop_internal.h (modified) (8 diffs)
• src/smop_s1p_preludescope.sm0p (deleted)
• test/36_prelude_scope.p6-pugs (deleted)

v6/smop/CMakeLists.txt

@@ -98 +98 @@
     src/smop_s1p_grep.sm0p
     src/smop_s1p_array_iterator.sm0p
-    src/smop_s1p_preludescope.sm0p
 )
 compile_sm0p (${sm0p_file})
@@ -143 +142 @@
     src/smop_s1p_scalar.c
     src/smop_s1p_str.c
-    src/smop_s1p_preludescope.c
     src/smop_slime_capturize.c
     src/smop_slime_currentframe.c

v6/smop/include/smop_s1p.h

@@ -26 +26 @@
 extern SMOP__Object* SMOP__S1P__BindCaptureSignature;
 extern SMOP__Object* SMOP__S1P__PurePrototypeHow;
-extern SMOP__Object* SMOP__S1P__PreludeScope;
 extern SMOP__Object* SMOP__GlobalInterpreter;
 

v6/smop/src/smop_internal.h

@@ -67 +67 @@
      smop_s1p_array_iterator_init();        \
      smop_s1p_emptylist_init();             \
-     smop_s1p_endofiterator_init();         \
-     smop_s1p_preludescope_init();          \
-     /* preludescope_populate should be the last */ \
-     smop_s1p_preludescope_populate();
-
+     smop_s1p_endofiterator_init();
 #define SMOP_INTERNAL_DESTROY_SEQUENCE      \
-     smop_s1p_preludescope_destr();         \
      smop_s1p_endofiterator_destr();        \
      smop_s1p_emptylist_destr();            \
@@ -95 +90 @@
      smop_s1p_ccode_destr();                \
      smop_s1p_code_destr();                 \
-     smop_mold_destr();                     
+     smop_mold_destr();                    
 
 #define SMOP_BOOTSTRAP_INIT_SEQUENCE        \
@@ -125 +120 @@
 void smop_interpreter_init();
 void smop_interpreter_destr(); 
-
 void smop_slime_frame_init();
 void smop_slime_frame_destr();
@@ -134 +128 @@
 void smop_slime_capturize_init();
 void smop_slime_capturize_destr();
-
 void smop_native_bool_init();
 void smop_native_bool_destr();
@@ -141 +134 @@
 void smop_native_uint_init();
 void smop_native_uint_destr();
-
 void smop_lowlevel_method_init();
 void smop_lowlevel_method_destr();
 void smop_p6opaque_init();
 void smop_p6opaque_destr();
-
 void smop_s1p_scalar_init();
 void smop_s1p_scalar_destr();
@@ -155 +146 @@
 void smop_s1p_ccode_init();
 void smop_s1p_ccode_destr();
-
 void smop_s1p_lexicalscope_init();
 void smop_s1p_lexicalscope_destr();
 void smop_s1p_lexicalscope_mold_init();
 void smop_s1p_lexicalscope_mold_destr();
-
 void smop_s1p_defaultblocksignature_init();
 void smop_s1p_defaultblocksignature_destr();
 void smop_s1p_defaultblocksignature_mold_init();
 void smop_s1p_defaultblocksignature_mold_destr();
-
 void smop_s1p_bindcapturesignature_init();
 void smop_s1p_bindcapturesignature_destr();
 void smop_s1p_bindcapturesignature_mold_init();
 void smop_s1p_bindcapturesignature_mold_destr();
-
 void smop_s1p_pureprototypehow_init();
 void smop_s1p_pureprototypehow_destr();
 void smop_s1p_pureprototypehow_mold_init();
 void smop_s1p_pureprototypehow_mold_destr();
-
 void smop_s1p_capturize_init();
 void smop_s1p_capturize_destr();
@@ -182 +168 @@
 void smop_s1p_itemrwcontext_init();
 void smop_s1p_itemrwcontext_destr();
-
-
 void smop_s1p_emptylist_init();
 void smop_s1p_emptylist_destr();
@@ -189 +173 @@
 void smop_s1p_endofiterator_destr();
 
-void smop_s1p_preludescope_init();
-void smop_s1p_preludescope_destr();
-void smop_s1p_preludescope_populate();
-
 #endif