Changeset 22288 for v6

Timestamp:

09/20/08 01:03:21 (2 months ago)

Author:

ruoso

Message:

[smop] YAY! SMOP now supports lazy map, for now there is only map in Void context, which means eager evaluation...

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (1 diff)
• include/smop_s1p.h (modified) (1 diff)
• src/native_bool.c (modified) (1 diff)
• src/smop_internal.h (modified) (2 diffs)
• src/smop_s1p_emptylist.c (modified) (1 diff)
• src/smop_s1p_endofiterator.c (added)
• src/smop_s1p_map.sm0p (modified) (4 diffs)

v6/smop/CMakeLists.txt

@@ -131 +131 @@
     src/smop_s1p_pureprototypehow.c
     src/smop_s1p_emptylist.c
+    src/smop_s1p_endofiterator.c
     src/smop_s1p_bindcapturesignature.c
     src/smop_s1p_defaultblocksignature.c

v6/smop/include/smop_s1p.h

@@ -7 +7 @@
 extern SMOP__Object* SMOP__S1P__Array;
 extern SMOP__Object* SMOP__S1P__Array_Iterator;
+extern SMOP__Object* SMOP__S1P__EndOfIterator;
 extern SMOP__Object* SMOP__S1P__Str;
 extern SMOP__Object* SMOP__S1P__Hash;

v6/smop/src/native_bool.c

@@ -22 +22 @@
     SMOP_RELEASE(interpreter,capture);
     return invocant;
+  } else if (identifier = SMOP__ID__defined) {
+    SMOP_RELEASE(interpreter,capture);
+    return SMOP__NATIVE__bool_true;
   } else {
     ___UNKNOWN_METHOD___;

v6/smop/src/smop_internal.h

@@ -65 +65 @@
      smop_s1p_map_init();                   \
      smop_s1p_array_iterator_init();        \
-     smop_s1p_emptylist_init();
+     smop_s1p_emptylist_init();             \
+     smop_s1p_endofiterator_init();
 #define SMOP_INTERNAL_DESTROY_SEQUENCE      \
+     smop_s1p_endofiterator_destr();        \
      smop_s1p_emptylist_destr();            \
      smop_s1p_array_iterator_destr();       \
@@ -164 +166 @@
 void smop_s1p_emptylist_init();
 void smop_s1p_emptylist_destr();
+void smop_s1p_endofiterator_init();
+void smop_s1p_endofiterator_destr();
 
 #endif

v6/smop/src/smop_s1p_emptylist.c

@@ -16 +16 @@
   if (identifier == SMOP__ID__new) {
     ret = SMOP__S1P__EmptyList;
+
+  } else if (identifier == SMOP__ID__defined) {
+    ret = SMOP__NATIVE__bool_true;
 
   } else if (identifier == SMOP__ID__postcircumfix_square) {

v6/smop/src/smop_s1p_map.sm0p

@@ -12 +12 @@
   SMOP__Object* input_iterator;
   SMOP__Object* code;
-} smop_s1p_array_struct;
+} smop_s1p_map_iterator_struct;
 
 static SMOP__Object* map_iterator_consume_mold;
+static SMOP__Object* map_iterator_voidcontext_mold;
 
 static SMOP__Object* smop_s1p_map_message(SMOP__Object* interpreter,
@@ -26 +27 @@
 
   if (identifier == SMOP__ID__postcircumfix_parens) {
-    ret = smop_lowlevel_alloc(sizeof(smop_s1p_array_struct));
+    ret = smop_lowlevel_alloc(sizeof(smop_s1p_map_iterator_struct));
     ret->RI = (SMOP__ResponderInterface*)SMOP__S1P__map;
-    ((smop_s1p_array_struct*)ret)->code = SMOP__NATIVE__capture_positional(interpreter,capture,0);
-    ((smop_s1p_array_struct*)ret)->input_iterator = SMOP__NATIVE__capture_positional(interpreter,capture,1);
+    ((smop_s1p_map_iterator_struct*)ret)->code = SMOP__NATIVE__capture_positional(interpreter,capture,0);
+    ((smop_s1p_map_iterator_struct*)ret)->input_iterator = SMOP__NATIVE__capture_positional(interpreter,capture,1);
 
   } else if (identifier == SMOP__ID__Void) {
     // map in void context should evaluate eagerly.
+
+    SMOP__Object* frame = (SMOP__Object*)SMOP__Mold__Frame_create(interpreter,SMOP_REFERENCE(interpreter,map_iterator_voidcontext_mold));
+    SMOP__Object* back = SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
+      SMOP__ID__continuation,
+      SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,interpreter),
+        NULL,NULL));
+
+    mold_reg_set(interpreter,frame,0,SMOP_REFERENCE(interpreter,interpreter));
+    mold_reg_set(interpreter,frame,1,SMOP_REFERENCE(interpreter,capture));
+    mold_reg_set(interpreter,frame,2,back);
+    mold_reg_set(interpreter,frame,3,SMOP_REFERENCE(interpreter,invocant));
+
+    SMOP_DISPATCH(interpreter,SMOP_RI(interpreter),SMOP__ID__goto,frame);
     
+  } else if (identifier == SMOP__ID__prefix_equal) {
+    // this is the bare iterator without a context applied, which
+    // means that it returns the bare return of the code.
+
+    smop_lowlevel_rdlock(invocant);
+    SMOP__Object* code = ((smop_s1p_map_iterator_struct*)invocant)->code;
+    SMOP__Object* in = ((smop_s1p_map_iterator_struct*)invocant)->input_iterator;
+    smop_lowlevel_unlock(invocant);
+
+    SMOP__Object* frame = (SMOP__Object*)SMOP__Mold__Frame_create(interpreter,SMOP_REFERENCE(interpreter,map_iterator_consume_mold));
+    SMOP__Object* back = SMOP_DISPATCH(interpreter, SMOP_RI(interpreter),
+      SMOP__ID__continuation,
+      SMOP__NATIVE__capture_create(interpreter,SMOP_REFERENCE(interpreter,interpreter),
+        NULL,NULL));
+
+    mold_reg_set(interpreter,frame,0,SMOP_REFERENCE(interpreter,interpreter));
+    mold_reg_set(interpreter,frame,1,SMOP_REFERENCE(interpreter,capture));
+    mold_reg_set(interpreter,frame,2,back);
+    mold_reg_set(interpreter,frame,3,SMOP_REFERENCE(interpreter,code));
+    mold_reg_set(interpreter,frame,4,SMOP_REFERENCE(interpreter,in));
+
+    SMOP_DISPATCH(interpreter,SMOP_RI(interpreter),SMOP__ID__goto,frame);
 
   } else if (identifier == SMOP__ID__DESTROYALL) {
     smop_lowlevel_wrlock(invocant);
-    SMOP__Object* code = ((smop_s1p_array_struct*)invocant)->code;
-    ((smop_s1p_array_struct*)invocant)->code = NULL;
-    SMOP__Object* in = ((smop_s1p_array_struct*)invocant)->input_iterator;
-    ((smop_s1p_array_struct*)invocant)->input_iterator = NULL;
+    SMOP__Object* code = ((smop_s1p_map_iterator_struct*)invocant)->code;
+    ((smop_s1p_map_iterator_struct*)invocant)->code = NULL;
+    SMOP__Object* in = ((smop_s1p_map_iterator_struct*)invocant)->input_iterator;
+    ((smop_s1p_map_iterator_struct*)invocant)->input_iterator = NULL;
     smop_lowlevel_unlock(invocant);
     
@@ -71 +107 @@
   SMOP__Object* interpreter = SMOP__GlobalInterpreter;
   map_iterator_consume_mold = q:m0ld {
+    my $interpreter;
     my $capture;
     my $back;
-    my $interpreter;
+    my $code;
+    my $input_iterator;
+    
+    my $next_item = $input_iterator."prefix:="();
+    my $list = $next_item."List"();
+    my $elems = $list."elems"();
+    my $greater = $elems."infix:>"(0);
+    my $bool = $greater."bool"();
+    if $bool { goto iteration } else { goto end };
 
-
-    my $result;
+    iteration:
+    my $item = $next_item."FETCH"();
+    my $result = $code."postcircumfix:( )"($item);
     my $void = $back."setr"($result);
     $void = $interpreter."goto"($back);
+
+    end:
+    $void = $back."setr"(¢SMOP__S1P__EndOfIterator);
+    $void = $interpreter."goto"($back);
+
+  };
+
+  map_iterator_voidcontext_mold = q:m0ld {
+    my $interpreter;
+    my $capture;
+    my $back;
+    my $invocant;
+
+    while:
+    my $result = $invocant."prefix:="();
+    my $defined = $result."defined"();
+    
+    if $defined { goto iteration } else { goto end };
+    
+    iteration:
+    goto while;
+    
+    end:
+    my $void = $interpreter."goto"($back);
+    
   };
 
@@ -86 +157 @@
   SMOP_RELEASE(SMOP__GlobalInterpreter, map_iterator_consume_mold);
   map_iterator_consume_mold = NULL;
+  SMOP_RELEASE(SMOP__GlobalInterpreter, map_iterator_voidcontext_mold);
+  map_iterator_voidcontext_mold = NULL;
 }