Changeset 62

Timestamp:

02/12/04 19:45:01 (4 years ago)

Author:

ug

Message:

Create encoding property for class Cursor

Files:

• 05/devel/sgfpars.cc (modified) (3 diffs)
• 05/devel/sgfpars.h (modified) (1 diff)
• 05/devel/sgfpars.py (modified) (1 diff)
• 05/devel/sgfpars_wrap.cxx (modified) (2 diffs)
• 05/devel/sgfparser.py (modified) (2 diffs)

05/devel/sgfpars.cc

@@ -22 +22 @@
-
-
-
+
-#include "sgfpars.h"
-
+
-
-intN::intN(int i, intN* p) { 
@@ -319 +319 @@
-  currentN = root->next;
-  setFlags();       
+
+  if (!currentN->parsed) currentN->parseNode();
+
+  PyObject* val = PyDict_GetItemString(currentN->data, "CA");
+  PyObject* v = 0;
+
+  if (PyList_Check(val) && PyList_Size(val)) v = PyList_GetItem(val, 0); 
+
+  if (v and PyString_Check(v)) {
+    char* s = PyString_AsString(v);
+    encoding = new char[strlen(s)+1];
+    strcpy(encoding, s);
+  }
+  else {
+    encoding = new char[1];
+    encoding[0] = 0;
+  }
-}
-
@@ -325 +342 @@
-Cursor::~Cursor() {
-  deltree(root);
+  delete [] encoding;
-}
-

05/devel/sgfpars.h

@@ -67 +67 @@
-  int posy;
-
+  char* encoding;
+
-  int noChildren();
-  PyObject* currentNode();

05/devel/sgfpars.py

@@ -144 +144 @@
-    __swig_getmethods__["posy"] = _sgfpars.Cursor_posy_get
-    if _newclass:posy = property(_sgfpars.Cursor_posy_get,_sgfpars.Cursor_posy_set)
+    __swig_setmethods__["encoding"] = _sgfpars.Cursor_encoding_set
+    __swig_getmethods__["encoding"] = _sgfpars.Cursor_encoding_get
+    if _newclass:encoding = property(_sgfpars.Cursor_encoding_get,_sgfpars.Cursor_encoding_set)
-    def noChildren(*args): return apply(_sgfpars.Cursor_noChildren,args)
-    def currentNode(*args): return apply(_sgfpars.Cursor_currentNode,args)

05/devel/sgfpars_wrap.cxx

@@ -1626 +1626 @@
-    
-    resultobj = PyInt_FromLong((long)result);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Cursor_encoding_set(PyObject *self, PyObject *args) {
+    PyObject *resultobj;
+    Cursor *arg1 = (Cursor *) 0 ;
+    char *arg2 ;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"Os:Cursor_encoding_set",&obj0,&arg2)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_Cursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        if (arg1->encoding) delete [] arg1->encoding;
+        if (arg2) {
+            arg1->encoding = (char *) (new char[strlen(arg2)+1]);
+            strcpy((char *) arg1->encoding,arg2);
+        }else {
+            arg1->encoding = 0;
+        }
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_Cursor_encoding_get(PyObject *self, PyObject *args) {
+    PyObject *resultobj;
+    Cursor *arg1 = (Cursor *) 0 ;
+    char *result;
+    PyObject * obj0 = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:Cursor_encoding_get",&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_Cursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    result = (char *) ((arg1)->encoding);
+    
+    resultobj = result ? PyString_FromString(result) : Py_BuildValue((char*)"");
-    return resultobj;
-    fail:
@@ -2858 +2899 @@
-         { (char *)"Cursor_posy_set", _wrap_Cursor_posy_set, METH_VARARGS },
-         { (char *)"Cursor_posy_get", _wrap_Cursor_posy_get, METH_VARARGS },
+         { (char *)"Cursor_encoding_set", _wrap_Cursor_encoding_set, METH_VARARGS },
+         { (char *)"Cursor_encoding_get", _wrap_Cursor_encoding_get, METH_VARARGS },
-         { (char *)"Cursor_noChildren", _wrap_Cursor_noChildren, METH_VARARGS },
-         { (char *)"Cursor_currentNode", _wrap_Cursor_currentNode, METH_VARARGS },

05/devel/sgfparser.py

@@ -183 +183 @@
-
-
- = 1
+
-        Node.sloppy = sloppy
-
@@ -196 +196 @@
-        self.currentN = self.root.next
-        self.setFlags()
+
+        if self.currentNode().has_key('CA') and self.currentNode()['CA']:
+            self.encoding = self.currentNode()['CA'][0]
+        else:
+            self.encoding = ''
+
-        
-    def setFlags(self):