New

Add group and groups method to the match object. Also add the re and string attributes.
Duncanr-glitch · Jan 28, 2013 · 8fd6edd · 8fd6edd
1 parent c73d264
commit 8fd6edd
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 4 deletions.
diff --git a/dist/builtin.js b/dist/builtin.js
diff --git a/src/lib/re/__init__.js b/src/lib/re/__init__.js
@@ -3,9 +3,23 @@ var $builtinmodule = function(name)
     var mod = {};
 
     var matchobj = function($gbl, $loc) {
-        $loc.__init__ = new Sk.builtin.func(function(self,thematch) {
+        $loc.__init__ = new Sk.builtin.func(function(self,thematch, pattern, string) {
             self.thematch = thematch;
+	    self.re = pattern;
+	    self.string = string;
         });
+
+	$loc.groups = new Sk.builtin.func(function(self) {
+	    return new Sk.builtin.tuple(self.thematch.v.slice(1))
+	});
+
+	$loc.group = new Sk.builtin.func(function(self,grpnum) {
+	    if(grpnum >= self.thematch.v.length) {
+		throw new Sk.builtin.IndexError("Index out of range: " + grpnum);
+		}
+	    return self.thematch.v[grpnum]
+	});
+
     }
 
     mod.MatchObject = Sk.misceval.buildClass(mod, matchobj, 'MatchObject', []);
@@ -41,15 +55,15 @@ var $builtinmodule = function(name)
         var res = "/"+pattern.v.replace("/","\\/")+"/";
         lst = mod._findre(res,string);
         if ( lst.v.length < 1 ) return null;
-        var mob = Sk.misceval.callsim(mod.MatchObject, lst);
+        var mob = Sk.misceval.callsim(mod.MatchObject, lst, pattern, string);
         return mob;
     });
 
     mod.match = new Sk.builtin.func(function(pattern, string, flags) {
         var res = "/^"+pattern.v.replace("/","\\/")+"/";
         lst = mod._findre(res,string);
         if ( lst.v.length < 1 ) return null;
-        var mob = Sk.misceval.callsim(mod.MatchObject, lst);
+        var mob = Sk.misceval.callsim(mod.MatchObject, lst, pattern, string);
         return mob;
     });
 

diff --git a/test/run/t340.py b/test/run/t340.py
@@ -0,0 +1,7 @@
+import re
+
+m = re.match('([0-9]+)([a-z]+)','345abu')
+print m.groups()
+print m.group(0)
+print m.group(1)
+print m.group(2)
diff --git a/test/run/t340.py.real b/test/run/t340.py.real
@@ -0,0 +1,4 @@
+('345', 'abu')
+345abu
+345
+abu
diff --git a/test/run/t340.py.symtab b/test/run/t340.py.symtab
@@ -0,0 +1,30 @@
+Sym_type: module
+Sym_name: top
+Sym_lineno: 0
+Sym_nested: False
+Sym_haschildren: False
+-- Identifiers --
+name: m
+  is_referenced: True
+  is_imported: False
+  is_parameter: False
+  is_global: False
+  is_declared_global: False
+  is_local: True
+  is_free: False
+  is_assigned: True
+  is_namespace: False
+  namespaces: [
+  ]
+name: re
+  is_referenced: True
+  is_imported: True
+  is_parameter: False
+  is_global: False
+  is_declared_global: False
+  is_local: True
+  is_free: False
+  is_assigned: False
+  is_namespace: False
+  namespaces: [
+  ]
diff --git a/test/run/t340.trans b/test/run/t340.trans
@@ -0,0 +1,53 @@
+Module(body=[Import(names=[alias(name='re',
+                                 asname=None)]),
+             Assign(targets=[Name(id='m',
+                                  ctx=Store())],
+                    value=Call(func=Attribute(value=Name(id='re',
+                                                         ctx=Load()),
+                                              attr='match',
+                                              ctx=Load()),
+                               args=[Str(s='([0-9]+)([a-z]+)'),
+                                     Str(s='345abu')],
+                               keywords=[],
+                               starargs=None,
+                               kwargs=None)),
+             Print(dest=None,
+                   values=[Call(func=Attribute(value=Name(id='m',
+                                                          ctx=Load()),
+                                               attr='groups',
+                                               ctx=Load()),
+                                args=[],
+                                keywords=[],
+                                starargs=None,
+                                kwargs=None)],
+                   nl=True),
+             Print(dest=None,
+                   values=[Call(func=Attribute(value=Name(id='m',
+                                                          ctx=Load()),
+                                               attr='group',
+                                               ctx=Load()),
+                                args=[Num(n=0)],
+                                keywords=[],
+                                starargs=None,
+                                kwargs=None)],
+                   nl=True),
+             Print(dest=None,
+                   values=[Call(func=Attribute(value=Name(id='m',
+                                                          ctx=Load()),
+                                               attr='group',
+                                               ctx=Load()),
+                                args=[Num(n=1)],
+                                keywords=[],
+                                starargs=None,
+                                kwargs=None)],
+                   nl=True),
+             Print(dest=None,
+                   values=[Call(func=Attribute(value=Name(id='m',
+                                                          ctx=Load()),
+                                               attr='group',
+                                               ctx=Load()),
+                                args=[Num(n=2)],
+                                keywords=[],
+                                starargs=None,
+                                kwargs=None)],
+                   nl=True)])