fixed wrong formatting ((char*)self)+Some.sizeof

Author: alexveden

lib/c3tools/codefmt/_resolvers.c3

@@ -561,6 +561,8 @@ fn bool CodeFmt._resolve__prev_is_binexp(&self) @private
     bool has_type = false;
     bool has_idents = false;
     bool has_expr = false;
+    bool has_typeof = false;
+    bool has_vars = false;
 
     TokenType rhs_token = INVALID_TOKEN;
 
@@ -618,16 +620,19 @@ fn bool CodeFmt._resolve__prev_is_binexp(&self) @private
             case QUESTION:  // for ternary
                 if (scope == 0) break LOOP;
                 has_expr = true;
-            case INTEGER:
             case IDENT:
             case HASH_IDENT:
+                has_vars = true;
+                nextcase;
+            case INTEGER:
                 // is a binary expression sign
                 // ident &
                 // ident *
                 // ident ^
                 // ident + foo
                 // ident - foo
                 // indent[i]
+                // ((char*)indent)
                 switch (rhs_token) {
                     case PLUS:
                     case MINUS:
@@ -640,9 +645,11 @@ fn bool CodeFmt._resolve__prev_is_binexp(&self) @private
                         break;
                 }
                 has_idents = true;
+            case CT_TYPEOF:
+                has_typeof = true;
+                nextcase;
             case TYPE_IDENT:
             case CT_TYPE_IDENT:
-            case CT_TYPEOF:
                 has_type = true;
             case LVEC:
             case RVEC:
@@ -697,8 +704,7 @@ fn bool CodeFmt._resolve__prev_is_binexp(&self) @private
             // simple cast (void*)
             // generic cast (Foo(<void>)*) / array cast (char[8]*)
             if (has_type) {
-                // return !has_idents || has_brackets;
-                is_cast = true;
+                if(has_typeof || !has_vars) is_cast = true;
                 break;
             } else {
                 break;
@@ -717,7 +723,7 @@ fn bool CodeFmt._resolve__prev_is_binexp(&self) @private
             }
         }
 
-        if (!has_parens && !has_type && !has_brackets && !has_idents) {
+        if (!has_parens && !has_type && !has_brackets && (has_typeof || !has_idents)) {
             is_cast = true;
         }
     };

lib/c3tools/lsp/_symbols.c3

@@ -40,8 +40,8 @@ struct SymbolItem @align(32)
     {
         uint name_offset : 0..31;  // from the beginning of SymbolCache.data
         SymbolKind kind : 32..39;  // kind of the symbol
-        bool is_private: 40..40;      // symbol contains @private attribute
-        bool is_conditional: 41..41;  // symbol contains @if() attribute
+        bool is_private : 40..40;  // symbol contains @private attribute
+        bool is_conditional : 41..41;  // symbol contains @if() attribute
     }
 
     union ptr
@@ -113,6 +113,7 @@ macro SymbolItem* SymbolCache.first(&self, name_or_hash)
 
 <*
  Returns next item with hash collision (if any)
+
  @param [in] item "Item returned by previous SymbolCache.find()"
  @return "next item or null if not exist"
  @require item != null
@@ -239,8 +240,9 @@ struct SymbolItemIterator
     uint cursor;
     uint next_idx;
 }
-macro SymbolNameIterator SymbolCache.iter_names(&self) => SymbolNameIterator {.cache = self};
-macro SymbolItemIterator SymbolCache.iter_items(&self) => SymbolItemIterator {.cache = self};
+
+macro SymbolNameIterator SymbolCache.iter_names(&self) => SymbolNameIterator { .cache = self };
+macro SymbolItemIterator SymbolCache.iter_items(&self) => SymbolItemIterator { .cache = self };
 
 macro usz SymbolNameIterator.len(self) @operator(len) => self.cache.names_cnt;
 macro usz SymbolItemIterator.len(self) @operator(len) => self.cache.items_len;
@@ -254,7 +256,7 @@ macro String SymbolNameIterator.get(&self, usz idx) @operator([])
     uint cnt = names[i];
 
     assert(cnt, "expected string len > 0");
-    assert(names[i+1+cnt] == '\0', "no null terminator");
+    assert(names[i + 1 + cnt] == '\0', "no null terminator");
 
     self.cursor += cnt + 2;  // 2 extra bytes for len and \0
     self.next_idx++;
@@ -269,7 +271,6 @@ macro SymbolItem* SymbolItemIterator.get(&self, usz idx) @operator(&[])
     return &items[idx];
 }
 
-
 <*
  Checks if SymbolCache has space for adding a new symbol
 *>

project.json

@@ -8,7 +8,7 @@
   "sources":  [ "lib/**" ],
   "test-sources":  [ "test/**" ],
   "output": "build",
-  //"exec": ["c3c compile-run c3fmt_gentests.c3 ../lib/**"],
+  "exec": ["c3c compile-run c3fmt_gentests.c3 ../lib/**"],
   "targets": {
     "c3fmt": {
       "type": "executable",