fix(parse,e2e): Allow 'function' as an argument type (#185)

I'd accidentally allowed "as callable" (the internal name for a BrightScript function) insntead of "as function". fixes #177
sjbarag · Mar 1, 2019 · e9c7701 · e9c7701
1 parent 795efae
commit e9c7701
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 2 deletions.
diff --git a/src/brsTypes/BrsType.ts b/src/brsTypes/BrsType.ts
@@ -52,7 +52,7 @@ export namespace ValueKind {
             case "longinteger": return ValueKind.Int64;
             case "float": return ValueKind.Float;
             case "double": return ValueKind.Double;
-            case "callable": return ValueKind.Callable;
+            case "function": return ValueKind.Callable;
             case "dynamic": return ValueKind.Dynamic;
             case "void": return ValueKind.Void;
             case "<uninitialized>": return ValueKind.Uninitialized;

diff --git a/test/e2e/resources/function/expressions.brs b/test/e2e/resources/function/expressions.brs
@@ -8,7 +8,7 @@ a()
     print "immediately-invoked function expression (IIFE)"
 end sub)()
 
-function acceptsCallback(initial as integer, cb)
+function acceptsCallback(initial as integer, cb as function)
     print "pre-callback"
     cb(initial * 2)
     print "post-callback"

diff --git a/test/parser/expression/Function.test.js b/test/parser/expression/Function.test.js
@@ -285,6 +285,10 @@ describe("parser", () => {
                 identifier("count"),
                 identifier("as"),
                 identifier("integer"),
+                token(Lexeme.Comma, ","),
+                identifier("cb"),
+                identifier("as"),
+                token(Lexeme.Function, "function"),
                 token(Lexeme.RightParen, ")"),
                 token(Lexeme.Newline, "\\n"),
                 token(Lexeme.EndFunction, "end sub"),

diff --git a/test/parser/expression/__snapshots__/Function.test.js.snap b/test/parser/expression/__snapshots__/Function.test.js.snap
@@ -2256,6 +2256,49 @@ Array [
             },
           },
         },
+        Object {
+          "defaultValue": undefined,
+          "location": Object {
+            "end": Object {
+              "column": -9,
+              "line": -9,
+            },
+            "file": undefined,
+            "start": Object {
+              "column": -9,
+              "line": -9,
+            },
+          },
+          "name": Object {
+            "isReserved": false,
+            "kind": 29,
+            "literal": undefined,
+            "location": Object {
+              "end": Object {
+                "column": -9,
+                "line": -9,
+              },
+              "start": Object {
+                "column": -9,
+                "line": -9,
+              },
+            },
+            "text": "cb",
+          },
+          "type": Object {
+            "kind": 7,
+            "location": Object {
+              "end": Object {
+                "column": -9,
+                "line": -9,
+              },
+              "start": Object {
+                "column": -9,
+                "line": -9,
+              },
+            },
+          },
+        },
       ],
       "returns": 9,
     },