Ruby: CFG make more expressions post-order

Author: aibaars

ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImpl.qll

@@ -107,14 +107,8 @@ module Trees {
     }
   }
 
-  private class ArgumentListTree extends StandardTree, ArgumentList {
+  private class ArgumentListTree extends StandardPostOrderTree, ArgumentList {
     final override ControlFlowTree getChildElement(int i) { result = this.getElement(i) }
-
-    final override predicate first(AstNode first) { first(this.getFirstChildElement(), first) }
-
-    final override predicate last(AstNode last, Completion c) {
-      last(this.getLastChildElement(), last, c)
-    }
   }
 
   private class AssignExprTree extends StandardPostOrderTree, AssignExpr {
@@ -983,6 +977,8 @@ module Trees {
     }
   }
 
+  private class ForwardedArgumentsTree extends LeafTree, ForwardedArguments { }
+
   private class ForwardParameterTree extends LeafTree, ForwardParameter { }
 
   private class GlobalVariableTree extends LeafTree, GlobalVariableAccess { }
@@ -995,7 +991,7 @@ module Trees {
 
   private class HashSplatParameterTree extends NonDefaultValueParameterTree, HashSplatParameter { }
 
-  private class HereDocTree extends StandardPreOrderTree, HereDoc {
+  private class HereDocTree extends StandardPostOrderTree, HereDoc {
     final override ControlFlowTree getChildElement(int i) { result = this.getComponent(i) }
   }
 
@@ -1355,14 +1351,8 @@ module Trees {
     }
   }
 
-  private class StringConcatenationTree extends StandardTree, StringConcatenation {
+  private class StringConcatenationTree extends StandardPostOrderTree, StringConcatenation {
     final override ControlFlowTree getChildElement(int i) { result = this.getString(i) }
-
-    final override predicate first(AstNode first) { first(this.getFirstChildElement(), first) }
-
-    final override predicate last(AstNode last, Completion c) {
-      last(this.getLastChildElement(), last, c)
-    }
   }
 
   private class StringlikeLiteralTree extends StandardPostOrderTree, StringlikeLiteral {

ruby/ql/test/library-tests/controlflow/graph/Cfg.expected

@@ -1847,6 +1847,9 @@ cfg.rb:
 #   52| "a"
 #-----|  -> chained
 
+#   52| "..." "..."
+#-----|  -> ... = ...
+
 #   52| "#{...}"
 #-----|  -> "string"
 
@@ -1857,7 +1860,7 @@ cfg.rb:
 #-----|  -> #{...}
 
 #   52| "string"
-#-----|  -> ... = ...
+#-----|  -> "..." "..."
 
 #   54| ... = ...
 #-----|  -> Silly
@@ -2416,13 +2419,13 @@ cfg.rb:
 #-----|  -> b
 
 #  108| self
-#-----|  -> <<SQL
+#-----|  -> table
 
 #  108| ( ... )
 #-----|  -> call to puts
 
 #  108| <<SQL
-#-----|  -> table
+#-----|  -> ( ... )
 
 #  109| #{...}
 #-----|  -> type
@@ -2431,7 +2434,7 @@ cfg.rb:
 #-----|  -> #{...}
 
 #  110| #{...}
-#-----|  -> ( ... )
+#-----|  -> <<SQL
 
 #  110| type
 #-----|  -> #{...}
@@ -2704,6 +2707,9 @@ cfg.rb:
 #  138| __synth__0
 #-----|  -> -1
 
+#  138| ..., ...
+#-----|  -> * ...
+
 #  138| 1
 #-----|  -> 2
 
@@ -2720,7 +2726,7 @@ cfg.rb:
 #-----|  -> 3
 
 #  138| 3
-#-----|  -> * ...
+#-----|  -> ..., ...
 
 #  140| M
 #-----|  -> Constant
@@ -3270,6 +3276,9 @@ cfg.rb:
 #-----|  -> b
 
 #  197| b
+#-----|  -> ...
+
+#  197| ...
 #-----|  -> call to bar
 
 desugar.rb:

ruby/ql/test/library-tests/controlflow/graph/Nodes.expected

@@ -191,6 +191,7 @@ positionalArguments
 | cfg.rb:191:3:191:10 | yield ... | cfg.rb:191:9:191:10 | 42 |
 | cfg.rb:194:16:194:21 | call to puts | cfg.rb:194:21:194:21 | x |
 | cfg.rb:197:3:197:13 | call to bar | cfg.rb:197:7:197:7 | b |
+| cfg.rb:197:3:197:13 | call to bar | cfg.rb:197:10:197:12 | ... |
 | desugar.rb:2:5:2:6 | ... + ... | desugar.rb:2:8:2:8 | 1 |
 | desugar.rb:6:3:6:13 | call to count= | desugar.rb:6:3:6:13 | ... = ... |
 | desugar.rb:10:3:10:10 | call to []= | desugar.rb:10:3:10:10 | ... = ... |