Skip to content

Parse Function arity without throwing exceptions #2694

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.

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

Merged
merged 1 commit into from
Jun 7, 2017
Merged
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions compiler/src/dotty/tools/dotc/core/NameOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,13 @@ object NameOps {

/** Parsed function arity for function with some specific prefix */
private def functionArityFor(prefix: String): Int = {
if (name.startsWith(prefix))
try name.toString.substring(prefix.length).toInt
catch { case _: NumberFormatException => -1 }
else -1
if (name.startsWith(prefix)) {
val suffix = name.toString.substring(prefix.length)
if (suffix.matches("\\d+"))
suffix.toInt
else
-1
} else -1
}

/** The name of the generic runtime operation corresponding to an array operation */
Expand Down