Skip to content

Commit ac85118

Browse files
authored
Move syntax sources into jscomp dir (#6225)
1 parent 6183504 commit ac85118

File tree

1,845 files changed

+9
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,845 files changed

+9
-11
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
- name: Checkout
123123
uses: actions/checkout@v3
124124
with:
125-
fetch-depth: 2 # to be able to check for changes in subfolder res_syntax later
125+
fetch-depth: 2 # to be able to check for changes in subfolder jscomp/syntax later
126126

127127
- name: Download static linux binaries
128128
if: runner.os == 'Linux'
@@ -175,7 +175,7 @@ jobs:
175175
id: syntax-diff
176176
shell: bash
177177
run: |
178-
if git diff --name-only --exit-code HEAD^ HEAD -- res_syntax; then
178+
if git diff --name-only --exit-code HEAD^ HEAD -- jscomp/syntax; then
179179
echo "syntax_status=unchanged" >> $GITHUB_ENV
180180
else
181181
echo "syntax_status=changed" >> $GITHUB_ENV

.prettierignore

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ jscomp/
22
lib/
33
vendor/
44
ninja/
5-
res_syntax/
65
_build/
76
_opam
87
CHANGELOG.md

Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ test-gentype:
4242
test-all: test test-gentype
4343

4444
reanalyze:
45-
reanalyze.exe -set-exit-code -all-cmt _build/default/res_syntax -suppress res_syntax/testrunner
46-
reanalyze.exe -set-exit-code -all-cmt _build/default/jscomp -suppress res_syntax/testrunner -exclude-paths jscomp/super_errors,jscomp/outcome_printer,jscomp/ounit_tests,jscomp/ml,jscomp/js_parser,jscomp/frontend,jscomp/ext,jscomp/depends,jscomp/core,jscomp/common,jscomp/cmij,jscomp/bsb_helper,jscomp/bsb
45+
reanalyze.exe -set-exit-code -all-cmt _build/default/jscomp -suppress jscomp/syntax/testrunner -exclude-paths jscomp/outcome_printer,jscomp/ounit_tests,jscomp/ml,jscomp/js_parser,jscomp/frontend,jscomp/ext,jscomp/depends,jscomp/core,jscomp/common,jscomp/cmij,jscomp/bsb_helper,jscomp/bsb
4746

4847
lib: build node_modules/.bin/semver
4948
node scripts/ninja.js config

README.md

+1-1

dune

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
(dirs jscomp res_syntax)
1+
(dirs jscomp)

jscomp/dune

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(dirs bsb bsb_exe bsb_helper bsb_helper_exe bsc cmij common core depends ext
22
frontend gentype jsoo js_parser ml napkin ounit_tests outcome_printer
3-
super_errors)
3+
syntax)
44

55
(env
66
(dev
File renamed without changes.
File renamed without changes.

res_syntax/benchmarks/Benchmark.ml jscomp/syntax/benchmarks/Benchmark.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ end = struct
237237
Benchmark.report b
238238

239239
let run () =
240-
let dataDir = "res_syntax/benchmarks/data" in
240+
let dataDir = "jscomp/syntax/benchmarks/data" in
241241
benchmark (Filename.concat dataDir "RedBlackTree.res") Rescript Parse;
242242
benchmark (Filename.concat dataDir "RedBlackTree.ml") Ocaml Parse;
243243
benchmark (Filename.concat dataDir "RedBlackTree.res") Rescript Print;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

res_syntax/dune jscomp/syntax/dune

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

res_syntax/testrunner/res_test.ml jscomp/syntax/testrunner/res_test.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module IO = Res_io
22

3-
let dataDir = "res_syntax/tests"
3+
let dataDir = "jscomp/syntax/tests"
44

55
(* test printing of .res file*)
66
let () =
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)