build: hopefully fix windows

and a few more stuff

.github/workflows/ci.yml

@@ -19,6 +19,10 @@ on:
       - "bindings/**"
       - "binding.gyp"
 
+concurrency:
+  group: ${{github.workflow}}-${{github.ref}}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: Test parsers

README.md

@@ -27,4 +27,4 @@ A tree-sitter parser for XML & DTD files.
 [matrix]: https://img.shields.io/matrix/tree-sitter-chat%3Amatrix.org?logo=matrix&label=matrix
 [npm]: https://img.shields.io/npm/v/%40tree-sitter-grammars%2Ftree-sitter-xml?logo=npm
 [crates]: https://img.shields.io/crates/v/tree-sitter-xml?logo=rust
-[pypi]: https://img.shields.io/pypi/v/tree-sitter-pymanifest?logo=pypi&logoColor=ffd242
+[pypi]: https://img.shields.io/pypi/v/tree-sitter-xml?logo=pypi&logoColor=ffd242

binding.gyp

@@ -19,6 +19,6 @@
         "-std=c11",
         "-Wno-unused-value",
       ]
-    },
+    }
   ]
 }

bindings/go/binding.go

@@ -1,5 +1,8 @@
 package tree_sitter_xml
 
+//go:generate make -C../../xml libtree-sitter-xml.a
+//go:generate make -C../../dtd libtree-sitter-dtd.a
+
 // #cgo CFLAGS: -std=c11 -fPIC
 // #cgo LDFLAGS: -L../../xml -l:libtree-sitter-xml.a
 // #cgo LDFLAGS: -L../../dtd -l:libtree-sitter-dtd.a

bindings/rust/build.rs

@@ -7,6 +7,7 @@ fn main() {
     let mut config = cc::Build::new();
     config.include(&xml_dir);
     config
+        .flag_if_supported("-std=c11")
         .flag_if_supported("-Wno-unused-parameter")
         .flag_if_supported("-Wno-unused-value");
 
@@ -22,5 +23,5 @@ fn main() {
 
     println!("cargo:rerun-if-changed={}", common_dir.join("scanner.h").to_str().unwrap());
 
-    config.compile("parser-scanner");
+    config.compile("tree-sitter-xml");
 }

common/scanner.h

@@ -27,7 +27,7 @@ static inline void advance(TSLexer *lexer) { lexer->advance(lexer, false); }
 /// Check if the character is valid in a name
 /// TODO: explicitly follow https://www.w3.org/TR/xml11/#NT-Name
 static inline bool is_valid_name_char(wchar_t chr) {
-    return iswalnum(chr) || chr == '_' || chr == ':' || chr == '.' || chr == '-' || chr == L'·';
+    return iswalnum(chr) || chr == '_' || chr == ':' || chr == '.' || chr == '-' || chr == 0xB7;
 }
 
 /// Check if the character is valid to start a name

setup.py

@@ -40,9 +40,11 @@ def get_tag(self):
                 "dtd/src/parser.c",
                 "dtd/src/scanner.c",
             ],
-            extra_compile_args=(
-                ["-std=c11", "-Wno-unused-value"] if system() != "Windows" else []
-            ),
+            extra_compile_args=[
+                "-std=c11",
+                "-Wno-unused-parameter",
+                "-Wno-unused-value",
+            ] if system() != "Windows" else [],
             define_macros=[
                 ("Py_LIMITED_API", "0x03080000"),
                 ("PY_SSIZE_T_CLEAN", None)

xml/src/scanner.c

@@ -13,9 +13,11 @@ typedef Array(String) Vector;
 /// Create a new String instance
 #define String() { ts_calloc(STRING_CAP + 1, sizeof(char)), 0, STRING_CAP }
 
+#ifndef _WIN32
 static inline uint32_t max(uint32_t a, uint32_t b) {
     return a > b ? a : b;
 }
+#endif
 
 static inline bool string_equals(String *a, String b) {
     return strcmp(a->contents, b.contents) == 0;