YaYAML/IIndexable.cs @@ -11,11 +11,7 @@ namespace YaYAML.Tests var result = Parse<YamlDocument>(x => x.Document, "hr: 65"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("hr"), Is.True); - Assert.That(map["hr"].ToString(), Is.EqualTo("65")); + Assert.That(result["hr"].ToString(), Is.EqualTo("65")); } [Test] @@ -24,11 +20,7 @@ namespace YaYAML.Tests var result = Parse<YamlDocument>(x => x.Document, "hr: 65"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("hr"), Is.True); - Assert.That(map["hr"].ToString(), Is.EqualTo("65")); + Assert.That(result["hr"].ToString(), Is.EqualTo("65")); } [Test] @@ -38,11 +30,7 @@ namespace YaYAML.Tests "Fatal:", " Unknown variable \"bar\""); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("Fatal"), Is.True); - Assert.That(map["Fatal"].ToString(), Is.EqualTo("Unknown variable \"bar\"")); + Assert.That(result["Fatal"].ToString(), Is.EqualTo("Unknown variable \"bar\"")); } [Test] @@ -53,11 +41,7 @@ namespace YaYAML.Tests " A slightly different error", " message."); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("Warning"), Is.True); - Assert.That(map["Warning"].ToString(), Is.EqualTo("A slightly different error message.")); + Assert.That(result["Warning"].ToString(), Is.EqualTo("A slightly different error message.")); } [Test] @@ -68,15 +52,9 @@ namespace YaYAML.Tests "avg: 0.278", "rbi: 147"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("hr"), Is.True); - Assert.That(map.ContainsKey("avg"), Is.True); - Assert.That(map.ContainsKey("rbi"), Is.True); - Assert.That(map["hr"].ToString(), Is.EqualTo("65")); - Assert.That(map["avg"].ToString(), Is.EqualTo("0.278")); - Assert.That(map["rbi"].ToString(), Is.EqualTo("147")); + Assert.That(result["hr"].ToString(), Is.EqualTo("65")); + Assert.That(result["avg"].ToString(), Is.EqualTo("0.278")); + Assert.That(result["rbi"].ToString(), Is.EqualTo("147")); } [Test] @@ -92,19 +70,11 @@ namespace YaYAML.Tests " fourth", "fifth: 5"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("one"), Is.True); - Assert.That(map.ContainsKey("two"), Is.True); - Assert.That(map.ContainsKey("three"), Is.True); - Assert.That(map.ContainsKey("four"), Is.True); - Assert.That(map.ContainsKey("fifth"), Is.True); - Assert.That(map["one"].ToString(), Is.EqualTo("1")); - Assert.That(map["two"].ToString(), Is.EqualTo("2")); - Assert.That(map["three"].ToString(), Is.EqualTo("3")); - Assert.That(map["four"].ToString(), Is.EqualTo("this is the fourth")); - Assert.That(map["fifth"].ToString(), Is.EqualTo("5")); + Assert.That(result["one"].ToString(), Is.EqualTo("1")); + Assert.That(result["two"].ToString(), Is.EqualTo("2")); + Assert.That(result["three"].ToString(), Is.EqualTo("3")); + Assert.That(result["four"].ToString(), Is.EqualTo("this is the fourth")); + Assert.That(result["fifth"].ToString(), Is.EqualTo("5")); } } } \ No newline at end of file Tests/ParsingFlatMappings.cs @@ -15,15 +15,7 @@ namespace YaYAML.Tests var result = Parse<YamlDocument>(x => x.Document, "- Mark McGwire"); - var seq = result.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(1)); - - var content = seq[0] as YamlText; - - Assert.That(content, Is.Not.Null); - Assert.That(content.ToString(), Is.EqualTo("Mark McGwire")); + Assert.That(result[0].ToString(), Is.EqualTo("Mark McGwire")); } [Test] @@ -34,25 +26,9 @@ namespace YaYAML.Tests "- Sammy Sosa", "- Ken Griffey"); - var seq = result.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(3)); - - var first = seq[0] as YamlText; - - Assert.That(first, Is.Not.Null); - Assert.That(first.ToString(), Is.EqualTo("Mark McGwire")); - - var second = seq[1] as YamlText; - - Assert.That(second, Is.Not.Null); - Assert.That(second.ToString(), Is.EqualTo("Sammy Sosa")); - - var third = seq[2] as YamlText; - - Assert.That(third, Is.Not.Null); - Assert.That(third.ToString(), Is.EqualTo("Ken Griffey")); + Assert.That(result[0].ToString(), Is.EqualTo("Mark McGwire")); + Assert.That(result[1].ToString(), Is.EqualTo("Sammy Sosa")); + Assert.That(result[2].ToString(), Is.EqualTo("Ken Griffey")); } } } \ No newline at end of file Tests/ParsingFlatSequences.cs @@ -14,23 +14,9 @@ namespace YaYAML.Tests " - two", "- three"); - var seq = result.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(2)); - - var first = seq[0] as YamlMapping; - - Assert.That(first, Is.Not.Null); - Assert.That(first.ContainsKey("value"), Is.True); - - var seq2 = first["value"] as YamlSequence; - - Assert.That(seq2, Is.Not.Null); - Assert.That(seq2.Count, Is.EqualTo(2)); - Assert.That(seq2[0].ToString(), Is.EqualTo("one")); - Assert.That(seq2[1].ToString(), Is.EqualTo("two")); - Assert.That(seq[1].ToString(), Is.EqualTo("three")); + Assert.That(result[0]["value"][0].ToString(), Is.EqualTo("one")); + Assert.That(result[0]["value"][1].ToString(), Is.EqualTo("two")); + Assert.That(result[1].ToString(), Is.EqualTo("three")); } [Test] @@ -44,34 +30,10 @@ namespace YaYAML.Tests " - three", " - four"); - var seq = result.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(2)); - - var first = seq[0] as YamlMapping; - - Assert.That(first, Is.Not.Null); - Assert.That(first.ContainsKey("value"), Is.True); - - var firstSeq = first["value"] as YamlSequence; - - Assert.That(firstSeq, Is.Not.Null); - Assert.That(firstSeq.Count, Is.EqualTo(2)); - Assert.That(firstSeq[0].ToString(), Is.EqualTo("one")); - Assert.That(firstSeq[1].ToString(), Is.EqualTo("two")); - - var second = seq[1] as YamlMapping; - - Assert.That(second, Is.Not.Null); - Assert.That(second.ContainsKey("value2"), Is.True); - - var secondSeq = second["value2"] as YamlSequence; - - Assert.That(secondSeq, Is.Not.Null); - Assert.That(secondSeq.Count, Is.EqualTo(2)); - Assert.That(secondSeq[0].ToString(), Is.EqualTo("three")); - Assert.That(secondSeq[1].ToString(), Is.EqualTo("four")); + Assert.That(result[0]["value"][0].ToString(), Is.EqualTo("one")); + Assert.That(result[0]["value"][1].ToString(), Is.EqualTo("two")); + Assert.That(result[1]["value2"][0].ToString(), Is.EqualTo("three")); + Assert.That(result[1]["value2"][1].ToString(), Is.EqualTo("four")); } } } \ No newline at end of file Tests/ParsingListOfMappingsWithListsAsValues.cs @@ -20,30 +20,10 @@ namespace YaYAML.Tests " - name: Uma", " reason: too tall"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("good_people"), Is.True, - "Expected key 'good_people'"); - - var good_people = map["good_people"] as YamlSequence; - - Assert.That(good_people, Is.Not.Null); - Assert.That(good_people.Count, Is.EqualTo(2)); - - VerifyPerson(good_people[0] as YamlMapping, "James", "always happy"); - VerifyPerson(good_people[1] as YamlMapping, "Sara", "is nice"); - - Assert.That(map.ContainsKey("bad_people"), Is.True, - "Expected key 'bad_people'"); - - var bad_people = map["bad_people"] as YamlSequence; - - Assert.That(bad_people, Is.Not.Null); - Assert.That(bad_people.Count, Is.EqualTo(2)); - - VerifyPerson(bad_people[0] as YamlMapping, "Bob", "smells"); - VerifyPerson(bad_people[1] as YamlMapping, "Uma", "too tall"); + VerifyPerson(result["good_people"][0] as YamlMapping, "James", "always happy"); + VerifyPerson(result["good_people"][1] as YamlMapping, "Sara", "is nice"); + VerifyPerson(result["bad_people"][0] as YamlMapping, "Bob", "smells"); + VerifyPerson(result["bad_people"][1] as YamlMapping, "Uma", "too tall"); } [Test] @@ -57,33 +37,9 @@ namespace YaYAML.Tests " one", " - name: Sara"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("good_people"), Is.True, - "Expected key 'good_people'"); - - var good_people = map["good_people"] as YamlSequence; - - Assert.That(good_people, Is.Not.Null); - Assert.That(good_people.Count, Is.EqualTo(2)); - - var mapping = good_people[0] as YamlMapping; - - Assert.That(mapping, Is.Not.Null); - Assert.That(mapping.ContainsKey("name"), Is.True); - Assert.That(mapping.ContainsKey("extras"), Is.True); - - var extras = mapping["extras"] as YamlSequence; - - Assert.That(extras, Is.Not.Null); - Assert.That(extras.Count, Is.EqualTo(1)); + var map = result[0] as YamlMapping; - mapping = extras[0] as YamlMapping; - - Assert.That(mapping, Is.Not.Null); - Assert.That(mapping.ContainsKey("mirror2"), Is.Not.Null); - Assert.That(mapping["mirror2"].ToString(), Is.EqualTo("one")); + Assert.That(result["good_people"][0]["extras"][0]["mirror2"].ToString(), Is.EqualTo("one")); } [Test] @@ -98,39 +54,8 @@ namespace YaYAML.Tests " - two", " - name: Sara"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("good_people"), Is.True, - "Expected key 'good_people'"); - - var good_people = map["good_people"] as YamlSequence; - - Assert.That(good_people, Is.Not.Null); - Assert.That(good_people.Count, Is.EqualTo(2)); - - var mapping = good_people[0] as YamlMapping; - - Assert.That(mapping, Is.Not.Null); - Assert.That(mapping.ContainsKey("name"), Is.True); - Assert.That(mapping.ContainsKey("extras"), Is.True); - - var extras = mapping["extras"] as YamlSequence; - - Assert.That(extras, Is.Not.Null); - Assert.That(extras.Count, Is.EqualTo(1)); - - mapping = extras[0] as YamlMapping; - - Assert.That(mapping, Is.Not.Null); - Assert.That(mapping.ContainsKey("mirror2"), Is.Not.Null); - - var mirror2Seq = mapping["mirror2"] as YamlSequence; - - Assert.That(mirror2Seq, Is.Not.Null); - Assert.That(mirror2Seq.Count, Is.EqualTo(2)); - Assert.That(mirror2Seq[0].ToString(), Is.EqualTo("one")); - Assert.That(mirror2Seq[1].ToString(), Is.EqualTo("two")); + Assert.That(result["good_people"][0]["extras"][0]["mirror2"][0].ToString(), Is.EqualTo("one")); + Assert.That(result["good_people"][0]["extras"][0]["mirror2"][1].ToString(), Is.EqualTo("two")); } private void VerifyPerson(YamlMapping mapping, string name, string reason) Tests/ParsingMappingWithListOfMappings.cs @@ -12,16 +12,7 @@ namespace YaYAML.Tests "key:", " - value"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("key"), Is.True); - - var value = map["key"] as YamlSequence; - - Assert.That(value, Is.Not.Null); - Assert.That(value.Count, Is.EqualTo(1)); - Assert.That(value[0].ToString(), Is.EqualTo("value")); + Assert.That(result["key"][0].ToString(), Is.EqualTo("value")); } [Test] @@ -32,17 +23,8 @@ namespace YaYAML.Tests " - value", " - another value"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("key"), Is.True); - - var value = map["key"] as YamlSequence; - - Assert.That(value, Is.Not.Null); - Assert.That(value.Count, Is.EqualTo(2)); - Assert.That(value[0].ToString(), Is.EqualTo("value")); - Assert.That(value[1].ToString(), Is.EqualTo("another value")); + Assert.That(result["key"][0].ToString(), Is.EqualTo("value")); + Assert.That(result["key"][1].ToString(), Is.EqualTo("another value")); } [Test] @@ -54,24 +36,8 @@ namespace YaYAML.Tests "key2:", " - value2"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("key"), Is.True); - - var first = map["key"] as YamlSequence; - - Assert.That(first, Is.Not.Null); - Assert.That(first.Count, Is.EqualTo(1)); - Assert.That(first[0].ToString(), Is.EqualTo("value")); - - Assert.That(map.ContainsKey("key2"), Is.True); - - var second = map["key2"] as YamlSequence; - - Assert.That(second, Is.Not.Null); - Assert.That(second.Count, Is.EqualTo(1)); - Assert.That(second[0].ToString(), Is.EqualTo("value2")); + Assert.That(result["key"][0].ToString(), Is.EqualTo("value")); + Assert.That(result["key2"][0].ToString(), Is.EqualTo("value2")); } [Test] @@ -85,26 +51,10 @@ namespace YaYAML.Tests " - value3", " - value4"); - var map = result.Items[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("key"), Is.True); - - var first = map["key"] as YamlSequence; - - Assert.That(first, Is.Not.Null); - Assert.That(first.Count, Is.EqualTo(2)); - Assert.That(first[0].ToString(), Is.EqualTo("value")); - Assert.That(first[1].ToString(), Is.EqualTo("value2")); - - Assert.That(map.ContainsKey("key2"), Is.True); - - var second = map["key2"] as YamlSequence; - - Assert.That(second, Is.Not.Null); - Assert.That(second.Count, Is.EqualTo(2)); - Assert.That(second[0].ToString(), Is.EqualTo("value3")); - Assert.That(second[1].ToString(), Is.EqualTo("value4")); + Assert.That(result["key"][0].ToString(), Is.EqualTo("value")); + Assert.That(result["key"][1].ToString(), Is.EqualTo("value2")); + Assert.That(result["key2"][0].ToString(), Is.EqualTo("value3")); + Assert.That(result["key2"][1].ToString(), Is.EqualTo("value4")); } } } \ No newline at end of file Tests/ParsingMappingsWithSequencesAsValues.cs @@ -11,16 +11,7 @@ namespace YaYAML.Tests var result = Parse<YamlDocument>(x => x.Document, "- name: first"); - var seq = result.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(1)); - - var map = seq[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("name"), Is.True); - Assert.That(map["name"].ToString(), Is.EqualTo("first")); + Assert.That(result[0]["name"].ToString(), Is.EqualTo("first")); } [Test] @@ -30,18 +21,8 @@ namespace YaYAML.Tests "- name: first", " value: test"); - var seq = result.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(1)); - - var map = seq[0] as YamlMapping; - - Assert.That(map, Is.Not.Null); - Assert.That(map.ContainsKey("name"), Is.True); - Assert.That(map.ContainsKey("value"), Is.True); - Assert.That(map["name"].ToString(), Is.EqualTo("first")); - Assert.That(map["value"].ToString(), Is.EqualTo("test")); + Assert.That(result[0]["name"].ToString(), Is.EqualTo("first")); + Assert.That(result[0]["value"].ToString(), Is.EqualTo("test")); } [Test] @@ -51,22 +32,8 @@ namespace YaYAML.Tests "- name: first", "- name: second"); - var seq = result.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(2)); - - var first = seq[0] as YamlMapping; - - Assert.That(first, Is.Not.Null); - Assert.That(first.ContainsKey("name"), Is.True); - Assert.That(first["name"].ToString(), Is.EqualTo("first")); - - var second = seq[1] as YamlMapping; - - Assert.That(second, Is.Not.Null); - Assert.That(second.ContainsKey("name"), Is.True); - Assert.That(second["name"].ToString(), Is.EqualTo("second")); + Assert.That(result[0]["name"].ToString(), Is.EqualTo("first")); + Assert.That(result[1]["name"].ToString(), Is.EqualTo("second")); } [Test] @@ -78,25 +45,10 @@ namespace YaYAML.Tests "- name: second", " value: test2"); - var seq = result.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(2)); - - var first = seq[0] as YamlMapping; - - Assert.That(first, Is.Not.Null); - Assert.That(first.ContainsKey("name"), Is.True); - Assert.That(first.ContainsKey("value"), Is.True); - Assert.That(first["name"].ToString(), Is.EqualTo("first")); - Assert.That(first["value"].ToString(), Is.EqualTo("test")); - - var second = seq[1] as YamlMapping; - - Assert.That(second, Is.Not.Null); - Assert.That(second.ContainsKey("name"), Is.True); - Assert.That(second.ContainsKey("value"), Is.True); - Assert.That(second["value"].ToString(), Is.EqualTo("test2")); + Assert.That(result[0]["name"].ToString(), Is.EqualTo("first")); + Assert.That(result[0]["value"].ToString(), Is.EqualTo("test")); + Assert.That(result[1]["name"].ToString(), Is.EqualTo("second")); + Assert.That(result[1]["value"].ToString(), Is.EqualTo("test2")); } [Test] @@ -107,20 +59,8 @@ namespace YaYAML.Tests " - one", " - two"); - var seq = result.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(1)); - - var first = seq[0] as YamlMapping; - - Assert.That(first, Is.Not.Null); - Assert.That(first.ContainsKey("value"), Is.True); - - var seq2 = first["value"] as YamlSequence; - - Assert.That(seq2, Is.Not.Null); - Assert.That(seq2.Count, Is.EqualTo(2)); + Assert.That(result[0]["value"][0].ToString(), Is.EqualTo("one")); + Assert.That(result[0]["value"][1].ToString(), Is.EqualTo("two")); } } } \ No newline at end of file Tests/ParsingSequencesOfMappings.cs @@ -56,7 +56,6 @@ <Compile Include="AbstractParserTestFixture.cs" /> <Compile Include="ParsingFlatMappings.cs" /> <Compile Include="ParsingFlatSequences.cs" /> - <Compile Include="ParsingFullDocuments.cs" /> <Compile Include="ParsingListOfMappingsWithListsAsValues.cs" /> <Compile Include="ParsingMappingsWithSequencesAsValues.cs" /> <Compile Include="ParsingMappingWithListOfMappings.cs" /> Tests/Tests.csproj @@ -18,12 +18,8 @@ namespace YaYAML.Tests var yaml = new Yaml(); var parsed = yaml.ParseText(content); - Assert.That(parsed, Is.Not.Null); - Assert.That(parsed.Items.Count, Is.EqualTo(1)); - Assert.That(parsed.Items[0], Is.TypeOf<YamlSequence>()); - - var seq = (YamlSequence)parsed.Items[0]; - Assert.That(seq.Count, Is.EqualTo(2)); + Assert.That(parsed[0].ToString(), Is.EqualTo("hello")); + Assert.That(parsed[1].ToString(), Is.EqualTo("there")); } [Test] @@ -32,12 +28,8 @@ namespace YaYAML.Tests var yaml = new Yaml(); var parsed = yaml.ParseFile(@"Resources\Sample.yaml"); - Assert.That(parsed, Is.Not.Null); - Assert.That(parsed.Items.Count, Is.EqualTo(1)); - Assert.That(parsed.Items[0], Is.TypeOf<YamlSequence>()); - - var seq = (YamlSequence)parsed.Items[0]; - Assert.That(seq.Count, Is.EqualTo(2)); + Assert.That(parsed[0].ToString(), Is.EqualTo("hello")); + Assert.That(parsed[1].ToString(), Is.EqualTo("there")); } [Test] @@ -46,29 +38,12 @@ namespace YaYAML.Tests var yaml = new Yaml(); var parsed = yaml.ParseFile(@"Resources\NestedSample.yaml"); - Assert.That(parsed, Is.Not.Null); - - // container - Assert.That(parsed.Items.Count, Is.EqualTo(1)); - - var seq = parsed.Items[0] as YamlSequence; - - Assert.That(seq, Is.Not.Null); - Assert.That(seq.Count, Is.EqualTo(2)); - - var first = seq[0] as YamlMapping; - - Assert.That(first, Is.Not.Null); - Assert.That(first.ContainsKey("name"), Is.True); - Assert.That(first.ContainsKey("age"), Is.True); - Assert.That(first.ContainsKey("phones"), Is.True); - - ValidatePersonYaml(seq[0] as YamlMapping, "James", "23", new[] + ValidatePersonYaml(parsed[0] as YamlMapping, "James", "23", new[] { "01234 432123", "01234 455674" }); - ValidatePersonYaml(seq[1] as YamlMapping, "Sara", "23", new[] + ValidatePersonYaml(parsed[1] as YamlMapping, "Sara", "23", new[] { "03323 412314", "03432 885443" Tests/YamlParserTests.cs @@ -1,5 +1,8 @@ +using System.Collections.Generic; + namespace YaYAML { public interface IYamlEntity + : IEnumerable<IYamlEntity>, IIndexable<string, IYamlEntity>, IIndexable<int, IYamlEntity> {} } \ No newline at end of file YaYAML/IYamlEntity.cs @@ -53,6 +53,7 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="IIndexable.cs" /> <Compile Include="IYamlEntity.cs" /> <Compile Include="Parsing\YamlParser.cs" /> <Compile Include="Yaml.cs" /> YaYAML/YaYAML.csproj @@ -1,16 +1,36 @@ +using System.Collections; using System.Collections.Generic; namespace YaYAML { - public class YamlDocument + public class YamlDocument : IYamlEntity { + private readonly IYamlEntity entity; + public YamlDocument(IYamlEntity entity) { // this is a bit pants - Items = new List<IYamlEntity>(); - Items.Add(entity); + this.entity = entity; + } + + public IEnumerator<IYamlEntity> GetEnumerator() + { + return entity.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + + public IYamlEntity this[string key] + { + get { return entity[key]; } } - public IList<IYamlEntity> Items { get; private set; } + public IYamlEntity this[int key] + { + get { return entity[key]; } + } } } \ No newline at end of file YaYAML/YamlDocument.cs @@ -25,6 +25,11 @@ namespace YaYAML } } + IEnumerator<IYamlEntity> IEnumerable<IYamlEntity>.GetEnumerator() + { + return internalDictionary.Values.GetEnumerator(); + } + public IEnumerator<KeyValuePair<string, IYamlEntity>> GetEnumerator() { return internalDictionary.GetEnumerator(); @@ -110,5 +115,10 @@ namespace YaYAML { return GetEnumerator(); } + + IYamlEntity IIndexable<int, IYamlEntity>.this[int index] + { + get { return new List<IYamlEntity>(internalDictionary.Values)[index]; } + } } } \ No newline at end of file YaYAML/YamlMapping.cs @@ -80,5 +80,10 @@ namespace YaYAML { return GetEnumerator(); } + + IYamlEntity IIndexable<string, IYamlEntity>.this[string key] + { + get { return null; } + } } } \ No newline at end of file YaYAML/YamlSequence.cs @@ -1,3 +1,7 @@ +using System; +using System.Collections; +using System.Collections.Generic; + namespace YaYAML { public class YamlText : IYamlEntity @@ -9,9 +13,29 @@ namespace YaYAML this.content = content; } + public IEnumerator<IYamlEntity> GetEnumerator() + { + yield return null; + } + public override string ToString() { return content; } + + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } + + IYamlEntity IIndexable<string, IYamlEntity>.this[string key] + { + get { return null; } + } + + IYamlEntity IIndexable<int, IYamlEntity>.this[int key] + { + get { return null; } + } } } \ No newline at end of file YaYAML/YamlText.cs 66a76c93aeb6fe08679876a8c77f828619f53b06 James Gregory james@jagregory.com http://github.com/jagregory/yayaml/commit/05ad80fe881b4076e7263103a2aa8ffff73d415a 05ad80fe881b4076e7263103a2aa8ffff73d415a 2008-11-02T18:27:04-08:00 2008-11-02T18:27:04-08:00 Updated the object-model a bit so it can be used a bit more "loosely". It's much easier to use if you know the file structure to not have to dance around types. 7ac4da133878e61432f21277b20f7cfa96764581 James Gregory james@jagregory.com