Fix Painless void return bug (elastic#38046)

Painless now allows void functions and contexts to with a void return type to use a return statement without a following expression.
jdconrad · Jan 31, 2019 · ab49681 · ab49681
1 parent e73140e
commit ab49681
Show file tree

Hide file tree

Showing 5 changed files with 535 additions and 461 deletions.
diff --git a/modules/lang-painless/src/main/antlr/PainlessParser.g4 b/modules/lang-painless/src/main/antlr/PainlessParser.g4
@@ -55,7 +55,7 @@ dstatement
     | declaration                     # decl
     | CONTINUE                        # continue
     | BREAK                           # break
-    | RETURN expression               # return
+    | RETURN expression?              # return
     | THROW expression                # throw
     | expression                      # expr
     ;