cadey
/
platypus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FLOATING POINT AND EVERYTHING WORKS EXCEPT NON-CLOSING STRING AT END OF FILE

This commit is contained in:
Victor Fernandes 2017-03-18 19:53:58 -04:00
parent d3c6197b7e
commit f22d0d87df
1 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
scanner.c
View File

@ -190,42 +190,39 @@ Token malar_next_token(Buffer * sc_buf)
lexstart = b_mark(sc_buf); lexstart = b_mark(sc_buf);
lexend = lexstart; lexend = lexstart;
c = b_getc(sc_buf); c = b_getc(sc_buf);
/* Step through the string literal and track progress *//* /* Step through the string literal and track progress */
c = b_getc(sc_buf);*/ for (; c != '\"'; c = b_getc(sc_buf), ++lexend) {
for (; c != '\"' || c!= 255; c = b_getc(sc_buf), ++lexend) {
if (c == '\n' || c == '\r') if (c == '\n' || c == '\r')
++line; ++line;
else if (c == '\0') { /* Illegal string, make it an error token */ if (c == '\0' || c == EOF) { /* Illegal string, make it an error token */
b_retract_to_mark(sc_buf); b_retract_to_mark(sc_buf);
b_retract(sc_buf); b_retract(sc_buf);
b_retract(sc_buf);
t.code = ERR_T; t.code = ERR_T;
for (i = 0; i < ERR_LEN; ++i) for (i = 0; i < lexend; ++i) {
if (i == ERR_LEN) continue;
if (i < (ERR_LEN - 3))
t.attribute.err_lex[i] = b_getc(sc_buf); t.attribute.err_lex[i] = b_getc(sc_buf);
else {
/* If the erroneous string is too long, t.attribute.err_lex[i] = '.';
* replace last three characterss with '...'' */
if ((lexend - lexstart) > ERR_LEN) {
t.attribute.err_lex[i - 1] = '.';
t.attribute.err_lex[i - 2] = '.';
t.attribute.err_lex[i - 3] = '.';
} }
t.attribute.err_lex[i] = '\0'; }
scerrnum = 1; t.attribute.err_lex[ERR_LEN] = '\0';
return t; return t;
} }
} /* end for loop, string finished and considered valid */ } /* end for loop, string finished and considered valid */
lexend = b_getcoffset(sc_buf);
b_retract_to_mark(sc_buf); b_retract_to_mark(sc_buf);
/* Copy the matched string literal to str_LTBL */ /* Copy the matched string literal to str_LTBL */
for (; lexstart < lexend; ++lexstart, ++str_offset) {
b_addc(str_LTBL, b_getc(sc_buf));
}
b_addc(str_LTBL, '\0');
t.code = STR_T;
t.attribute.str_offset = str_offset; t.attribute.str_offset = str_offset;
c = b_getc(sc_buf);
for (; lexstart < lexend; c = b_getc(sc_buf), ++lexstart, ++str_offset) {
b_addc(str_LTBL, c);
}
b_addc(str_LTBL, '\0'); ++str_offset;
t.code = STR_T;
return t; return t;
default: default:
if (isalpha(c) || isalnum(c)) { if (isalpha(c) || isalnum(c)) {
@ -494,22 +491,23 @@ err_lex C-type string. */
Token aa_func08(char lexeme[]) { Token aa_func08(char lexeme[]) {
Token t; Token t;
double temp_dbl; double temp_dbl = 0.0f;
t.code = FPL_T; t.code = FPL_T;
if (strstr(lexeme, "0.0")) { if (strstr(lexeme, "0.0")) {
t.attribute.flt_value = 0.0f; t.attribute.flt_value = 0.0f;
} }
else /* strtof() returns 0 if the value is out of range) */
temp_dbl = atof(lexeme); temp_dbl = strtof(lexeme, NULL);
#ifdef DEBUG #ifdef DEBUG
printf("Lexeme: '%s' | FLT value: %f \n", lexeme, temp_dbl); printf("Lexeme: '%s' | FLT value: %f \n", lexeme, temp_dbl);
#endif #endif
if ((temp_dbl > FLT_MAX) || (temp_dbl < 0)) { /* Overflow error */ if ((temp_dbl > FLT_MAX) || (temp_dbl <= 0)) { /* Overflow error */
t = aa_table[ES](lexeme); t = aa_table[ES](lexeme);
return t; return t;
} }
t.attribute.flt_value = (float)temp_dbl; t.attribute.flt_value = (float)temp_dbl;
return t; return t;
/* /*
THE FUNCTION MUST CONVERT THE LEXEME TO A FLOATING POINT VALUE, THE FUNCTION MUST CONVERT THE LEXEME TO A FLOATING POINT VALUE,
@ -591,7 +589,7 @@ Token aa_func13(char lexeme[]) {
Token t; Token t;
unsigned int i; unsigned int i;
t.code = ERR_T; t.code = ERR_T;
for (i = 0; i < (ERR_LEN - 1) && i < strlen(lexeme); i++) for (i = 0; i < (ERR_LEN) && i < strlen(lexeme); i++)
t.attribute.err_lex[i] = lexeme[i]; t.attribute.err_lex[i] = lexeme[i];
if (strlen(lexeme) > ERR_LEN) { if (strlen(lexeme) > ERR_LEN) {