[FlagsAttribute]
public enum Flags
{
- None = 0,
- /// A text inserted before a character that has this property
- /// inherits this property. If the text already has properties
- /// of the same key, they are deleted. See the documentation of
- /// Sensitive for exception.
- FrontSticky = 1,
- /// A text inserted after a character that has this property
- /// inherits this property. If the text already has properties
- /// of the same key, they are deleted. See the documentation of
- /// Sensitive for exception.
- RearSticky = 2,
+ None = 0x00,
+
+ /// On inserting a text in between two characters, if the
+ /// preceding and following characters have Sticky properties of
+ /// the same key with same values, the inserted text inherits
+ /// those properties. In that case, properties of the inserted
+ /// text are overriden.
+ Sticky = 0x01, // 00000001
+
+ /// On inserting a text before a character, if the character has
+ /// FrontSticky properties, the inserted text inherits those
+ /// properties.
+ FrontSticky = 0x03, // 00000011
+
+ /// On inserting a text after a character, if the character has
+ /// RearSticky properties, the inserted text inherits those
+ /// properties.
+ RearSticky = 0x05, // 00000101
+
+ /// Like RearSticky, but if the inserted text inherits no
+ /// properties from the preceding character, it inherits
+ /// BothSticky properties from the following character if any.
+ BothSticky = 0x07, // 00000111
+
/// This property is deleted from a span of text if the span is
- /// modified (i.e. a character is changed, a text is inserted,
- /// some part is deleted). This propery is also deleted if a
- /// property of the same key is added, which means that this
- /// property is not stackable. If this property is also
- /// FrontSticky (or RearSticky), text insertion just before (or
- /// after) the span also deletes this property from the span of
- /// text.
- Sensitive = 4,
+ /// modified (i.e. one of a character is changed, a text is
+ /// inserted, some part is deleted). Here, "span" means a
+ /// sequence of characters that has this property with the same
+ /// value. This property is also deleted if a property of the
+ /// same key is added, which means that this property is not
+ /// stackable. In addition this property is never merged with
+ /// the same value of preceding or following property. At last,
+ /// this property can't be sticky in any way.
+ Sensitive = 0x10, // 00010000
+
+ /// Like Sensitive but also this property is deleted from a span
+ /// of text if a characeter just before the span is modified,
+ /// inserted, or deleted.
+ FrontSensitive = 0x30, // 00110000
+
+ /// Like Sensitive but also this property is deleted from a span
+ /// of text if a character just after the span is modified,
+ /// inserted, or deleted.
+ RearSensitive = 0x50, // 01010000
+
+ /// Same as (FrontSensitive | RearSensitive).
+ BothSensitive = 0x70, // 01110000
};
internal MSymbol key;
public MProperty (MSymbol key, object val)
{
if (key.flags == null)
- key.flags = MProperty.Flags.None;
+ key.flags = Flags.None;
this.key = key;
this.val = val;
}
this.val = val;
}
+ public static bool HasFlags (MSymbol key, Flags flags)
+ {
+ return ((key.flags & flags) == flags);
+ }
+
public override string ToString ()
{
return key.ToString () + ":" + val;
intervals = new MPlist ();
}
+ public MText (byte[] str, int offset, int length)
+ {
+ sb = new StringBuilder (utf8.GetString (str, offset, length));
+ nchars = count_chars (sb);
+ intervals = new MPlist ();
+ }
+
public MText (String str)
{
sb = new StringBuilder (str);
public static MText operator+ (object obj, MText mt)
{
if (obj is string)
- return new MText ((string) obj) + mt;
+ {
+ MText mtnew = new MText ((string) obj);
+ return mtnew.Ins (mtnew.Length, mt);
+ }
throw new Exception ("Unknown object type: " + obj.GetType());
}
- public static MText operator+ (MText mt1, MText mt2)
+ public static MText operator+ (MText mt, object obj)
{
- MText mt = new MText ();
-
- mt.sb.Append (mt1.sb);
- mt.sb.Append (mt2.sb);
- mt.nchars = mt1.nchars + mt2.nchars;
- return mt;
+ if (obj is string)
+ return mt + new MText ((string) obj);
+ if (obj is int)
+ return mt.Dup ().Ins (mt.Length, (int) obj);
+ if (obj is char)
+ return mt.Dup ().Ins (mt.Length, (int) ((char) obj));
+ throw new Exception ("Unknown object type: " + obj.GetType());
}
- public static MText operator+ (string str, MText mt)
+ public static MText operator+ (MText mt1, MText mt2)
{
- MText mtnew = new MText (str);
-
- mtnew.sb.Append (mt.sb);
- mtnew.nchars += mt.nchars;
- return mtnew;
+ return mt1.Dup ().Ins (mt1.Length, mt2);
}
// Public properties
return this.sb.ToString ().CompareTo (other.sb.ToString ());
}
- public override String ToString () { return "\"" + sb.ToString () + "\""; }
+ public override string ToString () { return sb.ToString (); }
private static bool surrogate_high_p (char c)
{
MInterval root = (MInterval) plist.Val;
root.Delete (from, to);
if (from > 0 && from < nchars)
- root.MergeAfterChange (from, from);
+ ((MInterval) plist.Val).MergeAfterChange (from, from);
}
else
intervals.Clear ();
intervals.Push (prop.key, root);
}
else
- root = (MInterval) p.Val;
-
- if (root.isSensitive)
- root.PopSensitive (from, to);
+ {
+ root = (MInterval) p.Val;
+ if (root.isSensitive)
+ {
+ root.PopSensitive (from, to);
+ root.MergeAfterChange (from, to);
+ root = (MInterval) p.Val;
+ if (M17n.debug)
+ DumpPropNested ();
+ }
+ }
root.Push (from, to, prop);
root.MergeAfterChange (from, to);
root.Balance ();
root.PopSensitive (from, to);
else
root.Pop (from, to);
+ root = (MInterval) p.Val;
+ if (M17n.debug)
+ DumpPropNested ();
root.MergeAfterChange (from, to);
root.Balance ();
}
private bool isRearSticky
{
- get { return ((Key.flags & MProperty.Flags.RearSticky)
- != MProperty.Flags.None); }
+ get { return MProperty.HasFlags (Key, MProperty.Flags.RearSticky) ; }
}
private bool isFrontSticky
{
- get { return ((Key.flags & MProperty.Flags.FrontSticky)
- != MProperty.Flags.None); }
+ get { return MProperty.HasFlags (Key, MProperty.Flags.FrontSticky) ; }
}
public bool isSensitive
{
- get { return ((Key.flags & MProperty.Flags.Sensitive)
- != MProperty.Flags.None); }
+ get { return MProperty.HasFlags (Key, MProperty.Flags.Sensitive) ; }
+ }
+
+ public bool isFrontSensitive
+ {
+ get { return MProperty.HasFlags (Key,
+ MProperty.Flags.FrontSensitive) ; }
+ }
+
+ public bool isRearSensitive
+ {
+ get { return MProperty.HasFlags (Key,
+ MProperty.Flags.RearSensitive) ; }
}
private void update_from_to ()
{
MPlist p1, p2;
+ if (Stack.IsEmpty && i.Stack.IsEmpty)
+ return true;
+ if (isSensitive)
+ return false;
for (p1 = Stack, p2 = i.Stack; ! p1.IsEmpty && ! p2.IsEmpty;
p1 = p1.Next, p2 = p2.Next)
if (p1.Val != p2.Val)
if (c1 != null)
c1.Parent = this;
+ Parent.update_from_to ();
return Parent;
}
if (c2 != null)
c2.Parent = this;
+ Parent.update_from_to ();
return Parent;
}
{
MInterval i = this;
+ update_from_to ();
while (true)
{
// .-this-.
return copy;
}
+ public MInterval Copy (MText mt, int start, int end,
+ bool first, bool last)
+ {
+ MInterval copy = Copy (mt, start, end);
+ MInterval head = find_head (start);
+ MInterval tail = find_tail (end);
+
+ M17n.DebugPrint ("Copying: {0}", copy);
+
+ if (! head.Stack.IsEmpty
+ && (isSensitive && head.From < start
+ || (isFrontSensitive && ! first)))
+ {
+ M17n.DebugPrint (" clear head");
+ head = copy.find_head (0);
+ head.Stack.Clear ();
+ }
+ if (! tail.Stack.IsEmpty
+ && (isSensitive && end < tail.To
+ || (isRearSensitive && ! last)))
+ {
+ M17n.DebugPrint (" clear tail");
+ tail = copy.find_tail (copy.Length);
+ tail.Stack.Clear ();
+ }
+ M17n.DebugPrint ("\n");
+ return copy;
+ }
+
// this-. ==> this-.
// right newright-.
// right
{
MInterval interval = new MInterval (Key, mtext, To - pos, Stack);
- M17n.DebugPrint ("divide-right({0}) at ", pos); DumpOne (false, true);
+ M17n.DebugPrint ("divide-right({0}) at {1}\n", pos, this);
To = pos;
if (Right != null)
{
{
MInterval interval = new MInterval (Key, mtext, pos - From, Stack);
- M17n.DebugPrint ("divide-left({0}) at ", pos); DumpOne (false, true);
+ M17n.DebugPrint ("divide-left({0}) at {1}\n", pos, this);
From = pos;
if (Left != null)
{
MInterval i = interval.find_head (start);
len = 0;
- while (i != null && mergeable (i))
+ if (Stack.IsEmpty
+ && (isFrontSensitive || (isSensitive && i.From < start)))
+ {
+ M17n.DebugPrint (" forward grafting {0}", i);
+ if (i.To < end)
+ len = i.To - start;
+ else
+ len = end - start;
+ i = i.Next;
+ }
+ while (i != null && i.From < end && mergeable (i))
{
- M17n.DebugPrint (" grafting "); i.DumpOne (false, false);
+ M17n.DebugPrint (" forward grafting {0}", i);
len += i.To - i.From;
if (i.From < start)
len -= start - i.From;
}
}
- M17n.DebugPrint (" grafted {0} in ", len); DumpOne (false, true);
+ M17n.DebugPrint (" grafted {0} in {1}\n", len, this);
if (len > 0)
enlarge (len);
return len;
MInterval i = interval.find_tail (end);
len = 0;
- while (i != null && mergeable (i))
+ if (Stack.IsEmpty
+ && (isRearSensitive || (isSensitive && end < i.To)))
{
- M17n.DebugPrint (" grafting "); i.DumpOne (false, false);
+ M17n.DebugPrint (" backward grafting {0}", i);
+ if (i.From <= start)
+ len = end - start;
+ else
+ len = end - i.From;
+ i = i.Prev;
+ }
+ while (i != null && i.To <= start && mergeable (i))
+ {
+ M17n.DebugPrint (" backward grafting {0}", i);
len += i.To - i.From;
if (end < i.To)
len -= i.To - end;
}
}
- M17n.DebugPrint (" grafted {0} in ", len); DumpOne (false, true);
+ M17n.DebugPrint (" grafted {0} in {1}\n", len, this);
if (len > 0)
enlarge (len);
return len;
{
update_from_to ();
- M17n.DebugPrint ("insert({0} to {1}) at {2} in ", start, end, pos);
- DumpOne (false, false);
+ M17n.DebugPrint ("insert({0} to {1}) at {2} in {3}",
+ start, end, pos, this);
if (pos < From)
Left.Insert (pos, interval, start, end);
else if (pos == From)
{
- if (Left != null)
- {
- MInterval prev = Prev;
+ MInterval prev = Left != null ? Prev : null;
- if (prev.isSensitive && prev.isRearSticky)
- prev.Stack.Clear ();
- start += prev.graft_forward (interval, start, end);
- }
- if (isSensitive && isFrontSticky)
+ if (isFrontSensitive)
Stack.Clear ();
- if (start < end)
+ if (prev != null && isRearSensitive)
+ prev.Stack.Clear ();
+ if (prev != null && isRearSticky && ! prev.Stack.IsEmpty)
+ {
+ prev.enlarge (end - start);
+ M17n.DebugPrint (" done\n");
+ return;
+ }
+ if (isFrontSticky && ! Stack.IsEmpty)
+ {
+ enlarge (end - start);
+ M17n.DebugPrint (" done\n");
+ return;
+ }
+ bool front_grafted = false, rear_grafted = false;
+ int grafted;
+ if (prev != null
+ && (grafted = prev.graft_forward (interval, start, end)) > 0)
{
- end -= graft_backward (interval, start, end);
- if (start < end)
+ start += grafted;
+ if (start == end)
{
- if (interval != null)
- interval = interval.Copy (mtext, start, end);
- else
- interval = new MInterval (Key, mtext, end - start, null);
-
- MInterval i;
- if (Left != null)
- {
- // .-this-. ==> .-this-.
- // left-. .-left-.
- // child child-.
- // interval
- i = Left.RightMost;
- i.Right = interval;
- }
- else
- {
- Left = interval;
- i = this;
- }
- interval.Parent = i;
- for (; i != null; i = i.Parent)
- i.Length += interval.Length;
+ M17n.DebugPrint (" done\n");
+ return;
+ }
+ front_grafted = true;
+ }
+ if ((grafted = graft_backward (interval, start, end)) > 0)
+ {
+ end -= grafted;
+ if (start == end)
+ {
+ M17n.DebugPrint (" done\n");
+ return;
}
+ rear_grafted = true;
}
+
+ if (interval != null)
+ interval = interval.Copy (mtext, start, end,
+ (front_grafted
+ || (prev == null && start == 0)),
+ rear_grafted);
+ else
+ interval = new MInterval (Key, mtext, end - start, null);
+
+ MInterval i;
+ if (Left != null)
+ {
+ // .-this-. ==> .-this-.
+ // left-. .-left-.
+ // child child-.
+ // interval
+ i = Left.RightMost;
+ i.Right = interval;
+ }
+ else
+ {
+ Left = interval;
+ i = this;
+ }
+ interval.Parent = i;
+ for (; i != null; i = i.Parent)
+ i.Length += interval.Length;
}
else if (pos < To)
{
- if (isSensitive)
- Stack.Clear ();
-
- int len = graft_forward (interval, start, end);
- start += len;
- pos += len;
- if (start < end)
+ if (! Stack.IsEmpty)
+ {
+ if (isSensitive)
+ Stack.Clear ();
+ else if (isFrontSticky || isRearSticky)
+ {
+ enlarge (end - start);
+ return;
+ }
+ }
+ bool front_grafted = false, rear_grafted = false;
+ int grafted;
+ if ((grafted = graft_forward (interval, start, end)) > 0)
{
- end -= graft_backward (interval, start, end);
- if (start < end)
+ start += grafted;
+ if (start == end)
{
- if (interval != null)
- interval = interval.Copy (mtext, start, end);
- else
- interval = new MInterval (Key, mtext, end - start, null);
-
- divide_right (pos);
- Right.Left = interval;
- interval.Parent = Right;
- for (MInterval i = Right; i != null; i = i.Parent)
- i.Length += interval.Length;
+ M17n.DebugPrint (" done\n");
+ return;
}
+ front_grafted = true;
+ pos += grafted;
}
+ if ((grafted = graft_backward (interval, start, end)) > 0)
+ {
+ end -= grafted;
+ if (start == end)
+ {
+ M17n.DebugPrint (" done\n");
+ return;
+ }
+ rear_grafted = true;
+ }
+ if (interval != null)
+ interval = interval.Copy (mtext, start, end,
+ front_grafted, rear_grafted);
+ else
+ interval = new MInterval (Key, mtext, end - start, null);
+
+ divide_right (pos);
+ Right.Left = interval;
+ interval.Parent = Right;
+ for (MInterval i = Right; i != null; i = i.Parent)
+ i.Length += interval.Length;
}
else if (pos == To)
{
- if (Right != null)
- {
- MInterval next = Next;
+ MInterval next = Right != null ? Next : null;
- if (next.isSensitive && next.isFrontSticky)
- next.Stack.Clear ();
- end -= next.graft_backward (interval, start, end);
- }
- if (isSensitive && isRearSticky)
+ if (isRearSensitive)
Stack.Clear ();
- if (start < end)
+ if (next != null && isFrontSensitive)
+ next.Stack.Clear ();
+ if (isRearSticky && ! Stack.IsEmpty)
{
- start += graft_forward (interval, start, end);
- if (start < end)
+ enlarge (end - start);
+ M17n.DebugPrint (" done by enlarging this\n");
+ return;
+ }
+ if (next != null && isFrontSticky && ! next.Stack.IsEmpty)
+ {
+ M17n.DebugPrint (" next is {0}\n", next);
+ next.enlarge (end - start);
+ M17n.DebugPrint (" done by enlarging next\n");
+ return;
+ }
+ bool front_grafted = false, rear_grafted = false;
+ int grafted;
+ if (next != null
+ && (grafted = next.graft_backward (interval, start, end)) > 0)
+ {
+ end -= grafted;
+ if (start == end)
{
- if (interval != null)
- interval = interval.Copy (mtext, start, end);
- else
- interval = new MInterval (Key, mtext, end - start, null);
-
- MInterval i;
- if (Right != null)
- {
- // .-this-. ==> .-this-.
- // .-right .-right
- // child .-child
- // interval
-
- i = Right.LeftMost;
- i.Left = interval;
- }
- else
- {
- Right = interval;
- i = this;
- }
- interval.Parent = i;
- for (; i != null; i = i.Parent)
- i.Length += interval.Length;
+ M17n.DebugPrint (" done\n");
+ return;
+ }
+ rear_grafted = true;
+ }
+ if ((grafted = graft_forward (interval, start, end)) > 0)
+ {
+ start += grafted;
+ if (start == end)
+ {
+ M17n.DebugPrint (" done\n");
+ return;
}
+ front_grafted = true;
}
+ if (interval != null)
+ interval = interval.Copy (mtext, start, end,
+ front_grafted,
+ (rear_grafted
+ || (next == null && end == interval.mtext.Length)));
+ else
+ interval = new MInterval (Key, mtext, end - start, null);
+
+ MInterval i;
+ if (Right != null)
+ {
+ // .-this-. ==> .-this-.
+ // .-right .-right
+ // child .-child
+ // interval
+
+ i = Right.LeftMost;
+ i.Left = interval;
+ }
+ else
+ {
+ Right = interval;
+ i = this;
+ }
+ interval.Parent = i;
+ for (; i != null; i = i.Parent)
+ i.Length += interval.Length;
}
else // (pos > To)
- Next.Insert (pos, interval, start, end);
+ Right.Insert (pos, interval, start, end);
M17n.DebugPrint (" done\n");
}
public void Delete (int start, int end)
{
update_from_to ();
- M17n.DebugPrint ("delete({0} {1}) from ", start, end); DumpOne (false, true);
+ M17n.DebugPrint ("delete({0} {1}) from {2}\n", start, end, this);
+
+ bool front_checked = false;
+ bool rear_checked = false;
+
if (start < From)
{
if (end <= From)
{
+ if (end == From && isFrontSensitive)
+ Stack.Clear ();
Left.Delete (start, end);
return;
}
+ if (isSensitive)
+ Stack.Clear ();
Left.Delete (start, From);
To -= From - start;
end -= From - start;
From = start;
+ front_checked = true;
}
if (end > To)
{
if (start >= To)
{
+ if (start == To && isRearSensitive)
+ Stack.Clear ();
Right.Delete (start, end);
return;
}
+ if (isSensitive)
+ Stack.Clear ();
Right.Delete (To, end);
end = To;
+ rear_checked = true;
}
+ if (start == From
+ && ! front_checked
+ && start > 0
+ && isRearSensitive)
+ Prev.Stack.Clear ();
+ if (end == To
+ && ! rear_checked
+ && Next != null
+ && isFrontSensitive)
+ Next.Stack.Clear ();
if (start == From && end == To)
{
if (Right == null)
{
int len = end - start;
+ if (isSensitive)
+ Stack.Clear ();
for (MInterval i = this; i != null; i = i.Parent)
i.Length -= len;
}
public void Push (int start, int end, MProperty prop)
{
update_from_to ();
- M17n.DebugPrint ("push({0} {1}) at ", start, end); DumpOne (false, true);
+ M17n.DebugPrint ("push({0} {1}) at {2}\n", start, end, this);
if (start < From)
{
if (end <= From)
end = To;
}
+ if (! Stack.IsEmpty && isSensitive)
+ Stack.Clear ();
if (start > From)
divide_left (start);
if (end < To)
}
/// Combine intervals between HEAD and TAIL (both inclusive) to
- /// the common parent of HEAD and TAIL while assuming that the
- /// intervals are mergeable.
+ /// the common parent of HEAD and TAIL. Callers should assure
+ /// that the intervals are mergeable in advance.
private static void combine (MInterval head, MInterval tail)
{
- M17n.DebugPrint ("merging "); head.DumpOne (true, false);
- M17n.DebugPrint (" through "); tail.DumpOne (true, false);
+ M17n.DebugPrint ("combining {0} through {1}", head, tail);
+ head.update_from_to ();
+ tail.update_from_to ();
int from = head.From;
int to = tail.To;
+
// The nearest common parent of HEAD and TAIL.
MInterval root;
-
for (root = head; root.To + root.RightLength < to;
root = root.Parent);
- M17n.DebugPrint (" common root is "); root.DumpOne (false, true);
+ M17n.DebugPrint (" with common root {0}\n", root);
if (from < root.From)
{
while (true)
{
- M17n.DebugPrint ("merging "); prev.DumpOne (false, true);
+ M17n.DebugPrint ("merging {0}\n", prev);
prev.vacate_node (prev.Left, root);
if (prev == head)
break;
else
prev = prev.Parent;
}
+ root.update_from_to ();
}
if (root.To < to)
{
while (true)
{
- M17n.DebugPrint ("merging "); next.DumpOne (false, true);
+ M17n.DebugPrint ("merging {0}\n", next);
next.vacate_node (next.Right, root);
if (next == tail)
break;
else
next = next.Parent;
}
+ root.update_from_to ();
}
}
{
update_from_to ();
- MInterval head = find_head (start), tail = head, i;
+ MInterval head = find_head (start), i = head;
+ MInterval tail = start < end ? find_tail (end) : head;
+
+ if (tail.To < Length)
+ tail = tail.Next;
if (start == head.From && start > 0)
{
- i = head.Prev;
- if (head.mergeable (i))
- head = i;
+ MInterval prev = head.Prev;
+ if (head.mergeable (prev))
+ head = prev;
}
- while (tail.To < end)
+ M17n.DebugPrint ("merge between {0} and {1}\n", head, tail);
+ while (i != tail)
{
- i = tail.Next;
- if (! tail.mergeable (i))
+ MInterval next = i.Next;
+
+ if (! i.mergeable (next))
{
- if (head != tail)
- combine (head, tail);
- head = i;
+ if (head != i)
+ combine (head, i);
+ head = next;
}
- tail = i;
- }
- while (true)
- {
- i = tail.Next;
- if (i == null || ! tail.mergeable (i))
- break;
- tail = i;
+ i = next;
}
- if (head != tail)
- combine (head, tail);
+ if (head != i)
+ combine (head, i);
}
public void Pop (int start, int end)
{
update_from_to ();
- M17n.DebugPrint ("pop({0} {1}) at ", start, end); DumpOne (false, true);
+ M17n.DebugPrint ("pop({0} {1}) at {2}\n", start, end, this);
if (start < From)
{
if (end <= From)
if (! Stack.IsEmpty)
{
- if (start > From)
- divide_left (start);
- if (end < To)
- divide_right (end);
- Stack.Pop ();
+ if (isSensitive)
+ Stack.Clear ();
+ else
+ {
+ if (start > From)
+ divide_left (start);
+ if (end < To)
+ divide_right (end);
+ Stack.Pop ();
+ }
}
}
update_from_to ();
MInterval head = find_head (start);
MInterval tail = find_tail (end);
- while (! head.Stack.IsEmpty && head.From > 0)
- {
- MInterval prev = head.Prev;
-
- if (prev.Stack.IsEmpty || head.Stack.Val != prev.Stack.Val)
- break;
- head = head.Prev;
- }
- while (! tail.Stack.IsEmpty && tail.To < mtext.Length)
- {
- MInterval next = tail.Next;
-
- if (next.Stack.IsEmpty || tail.Stack.Val != next.Stack.Val)
- break;
- tail = tail.Next;
- }
Pop (head.From, tail.To);
}
- private void DumpOne (bool with_prop, bool newline)
+ public override string ToString ()
{
- DumpOne (with_prop, newline, false);
+ string str = String.Format ("#{0}({1} {2} {3} [", ID, Length, From, To);
+ bool first = true;
+ foreach (MPlist p in Stack)
+ {
+ if (first)
+ {
+ str += ((MProperty) p.Val).Val;
+ first = false;
+ }
+ else
+ str += " " + ((MProperty) p.Val).Val;
+ }
+ return (str + "])");
}
private void DumpOne (bool with_prop, bool newline, bool force)
if (force || M17n.debug)
{
Console.Write ("#{0}({1} {2} {3}", ID, Length, From, To);
- if (with_prop)
- foreach (MPlist p in Stack)
- Console.Write (" " + p.Val);
+ if (with_prop && ! Stack.IsEmpty)
+ {
+ string prepend = " [";
+ foreach (MPlist p in Stack)
+ {
+ Console.Write (prepend + ((MProperty) p.Val).Val);
+ prepend = " ";
+ }
+ Console.Write ("]");
+ }
Console.Write (")");
if (newline)
Console.WriteLine ();
public void DumpNested (bool force)
{
- DumpNested (Key.ToString () + ":", force);
+ DumpNested (" " + Key.ToString () + ":", force);
}
public void DumpNested (string indent, bool force)