ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-02 04:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support #! comments

Browse Source
This commit is contained in:
gingerBill
2018-12-26 12:00:16 +00:00
parent 956dd26aa0
commit 1f2fdddc6d
2 changed files with 13 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.bat
+1 -1
View File
@@ -42,7 +42,7 @@ del *.ilk > NUL 2> NUL
cl %compiler_settings% "src\main.cpp" ^ cl %compiler_settings% "src\main.cpp" ^
/link %linker_settings% -OUT:%exe_name% ^ /link %linker_settings% -OUT:%exe_name% ^
&& odin run examples/demo/demo.odin -keep-temp-files && odin run examples/demo/demo.odin -debug -keep-temp-files
del *.obj > NUL 2> NUL del *.obj > NUL 2> NUL
src/tokenizer.cpp
+12 -45
View File
@@ -776,50 +776,6 @@ gb_inline TokenKind token_kind_dub_eq(Tokenizer *t, Rune sing_rune, TokenKind si
return sing; return sing;
} }
void tokenizer__fle_update(Tokenizer *t) {
t->curr_rune = '/';
t->curr = t->curr-1;
t->read_curr = t->curr+1;
advance_to_next_rune(t);
}
// NOTE(bill): needed if comment is straight after a "semicolon"
bool tokenizer_find_line_end(Tokenizer *t) {
while (t->curr_rune == '/' || t->curr_rune == '*') {
if (t->curr_rune == '/') {
tokenizer__fle_update(t);
return true;
}
advance_to_next_rune(t);
while (t->curr_rune >= 0) {
Rune r = t->curr_rune;
if (r == '\n') {
tokenizer__fle_update(t);
return true;
}
advance_to_next_rune(t);
if (r == '*' && t->curr_rune == '/') {
advance_to_next_rune(t);
break;
}
}
tokenizer_skip_whitespace(t);
if (t->curr_rune < 0 || t->curr_rune == '\n') {
tokenizer__fle_update(t);
return true;
}
if (t->curr_rune != '/') {
tokenizer__fle_update(t);
return false;
}
advance_to_next_rune(t);
}
tokenizer__fle_update(t);
return false;
}
Token tokenizer_get_token(Tokenizer *t) { Token tokenizer_get_token(Tokenizer *t) {
tokenizer_skip_whitespace(t); tokenizer_skip_whitespace(t);
@@ -956,7 +912,6 @@ Token tokenizer_get_token(Tokenizer *t) {
} }
break; break;
case '#': token.kind = Token_Hash; break;
case '@': token.kind = Token_At; break; case '@': token.kind = Token_At; break;
case '$': token.kind = Token_Dollar; break; case '$': token.kind = Token_Dollar; break;
case '?': token.kind = Token_Question; break; case '?': token.kind = Token_Question; break;
@@ -1011,6 +966,18 @@ Token tokenizer_get_token(Tokenizer *t) {
} }
break; break;
case '#':
if (t->curr_rune == '!') {
while (t->curr_rune != '\n' && t->curr_rune != GB_RUNE_EOF) {
advance_to_next_rune(t);
}
token.kind = Token_Comment;
} else {
token.kind = Token_Hash;
}
break;
case '/': { case '/': {
if (t->curr_rune == '/') { if (t->curr_rune == '/') {
while (t->curr_rune != '\n' && t->curr_rune != GB_RUNE_EOF) { while (t->curr_rune != '\n' && t->curr_rune != GB_RUNE_EOF) {