hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-20 00:43:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

CFG: remove intermediate HeredocBody nodes

Browse Source
This commit is contained in:
Arthur Baars
2021-02-16 21:10:17 +01:00
parent 167574d82f
commit e1047fad2c
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
View File

@@ -316,7 +316,7 @@ private class LeftToRightPostOrderNodes =
@argument_list or @array or @bare_string or @bare_symbol or @binary or @block_argument or
@break or @call or @chained_string or @delimited_symbol or @destructured_left_assignment or
@destructured_parameter or @element_reference or @exception_variable or @hash or
@hash_splat_argument or @heredoc_body or @interpolation or @left_assignment_list or @next or
@hash_splat_argument or @interpolation or @left_assignment_list or @next or
@operator_assignment or @pair or @parenthesized_statements or @range or @redo or @regex or
@rest_assignment or @retry or @return or @right_assignment_list or @scope_resolution or
@token_simple_symbol or @splat_argument or @string__ or @string_array or @subshell or
@@ -684,10 +684,7 @@ module Trees {
}
private class HeredocBeginningTree extends StandardPreOrderTree, HeredocBeginning {
final override ControlFlowTree getChildNode(int i) {
i = 0 and
result = heredoc(this)
}
final override ControlFlowTree getChildNode(int i) { result = heredoc(this).getChild(i) }
}
private class IdentifierTree extends LeafTree, Identifier { }

13
ql/test/library-tests/controlflow/graph/Cfg.expected
View File

@@ -1337,9 +1337,6 @@ cfg.rb:
# 108| <<SQL
#-----| -> call to table
# 108| (no string representation)
#-----| -> (<<SQL)
# 109| #{...}
#-----| -> call to type
@@ -1347,7 +1344,7 @@ cfg.rb:
#-----| -> #{...}
# 110| #{...}
#-----| -> (no string representation)
#-----| -> (<<SQL)
# 110| call to type
#-----| -> #{...}
@@ -2154,15 +2151,9 @@ heredoc.rb:
#-----| -> <<A
# 2| <<A
#-----| -> (no string representation)
# 2| <<A
#-----| -> (no string representation)
# 2| (no string representation)
#-----| -> <<A
# 4| (no string representation)
# 2| <<A
#-----| -> call to puts
ifs.rb: