Merge pull request #7282 from ke-yu/cbn-force-execution

Disable delta computation on code block node
DynamoDS · Oct 20, 2016 · b59d6d7 · b59d6d7
2 parents e189317 + 3a17b6b
commit b59d6d7
Show file tree

Hide file tree

Showing 10 changed files with 241 additions and 132 deletions.
diff --git a/src/DynamoCore/Engine/EngineController.cs b/src/DynamoCore/Engine/EngineController.cs
@@ -364,15 +364,22 @@ private bool VerifyGraphSyncData(IEnumerable<NodeModel> nodes)
                 nodes.Where(n => n.NeedsForceExecution)
                      .Select(n => n.GUID));
 
-            if (reExecuteNodesIds.Any())
+            var codeBlockNodes = new HashSet<Guid>(
+                nodes.Where(n => n is CodeBlockNodeModel).Select(n => n.GUID));
+
+            if (reExecuteNodesIds.Any() || codeBlockNodes.Any())
             {
                 for (int i = 0; i < graphSyncdata.ModifiedSubtrees.Count; ++i)
                 {
                     var st = graphSyncdata.ModifiedSubtrees[i];
-                    if (reExecuteNodesIds.Contains(st.GUID))
+                    var forceExecution = reExecuteNodesIds.Contains(st.GUID);
+                    var isCodeBlockNode = codeBlockNodes.Contains(st.GUID);
+
+                    if (forceExecution || isCodeBlockNode) 
                     {
                         Subtree newSt = new Subtree(st.AstNodes, st.GUID);
-                        newSt.ForceExecution = true;
+                        newSt.ForceExecution = forceExecution;
+                        newSt.DeltaComputation = !isCodeBlockNode;
                         graphSyncdata.ModifiedSubtrees[i] = newSt;
                     }
                 }

diff --git a/src/Engine/ProtoAssociative/CodeGen.cs b/src/Engine/ProtoAssociative/CodeGen.cs
@@ -1961,6 +1961,7 @@ private AssociativeNode DFSEmitSplitAssign_AST(AssociativeNode node, ref List<As
                 {
                     AssociativeNode lastNode = DFSEmitSplitAssign_AST(bnode.RightNode, ref astList);
                     var newBNode = AstFactory.BuildBinaryExpression(bnode.LeftNode, lastNode, Operator.assign);
+                    newBNode.OriginalAstID = bnode.OriginalAstID;
 
                     astList.Add(newBNode);
                     return bnode.LeftNode;

diff --git a/src/Engine/ProtoCore/Parser/AssociativeAST.cs b/src/Engine/ProtoCore/Parser/AssociativeAST.cs
@@ -2076,11 +2076,6 @@ public class BinaryExpressionNode : AssociativeNode
         public bool isSSAPointerAssignment { get; set; }
         public bool IsFirstIdentListNode { get; set; }
 
-        // These properties are used only for the GraphUI ProtoAST
-        public uint Guid { get; set; }
-        //private uint splitFromUID = 0;
-        //public uint SplitFromUID { get { return splitFromUID; } set { splitFromUID = value; } }
-
         public BinaryExpressionNode(AssociativeNode left = null, AssociativeNode right = null, Operator optr = Operator.none)
         {
             isSSAAssignment = false;