Merge pull request #138 from savq/scanner-fix

Fix scanner lookahead error and update CI

.github/workflows/ci.yml

@@ -1,8 +1,28 @@
-name: Build/test
+name: CI
+
 on:
   push:
     branches:
-      - "**"
+      - master
+      - main
+    paths:
+      - grammar.js
+      - src/**
+      - test/**
+      - bindings/**
+      - binding.gyp
+  pull_request:
+    paths:
+      - grammar.js
+      - src/**
+      - test/**
+      - bindings/**
+      - binding.gyp
+
+concurrency:
+  group: ${{github.workflow}}-${{github.ref}}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ${{ matrix.os }}

Makefile

@@ -104,7 +104,8 @@ uninstall:
 clean:
 	$(RM) $(OBJS) $(LANGUAGE_NAME).pc lib$(LANGUAGE_NAME).a lib$(LANGUAGE_NAME).$(SOEXT)
 
-test:
+test: $(SRC_DIR)/parser.c
 	$(TS) test
+	./script/parse-examples
 
 .PHONY: all install uninstall clean test

script/known-failures.txt

@@ -1,4 +1,3 @@
-examples/Flux.jl/test/optimise.jl
 examples/Flux.jl/test/utils.jl
 examples/Flux.jl/src/train.jl
 examples/Gadfly.jl/test/testscripts/unitful_basic.jl

src/scanner.c

@@ -112,7 +112,7 @@ static bool scan_string_content(TSLexer *lexer, Stack *stack, bool interp) {
     TSSymbol end_symbol = (end_char == '"') ? STRING_END : COMMAND_END;
     TSSymbol content_symbol = interp ? STRING_CONTENT : STRING_CONTENT_NO_INTERP;
     bool has_content = false;
-    char next;
+    int32_t next;
     while ((next = lexer->lookahead)) {
         mark_end(lexer);
         if (next == '\\') {