Menu
▾
▴
[Jython-checkins] SF.net SVN: jython: [3060] trunk/jython/src/org
|
From: <cg...@us...> - 2007-01-24 02:42:35
|
Revision: 3060
http://svn.sourceforge.net/jython/?rev=3060&view=rev
Author: cgroves
Date: 2007-01-23 18:42:33 -0800 (Tue, 23 Jan 2007)
Log Message:
-----------
Removed oro and regex stuff since it wasn't in 2.1 and hasn't been missed per bug #1614266
Removed Paths:
-------------
trunk/jython/src/org/apache/
trunk/jython/src/org/python/modules/MatchObject.java
trunk/jython/src/org/python/modules/RegexObject.java
trunk/jython/src/org/python/modules/re.java
Deleted: trunk/jython/src/org/python/modules/MatchObject.java
===================================================================
--- trunk/jython/src/org/python/modules/MatchObject.java 2007-01-23 07:11:24 UTC (rev 3059)
+++ trunk/jython/src/org/python/modules/MatchObject.java 2007-01-24 02:42:33 UTC (rev 3060)
@@ -1,153 +0,0 @@
-// Copyright (c) Corporation for National Research Initiatives
-package org.python.modules;
-
-import org.python.core.*;
-import org.apache.oro.text.regex.*;
-
-public class MatchObject extends PyObject
-{
- public String string;
- public int pos, endpos;
- public RegexObject re;
- private MatchResult match;
-
- public MatchObject(RegexObject re, String string,
- int pos, int endpos, MatchResult match)
- {
- this.string = string;
- this.pos = pos;
- this.endpos = endpos;
- this.re = re;
- this.match = match;
- }
-
- public int start(int g) {
- return match.beginOffset(g);
- }
-
- public int start() {
- return start(0);
- }
-
- public int start(PyString s) {
- return start(getindex(s));
- }
-
- public int end(int g) {
- return match.endOffset(g);
- }
-
- public int end() {
- return end(0);
- }
-
- public int end(PyString s) {
- return end(getindex(s));
- }
-
- public PyTuple span(int g) {
- return new PyTuple(
- new PyObject[] {
- new PyInteger(start(g)),
- new PyInteger(end(g))
- });
- }
-
- public PyTuple span() {
- return span(0);
- }
-
- public PyTuple span(PyString s) {
- return span(getindex(s));
- }
-
- public PyTuple groups(PyObject defalt) {
- int n = match.groups()-1;
- PyObject[] ret = new PyObject[n];
- for(int i=0; i<n; i++) {
- String tmp = match.group(i+1);
- if (tmp == null) {
- ret[i] = defalt;
- } else {
- ret[i] = new PyString(tmp);
- }
- }
- return new PyTuple(ret);
- }
-
- public PyTuple groups() {
- return groups(Py.None);
- }
-
- private int getindex(PyString s) {
- PyInteger v = (PyInteger)re.groupindex.__finditem__(s);
- if (v == null)
- throw Py.IndexError("group '"+s+"' is undefined");
- return v.getValue();
- }
-
- private String group(int i) {
- if (i >= match.groups()) {
- throw Py.IndexError("group "+i+" is undefined");
- }
- return match.group(i);
- }
-
- private String group(PyString s) {
- return group(getindex(s));
- }
-
- private PyObject group(PyObject o) {
- String s;
-
- if (o instanceof PyInteger) {
- s = group(((PyInteger)o).getValue());
- } else if (o instanceof PyString) {
- s = group((PyString)o);
- } else {
- throw org.python.modules.re.ReError(
- "group index must be a string or integer");
- }
- if (s == null)
- return Py.None;
- else
- return new PyString(s);
- }
-
- public PyObject group(PyObject[] args) {
- int n = args.length;
-
- if (n == 0)
- return new PyString(group(0));
- if (n == 1)
- return group(args[0]);
-
- PyObject[] res = new PyObject[n];
- for(int i=0; i < n; i++) {
- res[i] = group(args[i]);
- }
- return new PyTuple(res);
- }
-
- public PyObject groupdict() {
- return groupdict(Py.None);
- }
-
- public PyObject groupdict(PyObject defalt) {
- PyDictionary dict = new PyDictionary();
- PyList items = re.groupindex.items();
-
- for (int i=0; i < items.__len__(); i++) {
- PyTuple t = (PyTuple)items.__getitem__(i);
- PyString name = (PyString)t.__getitem__(0);
- PyInteger index = (PyInteger)t.__getitem__(1);
-
- String s = group(index.getValue());
- if (s == null)
- dict.__setitem__(name, defalt);
- else
- dict.__setitem__(name, new PyString(s));
- }
- return dict;
- }
-}
Deleted: trunk/jython/src/org/python/modules/RegexObject.java
===================================================================
--- trunk/jython/src/org/python/modules/RegexObject.java 2007-01-23 07:11:24 UTC (rev 3059)
+++ trunk/jython/src/org/python/modules/RegexObject.java 2007-01-24 02:42:33 UTC (rev 3060)
@@ -1,526 +0,0 @@
-// Copyright (c) Corporation for National Research Initiatives
-package org.python.modules;
-
-import org.python.core.*;
-import org.apache.oro.text.regex.*;
-
-
-public class RegexObject extends PyObject
-{
- private static Perl5Compiler compiler = new Perl5Compiler();
-
- private static synchronized Pattern compile(String pattern, int flags) {
- try {
- return compiler.compile(pattern, flags);
- }
- catch (MalformedPatternException e) {
- throw re.ReError(e.getMessage());
- }
- }
-
- private static synchronized Perl5Matcher getMatcher() {
- Perl5Matcher matcher = new Perl5Matcher();
- //matcher.setMultiline(false);
- return matcher;
- }
-
- public String pattern;
- public int flags;
- public PyDictionary groupindex;
- private Pattern code;
-
- public RegexObject(String pattern, int flags) {
- this.pattern = pattern;
- this.flags = flags;
- groupindex = new PyDictionary();
- code = compile(fixPattern(pattern), flags);
- }
-
- public MatchObject match(String string) {
- MatchResult result = doMatch(string);
- if (result == null)
- return null;
- return new MatchObject(this, string, 0, string.length(), result);
- }
-
- public MatchObject match(String s, int pos) {
- return match(s, pos, s.length());
- }
-
- public MatchObject match(String string, int pos, int endpos) {
- if (endpos > string.length())
- endpos = string.length();
- if (endpos < pos)
- endpos = pos;
-
- MatchResult result =
- doMatch(new PatternMatcherInput(string, pos, endpos-pos));
- if (result == null)
- return null;
- return new MatchObject(this, string, pos, endpos, result);
- }
-
- private MatchResult doMatch(Object input) {
- Perl5Matcher matcher = getMatcher();
- if (input instanceof String) {
- if (!matcher.matchesPrefix((String)input, code))
- return null;
- }
- else {
- if (!matcher.matchesPrefix((PatternMatcherInput)input, code))
- return null;
- }
- return matcher.getMatch();
- }
-
- public MatchObject search(String string) {
- MatchResult result = doSearch(string);
- if (result == null)
- return null;
- return new MatchObject(this, string, 0, string.length(), result);
- }
-
- public MatchObject search(String s, int pos) {
- return search(s, pos, s.length());
- }
-
- public MatchObject search(String string, int pos, int endpos) {
- if (endpos > string.length())
- endpos = string.length();
- if (endpos < pos)
- endpos = pos;
-
- MatchResult result =
- doSearch(new PatternMatcherInput(string, pos, endpos-pos));
- if (result == null)
- return null;
- return new MatchObject(this, string, pos, endpos, result);
- }
-
- private MatchResult doSearch(Object input) {
- Perl5Matcher matcher = getMatcher();
-
- if (input instanceof String) {
- if (!matcher.contains((String)input, code))
- return null;
- }
- else {
- if (!matcher.contains((PatternMatcherInput)input, code))
- return null;
- }
- return matcher.getMatch();
- }
-
- public PyString sub(PyObject repl, String string) {
- return sub(repl, string, 0);
- }
-
- public PyString sub(PyObject repl, String string, int count) {
- return (PyString)subn(repl, string, count).__getitem__(0);
- }
-
- public PyTuple subn(PyObject repl, String string) {
- return subn(repl, string, 0);
- }
-
- public PyTuple subn(PyObject repl, String string, int count) {
- // Real work is done here
- String srepl = null;
- boolean expand = false;
- if (repl instanceof PyString) {
- srepl = repl.toString();
- expand = (srepl.indexOf('\\') != -1);
- }
- if (count < 0) {
- throw re.ReError("negative substitution count");
- }
- if (count == 0) {
- count = Integer.MAX_VALUE;
- }
-
- // How to handle repl as String vs. callable?
- int n=0;
- StringBuffer buf = new StringBuffer();
- Perl5Matcher matcher = getMatcher();
- PatternMatcherInput match = new PatternMatcherInput(string);
- int lastmatch = 0;
-
- while (n < count && !match.endOfInput()) {
- if (!matcher.contains(match, code))
- break;
- n++;
- int offset = match.getMatchBeginOffset();
- //System.err.println("off: "+offset+", "+lastmatch);
- if (offset > lastmatch) {
- buf.append(match.substring(lastmatch, offset));
- }
- if (srepl == null) {
- MatchObject m = new MatchObject(this, string, lastmatch,
- string.length(),
- matcher.getMatch());
- PyObject ret = repl.__call__(m);
- buf.append(ret.toString());
- }
- else {
- if (expand)
- buf.append(expandMatch(matcher.getMatch(), srepl));
- else
- buf.append(srepl);
- }
- lastmatch = match.getMatchEndOffset();
- }
- if (lastmatch < match.getEndOffset()) {
- buf.append(match.substring(lastmatch, match.getEndOffset()));
- }
- return new PyTuple(
- new PyObject[] {
- new PyString(buf.toString()),
- new PyInteger(n)
- });
- }
-
- public PyList split(String string) {
- return split(string, 0);
- }
-
- public PyList split(String string, int maxsplit) {
- if (maxsplit < 0) {
- throw re.ReError("maxsplit < 0");
- }
- if (maxsplit == 0) {
- maxsplit = Integer.MAX_VALUE;
- }
-
- int n=0;
- Perl5Matcher matcher = getMatcher();
- PatternMatcherInput match = new PatternMatcherInput(string);
- int lastmatch = 0;
- PyList results = new PyList();
-
- while (n < maxsplit && !match.endOfInput()) {
- if (!matcher.contains(match, code))
- break;
- n++;
-
- int begin = match.getMatchBeginOffset();
- int end = match.getMatchEndOffset();
-
- if (begin == end) {
- // More needed?
- continue;
- }
-
- results.append(new PyString(match.substring(lastmatch, begin)));
-
- MatchResult m = matcher.getMatch();
- int ngroups = m.groups();
- if (ngroups > 1) {
- for (int j=1; j<ngroups; j++) {
- String tmp = m.group(j);
- if (tmp == null) {
- results.append(Py.None);
- }
- else {
- results.append(new PyString(tmp));
- }
- }
- }
- lastmatch = end;
- }
- results.append(
- new PyString(match.substring(lastmatch, match.getEndOffset())));
- return results;
- }
-
- private int getindex(PyString s) {
- PyInteger v = (PyInteger)groupindex.__finditem__(s);
- if (v == null) {
- try {
- v = (PyInteger)s.__int__();
- }
- catch (PyException exc) {
- if (!isname(s.toString()))
- throw re.ReError("illegal character in group name");
- else
- throw Py.IndexError("group "+s.__repr__() +
- " is undefined");
- }
- }
- return v.getValue();
- }
-
- private boolean isdigit(char c) {
- return '0' <= c && c <= '9';
- }
-
- private boolean isident(char c) {
- return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || (c == '_');
- }
-
- private boolean isname(String name) {
- int n = name.length();
- if (n <= 0 || !isident(name.charAt(0)))
- return false;
- for (int i = 1; i < n; i++) {
- char c = name.charAt(i);
- if (!isident(c) && !isdigit(c))
- return false;
- }
- return true;
- }
-
- private String fixPattern(String pattern) {
- char[] chars = pattern.toCharArray();
-
- int index=0;
- int group=1;
- int lasti=0;
- int n = chars.length;
-
- StringBuffer buf = new StringBuffer();
-
- while (index < n) {
- if (chars[index++] == '(') {
- // Ignore \( because these are literal parens
- if (index > 2 && chars[index-2] == '\\')
- continue;
-
- if (index < n && chars[index] == '?') {
- index++;
- if (index < n && chars[index] == 'P') {
- index++;
- if (index == n)
- break;
- char c = chars[index++];
- int start = index;
- if (c == '<') {
- while (index < n && chars[index] != '>')
- index++;
- if (index == n)
- throw re.ReError("unmatched <");
- String name =
- new String(chars, start, index-start);
- // name must be a valid Python identifier
- if (!isname(name))
- throw re.ReError("illegal character in " +
- "group name");
- groupindex.__setitem__(new PyString(name),
- new PyInteger(group));
- buf.append(chars, lasti, start-3-lasti);
- index++;
- lasti = index;
- group++;
- continue;
- }
- else {
- if (c == '=') {
- while (index < n && chars[index] != ')') {
- c = chars[index];
- if (Character.isJavaIdentifierPart(c) &&
- c != '$')
- {
- index++;
- }
- else {
- throw re.ReError(
- "illegal character in symbol");
- }
- }
- if (index == n)
- throw re.ReError("?P= not closed");
- if (!(Character.isJavaIdentifierStart(
- chars[start])))
- {
- throw re.ReError(
- "illegal character starting symbol");
- }
- String name = new String(chars, start,
- index-start);
- PyString pname = new PyString(name);
- buf.append(chars, lasti, start-4-lasti);
- buf.append('\\');
- buf.append(getindex(pname));
- index++;
- lasti=index;
- }
- else {
- throw re.ReError("invalid ?P grouping");
- }
- }
- }
- else {
- if (chars[index] == ':')
- continue;
- while (index < n && chars[index] != ')')
- index++;
- }
- }
- else {
- group++;
- }
- }
- }
- if (lasti > 0) {
- buf.append(chars, lasti, n-lasti);
- //System.err.println("pat: "+buf.toString());
- return buf.toString();
- }
- else {
- //System.err.println("untouched: "+pattern);
- return pattern;
- }
- }
-
- public String expandMatch(MatchResult match, String repl) {
- char[] chars = repl.toCharArray();
-
- int index=0;
- int lasti=0;
- int n = chars.length;
-
- StringBuffer buf = new StringBuffer();
- try {
- while (index<n) {
- //System.out.println("index: "+index+", "+n+", "+repl);
-
- if (chars[index++] == '\\') {
- char ch = 0;
- switch (chars[index++]) {
- case '\\':
- ch = '\\'; break;
- case 'E':
- case 'G':
- case 'L':
- case 'Q':
- case 'U':
- case 'l':
- case 'u':
- throw re.ReError("\\"+chars[index-1]+
- " is not allowed");
- case 'n':
- ch = '\n'; break;
- case 't':
- ch = '\t'; break;
- case 'r':
- ch = '\r'; break;
- case 'v':
- ch = '\013'; break;
- case 'f':
- ch = '\f'; break;
- case 'a':
- ch = '\007'; break;
- case 'b':
- ch = '\b'; break;
-
- case 'g':
- if (chars[index++] != '<') {
- throw re.ReError(
- "missing < in symbolic reference");
- }
- int start = index;
- while (index < n && chars[index] != '>')
- index++;
- if (index == n) {
- throw re.ReError("unfinished symbolic reference");
- }
- index++;
- buf.append(chars, lasti, start-3-lasti);
- PyString str = new PyString(new String(chars, start,
- index-1-start));
- String tmp = match.group(getindex(str));
- if (tmp == null) {
- throw re.ReError("group not in match: "+str);
- }
- buf.append(tmp);
- lasti=index;
- continue;
-
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- start = index-2;
- int v = chars[index-1]-'0';
- char ch1;
- if (index<n) {
- ch = chars[index];
- if (ch >= '0' && ch <= '9') {
- index++;
- if (index < n && ch <= '7') {
- ch1 = chars[index];
- if (ch1 >= '0' && ch1 <= '7') {
- v = v*64 +
- (ch - '0')*8 +
- (ch1 - '0');
- buf.append(chars, lasti,
- index-2-lasti);
- buf.append((char)v);
- index++;
- lasti=index;
- }
- }
- v = v*10 + (ch - '0');
- }
- }
- buf.append(chars, lasti, start-lasti);
- tmp = match.group(v);
- if (tmp == null) {
- throw re.ReError("group not in match: "+v);
- }
- buf.append(tmp);
- lasti=index;
- continue;
- default:
- continue;
- }
- buf.append(chars, lasti, index-2-lasti);
- buf.append(ch);
- lasti=index;
- }
- }
- }
- catch (ArrayIndexOutOfBoundsException exc) {
- throw re.ReError("invalid expression");
- }
- if (lasti > 0) {
- buf.append(chars, lasti, n-lasti);
- return buf.toString();
- }
- else {
- return repl;
- }
- }
-
- public PyList findall(String string) {
- Perl5Matcher matcher = getMatcher();
- PatternMatcherInput match = new PatternMatcherInput(string);
- PyList ret = new PyList();
-
- while (matcher.contains(match, code)) {
- MatchResult result = matcher.getMatch();
- int groups = result.groups();
-
- if (groups == 1)
- // no parenthetical subgroups
- ret.append(new PyString(result.group(0)));
- else if (groups == 2)
- // one parenthetical subgroup, but we only return a list of
- // the first matching subgroup.
- ret.append(new PyString(result.group(1)));
- else {
- // two or more subgroups, so ignore the whole match
- PyString[] submatches = new PyString[groups-1];
- for (int g = 1; g < groups; g++)
- submatches[g-1] = new PyString(result.group(g));
- PyTuple tup = new PyTuple(submatches);
- ret.append(tup);
- }
- }
- return ret;
- }
-}
Deleted: trunk/jython/src/org/python/modules/re.java
===================================================================
--- trunk/jython/src/org/python/modules/re.java 2007-01-23 07:11:24 UTC (rev 3059)
+++ trunk/jython/src/org/python/modules/re.java 2007-01-24 02:42:33 UTC (rev 3060)
@@ -1,126 +0,0 @@
-// Copyright (c) Corporation for National Research Initiatives
-package org.python.modules;
-
-import org.python.core.*;
-import org.apache.oro.text.regex.*;
-
-public class re implements ClassDictInit
-{
- public static String[] __all__ = new String[] {
- "match","search","sub","subn","split","findall","escape","compile",
- "I","L","M","S","X","IGNORECASE","LOCALE","MULTILINE","DOTALL",
- "VERBOSE","error"
- };
-
- public static PyObject error = new PyString("re.error");
-
- public static PyException ReError(String message) {
- return new PyException(error, message);
- }
-
- public static void classDictInit(PyObject dict) {
- dict.__setitem__("IGNORECASE",
- new PyInteger(Perl5Compiler.CASE_INSENSITIVE_MASK));
- dict.__setitem__("I",
- new PyInteger(Perl5Compiler.CASE_INSENSITIVE_MASK));
- dict.__setitem__("MULTILINE",
- new PyInteger(Perl5Compiler.MULTILINE_MASK));
- dict.__setitem__("M", new PyInteger(Perl5Compiler.MULTILINE_MASK));
- dict.__setitem__("DOTALL",
- new PyInteger(Perl5Compiler.SINGLELINE_MASK));
- dict.__setitem__("S", new PyInteger(Perl5Compiler.SINGLELINE_MASK));
- dict.__setitem__("VERBOSE",
- new PyInteger(Perl5Compiler.EXTENDED_MASK));
- dict.__setitem__("X", new PyInteger(Perl5Compiler.EXTENDED_MASK));
- // These are not implemented
- dict.__setitem__("LOCALE", new PyInteger(0));
- dict.__setitem__("L", new PyInteger(0));
- dict.__setitem__("UNICODE", new PyInteger(0));
- dict.__setitem__("U", new PyInteger(0));
- }
-
- // Skip caching for now...
- private static RegexObject cachecompile(String pattern, int flags) {
- return compile(pattern, flags);
- }
-
- private static RegexObject cachecompile(String pattern) {
- return cachecompile(pattern, 0);
- }
-
- public static MatchObject match(String pattern, String string) {
- return match(pattern, string, 0);
- }
-
- public static MatchObject match(String pattern, String string,
- int flags)
- {
- return cachecompile(pattern, flags).match(string);
- }
-
- public static MatchObject search(String pattern, String string) {
- return search(pattern, string, 0);
- }
-
- public static MatchObject search(String pattern, String string, int flags)
- {
- return cachecompile(pattern, flags).search(string);
- }
-
- private static RegexObject getPattern(PyObject pattern) {
- if (pattern instanceof PyString) {
- return cachecompile(pattern.toString());
- } else if (pattern instanceof RegexObject) {
- return (RegexObject)pattern;
- }
- throw Py.TypeError("pattern must be string or RegexObject");
- }
-
- public static PyString sub(PyObject pattern, PyObject repl, String string)
- {
- return sub(pattern, repl, string, 0);
- }
-
- public static PyString sub(PyObject pattern, PyObject repl,
- String string, int count)
- {
- return getPattern(pattern).sub(repl, string, count);
- }
-
- public static PyTuple subn(PyObject pattern, PyObject repl, String string)
- {
- return subn(pattern, repl, string, 0);
- }
-
- public static PyTuple subn(PyObject pattern, PyObject repl,
- String string, int count)
- {
- return getPattern(pattern).subn(repl, string, count);
- }
-
- public static PyList split(PyObject pattern, String string) {
- return split(pattern, string, 0);
- }
-
- public static PyList split(PyObject pattern, String string,
- int maxsplit)
- {
- return getPattern(pattern).split(string, maxsplit);
- }
-
- public static PyList findall(PyObject pattern, String string) {
- return getPattern(pattern).findall(string);
- }
-
- public static String escape(String s) {
- return Perl5Compiler.quotemeta(s);
- }
-
- public static RegexObject compile(String pattern) {
- return new RegexObject(pattern, 0);
- }
-
- public static RegexObject compile(String pattern, int flags) {
- return new RegexObject(pattern, flags);
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|