From f9ee8960c7b66a742a9c21c07f9fb2e85f4252a6 Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Thu, 10 Jul 2014 21:12:26 +0400 Subject: [PATCH] Move fatal from parser.c to lexer.c. --- src/libjsparser/lexer.c | 13 ++++++++++--- src/libjsparser/lexer.h | 4 +++- src/libjsparser/parser.c | 14 -------------- src/main.c | 3 --- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/libjsparser/lexer.c b/src/libjsparser/lexer.c index 312e1e14d..716ccc29e 100644 --- a/src/libjsparser/lexer.c +++ b/src/libjsparser/lexer.c @@ -14,15 +14,13 @@ */ #include "allocator.h" +#include "globals.h" #include "jerry-libc.h" #include "lexer.h" static token saved_token; static token empty_token = { .type = TOK_EMPTY, .data.none = NULL }; -/* FIXME: Make general fatal function call it from libjsparser's fatal */ -extern void fatal(int); - typedef struct { const char *str; @@ -809,3 +807,12 @@ lexer_dump_buffer_state (void) __printf ("%s\n", buffer); } +void +fatal (int code) +{ + __printf ("FATAL: %d\n", code); + lexer_dump_buffer_state (); + JERRY_UNREACHABLE (); + __exit( -code); +} + diff --git a/src/libjsparser/lexer.h b/src/libjsparser/lexer.h index ee3893e0d..b7061abbd 100644 --- a/src/libjsparser/lexer.h +++ b/src/libjsparser/lexer.h @@ -161,4 +161,6 @@ void lexer_save_token (token); void lexer_dump_buffer_state (void); -#endif \ No newline at end of file +void fatal(int); + +#endif diff --git a/src/libjsparser/parser.c b/src/libjsparser/parser.c index 88955be1a..2a81b46a0 100644 --- a/src/libjsparser/parser.c +++ b/src/libjsparser/parser.c @@ -17,20 +17,6 @@ #include "lexer.h" #include "parser.h" -extern void lexer_dump_buffer_state(void); - -/* FIXME: Make general fatal function call it from libjsparser's fatal */ -extern void fatal(int); - -void -fatal (int code) -{ - __printf ("FATAL: %d\n", code); - lexer_dump_buffer_state (); - JERRY_UNREACHABLE (); - __exit( -code); -} - bool is_formal_parameter_list_empty (formal_parameter_list list) { diff --git a/src/main.c b/src/main.c index 292e1d7d2..580236928 100644 --- a/src/main.c +++ b/src/main.c @@ -32,9 +32,6 @@ #include "parser.h" #include "pretty-printer.h" -/* FIXME: Make general fatal function call it from libjsparser's fatal */ -extern void fatal(int); - void fake_exit (void); void