Changeset 33649

Timestamp:

05/28/09 20:09:43 (4 years ago)

Author:

hoge1e3

Message:

 

Location:

lang/csharp/soyText/soyText

Files:

• AttributeCondition.cs (modified) (1 diff)
• DocumentList.cs (modified) (1 diff)
• EditorTab.cs (modified) (1 diff)
• Form2.Designer.cs (modified) (5 diffs)
• Form2.cs (modified) (1 diff)
• ParsedDocument.cs (modified) (2 diffs)
• SearchCondition.cs (modified) (1 diff)
• SearchLogSet.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.csproj (modified) (1 diff)
• soyText.suo (modified) (previous)

lang/csharp/soyText/soyText/AttributeCondition.cs

@@ -6 +6 @@
 namespace SoyText
 {
-    class AttributeCondition
+    internal class AttributeCondition: SearchCondition
     {
-        public string key;
-        public string value;
-
+        string key;
+        string value;
+        public AttributeCondition(string key, string value)
+        {
+            this.key = key;
+            this.value = value.ToLower();
+        }
+        public override bool matches(Document d)
+        {
+            var a=d.parsed[key];
+            return a!=null && a.ToLower().IndexOf(value) >= 0;
+        }
+        public override bool matches(DocumentLine d)
+        {
+            return false;
+        }
     }
 }

lang/csharp/soyText/soyText/DocumentList.cs

@@ -8 +8 @@
     public class DocumentList: SortedList<long,Document>
     {
+        public void add(Document d)
+        {
+            Add(d.uniqueLastUpdate, d);
+        }
     }
 }

lang/csharp/soyText/soyText/EditorTab.cs

@@ -223 +223 @@
         }
         TerminableThread tth = new TerminableThread();
-        private void Form1_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode.Equals(Keys.F11))
-            {
-                /*new Thread(delegate()
-                {
-                    var oldActive = documentSet.getOldestActiveDocument();
-                    workspace.indexer.make(oldActive);
-                }).Start();*/
-            }
-            if (e.KeyCode.Equals(Keys.F9))
-            {
-                var p = new PythonEngine();
-                var res = p.evaluate(this , curDoc.parsed.cdr);
-                //Debug.print(res);
-                Text = res;
-                /*
-                tth.exec(delegate(TerminableThread t)
-                {
-                    for (var i = 0; i < 20; i++)
-                    {
-                        Debug.print("TTH " + i);
-                        Thread.Sleep(500);
-                        if (t.terminated) break;
-                    }
-                });
-                Text = curDoc.parsed.getValue("title");*/
-            }
-        }
+        
 
         private void NewMenuItem_Click(object sender, EventArgs e)

lang/csharp/soyText/soyText/Form2.Designer.cs

@@ -50 +50 @@
             this.閉じるCToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tabControl1 = new SoyText.TabControl2();
+            this.tESTToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.tabMenu.SuspendLayout();
@@ -163 +164 @@
             // 
             this.実行RToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.外部プログラムを実行RToolStripMenuItem});
+            this.外部プログラムを実行RToolStripMenuItem,
+            this.tESTToolStripMenuItem});
             this.実行RToolStripMenuItem.Name = "実行RToolStripMenuItem";
             this.実行RToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
@@ -186 +188 @@
             this.閉じるCToolStripMenuItem});
             this.tabMenu.Name = "tabMenu";
-            this.tabMenu.Size = new System.Drawing.Size(153, 48);
+            this.tabMenu.Size = new System.Drawing.Size(117, 26);
             // 
             // 閉じるCToolStripMenuItem
             // 
             this.閉じるCToolStripMenuItem.Name = "閉じるCToolStripMenuItem";
-            this.閉じるCToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.閉じるCToolStripMenuItem.Size = new System.Drawing.Size(116, 22);
             this.閉じるCToolStripMenuItem.Text = "閉じる(&C)";
             this.閉じるCToolStripMenuItem.Click += new System.EventHandler(this.閉じるCToolStripMenuItem_Click);
@@ -206 +208 @@
             this.tabControl1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.tabControl1_MouseDown);
             this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
+            // 
+            // tESTToolStripMenuItem
+            // 
+            this.tESTToolStripMenuItem.Name = "tESTToolStripMenuItem";
+            this.tESTToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
+            this.tESTToolStripMenuItem.Text = "TEST";
+            this.tESTToolStripMenuItem.Click += new System.EventHandler(this.tESTToolStripMenuItem_Click);
             // 
             // Form2
@@ -250 +259 @@
         private ContextMenuStrip tabMenu;
         private ToolStripMenuItem 閉じるCToolStripMenuItem;
+        private ToolStripMenuItem tESTToolStripMenuItem;
     }
 }

lang/csharp/soyText/soyText/Form2.cs

@@ -162 +162 @@
         }
 
+        private void tESTToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            curTab.curDoc.parsed.setValue("test", "desu");
+            curTab.curDoc.save();
+        }
+
     }
 }

lang/csharp/soyText/soyText/ParsedDocument.cs

@@ -42 +42 @@
             cdr = "";
             var newLines = "";
+            var valueSetted = false;
             foreach (var line in Regex.Split(src.content, "\r*\n"))
             {
                 if (resting) { newLines += line + "\n"; continue; }
                 var m = Regex.Match(line, "^[ \t]*$");
-                var valueSetted = false;
                 if (m.Success)
                 {
                     if (!valueSetted)
                     {
-                        newLines += key + ": " + value + "\n";
+                        newLines += key + ": " + value + "\r\n";
                     }
                     resting = true;
@@ -62 +62 @@
                     if (k.Equals(key))
                     {
-                        newLines += key + ": " + value + "\n";
+                        newLines += key + ": " + value + "\r\n";
                         valueSetted = true;
                     }
                     else
                     {
-                        newLines += line + "\n";
+                        newLines += line + "\r\n";
                     }
                 }
                 else
                 {
-                    newLines += line + "\n";
+                    newLines += line + "\r\n";
                 }
             }

lang/csharp/soyText/soyText/SearchCondition.cs

@@ -16 +16 @@
             if (s.Length == 1)
             {
-                return new KeywordCondition(expr);
+                var n = new Reg("^-");
+                if (n.m(s[0]))
+                {
+                    return new NotCondition(fromExpression(n.post));
+                }
+                var r = new Reg("^([^:]+):");
+                if (r.m(s[0]))
+                {
+                    return new AttributeCondition(r[1], r.post);
+                }
+                else
+                {
+                    return new KeywordCondition(expr);
+                }
             }
             if (s.Length == 0)

lang/csharp/soyText/soyText/SearchLogSet.cs

@@ -9 +9 @@
     {
         DocumentSet superSet;
-        DocumentList list = null;
-        internal bool addIfContains(Document d)
+        public SearchLogSet(DocumentSet superSet)
+        {
+            this.superSet = superSet;
+            list = new Dictionary<string, Document>();
+            recents = new DocumentList();
+        }
+        Dictionary<string,Document> list = null;
+        DocumentList recents;
+
+        internal bool add(Document d)
         {
             if (d.parsed["type"] != "SearchLog") return false;
-            list.Add(d.uniqueLastUpdate, d);
+            var c=d.parsed["condition"];
+            if (!list.ContainsKey(c)) {
+                           list[c]=d;
+                           recents.add(d);
+            }
             return true;
         }
         internal DocumentList getRecents()
         {
-            return list;
+            return recents;
+        }
+        public void add(string searchExpr)
+        {
+            var c = searchExpr;
+            if (!list.ContainsKey(c))
+            {
+                var d = superSet.createDocument();
+                d.parsed["type"] = "SearchLog";
+                d.parsed["condition"] = c;
+                d.save();
+                add(d);
+            }
         }
     }

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>yllOjAJh5FQBMq+0fPbgiYaPPIY=</dsig:DigestValue>
+        <dsig:DigestValue>NzImv/+409azqvCZyF3CI7ckSG0=</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="79872">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="soyText.exe" size="80896">
       <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>SM+YQyrIGxxBmOx2qOf4KCKAS44=</dsig:DigestValue>
+        <dsig:DigestValue>xoIpTSHlzPf6s71Jq19Wy0TeQ30=</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>yllOjAJh5FQBMq+0fPbgiYaPPIY=</dsig:DigestValue>
+        <dsig:DigestValue>NzImv/+409azqvCZyF3CI7ckSG0=</dsig:DigestValue>
       </hash>
     </dependentAssembly>

lang/csharp/soyText/soyText/soyText.csproj

@@ -135 +135 @@
     <Compile Include="MatchLine.cs" />
     <Compile Include="Mkdir.cs" />
+    <Compile Include="NotCondition.cs" />
     <Compile Include="ParsedDocument.cs" />
     <Compile Include="ProcessExecutor.cs" />