diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2017-02-07 17:00:28 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-02-07 17:00:28 +0000 |
| commit | e5200ef5bfd80e3a961fc314260ba98a6835ad76 (patch) | |
| tree | 0fc91423403826032b61d424f8f831ffb0411039 /c_lexer | |
| parent | 76699050049febe4c7eb0199cd0ae9d13fb36b74 (diff) | |
| parent | 6408d224ea3e93bc60e32e5df3fa080dd83fc081 (diff) | |
| download | Compiler-e5200ef5bfd80e3a961fc314260ba98a6835ad76.tar.gz Compiler-e5200ef5bfd80e3a961fc314260ba98a6835ad76.zip | |
Fixed merge conflicts
Diffstat (limited to 'c_lexer')
| -rw-r--r-- | c_lexer/include/c_lexer.hpp | 2 | ||||
| -rw-r--r-- | c_lexer/src/.gitignore | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/c_lexer/include/c_lexer.hpp b/c_lexer/include/c_lexer.hpp index 059664a..54b1b81 100644 --- a/c_lexer/include/c_lexer.hpp +++ b/c_lexer/include/c_lexer.hpp @@ -19,7 +19,7 @@ extern std::string *yylval; // flex function to run on input extern int yylex(); -extern int yyleng; +extern size_t yyleng; extern int lineCount; extern int spaceCount; diff --git a/c_lexer/src/.gitignore b/c_lexer/src/.gitignore deleted file mode 100644 index e69de29..0000000 --- a/c_lexer/src/.gitignore +++ /dev/null |