Changeset 30c5aab for perl

Timestamp:

Mar 7, 2010, 6:54:59 PM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

d64f963

Parents:

2d232ed

git-author:

David Benjamin <davidben@mit.edu> (02/27/10 22:16:24)

git-committer:

David Benjamin <davidben@mit.edu> (03/07/10 18:54:59)

Message:

Add function for point-less parses

Often, you don't care very much about the point when you do the parse.
We rename existing tokenize to tokenize_with_point and add tokenize that
does point-less parses.

Signed-off-by: David Benjamin <davidben@mit.edu>

Location:

perl/lib/BarnOwl

Files:

• Completion/Context.pm (modified) (2 diffs)
• Parse.pm (modified) (3 diffs)

perl/lib/BarnOwl/Completion/Context.pm

@@ -41 +41 @@
 use base qw(Class::Accessor::Fast);
 use Carp qw(croak);
-use BarnOwl::Parse qw(tokenize);
+use BarnOwl::Parse qw(tokenize_with_point);
 
 __PACKAGE__->mk_ro_accessors(qw(line point words word word_point
@@ -54 +54 @@
     my $point = length ($before_point);
     my ($words, $word, $word_point,
-        $word_start, $word_end) = tokenize($line, $point);
+        $word_start, $word_end) = tokenize_with_point($line, $point);
     push @$words, '' if scalar @$words <= $word;
 

perl/lib/BarnOwl/Parse.pm

@@ -5 +5 @@
 
 use base qw(Exporter);
-our @EXPORT_OK = qw(tokenize);
+our @EXPORT_OK = qw(tokenize tokenize_with_point);
 
 # TODO: have the main function return whether or not it was a valid parse, with
@@ -33 +33 @@
 my $space  = qr{[ \t]};
 
-sub tokenize {
+sub tokenize_with_point {
     my $line = shift;
     my $point = shift;
@@ -94 +94 @@
     return (\@words, $cword, $word_point, $cword_start, $cword_end);
 }
+
+sub tokenize {
+    my $line = shift;
+
+    my ($words, $word, $word_point,
+        $word_start, $word_end) = tokenize_with_point($line, 0);
+    return $words;
+}