Changeset 22303 for v6

Timestamp:

09/21/08 16:09:51 (2 months ago)

Author:

pmurias

Message:

[smop/pugs]
added .FETCH and .STORE to Code and constant identifiers
m0ld emitted by pugs uses FETCH

Location:

v6/smop

Files:

• include/smop_s1p.h (modified) (1 diff)
• src/idconst.c (modified) (1 diff)
• src/smop_mold.c (modified) (2 diffs)
• src/smop_s1p_code.sm0p (modified) (1 diff)
• src/smop_s1p_io.ri (modified) (1 diff)
• tools/ri (modified) (1 diff)

v6/smop/include/smop_s1p.h

@@ -63 +63 @@
     SMOP__Object* invocant = SMOP__NATIVE__capture_invocant(interpreter, capture); \
     assert(SMOP_RI(invocant) == (SMOP__ResponderInterface*)self)
+#define ___VALUE_FETCH___\
+    ret = invocant;
+#define ___VALUE_STORE___ \
+    { \
+    fprintf(stderr, "can't call STORE or an read-only value at %s line %d file %s\n",__func__,__LINE__,__FILE__); \
+    abort(); \
+    } 
 
 #define ___UNKNOWN_METHOD___ \

v6/smop/src/idconst.c

@@ -54 +54 @@
 }
 
-static SMOP__Object* idconst_message(SMOP__Object* stack,
+static SMOP__Object* idconst_message(SMOP__Object* interpreter,
                                      SMOP__ResponderInterface* self,
                                      SMOP__Object* identifier,
                                      SMOP__Object* capture) {
-  ___UNKNOWN_METHOD___;
+  ___NATIVE_CAPTURE_ONLY___;
+  ___CONST_IDENTIFIER_ONLY___;
+  ___INVOCANT_RI_SHOULD_MATCH___;
+
+  SMOP__Object* ret = SMOP__NATIVE__bool_false;
+
+  if (SMOP__ID__FETCH == identifier) {
+    ___VALUE_FETCH___;
+  } else if (SMOP__ID__STORE == identifier) {
+    ___VALUE_STORE___;
+  } else {
+    ___UNKNOWN_METHOD___;
+  }
+
+  SMOP_RELEASE(interpreter,invocant);
+  SMOP_RELEASE(interpreter,capture);
+  return ret;
 }
 

v6/smop/src/smop_mold.c

@@ -42 +42 @@
   int position;
   SMOP__Object* back;
-  SMOP__Object* ctx;
   SMOP__Object** registers;
   int target;
@@ -93 +92 @@
     ret->position = 0;
     ret->back = NULL;
-    ret->ctx = SMOP__NATIVE__bool_false;
     ret->registers = (SMOP__Object**) calloc(mold->registers,sizeof(SMOP__ResponderInterface)); 
     ret->target = 0;

v6/smop/src/smop_s1p_code.sm0p

@@ -94 +94 @@
     if (outer) SMOP_RELEASE(interpreter,outer);
 
+  } else if (SMOP__ID__FETCH == identifier) {
+    ___VALUE_FETCH___;
+  } else if (SMOP__ID__STORE == identifier) {
+    ___VALUE_STORE___;
   } else {
     ___UNKNOWN_METHOD___;

v6/smop/src/smop_s1p_io.ri

@@ -2 +2 @@
 %RI.id lowlevel io
 %prefix smop_s1p_io
-%include <stdlib.h>,<stdio.h>
 
 %{

v6/smop/tools/ri

@@ -58 +58 @@
 #include <smop_lowlevel.h>
 #include <smop_s1p.h>
+#include <stdlib.h>
+#include <stdio.h>
 ];
 for (split (/,/,$properties{include} || '')) {