Merge syntax repo

.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test-syntax:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/[email protected]
+
+    - name: Cache OCaml's opam
+      uses: actions/[email protected]
+      with:
+        path: ~/.opam
+        key: macos-latest-ocaml-4.06.1
+
+    - name: Use OCaml
+      uses: ocaml/setup-ocaml@v1
+      with:
+        ocaml-version: 4.06.1
+
+    - name: Use Node.js
+      uses: actions/[email protected]
+      with:
+        node-version: 14.4.0
+
+    - name: Install depedencies
+      working-directory: ./syntax
+      run: npm ci
+
+    - name: Run tests
+      working-directory: ./syntax
+      run: eval $(opam env) && make roundtrip-test

.gitmodules

@@ -2,10 +2,6 @@
 	path = ocaml
 	url = https://github.com/rescript-lang/ocaml
 	ignore = untracked
-[submodule "syntax"]
-	path = syntax
-	url = https://github.com/rescript-lang/syntax
-	branch = master
 [submodule "ninja"]
 	path = ninja
 	url = https://github.com/rescript-lang/ninja

syntax/.depend

@@ -0,0 +1,79 @@
+src/reactjs_jsx_ppx_v3.cmx : src/reactjs_jsx_ppx_v3.cmi
+src/reactjs_jsx_ppx_v3.cmi :
+src/res_ast_conversion.cmx : src/res_printer.cmx src/res_ast_conversion.cmi
+src/res_ast_conversion.cmi :
+src/res_ast_debugger.cmx : src/res_driver.cmx src/res_doc.cmx \
+    src/res_ast_debugger.cmi
+src/res_ast_debugger.cmi : src/res_driver.cmi
+src/res_cli.cmx : src/res_driver_reason_binary.cmx \
+    src/res_driver_ml_parser.cmx src/res_driver_binary.cmx src/res_driver.cmx \
+    src/res_ast_debugger.cmx src/reactjs_jsx_ppx_v3.cmx
+src/res_comment.cmx : src/res_comment.cmi
+src/res_comment.cmi :
+src/res_comments_table.cmx : src/res_parsetree_viewer.cmx src/res_doc.cmx \
+    src/res_comment.cmx
+src/res_core.cmx : src/res_utf8.cmx src/res_token.cmx src/res_scanner.cmx \
+    src/res_printer.cmx src/res_parser.cmx src/res_js_ffi.cmx \
+    src/res_grammar.cmx src/res_doc.cmx src/res_diagnostics.cmx \
+    src/res_comments_table.cmx src/res_core.cmi
+src/res_core.cmi : src/res_parser.cmi
+src/res_diagnostics.cmx : src/res_token.cmx src/res_grammar.cmx \
+    src/res_diagnostics_printing_utils.cmx src/res_diagnostics.cmi
+src/res_diagnostics.cmi : src/res_token.cmx src/res_grammar.cmx
+src/res_diagnostics_printing_utils.cmx :
+src/res_doc.cmx : src/res_minibuffer.cmx src/res_doc.cmi
+src/res_doc.cmi :
+src/res_driver.cmx : src/res_printer.cmx src/res_parser.cmx src/res_io.cmx \
+    src/res_diagnostics.cmx src/res_core.cmx src/res_comment.cmx \
+    src/res_driver.cmi
+src/res_driver.cmi : src/res_diagnostics.cmi src/res_comment.cmi
+src/res_driver_binary.cmx : src/res_driver.cmx src/res_driver_binary.cmi
+src/res_driver_binary.cmi : src/res_driver.cmi
+src/res_driver_ml_parser.cmx : src/res_io.cmx src/res_driver.cmx \
+    src/res_comment.cmx src/res_ast_conversion.cmx \
+    src/res_driver_ml_parser.cmi
+src/res_driver_ml_parser.cmi : src/res_driver.cmi src/res_comment.cmi
+src/res_driver_reason_binary.cmx : src/res_scanner.cmx src/res_io.cmx \
+    src/res_driver.cmx src/res_comment.cmx src/res_ast_conversion.cmx \
+    src/res_driver_reason_binary.cmi
+src/res_driver_reason_binary.cmi : src/res_token.cmx src/res_driver.cmi
+src/res_grammar.cmx : src/res_token.cmx
+src/res_io.cmx : src/res_io.cmi
+src/res_io.cmi :
+src/res_js_ffi.cmx :
+src/res_minibuffer.cmx : src/res_minibuffer.cmi
+src/res_minibuffer.cmi :
+src/res_multi_printer.cmx : src/res_printer.cmx src/res_io.cmx \
+    src/res_driver_reason_binary.cmx src/res_driver_ml_parser.cmx \
+    src/res_driver.cmx src/res_diagnostics.cmx src/res_ast_conversion.cmx \
+    src/res_multi_printer.cmi
+src/res_multi_printer.cmi :
+src/res_outcome_printer.cmx : src/res_token.cmx src/res_doc.cmx \
+    src/res_outcome_printer.cmi
+src/res_outcome_printer.cmi : src/res_doc.cmi
+src/res_parens.cmx : src/res_parsetree_viewer.cmx src/res_parens.cmi
+src/res_parens.cmi :
+src/res_parser.cmx : src/res_token.cmx src/res_scanner.cmx \
+    src/res_reporting.cmx src/res_grammar.cmx src/res_diagnostics.cmx \
+    src/res_comment.cmx src/res_parser.cmi
+src/res_parser.cmi : src/res_token.cmx src/res_scanner.cmi \
+    src/res_reporting.cmx src/res_grammar.cmx src/res_diagnostics.cmi \
+    src/res_comment.cmi
+src/res_parsetree_viewer.cmx : src/res_parsetree_viewer.cmi
+src/res_parsetree_viewer.cmi :
+src/res_printer.cmx : src/res_utf8.cmx src/res_token.cmx \
+    src/res_parsetree_viewer.cmx src/res_parens.cmx src/res_doc.cmx \
+    src/res_comments_table.cmx src/res_comment.cmx src/res_printer.cmi
+src/res_printer.cmi : src/res_doc.cmi src/res_comments_table.cmx \
+    src/res_comment.cmi
+src/res_reporting.cmx : src/res_token.cmx src/res_grammar.cmx
+src/res_scanner.cmx : src/res_utf8.cmx src/res_token.cmx \
+    src/res_diagnostics.cmx src/res_comment.cmx src/res_scanner.cmi
+src/res_scanner.cmi : src/res_token.cmx src/res_diagnostics.cmi
+src/res_token.cmx : src/res_comment.cmx
+src/res_utf8.cmx : src/res_utf8.cmi
+src/res_utf8.cmi :
+tests/res_test.cmx : tests/res_utf8_test.cmx src/res_token.cmx \
+    src/res_parser.cmx src/res_outcome_printer.cmx src/res_multi_printer.cmx \
+    src/res_io.cmx src/res_driver.cmx src/res_core.cmx
+tests/res_utf8_test.cmx : src/res_utf8.cmx

syntax/.gitignore

@@ -0,0 +1,10 @@
+.DS_STORE
+node_modules
+*.cm*
+*.o
+*.s
+lib/*
+!lib/README.md
+.vscode/settings.json
+ # each person has its own preferences
+ _build

syntax/.merlin

@@ -0,0 +1,6 @@
+S src
+B src
+S +compiler-libs
+B +compiler-libs
+
+FLG -w +a-4-42-40-9-48

syntax/.travis.yml

@@ -0,0 +1,24 @@
+language: node_js 
+
+node_js:
+  - 10.15.1
+
+sudo: required
+
+env:
+  - OCAML_VERSION=4.06
+
+install: test -e .travis.opam.sh || wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
+
+script:
+  - bash -ex .travis-opam.sh
+  - npm install
+  - opam switch create 4.06.1
+  - eval $(opam env)
+  - ocamlopt -v
+  - make world
+  - make test
+
+os:
+  # - linux
+  - osx

syntax/.vscode/ninja.js

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+var path = require("path");
+var cp = require("child_process");
+var jscompDir = path.join(__dirname, "..");
+var vendorNinjaPath = "make";
+function main() {
+  var subcommand = process.argv[2];
+  switch (subcommand) {
+    case "build":
+      cp.execSync(vendorNinjaPath, {
+        encoding: "utf8",
+        cwd: jscompDir,
+        stdio: [0, 1, 2],
+      });
+      //   cp.execSync(`make depend`, {
+      //     cwd: jscompDir,
+      //     stdio: [0, 1, 2],
+      //   });
+      break;
+    case "clean":
+      cp.execSync(`make clean`, {
+        cwd: jscompDir,
+        stdio: [0, 1, 2],
+      });
+      break;
+    case "config":
+      cp.execSync(`make depend`, {
+        cwd: jscompDir,
+        stdio: [0, 1, 2],
+      });
+      break;
+    case "cleanbuild":
+      cp.execSync(`make clean && make depend && make -j9`, {
+        cwd: jscompDir,
+        stdio: [0, 1, 2],
+      });
+      break;
+    case "help":
+      console.log(`supported subcommands:
+  [exe] config        
+  [exe] build
+  [exe] cleanbuild
+  [exe] help
+  [exe] clean
+          `);
+      break;
+    default:
+      break;
+  }
+}
+
+main();

syntax/.vscode/task.js

@@ -0,0 +1,123 @@
+#!/usr/bin/env node
+//@ts-check
+var fs = require("fs");
+var path = require("path");
+var cp = require("child_process");
+var sourceDirs = ["src"];
+
+var buildAppending = false;
+var isBuilding = false;
+
+var jscompDir = path.join(__dirname, "..");
+/**
+ *
+ * @param {Date} d
+ */
+function showDate(d) {
+  return `${d.getHours()}:${d.getMinutes()}:${d.getSeconds()}`;
+}
+function rebuild() {
+  if (isBuilding) {
+    buildAppending = true;
+  } else {
+    console.log(">>>> Start compiling");
+    isBuilding = true;
+
+    cp.fork(path.join(__dirname, "ninja.js"), ["build"]).on(
+      "exit",
+      buildFinished
+    );
+  }
+}
+/**
+ *
+ * @param {number} code
+ * @param {string} signal
+ */
+function buildFinished(code, signal) {
+  isBuilding = false;
+  if (buildAppending) {
+    buildAppending = false;
+    rebuild();
+  } else {
+    if (code !== 0) {
+      // console.log(`File "package.json", line 1, characters 1-1:`);
+      // console.log(`Error: Failed to build ${showDate(new Date())}`);
+    }
+    console.log(">>>> Finish compiling (options: R|clean|config)");
+    // TODO: check ninja exit error code
+    if (code === 0) {
+      // This is not always correct
+      // ninjaFile.updateDev();
+      // This file is cached
+      cp.fork(path.join(__dirname, "ninja.js"), ["-dev"]);
+    }
+  }
+}
+/**
+ *
+ * @param {string} eventType
+ * @param {string} filename
+ */
+function onSourceChange(eventType, filename) {
+  // console.log('event ', eventType,filename)
+  if (
+    filename.endsWith(".ml") ||
+    filename.endsWith(".mli") ||
+    filename.endsWith(".json") ||
+    filename.endsWith(".re") ||
+    filename.endsWith(".rei")
+  ) {
+    rebuild();
+  }
+}
+
+sourceDirs.forEach((x) => {
+  fs.watch(path.join(jscompDir, x), "utf8", onSourceChange);
+});
+
+// fs.watch(path.join("..", "package.json"), "utf8", onSourceChange);
+
+rebuild();
+
+var readline = require("readline");
+readline
+  .createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  })
+  .on("line", (input) => {
+    switch (input.toLowerCase()) {
+      case "r":
+        rebuild();
+        break;
+      case "config":
+        if (isBuilding) {
+          console.log(`it's building`);
+        } else {
+          isBuilding = true;
+          cp.fork(path.join(__dirname, "ninja.js"), ["config"]).on(
+            "close",
+            () => {
+              isBuilding = false;
+              rebuild();
+            }
+          );
+        }
+        break;
+      case "clean":
+        if (isBuilding) {
+          console.log(`it's building`);
+        } else {
+          isBuilding = true;
+          cp.fork(path.join(__dirname, "ninja.js"), ["cleanbuild"]).on(
+            "close",
+            () => {
+              isBuilding = false;
+            }
+          );
+        }
+
+        break;
+    }
+  });