Skip to content

Commit 6eb9c98

Browse files
committed
Tweak CheckStyle rule so it only considers argument variables
1 parent 146348d commit 6eb9c98

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

src/main/.checkstyle_checks.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
<property name="message" value="Don't use transferToInterpreterOnException"/>
209209
</module>
210210
<module name="RegexpSinglelineJava">
211-
<property name="format" value='"isRuby(?!Value|DynamicObject|SymbolOrString|Rational|Range|[^"]+\|\|)'/> <!-- Rational is not a builtin type -->
211+
<property name="format" value='"isRuby(?!Value|DynamicObject|SymbolOrString|Rational|Range|[^"]+\|\|)\w+\(\w+\)'/> <!-- Rational is not a builtin type -->
212212
<property name="message" value="Type the argument instead of using a positive isRuby* guard."/>
213213
</module>
214214
<module name="RegexpSinglelineJava">

src/main/java/org/truffleruby/core/module/ModuleNodes.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,9 +1235,7 @@ private void warnAlreadyInitializedConstant(RubyModule module, String name,
12351235
@ImportStatic(RubyArguments.class)
12361236
public abstract static class DefineMethodNode extends AlwaysInlinedMethodNode {
12371237

1238-
//Checkstyle: stop
12391238
@Specialization(guards = { "isMethodParameterProvided(rubyArgs)", "isRubyMethod(getArgument(rubyArgs, 1))" })
1240-
//Checkstyle: resume
12411239
protected RubySymbol defineMethodWithMethod(
12421240
Frame callerFrame, RubyModule module, Object[] rubyArgs, RootCallTarget target,
12431241
@Cached NameToJavaStringNode nameToJavaStringNode) {
@@ -1247,9 +1245,7 @@ protected RubySymbol defineMethodWithMethod(
12471245
return addMethod(module, name, (RubyMethod) method);
12481246
}
12491247

1250-
//Checkstyle: stop
12511248
@Specialization(guards = { "isMethodParameterProvided(rubyArgs)", "isRubyProc(getArgument(rubyArgs, 1))" })
1252-
//Checkstyle: resume
12531249
protected RubySymbol defineMethodWithProc(
12541250
Frame callerFrame, RubyModule module, Object[] rubyArgs, RootCallTarget target,
12551251
@Cached NameToJavaStringNode nameToJavaStringNode) {
@@ -1260,10 +1256,8 @@ protected RubySymbol defineMethodWithProc(
12601256
return addProc(module, name, (RubyProc) method, callerFrame.materialize());
12611257
}
12621258

1263-
//Checkstyle: stop
12641259
@Specialization(
12651260
guards = { "isMethodParameterProvided(rubyArgs)", "isRubyUnboundMethod(getArgument(rubyArgs, 1))" })
1266-
//Checkstyle: resume
12671261
protected RubySymbol defineMethodWithUnboundMethod(
12681262
Frame callerFrame, RubyModule module, Object[] rubyArgs, RootCallTarget target,
12691263
@Cached NameToJavaStringNode nameToJavaStringNode) {

0 commit comments

Comments
 (0)