@@ -78,7 +78,7 @@ static ArenaLL arguments(Parser *parser);
78
78
79
79
static void handle_parse_err (Parser * parser , char * msg , ParseErrorType pet );
80
80
81
- static ParseError * new_parse_error (Arena * arena , char * msg , Token * failed , ParseErrorType pet )
81
+ static ParseError * parse_error_new (Arena * arena , char * msg , Token * failed , ParseErrorType pet )
82
82
{
83
83
ParseError * error = m_arena_alloc_struct (arena , ParseError );
84
84
error -> err_type = pet ;
@@ -220,7 +220,7 @@ static void handle_parse_err(Parser *parser, char *msg, ParseErrorType pet)
220
220
if ((failed -> type == t_eof || failed -> type == t_newline ) && parser -> token_pos != 0 )
221
221
failed = arraylist_get (parser -> tokens , parser -> token_pos - 1 );
222
222
223
- ParseError * error = new_parse_error (parser -> ast_arena , msg , failed , pet );
223
+ ParseError * error = parse_error_new (parser -> ast_arena , msg , failed , pet );
224
224
if (parser -> perr_head == NULL )
225
225
parser -> perr_head = error ;
226
226
else
@@ -834,11 +834,10 @@ static Expr *list(Parser *parser)
834
834
ListExpr * expr = (ListExpr * )expr_alloc (parser -> ast_arena , EXPR_LIST , parser -> source_line );
835
835
836
836
/* if next is not ']', parse list initializer */
837
- if (!match (parser , t_rbracket )) {
837
+ if (!match (parser , t_rbracket ))
838
838
expr -> exprs = sequence (parser , t_rbracket );
839
- } else {
839
+ else
840
840
expr -> exprs = NULL ;
841
- }
842
841
843
842
return (Expr * )expr ;
844
843
}
@@ -858,11 +857,13 @@ static Expr *map(Parser *parser)
858
857
do {
859
858
KeyValuePair * pair = m_arena_alloc_struct (parser -> ast_arena , KeyValuePair );
860
859
pair -> key = expression (parser );
861
- consume (parser , t_colon , "Expected colon ':' to denote value for key in map expression" );
860
+ consume (parser , t_colon , "Expected ':' to denote value for key in map expression" );
862
861
pair -> value = expression (parser );
863
862
arena_ll_append (expr -> key_value_pairs , pair );
863
+ ignore (parser , t_newline );
864
864
if (!match (parser , t_comma ))
865
865
break ;
866
+ ignore (parser , t_newline );
866
867
} while (!check (parser , t_rbracket ));
867
868
868
869
consume (parser , t_rbracket , "Expected ']' to terminate map" );
0 commit comments