retoor/wren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorganize trailing comma code a bit.

Browse Source 
- Split out syntax error tests.
- Avoid redundant handling of empty literals.
This commit is contained in:
Bob Nystrom
2015-08-31 07:23:36 -07:00
parent d7eed08774
commit 2b044666ee
12 changed files with 82 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm/wren_compiler.c
+30 -34
View File
@@ -1809,27 +1809,26 @@ static void list(Compiler* compiler, bool allowAssignment)
// Instantiate a new list.
callMethod(compiler, 0, "new()", 5);
ignoreNewlines(compiler);
// Compile the list elements. Each one compiles to a ".add()" call.
if (peek(compiler) != TOKEN_RIGHT_BRACKET)
do
{
do
{
ignoreNewlines(compiler);
ignoreNewlines(compiler);
// List with trailing comma.
if (peek(compiler) == TOKEN_RIGHT_BRACKET) break;
// Stop if we hit the end of the list.
if (peek(compiler) == TOKEN_RIGHT_BRACKET) break;
// Push a copy of the list since the add() call will consume it.
emit(compiler, CODE_DUP);
// Push a copy of the list since the add() call will consume it.
emit(compiler, CODE_DUP);
// The element.
expression(compiler);
callMethod(compiler, 1, "add(_)", 6);
// The element.
expression(compiler);
callMethod(compiler, 1, "add(_)", 6);
// Discard the result of the add() call.
emit(compiler, CODE_POP);
} while (match(compiler, TOKEN_COMMA));
}
// Discard the result of the add() call.
emit(compiler, CODE_POP);
} while (match(compiler, TOKEN_COMMA));
// Allow newlines before the closing ']'.
ignoreNewlines(compiler);
@@ -1850,31 +1849,28 @@ static void map(Compiler* compiler, bool allowAssignment)
// Compile the map elements. Each one is compiled to just invoke the
// subscript setter on the map.
if (peek(compiler) != TOKEN_RIGHT_BRACE)
do
{
do
{
ignoreNewlines(compiler);
ignoreNewlines(compiler);
// Map with trailing comma.
if (peek(compiler) == TOKEN_RIGHT_BRACE) break;
// Stop if we hit the end of the map.
if (peek(compiler) == TOKEN_RIGHT_BRACE) break;
// Push a copy of the map since the subscript call will consume it.
emit(compiler, CODE_DUP);
// Push a copy of the map since the subscript call will consume it.
emit(compiler, CODE_DUP);
// The key.
parsePrecedence(compiler, false, PREC_PRIMARY);
consume(compiler, TOKEN_COLON, "Expect ':' after map key.");
// The key.
parsePrecedence(compiler, false, PREC_PRIMARY);
consume(compiler, TOKEN_COLON, "Expect ':' after map key.");
ignoreNewlines(compiler);
// The value.
expression(compiler);
// The value.
expression(compiler);
callMethod(compiler, 2, "[_]=(_)", 7);
callMethod(compiler, 2, "[_]=(_)", 7);
// Discard the result of the setter call.
emit(compiler, CODE_POP);
} while (match(compiler, TOKEN_COMMA));
}
// Discard the result of the setter call.
emit(compiler, CODE_POP);
} while (match(compiler, TOKEN_COMMA));
// Allow newlines before the closing '}'.
ignoreNewlines(compiler);