添加 备注

Author: toolgood

csharp/ToolGood.Algorithm2.Test/ConditionTrees/ConditionTreeTest.cs

@@ -9,10 +9,11 @@ public class ConditionTreeTest
         [Test]
         public void Test1()
         {
-            string txt = "AA.IsText()=bb";
+            string txt = "AA.IsText() = bb";
             var t1 = ConditionTree.Parse(txt);
             Assert.AreEqual(t1.Type, ConditionTreeType.String);
-            Assert.AreEqual("AA.IsText()=bb", txt.Substring(t1.Start, t1.End - t1.Start + 1));
+            Assert.AreEqual("AA.IsText() = bb", txt.Substring(t1.Start, t1.End - t1.Start + 1));
+            Assert.AreEqual("AA.IsText()=bb", t1.ConditionString);
 
             txt = "[bbb]=bb";
             t1 = ConditionTree.Parse(txt);

csharp/ToolGood.Algorithm2/Internals/ConditionTree.cs

@@ -6,18 +6,33 @@ namespace ToolGood.Algorithm.Internals
 {
     public class ConditionTree
     {
-        public List<ConditionTree> Nodes { get; internal set; }
-
+        /// <summary>
+        /// 子节点
+        /// </summary>
+        public IList<ConditionTree> Nodes { get; internal set; }
+        /// <summary>
+        /// 开始位置
+        /// </summary>
         public int Start { get; internal set; }
+        /// <summary>
+        /// 结束位置
+        /// </summary>
         public int End { get; internal set; }
-
+        /// <summary>
+        /// 类型
+        /// </summary>
         public ConditionTreeType Type { get; internal set; }
-
+        /// <summary>
+        /// 条件
+        /// </summary>
+        public string ConditionString { get; internal set; }
+        /// <summary>
+        /// 出错信息
+        /// </summary>
         public String ErrorMessage { get; internal set; }
 
         internal ConditionTree()
         {
-            Nodes = new List<ConditionTree>();
         }
 
 

csharp/ToolGood.Algorithm2/Internals/ConditionTreeType.cs

@@ -2,9 +2,21 @@
 {
     public enum ConditionTreeType
     {
+        /// <summary>
+        /// 文本
+        /// </summary>
         String,
+        /// <summary>
+        /// 并
+        /// </summary>
         And,
+        /// <summary>
+        /// 或
+        /// </summary>
         Or,
+        /// <summary>
+        /// 错误
+        /// </summary>
         Error
 
     }

csharp/ToolGood.Algorithm2/Internals/MathSplitVisitor.cs

@@ -1,8 +1,6 @@
 using Antlr4.Runtime;
 using Antlr4.Runtime.Tree;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace ToolGood.Algorithm.Internals
@@ -16,6 +14,7 @@ public ConditionTree VisitProg(mathParser.ProgContext context)
         public ConditionTree VisitAndOr_fun(mathParser.AndOr_funContext context)
         {
             ConditionTree tree = new ConditionTree();
+            tree.Nodes = new List<ConditionTree>();
             var t = context.op.Text;
             if (CharUtil.Equals(t, "&&", "and")) {
                 tree.Type = ConditionTreeType.And;
@@ -35,15 +34,17 @@ public ConditionTree Visit_fun(ParserRuleContext context)
             ConditionTree tree = new ConditionTree();
             tree.Start = context.Start.StartIndex;
             tree.End = context.Stop.StopIndex;
+            tree.ConditionString = context.GetText();
             return tree;
         }
 
+
         public ConditionTree VisitIF_fun(mathParser.IF_funContext context)
         {
             return Visit_fun(context);
         }
 
-     
+
         public ConditionTree VisitAND_fun(mathParser.AND_funContext context)
         {
             return Visit_fun(context);
@@ -75,9 +76,6 @@ public ConditionTree VisitAddSub_fun(mathParser.AddSub_funContext context)
         {
             return Visit_fun(context);
         }
-
-
-
         public ConditionTree VisitArray_fun(mathParser.Array_funContext context)
         {
             return Visit_fun(context);

java/toolgood.algorithm/src/main/java/toolgood/algorithm/internals/ConditionTree.java

@@ -10,17 +10,33 @@
 import java.util.List;
 
 public class ConditionTree {
+    /**
+     * 子节点
+     */
     public List<ConditionTree> Nodes;
-
+    /**
+     * 开始位置
+     */
     public int Start;
+    /**
+     * 结束位置
+     */
     public int End;
-
+    /**
+     * 类型
+     */
     public ConditionTreeType Type;
-
+    /**
+     * 条件
+     */
+    public String ConditionString;
+    /**
+     * 出错信息
+     */
     public String ErrorMessage;
 
     public ConditionTree() {
-        Nodes = new ArrayList<>();
+
     }
 
 

java/toolgood.algorithm/src/main/java/toolgood/algorithm/internals/ConditionTreeType.java

@@ -1,8 +1,20 @@
 package toolgood.algorithm.internals;
 
 public enum ConditionTreeType {
+    /**
+     * 文本
+     */
     String,
+    /**
+     * 并
+     */
     And,
+    /**
+     * 或
+     */
     Or,
+    /**
+     * 错误
+     */
     Error
 }

java/toolgood.algorithm/src/main/java/toolgood/algorithm/internals/MathSplitVisitor.java

@@ -5,6 +5,8 @@
 import toolgood.algorithm.math.mathParser2;
 import toolgood.algorithm.math.mathVisitor;
 
+import java.util.ArrayList;
+
 public class MathSplitVisitor extends AbstractParseTreeVisitor<ConditionTree> implements mathVisitor<ConditionTree> {
     @Override
     public ConditionTree visitProg(mathParser2.ProgContext context) {
@@ -14,6 +16,7 @@ public ConditionTree visitProg(mathParser2.ProgContext context) {
     @Override
     public ConditionTree visitAndOr_fun(mathParser2.AndOr_funContext context) {
         ConditionTree tree = new ConditionTree();
+        tree.Nodes = new ArrayList<>();
         String t = context.op.getText();
         if (CharUtil.Equals(t, "&&", "and")) {
             tree.Type = ConditionTreeType.And;
@@ -35,6 +38,7 @@ public ConditionTree visit_fun(ParserRuleContext context) {
         tree.Type = ConditionTreeType.String;
         tree.Start = context.start.getStartIndex();
         tree.End = context.stop.getStopIndex();
+        tree.ConditionString = context.getText();
         return tree;
     }
 

java/toolgood.algorithm/src/test/java/toolgood/algorithm/Tests4/ConditionTreeTest.java

@@ -10,11 +10,12 @@ public class ConditionTreeTest {
 
     @Test
     public void Test1() {
-        String txt = "AA.IsText()=bb";
+        String txt = "AA.IsText() = bb";
         ConditionTree t1 = ConditionTree.Parse(txt);
 
         assertEquals(t1.Type, ConditionTreeType.String);
-        assertEquals("AA.IsText()=bb", txt.substring(t1.Start, t1.End + 1));
+        assertEquals("AA.IsText() = bb", txt.substring(t1.Start, t1.End + 1));
+        assertEquals("AA.IsText()=bb",t1.ConditionString);
 
         txt = "[bbb]=bb";
         t1 = ConditionTree.Parse(txt);