ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve text/scanner whitespace parameter to use a bit_set instead; Improve error message for for x in y where y is not iterable but allows in as an operator

Browse Source
This commit is contained in:
gingerBill
2020-12-15 22:28:40 +00:00
parent 2957da538d
commit 6c2b93d519
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/text/scanner/scanner.odin
+8 -5
View File
@@ -61,14 +61,17 @@ Scan_Flag :: enum u32 {
Scan_Comments, Scan_Comments,
Skip_Comments, // if set with .Scan_Comments, comments become white space Skip_Comments, // if set with .Scan_Comments, comments become white space
} }
Scan_Flags :: bit_set[Scan_Flag; u32]; Scan_Flags :: distinct bit_set[Scan_Flag; u32];
Odin_Like_Tokens :: Scan_Flags{.Scan_Idents, .Scan_Ints, .Scan_Floats, .Scan_Chars, .Scan_Strings, .Scan_Raw_Strings, .Scan_Comments, .Skip_Comments}; Odin_Like_Tokens :: Scan_Flags{.Scan_Idents, .Scan_Ints, .Scan_Floats, .Scan_Chars, .Scan_Strings, .Scan_Raw_Strings, .Scan_Comments, .Skip_Comments};
C_Like_Tokens :: Scan_Flags{.Scan_Idents, .Scan_Ints, .Scan_C_Int_Prefixes, .Scan_Floats, .Scan_Chars, .Scan_Strings, .Scan_Raw_Strings, .Scan_Comments, .Skip_Comments}; C_Like_Tokens :: Scan_Flags{.Scan_Idents, .Scan_Ints, .Scan_C_Int_Prefixes, .Scan_Floats, .Scan_Chars, .Scan_Strings, .Scan_Raw_Strings, .Scan_Comments, .Skip_Comments};
// Only allows for ASCII whitespace
Whitespace :: distinct bit_set['\x00'..<utf8.RUNE_SELF; u128];
// Odin_Whitespace is the default value for the Scanner's whitespace field // Odin_Whitespace is the default value for the Scanner's whitespace field
Odin_Whitespace :: 1<<'\t' | 1<<'\n' | 1<<'\r' | 1<<' '; Odin_Whitespace :: Whitespace{'\t', '\n', '\r', ' '};
C_Whitespace :: 1<<'\t' | 1<<'\n' | 1<<'\r' | 1<<'\v' | 1<<'\f' | 1<<' '; C_Whitespace :: Whitespace{'\t', '\n', '\r', '\v', '\f', ' '};
// Scanner allows for the reading of Unicode characters and tokens from a string // Scanner allows for the reading of Unicode characters and tokens from a string
@@ -102,7 +105,7 @@ Scanner :: struct {
// The whitespace field controls which characters are recognized as white space // The whitespace field controls which characters are recognized as white space
// This field may be changed by the user at any time during scanning // This field may be changed by the user at any time during scanning
whitespace: u64, whitespace: Whitespace,
// is_ident_rune is a predicate controlling the characters accepted as the ith rune in an identifier // is_ident_rune is a predicate controlling the characters accepted as the ith rune in an identifier
// The valid characters must not conflict with the set of white space characters // The valid characters must not conflict with the set of white space characters
@@ -523,7 +526,7 @@ scan :: proc(s: ^Scanner) -> (tok: rune) {
s.pos.line = 0; s.pos.line = 0;
redo: for { redo: for {
for s.whitespace & (1<<uint(ch)) != 0 { for (ch < utf8.RUNE_SELF && ch in s.whitespace) {
ch = advance(s); ch = advance(s);
} }
src/check_stmt.cpp
+12 -2
View File
@@ -1803,9 +1803,19 @@ void check_stmt_internal(CheckerContext *ctx, Ast *node, u32 flags) {
if (val0 == nullptr) { if (val0 == nullptr) {
gbString s = expr_to_string(operand.expr); gbString s = expr_to_string(operand.expr);
gbString t = type_to_string(operand.type); gbString t = type_to_string(operand.type);
defer (gb_string_free(s));
defer (gb_string_free(t));
error(operand.expr, "Cannot iterate over '%s' of type '%s'", s, t); error(operand.expr, "Cannot iterate over '%s' of type '%s'", s, t);
gb_string_free(t);
gb_string_free(s); if (rs->val0 != nullptr && rs->val1 == nullptr) {
if (is_type_map(operand.type) || is_type_bit_set(operand.type)) {
gbString v = expr_to_string(rs->val0);
defer (gb_string_free(v));
error_line("\tSuggestion: place parentheses around the expression\n");
error_line("\t for (%s in %s) {\n", v, s);
}
}
} }
} }