Changeset 7242 for lang/perl/R-Writer

Timestamp:

02/28/08 17:37:53 (5 years ago)

Author:

daisuke

Message:

updates

Location:

lang/perl/R-Writer/trunk

Files:

• lib/R/Writer.pm (modified) (8 diffs)
• lib/R/Writer/Call.pm (added)
• lib/R/Writer/Var.pm (modified) (2 diffs)
• t/02_simple.t (modified) (3 diffs)
• t/03_assign.t (added)

lang/perl/R-Writer/trunk/lib/R/Writer.pm

@@ -5 +5 @@
 use warnings;
 use base qw(Class::Accessor::Fast);
+use R::Writer::Call;
 use R::Writer::Encoder;
 use R::Writer::Range;
@@ -21 +22 @@
 sub append {
     my $self = shift;
-
-    if ( R::Writer::Util::__IN_RWRITER_PACKAGES__ ) {
-        push @{ $self->{statements} }, { code => shift };
-        return $self;
-    }
-
-    return $self->call("append", @_);
-}
-
+    push @{ $self->{statements} }, { code => shift };
+    return $self;
+}
 
 sub R
@@ -61 +56 @@
 {
     my ($self, $function, @args) = @_;
-
-    push @{$self->{statements}}, {
-        object => delete $self->{object} || undef,
-        call   => $function,
-        args   => \@args,
+    my $call = R::Writer::Call->new(
+        call => $function,
+        args => [@args],
         end_of_call_chain => ! defined wantarray
-    };
+    );
+    push @{$self->{statements}}, $call;
     return $self;
 }
@@ -80 +74 @@
 }
 
+sub expression
+{
+    my ($self, $expr) = @_;
+    return R::Writer::Call->new(
+        call => 'expression',
+        args => [ $expr ],
+        end_of_call_chain => 1,
+    );
+}
+*expr = \&expression;
+
+sub as_string
+{
+    my $self = shift;
+    my $ret = "";
+
+    for my $s (@{$self->{statements}}) {
+        if (eval { $s->isa('R::Writer::Call') }) {
+            $ret .= $s->as_string($self);
+        }
+        elsif (my $c = $s->{code}) {
+            my $delimiter = defined $s->{delimiter}  ? $s->{delimiter} : ";";
+            $c .= $delimiter unless $c =~ /$delimiter\s*$/s;
+            $ret .= $c ."\n";
+        }
+    }
+    return $ret;
+}
+
 sub obj_as_string
 {
@@ -87 +110 @@
 
     if ($ref eq 'CODE') {
-        return $self->function($obj);
+        return $self->obj_as_string($obj->());
     }
     elsif ($ref =~ /^R::Writer/) {
-        return $obj->as_string
+        return $obj->as_string($self);
     }
     elsif ($ref eq "SCALAR") {
@@ -114 +137 @@
 }
 
-sub as_string
-{
-    my $self = shift;
-    my $ret = "";
-
-    for my $s (@{$self->{statements}}) {
-        # If {call} is present, then this is a function call
-        if (my $f = $s->{call}) {
-            my $delimiter =
-                defined($s->{delimiter}) ? $s->{delimiter} : ($s->{end_of_call_chain} ? ";" : ".");
-            my $args = $s->{args};
-            $ret .= ($s->{object} ? "$s->{object}." : "" ) .
-                "$f(" .
-                    join(",",
-                         map {
-                             $self->obj_as_string( $_ );
-                         } @$args
-                     ) . ")" . $delimiter . "\n"
-        }
-        elsif (my $c = $s->{code}) {
-            my $delimiter = defined $s->{delimiter}  ? $s->{delimiter} : ";";
-            $c .= $delimiter unless $c =~ /$delimiter\s*$/s;
-            $ret .= $c ."\n";
-        }
-    }
-    return $ret;
-}
-
 sub var
 {
@@ -147 +142 @@
 
     my $obj = R::Writer::Var->new($var, $value, $self);
-    $self->append($obj->as_string());
+    $self->append($obj->as_string($self));
     return $self;
 }
@@ -206 +201 @@
 fiddle with DB package on my own. gugod++)
 
+=head1 METHODS
+
+=head2 expression | expr
+
+The expression() method creates an mathematical expression, which can be
+assigned to a variable. Expressions that are not assigned to a variable is
+pretty useless, so when using expression(), you need to pass the result
+to some other method that can accept it:
+
+  $R->var(y => $R->expression('a * x ^ 2 + b * x + 1'));
+
+The above yields
+
+  y <- expression("a * x ^ 2 + b * x + 1");
+
 =head1 TODO
 

lang/perl/R-Writer/trunk/lib/R/Writer/Var.pm

@@ -18 +18 @@
 {
     my $self  = shift;
+    my $c     = shift;
     my $var   = $self->name;
     my $value = $self->value;
@@ -34 +35 @@
     }
     elsif ($ref eq 'CODE') {
-        $s = "$var <- " . $self->function($value);
+        $s = "$var <- " . $c->obj_as_string($value->());
     }
     elsif ($ref =~ /^R::Writer/) {
-        $s = "$var <- " . $value->as_string();
+        $s = "$var <- " . $value->as_string($c);
     }
     elsif ($ref eq 'REF') {

lang/perl/R-Writer/trunk/t/02_simple.t

@@ -11 +11 @@
     my $R = R::Writer->new();
     $R->call("demo", "plotmath");
-    like($R->as_string, qr/demo\("plotmath"\);\n/);
+    like($R->as_string, qr/demo\("plotmath"\);/);
 }
 
@@ -35 +35 @@
     my $y = $R->var(y => 11);
     $R->call(c => \("x", "y"));
-    is($R->as_string, qq/x <- 11;\ny <- 11;\nc(x,y);\n/);
+    is($R->as_string, qq/x <- 11;\ny <- 11;\nc(x,y);/);
 }
 
@@ -48 +48 @@
          ->call(cat => \'y')
     ;
-    is( $R->as_string, qq/x <- 1;\ny <- x + 1;\ncat(y);\n/);
+    is( $R->as_string, qq/x <- 1;\ny <- x + 1;\ncat(y);/);
 }