Changes in / [8830f79f:340c3e7]

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• perl/lib/BarnOwl/Complete/Client.pm (modified) (7 diffs)
• perl/lib/BarnOwl/Complete/Filter.pm (deleted)
• perl/lib/BarnOwl/Completion/Context.pm (modified) (2 diffs)
• perl/lib/BarnOwl/Completion/Util.pm (modified) (3 diffs)
• perl_tester.c (deleted)
• perlglue.xs (modified) (1 diff)
• runtests.sh (modified) (1 diff)
• t/completion.t (modified) (8 diffs)
• t/mock.pl (modified) (1 diff)

.gitignore

@@ -28 +28 @@
 owl_prototypes.h
 owl_prototypes.h.new
-perl_tester
 perlglue.c
 perlwrap.c

Makefile.am

@@ -2 +2 @@
 
 bin_PROGRAMS = barnowl.bin
-check_PROGRAMS = tester perl_tester
+check_PROGRAMS = tester
 
 barnowl_bin_SOURCES = $(BASE_SRCS) \
@@ -17 +17 @@
 
 tester_LDADD = libfaim/libfaim.a
-
-perl_tester_SOURCES = $(BASE_SRCS) \
-     owl.h owl_perl.h config.h \
-     libzcrypt.a \
-     $(GEN_C) $(GEN_H) \
-     perl_tester.c
-
-perl_tester_LDADD = libfaim/libfaim.a libzcrypt.a
 
 TESTS=runtests.sh

perl/lib/BarnOwl/Complete/Client.pm

@@ -7 +7 @@
 
 use BarnOwl::Completion::Util qw(complete_flags);
-use BarnOwl::Complete::Filter qw(complete_filter_name complete_filter_expr);
 
 my @all_colors = qw(default
@@ -43 +42 @@
 sub complete_command { return sort @BarnOwl::all_commands; }
 sub complete_color { return @all_colors; }
+sub complete_filter_name { return @{BarnOwl::all_filters()}; }
 sub complete_variable    { return @{BarnOwl::all_variables()}; }
 sub complete_style       { return @{BarnOwl::all_styles()}; }
+
+my %filter_cmds = (
+    sender    => \&BarnOwl::Complete::Zephyr::complete_user,
+    recipient => \&BarnOwl::Complete::Zephyr::complete_user,
+    class     => \&BarnOwl::Complete::Zephyr::complete_class,
+    instance  => \&BarnOwl::Complete::Zephyr::complete_instance,
+    opcode    => \&BarnOwl::Complete::Zephyr::complete_opcode,
+    realm     => \&BarnOwl::Complete::Zephyr::complete_realm,
+    body      => undef,
+    hostname  => undef,
+    type      => sub { qw(zephyr aim admin); },
+    direction => sub { qw(in out none); },
+    login     => sub { qw(login logout none); },
+    filter    => \&complete_filter_name,
+    perl      => undef,
+);
+
+# Returns:
+# - where to look next after pulling out an expression
+# - $INCOMPLETE if this cannot form a complete expression (or w/e)
+# - pushes to completion list as it finds valid completions
+
+my $INCOMPLETE = -1;
+sub _complete_filter_expr {
+    # Takes as arguments context and the index into $ctx->words where the
+    # filter expression starts
+    my $ctx = shift;
+    my $start = shift;
+    my $o_comp = shift;
+    my $end = $ctx->word;
+
+    # Grab an expression; we don't allow empty
+    my $i = $start;
+    $i = _complete_filter_primitive_expr($ctx, $start, $o_comp);
+    return $INCOMPLETE if $start == $INCOMPLETE;
+
+    while ($i <= $end) {
+        if ($i == $end) {
+            # We could and/or another clause
+            push @$o_comp, qw(and or);
+            return $end; # Or we could let the parent do his thing
+        }
+
+        if ($ctx->words->[$i] ne 'and' && $ctx->words->[$i] ne 'or') {
+            return $i; # We're done. Let the parent do his thing
+        }
+
+        # Eat the and/or
+        $i++;
+
+        # Grab an expression
+        $i = _complete_filter_primitive_expr($ctx, $i, $o_comp);
+        return $INCOMPLETE if $i == $INCOMPLETE;
+    }
+    
+    return $i; # Well, it looks like we're happy
+    # (Actually, I'm pretty sure this never happens...)
+}
+
+sub _complete_filter_primitive_expr {
+    my $ctx = shift;
+    my $start = shift;
+    my $o_comp = shift;
+    my $end = $ctx->word;
+
+    if ($start >= $end) {
+        push @$o_comp, "(";
+        push @$o_comp, qw(true false not);
+        push @$o_comp, keys %filter_cmds;
+        return $INCOMPLETE;
+    }
+
+    my $word = $ctx->words->[$start];
+    if ($word eq "(") {
+        $start = _complete_filter_expr($ctx, $start+1, $o_comp);
+        return $INCOMPLETE if $start == $INCOMPLETE;
+
+        # Now, we expect a ")"
+        if ($start >= $end) {
+            push @$o_comp, ")";
+            return $INCOMPLETE;
+        }
+        if ($ctx->words->[$start] ne ')') {
+            # User is being confusing. Give up.
+            return $INCOMPLETE;
+        }
+        return $start+1; # Eat the )
+    } elsif ($word eq "not") {
+        # We just want another primitive expression
+        return _complete_filter_primitive_expr($ctx, $start+1, $o_comp);
+    } elsif ($word eq "true" || $word eq "false") {
+        # No arguments
+        return $start+1; # Eat the boolean. Mmmm, tasty.
+    } else {
+        # It's of the form 'CMD ARG'
+        return $start+2 if ($start+1 < $end); # The user supplied the argument
+
+        # complete the argument
+        my $arg_func = $filter_cmds{$word};
+        push @$o_comp, ($arg_func ? ($arg_func->()) : ());
+        return $INCOMPLETE;
+    }
+}
+
+sub complete_filter_expr {
+    my $ctx = shift;
+    my $start = shift;
+    my @completions = ();
+    _complete_filter_expr($ctx, $start, \@completions);
+    # Get rid of duplicates and sort
+    my %hash = ();
+    @hash{@completions} = ();
+    @completions = sort keys %hash;
+    return @completions;
+}
+
+sub complete_filter_args {
+    my $ctx = shift;
+    my $arg = shift;
+    return complete_filter_name() unless $arg;
+    my $idx = 2; # skip the filter name
+    while ($idx < $ctx->word) {
+        last unless ($ctx->words->[$idx] =~ m{^-});
+        $idx += 2; # skip the flag and the argument
+    }
+    return complete_filter_expr($ctx, $idx);
+}
 
 sub complete_help {
@@ -67 +194 @@
 sub complete_filter {
     my $ctx = shift;
-    # Syntax: filter FILTERNAME FLAGS EXPR
-
-    # FILTERNAME
-    return complete_filter_name() if $ctx->word == 1;
-
-    # FLAGS
-    $ctx = $ctx->shift_words(1); # complete_flags starts at the second word
     return complete_flags($ctx,
         [qw()],
@@ -80 +200 @@
            "-b" => \&complete_color,
         },
-        # EXPR
-        sub {
-            my $ctx = shift;
-            my $arg = shift;
-
-            # We pass stop_at_nonflag, so we can rewind to the start
-            my $idx = $ctx->word - $arg;
-            $ctx = $ctx->shift_words($idx);
-            return complete_filter_expr($ctx);
-        },
-        stop_at_nonflag => 1
+         \&complete_filter_args
         );
 }
@@ -103 +213 @@
     }
     if ($ctx->words->[1] eq "-d") {
-        $ctx = $ctx->shift_words(2);
-        return complete_filter_expr($ctx);
+        return complete_filter_expr($ctx, 2);
     }
     if ($ctx->words->[1] eq "-s") {
@@ -132 +241 @@
     return if $arg;
     return complete_variable();
-}
-
-sub complete_startup {
-    my $ctx = shift;
-    my $new_ctx = $ctx->shift_words(1);
-    return BarnOwl::Completion::get_completions($new_ctx);
 }
 
@@ -147 +250 @@
 BarnOwl::Completion::register_completer(set     => \&complete_set);
 BarnOwl::Completion::register_completer(unset   => \&complete_set);
-BarnOwl::Completion::register_completer(startup => \&complete_startup);
 
 1;

perl/lib/BarnOwl/Completion/Context.pm

@@ -40 +40 @@
 
 use base qw(Class::Accessor::Fast);
-use Carp qw(croak);
 
 __PACKAGE__->mk_ro_accessors(qw(line point words word word_point
@@ -65 +64 @@
        };
     return bless($self, $class);
-}
-
-=head2 shift_words N
-
-Returns a new C<Context> object, with the leading C<N> words
-stripped. All fields are updated as appopriate. If C<N> > C<<
-$self->word >>, C<croak>s with an error message.
-
-=cut
-
-sub shift_words {
-    my $self = shift;
-    my $n    = shift;
-
-    if($n > $self->word) {
-        croak "Context::shift: Unable to shift $n words";
-    }
-
-    my $before = substr($self->line, 0, $self->point);
-    my $after  = substr($self->line, $self->point);
-
-    return BarnOwl::Completion::Context->new(BarnOwl::skiptokens($before, $n),
-                                             $after);
 }
 

perl/lib/BarnOwl/Completion/Util.pm

@@ -24 +24 @@
     my $optsdone = 0;
 
-    my %flags_seen;
-
     while($idx < $ctx->word) {
         my $word = $ctx->words->[$idx];
@@ -39 +37 @@
         } elsif ($word =~ m{^-}) {
             $word = "-" . substr($word, -1);
-            $flags_seen{$word} = 1; # record flag
             $flag = $word if(exists $args->{$word});
         } else {
@@ -61 +58 @@
         return;
     } else {
-        my @opts = $optsdone ? () : (@$no_args, keys %$args);
-        # filter out flags we've seen if needbe
-        @opts = grep {!$flags_seen{$_}} @opts unless $options{repeat_flags};
-        return (@opts, $default ? ($default->($ctx, $argct)) : ());
+        return ($optsdone ? () : (@$no_args, keys %$args),
+                $default ? ($default->($ctx, $argct)) : ());
     }
 }

perlglue.xs

@@ -424 +424 @@
                 RETVAL
 
-const char *
-skiptokens(str, n)
-        const char *str;
-        int n;
-        CODE:
-                RETVAL = skiptokens(str, n);
-        OUTPUT:
-                RETVAL
-
-
-
 MODULE = BarnOwl                PACKAGE = BarnOwl::Internal
 

runtests.sh

@@ -1 +1 @@
 #!/bin/sh
-prove t/ --perl ./perl_tester
+prove t/

t/completion.t

@@ -8 +8 @@
 BEGIN {require (dirname($0) . "/mock.pl");};
 
-use BarnOwl::Complete::Filter qw(complete_filter_expr);
-
 =head1 DESCRIPTION
 
@@ -22 +20 @@
     my $after_point = shift;
     
-    my $ctx = BarnOwl::Completion::Context->new($before_point,
-                                                $after_point);
-    is($ctx->line, $before_point . $after_point);
-    is($ctx->point, length $before_point);
-
-    test_ctx($ctx, @_);
-}
-
-sub test_ctx {
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-
-    my $ctx = shift;
-
     my $words = shift;
     my $word = shift;
@@ -42 +27 @@
     my $word_end   = shift;
 
+    my $ctx = BarnOwl::Completion::Context->new($before_point,
+                                                $after_point);
+
+    is($ctx->line, $before_point . $after_point);
+    is($ctx->point, length $before_point);
     is_deeply($ctx->words, $words);
     if (defined($word)) {
@@ -51 +41 @@
 }
 
-sub test_shift {
-    local $Test::Builder::Level = $Test::Builder::Level + 1;
-
-    my $before_point = shift;
-    my $after_point = shift;
-    my $shift = shift;
-    
-    my $ctx = BarnOwl::Completion::Context->new($before_point,
-                                                $after_point);
-    $ctx = $ctx->shift_words($shift);
-
-    test_ctx($ctx, @_);
-}
-
 
 isa_ok(BarnOwl::Completion::Context->new('Hello, W', 'orld'), 'BarnOwl::Completion::Context');
@@ -132 +108 @@
               1, -1, 7, 12);
 
-## Test Context::shift
-test_shift('lorem ipsum dolor ', 'sit amet', 0,
-           [qw(lorem ipsum dolor sit amet)],
-           3, 0, 18, 21);
-
-test_shift('lorem ipsum dolor ', 'sit amet', 1,
-           [qw(ipsum dolor sit amet)],
-           2, 0, 12, 15);
-
-test_shift('lorem ipsum dolor ', 'sit amet', 2,
-           [qw(dolor sit amet)],
-           1, 0, 6, 9);
-
-test_shift('lorem ipsum dolor ', 'sit amet', 3,
-           [qw(sit amet)],
-           0, 0, 0, 3);
-
-eval {
-    my $before_point = 'lorem ipsum dolor';
-    my $after_point = 'sit amet';
-    my $shift = 4;
-
-    my $ctx = BarnOwl::Completion::Context->new($before_point,
-                                                $after_point);
-    $ctx = $ctx->shift_words($shift);
-};
-like($@, qr/^Context::shift: Unable to shift /, "Correctly die when shifting away the point");
 
 ## Test common_prefix
@@ -214 +163 @@
 
 test_complete('zwrite -c nelhage ', '',
-              [qw(-n -C -m -i -r -O nelhage asedeno geofft)]);
+              [qw(-n -C -m -c -i -r -O nelhage asedeno geofft)]);
 
 test_complete('zwrite -c nelhage ', '-',
-              [qw(-n -C -m -i -r -O nelhage asedeno geofft)]);
+              [qw(-n -C -m -c -i -r -O nelhage asedeno geofft)]);
 
 test_complete('zwrite -c nelhage -- ', '',
@@ -229 +178 @@
                               "-d" => sub {qw(some words for completing)},
                           },
-                          sub {$_[1]},
-                          repeat_flags => 1);
+                          sub {$_[1]});
 }
 
@@ -255 +203 @@
               [qw(2)], \&complete_word);
 
-
-# Test the filter expression completer
-test_complete('', '',
-              [qw[( body class direction false filter hostname instance login not opcode perl realm recipient sender true type]],
-              \&complete_filter_expr);
-
-test_complete('not ', '',
-              [qw[( body class direction false filter hostname instance login not opcode perl realm recipient sender true type]],
-              \&complete_filter_expr);
-
-test_complete('true ', '',
-              [qw[and or]],
-              \&complete_filter_expr);
-
-test_complete('( true ', '',
-              [qw[and or )]],
-              \&complete_filter_expr);
-
-test_complete('( body static and body analysis and not false and class davidben and ( instance python or instance hotd ', '',
-              [qw[and or )]],
-              \&complete_filter_expr);
-
-test_complete('type ', '',
-              [qw[admin aim zephyr]],
-              \&complete_filter_expr);
-
-test_complete('direction ', '',
-              [qw[in out none]],
-              \&complete_filter_expr);
-
-test_complete('login ', '',
-              [qw[login logout none]],
-              \&complete_filter_expr);
-
 1;
 

t/mock.pl

@@ -7 +7 @@
 use Carp;
 
+sub bootstrap {}
 sub get_data_dir {"."}
 sub get_config_dir {"."}