refactor: use C for the external scanner (#16)

binding.gyp

@@ -9,7 +9,7 @@
       "sources": [
         "bindings/node/binding.cc",
         "src/parser.c",
-        # If your language uses an external scanner, add it here.
+		"scanner.c",
       ],
       "cflags_c": [
         "-std=c99",

bindings/rust/build.rs

@@ -10,29 +10,10 @@ fn main() {
     let parser_path = src_dir.join("parser.c");
     c_config.file(&parser_path);
 
-    // If your language uses an external scanner written in C,
-    // then include this block of code:
-
-    /*
     let scanner_path = src_dir.join("scanner.c");
     c_config.file(&scanner_path);
     println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-    */
 
     c_config.compile("parser");
     println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
-
-    // If your language uses an external scanner written in C++,
-    // then include this block of code:
-
-    let mut cpp_config = cc::Build::new();
-    cpp_config.cpp(true);
-    cpp_config.include(&src_dir);
-    cpp_config
-        .flag_if_supported("-Wno-unused-parameter")
-        .flag_if_supported("-Wno-unused-but-set-variable");
-    let scanner_path = src_dir.join("scanner.cc");
-    cpp_config.file(&scanner_path);
-    cpp_config.compile("scanner");
-    println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
 }

src/scanner.c

@@ -1,16 +1,19 @@
-#include <cwctype>
 #include <tree_sitter/parser.h>
+#include <wctype.h>
 
-namespace {
 enum TokenType { BRACKET_ARGUMENT, BRACKET_COMMENT, LINE_COMMENT };
-void skip(TSLexer *lexer) { lexer->advance(lexer, true); }
+
-void advance(TSLexer *lexer) { lexer->advance(lexer, false); }
+static void skip(TSLexer *lexer) { lexer->advance(lexer, true); }
-void skip_wspace(TSLexer *lexer) {
+
-  while (std::iswspace(lexer->lookahead)) {
+static void advance(TSLexer *lexer) { lexer->advance(lexer, false); }
+
+static void skip_wspace(TSLexer *lexer) {
+  while (iswspace(lexer->lookahead)) {
     skip(lexer);
   }
 }
-bool is_bracket_argument(TSLexer *lexer) {
+
+static bool is_bracket_argument(TSLexer *lexer) {
   if (lexer->lookahead != '[') {
     return false;
   }
@@ -45,7 +48,8 @@ bool is_bracket_argument(TSLexer *lexer) {
   }
   return false;
 }
-bool scan(void *payload, TSLexer *lexer, bool const *valid_symbols) {
+
+static bool scan(void *payload, TSLexer *lexer, bool const *valid_symbols) {
   skip_wspace(lexer);
 
   if (lexer->lookahead != '#' && valid_symbols[BRACKET_ARGUMENT]) {
@@ -72,19 +76,20 @@ bool scan(void *payload, TSLexer *lexer, bool const *valid_symbols) {
   return false;
 }
 
-} // namespace
-extern "C" {
 void *tree_sitter_cmake_external_scanner_create() { return NULL; }
+
 void tree_sitter_cmake_external_scanner_destroy(void *payload) {}
+
 unsigned tree_sitter_cmake_external_scanner_serialize(void *payload,
                                                       char *buffer) {
   return 0;
 }
+
 void tree_sitter_cmake_external_scanner_deserialize(void *payload,
                                                     char const *buffer,
                                                     unsigned length) {}
+
 bool tree_sitter_cmake_external_scanner_scan(void *payload, TSLexer *lexer,
                                              bool const *valid_symbols) {
   return scan(payload, lexer, valid_symbols);
 }
-}