Changeset 22940 for v6

Timestamp:

11/09/08 21:26:02 (2 months ago)

Author:

pmurias

Message:

[smop] changed "bool" to "true", native_int uses the RI DSL

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (1 diff)
• include/smop_identifiers.h (modified) (1 diff)
• src/idconst_decl_all.h (modified) (1 diff)
• src/idconst_init_all.c (modified) (2 diffs)
• src/lowlevel.sm0p (modified) (2 diffs)
• src/native_bool.c (modified) (1 diff)
• src/native_int.ri (moved) (moved from v6/smop/src/native_int.c) (5 diffs)
• src/s1p_array.c (modified) (1 diff)
• src/s1p_grep.sm0p (modified) (1 diff)
• src/s1p_lexicalscope.ri (modified) (2 diffs)
• src/s1p_lexicalscope.sm0p (modified) (2 diffs)
• src/s1p_scalar.c (modified) (1 diff)
• test/32_array_iterator.m0ld (modified) (1 diff)
• test/34_array_unshift.m0ld (modified) (1 diff)
• test/35_array_grep.m0ld (modified) (2 diffs)
• test/36_adhoc_signature.m0ld (modified) (1 diff)
• test/37_multisub.m0ld (modified) (4 diffs)
• test/38_ritest.m0ld (modified) (2 diffs)

v6/smop/CMakeLists.txt

@@ -109 +109 @@
     src/s1p_attribute.ri
     src/s1p_hash_bvalue.ri
+    src/native_int.ri
 )
 compile_ri (${ri_file})

v6/smop/include/smop_identifiers.h

@@ -12 +12 @@
 extern SMOP__Object* SMOP__ID__BIND;              /* "BIND" */
 extern SMOP__Object* SMOP__ID__bless;             /* "bless" */
-extern SMOP__Object* SMOP__ID__bool;              /* "bool" */
+extern SMOP__Object* SMOP__ID__true;              /* "true" */
 extern SMOP__Object* SMOP__ID__BUILDALL;          /* "BUILDALL" */
 extern SMOP__Object* SMOP__ID__BUILD;             /* "BUILD" */

v6/smop/src/idconst_decl_all.h

@@ -3 +3 @@
 SMOP__Object* SMOP__ID__BIND;
 SMOP__Object* SMOP__ID__bless;
-SMOP__Object* SMOP__ID__bool;
+SMOP__Object* SMOP__ID__true;
 SMOP__Object* SMOP__ID__BUILDALL;
 SMOP__Object* SMOP__ID__BUILD;

v6/smop/src/idconst_init_all.c

@@ -3 +3 @@
 SMOP__ID__BIND = SMOP__NATIVE__idconst_create_nolist( "BIND" );
 SMOP__ID__bless = SMOP__NATIVE__idconst_create_nolist( "bless" );
-SMOP__ID__bool = SMOP__NATIVE__idconst_create_nolist( "bool" );
+SMOP__ID__true = SMOP__NATIVE__idconst_create_nolist( "true" );
 SMOP__ID__BUILDALL = SMOP__NATIVE__idconst_create_nolist( "BUILDALL" );
 SMOP__ID__BUILD = SMOP__NATIVE__idconst_create_nolist( "BUILD" );
@@ -118 +118 @@
 constlist[2] = SMOP__ID__BIND;
 constlist[3] = SMOP__ID__bless;
-constlist[4] = SMOP__ID__bool;
+constlist[4] = SMOP__ID__true;
 constlist[5] = SMOP__ID__BUILDALL;
 constlist[6] = SMOP__ID__BUILD;

v6/smop/src/lowlevel.sm0p

@@ -156 +156 @@
 
       if ((SMOP__Object*)SMOP_RI(value) == SMOP__INTPTR__InterpreterInstance ||
-          (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__capture ||
-          (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__int ||
-          (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__uint) {
+          (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__capture) {
 
         SMOP_DISPATCH(interpreter, SMOP_RI(value), SMOP__ID__DESTROYALL, value);
@@ -179 +177 @@
       smop_lowlevel_free(value);
     } else if ((SMOP__Object*)SMOP_RI(value) == SMOP__INTPTR__InterpreterInstance ||
-               (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__capture ||
-               (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__int ||
-               (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__uint) {
+               (SMOP__Object*)SMOP_RI(value) == SMOP__NATIVE__capture) {
 
       SMOP_DISPATCH(interpreter, SMOP_RI(value), SMOP__ID__DESTROYALL, value);

v6/smop/src/native_bool.c

@@ -19 +19 @@
   ___INVOCANT_RI_SHOULD_MATCH___;
   SMOP__Object* ret = SMOP__NATIVE__bool_false;
-  if (identifier == SMOP__ID__bool) {
+  if (identifier == SMOP__ID__true) {
     ret = SMOP_REFERENCE(interpreter,invocant);
   } else if (identifier == SMOP__ID__defined) {

v6/smop/src/native_int.ri

@@ -1 @@
-#include <stdlib.h>
-#include <smop.h>
-#include <smop_lowlevel.h>
-#include <smop_s1p.h>
-#include <stdio.h>
-
-SMOP__Object* SMOP__NATIVE__int;
-
-typedef struct smop_native_int_struct {
-  SMOP__Object__BASE
-  int intvalue;
-} smop_native_int_struct;
-
-static SMOP__Object* int_message(SMOP__Object* interpreter,
-                                     SMOP__ResponderInterface* self,
-                                     SMOP__Object* identifier,
-                                     SMOP__Object* capture) {
-
-  ___CONST_IDENTIFIER_ONLY___;
-
-  SMOP__Object* ret = SMOP__NATIVE__bool_false;
-
-  if (identifier == SMOP__ID__infix_num_gt) {
-
-    ___NATIVE_CAPTURE_ONLY___;
-    ___INVOCANT_RI_SHOULD_MATCH___;
-
+%prefix smop_native_int
+%RI SMOP__NATIVE__int
+%RI.id Native int
+%attr int intvalue
+%method infix:>
     SMOP__Object* other = SMOP__NATIVE__capture_positional(interpreter,capture,0);
     if (SMOP_RI(other) == (SMOP__ResponderInterface*)SMOP__NATIVE__int) {
-      //fprintf(stderr,"native int: %d > %d\n", SMOP__NATIVE__int_fetch(invocant),
-      //        SMOP__NATIVE__int_fetch(other));
       if (SMOP__NATIVE__int_fetch(invocant) > SMOP__NATIVE__int_fetch(other)) {
         ret = SMOP__NATIVE__bool_true;
@@ -38 +14 @@
       ___UNKNOWN_METHOD___;
     }
-
     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) {
-
-    ___NATIVE_CAPTURE_ONLY___;
-    ___INVOCANT_RI_SHOULD_MATCH___;
-
+%method infix:>=
     SMOP__Object* other = SMOP__NATIVE__capture_positional(interpreter,capture,0);
     if (SMOP_RI(other) == (SMOP__ResponderInterface*)SMOP__NATIVE__int) {
-      //fprintf(stderr,"native int: %d > %d\n", SMOP__NATIVE__int_fetch(invocant),
-      //        SMOP__NATIVE__int_fetch(other));
       if (SMOP__NATIVE__int_fetch(invocant) >= SMOP__NATIVE__int_fetch(other)) {
         ret = SMOP__NATIVE__bool_true;
@@ -67 +26 @@
       ___UNKNOWN_METHOD___;
     }
-
     SMOP_RELEASE(interpreter, other);
-    SMOP_RELEASE(interpreter,invocant);
-
-  } else if (identifier == SMOP__ID__DESTROYALL) {
-    // notthing
-  } else if (identifier == SMOP__ID__new) {
-
+%method defined
+    ret = SMOP__NATIVE__bool_true;
+%method FETCH
+    ___VALUE_FETCH___;
+%method STORE
+    ___VALUE_STORE___;
+%method new
     SMOP__Object* other = SMOP__NATIVE__capture_positional(interpreter,capture,0);
     if (other && SMOP_RI(other) == (SMOP__ResponderInterface*)SMOP__NATIVE__int) {
@@ -84 +43 @@
       return SMOP__NATIVE__int_create(0);
     }
-
-  } else if (identifier == SMOP__ID__postfix_plusplus) {
-
-    ___NATIVE_CAPTURE_ONLY___;
-    ___INVOCANT_RI_SHOULD_MATCH___;
-
+%method postfix:++
     smop_lowlevel_wrlock(invocant);
     ((smop_native_int_struct*)invocant)->intvalue++;
     smop_lowlevel_unlock(invocant);
-
-    SMOP_RELEASE(interpreter, invocant);
-
-  } else {
-    ___UNKNOWN_METHOD___;
-  }
-
-  SMOP_RELEASE(interpreter,capture);
-  return ret;
-}
-
-
-void smop_native_int_init() {
-  SMOP__NATIVE__int = calloc(1,sizeof(SMOP__ResponderInterface));
-  ((SMOP__ResponderInterface*)SMOP__NATIVE__int)->MESSAGE = int_message;
-  ((SMOP__ResponderInterface*)SMOP__NATIVE__int)->REFERENCE = smop_lowlevel_generic_reference;
-  ((SMOP__ResponderInterface*)SMOP__NATIVE__int)->RELEASE = smop_lowlevel_generic_release;
-  ((SMOP__ResponderInterface*)SMOP__NATIVE__int)->id = "Native int";
-}
-
-void smop_native_int_destr() {
-  free(SMOP__NATIVE__int);
-}
-
+%method DESTROYALL
+%{
 SMOP__Object* SMOP__NATIVE__int_create(int value) {
   SMOP__Object* ret = smop_lowlevel_alloc(sizeof(smop_native_int_struct));
@@ -130 +62 @@
   return v;
 }
+%}

v6/smop/src/s1p_array.c

@@ -134 +134 @@
     SMOP_RELEASE(interpreter,invocant->array);
 
-  } else if (identifier == SMOP__ID__bool) {
+  } else if (identifier == SMOP__ID__true) {
     ret = SMOP__NATIVE__bool_true;
 

v6/smop/src/s1p_grep.sm0p

@@ -129 +129 @@
     my $capture = ¢SMOP__S1P__Capturize."capturize"($item);
     my $result = $code."postcircumfix:( )"($capture);
-    my $bool = $result."bool"();
+    my $bool = $result."true"();
     if $bool { goto in } else { goto fetch_item };
     

v6/smop/src/s1p_lexicalscope.ri

@@ -19 +19 @@
   SMOP_REFERENCE(interpreter, ret);
 
-%method bool
+%method true
   ret = SMOP__NATIVE__bool_true;
 
@@ -84 +84 @@
     else:
       my $outer = $invocant."outer"();
-      my $outer_true = $outer."bool"();
+      my $outer_true = $outer."true"();
       my $outer_cell = $outer."FETCH"();
       if $outer_true {goto than2} else {goto else2};

v6/smop/src/s1p_lexicalscope.sm0p

@@ -44 +44 @@
     SMOP_REFERENCE(interpreter, ret);
 
-  } else if (identifier == SMOP__ID__bool) {
+  } else if (identifier == SMOP__ID__true) {
     ret = SMOP__NATIVE__bool_true;
 
@@ -143 +143 @@
     else:
       my $outer = $invocant."outer"();
-      my $outer_true = $outer."bool"();
+      my $outer_true = $outer."true"();
       my $outer_cell = $outer."FETCH"();
       if $outer_true {goto than2} else {goto else2};

v6/smop/src/s1p_scalar.c

@@ -43 +43 @@
       SMOP_REFERENCE(interpreter,ret);
 
-  } else if (SMOP__ID__bool == identifier) {
+  } else if (SMOP__ID__true == identifier) {
     SMOP__Object* cell = SMOP__S1P__Scalar_FETCH(scalar);
     ret = SMOP_DISPATCH(interpreter, SMOP_RI(cell),
-                        SMOP__ID__bool,
+                        SMOP__ID__true,
                         SMOP__NATIVE__capture_delegate(interpreter,
                                                        SMOP_REFERENCE(interpreter,cell),

v6/smop/test/32_array_iterator.m0ld

@@ -23 +23 @@
 my $elems = $list."elems"();
 my $greater = $elems."infix:>"(0);
-my $bool = $greater."bool"();
+my $bool = $greater."true"();
 
 if $bool { goto iteration } else { goto end };

v6/smop/test/34_array_unshift.m0ld

@@ -23 +23 @@
 my $elems = $list."elems"();
 my $greater = $elems."infix:>"(0);
-my $bool = $greater."bool"();
+my $bool = $greater."true"();
 
 if $bool { goto iteration } else { goto end };

v6/smop/test/35_array_grep.m0ld

@@ -34 +34 @@
     
     my $greater = $it."infix:>"(3);
-    my $bool = $greater."bool"();
+    my $bool = $greater."true"();
     
     my $out_scalar = ¢SMOP__S1P__RootNamespace."postcircumfix:{ }"("$*OUT");
@@ -64 +64 @@
    
     my $greater = $it."infix:>"(3);
-    my $bool = $greater."bool"();
+    my $bool = $greater."true"();
     
     my $continuation = $interpreter."continuation"();

v6/smop/test/36_adhoc_signature.m0ld

@@ -64 +64 @@
 
 my $accepts = $signature."ACCEPTS"(1);
-my $accepts_bool = $accepts."bool"();
+my $accepts_bool = $accepts."true"();
 if $accepts_bool { goto then } else { goto else };
 

v6/smop/test/37_multisub.m0ld

@@ -23 +23 @@
     my $cap = ¢SMOP__S1P__Capturize."capturize"($p1, ¢SMOP__NATIVE__int);
     my $cmp = ¢SMOP__S1P__ritest."postcircumfix:( )"($cap);
-    my $bool = $cmp."bool"();
+    my $bool = $cmp."true"();
     
     if $bool { goto nexttest } else { goto false };
@@ -29 +29 @@
     $cap = ¢SMOP__S1P__Capturize."capturize"($p2, ¢SMOP__NATIVE__int);
     $cmp = ¢SMOP__S1P__ritest."postcircumfix:( )"($cap);
-    $bool = $cmp."bool"();
+    $bool = $cmp."true"();
     
     if $bool { goto true } else { goto false };
@@ -67 +67 @@
     my $cap = ¢SMOP__S1P__Capturize."capturize"($p1, ¢SMOP__NATIVE__bool);
     my $cmp = ¢SMOP__S1P__ritest."postcircumfix:( )"($cap);
-    my $bool = $cmp."bool"();
+    my $bool = $cmp."true"();
     
     if $bool { goto nexttest } else { goto false };
@@ -73 +73 @@
     $cap = ¢SMOP__S1P__Capturize."capturize"($p2, ¢SMOP__NATIVE__bool);
     $cmp = ¢SMOP__S1P__ritest."postcircumfix:( )"($cap);
-    $bool = $cmp."bool"();
+    $bool = $cmp."true"();
     
     if $bool { goto true } else { goto false };

v6/smop/test/38_ritest.m0ld

@@ -10 +10 @@
 my $capture = ¢SMOP__S1P__Capturize."capturize"(1, ¢SMOP__NATIVE__int);
 my $test = ¢SMOP__S1P__ritest."postcircumfix:( )"($capture);
-my $bool = $test."bool"();
+my $bool = $test."true"();
 
 if $bool { goto isint } else { goto notint };
@@ -24 +24 @@
 $capture = ¢SMOP__S1P__Capturize."capturize"("test", ¢SMOP__NATIVE__int);
 $test = ¢SMOP__S1P__ritest."postcircumfix:( )"($capture);
-$bool = $test."bool"();
+$bool = $test."true"();
 
 if $bool { goto isint2 } else { goto notint2 };