Skip to content

Commit 0188581

Browse files
committed
Change away from wasm prism artifact. Fix some obvious NPEs from my mass edit for byte[]
1 parent 18e107f commit 0188581

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</dependency>
7878
<dependency>
7979
<groupId>org.ruby-lang</groupId>
80-
<artifactId>prism-parser-wasm</artifactId>
80+
<artifactId>prism-parser</artifactId>
8181
<version>0.0.1-SNAPSHOT</version>
8282
</dependency>
8383
</dependencies>

src/main/java/org/jruby/prism/builder/IRBuilderPrism.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,12 +1745,13 @@ private void buildParameters(ParametersNode parameters) {
17451745

17461746

17471747
if (parameters.keyword_rest != null && parameters.keyword_rest instanceof KeywordRestParameterNode kwrest) {
1748-
RubySymbol key = symbol(kwrest.name);
1748+
RubySymbol key;
17491749
ArgumentType type;
1750-
if (key == null) {
1750+
if (kwrest.name == null) {
17511751
key = symbol(STAR_STAR);
17521752
type = ArgumentType.anonkeyrest;
17531753
} else {
1754+
key = symbol(kwrest.name);
17541755
type = ArgumentType.keyrest;
17551756
}
17561757

@@ -2088,7 +2089,7 @@ protected void receiveBlockArg(Node node) {
20882089
// reify to Proc if we have a block arg
20892090
if (blockArg != null) {
20902091
// FIXME: Handle bare '&' case?
2091-
RubySymbol name = symbol(blockArg.name) == null ? symbol(FWD_BLOCK) : symbol(blockArg.name);
2092+
RubySymbol name = blockArg.name == null ? symbol(FWD_BLOCK) : symbol(blockArg.name);
20922093
Variable blockVar = argumentResult(name);
20932094
addArgumentDescription(ArgumentType.block, name);
20942095
Variable tmp = temp();
@@ -2146,7 +2147,7 @@ protected void receiveNonBlockArgs(ParametersNode args, Variable keywords, boole
21462147

21472148
if (args.rest instanceof RestParameterNode restArg) {
21482149
// FIXME: how do we annotate generated AST types to have isAnonymous etc...
2149-
if (symbol(restArg.name) == null) {
2150+
if (restArg.name == null) {
21502151
argName = symbol("*");
21512152
addArgumentDescription(ArgumentType.anonrest, argName);
21522153
} else {

0 commit comments

Comments
 (0)