move sgrep to subdirectory, pin pfff as git submodule (semgrep#258)

* move sgrep to subdirectory, pin pfff as git submodule
QPC-github · Mar 6, 2020 · 01bac59 · 01bac59
1 parent 1fed634
commit 01bac59
Show file tree

Hide file tree

Showing 460 changed files with 54 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,14 +10,9 @@ jobs:
     executor: sgrep-build
     steps:
       - checkout
-      - run: cd ~ && git clone  https://github.com/returntocorp/pfff
-      - run: eval $(opam env) && cd ~/pfff && ./configure && make depend && make && make opt && make install-libs
-      - run: eval $(opam env); make all
-      - run: cd sgrep_lint; make all
-      - persist_to_workspace:
-          root: /home/opam/project
-          paths:
-            - _build
+      - run: git submodule init && git submodule update --remote
+      - run: eval $(opam env) && cd ./pfff && ./configure && make depend && make && make opt && make install-libs
+      - run: eval $(opam env) && cd sgrep && make all
   build-lint:
     executor: sgrep-build
     steps:
@@ -27,14 +22,14 @@ jobs:
     executor: sgrep-build
     steps:
       - checkout
+      - run: git submodule init && git submodule update --remote
       - attach_workspace:
           at: /home/opam/project
       - run: pip3 install -r sgrep_lint/requirements.txt
       - run: ln -s /home/opam/project/_build/default/bin/main_sgrep.exe /home/opam/.local/bin/sgrep
-      - run: cd ~ && git clone  https://github.com/returntocorp/pfff # TODO remove and just mount these two lines
-      - run: eval $(opam env) && cd ~/pfff && ./configure && make depend && make && make opt && make install-libs
-      - run: eval $(opam env); make test
-      - run: cd sgrep_lint && make test
+      - run: eval $(opam env) && cd ./pfff && ./configure && make depend && make && make opt && make install-libs
+      - run: eval $(opam env) && cd sgrep && make test && make && make install
+      - run: eval $(opam env) && cd sgrep_lint && make test
 
 
 workflows:

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "pfff"]
+	path = pfff
+	url = [email protected]:returntocorp/pfff.git
diff --git a/Dockerfile b/Dockerfile
@@ -11,10 +11,8 @@ WORKDIR /home/opam/
 
 COPY --chown=opam . /home/opam/sgrep/
 
-RUN git clone https://github.com/returntocorp/pfff
-RUN eval $(opam env) && cd pfff && ./configure && make depend && make && make opt && make install-libs
-
-RUN eval $(opam env); cd sgrep; make all
+RUN eval $(opam env) && cd sgrep/pfff && ./configure && make depend && make && make opt && make install-libs
+RUN eval $(opam env) && cd sgrep; make all
 RUN /home/opam/sgrep/_build/default/bin/main_sgrep.exe -version
 
 ## sgrep lint build

diff --git a/docs/development.md b/docs/development.md
@@ -38,14 +38,15 @@ be yet in the latest OPAM version of pfff. In that case, install pfff
 manually by doing:
 
 ```bash
-git clone https://github.com/returntocorp/pfff
+git submodule init && git submodule update --remote
 cd pfff
 ./configure; make depend; make; make opt; make reinstall-libs
 ```
 
 Then you can compile the program with:
 
 ```bash
+cd sgrep
 dune build
 ```
 
@@ -58,15 +59,17 @@ Then to test sgrep on a file, for example tests/GENERIC/test.py
 run:
 
 ```bash
+cd sgrep
 ./_build/default/bin/main_sgrep.exe -e foo tests/python
 ...
 ```
 
 If you want to test sgrep on a directory with a set of given rules, run:
 
 ```bash
-cp ./_build/default/bin/main_sgrep.exe /usr/local/bin/sgrep
-cp ./sgrep.py /usr/local/bin/sgrep-lint
+cp ./sgrep/_build/default/bin/main_sgrep.exe /usr/local/bin/sgrep
+cd sgrep_lint
+make && make install
 sgrep-lint --config <YAML_FILE_OR_DIRECTORY> <code to check>
 ```
 

diff --git a/pfff b/pfff
diff --git a/Makefile → sgrep/Makefile b/Makefile → sgrep/Makefile
diff --git a/TODO/run-test.sh → sgrep/TODO/run-test.sh b/TODO/run-test.sh → sgrep/TODO/run-test.sh
diff --git a/bin/dune → sgrep/bin/dune b/bin/dune → sgrep/bin/dune
diff --git a/bin/main_sgrep.ml → sgrep/bin/main_sgrep.ml b/bin/main_sgrep.ml → sgrep/bin/main_sgrep.ml
diff --git a/bin/main_spatch.ml → sgrep/bin/main_spatch.ml b/bin/main_spatch.ml → sgrep/bin/main_spatch.ml
diff --git a/data/basic.yml → sgrep/data/basic.yml b/data/basic.yml → sgrep/data/basic.yml
diff --git a/demos/Makefile → sgrep/demos/Makefile b/demos/Makefile → sgrep/demos/Makefile
diff --git a/demos/dune → sgrep/demos/dune b/demos/dune → sgrep/demos/dune
diff --git a/demos/simple_refactoring.ml → sgrep/demos/simple_refactoring.ml b/demos/simple_refactoring.ml → sgrep/demos/simple_refactoring.ml
diff --git a/dune → sgrep/dune b/dune → sgrep/dune
diff --git a/dune-project → sgrep/dune-project b/dune-project → sgrep/dune-project
diff --git a/lib/dune → sgrep/lib/dune b/lib/dune → sgrep/lib/dune
diff --git a/lib/flag_matcher.ml → sgrep/lib/flag_matcher.ml b/lib/flag_matcher.ml → sgrep/lib/flag_matcher.ml
diff --git a/lib/fuzzy_vs_fuzzy.ml → sgrep/lib/fuzzy_vs_fuzzy.ml b/lib/fuzzy_vs_fuzzy.ml → sgrep/lib/fuzzy_vs_fuzzy.ml
diff --git a/lib/fuzzy_vs_fuzzy.mli → sgrep/lib/fuzzy_vs_fuzzy.mli b/lib/fuzzy_vs_fuzzy.mli → sgrep/lib/fuzzy_vs_fuzzy.mli
diff --git a/lib/generic_vs_generic.ml → sgrep/lib/generic_vs_generic.ml b/lib/generic_vs_generic.ml → sgrep/lib/generic_vs_generic.ml
diff --git a/lib/match_result.ml → sgrep/lib/match_result.ml b/lib/match_result.ml → sgrep/lib/match_result.ml
diff --git a/lib/matching_fuzzy.ml → sgrep/lib/matching_fuzzy.ml b/lib/matching_fuzzy.ml → sgrep/lib/matching_fuzzy.ml
diff --git a/lib/matching_fuzzy.mli → sgrep/lib/matching_fuzzy.mli b/lib/matching_fuzzy.mli → sgrep/lib/matching_fuzzy.mli
diff --git a/lib/matching_report.ml → sgrep/lib/matching_report.ml b/lib/matching_report.ml → sgrep/lib/matching_report.ml
diff --git a/lib/matching_report.mli → sgrep/lib/matching_report.mli b/lib/matching_report.mli → sgrep/lib/matching_report.mli
diff --git a/lib/metavars_fuzzy.ml → sgrep/lib/metavars_fuzzy.ml b/lib/metavars_fuzzy.ml → sgrep/lib/metavars_fuzzy.ml
diff --git a/lib/metavars_fuzzy.mli → sgrep/lib/metavars_fuzzy.mli b/lib/metavars_fuzzy.mli → sgrep/lib/metavars_fuzzy.mli
diff --git a/lib/metavars_generic.ml → sgrep/lib/metavars_generic.ml b/lib/metavars_generic.ml → sgrep/lib/metavars_generic.ml
diff --git a/lib/parse_rules.ml → sgrep/lib/parse_rules.ml b/lib/parse_rules.ml → sgrep/lib/parse_rules.ml
diff --git a/lib/parse_rules.mli → sgrep/lib/parse_rules.mli b/lib/parse_rules.mli → sgrep/lib/parse_rules.mli
diff --git a/lib/rule.ml → sgrep/lib/rule.ml b/lib/rule.ml → sgrep/lib/rule.ml
diff --git a/lib/sgrep_fuzzy.ml → sgrep/lib/sgrep_fuzzy.ml b/lib/sgrep_fuzzy.ml → sgrep/lib/sgrep_fuzzy.ml
diff --git a/lib/sgrep_fuzzy.mli → sgrep/lib/sgrep_fuzzy.mli b/lib/sgrep_fuzzy.mli → sgrep/lib/sgrep_fuzzy.mli
diff --git a/lib/sgrep_generic.ml → sgrep/lib/sgrep_generic.ml b/lib/sgrep_generic.ml → sgrep/lib/sgrep_generic.ml
diff --git a/lib/sgrep_lint_generic.ml → sgrep/lib/sgrep_lint_generic.ml b/lib/sgrep_lint_generic.ml → sgrep/lib/sgrep_lint_generic.ml
diff --git a/lib/sgrep_lint_generic.mli → sgrep/lib/sgrep_lint_generic.mli b/lib/sgrep_lint_generic.mli → sgrep/lib/sgrep_lint_generic.mli
diff --git a/lib/spatch_fuzzy.ml → sgrep/lib/spatch_fuzzy.ml b/lib/spatch_fuzzy.ml → sgrep/lib/spatch_fuzzy.ml
diff --git a/lib/spatch_fuzzy.mli → sgrep/lib/spatch_fuzzy.mli b/lib/spatch_fuzzy.mli → sgrep/lib/spatch_fuzzy.mli
diff --git a/lib/transforming_fuzzy.ml → sgrep/lib/transforming_fuzzy.ml b/lib/transforming_fuzzy.ml → sgrep/lib/transforming_fuzzy.ml
diff --git a/lib/transforming_fuzzy.mli → sgrep/lib/transforming_fuzzy.mli b/lib/transforming_fuzzy.mli → sgrep/lib/transforming_fuzzy.mli
diff --git a/lib/typechecking_generic.ml → sgrep/lib/typechecking_generic.ml b/lib/typechecking_generic.ml → sgrep/lib/typechecking_generic.ml
diff --git a/lib/typechecking_generic.mli → sgrep/lib/typechecking_generic.mli b/lib/typechecking_generic.mli → sgrep/lib/typechecking_generic.mli
diff --git a/lib/unit_matcher.ml → sgrep/lib/unit_matcher.ml b/lib/unit_matcher.ml → sgrep/lib/unit_matcher.ml
diff --git a/lib/unit_matcher.mli → sgrep/lib/unit_matcher.mli b/lib/unit_matcher.mli → sgrep/lib/unit_matcher.mli
diff --git a/old/editors/emacs/sgrep.el → sgrep/old/editors/emacs/sgrep.el b/old/editors/emacs/sgrep.el → sgrep/old/editors/emacs/sgrep.el
diff --git a/old/lang_php/META → sgrep/old/lang_php/META b/old/lang_php/META → sgrep/old/lang_php/META
diff --git a/old/lang_php/Makefile → sgrep/old/lang_php/Makefile b/old/lang_php/Makefile → sgrep/old/lang_php/Makefile
diff --git a/old/lang_php/flag_matcher_php.ml → sgrep/old/lang_php/flag_matcher_php.ml b/old/lang_php/flag_matcher_php.ml → sgrep/old/lang_php/flag_matcher_php.ml
diff --git a/old/lang_php/matching_php.ml → sgrep/old/lang_php/matching_php.ml b/old/lang_php/matching_php.ml → sgrep/old/lang_php/matching_php.ml
diff --git a/old/lang_php/matching_php.mli → sgrep/old/lang_php/matching_php.mli b/old/lang_php/matching_php.mli → sgrep/old/lang_php/matching_php.mli
diff --git a/old/lang_php/metavars_php.ml → sgrep/old/lang_php/metavars_php.ml b/old/lang_php/metavars_php.ml → sgrep/old/lang_php/metavars_php.ml
diff --git a/old/lang_php/metavars_php.mli → sgrep/old/lang_php/metavars_php.mli b/old/lang_php/metavars_php.mli → sgrep/old/lang_php/metavars_php.mli
diff --git a/old/lang_php/php_vs_php.ml → sgrep/old/lang_php/php_vs_php.ml b/old/lang_php/php_vs_php.ml → sgrep/old/lang_php/php_vs_php.ml
diff --git a/old/lang_php/php_vs_php.mli → sgrep/old/lang_php/php_vs_php.mli b/old/lang_php/php_vs_php.mli → sgrep/old/lang_php/php_vs_php.mli
diff --git a/old/lang_php/refactoring_code_php.ml → sgrep/old/lang_php/refactoring_code_php.ml b/old/lang_php/refactoring_code_php.ml → sgrep/old/lang_php/refactoring_code_php.ml
diff --git a/old/lang_php/refactoring_code_php.mli → sgrep/old/lang_php/refactoring_code_php.mli b/old/lang_php/refactoring_code_php.mli → sgrep/old/lang_php/refactoring_code_php.mli
diff --git a/old/lang_php/sgrep_php.ml → sgrep/old/lang_php/sgrep_php.ml b/old/lang_php/sgrep_php.ml → sgrep/old/lang_php/sgrep_php.ml
diff --git a/old/lang_php/sgrep_php.mli → sgrep/old/lang_php/sgrep_php.mli b/old/lang_php/sgrep_php.mli → sgrep/old/lang_php/sgrep_php.mli
diff --git a/old/lang_php/spatch_php.ml → sgrep/old/lang_php/spatch_php.ml b/old/lang_php/spatch_php.ml → sgrep/old/lang_php/spatch_php.ml
diff --git a/old/lang_php/spatch_php.mli → sgrep/old/lang_php/spatch_php.mli b/old/lang_php/spatch_php.mli → sgrep/old/lang_php/spatch_php.mli
diff --git a/old/lang_php/transforming_php.ml → sgrep/old/lang_php/transforming_php.ml b/old/lang_php/transforming_php.ml → sgrep/old/lang_php/transforming_php.ml
diff --git a/old/lang_php/transforming_php.mli → sgrep/old/lang_php/transforming_php.mli b/old/lang_php/transforming_php.mli → sgrep/old/lang_php/transforming_php.mli
diff --git a/old/lang_php/unit_matcher_php.ml → sgrep/old/lang_php/unit_matcher_php.ml b/old/lang_php/unit_matcher_php.ml → sgrep/old/lang_php/unit_matcher_php.ml
diff --git a/old/lang_php/unit_matcher_php.mli → sgrep/old/lang_php/unit_matcher_php.mli b/old/lang_php/unit_matcher_php.mli → sgrep/old/lang_php/unit_matcher_php.mli
diff --git a/scripts/import_parser_python_ast.py → sgrep/scripts/import_parser_python_ast.py b/scripts/import_parser_python_ast.py → sgrep/scripts/import_parser_python_ast.py
diff --git a/scripts/run-ocamldebug.sh → sgrep/scripts/run-ocamldebug.sh b/scripts/run-ocamldebug.sh → sgrep/scripts/run-ocamldebug.sh
diff --git a/sgrep.opam → sgrep/sgrep.opam b/sgrep.opam → sgrep/sgrep.opam
diff --git a/tests/GENERIC/concrete_syntax.sgrep → sgrep/tests/GENERIC/concrete_syntax.sgrep b/tests/GENERIC/concrete_syntax.sgrep → sgrep/tests/GENERIC/concrete_syntax.sgrep
diff --git a/tests/GENERIC/dots_args.sgrep → sgrep/tests/GENERIC/dots_args.sgrep b/tests/GENERIC/dots_args.sgrep → sgrep/tests/GENERIC/dots_args.sgrep
diff --git a/tests/GENERIC/dots_expr.sgrep → sgrep/tests/GENERIC/dots_expr.sgrep b/tests/GENERIC/dots_expr.sgrep → sgrep/tests/GENERIC/dots_expr.sgrep
diff --git a/tests/GENERIC/dots_nested_stmts.sgrep → sgrep/tests/GENERIC/dots_nested_stmts.sgrep b/tests/GENERIC/dots_nested_stmts.sgrep → sgrep/tests/GENERIC/dots_nested_stmts.sgrep
diff --git a/tests/GENERIC/dots_stmts.sgrep → sgrep/tests/GENERIC/dots_stmts.sgrep b/tests/GENERIC/dots_stmts.sgrep → sgrep/tests/GENERIC/dots_stmts.sgrep
diff --git a/tests/GENERIC/dots_string.sgrep → sgrep/tests/GENERIC/dots_string.sgrep b/tests/GENERIC/dots_string.sgrep → sgrep/tests/GENERIC/dots_string.sgrep
diff --git a/...IC/equivalence_constant_propagation.sgrep → ...IC/equivalence_constant_propagation.sgrep b/...IC/equivalence_constant_propagation.sgrep → ...IC/equivalence_constant_propagation.sgrep
diff --git a/tests/GENERIC/equivalence_eq.sgrep → sgrep/tests/GENERIC/equivalence_eq.sgrep b/tests/GENERIC/equivalence_eq.sgrep → sgrep/tests/GENERIC/equivalence_eq.sgrep
diff --git a/tests/GENERIC/metavar_arg.sgrep → sgrep/tests/GENERIC/metavar_arg.sgrep b/tests/GENERIC/metavar_arg.sgrep → sgrep/tests/GENERIC/metavar_arg.sgrep
diff --git a/tests/GENERIC/metavar_call.sgrep → sgrep/tests/GENERIC/metavar_call.sgrep b/tests/GENERIC/metavar_call.sgrep → sgrep/tests/GENERIC/metavar_call.sgrep
diff --git a/tests/GENERIC/metavar_cond.sgrep → sgrep/tests/GENERIC/metavar_cond.sgrep b/tests/GENERIC/metavar_cond.sgrep → sgrep/tests/GENERIC/metavar_cond.sgrep
diff --git a/tests/GENERIC/metavar_equality_expr.sgrep → ...tests/GENERIC/metavar_equality_expr.sgrep b/tests/GENERIC/metavar_equality_expr.sgrep → ...tests/GENERIC/metavar_equality_expr.sgrep
diff --git a/tests/GENERIC/metavar_equality_stmt.sgrep → ...tests/GENERIC/metavar_equality_stmt.sgrep b/tests/GENERIC/metavar_equality_stmt.sgrep → ...tests/GENERIC/metavar_equality_stmt.sgrep
diff --git a/tests/GENERIC/metavar_equality_var.sgrep → .../tests/GENERIC/metavar_equality_var.sgrep b/tests/GENERIC/metavar_equality_var.sgrep → .../tests/GENERIC/metavar_equality_var.sgrep
diff --git a/tests/GENERIC/metavar_stmt.sgrep → sgrep/tests/GENERIC/metavar_stmt.sgrep b/tests/GENERIC/metavar_stmt.sgrep → sgrep/tests/GENERIC/metavar_stmt.sgrep
diff --git a/tests/TODO/bad.py → sgrep/tests/TODO/bad.py b/tests/TODO/bad.py → sgrep/tests/TODO/bad.py
diff --git a/tests/TODO/basic.sgrep → sgrep/tests/TODO/basic.sgrep b/tests/TODO/basic.sgrep → sgrep/tests/TODO/basic.sgrep
diff --git a/tests/TODO/class.py → sgrep/tests/TODO/class.py b/tests/TODO/class.py → sgrep/tests/TODO/class.py
diff --git a/tests/TODO/dots.sgrep → sgrep/tests/TODO/dots.sgrep b/tests/TODO/dots.sgrep → sgrep/tests/TODO/dots.sgrep
diff --git a/tests/TODO/expr_vs_stmt_metavar.sgrep → sgrep/tests/TODO/expr_vs_stmt_metavar.sgrep b/tests/TODO/expr_vs_stmt_metavar.sgrep → sgrep/tests/TODO/expr_vs_stmt_metavar.sgrep
diff --git a/tests/TODO/flask.py → sgrep/tests/TODO/flask.py b/tests/TODO/flask.py → sgrep/tests/TODO/flask.py
diff --git a/tests/TODO/foo.js → sgrep/tests/TODO/foo.js b/tests/TODO/foo.js → sgrep/tests/TODO/foo.js
diff --git a/tests/TODO/foo.py → sgrep/tests/TODO/foo.py b/tests/TODO/foo.py → sgrep/tests/TODO/foo.py
diff --git a/tests/TODO/global.py → sgrep/tests/TODO/global.py b/tests/TODO/global.py → sgrep/tests/TODO/global.py
diff --git a/tests/TODO/imports.py → sgrep/tests/TODO/imports.py b/tests/TODO/imports.py → sgrep/tests/TODO/imports.py
diff --git a/tests/TODO/imports2.py → sgrep/tests/TODO/imports2.py b/tests/TODO/imports2.py → sgrep/tests/TODO/imports2.py
diff --git a/tests/TODO/metavar.sgrep → sgrep/tests/TODO/metavar.sgrep b/tests/TODO/metavar.sgrep → sgrep/tests/TODO/metavar.sgrep
diff --git a/tests/TODO/name_metavar.sgrep → sgrep/tests/TODO/name_metavar.sgrep b/tests/TODO/name_metavar.sgrep → sgrep/tests/TODO/name_metavar.sgrep
diff --git a/tests/TODO/protocol.sgrep → sgrep/tests/TODO/protocol.sgrep b/tests/TODO/protocol.sgrep → sgrep/tests/TODO/protocol.sgrep
diff --git a/tests/TODO/stmt.sgrep → sgrep/tests/TODO/stmt.sgrep b/tests/TODO/stmt.sgrep → sgrep/tests/TODO/stmt.sgrep
diff --git a/tests/TODO/stmt_basic.sgrep → sgrep/tests/TODO/stmt_basic.sgrep b/tests/TODO/stmt_basic.sgrep → sgrep/tests/TODO/stmt_basic.sgrep
diff --git a/tests/TODO/stmt_dots.sgrep → sgrep/tests/TODO/stmt_dots.sgrep b/tests/TODO/stmt_dots.sgrep → sgrep/tests/TODO/stmt_dots.sgrep
diff --git a/tests/TODO/stmt_ellipsis.py → sgrep/tests/TODO/stmt_ellipsis.py b/tests/TODO/stmt_ellipsis.py → sgrep/tests/TODO/stmt_ellipsis.py
diff --git a/tests/TODO/stmt_ellipsis.sgrep → sgrep/tests/TODO/stmt_ellipsis.sgrep b/tests/TODO/stmt_ellipsis.sgrep → sgrep/tests/TODO/stmt_ellipsis.sgrep
diff --git a/tests/TODO/stmt_metavar.sgrep → sgrep/tests/TODO/stmt_metavar.sgrep b/tests/TODO/stmt_metavar.sgrep → sgrep/tests/TODO/stmt_metavar.sgrep
diff --git a/tests/TODO/string.sgrep → sgrep/tests/TODO/string.sgrep b/tests/TODO/string.sgrep → sgrep/tests/TODO/string.sgrep
diff --git a/tests/TODO/stupid.py → sgrep/tests/TODO/stupid.py b/tests/TODO/stupid.py → sgrep/tests/TODO/stupid.py
diff --git a/tests/TODO/stupid_if.sgrep → sgrep/tests/TODO/stupid_if.sgrep b/tests/TODO/stupid_if.sgrep → sgrep/tests/TODO/stupid_if.sgrep
diff --git a/tests/TODO/test.py → sgrep/tests/TODO/test.py b/tests/TODO/test.py → sgrep/tests/TODO/test.py
diff --git a/tests/TODO/unify.sgrep → sgrep/tests/TODO/unify.sgrep b/tests/TODO/unify.sgrep → sgrep/tests/TODO/unify.sgrep
diff --git a/tests/c/aliasing.TODO → sgrep/tests/c/aliasing.TODO b/tests/c/aliasing.TODO → sgrep/tests/c/aliasing.TODO
diff --git a/tests/c/concrete_syntax.c → sgrep/tests/c/concrete_syntax.c b/tests/c/concrete_syntax.c → sgrep/tests/c/concrete_syntax.c
diff --git a/tests/c/dots_args.c → sgrep/tests/c/dots_args.c b/tests/c/dots_args.c → sgrep/tests/c/dots_args.c
diff --git a/tests/c/dots_stmts.c → sgrep/tests/c/dots_stmts.c b/tests/c/dots_stmts.c → sgrep/tests/c/dots_stmts.c
diff --git a/tests/c/dots_string.c → sgrep/tests/c/dots_string.c b/tests/c/dots_string.c → sgrep/tests/c/dots_string.c
diff --git a/tests/c/equivalence_eq.c → sgrep/tests/c/equivalence_eq.c b/tests/c/equivalence_eq.c → sgrep/tests/c/equivalence_eq.c
diff --git a/tests/c/goto_fail.c → sgrep/tests/c/goto_fail.c b/tests/c/goto_fail.c → sgrep/tests/c/goto_fail.c
diff --git a/tests/c/goto_fail.sgrep → sgrep/tests/c/goto_fail.sgrep b/tests/c/goto_fail.sgrep → sgrep/tests/c/goto_fail.sgrep
diff --git a/tests/c/metavar_arg.c → sgrep/tests/c/metavar_arg.c b/tests/c/metavar_arg.c → sgrep/tests/c/metavar_arg.c
diff --git a/tests/c/metavar_call.c → sgrep/tests/c/metavar_call.c b/tests/c/metavar_call.c → sgrep/tests/c/metavar_call.c
diff --git a/tests/c/metavar_cond.c → sgrep/tests/c/metavar_cond.c b/tests/c/metavar_cond.c → sgrep/tests/c/metavar_cond.c
diff --git a/tests/c/metavar_equality_expr.c → sgrep/tests/c/metavar_equality_expr.c b/tests/c/metavar_equality_expr.c → sgrep/tests/c/metavar_equality_expr.c
diff --git a/tests/c/metavar_equality_stmt.c → sgrep/tests/c/metavar_equality_stmt.c b/tests/c/metavar_equality_stmt.c → sgrep/tests/c/metavar_equality_stmt.c
diff --git a/tests/c/metavar_equality_var.c → sgrep/tests/c/metavar_equality_var.c b/tests/c/metavar_equality_var.c → sgrep/tests/c/metavar_equality_var.c
diff --git a/tests/c/metavar_stmt.c → sgrep/tests/c/metavar_stmt.c b/tests/c/metavar_stmt.c → sgrep/tests/c/metavar_stmt.c
diff --git a/tests/cpp/sgrep/namespace.cpp → sgrep/tests/cpp/sgrep/namespace.cpp b/tests/cpp/sgrep/namespace.cpp → sgrep/tests/cpp/sgrep/namespace.cpp
diff --git a/tests/cpp/sgrep/namespace.sgrep → sgrep/tests/cpp/sgrep/namespace.sgrep b/tests/cpp/sgrep/namespace.sgrep → sgrep/tests/cpp/sgrep/namespace.sgrep
diff --git a/tests/cpp/spatch/namespace.cpp → sgrep/tests/cpp/spatch/namespace.cpp b/tests/cpp/spatch/namespace.cpp → sgrep/tests/cpp/spatch/namespace.cpp
diff --git a/tests/cpp/spatch/namespace.spatch → sgrep/tests/cpp/spatch/namespace.spatch b/tests/cpp/spatch/namespace.spatch → sgrep/tests/cpp/spatch/namespace.spatch
diff --git a/tests/dune → sgrep/tests/dune b/tests/dune → sgrep/tests/dune
diff --git a/tests/fuzzy/sgrep/funcall.cpp → sgrep/tests/fuzzy/sgrep/funcall.cpp b/tests/fuzzy/sgrep/funcall.cpp → sgrep/tests/fuzzy/sgrep/funcall.cpp
diff --git a/tests/fuzzy/sgrep/metavar.cpp → sgrep/tests/fuzzy/sgrep/metavar.cpp b/tests/fuzzy/sgrep/metavar.cpp → sgrep/tests/fuzzy/sgrep/metavar.cpp
diff --git a/tests/fuzzy/sgrep/phpfuzzy.php → sgrep/tests/fuzzy/sgrep/phpfuzzy.php b/tests/fuzzy/sgrep/phpfuzzy.php → sgrep/tests/fuzzy/sgrep/phpfuzzy.php
diff --git a/tests/fuzzy/spatch/constructor.exp → sgrep/tests/fuzzy/spatch/constructor.exp b/tests/fuzzy/spatch/constructor.exp → sgrep/tests/fuzzy/spatch/constructor.exp
diff --git a/tests/fuzzy/spatch/constructor.fuzzy → sgrep/tests/fuzzy/spatch/constructor.fuzzy b/tests/fuzzy/spatch/constructor.fuzzy → sgrep/tests/fuzzy/spatch/constructor.fuzzy
diff --git a/tests/fuzzy/spatch/constructor.spatch → sgrep/tests/fuzzy/spatch/constructor.spatch b/tests/fuzzy/spatch/constructor.spatch → sgrep/tests/fuzzy/spatch/constructor.spatch
diff --git a/tests/fuzzy/spatch/identifier_vs_strings.exp → ...ts/fuzzy/spatch/identifier_vs_strings.exp b/tests/fuzzy/spatch/identifier_vs_strings.exp → ...ts/fuzzy/spatch/identifier_vs_strings.exp
diff --git a/.../fuzzy/spatch/identifier_vs_strings.fuzzy → .../fuzzy/spatch/identifier_vs_strings.fuzzy b/.../fuzzy/spatch/identifier_vs_strings.fuzzy → .../fuzzy/spatch/identifier_vs_strings.fuzzy
diff --git a/...fuzzy/spatch/identifier_vs_strings.spatch → ...fuzzy/spatch/identifier_vs_strings.spatch b/...fuzzy/spatch/identifier_vs_strings.spatch → ...fuzzy/spatch/identifier_vs_strings.spatch
diff --git a/tests/fuzzy/spatch/namespace.exp → sgrep/tests/fuzzy/spatch/namespace.exp b/tests/fuzzy/spatch/namespace.exp → sgrep/tests/fuzzy/spatch/namespace.exp
diff --git a/tests/fuzzy/spatch/namespace.fuzzy → sgrep/tests/fuzzy/spatch/namespace.fuzzy b/tests/fuzzy/spatch/namespace.fuzzy → sgrep/tests/fuzzy/spatch/namespace.fuzzy
diff --git a/tests/fuzzy/spatch/namespace.spatch → sgrep/tests/fuzzy/spatch/namespace.spatch b/tests/fuzzy/spatch/namespace.spatch → sgrep/tests/fuzzy/spatch/namespace.spatch
diff --git a/tests/generate_test_matrix.py → sgrep/tests/generate_test_matrix.py b/tests/generate_test_matrix.py → sgrep/tests/generate_test_matrix.py
diff --git a/tests/go/aliasing.TODO → sgrep/tests/go/aliasing.TODO b/tests/go/aliasing.TODO → sgrep/tests/go/aliasing.TODO
diff --git a/tests/go/concrete_syntax.go → sgrep/tests/go/concrete_syntax.go b/tests/go/concrete_syntax.go → sgrep/tests/go/concrete_syntax.go
diff --git a/tests/go/dots_args.go → sgrep/tests/go/dots_args.go b/tests/go/dots_args.go → sgrep/tests/go/dots_args.go
diff --git a/tests/go/dots_attributes.go → sgrep/tests/go/dots_attributes.go b/tests/go/dots_attributes.go → sgrep/tests/go/dots_attributes.go
diff --git a/tests/go/dots_attributes.sgrep → sgrep/tests/go/dots_attributes.sgrep b/tests/go/dots_attributes.sgrep → sgrep/tests/go/dots_attributes.sgrep
diff --git a/tests/go/dots_expr.go → sgrep/tests/go/dots_expr.go b/tests/go/dots_expr.go → sgrep/tests/go/dots_expr.go
diff --git a/tests/go/dots_nested_stmts.go → sgrep/tests/go/dots_nested_stmts.go b/tests/go/dots_nested_stmts.go → sgrep/tests/go/dots_nested_stmts.go
diff --git a/tests/go/dots_nested_stmts.sgrep → sgrep/tests/go/dots_nested_stmts.sgrep b/tests/go/dots_nested_stmts.sgrep → sgrep/tests/go/dots_nested_stmts.sgrep
diff --git a/tests/go/dots_params.go → sgrep/tests/go/dots_params.go b/tests/go/dots_params.go → sgrep/tests/go/dots_params.go
diff --git a/tests/go/dots_params.sgrep → sgrep/tests/go/dots_params.sgrep b/tests/go/dots_params.sgrep → sgrep/tests/go/dots_params.sgrep
diff --git a/tests/go/dots_stmts.go → sgrep/tests/go/dots_stmts.go b/tests/go/dots_stmts.go → sgrep/tests/go/dots_stmts.go
diff --git a/tests/go/dots_stmts.sgrep → sgrep/tests/go/dots_stmts.sgrep b/tests/go/dots_stmts.sgrep → sgrep/tests/go/dots_stmts.sgrep
diff --git a/tests/go/dots_stmts2.go → sgrep/tests/go/dots_stmts2.go b/tests/go/dots_stmts2.go → sgrep/tests/go/dots_stmts2.go
diff --git a/tests/go/dots_stmts2.newline.go → sgrep/tests/go/dots_stmts2.newline.go b/tests/go/dots_stmts2.newline.go → sgrep/tests/go/dots_stmts2.newline.go
diff --git a/tests/go/dots_stmts2.newline.sgrep → sgrep/tests/go/dots_stmts2.newline.sgrep b/tests/go/dots_stmts2.newline.sgrep → sgrep/tests/go/dots_stmts2.newline.sgrep
diff --git a/tests/go/dots_stmts2.sgrep → sgrep/tests/go/dots_stmts2.sgrep b/tests/go/dots_stmts2.sgrep → sgrep/tests/go/dots_stmts2.sgrep
diff --git a/tests/go/dots_string.go → sgrep/tests/go/dots_string.go b/tests/go/dots_string.go → sgrep/tests/go/dots_string.go
diff --git a/tests/go/dots_struct_fields.TODO → sgrep/tests/go/dots_struct_fields.TODO b/tests/go/dots_struct_fields.TODO → sgrep/tests/go/dots_struct_fields.TODO
diff --git a/tests/go/dots_struct_fields.go.TODO → sgrep/tests/go/dots_struct_fields.go.TODO b/tests/go/dots_struct_fields.go.TODO → sgrep/tests/go/dots_struct_fields.go.TODO
diff --git a/tests/go/equivalence_constant_propagation.go → ...ts/go/equivalence_constant_propagation.go b/tests/go/equivalence_constant_propagation.go → ...ts/go/equivalence_constant_propagation.go
diff --git a/tests/go/equivalence_eq.go → sgrep/tests/go/equivalence_eq.go b/tests/go/equivalence_eq.go → sgrep/tests/go/equivalence_eq.go
diff --git a/tests/go/equivalence_naming_import.go → sgrep/tests/go/equivalence_naming_import.go b/tests/go/equivalence_naming_import.go → sgrep/tests/go/equivalence_naming_import.go
diff --git a/tests/go/equivalence_naming_import.sgrep → .../tests/go/equivalence_naming_import.sgrep b/tests/go/equivalence_naming_import.sgrep → .../tests/go/equivalence_naming_import.sgrep
diff --git a/tests/go/imports.go → sgrep/tests/go/imports.go b/tests/go/imports.go → sgrep/tests/go/imports.go
diff --git a/tests/go/imports.sgrep → sgrep/tests/go/imports.sgrep b/tests/go/imports.sgrep → sgrep/tests/go/imports.sgrep
diff --git a/tests/go/imports_prefix.go → sgrep/tests/go/imports_prefix.go b/tests/go/imports_prefix.go → sgrep/tests/go/imports_prefix.go
diff --git a/tests/go/imports_prefix.sgrep → sgrep/tests/go/imports_prefix.sgrep b/tests/go/imports_prefix.sgrep → sgrep/tests/go/imports_prefix.sgrep
diff --git a/tests/go/metavar_arg.go → sgrep/tests/go/metavar_arg.go b/tests/go/metavar_arg.go → sgrep/tests/go/metavar_arg.go
diff --git a/tests/go/metavar_call.go → sgrep/tests/go/metavar_call.go b/tests/go/metavar_call.go → sgrep/tests/go/metavar_call.go
diff --git a/tests/go/metavar_cond.go → sgrep/tests/go/metavar_cond.go b/tests/go/metavar_cond.go → sgrep/tests/go/metavar_cond.go
diff --git a/tests/go/metavar_cond.sgrep → sgrep/tests/go/metavar_cond.sgrep b/tests/go/metavar_cond.sgrep → sgrep/tests/go/metavar_cond.sgrep
diff --git a/tests/go/metavar_equality_expr.go → sgrep/tests/go/metavar_equality_expr.go b/tests/go/metavar_equality_expr.go → sgrep/tests/go/metavar_equality_expr.go
diff --git a/tests/go/metavar_equality_stmt.TODO → sgrep/tests/go/metavar_equality_stmt.TODO b/tests/go/metavar_equality_stmt.TODO → sgrep/tests/go/metavar_equality_stmt.TODO
diff --git a/tests/go/metavar_equality_var.go → sgrep/tests/go/metavar_equality_var.go b/tests/go/metavar_equality_var.go → sgrep/tests/go/metavar_equality_var.go
diff --git a/tests/go/metavar_equality_vardef_vs_use.go → ...ests/go/metavar_equality_vardef_vs_use.go b/tests/go/metavar_equality_vardef_vs_use.go → ...ests/go/metavar_equality_vardef_vs_use.go
diff --git a/...s/go/metavar_equality_vardef_vs_use.sgrep → ...s/go/metavar_equality_vardef_vs_use.sgrep b/...s/go/metavar_equality_vardef_vs_use.sgrep → ...s/go/metavar_equality_vardef_vs_use.sgrep
diff --git a/tests/go/metavar_stmt.TODO → sgrep/tests/go/metavar_stmt.TODO b/tests/go/metavar_stmt.TODO → sgrep/tests/go/metavar_stmt.TODO
diff --git a/tests/go/misc_import.go → sgrep/tests/go/misc_import.go b/tests/go/misc_import.go → sgrep/tests/go/misc_import.go
diff --git a/tests/go/misc_import.sgrep → sgrep/tests/go/misc_import.sgrep b/tests/go/misc_import.sgrep → sgrep/tests/go/misc_import.sgrep
diff --git a/tests/java/aliasing.TODO → sgrep/tests/java/aliasing.TODO b/tests/java/aliasing.TODO → sgrep/tests/java/aliasing.TODO
diff --git a/tests/java/concrete_syntax.java → sgrep/tests/java/concrete_syntax.java b/tests/java/concrete_syntax.java → sgrep/tests/java/concrete_syntax.java
diff --git a/tests/java/dots_args.java → sgrep/tests/java/dots_args.java b/tests/java/dots_args.java → sgrep/tests/java/dots_args.java
diff --git a/tests/java/dots_expr.java → sgrep/tests/java/dots_expr.java b/tests/java/dots_expr.java → sgrep/tests/java/dots_expr.java
diff --git a/tests/java/dots_nested_stmts.java → sgrep/tests/java/dots_nested_stmts.java b/tests/java/dots_nested_stmts.java → sgrep/tests/java/dots_nested_stmts.java
diff --git a/tests/java/dots_stmts.java → sgrep/tests/java/dots_stmts.java b/tests/java/dots_stmts.java → sgrep/tests/java/dots_stmts.java
diff --git a/tests/java/dots_string.java → sgrep/tests/java/dots_string.java b/tests/java/dots_string.java → sgrep/tests/java/dots_string.java
diff --git a/tests/java/equivalence_eq.java → sgrep/tests/java/equivalence_eq.java b/tests/java/equivalence_eq.java → sgrep/tests/java/equivalence_eq.java
diff --git a/tests/java/equivalence_naming_import.TODO → ...tests/java/equivalence_naming_import.TODO b/tests/java/equivalence_naming_import.TODO → ...tests/java/equivalence_naming_import.TODO
diff --git a/tests/java/less_inheritance.TODO → sgrep/tests/java/less_inheritance.TODO b/tests/java/less_inheritance.TODO → sgrep/tests/java/less_inheritance.TODO
diff --git a/tests/java/less_inheritance.java.TODO → sgrep/tests/java/less_inheritance.java.TODO b/tests/java/less_inheritance.java.TODO → sgrep/tests/java/less_inheritance.java.TODO
diff --git a/tests/java/metavar_arg.java → sgrep/tests/java/metavar_arg.java b/tests/java/metavar_arg.java → sgrep/tests/java/metavar_arg.java
diff --git a/tests/java/metavar_call.java → sgrep/tests/java/metavar_call.java b/tests/java/metavar_call.java → sgrep/tests/java/metavar_call.java
diff --git a/tests/java/metavar_cond.java → sgrep/tests/java/metavar_cond.java b/tests/java/metavar_cond.java → sgrep/tests/java/metavar_cond.java
diff --git a/tests/java/metavar_equality_expr.java → sgrep/tests/java/metavar_equality_expr.java b/tests/java/metavar_equality_expr.java → sgrep/tests/java/metavar_equality_expr.java
diff --git a/tests/java/metavar_equality_stmt.java → sgrep/tests/java/metavar_equality_stmt.java b/tests/java/metavar_equality_stmt.java → sgrep/tests/java/metavar_equality_stmt.java
diff --git a/tests/java/metavar_equality_var.java → sgrep/tests/java/metavar_equality_var.java b/tests/java/metavar_equality_var.java → sgrep/tests/java/metavar_equality_var.java
diff --git a/tests/java/metavar_stmt.java → sgrep/tests/java/metavar_stmt.java b/tests/java/metavar_stmt.java → sgrep/tests/java/metavar_stmt.java
diff --git a/tests/java/misc_assert.java → sgrep/tests/java/misc_assert.java b/tests/java/misc_assert.java → sgrep/tests/java/misc_assert.java
diff --git a/tests/java/misc_assert.sgrep → sgrep/tests/java/misc_assert.sgrep b/tests/java/misc_assert.sgrep → sgrep/tests/java/misc_assert.sgrep
diff --git a/tests/js/aliasing.TODO → sgrep/tests/js/aliasing.TODO b/tests/js/aliasing.TODO → sgrep/tests/js/aliasing.TODO
diff --git a/tests/js/concrete_syntax.js → sgrep/tests/js/concrete_syntax.js b/tests/js/concrete_syntax.js → sgrep/tests/js/concrete_syntax.js
diff --git a/tests/js/dots_args.js → sgrep/tests/js/dots_args.js b/tests/js/dots_args.js → sgrep/tests/js/dots_args.js
diff --git a/tests/js/dots_class_field.js → sgrep/tests/js/dots_class_field.js b/tests/js/dots_class_field.js → sgrep/tests/js/dots_class_field.js
diff --git a/tests/js/dots_class_field.sgrep → sgrep/tests/js/dots_class_field.sgrep b/tests/js/dots_class_field.sgrep → sgrep/tests/js/dots_class_field.sgrep
diff --git a/tests/js/dots_expr.js → sgrep/tests/js/dots_expr.js b/tests/js/dots_expr.js → sgrep/tests/js/dots_expr.js
diff --git a/tests/js/dots_inheritance.js → sgrep/tests/js/dots_inheritance.js b/tests/js/dots_inheritance.js → sgrep/tests/js/dots_inheritance.js
diff --git a/tests/js/dots_inheritance.sgrep → sgrep/tests/js/dots_inheritance.sgrep b/tests/js/dots_inheritance.sgrep → sgrep/tests/js/dots_inheritance.sgrep
diff --git a/tests/js/dots_nested_stmts.js → sgrep/tests/js/dots_nested_stmts.js b/tests/js/dots_nested_stmts.js → sgrep/tests/js/dots_nested_stmts.js
diff --git a/tests/js/dots_params.js → sgrep/tests/js/dots_params.js b/tests/js/dots_params.js → sgrep/tests/js/dots_params.js
diff --git a/tests/js/dots_params.sgrep → sgrep/tests/js/dots_params.sgrep b/tests/js/dots_params.sgrep → sgrep/tests/js/dots_params.sgrep
diff --git a/tests/js/dots_stmts.js → sgrep/tests/js/dots_stmts.js b/tests/js/dots_stmts.js → sgrep/tests/js/dots_stmts.js
diff --git a/tests/js/dots_string.js → sgrep/tests/js/dots_string.js b/tests/js/dots_string.js → sgrep/tests/js/dots_string.js
diff --git a/tests/js/equivalence_constant_propagation.js → ...ts/js/equivalence_constant_propagation.js b/tests/js/equivalence_constant_propagation.js → ...ts/js/equivalence_constant_propagation.js
diff --git a/tests/js/equivalence_eq.js → sgrep/tests/js/equivalence_eq.js b/tests/js/equivalence_eq.js → sgrep/tests/js/equivalence_eq.js
diff --git a/tests/js/equivalence_keyword_args.TODO → sgrep/tests/js/equivalence_keyword_args.TODO b/tests/js/equivalence_keyword_args.TODO → sgrep/tests/js/equivalence_keyword_args.TODO
diff --git a/tests/js/equivalence_keyword_args.sgrep → ...p/tests/js/equivalence_keyword_args.sgrep b/tests/js/equivalence_keyword_args.sgrep → ...p/tests/js/equivalence_keyword_args.sgrep
diff --git a/tests/js/equivalence_naming_import.TODO → ...p/tests/js/equivalence_naming_import.TODO b/tests/js/equivalence_naming_import.TODO → ...p/tests/js/equivalence_naming_import.TODO
diff --git a/tests/js/imports.TODO → sgrep/tests/js/imports.TODO b/tests/js/imports.TODO → sgrep/tests/js/imports.TODO
diff --git a/tests/js/imports.js.TODO → sgrep/tests/js/imports.js.TODO b/tests/js/imports.js.TODO → sgrep/tests/js/imports.js.TODO
diff --git a/tests/js/less_class_complex.js → sgrep/tests/js/less_class_complex.js b/tests/js/less_class_complex.js → sgrep/tests/js/less_class_complex.js
diff --git a/tests/js/less_class_complex.sgrep → sgrep/tests/js/less_class_complex.sgrep b/tests/js/less_class_complex.sgrep → sgrep/tests/js/less_class_complex.sgrep
diff --git a/tests/js/less_class_complex_2.js → sgrep/tests/js/less_class_complex_2.js b/tests/js/less_class_complex_2.js → sgrep/tests/js/less_class_complex_2.js
diff --git a/tests/js/less_class_complex_2.sgrep → sgrep/tests/js/less_class_complex_2.sgrep b/tests/js/less_class_complex_2.sgrep → sgrep/tests/js/less_class_complex_2.sgrep
diff --git a/tests/js/metavar_arg.js → sgrep/tests/js/metavar_arg.js b/tests/js/metavar_arg.js → sgrep/tests/js/metavar_arg.js
diff --git a/tests/js/metavar_call.js → sgrep/tests/js/metavar_call.js b/tests/js/metavar_call.js → sgrep/tests/js/metavar_call.js
diff --git a/tests/js/metavar_cond.js → sgrep/tests/js/metavar_cond.js b/tests/js/metavar_cond.js → sgrep/tests/js/metavar_cond.js
diff --git a/tests/js/metavar_equality_expr.js → sgrep/tests/js/metavar_equality_expr.js b/tests/js/metavar_equality_expr.js → sgrep/tests/js/metavar_equality_expr.js
diff --git a/tests/js/metavar_equality_stmt.js → sgrep/tests/js/metavar_equality_stmt.js b/tests/js/metavar_equality_stmt.js → sgrep/tests/js/metavar_equality_stmt.js
diff --git a/tests/js/metavar_equality_var.js → sgrep/tests/js/metavar_equality_var.js b/tests/js/metavar_equality_var.js → sgrep/tests/js/metavar_equality_var.js
diff --git a/tests/js/metavar_equality_vardef_vs_use.js → ...ests/js/metavar_equality_vardef_vs_use.js b/tests/js/metavar_equality_vardef_vs_use.js → ...ests/js/metavar_equality_vardef_vs_use.js
diff --git a/...s/js/metavar_equality_vardef_vs_use.sgrep → ...s/js/metavar_equality_vardef_vs_use.sgrep b/...s/js/metavar_equality_vardef_vs_use.sgrep → ...s/js/metavar_equality_vardef_vs_use.sgrep
diff --git a/tests/js/metavar_stmt.js → sgrep/tests/js/metavar_stmt.js b/tests/js/metavar_stmt.js → sgrep/tests/js/metavar_stmt.js
diff --git a/sgrep/tests/js/misc_id_vs_name.js b/sgrep/tests/js/misc_id_vs_name.js
@@ -0,0 +1,9 @@
+//ERROR: match
+var foo = "bar";
+console.log(foo);
+
+function test() {
+    //ERROR: match
+    var foo2 = "bar";
+    console.log(foo2);
+}
diff --git a/sgrep/tests/js/misc_id_vs_name.sgrep b/sgrep/tests/js/misc_id_vs_name.sgrep
@@ -0,0 +1,2 @@
+var $X = ...;
+console.log($X);
diff --git a/tests/lint/stupid.py → sgrep/tests/lint/stupid.py b/tests/lint/stupid.py → sgrep/tests/lint/stupid.py
diff --git a/tests/ml/sgrep/foo.ml → sgrep/tests/ml/sgrep/foo.ml b/tests/ml/sgrep/foo.ml → sgrep/tests/ml/sgrep/foo.ml
diff --git a/tests/ml/spatch/foo.ml → sgrep/tests/ml/spatch/foo.ml b/tests/ml/spatch/foo.ml → sgrep/tests/ml/spatch/foo.ml
diff --git a/tests/ml/spatch/foo.spatch → sgrep/tests/ml/spatch/foo.spatch b/tests/ml/spatch/foo.spatch → sgrep/tests/ml/spatch/foo.spatch
diff --git a/tests/php/sgrep/argref.php → sgrep/tests/php/sgrep/argref.php b/tests/php/sgrep/argref.php → sgrep/tests/php/sgrep/argref.php
diff --git a/tests/php/sgrep/boolean_vs_int.php → sgrep/tests/php/sgrep/boolean_vs_int.php b/tests/php/sgrep/boolean_vs_int.php → sgrep/tests/php/sgrep/boolean_vs_int.php
diff --git a/tests/php/sgrep/case_sensitive.php → sgrep/tests/php/sgrep/case_sensitive.php b/tests/php/sgrep/case_sensitive.php → sgrep/tests/php/sgrep/case_sensitive.php
diff --git a/tests/php/sgrep/debug_rlog.php → sgrep/tests/php/sgrep/debug_rlog.php b/tests/php/sgrep/debug_rlog.php → sgrep/tests/php/sgrep/debug_rlog.php
diff --git a/tests/php/sgrep/expr_pattern.php → sgrep/tests/php/sgrep/expr_pattern.php b/tests/php/sgrep/expr_pattern.php → sgrep/tests/php/sgrep/expr_pattern.php
diff --git a/tests/php/sgrep/fbt.php → sgrep/tests/php/sgrep/fbt.php b/tests/php/sgrep/fbt.php → sgrep/tests/php/sgrep/fbt.php
diff --git a/tests/php/sgrep/foo.php → sgrep/tests/php/sgrep/foo.php b/tests/php/sgrep/foo.php → sgrep/tests/php/sgrep/foo.php
diff --git a/tests/php/sgrep/foo_expr.sgrep → sgrep/tests/php/sgrep/foo_expr.sgrep b/tests/php/sgrep/foo_expr.sgrep → sgrep/tests/php/sgrep/foo_expr.sgrep
diff --git a/tests/php/sgrep/foreach.php → sgrep/tests/php/sgrep/foreach.php b/tests/php/sgrep/foreach.php → sgrep/tests/php/sgrep/foreach.php
diff --git a/tests/php/sgrep/foreach.sgrep → sgrep/tests/php/sgrep/foreach.sgrep b/tests/php/sgrep/foreach.sgrep → sgrep/tests/php/sgrep/foreach.sgrep
diff --git a/tests/php/sgrep/foreach.spatch → sgrep/tests/php/sgrep/foreach.spatch b/tests/php/sgrep/foreach.spatch → sgrep/tests/php/sgrep/foreach.spatch
diff --git a/tests/php/sgrep/foreach2.spatch → sgrep/tests/php/sgrep/foreach2.spatch b/tests/php/sgrep/foreach2.spatch → sgrep/tests/php/sgrep/foreach2.spatch
diff --git a/tests/php/sgrep/if.php → sgrep/tests/php/sgrep/if.php b/tests/php/sgrep/if.php → sgrep/tests/php/sgrep/if.php
diff --git a/tests/php/sgrep/keywords_arguments.php → sgrep/tests/php/sgrep/keywords_arguments.php b/tests/php/sgrep/keywords_arguments.php → sgrep/tests/php/sgrep/keywords_arguments.php
diff --git a/tests/php/sgrep/many_args.php → sgrep/tests/php/sgrep/many_args.php b/tests/php/sgrep/many_args.php → sgrep/tests/php/sgrep/many_args.php
diff --git a/tests/php/sgrep/many_args.sgrep → sgrep/tests/php/sgrep/many_args.sgrep b/tests/php/sgrep/many_args.sgrep → sgrep/tests/php/sgrep/many_args.sgrep
diff --git a/tests/php/sgrep/multi.sgrep → sgrep/tests/php/sgrep/multi.sgrep b/tests/php/sgrep/multi.sgrep → sgrep/tests/php/sgrep/multi.sgrep
diff --git a/tests/php/sgrep/namespace.php → sgrep/tests/php/sgrep/namespace.php b/tests/php/sgrep/namespace.php → sgrep/tests/php/sgrep/namespace.php
diff --git a/tests/php/sgrep/namespace2.php → sgrep/tests/php/sgrep/namespace2.php b/tests/php/sgrep/namespace2.php → sgrep/tests/php/sgrep/namespace2.php
diff --git a/tests/php/sgrep/new_var.php → sgrep/tests/php/sgrep/new_var.php b/tests/php/sgrep/new_var.php → sgrep/tests/php/sgrep/new_var.php
diff --git a/tests/php/sgrep/regexp.php → sgrep/tests/php/sgrep/regexp.php b/tests/php/sgrep/regexp.php → sgrep/tests/php/sgrep/regexp.php
diff --git a/tests/php/sgrep/regexp.sgrep → sgrep/tests/php/sgrep/regexp.sgrep b/tests/php/sgrep/regexp.sgrep → sgrep/tests/php/sgrep/regexp.sgrep
diff --git a/tests/php/sgrep/return_this.php → sgrep/tests/php/sgrep/return_this.php b/tests/php/sgrep/return_this.php → sgrep/tests/php/sgrep/return_this.php
diff --git a/tests/php/sgrep/statement_pattern.php → sgrep/tests/php/sgrep/statement_pattern.php b/tests/php/sgrep/statement_pattern.php → sgrep/tests/php/sgrep/statement_pattern.php
diff --git a/tests/php/sgrep/static_initializers.php → ...p/tests/php/sgrep/static_initializers.php b/tests/php/sgrep/static_initializers.php → ...p/tests/php/sgrep/static_initializers.php
diff --git a/tests/php/sgrep/string_args.php → sgrep/tests/php/sgrep/string_args.php b/tests/php/sgrep/string_args.php → sgrep/tests/php/sgrep/string_args.php
diff --git a/tests/php/sgrep/trailing_comma.php → sgrep/tests/php/sgrep/trailing_comma.php b/tests/php/sgrep/trailing_comma.php → sgrep/tests/php/sgrep/trailing_comma.php
diff --git a/tests/php/sgrep/xhp.php → sgrep/tests/php/sgrep/xhp.php b/tests/php/sgrep/xhp.php → sgrep/tests/php/sgrep/xhp.php
diff --git a/tests/php/sgrep/xhp_metavar.php → sgrep/tests/php/sgrep/xhp_metavar.php b/tests/php/sgrep/xhp_metavar.php → sgrep/tests/php/sgrep/xhp_metavar.php
diff --git a/tests/php/sgrep/xhp_metavar2.php → sgrep/tests/php/sgrep/xhp_metavar2.php b/tests/php/sgrep/xhp_metavar2.php → sgrep/tests/php/sgrep/xhp_metavar2.php
diff --git a/tests/php/sgrep/xhp_metavar_attr.php → sgrep/tests/php/sgrep/xhp_metavar_attr.php b/tests/php/sgrep/xhp_metavar_attr.php → sgrep/tests/php/sgrep/xhp_metavar_attr.php
diff --git a/tests/php/spatch/add_statement.exp → sgrep/tests/php/spatch/add_statement.exp b/tests/php/spatch/add_statement.exp → sgrep/tests/php/spatch/add_statement.exp
diff --git a/tests/php/spatch/add_statement.php → sgrep/tests/php/spatch/add_statement.php b/tests/php/spatch/add_statement.php → sgrep/tests/php/spatch/add_statement.php
diff --git a/tests/php/spatch/add_statement.spatch → sgrep/tests/php/spatch/add_statement.spatch b/tests/php/spatch/add_statement.spatch → sgrep/tests/php/spatch/add_statement.spatch
diff --git a/tests/php/spatch/array_to_int_array.php → ...p/tests/php/spatch/array_to_int_array.php b/tests/php/spatch/array_to_int_array.php → ...p/tests/php/spatch/array_to_int_array.php
diff --git a/tests/php/spatch/bar.exp → sgrep/tests/php/spatch/bar.exp b/tests/php/spatch/bar.exp → sgrep/tests/php/spatch/bar.exp
diff --git a/tests/php/spatch/bar.php → sgrep/tests/php/spatch/bar.php b/tests/php/spatch/bar.php → sgrep/tests/php/spatch/bar.php
diff --git a/tests/php/spatch/bar.spatch → sgrep/tests/php/spatch/bar.spatch b/tests/php/spatch/bar.spatch → sgrep/tests/php/spatch/bar.spatch
diff --git a/tests/php/spatch/bar2.exp → sgrep/tests/php/spatch/bar2.exp b/tests/php/spatch/bar2.exp → sgrep/tests/php/spatch/bar2.exp
diff --git a/tests/php/spatch/bar2.php → sgrep/tests/php/spatch/bar2.php b/tests/php/spatch/bar2.php → sgrep/tests/php/spatch/bar2.php
diff --git a/tests/php/spatch/distr_plus.exp → sgrep/tests/php/spatch/distr_plus.exp b/tests/php/spatch/distr_plus.exp → sgrep/tests/php/spatch/distr_plus.exp
diff --git a/tests/php/spatch/distr_plus.php → sgrep/tests/php/spatch/distr_plus.php b/tests/php/spatch/distr_plus.php → sgrep/tests/php/spatch/distr_plus.php
diff --git a/tests/php/spatch/distr_plus.spatch → sgrep/tests/php/spatch/distr_plus.spatch b/tests/php/spatch/distr_plus.spatch → sgrep/tests/php/spatch/distr_plus.spatch
diff --git a/...spatch/error/transfo_on_comma_varargs.php → ...spatch/error/transfo_on_comma_varargs.php b/...spatch/error/transfo_on_comma_varargs.php → ...spatch/error/transfo_on_comma_varargs.php
diff --git a/...tch/error/transfo_on_comma_varargs.spatch → ...tch/error/transfo_on_comma_varargs.spatch b/...tch/error/transfo_on_comma_varargs.spatch → ...tch/error/transfo_on_comma_varargs.spatch
diff --git a/.../error/transfo_on_comma_varargs_ok.spatch → .../error/transfo_on_comma_varargs_ok.spatch b/.../error/transfo_on_comma_varargs_ok.spatch → .../error/transfo_on_comma_varargs_ok.spatch
diff --git a/tests/php/spatch/errors/missing_paren.php → ...tests/php/spatch/errors/missing_paren.php b/tests/php/spatch/errors/missing_paren.php → ...tests/php/spatch/errors/missing_paren.php
diff --git a/tests/php/spatch/errors/missing_paren.spatch → ...ts/php/spatch/errors/missing_paren.spatch b/tests/php/spatch/errors/missing_paren.spatch → ...ts/php/spatch/errors/missing_paren.spatch
diff --git a/...hp/spatch/errors/transfo_not_at_start.php → ...hp/spatch/errors/transfo_not_at_start.php b/...hp/spatch/errors/transfo_not_at_start.php → ...hp/spatch/errors/transfo_not_at_start.php
diff --git a/...spatch/errors/transfo_not_at_start.spatch → ...spatch/errors/transfo_not_at_start.spatch b/...spatch/errors/transfo_not_at_start.spatch → ...spatch/errors/transfo_not_at_start.spatch
diff --git a/tests/php/spatch/foo.exp → sgrep/tests/php/spatch/foo.exp b/tests/php/spatch/foo.exp → sgrep/tests/php/spatch/foo.exp
diff --git a/tests/php/spatch/foo.php → sgrep/tests/php/spatch/foo.php b/tests/php/spatch/foo.php → sgrep/tests/php/spatch/foo.php
diff --git a/tests/php/spatch/foo.spatch → sgrep/tests/php/spatch/foo.spatch b/tests/php/spatch/foo.spatch → sgrep/tests/php/spatch/foo.spatch
diff --git a/tests/php/spatch/generics.php → sgrep/tests/php/spatch/generics.php b/tests/php/spatch/generics.php → sgrep/tests/php/spatch/generics.php
diff --git a/tests/php/spatch/generics.spatch → sgrep/tests/php/spatch/generics.spatch b/tests/php/spatch/generics.spatch → sgrep/tests/php/spatch/generics.spatch
diff --git a/tests/php/spatch/lvalue.exp → sgrep/tests/php/spatch/lvalue.exp b/tests/php/spatch/lvalue.exp → sgrep/tests/php/spatch/lvalue.exp
diff --git a/tests/php/spatch/lvalue.php → sgrep/tests/php/spatch/lvalue.php b/tests/php/spatch/lvalue.php → sgrep/tests/php/spatch/lvalue.php
diff --git a/tests/php/spatch/lvalue.spatch → sgrep/tests/php/spatch/lvalue.spatch b/tests/php/spatch/lvalue.spatch → sgrep/tests/php/spatch/lvalue.spatch
diff --git a/tests/php/spatch/new.exp → sgrep/tests/php/spatch/new.exp b/tests/php/spatch/new.exp → sgrep/tests/php/spatch/new.exp
diff --git a/tests/php/spatch/new.php → sgrep/tests/php/spatch/new.php b/tests/php/spatch/new.php → sgrep/tests/php/spatch/new.php
diff --git a/tests/php/spatch/new.spatch → sgrep/tests/php/spatch/new.spatch b/tests/php/spatch/new.spatch → sgrep/tests/php/spatch/new.spatch