rebased

yagweb · yagweb · commit 9f50e25dda9b · 2017-04-07T21:05:25.000+08:00
diff --git a/src/embed_tests/pyscope.cs b/src/embed_tests/pyscope.cs
@@ -53,7 +53,7 @@ public void TestCompileExpression()
         {
             ps.SetVariable("bb", 100); //declare a global variable
             ps.SetVariable("cc", 10); //declare a local variable
-            var script = ps.Compile("bb+cc+3", "", CompileMode.Eval);
+            var script = ps.Compile("bb+cc+3", "", RunFlagType.Eval);
             var result = ps.Execute<int>(script);
             Assert.AreEqual(result, 113);
         }
@@ -68,7 +68,7 @@ public void TestCompileStatements()
         {
             ps.SetVariable("bb", 100); //declare a global variable
             ps.SetVariable("cc", 10); //declare a local variable
-            var script = ps.Compile("aa=bb+cc+3", "", CompileMode.File);
+            var script = ps.Compile("aa=bb+cc+3", "", RunFlagType.File);
             ps.Execute(script);
             int result = ps.GetVariable<int>("aa");
             Assert.AreEqual(result, 113);
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -531,14 +531,7 @@ public class PySessionDisposedException: Exception
     {
 
     }
-
-    public enum CompileMode
-    {
-        Single = 256,
-        File = 257,
-        Eval = 258
-    }
-
+    
     public class PyScope : IDisposable
     {
         public class GILState : IDisposable
@@ -731,7 +724,7 @@ public T Execute<T>(PyObject script)
         /// <remarks>
         /// Compile Python expression/statements into ast.
         /// </remarks>
-        public PyObject Compile(string code, string filename = "", CompileMode mode = CompileMode.File)
+        public PyObject Compile(string code, string filename = "", RunFlagType mode = RunFlagType.File)
         {
             IntPtr flag = (IntPtr)mode;
             IntPtr ptr = Runtime.Py_CompileString(code, filename, flag);

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void TestCompileExpression()`
`53`	`53`	`{`
`54`	`54`	`ps.SetVariable("bb", 100); //declare a global variable`
`55`	`55`	`ps.SetVariable("cc", 10); //declare a local variable`
`56`		`- var script = ps.Compile("bb+cc+3", "", CompileMode.Eval);`
	`56`	`+ var script = ps.Compile("bb+cc+3", "", RunFlagType.Eval);`
`57`	`57`	`var result = ps.Execute<int>(script);`
`58`	`58`	`Assert.AreEqual(result, 113);`
`59`	`59`	`}`
`@@ -68,7 +68,7 @@ public void TestCompileStatements()`
`68`	`68`	`{`
`69`	`69`	`ps.SetVariable("bb", 100); //declare a global variable`
`70`	`70`	`ps.SetVariable("cc", 10); //declare a local variable`
`71`		`- var script = ps.Compile("aa=bb+cc+3", "", CompileMode.File);`
	`71`	`+ var script = ps.Compile("aa=bb+cc+3", "", RunFlagType.File);`
`72`	`72`	`ps.Execute(script);`
`73`	`73`	`int result = ps.GetVariable<int>("aa");`
`74`	`74`	`Assert.AreEqual(result, 113);`
Original file line number	Diff line number	Diff line change
`@@ -531,14 +531,7 @@ public class PySessionDisposedException: Exception`
`531`	`531`	`{`
`532`	`532`
`533`	`533`	`}`
`534`		`-`
`535`		`- public enum CompileMode`
`536`		`- {`
`537`		`- Single = 256,`
`538`		`- File = 257,`
`539`		`- Eval = 258`
`540`		`- }`
`541`		`-`
	`534`	`+`
`542`	`535`	`public class PyScope : IDisposable`
`543`	`536`	`{`
`544`	`537`	`public class GILState : IDisposable`
`@@ -731,7 +724,7 @@ public T Execute<T>(PyObject script)`
`731`	`724`	`/// <remarks>`
`732`	`725`	`/// Compile Python expression/statements into ast.`
`733`	`726`	`/// </remarks>`
`734`		`- public PyObject Compile(string code, string filename = "", CompileMode mode = CompileMode.File)`
	`727`	`+ public PyObject Compile(string code, string filename = "", RunFlagType mode = RunFlagType.File)`
`735`	`728`	`{`
`736`	`729`	`IntPtr flag = (IntPtr)mode;`
`737`	`730`	`IntPtr ptr = Runtime.Py_CompileString(code, filename, flag);`