Skip to content

[pysrc2cpg] Fix tab handling in parser grammar. #5703

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −1
Open

[pysrc2cpg] Fix tab handling in parser grammar. #5703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion joern-cli/frontends/pysrc2cpg/pythonGrammar.jj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,13 @@ SPECIAL_TOKEN: {

<INDENT_CHECK> SKIP: {
<INDENT_CHECK_SPACE: " "> { currentIndent += 1; }
| <INDENT_CHECK_TAB: "\t"> { currentIndent = currentIndent / 8 + 8; }
| <INDENT_CHECK_TAB: "\t"> {
// The "/ 8 * 8" rounds down to the closest multiple of 8.
// This is needed to handle python 2 mixed space and tab use cases
// where tab is not strictly counted as 8 spaces but rather adds the
// amount of spaces to get to the next multiple of 8.
currentIndent = currentIndent / 8 * 8 + 8;
}
| <INDENT_CHECK_NEWLINE: "\n" | "\r"> { currentIndent = 0; }
| <INDENT_CHECK_END_OF_MEDIUM: "\u0019">
| <INDENT_CHECK_END: ~[]> {
Expand Down
1 change: 1 addition & 0 deletions joern-cli/frontends/pysrc2cpg/src/test/scala/io/joern/pythonparser/ParserTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ class ParserTests extends AnyFreeSpec with Matchers {
| z = (x,y)
|a""".stripMargin
)
testT("def init():\n\tmatch x:\n\t\tcase 'C':\n\t\t\tz = 1")
}

"explicit line joining tests" in {
Expand Down
Loading