[Jython-checkins] CVS: jython/org/python/core PyBaseString.java,NONE,2.1 PyUnicode.java,NONE,2.1 PyString.java,2.71,2.72 __builtin__.java,2.69,2.70

[Frank W. <fwi...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3203/org/python/core

Modified Files:
	PyString.java __builtin__.java 
Added Files:
	PyBaseString.java PyUnicode.java 
Log Message:
Initial work to support <type 'unicode'>


--- NEW FILE: PyBaseString.java ---
package org.python.core;

/**
 * base class for jython strings.
 */

public abstract class PyBaseString extends PySequence {
    public static final String exposed_name="unicode";
    
    public PyBaseString() {
        super();
    }

    protected PyBaseString(PyType type) {
        super(type);
    }
}



--- NEW FILE: PyUnicode.java ---
package org.python.core;

/**
 * a builtin python unicode string.
 */

public class PyUnicode extends PyString {
    public static final Class exposed_base=PyBaseString.class;

    //~ BEGIN GENERATED

    /* type info */

    public static final String exposed_name="unicode";

    public static void typeSetup(PyObject dict,PyType.Newstyle marker) {
        class exposed___ne__ extends PyBuiltinFunctionNarrow {

            private PyUnicode self;
[...2940 lines suppressed...]
    final String unicode_encode(String encoding) {
        return str_encode();
    }

    final String unicode_encode(String encoding, String errors) {
        return str_encode();
    }

    final String unicode_decode() {
        return str_decode();
    }

    final String unicode_decode(String encoding) {
        return str_decode(encoding);
    }

    final String unicode_decode(String encoding, String errors) {
        return str_decode(encoding, errors);
    }
}

Index: PyString.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyString.java,v
retrieving revision 2.71
retrieving revision 2.72
diff -C2 -d -r2.71 -r2.72
*** PyString.java	24 Jun 2005 18:48:50 -0000	2.71
--- PyString.java	26 Jun 2005 05:16:26 -0000	2.72
***************
*** 5,9 ****
   * A builtin python string.
   */
! public class PyString extends PySequence implements ClassDictInit
  {
      //~ BEGIN GENERATED
--- 5,9 ----
   * A builtin python string.
   */
! public class PyString extends PyBaseString implements ClassDictInit
  {
      //~ BEGIN GENERATED

Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.69
retrieving revision 2.70
diff -C2 -d -r2.69 -r2.70
*** __builtin__.java	24 Jun 2005 01:10:25 -0000	2.69
--- __builtin__.java	26 Jun 2005 05:16:27 -0000	2.70
***************
*** 124,127 ****
--- 124,128 ----
          dict.__setitem__("super", PyType.fromClass(PySuper.class));
          dict.__setitem__("str", PyType.fromClass(PyString.class));
+         dict.__setitem__("unicode", PyType.fromClass(PyUnicode.class));
          dict.__setitem__("file", PyType.fromClass(PyFile.class));
  
***************
*** 839,842 ****
--- 840,844 ----
      }
  
+     /*
      public static PyString unicode(PyObject v) {
          return unicode(v.__str__(), null, null);
***************
*** 852,856 ****
          return new PyString(codecs.decode(v, encoding, errors));
      }
! 
      public static PyTuple tuple(PyObject o) {
          if (o instanceof PyTuple)
--- 854,858 ----
          return new PyString(codecs.decode(v, encoding, errors));
      }
!     */
      public static PyTuple tuple(PyObject o) {
          if (o instanceof PyTuple)