[ruby] Begin, Rescue, Ensure (Try-Catch Statements) AST creator changes #3927 #3976
Conversation
|
|
||
| // Helper for nil literals to put in empty clauses | ||
| protected def astForNilLiteral: Ast = Ast(NewLiteral().code("nil").typeFullName(getBuiltInType(Defines.NilClass))) | ||
| protected def astForNilBlock: Ast = blockAst(NewBlock(), List(astForNilLiteral)) |
There was a problem hiding this comment.
There is a blockNode(RubyNode) method that uses the node info for code/location information. Maybe this can accept an Option[RubyNode] then you can node.map(blockNode).getOrElse(NewBlock())
There was a problem hiding this comment.
This takes inspiration from how the if expression is handled, as they insert a nil there. As long as dataflow can interpret an empty block as a nil value, then that logic is probably not necesary.
| val rescueBodies = node.rescueClauses.map(rescue => astForStatementList(rescue.asStatementList)) | ||
| val elseClause = node.elseClause.map(_.asStatementList).map(astForStatementList) | ||
| val ensureClause = node.ensureClause.map(_.asStatementList).map(astForStatementList) | ||
| controlStructureAst() |
There was a problem hiding this comment.
Don't forget to populate the params here when you start testing :)
badly-drawn-wizards
force-pushed
the
reuben/rubysrc2cpg/ruby-begin-rescue-ast-creator
branch
from
5597df7 to
ec5dab7
Compare
| @@ -254,4 +252,37 @@ class ControlStructureTests extends RubyCode2CpgFixture { | |||
| putsHi.lineNumber shouldBe Some(2) | |||
| } | |||
|
|
|||
| "`begin ... rescue ... end is represented by a `TRY` CONTROL_STRUCTURE node" in { | |||
| val cpg = code(""" | |||
There was a problem hiding this comment.
I think add multiple statements in at least one of these blocks to ensure they're correctly grouped for multiple lines and then I'd ship this and put the exception assignment handling in a new issue at lower priority.
There was a problem hiding this comment.
Ah yes, and a merge with master appears to be necessary
max-leuthaeuser
deleted the
reuben/rubysrc2cpg/ruby-begin-rescue-ast-creator
branch
Continuation of the prior PR on the intermediate AST to make the corresponding changes for the AST creator.