Changeset 34100 for lang/csharp

Timestamp:

06/22/09 13:26:10 (4 years ago)

Author:

hoge1e3

Message:

 

Location:

lang/csharp/soyText/soyText

Files:

• DocExecutor.cs (modified) (1 diff)
• PythonEngine.cs (modified) (3 diffs)
• Reg.cs (modified) (1 diff)
• bin/Debug/soyText.application (modified) (1 diff)
• bin/Debug/soyText.exe (modified) (previous)
• bin/Debug/soyText.exe.manifest (modified) (2 diffs)
• bin/Debug/soyText.pdb (modified) (previous)
• bin/Debug/soyText.vshost.application (modified) (1 diff)
• soyText.suo (modified) (previous)

lang/csharp/soyText/soyText/DocExecutor.cs

@@ -29 +29 @@
             if (document.parsed["interpreter"] == "IronPython")
             {
-                var p = new PythonEngine();
-                var res=p.evaluate(document.documentSet, scr);
+                var p = new PythonEngine(document);
+                var res=p.evaluate(); //document.documentSet, scr);
                 stdout(res);
                 return;

lang/csharp/soyText/soyText/PythonEngine.cs

@@ -16 +16 @@
         private ScriptEngine engine;
         private ScriptScope scope;
-
-        public PythonEngine()
+        private Document document;
+        public PythonEngine(Document document)
         {
+            this.document = document;
             engine = Python.CreateEngine();
             scope = engine.CreateScope();
@@ -27 +28 @@
             button = from_form;
         }
-        /*public string evaluate(EditorTab ds, string code)
+
+        public string evaluate()
         {
-            var u = new PythonUtil(ds);
-            return evaluate(u, code);
-        }*/
+            var u = new PythonUtil(documentSet);
+            var uses=document.parsed["uses"] ?? "";
+            var buf = "";
+            buf += "import sys\r\n";
+            buf += "sys.stdout=util\r\n";
+            buf += "sys.path+=[r\"" + libDir + "\"]\r\n";
+            foreach (var l in Str.eachLine(uses))
+            {
+                var s = l;
+                Reg.sub(ref s, @"^\s*", "");
+                importModule(s);
+                buf += "from m" + s + " import *\r\n";
+            }
+            return evaluate(u, buf+document.body);
+        }
+        public void importModule(string id)
+        {
+            Mkdir.setFileContent(libDir + "/m" + id + ".py", documentSet.byId(id).body);
 
-        public string evaluate(DocumentSet ds, string code)
-        {
-            var u = new PythonUtil(ds);
-            return evaluate(u, code);
         }
         public string evaluate(PythonUtil u, string code) {
             scope.SetVariable("util", u);
-
-            /*var d=Delegate.CreateDelegate(;
-            d.Method=delegate(string s)
-            {
-                MessageBox.Show(s);
-            });
-            scope.("alert",);*/
 
             try
@@ -61 +67 @@
             }
             return u.stdout;
-
-            /*
-            if (!scope.ContainsVariable("x"))
+        }
+        public DocumentSet documentSet
+        {
+            get
             {
-                return "x was deleted";
+                return document.documentSet;
             }
-            string result = scope.GetVariable<object>("x").ToString();
-            if (result == "") return "RESULT is empty: " + code;
-            return result.Length+": "+result;*/
+        }
+        public string libDir
+        {
+            get
+            {
+                return documentSet.workspace.home + "/ironPython/lib";
+            }
         }
     }

lang/csharp/soyText/soyText/Reg.cs

@@ -56 +56 @@
             return false;
         }*/
+
+        internal static void sub(ref string l, string pattern, string replacement)
+        {
+            l=Regex.Replace(l, pattern, replacement);
+
+        }
     }
 }

lang/csharp/soyText/soyText/bin/Debug/soyText.application

@@ -12 +12 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>nyZII1fjkR8GGyK7/De/XtqCQy8=</dsig:DigestValue>
+        <dsig:DigestValue>XyuhzM+190h32w0NIpb41p7hQD4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/bin/Debug/soyText.exe.manifest

@@ -113 +113 @@
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="77824">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="78848">
       <assemblyIdentity name="soyText" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
@@ -120 +120 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>DF71TlIMf9OQjcnh3xPI2JEU0MU=</dsig:DigestValue>
+        <dsig:DigestValue>3YywIbZ7rDDj2rf0+lJMxLbWIps=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/bin/Debug/soyText.vshost.application

@@ -12 +12 @@
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>nyZII1fjkR8GGyK7/De/XtqCQy8=</dsig:DigestValue>
+        <dsig:DigestValue>XyuhzM+190h32w0NIpb41p7hQD4=</dsig:DigestValue>
       </hash>
     </dependentAssembly>