Work on features and bugs

Viktor Chernev · Viktor Chernev · commit e55d25078129 · 2024-10-28T23:01:44.000+03:00
diff --git a/DescribeParser/Parsers/ParserFor10/Describe10Lexer.cs b/DescribeParser/Parsers/ParserFor10/Describe10Lexer.cs
diff --git a/DescribeParser/Parsers/ParserFor10/Describe10Parser.cs b/DescribeParser/Parsers/ParserFor10/Describe10Parser.cs
diff --git a/DescribeParser/Parsers/ParserFor11/Describe11Lexer.cs b/DescribeParser/Parsers/ParserFor11/Describe11Lexer.cs
diff --git a/DescribeParser/Parsers/ParserFor11/Describe11Parser.cs b/DescribeParser/Parsers/ParserFor11/Describe11Parser.cs
diff --git a/DescribeParser/Unfold/DescribeUnfold.cs b/DescribeParser/Unfold/DescribeUnfold.cs
@@ -44,7 +44,7 @@ public partial class DescribeUnfold
         /// <summary>
         /// Gets or sets the dictionary of tildes (head item ID - body items ID's).
         /// </summary>
-        public Dictionary<string, List<string>> Tildes { get; set; }
+        //public Dictionary<string, List<string>> Tildes { get; set; }
 
         /// <summary>
         /// Gets or sets the dictionary of translations (item ID - item Text).
@@ -75,6 +75,7 @@ public partial class DescribeUnfold
         public Dictionary<string, List<string>> ProdidFile { get; set; }
 
 
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DescribeUnfold"/> class.
         /// </summary>
@@ -88,7 +89,6 @@ public DescribeUnfold()
 
             PrimaryProductions = new List<string>();
             Productions = new Dictionary<string, List<string>>();
-            Tildes = new Dictionary<string, List<string>>();
             Translations = new Dictionary<string, string>();
             Links = new Dictionary<string, List<DescribeLink>>();
             Decorators = new Dictionary<string, List<DescribeDecorator>>();
diff --git a/DescribeParser/Unfold/DescribeUnfold_ToString.cs b/DescribeParser/Unfold/DescribeUnfold_ToString.cs
@@ -32,7 +32,6 @@ public override string ToString()
             text += Translations_ToString();
             text += Links_ToString();
             text += Decorators_ToString();
-            text += Tildes_ToString();
             text += Environment.NewLine;
 
             //File Placement
@@ -131,36 +130,7 @@ private string Productions_ToString()
             text += Environment.NewLine;
             return text;
         }
-        private string Tildes_ToString()
-        {
-            string text = INDENT + ".Tildes" + Environment.NewLine;
-            if (Tildes.Count == 0) return text;
 
-            foreach (KeyValuePair<string, List<string>> kvp in Tildes)
-            {
-                text += INDENT + INDENT + '"' + kvp.Key + "\" -> ";
-                if (kvp.Value.Count > 10)
-                {
-                    text += Environment.NewLine + INDENT + INDENT + INDENT;
-                    for (int i = 0; i < kvp.Value.Count - 1; i++)
-                    {
-                        text += "\"" + kvp.Value[i] + "\", ";
-                        if ((i + 1) % 10 == 0) text += Environment.NewLine + INDENT + INDENT + INDENT;
-                    }
-                }
-                else
-                {
-                    for (int i = 0; i < kvp.Value.Count - 1; i++)
-                    {
-                        text += "\"" + kvp.Value[i] + "\", ";
-                    }
-                }
-                if(kvp.Value.Count > 0) text += "\"" + kvp.Value[kvp.Value.Count - 1] + "\";";
-                text += Environment.NewLine;
-            }
-            text += Environment.NewLine;
-            return text;
-        }
         private string Translations_ToString()
         {
             string text = INDENT + ".Translations" + Environment.NewLine;
diff --git a/DescribeParser/Visitors/VisitorsFor10/UnfoldVisitor10.cs b/DescribeParser/Visitors/VisitorsFor10/UnfoldVisitor10.cs
@@ -300,12 +300,10 @@ private string DoExpression(DescribeUnfold u, Describe10Parser.ExpressionContext
 
                 if (right.StartsWith('~'))
                 {
-                    u.Tildes.Add(head, new List<string>() { right.Substring(1) });
-                    u.Productions.Add(head, new List<string>());
+                    u.Productions.Add(head, new List<string>() { right.Substring(1) });
                 }
                 else
                 {
-                    u.Tildes.Add(head, new List<string>());
                     u.Productions.Add(head, new List<string>() { right });
                 }
             }
@@ -323,7 +321,6 @@ private string DoExpression(DescribeUnfold u, Describe10Parser.ExpressionContext
                         prodfile + "\"";
                     throw new Exception(message);
                 }
-                u.Tildes.Add(head, new List<string>());
                 u.Productions.Add(head, new List<string>() { right });
             }
             else if (thirdChild is Describe10Parser.Item_or_expression_listContext)
@@ -341,14 +338,12 @@ private string DoExpression(DescribeUnfold u, Describe10Parser.ExpressionContext
                     throw new Exception(message);
                 }
 
-                List<string> tildes = new List<string>();
                 List<string> items = new List<string>();
                 for (int i = 0; i <  rights.Length; i++)
                 {
-                    if (rights[i].StartsWith('~')) tildes.Add(rights[i].Substring(1));
+                    if (rights[i].StartsWith('~')) items.Add(rights[i].Substring(1));
                     else items.Add(rights[i]);
                 }
-                u.Tildes.Add(head, tildes);
                 u.Productions.Add(head, items);
             }
             else
diff --git a/DescribeParser/Visitors/VisitorsFor11/UnfoldVisitor11.cs b/DescribeParser/Visitors/VisitorsFor11/UnfoldVisitor11.cs
@@ -298,12 +298,10 @@ private string DoExpression(DescribeUnfold u, Describe11Parser.ExpressionContext
 
                 if (right.StartsWith('~'))
                 {
-                    u.Tildes.Add(head, new List<string>() { right.Substring(1) });
-                    u.Productions.Add(head, new List<string>());
+                    u.Productions.Add(head, new List<string>() { right.Substring(1) });
                 }
                 else
                 {
-                    u.Tildes.Add(head, new List<string>());
                     u.Productions.Add(head, new List<string>() { right });
                 }
             }
@@ -321,7 +319,6 @@ private string DoExpression(DescribeUnfold u, Describe11Parser.ExpressionContext
                         prodfile + "\"";
                     throw new Exception(message);
                 }
-                u.Tildes.Add(head, new List<string>());
                 u.Productions.Add(head, new List<string>() { right });
             }
             else if (thirdChild is Describe11Parser.Item_or_expression_listContext)
@@ -339,14 +336,12 @@ private string DoExpression(DescribeUnfold u, Describe11Parser.ExpressionContext
                     throw new Exception(message);
                 }
 
-                List<string> tildes = new List<string>();
                 List<string> items = new List<string>();
                 for (int i = 0; i <  rights.Length; i++)
                 {
-                    if (rights[i].StartsWith('~')) tildes.Add(rights[i].Substring(1));
+                    if (rights[i].StartsWith('~')) items.Add(rights[i].Substring(1));
                     else items.Add(rights[i]);
                 }
-                u.Tildes.Add(head, tildes);
                 u.Productions.Add(head, items);
             }
             else
diff --git a/DescribeTranspiler/Translators/Translators/Html/HtmlBasicTranslator.cs b/DescribeTranspiler/Translators/Translators/Html/HtmlBasicTranslator.cs
@@ -270,20 +270,12 @@ string TranslateProduction(DescribeUnfold u, string id)
             List<string> li = new List<string>();
             if (u.Productions.ContainsKey(id)) li = u.Productions[id];
 
-            List<string> ti = new List<string>();
-            if (u.Tildes.ContainsKey(id)) ti = u.Tildes[id];
-
             string items = "";
             foreach (string s in li)
             {
                 string z = TranslateProductionOrItem(u, s);
                 items += z;
             }
-            foreach (string s in ti)
-            {
-                string z = TranslateProductionOrItem(u, s);
-                items += z;
-            }
 
             //do links
             //we are assuming there would be no backslashes in links
diff --git a/DescribeTranspiler/Translators/Translators/Html/HtmlPageTranslator.cs b/DescribeTranspiler/Translators/Translators/Html/HtmlPageTranslator.cs
@@ -272,20 +272,12 @@ string TranslateProduction(DescribeUnfold u, string id)
             List<string> li = new List<string>();
             if (u.Productions.ContainsKey(id)) li = u.Productions[id];
 
-            List<string> ti = new List<string>();
-            if (u.Tildes.ContainsKey(id)) ti = u.Tildes[id];
-
             string items = "";
             foreach (string s in li)
             {
                 string z = TranslateProductionOrItem(u, s);
                 items += z;
             }
-            foreach (string s in ti)
-            {
-                string z = TranslateProductionOrItem(u, s);
-                items += z;
-            }
 
             //do links
             //we are assuming there would be no backslashes in links
diff --git a/DescribeTranspiler/Translators/Translators/Json/JsonBasicTranslator.cs b/DescribeTranspiler/Translators/Translators/Json/JsonBasicTranslator.cs
@@ -296,22 +296,13 @@ string TranslateProduction(DescribeUnfold u, string id)
             List<string> li = new List<string>();
             if (u.Productions.ContainsKey(id)) li = u.Productions[id];
 
-            List<string> ti = new List<string>();
-            if (u.Tildes.ContainsKey(id)) ti = u.Tildes[id];
-
             string items = "";
             foreach (string s in li)
             {
                 string z = TranslateProductionOrItem(u, s);
                 if (items != "") items += ",";
                 items += z;
             }
-            foreach (string s in ti)
-            {
-                string z = TranslateProductionOrItem(u, s);
-                if (items != "") items += ",";
-                items += z;
-            }
 
             //do links
             //we are assuming there would be no backslashes in links
diff --git a/DescribeTranspiler/Translators/Translators/Json/JsonListiaryTranslator.cs b/DescribeTranspiler/Translators/Translators/Json/JsonListiaryTranslator.cs
@@ -297,22 +297,13 @@ string TranslateProduction(DescribeUnfold u, string id)
             List<string> li = new List<string>();
             if (u.Productions.ContainsKey(id)) li = u.Productions[id];
 
-            List<string> ti = new List<string>();
-            if (u.Tildes.ContainsKey(id)) ti = u.Tildes[id];
-
             string items = "";
             foreach (string s in li)
             {
                 string z = TranslateProductionOrItem(u, s);
                 if (items != "") items += ",";
                 items += z;
             }
-            foreach (string s in ti)
-            {
-                string z = TranslateProductionOrItem(u, s);
-                if (items != "") items += ",";
-                items += z;
-            }
 
             //do links
             //we are assuming there would be no backslashes in links
diff --git a/DescribeTranspiler/Translators/Translators/Xml/XmlBasicTranslator.cs b/DescribeTranspiler/Translators/Translators/Xml/XmlBasicTranslator.cs
@@ -290,20 +290,12 @@ string TranslateProduction(DescribeUnfold u, string id)
             List<string> li = new List<string>();
             if (u.Productions.ContainsKey(id)) li = u.Productions[id];
 
-            List<string> ti = new List<string>();
-            if (u.Tildes.ContainsKey(id)) ti = u.Tildes[id];
-
             string items = "";
             foreach (string s in li)
             {
                 string z = TranslateProductionOrItem(u, s);
                 items += z;
             }
-            foreach (string s in ti)
-            {
-                string z = TranslateProductionOrItem(u, s);
-                items += z;
-            }
 
             //do links
             //we are assuming there would be no backslashes in links
diff --git a/Tests.Unit.Parser/Unfold/DescribeUnfold_Tests.cs b/Tests.Unit.Parser/Unfold/DescribeUnfold_Tests.cs
@@ -24,7 +24,6 @@ public void DescribeUnfold_Constructor_ShouldInitializeProperties()
             Assert.IsNotNull(unfold.FailedFiles, "FailedFiles should be initialized.");
             Assert.IsNotNull(unfold.PrimaryProductions, "PrimaryProductions should be initialized.");
             Assert.IsNotNull(unfold.Productions, "Productions should be initialized.");
-            Assert.IsNotNull(unfold.Tildes, "Tildes should be initialized.");
             Assert.IsNotNull(unfold.Translations, "Translations should be initialized.");
             Assert.IsNotNull(unfold.Links, "Links should be initialized.");
             Assert.IsNotNull(unfold.Decorators, "Decorators should be initialized.");
@@ -64,7 +63,6 @@ public void DescribeUnfold_SetAndGetProperties_ShouldWorkCorrectly()
             unfold.FailedFiles = testFailedFiles;
             unfold.PrimaryProductions = testPrimaryProductions;
             unfold.Productions = testProductions;
-            unfold.Tildes = testTildes;
             unfold.Translations = testTranslations;
             unfold.Links = testLinks;
             unfold.Decorators = testDecorators;
@@ -78,7 +76,6 @@ public void DescribeUnfold_SetAndGetProperties_ShouldWorkCorrectly()
             CollectionAssert.AreEqual(testFailedFiles, unfold.FailedFiles);
             CollectionAssert.AreEqual(testPrimaryProductions, unfold.PrimaryProductions);
             CollectionAssert.AreEqual(testProductions, unfold.Productions);
-            CollectionAssert.AreEqual(testTildes, unfold.Tildes);
             CollectionAssert.AreEqual(testTranslations, unfold.Translations);
             CollectionAssert.AreEqual(testLinks, unfold.Links);
             CollectionAssert.AreEqual(testDecorators, unfold.Decorators);
@@ -136,7 +133,6 @@ public void ToJson_ShouldSerializeObjectToJson()
                 FailedFiles = new List<string> { "file2.txt" },
                 PrimaryProductions = new List<string> { "prod1", "prod2" },
                 Productions = new Dictionary<string, List<string>> { { "prod1", new List<string> { "item1" } } },
-                Tildes = new Dictionary<string, List<string>> { { "tilde1", new List<string> { "item2" } } },
                 Translations = new Dictionary<string, string> { { "item1", "translation1" } },
                 Links = new Dictionary<string, List<DescribeLink>> { { "item1", new List<DescribeLink> { new DescribeLink { Url = "http://example.com" } } } },
                 Decorators = new Dictionary<string, List<DescribeDecorator>> { { "item1", new List<DescribeDecorator> { new DescribeDecorator { Name = "Decorator1" } } } },

Original file line number	Diff line number	Diff line change
`@@ -300,12 +300,10 @@ private string DoExpression(DescribeUnfold u, Describe10Parser.ExpressionContext`
`300`	`300`
`301`	`301`	`if (right.StartsWith('~'))`
`302`	`302`	`{`
`303`		`- u.Tildes.Add(head, new List<string>() { right.Substring(1) });`
`304`		`- u.Productions.Add(head, new List<string>());`
	`303`	`+ u.Productions.Add(head, new List<string>() { right.Substring(1) });`
`305`	`304`	`}`
`306`	`305`	`else`
`307`	`306`	`{`
`308`		`- u.Tildes.Add(head, new List<string>());`
`309`	`307`	`u.Productions.Add(head, new List<string>() { right });`
`310`	`308`	`}`
`311`	`309`	`}`
`@@ -323,7 +321,6 @@ private string DoExpression(DescribeUnfold u, Describe10Parser.ExpressionContext`
`323`	`321`	`prodfile + "\"";`
`324`	`322`	`throw new Exception(message);`
`325`	`323`	`}`
`326`		`- u.Tildes.Add(head, new List<string>());`
`327`	`324`	`u.Productions.Add(head, new List<string>() { right });`
`328`	`325`	`}`
`329`	`326`	`else if (thirdChild is Describe10Parser.Item_or_expression_listContext)`
`@@ -341,14 +338,12 @@ private string DoExpression(DescribeUnfold u, Describe10Parser.ExpressionContext`
`341`	`338`	`throw new Exception(message);`
`342`	`339`	`}`
`343`	`340`
`344`		`- List<string> tildes = new List<string>();`
`345`	`341`	`List<string> items = new List<string>();`
`346`	`342`	`for (int i = 0; i < rights.Length; i++)`
`347`	`343`	`{`
`348`		`- if (rights[i].StartsWith('~')) tildes.Add(rights[i].Substring(1));`
	`344`	`+ if (rights[i].StartsWith('~')) items.Add(rights[i].Substring(1));`
`349`	`345`	`else items.Add(rights[i]);`
`350`	`346`	`}`
`351`		`- u.Tildes.Add(head, tildes);`
`352`	`347`	`u.Productions.Add(head, items);`
`353`	`348`	`}`
`354`	`349`	`else`
Original file line number	Diff line number	Diff line change
`@@ -298,12 +298,10 @@ private string DoExpression(DescribeUnfold u, Describe11Parser.ExpressionContext`
`298`	`298`
`299`	`299`	`if (right.StartsWith('~'))`
`300`	`300`	`{`
`301`		`- u.Tildes.Add(head, new List<string>() { right.Substring(1) });`
`302`		`- u.Productions.Add(head, new List<string>());`
	`301`	`+ u.Productions.Add(head, new List<string>() { right.Substring(1) });`
`303`	`302`	`}`
`304`	`303`	`else`
`305`	`304`	`{`
`306`		`- u.Tildes.Add(head, new List<string>());`
`307`	`305`	`u.Productions.Add(head, new List<string>() { right });`
`308`	`306`	`}`
`309`	`307`	`}`
`@@ -321,7 +319,6 @@ private string DoExpression(DescribeUnfold u, Describe11Parser.ExpressionContext`
`321`	`319`	`prodfile + "\"";`
`322`	`320`	`throw new Exception(message);`
`323`	`321`	`}`
`324`		`- u.Tildes.Add(head, new List<string>());`
`325`	`322`	`u.Productions.Add(head, new List<string>() { right });`
`326`	`323`	`}`
`327`	`324`	`else if (thirdChild is Describe11Parser.Item_or_expression_listContext)`
`@@ -339,14 +336,12 @@ private string DoExpression(DescribeUnfold u, Describe11Parser.ExpressionContext`
`339`	`336`	`throw new Exception(message);`
`340`	`337`	`}`
`341`	`338`
`342`		`- List<string> tildes = new List<string>();`
`343`	`339`	`List<string> items = new List<string>();`
`344`	`340`	`for (int i = 0; i < rights.Length; i++)`
`345`	`341`	`{`
`346`		`- if (rights[i].StartsWith('~')) tildes.Add(rights[i].Substring(1));`
	`342`	`+ if (rights[i].StartsWith('~')) items.Add(rights[i].Substring(1));`
`347`	`343`	`else items.Add(rights[i]);`
`348`	`344`	`}`
`349`		`- u.Tildes.Add(head, tildes);`
`350`	`345`	`u.Productions.Add(head, items);`
`351`	`346`	`}`
`352`	`347`	`else`