YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove inclusion of std headers to our headers; move fatal from src/error.h to src/libjsparser/parser.c.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-07-10 17:10:50 +04:00
parent c132f6aa3c
commit 76e579d4e1
17 changed files with 263 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libjsparser/lexer.c
+30 -28
View File
@@ -13,13 +13,15 @@
* limitations under the License.
*/
#include "error.h"
#include "jerry-libc.h"
#include "lexer.h"
#include "mappings.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;
@@ -117,7 +119,7 @@ get_char (size_t i)
if (error == 0)
return '\0';
if (error < BUFFER_SIZE)
memset (buffer + error, '\0', BUFFER_SIZE - error);
__memset (buffer + error, '\0', BUFFER_SIZE - error);
buffer_start = buffer;
}
@@ -141,7 +143,7 @@ get_char (size_t i)
if (error == 0)
return '\0';
if (error < BUFFER_SIZE - tail_size - token_size)
memset (buffer + tail_size + error, '\0',
__memset (buffer + tail_size + error, '\0',
BUFFER_SIZE - tail_size - token_size - error);
}
else
@@ -152,7 +154,7 @@ get_char (size_t i)
if (error == 0)
return '\0';
if (error < BUFFER_SIZE - tail_size)
memset (buffer + tail_size + error, '\0', BUFFER_SIZE - tail_size - error);
__memset (buffer + tail_size + error, '\0', BUFFER_SIZE - tail_size - error);
}
}
@@ -182,7 +184,7 @@ decode_keyword (void)
for (i = 0; i < size; i++)
{
if (!strncmp (keyword_tokens[i].str, token_start, strlen (keyword_tokens[i].str)))
if (!__strncmp (keyword_tokens[i].str, token_start, __strlen (keyword_tokens[i].str)))
return keyword_tokens[i].tok;
}
@@ -196,7 +198,7 @@ convert_seen_name_to_token (void)
for (i = 0; i < seen_names_num; i++)
{
if (!strncmp (seen_names[i].str, token_start, strlen (seen_names[i].str)))
if (!__strncmp (seen_names[i].str, token_start, __strlen (seen_names[i].str)))
return seen_names[i].tok;
}
@@ -233,7 +235,7 @@ current_token (void)
JERRY_ASSERT (token_start <= buffer);
size_t length = (size_t) (buffer - token_start);
char *res = (char *) malloc (length + 1);
strncpy (res, token_start, length);
__strncpy (res, token_start, length);
res[length] = '\0';
token_start = NULL;
return res;
@@ -278,11 +280,11 @@ static token
parse_name (void)
{
char c = LA (0);
bool every_char_islower = islower (c);
bool every_char_islower = __islower (c);
const char *string = NULL;
token known_token = empty_token;
JERRY_ASSERT (isalpha (c) || c == '$' || c == '_');
JERRY_ASSERT (__isalpha (c) || c == '$' || c == '_');
new_token ();
consume_char ();
@@ -291,9 +293,9 @@ parse_name (void)
c = LA (0);
if (c == '\0')
c = c;
if (!isalpha (c) && !isdigit (c) && c != '$' && c != '_')
if (!__isalpha (c) && !__isdigit (c) && c != '$' && c != '_')
break;
if (every_char_islower && (!islower (c)))
if (every_char_islower && (!__islower (c)))
every_char_islower = false;
consume_char ();
}
@@ -366,7 +368,7 @@ parse_number (void)
size_t tok_length = 0, i;
int res = 0;
JERRY_ASSERT (isdigit (c) || c == '.');
JERRY_ASSERT (__isdigit (c) || c == '.');
if (c == '0')
if (LA (1) == 'x' || LA (1) == 'X')
@@ -374,7 +376,7 @@ parse_number (void)
if (c == '.')
{
JERRY_ASSERT (!isalpha (LA (1)));
JERRY_ASSERT (!__isalpha (LA (1)));
is_fp = true;
}
@@ -387,12 +389,12 @@ parse_number (void)
while (true)
{
c = LA (0);
if (!isxdigit (c))
if (!__isxdigit (c))
break;
consume_char ();
}
if (isalpha (c) || c == '_' || c == '$')
if (__isalpha (c) || c == '_' || c == '$')
fatal (ERR_INT_LITERAL);
tok_length = (size_t) (buffer - token_start);
@@ -422,7 +424,7 @@ parse_number (void)
if (c == '.')
{
if (isalpha (LA (1)) || LA (1) == '_' || LA (1) == '$')
if (__isalpha (LA (1)) || LA (1) == '_' || LA (1) == '$')
fatal (ERR_INT_LITERAL);
is_fp = true;
consume_char ();
@@ -433,17 +435,17 @@ parse_number (void)
{
if (LA (1) == '-' || LA (1) == '+')
consume_char ();
if (!isdigit (LA (1)))
if (!__isdigit (LA (1)))
fatal (ERR_INT_LITERAL);
is_exp = true;
consume_char ();
continue;
}
if (isalpha (c) || c == '_' || c == '$')
if (__isalpha (c) || c == '_' || c == '$')
fatal (ERR_INT_LITERAL);
if (!isdigit (c))
if (!__isdigit (c))
break;
consume_char ();
@@ -451,7 +453,7 @@ parse_number (void)
if (is_fp || is_exp)
{
float res = strtof (token_start, NULL);
float res = __strtof (token_start, NULL);
token_start = NULL;
return (token) { .type = TOK_FLOAT, .data.fp_num = res };
}
@@ -512,7 +514,7 @@ parse_string (void)
if (c == '\\')
{
/* Only single escape character is allowed. */
if (LA (1) == 'x' || LA (1) == 'u' || isdigit (LA (1)))
if (LA (1) == 'x' || LA (1) == 'u' || __isdigit (LA (1)))
fatal (ERR_STRING);
if ((LA (1) == '\'' && !is_double_quoted)
|| (LA (1) == '"' && is_double_quoted)
@@ -553,7 +555,7 @@ parse_string (void)
index++;
}
memset (index, '\0', length - (size_t) (index - tok));
__memset (index, '\0', length - (index - tok));
token_start = NULL;
// Eat up '"'
@@ -571,7 +573,7 @@ grobble_whitespaces (void)
{
char c = LA (0);
while ((isspace (c) && c != '\n') || c == '\0')
while ((__isspace (c) && c != '\n') || c == '\0')
{
consume_char ();
c = LA (0);
@@ -653,10 +655,10 @@ lexer_next_token (void)
JERRY_ASSERT (token_start == NULL);
if (isalpha (c) || c == '$' || c == '_')
if (__isalpha (c) || c == '$' || c == '_')
return parse_name ();
if (isdigit (c) || (c == '.' && isdigit (LA (1))))
if (__isdigit (c) || (c == '.' && __isdigit (LA (1))))
return parse_number ();
if (c == '\n')
@@ -671,7 +673,7 @@ lexer_next_token (void)
if (c == '\'' || c == '"')
return parse_string ();
if (isspace (c))
if (__isspace (c))
{
grobble_whitespaces ();
return
@@ -803,5 +805,5 @@ lexer_save_token (token tok)
void
lexer_dump_buffer_state (void)
{
printf ("%s\n", buffer);
__printf ("%s\n", buffer);
}
src/libjsparser/lexer.h
+1 -1
View File
@@ -16,7 +16,7 @@
#ifndef LEXER_H
#define LEXER_H
#include "mappings.h"
#include "globals.h"
/* Keywords. */
typedef enum
src/libjsparser/mappings.h
-139
View File
@@ -1,139 +0,0 @@
/* Copyright 2014 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef MAPPINGS_H
#define MAPPINGS_H
#ifndef __HOST
#include "jerry-libc.h"
#include "allocator.h"
#include <stdarg.h>
static inline void *
memset (void *s, int n1, size_t n2)
{
return __memset (s, n1, n2);
}
static inline int
memcmp (const void *s1, const void *s2, size_t n)
{
return __memcmp (s1, s2, n);
}
static inline void *
memcpy (void *s1, const void *s2, size_t n)
{
return __memcpy (s1, s2, n);
}
static inline int
printf (const char *s, ...)
{
va_list args;
va_start (args, s);
int ret = __printf (s, args);
va_end (args);
return ret;
}
static inline int
putchar (int c)
{
return __putchar (c);
}
static inline void
exit (int status)
{
__exit (status);
}
static inline int
strcmp (const char *s1, const char *s2)
{
return __strcmp (s1, s2);
}
static inline int
strncmp (const char *s1, const char *s2, size_t n)
{
return __strncmp (s1, s2, n);
}
static inline char *
strncpy (char *s1, const char *s2, size_t n)
{
return __strncpy (s1, s2, n);
}
static inline float
strtof (const char *s1, char **s2)
{
return __strtof (s1, s2);
}
static inline size_t
strlen (const char *s)
{
return __strlen (s);
}
static inline int
isspace (int s)
{
return __isspace (s);
}
static inline int
isupper (int s)
{
return __isupper (s);
}
static inline int
islower (int s)
{
return __islower (s);
}
static inline int
isalpha (int s)
{
return __isalpha (s);
}
static inline int
isdigit (int s)
{
return __isdigit (s);
}
static inline int
isxdigit (int s)
{
return __isxdigit (s);
}
#else
#undef NULL
#include "../globals.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#endif
#endif // MAPPINGS_H
src/libjsparser/parser.c
+7 -7
View File
@@ -13,20 +13,20 @@
* limitations under the License.
*/
#include "parser.h"
#include "error.h"
#include "jerry-libc.h"
#include "lexer.h"
#include "error.h"
extern void lexer_dump_buffer_state (void);
#include "parser.h"
/* FIXME: */
extern void lexer_dump_buffer_state();
/* FIXME: Make general fatal function call it from libjsparser's fatal */
void
fatal (int code)
{
printf ("FATAL: %d\n", code);
__printf ("FATAL: %d\n", code);
lexer_dump_buffer_state ();
JERRY_UNREACHABLE ();
exit (code);
__exit( -code);
}
bool
src/libjsparser/parser.h
+1 -1
View File
@@ -16,7 +16,7 @@
#ifndef PARSER_H
#define PARSER_H
#include "mappings.h"
#include "globals.h"
struct source_element_list;
struct statement_list;