Fix bug parse error on function parameters

Fixes #111
willowtreeapps · Jun 17, 2018 · 05ecbe6 · 05ecbe6
1 parent ca077d8
commit 05ecbe6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/dist/libwist.wasm b/dist/libwist.wasm
diff --git a/src/antlr/BrightScript.g4 b/src/antlr/BrightScript.g4
@@ -201,7 +201,7 @@ baseType
     ;
 
 expressionList
-    : traversableExpression (COMMA traversableExpression)*
+    : assignableExpression (COMMA assignableExpression)*
     ;
 
 expression

diff --git a/src/cpp/parser/BrightScriptParser.cpp b/src/cpp/parser/BrightScriptParser.cpp
@@ -5307,12 +5307,12 @@ BrightScriptParser::ExpressionListContext::ExpressionListContext(ParserRuleConte
   : ParserRuleContext(parent, invokingState) {
 }
 
-std::vector<BrightScriptParser::TraversableExpressionContext *> BrightScriptParser::ExpressionListContext::traversableExpression() {
-  return getRuleContexts<BrightScriptParser::TraversableExpressionContext>();
+std::vector<BrightScriptParser::AssignableExpressionContext *> BrightScriptParser::ExpressionListContext::assignableExpression() {
+  return getRuleContexts<BrightScriptParser::AssignableExpressionContext>();
 }
 
-BrightScriptParser::TraversableExpressionContext* BrightScriptParser::ExpressionListContext::traversableExpression(size_t i) {
-  return getRuleContext<BrightScriptParser::TraversableExpressionContext>(i);
+BrightScriptParser::AssignableExpressionContext* BrightScriptParser::ExpressionListContext::assignableExpression(size_t i) {
+  return getRuleContext<BrightScriptParser::AssignableExpressionContext>(i);
 }
 
 std::vector<tree::TerminalNode *> BrightScriptParser::ExpressionListContext::COMMA() {
@@ -5359,15 +5359,15 @@ BrightScriptParser::ExpressionListContext* BrightScriptParser::expressionList()
   try {
     enterOuterAlt(_localctx, 1);
     setState(713);
-    traversableExpression();
+    assignableExpression();
     setState(718);
     _errHandler->sync(this);
     _la = _input->LA(1);
     while (_la == BrightScriptParser::COMMA) {
       setState(714);
       match(BrightScriptParser::COMMA);
       setState(715);
-      traversableExpression();
+      assignableExpression();
       setState(720);
       _errHandler->sync(this);
       _la = _input->LA(1);
@@ -5901,13 +5901,15 @@ BrightScriptParser::ExpressionContext* BrightScriptParser::expression(int preced
             | (1ULL << BrightScriptParser::CREATEOBJECT)
             | (1ULL << BrightScriptParser::EVAL)
             | (1ULL << BrightScriptParser::FALSE)
+            | (1ULL << BrightScriptParser::FUNCTION)
             | (1ULL << BrightScriptParser::GETGLOBALAA)
             | (1ULL << BrightScriptParser::GETLASTRUNCOMPILEERROR)
             | (1ULL << BrightScriptParser::GETLASTRUNRUNTIMEERROR)
             | (1ULL << BrightScriptParser::INVALID)
             | (1ULL << BrightScriptParser::NOT)
             | (1ULL << BrightScriptParser::RUN)
             | (1ULL << BrightScriptParser::STRING)
+            | (1ULL << BrightScriptParser::SUB)
             | (1ULL << BrightScriptParser::TAB)
             | (1ULL << BrightScriptParser::TRUE)
             | (1ULL << BrightScriptParser::TYPE)
@@ -6301,13 +6303,15 @@ BrightScriptParser::GlobalFunctionInvocationContext* BrightScriptParser::globalF
       | (1ULL << BrightScriptParser::CREATEOBJECT)
       | (1ULL << BrightScriptParser::EVAL)
       | (1ULL << BrightScriptParser::FALSE)
+      | (1ULL << BrightScriptParser::FUNCTION)
       | (1ULL << BrightScriptParser::GETGLOBALAA)
       | (1ULL << BrightScriptParser::GETLASTRUNCOMPILEERROR)
       | (1ULL << BrightScriptParser::GETLASTRUNRUNTIMEERROR)
       | (1ULL << BrightScriptParser::INVALID)
       | (1ULL << BrightScriptParser::NOT)
       | (1ULL << BrightScriptParser::RUN)
       | (1ULL << BrightScriptParser::STRING)
+      | (1ULL << BrightScriptParser::SUB)
       | (1ULL << BrightScriptParser::TAB)
       | (1ULL << BrightScriptParser::TRUE)
       | (1ULL << BrightScriptParser::TYPE)
@@ -8220,8 +8224,8 @@ BrightScriptParser::Initializer::Initializer() {
     0x2c6, 0x7, 0x4, 0x2, 0x2, 0x2c6, 0x2c8, 0x5, 0x54, 0x2b, 0x2, 0x2c7, 
     0x2c5, 0x3, 0x2, 0x2, 0x2, 0x2c7, 0x2c8, 0x3, 0x2, 0x2, 0x2, 0x2c8, 
     0x53, 0x3, 0x2, 0x2, 0x2, 0x2c9, 0x2ca, 0x9, 0x3, 0x2, 0x2, 0x2ca, 0x55, 
-    0x3, 0x2, 0x2, 0x2, 0x2cb, 0x2d0, 0x5, 0x5a, 0x2e, 0x2, 0x2cc, 0x2cd, 
-    0x7, 0x56, 0x2, 0x2, 0x2cd, 0x2cf, 0x5, 0x5a, 0x2e, 0x2, 0x2ce, 0x2cc, 
+    0x3, 0x2, 0x2, 0x2, 0x2cb, 0x2d0, 0x5, 0x5c, 0x2f, 0x2, 0x2cc, 0x2cd, 
+    0x7, 0x56, 0x2, 0x2, 0x2cd, 0x2cf, 0x5, 0x5c, 0x2f, 0x2, 0x2ce, 0x2cc, 
     0x3, 0x2, 0x2, 0x2, 0x2cf, 0x2d2, 0x3, 0x2, 0x2, 0x2, 0x2d0, 0x2ce, 
     0x3, 0x2, 0x2, 0x2, 0x2d0, 0x2d1, 0x3, 0x2, 0x2, 0x2, 0x2d1, 0x57, 0x3, 
     0x2, 0x2, 0x2, 0x2d2, 0x2d0, 0x3, 0x2, 0x2, 0x2, 0x2d3, 0x2d4, 0x8, 

diff --git a/src/cpp/parser/BrightScriptParser.h b/src/cpp/parser/BrightScriptParser.h
@@ -992,8 +992,8 @@ class  BrightScriptParser : public antlr4::Parser {
   public:
     ExpressionListContext(antlr4::ParserRuleContext *parent, size_t invokingState);
     virtual size_t getRuleIndex() const override;
-    std::vector<TraversableExpressionContext *> traversableExpression();
-    TraversableExpressionContext* traversableExpression(size_t i);
+    std::vector<AssignableExpressionContext *> assignableExpression();
+    AssignableExpressionContext* assignableExpression(size_t i);
     std::vector<antlr4::tree::TerminalNode *> COMMA();
     antlr4::tree::TerminalNode* COMMA(size_t i);
 

diff --git a/test/regression/111.brs b/test/regression/111.brs
@@ -0,0 +1,5 @@
+sub buOptionalTests()
+    res = optional.ifPresent(function(value) as Integer 'parse error
+        return value + 1
+     end function)
+end sub