fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-08 12:28:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[scan] Add error reporting to the scanner

Browse source 
The canner now returs error tokens when strings or comments are not correctly
terminated.
This commit is contained in:
Charlie Brej 2009-06-23 14:06:30 +01:00 • committed by Ray Strode
parent 6257228266
commit 6f307ed7b4
2 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/plugins/splash/script/ply-scan.c
View file

@ -54,6 +54,7 @@ void ply_scan_token_clean(ply_scan_token_t* token)
case PLY_SCAN_TOKEN_TYPE_INTEGER:
case PLY_SCAN_TOKEN_TYPE_FLOAT:
case PLY_SCAN_TOKEN_TYPE_SYMBOL:
case PLY_SCAN_TOKEN_TYPE_ERROR:
break;
case PLY_SCAN_TOKEN_TYPE_IDENTIFIER:
case PLY_SCAN_TOKEN_TYPE_STRING:
@ -106,33 +107,40 @@ void ply_scan_read_next_token(ply_scan_t* scan, ply_scan_token_t* token)
token->whitespace = 0;
while(true){
if (curchar == ' ') {curchar = ply_scan_get_next_char(scan); token->whitespace++; continue;}
if (curchar == ' ') {curchar = ply_scan_get_next_char(scan); token->whitespace++; continue;} //FIXME restrcuture
if (curchar == '\n') {curchar = ply_scan_get_next_char(scan); token->whitespace++; continue;}
if (curchar == '\t') {curchar = ply_scan_get_next_char(scan); token->whitespace++; continue;}
break;
}
nextchar = ply_scan_get_next_char(scan);
if (ply_bitarray_lookup(scan->identifier_1st_char, curchar)){
token->type = PLY_SCAN_TOKEN_TYPE_IDENTIFIER;
int index = 0;
token->data.string = NULL;
do {
int index = 1;
token->data.string = malloc(2*sizeof(char));
token->data.string[0] = curchar;
token->data.string[1] = '\0';
curchar = nextchar;
while (ply_bitarray_lookup(scan->identifier_nth_char, curchar)){
token->data.string = realloc(token->data.string, (index+2)*sizeof(char));
token->data.string[index] = curchar;
token->data.string[index+1] = '\0';
index++;
curchar = ply_scan_get_next_char(scan);
}
while (ply_bitarray_lookup(scan->identifier_nth_char, curchar));
return;
}
if (curchar >= '0' && curchar <= '9'){
long long int int_value = 0;
do {
long long int int_value = curchar - '0';
curchar = nextchar;
while (curchar >= '0' && curchar <= '9') {
int_value *= 10;
int_value += curchar - '0';
curchar = ply_scan_get_next_char(scan);
}
while (curchar >= '0' && curchar <= '9');
if (curchar == '.'){
double floatpoint = int_value;
@ -159,16 +167,24 @@ void ply_scan_read_next_token(ply_scan_t* scan, ply_scan_token_t* token)
return;
}
if (curchar == '"') {
if (curchar == '\"') {
token->type = PLY_SCAN_TOKEN_TYPE_STRING;
int index = 0;
token->data.string = malloc(sizeof(char));
token->data.string[0] = '\0';
curchar = nextchar;
while (1){
curchar = ply_scan_get_next_char(scan);
if (curchar == '"') break;
assert(curchar != '\0');
while (curchar != '\"'){
if (curchar == '\0') {
token->data.string = "End of file before end of string";
token->type = PLY_SCAN_TOKEN_TYPE_ERROR;
return;
}
if (curchar == '\n') {
token->data.string = "Line terminator before end of string";
token->type = PLY_SCAN_TOKEN_TYPE_ERROR;
return;
}
if (curchar == '\\') {
curchar = ply_scan_get_next_char(scan);
switch (curchar){
@ -189,13 +205,12 @@ void ply_scan_read_next_token(ply_scan_t* scan, ply_scan_token_t* token)
token->data.string[index] = curchar;
token->data.string[index+1] = '\0';
index++;
curchar = ply_scan_get_next_char(scan);
}
ply_scan_get_next_char(scan);
return;
}
nextchar = ply_scan_get_next_char(scan);
{
bool linecomment = false;
if (curchar == '#') linecomment = true;
@ -228,6 +243,13 @@ void ply_scan_read_next_token(ply_scan_t* scan, ply_scan_token_t* token)
nextchar = ply_scan_get_next_char(scan);
while (true){
if (nextchar == '\0') {
free(token->data.string);
token->data.string = "End of file before end of comment";
token->type = PLY_SCAN_TOKEN_TYPE_ERROR;
return;
}
if (curchar == '/' && nextchar == '*') {
depth++;
}

1
src/plugins/splash/script/ply-scan.h
View file

@ -14,6 +14,7 @@ typedef enum
PLY_SCAN_TOKEN_TYPE_STRING,
PLY_SCAN_TOKEN_TYPE_SYMBOL,
PLY_SCAN_TOKEN_TYPE_COMMENT,
PLY_SCAN_TOKEN_TYPE_ERROR,
} ply_scan_token_type_t;
typedef struct