Merge pull request #36 from LxLeChat/Multiple-types-of-graphs

fixing bug for issue #17

Author: LxLeChat

Code/Library/GraphBuilder/ElseIfBuilder.cs

@@ -42,17 +42,27 @@ public void CreateEndNode()
 
         public void CreateFalseEdge()
         {
-            // throw new System.NotImplementedException();
             Node nextnode = node.GetNextNode();
-            if (nextnode.GetType() == typeof(ElseNode) )
+            
+            // Fix issue #17
+            // if no nextnode present
+            if (nextnode == null)
             {
-                DotEdge edge = new DotEdge(node.Id,node.GetNextNode().children[0].Id);
+                DotEdge edge = new DotEdge(node.Id,node.parent.GetEndId());
                 edge.Label = "False";
                 DotDefinition.Add(edge);
             } else {
-                DotEdge edge = new DotEdge(node.Id,node.GetNextNode().Id);
-                edge.Label = "False";
-                DotDefinition.Add(edge);
+                
+                if (nextnode.GetType() == typeof(ElseNode) )
+                {
+                    DotEdge edge = new DotEdge(node.Id,node.GetNextNode().children[0].Id);
+                    edge.Label = "False";
+                    DotDefinition.Add(edge);
+                } else {
+                    DotEdge edge = new DotEdge(node.Id,node.GetNextNode().Id);
+                    edge.Label = "False";
+                    DotDefinition.Add(edge);
+                }
             }
 
         }

Code/Library/Nodes - Loops/ForNode.cs

@@ -111,7 +111,11 @@ public ForStatementAst GetAst() {
         }
 
         internal override void SetCondition(){
-            condition = RawAst.Condition.Extent.Text;
+            // bug fix issue #17
+            // condition can be null, unfortunally
+            if ( RawAst.Condition != null ) {
+                condition = RawAst.Condition.Extent.Text;
+            }
             iterator = RawAst.Iterator.Extent.Text;
         }