Changeset 2232

Timestamp:

12/28/08 22:02:48 (3 years ago)

Author:

adamk

Message:

Starting Padre::Document refactoring by reorganising the methods into sections.

Padre::Document->setup was doing nothing, merge it back into new

File:

• trunk/Padre/lib/Padre/Document/Perl.pm (modified) (7 diffs)

trunk/Padre/lib/Padre/Document/Perl.pm

@@ -4 +4 @@
 use strict;
 use warnings;
-
 use Carp            ();
 use Params::Util    '_INSTANCE';
@@ -22 +21 @@
 
 # TODO watch out! These PPI methods may be VERY expensive!
-# (Ballpark: Around 1 second of *BLOCKING* CPU per 1000 lines)
+# (Ballpark: Around 1 Gigahertz-second of *BLOCKING* CPU per 1000 lines)
 # Check out Padre::Task::PPI and its subclasses instead!
 sub ppi_get {
@@ -83 +82 @@
 }
 
-my $keywords;
-
-sub keywords {
-    unless ( defined $keywords ) {
-        $keywords = YAML::Tiny::LoadFile(
-            Padre::Util::sharefile( 'languages', 'perl5', 'perl5.yml' )
-        );
-    }
-    return $keywords;
-}
-
-sub get_functions {
-    my $self = shift;
-    my $text = $self->text_get;
-
-    my %nlCharTable = ( UNIX => "\n", WIN => "\r\n", MAC => "\r" );
-    my $nlchar = $nlCharTable{ $self->get_newline_type };
-
-    return $text =~ m/${nlchar}sub\s+(\w+(?:::\w+)*)/g;
-}
-
-sub get_function_regex {
-    my ( $self, $sub ) = @_;
-
-    my %nlCharTable = ( UNIX => "\n", WIN => "\r\n", MAC => "\r" );
-    my $nlchar = $nlCharTable{ $self->get_newline_type };
-
-    return qr!(?:^|${nlchar})sub\s+$sub\b!;
-}
-
-sub get_command {
-    my $self     = shift;
-
-    # Check the file name
-    my $filename = $self->filename;
-#   unless ( $filename and $filename =~ /\.pl$/i ) {
-#       die "Only .pl files can be executed\n";
-#   }
-
-    # Run with the same Perl that launched Padre
-    # TODO: get preferred Perl from configuration
-    my $perl = Padre->perl_interpreter;
-
-    my $dir = File::Basename::dirname($filename);
-    chdir $dir;
-    return qq{"$perl" "$filename"};
-}
-
-sub pre_process {
-    my ( $self ) = @_;
-    my $config = Padre->ide->config;
-
-    if ($config->{editor_perl5_beginner}) {
-        require Padre::Document::Perl::Beginner;
-        my $b = Padre::Document::Perl::Beginner->new;
-        if ($b->check( $self->text_get )) {
-            return 1;
-        } else {
-            $self->set_errstr( $b->error );
-            return;
-        }
-    }
-
-    return 1;
-}
+
+
+
+
+#####################################################################
+# Padre::Document GUI Integration
 
 sub colorize {
@@ -282 +222 @@
 }
 
+
+
+
+
+#####################################################################
+# Padre::Document Document Analysis
+
+my $keywords;
+
+sub keywords {
+    unless ( defined $keywords ) {
+        $keywords = YAML::Tiny::LoadFile(
+            Padre::Util::sharefile( 'languages', 'perl5', 'perl5.yml' )
+        );
+    }
+    return $keywords;
+}
+
+sub get_functions {
+    my $self = shift;
+    my $text = $self->text_get;
+
+    my %nlCharTable = ( UNIX => "\n", WIN => "\r\n", MAC => "\r" );
+    my $nlchar = $nlCharTable{ $self->get_newline_type };
+
+    return $text =~ m/${nlchar}sub\s+(\w+(?:::\w+)*)/g;
+}
+
+sub get_function_regex {
+    my ( $self, $sub ) = @_;
+
+    my %nlCharTable = ( UNIX => "\n", WIN => "\r\n", MAC => "\r" );
+    my $nlchar = $nlCharTable{ $self->get_newline_type };
+
+    return qr!(?:^|${nlchar})sub\s+$sub\b!;
+}
+
+sub get_command {
+    my $self     = shift;
+
+    # Check the file name
+    my $filename = $self->filename;
+#   unless ( $filename and $filename =~ /\.pl$/i ) {
+#       die "Only .pl files can be executed\n";
+#   }
+
+    # Run with the same Perl that launched Padre
+    # TODO: get preferred Perl from configuration
+    my $perl = Padre->perl_interpreter;
+
+    my $dir = File::Basename::dirname($filename);
+    chdir $dir;
+    return qq{"$perl" "$filename"};
+}
+
+sub pre_process {
+    my ( $self ) = @_;
+    my $config = Padre->ide->config;
+
+    if ($config->{editor_perl5_beginner}) {
+        require Padre::Document::Perl::Beginner;
+        my $b = Padre::Document::Perl::Beginner->new;
+        if ($b->check( $self->text_get )) {
+            return 1;
+        } else {
+            $self->set_errstr( $b->error );
+            return;
+        }
+    }
+
+    return 1;
+}
+
 # Checks the syntax of a Perl document.
 # Documented in Padre::Document!
@@ -417 +430 @@
 }
 
+
+
+
+
+#####################################################################
+# Padre::Document Document Manipulation
+
 sub lexical_variable_replacement {
     my ($self, $replacement) = @_;
@@ -465 +485 @@
     my @words;
     push @words ,grep { ! $seen{$_}++ } reverse ($pre_text =~ /$regex/g);
-    push @words , grep { ! $seen{$_}++ } ($post_text =~ /$regex/g);
+    push @words ,grep { ! $seen{$_}++ } ($post_text =~ /$regex/g);
 
     if (@words > 20) {
@@ -473 +493 @@
     return (length($prefix), @words);
 }
-
 
 1;