add a Variables method

yagweb · yagweb · commit 904d9ed168a3 · 2017-04-07T21:05:25.000+08:00
diff --git a/src/embed_tests/TestPyScope.cs b/src/embed_tests/TestPyScope.cs
@@ -125,6 +125,37 @@ public void TestScopeFunction()
             }
         }
 
+        /// <summary>
+        /// Create a class in the scope, the class can read variables in the scope.
+        /// Its methods can write the variables with the help of 'global' keyword.
+        /// </summary>
+        [Test]
+        public void TestScopeClass()
+        {
+            using (Py.GIL())
+            {
+                dynamic _ps = ps;
+                _ps.bb = 100;
+                ps.Exec(
+                    "class class1():\n" +
+                    "    def __init__(self, value):\n" +
+                    "        self.value = value\n" +
+                    "    def call(self, arg):\n" +
+                    "        return self.value + bb + arg\n" + //use scope variables
+                    "    def update(self, arg):\n" +
+                    "        global bb\n" +
+                    "        bb = self.value + arg\n"  //update scope variable
+                );
+                dynamic obj1 = _ps.class1(20);
+                var result = obj1.call(10).AsManagedObject(typeof(int));
+                Assert.AreEqual(130, result);
+
+                obj1.update(10);
+                result = ps.GetVariable<int>("bb");
+                Assert.AreEqual(30, result);
+            }
+        }
+
         /// <summary>
         /// Import a python module into the session.
         /// Equivalent to the Python "import" statement.
diff --git a/src/runtime/pyscope.cs b/src/runtime/pyscope.cs
@@ -12,6 +12,9 @@ public PyScopeException(string message)
         }
     }
 
+    /// <summary>
+    /// Classes implement this interface must be used with GIL obtained.
+    /// </summary>
     public interface IPyObject : IDisposable
     {
     }
@@ -38,6 +41,8 @@ internal PyScope(string name)
                 variables, "__builtins__",
                 Runtime.PyEval_GetBuiltins()
             );
+            SetVariable("locals", (Func<PyDict>)Variables);
+            SetVariable("globals", (Func<PyDict>)Variables);
         }
         
         /// <summary>
@@ -47,6 +52,11 @@ internal PyScope(string name)
 
         public event Action<PyScope> OnDispose;
 
+        public PyDict Variables()
+        {
+            return new PyDict(variables);
+        }
+
         public PyScope CreateScope()
         {
             var scope = new PyScope(null);
@@ -276,17 +286,26 @@ private PyObject _GetVariable(string name)
         public PyObject GetVariable(string name)
         {
             Check();
-            var variable = _GetVariable(name);
-            if (variable == null)
-            {
-                throw new PyScopeException(String.Format("'ScopeStorage' object has no attribute '{0}'", name));
-            }
-            if (variable.Handle == Runtime.PyNone)
+            using (var pyKey = new PyString(name))
             {
-                variable.Dispose();
-                return null;
+                if (Runtime.PyMapping_HasKey(variables, pyKey.obj) != 0)
+                {
+                    IntPtr op = Runtime.PyObject_GetItem(variables, pyKey.obj);
+                    if (op == IntPtr.Zero)
+                    {
+                        throw new PythonException();
+                    }
+                    if (op == Runtime.PyNone)
+                    {
+                        return null;
+                    }
+                    return new PyObject(op);
+                }
+                else
+                {
+                    throw new PyScopeException(String.Format("'ScopeStorage' object has no attribute '{0}'", name));
+                }
             }
-            return variable;
         }
 
         /// <summary>
@@ -299,19 +318,29 @@ public PyObject GetVariable(string name)
         public bool TryGetVariable(string name, out PyObject value)
         {
             Check();
-            var variable = _GetVariable(name);
-            if (variable == null)
-            {
-                value = null;
-                return false;
-            }
-            if (variable.Handle == Runtime.PyNone)
+            using (var pyKey = new PyString(name))
             {
-                value = null;
-                return true;
+                if (Runtime.PyMapping_HasKey(variables, pyKey.obj) != 0)
+                {
+                    IntPtr op = Runtime.PyObject_GetItem(variables, pyKey.obj);
+                    if (op == IntPtr.Zero)
+                    {
+                        throw new PythonException();
+                    }
+                    if (op == Runtime.PyNone)
+                    {
+                        value = null;
+                        return true;
+                    }
+                    value = new PyObject(op);
+                    return true;
+                }
+                else
+                {
+                    value = null;
+                    return false;
+                }
             }
-            value = variable;
-            return true;
         }
 
         public T GetVariable<T>(string name)
