From fcbdb853f2f06cc79235cc8090943d2aa5624d14 Mon Sep 17 00:00:00 2001
From: moculus <none@none>
Date: Mon, 18 Jun 2007 19:58:23 +0000
Subject: [PATCH] perl mode tag matching

--HG--
branch : pmacs2
---
 lex2_perl.py |  3 ++-
 mode2.py     | 12 ++++++------
 mode_perl.py |  8 ++------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lex2_perl.py b/lex2_perl.py
index f47f4bc..5dd98db 100755
--- a/lex2_perl.py
+++ b/lex2_perl.py
@@ -335,7 +335,8 @@ class PerlGrammar(Grammar):
         # some basic stuff
         PatternRule(
             name=r'delimiter',
-            pattern=r",|;|->|=>|=|\?|(?<!:):(?!=:)",
+            #pattern=r",|;|->|=>|=|\?|(?<!:):(?!=:)",
+            pattern=r",|;|->|=>|=|\?|\(|\)|{|}|\[|\](?<!:):(?!=:)",
         ),
         PatternRule(
             name=r'operator',
diff --git a/mode2.py b/mode2.py
index aac2af3..48232f6 100644
--- a/mode2.py
+++ b/mode2.py
@@ -136,15 +136,15 @@ class Fundamental(Handler):
         self.add_bindings('cmd-help-buffer', ('M-h',))
         self.add_bindings('set-mode', ('C-x m',))
         self.add_bindings('cancel', ('C-]',))
-        #self.add_bindings('close-paren', (')',))
-        #self.add_bindings('close-brace', ('}',))
-        #self.add_bindings('close-bracket', (']',))
+        self.add_bindings('close-paren', (')',))
+        self.add_bindings('close-brace', ('}',))
+        self.add_bindings('close-bracket', (']',))
 
         # create all the insert actions for the character ranges we like
         for c in string.letters + string.digits + string.punctuation:
-            ## closing tags are handled differently
-            #if c == ')' or c == ']' or c == '}':
-            #    continue
+            # closing tags are handled differently
+            if c == ')' or c == ']' or c == '}':
+                continue
             self.add_binding('insert-string-%s' % c, c)
         
         # initialize some stuff
diff --git a/mode_perl.py b/mode_perl.py
index 70e2f01..51b8840 100644
--- a/mode_perl.py
+++ b/mode_perl.py
@@ -6,7 +6,7 @@ class Perl(mode2.Fundamental):
     def __init__(self, w):
         mode2.Fundamental.__init__(self, w)
 
-        #self.tag_matching = True
+        self.tag_matching = True
         self.grammar      = lex2_perl.PerlGrammar()
         self.lexer        = lex2.Lexer(self.name(), self.grammar)
 
@@ -20,10 +20,6 @@ class Perl(mode2.Fundamental):
         self.add_action_and_bindings(PerlWhichFunction(), ('C-c w',))
         self.add_action_and_bindings(PerlListFunctions(), ('C-c W',))
 
-        #self.add_bindings('close-paren', (')',))
-        #self.add_bindings('close-brace', ('}',))
-        #self.add_bindings('close-bracket', (']',))
-
         self.default_color = color.build('default', 'default')
 
         self.colors = {
@@ -390,7 +386,7 @@ class PerlHashCleanup(method.Method):
         start_p = Point(0, start)
         end_p = Point(0, end + 1)
         window.kill(start_p, end_p)
-        window.insert(start_p, data)
+        window.insert_string(start_p, data)
 
 class PerlHashCleanup2(method.Method):
     '''Correctly align assignment blocks and literal hashes'''