*** empty log message ***

diff --git a/frontsensitive.cs b/frontsensitive.cs
index edaeb14..587d903 100644 (file)
--- a/frontsensitive.cs
+++ b/frontsensitive.cs
@@ -5,9 +5,8 @@ using M17N.Core;
 
 public class Test
 {
-  const int LENGTH = 10;
-  const int DEPTH = 10;
-  static MText mt = new MText ("0123456789");
+  const int LENGTH = 9;
+  static MText mt = new MText ("012345678");
   static MSymbol key = MSymbol.PropertyKey ("fse",
                                            MProperty.Flags.FrontSensitive);
   static MSymbol val0 = MSymbol.Of ("0");
@@ -17,107 +16,160 @@ public class Test
   static MProperty prop1 = new MProperty (key, val1);
   static MProperty prop2 = new MProperty (key, val2);
 
-  static MSymbol[] valtable = new MSymbol[LENGTH];
+  // Each property is identified by its beginning point.
+  // The character at position i has the property that begins at prop[i].
+  // If the character has no property, prop[i] == -1.
+  static int[] prop = new int[LENGTH];
 
-  static void TestPushProp (int from, int to, MProperty prop)
+  // The property beginning at position i ends at position end[i].
+  // If no property begins at position i, end[i] is undefined.
+  static int[] end = new int[LENGTH];
+
+  // The property beginning at position i has value value[i].
+  // If no property begings at positoin i, value[i] is undefined.
+  static MSymbol[] value = new MSymbol[LENGTH];
+
+  static void TestPushProp (int from, int to, MProperty newprop)
   {
-    int i;
-    MSymbol sym;
+    Console.WriteLine ("from {0}, to {1}, push {2}.\n", from, to, newprop.Val);
+
+    int i, n;
 
-    if (from > 0 && valtable[from] != null)
+    if (from > 0 && prop[from - 1] == prop[from] && prop[from] != -1)
       {
-       sym = valtable[from];
-       for (i = from - 1; i >= 0 && valtable[i] == sym; i--)
-         valtable[i] = null;
+       n = end[prop[from]];
+       for (i = prop[from]; i < n; i++)
+         prop[i] = -1;
       }
-    if (to < LENGTH && valtable[to - 1] != null)
+    if (to < LENGTH && prop[to - 1] == prop[to] && prop[to] != -1)
       {
-       sym = valtable[to - 1];
-       for (i = to; i < LENGTH && valtable[i] == sym; i++)
-         valtable[i] = null;
+       n = end[prop[to]];
+       for (i = to; i < n; i++)
+         prop[i] = -1;
       }
     for (i = from; i < to; i++)
-      valtable[i] = (MSymbol) prop.Val;
-    Console.WriteLine ("from {0}, to {1}, push {2}.\n", from, to, prop.Val);
+      prop[i] = from;
+    end[from] = to;
+    value[from] = (MSymbol) newprop.Val;
 
-    mt.PushProp (from, to, prop);
+    mt.PushProp (from, to, newprop);
   }
 
   static void TestPopProp (int from, int to, MSymbol key)
   {
-    int i;
-    MSymbol sym;
+    Console.WriteLine ("from {0}, to {1}, pop.\n", from, to);
 
-    if (from > 0 && valtable[from] != null)
-      {
-       sym = valtable[from];
-       for (i = from - 1; i >= 0 && valtable[i] == sym; i--)
-         valtable[i] = null;
-      }
-    if (to < LENGTH && valtable[to - 1] != null)
+    int i, n;
+
+    Console.WriteLine ("prop[from] = {0}", prop[from]);
+    if (from > 0 && prop[from - 1] == prop[from] && prop[from] != -1)
+      for (i = prop[from]; i < from; i++)
+         prop[i] = -1;
+
+    if (to < LENGTH && prop[to - 1] == prop[to] && prop[to] != -1)
       {
-       sym = valtable[to - 1];
-       for (i = to; i < LENGTH && valtable[i] == sym; i++)
-         valtable[i] = null;
+       n = end[prop[to]];
+       for (i = to; i < n; i++)
+         prop[i] = -1;
       }
+
     for (i = from; i < to; i++)
-      valtable[i] = null;
-    Console.WriteLine ("from {0}, to {1}, pop.\n", from, to);
+      prop[i] = -1;
 
     mt.PopProp (from, to, key);
   }
     
   static void TestDelIns (int from, int to, int from2)
   {
-    int i, l = to - from;
-    MSymbol[] valtable2 = new MSymbol[LENGTH];
-    MSymbol sym;
+    Console.WriteLine ("from {0}, to {1}, moveto {2}.\n", from, to, from2);
+
+    int i, n, l = to - from;
+    int[] prop2 = new int[LENGTH], end2 = new int[LENGTH];
+    MSymbol[] value2 = new MSymbol[LENGTH];
 
+    DebugDump (0);
     // sensitivity for deletion
-    if (from > 0 && valtable[from] != null)
+    if (from > 0 && prop[from] != -1)
       {
-       sym = valtable[from];
-       for (i = from; i < LENGTH && valtable[i] == sym; i++)
-         valtable[i] = null;
+       n = end[prop[from]];
+       for (i = prop[from - 1] == prop[from] ? prop[from] : from; i < n; i++)
+         prop[i] = -1;
       }
-    if (to < LENGTH && valtable[to] != null)
+
+    if (to < LENGTH && prop[to] != -1)
       {
-       sym = valtable[to];
-       for (i = to; i < LENGTH && valtable[i] == sym; i++)
-         valtable[i] = null;
+       n = end[prop[to]];
+       for (i = prop[to - 1] == prop[to] ? prop[to] : to; i < n; i++)
+         prop[i] = -1;
       }
 
+    DebugDump (1);
     // copy
     for (i = from; i < to; i++)
-      valtable2[i - from] = valtable[i];
+      {
+       if (prop[i] != -1)
+         {
+           prop2[i - from] = prop[i] - from + from2;
+           end2[prop2[i - from]] = end[prop[i]] - from + from2;
+           value2[prop2[i - from]] = value[prop[i]];
+         }
+       else
+         prop2[i - from] = -1;
+      }
 
+    DebugDump (2);
     // delete
     for (i = to; i < LENGTH; i++)
-      valtable[i - l] = valtable[i];
-    valtable[LENGTH - l] = null;
-
-    // sensitivity for insertion
-    if (l < LENGTH && valtable[from2] != null)
       {
-       sym = valtable[from2];
-       for (i = from2; i < LENGTH && valtable[i] == sym; i++)
-         valtable[i] = null;
+       if (prop[i] != -1)
+         {
+           prop[i - l] = prop[i] - l;
+           end[prop[i - l]] = end[prop[i]] - l;
+           value[prop[i - l]] = value[prop[i]];
+         }
+       else
+         prop[i - l] = -1;
       }
-    if ((from > 0 || from2 > 0)        && valtable2[0] != null)
+    prop[LENGTH - l] = -1;
+
+    DebugDump (3);
+    // sensitivity for insertion
+    if (from2 > 0 && prop[from2 - 1] == prop[from2] && prop[from2] != -1)
       {
-       sym = valtable2[0];
-       for (i = 0; i < LENGTH && valtable2[i] == sym; i++)
-         valtable2[i] = null;
+       n = end[prop[from2]];
+       for (i = prop[from2 - 1] == prop[from2] ? prop[from2] : from2;
+            i < n; i++)
+         prop[i] = -1;
       }
-    
+
+    DebugDump (4);
     // move
     for (i = LENGTH - 1; i >= from2 + l; i--)
-      valtable[i] = valtable[i - l];
+      {
+       if (prop[i - l] != -1)
+         {
+           prop[i] = prop[i - l] + l;
+           end[prop[i]] = end[prop[i - l]] + l;
+           value[prop[i]] = value[prop[i - l]];
+         }
+       else
+         prop[i] = -1;
+      }
 
+    DebugDump (5);
     // insert
     for (i = from2; i < from2 + l; i++)
-      valtable[i] = valtable2[i - from2];
-    Console.WriteLine ("from {0}, to {1}, moveto {2}.\n", from, to, from2);
+      {
+       if (prop2[i - from2] != -1)
+         {
+           prop[i] = prop2[i - from2];
+           end[prop[i]] = end2[prop2[i - from2]];
+           value[prop[i]] = value2[prop2[i - from2]];
+         }
+       else
+         prop[i] = -1;
+      }
+    DebugDump (6);
 
     MText mt2 = mt.Dup ();
     mt.Del (from, to);
@@ -130,11 +182,19 @@ public class Test
       {
        object val = mt.GetProp (i, key);
 
-       if (valtable[i] != (MSymbol) val)
+       if (prop[i] == -1 && (MSymbol) val != null)
          {
-           Console.WriteLine ("valtable[{0}] is {1}, GetProp returned {2}",
+           Console.WriteLine ("value[{0}] is nil, GetProp returned {1}",
                               i,
-                              valtable[i] == null ? MSymbol.nil : valtable[i],
+                              val == null ? MSymbol.nil : val);
+           return false;
+         }
+
+       if (prop[i] != -1 && (value[prop[i]] != (MSymbol) val))
+         {
+           Console.WriteLine ("value[{0}] is {1}, GetProp returned {2}",
+                              i,
+                              value[prop[i]] == null ? MSymbol.nil : value[prop[i]],
                               val == null ? MSymbol.nil : val);
            return false;
          }
@@ -144,8 +204,69 @@ public class Test
 
   static void Dump ()
   {
-    for (int i = 0; i < LENGTH; i++)
-      Console.WriteLine ("{0} {1} :", i, valtable[i]);
+    for (int i = 0; i <= LENGTH; i++)
+      Console.Write ("{0} ", i);
+    Console.WriteLine ("\n-------------------");
+
+    if (prop[0] == -1)
+      Console.Write ("  ");
+    else
+      Console.Write ("{0} ", value[prop[0]]);
+
+    for (int i = 1; i < LENGTH; i++)
+      {
+       if (prop[i] == -1)
+         Console.Write ("  ");
+       else if (prop[i - 1] == prop[i])
+         Console.Write ("< ");
+       else
+         Console.Write ("{0} ", value[prop[i]]);
+      }
+    Console.Write ("\n");
+  }
+
+  static void DebugDump (int n)
+  {
+    /*
+    int i;
+
+    Console.Write ("\n#{0}\n  ", n);
+    for (i = 0; i <= LENGTH; i++)
+      Console.Write ("{0} ", i);
+    Console.Write ("\n----------------------\nP ");
+    for (i = 0; i < LENGTH; i++)
+      {
+       if (prop[i] != -1)
+         Console.Write ("{0} ", prop[i]);
+       else
+         Console.Write ("  ");
+      }
+    Console.Write ("\nE ");
+    if (prop[0] != -1)
+      Console.Write ("{0} ", end[0]);
+    else
+      Console.Write ("  ");
+    for (i = 1; i < LENGTH; i++)
+      {
+       if (prop[i - 1] != prop[i] && prop[i] != -1)
+         Console.Write ("{0} ", end[i]);
+       else
+         Console.Write ("  ");
+      }
+    Console.Write ("\nV ");
+    if (prop[0] != -1)
+      Console.Write ("{0} ", value[0]);
+    else
+      Console.Write ("  ");
+    for (i = 1; i < LENGTH; i++)
+      {
+       if (prop[i - 1] != prop[i] && prop[i] != -1)
+         Console.Write ("{0} ", value[i]);
+       else
+         Console.Write ("  ");
+      }
+    Console.Write ("\n");
+    */
   }
 
   public static void Main (string[] args)
@@ -153,6 +274,9 @@ public class Test
     Random r = new Random (int.Parse (args[0]));
     int check = (args.Length > 1 ? int.Parse (args[1]) : 0xFFFFFFF);
 
+    for (int i = 0; i < LENGTH; i++)
+      prop[i] = -1;    
+
     for (int loop = 0; loop < 1000000; loop++)
       {
        int from, to;

diff --git a/sensitive.cs b/sensitive.cs
index ed54fbc..98abd90 100644 (file)
--- a/sensitive.cs
+++ b/sensitive.cs
@@ -61,7 +61,6 @@ public class Test
 
     int i, n;
 
-    Console.WriteLine ("prop[from] = {0}", prop[from]);
     if (from > 0 && prop[from - 1] == prop[from] && prop[from] != -1)
       for (i = prop[from]; i < from; i++)
          prop[i] = -1;
@@ -130,6 +129,7 @@ public class Test
        else
          prop[i - l] = -1;
       }
+    prop[LENGTH - l] = -1;
 
     DebugDump (3);
     // sensitivity for insertion