Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[c#] Type Node Pass #4401

Merged
merged 2 commits into from
Mar 26, 2024
Merged

[c#] Type Node Pass #4401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
239ccb4
[c#] Type Node Pass
DavidBakerEffendi Mar 26, 2024
373f15e
Fixed test
DavidBakerEffendi Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion joern-cli/frontends/csharpsrc2cpg/src/main/scala/io/joern/csharpsrc2cpg/CSharpSrc2Cpg.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import io.joern.x2cpg.X2Cpg.withNewEmptyCpg
import io.joern.x2cpg.astgen.AstGenRunner.AstGenRunnerResult
import io.joern.x2cpg.astgen.ParserResult
import io.joern.x2cpg.passes.callgraph.NaiveCallLinker
import io.joern.x2cpg.passes.frontend.MetaDataPass
import io.joern.x2cpg.passes.frontend.{MetaDataPass, TypeNodePass}
import io.joern.x2cpg.utils.{ConcurrentTaskUtil, Environment, HashUtil, Report}
import io.joern.x2cpg.{SourceFiles, X2CpgFrontend}
import io.shiftleft.codepropertygraph.Cpg
Expand Down Expand Up @@ -56,6 +56,7 @@ class CSharpSrc2Cpg extends X2CpgFrontend[Config] {
internalProgramSummary
}
new AstCreationPass(cpg, astCreators.map(_.withSummary(programSummary)), report).createAndApply()
TypeNodePass.withTypesFromCpg(cpg).createAndApply()
report.print()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...nds/csharpsrc2cpg/src/test/scala/io/joern/csharpsrc2cpg/querying/ast/NamespaceTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class NamespaceTests extends CSharpCode2CpgFixture {

"assign appropriate AST parent for both classes" in {
val List(fooNamespace) = cpg.namespaceBlock.nameExact("Foo").l
val List(bar, baz) = cpg.typeDecl.l
val List(bar, baz) = cpg.typeDecl.name("Ba.*").l
bar.astParent shouldBe fooNamespace
baz.astParent shouldBe fooNamespace

Expand Down