Changeset 22270 for v6

Timestamp:

09/17/08 13:27:13 (3 months ago)

Author:

pmurias

Message:

[smop] IO RI converted to the RI DSL

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (1 diff)
• src/smop_s1p_io.c (deleted)
• src/smop_s1p_io.ri (moved) (moved from v6/smop/misc/ri/smop_s1p_io.ri) (2 diffs)
• tools/ri (modified) (3 diffs)

v6/smop/CMakeLists.txt

@@ -101 +101 @@
 
 foreach (ri_file
-#    src/smop_s1p_itemcontext.ri
-#    src/smop_s1p_itemrwcontext.ri
+    src/smop_s1p_io.ri
 )
 compile_ri (${ri_file})

v6/smop/src/smop_s1p_io.ri

@@ -3 +3 @@
 %prefix smop_s1p_io
 %include <stdlib.h>,<stdio.h>
+
+%{
+typedef struct smop_s1p_io_struct {
+  SMOP__Object__BASE
+} smop_s1p_io_struct;
+
+SMOP__Object* SMOP__S1P__IO_create(SMOP__Object* interpreter) {
+    SMOP_REFERENCE(interpreter,RI);
+    SMOP__Object* ret = smop_lowlevel_alloc(sizeof(smop_s1p_io_struct));
+    ret->RI = (SMOP__ResponderInterface*)RI;
+    return ret;
+}
+%}
+
 %method print
     int pc = SMOP__NATIVE__capture_positional_count(interpreter,capture);
@@ -23 +37 @@
     }
 %method DESTROYALL
+    SMOP_RELEASE(interpreter,RI);
+%method new
+    ret = SMOP__S1P__IO_create(interpreter);

v6/smop/tools/ri

@@ -5 +5 @@
 sub mangle {
     my $id = shift;
-    return 'SMOP__ID__'.$id;
+    return 'ID__'.$id;
 }
 
-my @properties = qw(RI RI.id prefix include);
+my @properties = qw(RI RI.id prefix include prototype);
 my %properties;
 
@@ -14 +14 @@
 my $method;
 
-# FIX convoluted
-LINE: while (my $line = <>) {
-    if ($method) {
+my $raw = '';
+
+sub debug {
+}
+while (my $line = <>) {
+    if ($line =~ /^\%\{\s*/) {
+         debug "raw start\n";
+         until((my $raw_line = <>) =~ /^\%}\s*$/) {
+             debug "raw $raw_line";
+             $raw .= $raw_line;
+         }
+         debug "raw stop\n";
+    } elsif ($method) {
         if ($line =~ /^%/) {
             undef $method;
+            redo;
         } else {
+            debug "in method $line";
             $methods{$method} .= $line;
             next;
         }
-    }
-    if ($line =~ /^%method\s*(.*)$/) {
+    } elsif ($line =~ /^%method\s*(.*)$/) {
         $method = $1;
-        next;
-    }
-    for my $property (@properties) {
-        if ($line =~ /^% \s* \Q$property\E \s+ (.*)$/x) {
-            $properties{$property} = $1;
-            next LINE;
+        debug "method start:$method\n";
+    } elsif ($line =~ / ^\s*$ | ^\# | ^\/\/ /x) {
+        debug "ws/comment:$line";
+    } else {
+        for my $property (@properties) {
+            if ($line =~ /^% \s* \Q$property\E \s+ (.*)$/x) {
+                $properties{$property} = $1;
+                debug "prop $property = $1\n";
+                goto FOUND;
+            }
         }
-    }
+        die "unrecognised line: $line";
+        FOUND: ;
+    } 
 }
 
@@ -57 +74 @@
     print 'static SMOP__Object* ',mangle($_),";\n";
 }
+
+print $raw;
+
 print q[
 static SMOP__Object* message(SMOP__Object* interpreter,