Merge branch 'master' into api

2015-12-23 09:22:49 -08:00
parent 6f3077d582 1ebc711c30
commit b7e62926ab
3 changed files with 30 additions and 1 deletions
@@ -1987,7 +1987,7 @@ static void map(Compiler* compiler, bool allowAssignment)
    if (peek(compiler) == TOKEN_RIGHT_BRACE) break;

    // The key.
-    parsePrecedence(compiler, false, PREC_PRIMARY);
+    parsePrecedence(compiler, false, PREC_UNARY);
    consume(compiler, TOKEN_COLON, "Expect ':' after map key.");
    ignoreNewlines(compiler);