Merge remote-tracking branch 'origin/master' into llvm6

1 files changed, 15 insertions, 0 deletions

diff --git a/src/c_tokenizer.cpp b/src/c_tokenizer.cpp
index 6be2cf991e..3746cf5853 100644
--- a/src/c_tokenizer.cpp
+++ b/src/c_tokenizer.cpp
@@ -121,6 +121,9 @@ static void begin_token(CTokenize *ctok, CTokId id) {
         case CTokIdRParen:
         case CTokIdEOF:
         case CTokIdDot:
+        case CTokIdAsterisk:
+        case CTokIdBang:
+        case CTokIdTilde:
             break;
     }
 }
@@ -228,10 +231,22 @@ void tokenize_c_macro(CTokenize *ctok, const uint8_t *c) {
                         begin_token(ctok, CTokIdRParen);
                         end_token(ctok);
                         break;
+                    case '*':
+                        begin_token(ctok, CTokIdAsterisk);
+                        end_token(ctok);
+                        break;
                     case '-':
                         begin_token(ctok, CTokIdMinus);
                         end_token(ctok);
                         break;
+                    case '!':
+                        begin_token(ctok, CTokIdBang);
+                        end_token(ctok);
+                        break;
+                    case '~':
+                        begin_token(ctok, CTokIdTilde);
+                        end_token(ctok);
+                        break;
                     default:
                         return mark_error(ctok);
                 }