Changeset 22263 for v6

Timestamp:

09/16/08 21:20:56 (3 months ago)

Author:

pmurias

Message:

[smop] added stub item and item is rw contexts

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (3 diffs)
• include/smop_s1p.h (modified) (1 diff)
• src/smop_haskell_ffi.c (modified) (1 diff)
• src/smop_internal.h (modified) (1 diff)
• src/smop_s1p_itemcontext.ri (added)
• src/smop_s1p_itemrwcontext.ri (added)
• tools/dsl (modified) (1 diff)
• tools/ri (modified) (3 diffs)

v6/smop/CMakeLists.txt

@@ -47 +47 @@
     )
 endmacro(compile_m0ld)
+
+macro (compile_ri dsl_file)
+    string(REGEX REPLACE ".ri$" ".c" c_file ${dsl_file})
+    add_custom_command (
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${c_file}
+        COMMAND perl ARGS ${smop_SOURCE_DIR}/tools/dsl ri ${smop_SOURCE_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/m0ld_exe ${smop_SOURCE_DIR}/${dsl_file} ${CMAKE_CURRENT_BINARY_DIR}/${c_file}
+        DEPENDS ${smop_SOURCE_DIR}/${dsl_file}
+    )
+endmacro(compile_ri)
 
 macro (compile_perl6 dsl_file)
@@ -89 +98 @@
 )
 compile_sm0p (${sm0p_file})
+endforeach()
+
+foreach (ri_file
+    src/smop_s1p_itemcontext.ri
+    src/smop_s1p_itemrwcontext.ri
+)
+compile_ri (${ri_file})
 endforeach()
 
@@ -127 +143 @@
     src/smop_slime_node.c
     src/smop_ri.c
+    src/smop_s1p_itemcontext.c
+    src/smop_s1p_itemrwcontext.c
 )
 

v6/smop/include/smop_s1p.h

@@ -1 +1 @@
 #ifndef SMOP_S1P_H
 #define SMOP_S1P_H
+#include <stdio.h>
 
 

v6/smop/src/smop_haskell_ffi.c

@@ -11 +11 @@
 }
 SMOP__Object* smop_ri(SMOP__Object* obj) {
-  return SMOP_RI(obj);
+  return (SMOP__Object*) SMOP_RI(obj);
 }
 SMOP__Object* get_SMOP__GlobalInterpreter(void) {

v6/smop/src/smop_internal.h

@@ -156 +156 @@
 void smop_s1p_capturize_init();
 void smop_s1p_capturize_destr();
+void smop_s1p_itemcontext_init();
+void smop_s1p_itemcontext_destr();
+void smop_s1p_itemrwcontext_init();
+void smop_s1p_itemrwcontext_destr();
 
 

v6/smop/tools/dsl

@@ -11 +11 @@
 } elsif ($dsl eq 'p6') {
     system("perl $elfX -C m0ld -s $in > $out");
+} elsif ($dsl eq 'ri') {
+    system("perl $base/tools/ri $in > $out");
 } elsif ($dsl eq 'p6-pugs') {
     system("$base/../../pugs -Cm0ld $in > $out");

v6/smop/tools/ri

@@ -8 +8 @@
 }
 
-my @properties = qw(RI.id prefix include);
+my @properties = qw(RI RI.id prefix include);
 my %properties;
 
@@ -42 +42 @@
 #include <smop_s1p.h>
 ];
-for (split (/,/,$properties{include})) {
+for (split (/,/,$properties{include} || '')) {
     print "#include $_\n";
 }
@@ -73 +73 @@
 }
 print qq[{
-    ___UNKNOWN__METHOD___;
+    ___UNKNOWN_METHOD___;
   }