X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lexer%2Flexical_analyzer.c;h=39c82e075169b69eb50ce895bc283227a45f72cc;hb=2d2a5978e84c354bf8167a3ab0b1088d264049bf;hp=56415a01a914f73c8ee3355fada66416d6f10ead;hpb=8aa14fa6392221f27472350490ebd334738f8ac2;p=TP_AL_C.git diff --git a/lexer/lexical_analyzer.c b/lexer/lexical_analyzer.c index 56415a0..39c82e0 100644 --- a/lexer/lexical_analyzer.c +++ b/lexer/lexical_analyzer.c @@ -5,6 +5,7 @@ #include "global_vars.h" #include "print_helper.h" +#include "lexical_analyzer.h" wint_t c; @@ -46,7 +47,8 @@ static bool isEOF() { return false; } -int scanner() { +int scanner(void) { + tokenValue[0] = 0; unsigned int i = 0; wchar_t m[6]; @@ -68,7 +70,7 @@ init: goto S1SS1; } if (isAlphaNum()) { - token[tokenFound].value[i] = c; + tokenValue[i] = c; i++; c = fgetwc(source); goto M1; @@ -80,12 +82,12 @@ init: MC1: if (c == L'A' && !wcscmp(fgetws(m, 6, source), L"uteur")) { - wcscpy((wchar_t*)token[tokenFound].value, L">Auteur"); + wcscpy((wchar_t*)tokenValue, L">Auteur"); c = fgetwc(source); goto MC2; } if (c == L'T' && !wcscmp(fgetws(m, 5, source), L"itre")) { - wcscpy((wchar_t*)token[tokenFound].value, L">Titre"); + wcscpy((wchar_t*)tokenValue, L">Titre"); c = fgetwc(source); goto MC2; } @@ -117,7 +119,7 @@ SSECTION: M1: if (isAlphaNum()) { - token[tokenFound].value[i] = c; + tokenValue[i] = c; i++; c = fgetwc(source); goto M1; @@ -137,7 +139,7 @@ initLV1: goto initLV1LV2; } if (isAlphaNum()) { - token[tokenFound].value[i] = c; + tokenValue[i] = c; i++; c = fgetwc(source); goto M1; @@ -182,6 +184,8 @@ NPARA: MOT: tokenType = MOT; + tokenValue[i] = 0; + wcscpy((wchar_t*)token[tokenFound].value, (wchar_t*)tokenValue); return EXIT_SUCCESS; MC2: @@ -192,6 +196,7 @@ MC2: MOTCLE: tokenType = MOTCLE; + wcscpy((wchar_t*)token[tokenFound].value, (wchar_t*)tokenValue); return EXIT_SUCCESS; FIN: @@ -203,7 +208,7 @@ error: fwprintf(stderr, L"%s error with token type: %s and value: %ls\n", __func__, tokenTypestr[tokenType], - token[tokenFound].value); + tokenValue); } else { fwprintf(stderr, L"%s error with token type: %s\n", __func__,