Changeset 22299 for v6

Timestamp:

09/20/08 15:36:33 (2 months ago)

Author:

ruoso

Message:

[smop] YAY! YAY! we do have map and grep now!
test/35 is the m0ld version of the following code
map { $_ > 3 ?? print "not ok - item > 3\n" !! print "ok - item < 3\n" },

grep { print "ok - grep iteration"; $_ < 3 } 2..5;

Location:

v6/smop

Files:

• src/native_int.c (modified) (1 diff)
• src/smop_s1p_array.c (modified) (1 diff)
• src/smop_s1p_array_iterator.sm0p (modified) (1 diff)
• src/smop_s1p_emptylist.c (modified) (1 diff)
• src/smop_s1p_grep.sm0p (modified) (1 diff)
• src/smop_s1p_map.sm0p (modified) (1 diff)
• test/35_array_grep.m0ld (modified) (2 diffs)

v6/smop/src/native_int.c

@@ -41 +41 @@
     SMOP_RELEASE(interpreter, other);
     SMOP_RELEASE(interpreter,invocant);
+
+  } else if (identifier == SMOP__ID__defined) {
+    ret = SMOP__NATIVE__bool_true;
+    
+  } else if (identifier == SMOP__ID__FETCH) {
+    ___NATIVE_CAPTURE_ONLY___;
+    ___INVOCANT_RI_SHOULD_MATCH___;
+    ret = invocant;
 
   } else if (identifier == SMOP__ID__infix_num_ge) {

v6/smop/src/smop_s1p_array.c

@@ -112 +112 @@
     }
 
+  } else if (identifier == SMOP__ID__defined) {
+    // the array container is defined, the value inside it that maybe not.
+    ret = SMOP__NATIVE__bool_true;
+
   } else if (identifier == SMOP__ID__STORE) {
     resize_array(invocant->array,invocant->index+1);

v6/smop/src/smop_s1p_array_iterator.sm0p

@@ -124 +124 @@
       $void = $interpreter."goto"($back);
      final:
-      $void = $back."setr"(¢SMOP__S1P__EmptyList);
+      $void = $back."setr"(¢SMOP__S1P__EndOfIterator);
       $void = $interpreter."goto"($back)
 

v6/smop/src/smop_s1p_emptylist.c

@@ -27 +27 @@
 
   } else if (identifier == SMOP__ID__List) {
+    ret = SMOP__S1P__EmptyList;
+
+  } else if (identifier == SMOP__ID__FETCH) {
     ret = SMOP__S1P__EmptyList;
 

v6/smop/src/smop_s1p_grep.sm0p

@@ -117 +117 @@
     my $input_iterator;
     
+    fetch_item:
     my $next_item = $input_iterator."prefix:="();
-    my $list = $next_item."List"();
-    my $elems = $list."elems"();
-    my $greater = $elems."infix:>"(0);
-    my $bool = $greater."bool"();
+    my $bool = $next_item."defined"();
     if $bool { goto iteration } else { goto end };
-
+    
     iteration:
     my $item = $next_item."FETCH"();
     my $result = $code."postcircumfix:( )"($item);
-    my $void = $back."setr"($result);
+    my $bool = $result."bool"();
+    if $bool { goto in } else { goto fetch_item };
+    
+    in:
+    my $void = $back."setr"($item);
     $void = $interpreter."goto"($back);
-
+    
     end:
     $void = $back."setr"(¢SMOP__S1P__EndOfIterator);
     $void = $interpreter."goto"($back);
-
+    
   };
 

v6/smop/src/smop_s1p_map.sm0p

@@ -114 +114 @@
     
     my $next_item = $input_iterator."prefix:="();
-    my $list = $next_item."List"();
-    my $elems = $list."elems"();
-    my $greater = $elems."infix:>"(0);
-    my $bool = $greater."bool"();
+    my $bool = $next_item."defined"();
     if $bool { goto iteration } else { goto end };
 

v6/smop/test/35_array_grep.m0ld

@@ -43 +43 @@
     my $back = $continuation."back"();
     
-    if $bool { goto in } else { goto out };
+    if $bool { goto out } else { goto in };
+    
+    in:
+    $void = $back."setr"(¢SMOP__NATIVE__bool_true);
+    $void = $interpreter."goto"($back);
     
     out:
-    $void = $back."setr"(¢SMOP__NATIVE__bool_true);
-    goto end;
-    
-    in:
     $void = $back."setr"(¢SMOP__NATIVE__bool_false);
-    
-    end:
     $void = $interpreter."goto"($back);
 }));
@@ -76 +74 @@
 
     in:
-    $void = $out."print"("ok\n");
+    $void = $out."print"("ok - item < 3 \n");
     goto end;
 
     out:
-    $void = $out."print"("not ok\n");
+    $void = $out."print"("not ok - item > 3\n");
 
     end: