Correcting Issue #17, some more workds needs to be done for other keywords

Author: LxLeChat

Code/Library/GraphBuilder/BreakBuilder.cs

@@ -56,9 +56,14 @@ public void CreateSpecialEdge()
             if (node.label == null)
             {
                 breakablenode = node.FindNodesUp(x => x is ForeachNode || x is WhileNode || x is DoWhileNode || x is DoUntilNode || x is ForNode || x is SwitchNode);
-                specialedge = new DotEdge(node.Id,breakablenode.GetNextId());
-                specialedge.Label = $"Break From {node.Label}";
 
+                // New fix for Issue #17
+                if (breakablenode == null){
+                    specialedge = new DotEdge(node.Id,"end_of_script");
+                } else {
+                    specialedge = new DotEdge(node.Id,breakablenode.GetNextId());
+                    specialedge.Label = $"Break From {node.Label}";
+                }
             } else {
                 breakablenode = node.FindNodesUp(x => x.label == node.label);
                 specialedge = new DotEdge(node.Id,breakablenode.GetNextId());

Code/Library/Nodes - Keywords/BreakNode.cs

@@ -11,13 +11,14 @@ public class BreakNode : Node
         public string Label { get => label;}
         internal override int OffSetStatementStart {get => RawAst.Extent.StartOffset-OffSetToRemove;}
 
-        public BreakNode(BreakStatementAst _ast, int _depth, int _position, Node _parent)
+        public BreakNode(BreakStatementAst _ast, int _depth, int _position, Node _parent, Tree _tree)
         {
             name = "BreakNode";
             position = _position;
             depth = _depth;
             parent = _parent;
             RawAst = _ast;
+            parentroot = _tree;
             SetLabel();
 
         }

Code/Library/Nodes - Keywords/ContinueNode.cs

@@ -11,13 +11,14 @@ public class ContinueNode : Node
         public string Label { get => label;}
         internal override int OffSetStatementStart {get => RawAst.Extent.StartOffset-OffSetToRemove;}
 
-        public ContinueNode(ContinueStatementAst _ast, int _depth, int _position, Node _parent)
+        public ContinueNode(ContinueStatementAst _ast, int _depth, int _position, Node _parent, Tree _tree)
         {
             name = "ContinueNode";
             position = _position;
             depth = _depth;
             parent = _parent;
             RawAst = _ast;
+            parentroot = _tree;
 
             SetLabel();
 

Code/Library/Nodes - Keywords/ExitNode.cs

@@ -11,13 +11,14 @@ public class ExitNode : Node
         public string Label { get => label;}
         internal override int OffSetStatementStart {get => RawAst.Extent.StartOffset-OffSetToRemove;}
 
-        public ExitNode(ExitStatementAst _ast, int _depth, int _position, Node _parent)
+        public ExitNode(ExitStatementAst _ast, int _depth, int _position, Node _parent, Tree _tree)
         {
             name = "ExitNode";
             position = _position;
             depth = _depth;
             parent = _parent;
             RawAst = _ast;
+            parentroot = _tree;
 
         }
 

Code/Library/extension.cs

@@ -34,11 +34,11 @@ public static Node CreateNode (this Ast _ast, int _depth, int _position, Node _p
                 case Ast a when _ast is CatchClauseAst : 
                     return ((CatchClauseAst)_ast).CreateNodeFromAst(_depth, _position, _parent);
                 case Ast a when _ast is BreakStatementAst : 
-                    return ((BreakStatementAst)_ast).CreateNodeFromAst(_depth, _position, _parent);
+                    return ((BreakStatementAst)_ast).CreateNodeFromAst(_depth, _position, _parent, _tree);
                 case Ast a when _ast is ContinueStatementAst : 
-                    return ((ContinueStatementAst)_ast).CreateNodeFromAst(_depth, _position, _parent);
+                    return ((ContinueStatementAst)_ast).CreateNodeFromAst(_depth, _position, _parent, _tree);
                 case Ast a when _ast is ExitStatementAst : 
-                    return ((ExitStatementAst)_ast).CreateNodeFromAst(_depth, _position, _parent);
+                    return ((ExitStatementAst)_ast).CreateNodeFromAst(_depth, _position, _parent, _tree);
                 case Ast a when _ast is PipelineAst : 
                     return ((PipelineAst)_ast).CreateNodeFromAst(_depth, _position, _parent, _tree);
             }
@@ -79,9 +79,9 @@ public static class ExitStatementExtension {
         // New Methods Available:
         // - CreateNodeFromAST(NodeDepth, NodePosition, Parent) => Creates a Node
         // - GetChildAst() => retourne only ASTs we are looking for ...
-        public static ExitNode CreateNodeFromAst(this ExitStatementAst _ast,int _depth, int _position, Node _parent)
+        public static ExitNode CreateNodeFromAst(this ExitStatementAst _ast,int _depth, int _position, Node _parent, Tree _tree)
         {
-            return new ExitNode(_ast,_depth, _position, _parent);
+            return new ExitNode(_ast,_depth, _position, _parent,_tree);
         }
 
     }
@@ -91,9 +91,9 @@ public static class ContinueStatementExtension {
         // New Methods Available:
         // - CreateNodeFromAST(NodeDepth, NodePosition, Parent) => Creates a Node
         // - GetChildAst() => retourne only ASTs we are looking for ...
-        public static ContinueNode CreateNodeFromAst(this ContinueStatementAst _ast,int _depth, int _position, Node _parent)
+        public static ContinueNode CreateNodeFromAst(this ContinueStatementAst _ast,int _depth, int _position, Node _parent, Tree _tree)
         {
-            return new ContinueNode(_ast,_depth, _position, _parent);
+            return new ContinueNode(_ast,_depth, _position, _parent,_tree);
         }
 
     }
@@ -103,9 +103,9 @@ public static class BreakStatementExtension {
         // New Methods Available:
         // - CreateNodeFromAST(NodeDepth, NodePosition, Parent) => Creates a Node
         // - GetChildAst() => retourne only ASTs we are looking for ...
-        public static BreakNode CreateNodeFromAst(this BreakStatementAst _ast,int _depth, int _position, Node _parent)
+        public static BreakNode CreateNodeFromAst(this BreakStatementAst _ast,int _depth, int _position, Node _parent, Tree _tree)
         {
-            return new BreakNode(_ast,_depth, _position, _parent);
+            return new BreakNode(_ast,_depth, _position, _parent,_tree);
         }
 
     }