Rename to Rescript (rescript-lang#98)

Author: IwanKaramazow

syntax/.depend

@@ -1,83 +1,79 @@
-src/napkin_ast_conversion.cmx : src/napkin_ast_conversion.cmi
-src/napkin_ast_conversion.cmi :
-src/napkin_ast_debugger.cmx : src/napkin_driver.cmx src/napkin_doc.cmx \
-    src/napkin_ast_debugger.cmi
-src/napkin_ast_debugger.cmi : src/napkin_driver.cmi
-src/napkin_character_codes.cmx :
-src/napkin_cli.cmx : src/napkin_driver_reason_binary.cmx \
-    src/napkin_driver_ml_parser.cmx src/napkin_driver_binary.cmx \
-    src/napkin_driver.cmx src/napkin_ast_debugger.cmx
-src/napkin_comment.cmx : src/napkin_comment.cmi
-src/napkin_comment.cmi :
-src/napkin_comments_table.cmx : src/napkin_parsetree_viewer.cmx \
-    src/napkin_doc.cmx src/napkin_comment.cmx
-src/napkin_core.cmx : src/napkin_token.cmx src/napkin_scanner.cmx \
-    src/napkin_printer.cmx src/napkin_parser.cmx src/napkin_js_ffi.cmx \
-    src/napkin_grammar.cmx src/napkin_doc.cmx src/napkin_diagnostics.cmx \
-    src/napkin_comments_table.cmx src/napkin_core.cmi
-src/napkin_core.cmi : src/napkin_parser.cmi
-src/napkin_diagnostics.cmx : src/napkin_token.cmx src/napkin_grammar.cmx \
-    src/napkin_diagnostics_printing_utils.cmx src/napkin_diagnostics.cmi
-src/napkin_diagnostics.cmi : src/napkin_token.cmx src/napkin_grammar.cmx
-src/napkin_diagnostics_printing_utils.cmx :
-src/napkin_doc.cmx : src/napkin_minibuffer.cmx src/napkin_doc.cmi
-src/napkin_doc.cmi :
-src/napkin_driver.cmx : src/napkin_printer.cmx src/napkin_parser.cmx \
-    src/napkin_io.cmx src/napkin_diagnostics.cmx src/napkin_core.cmx \
-    src/napkin_comment.cmx src/napkin_driver.cmi
-src/napkin_driver.cmi : src/napkin_diagnostics.cmi src/napkin_comment.cmi
-src/napkin_driver_binary.cmx : src/napkin_driver.cmx \
-    src/napkin_driver_binary.cmi
-src/napkin_driver_binary.cmi : src/napkin_driver.cmi
-src/napkin_driver_ml_parser.cmx : src/napkin_io.cmx src/napkin_driver.cmx \
-    src/napkin_comment.cmx src/napkin_ast_conversion.cmx \
-    src/napkin_driver_ml_parser.cmi
-src/napkin_driver_ml_parser.cmi : src/napkin_driver.cmi \
-    src/napkin_comment.cmi
-src/napkin_driver_reason_binary.cmx : src/napkin_scanner.cmx \
-    src/napkin_io.cmx src/napkin_driver.cmx src/napkin_comment.cmx \
-    src/napkin_ast_conversion.cmx src/napkin_driver_reason_binary.cmi
-src/napkin_driver_reason_binary.cmi : src/napkin_token.cmx \
-    src/napkin_driver.cmi
-src/napkin_grammar.cmx : src/napkin_token.cmx
-src/napkin_io.cmx : src/napkin_io.cmi
-src/napkin_io.cmi :
-src/napkin_js_ffi.cmx :
-src/napkin_minibuffer.cmx : src/napkin_minibuffer.cmi
-src/napkin_minibuffer.cmi :
-src/napkin_multi_printer.cmx : src/napkin_printer.cmx src/napkin_io.cmx \
-    src/napkin_driver_reason_binary.cmx src/napkin_driver_ml_parser.cmx \
-    src/napkin_driver.cmx src/napkin_diagnostics.cmx \
-    src/napkin_ast_conversion.cmx src/napkin_multi_printer.cmi
-src/napkin_multi_printer.cmi :
-src/napkin_outcome_printer.cmx : src/napkin_token.cmx src/napkin_doc.cmx \
-    src/napkin_outcome_printer.cmi
-src/napkin_outcome_printer.cmi :
-src/napkin_parens.cmx : src/napkin_parsetree_viewer.cmx \
-    src/napkin_parens.cmi
-src/napkin_parens.cmi :
-src/napkin_parser.cmx : src/napkin_token.cmx src/napkin_scanner.cmx \
-    src/napkin_reporting.cmx src/napkin_grammar.cmx \
-    src/napkin_diagnostics.cmx src/napkin_comment.cmx src/napkin_parser.cmi
-src/napkin_parser.cmi : src/napkin_token.cmx src/napkin_scanner.cmi \
-    src/napkin_reporting.cmx src/napkin_grammar.cmx \
-    src/napkin_diagnostics.cmi src/napkin_comment.cmi
-src/napkin_parsetree_viewer.cmx : src/napkin_parsetree_viewer.cmi
-src/napkin_parsetree_viewer.cmi :
-src/napkin_printer.cmx : src/napkin_token.cmx \
-    src/napkin_parsetree_viewer.cmx src/napkin_parens.cmx src/napkin_doc.cmx \
-    src/napkin_comments_table.cmx src/napkin_comment.cmx \
-    src/napkin_printer.cmi
-src/napkin_printer.cmi : src/napkin_doc.cmi src/napkin_comments_table.cmx \
-    src/napkin_comment.cmi
-src/napkin_reporting.cmx : src/napkin_token.cmx src/napkin_grammar.cmx
-src/napkin_scanner.cmx : src/napkin_token.cmx src/napkin_diagnostics.cmx \
-    src/napkin_comment.cmx src/napkin_character_codes.cmx \
-    src/napkin_scanner.cmi
-src/napkin_scanner.cmi : src/napkin_token.cmx src/napkin_diagnostics.cmi
-src/napkin_token.cmx : src/napkin_comment.cmx src/napkin_character_codes.cmx
-tests/napkin_diff.cmx : tests/napkin_diff.cmi
-tests/napkin_diff.cmi :
-tests/napkin_test.cmx : src/napkin_token.cmx src/napkin_parser.cmx \
-    src/napkin_outcome_printer.cmx src/napkin_multi_printer.cmx \
-    src/napkin_io.cmx src/napkin_driver.cmx tests/napkin_diff.cmx
+src/res_ast_conversion.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_character_codes.cmx :
+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/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_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_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_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_token.cmx src/res_diagnostics.cmx \
+    src/res_comment.cmx src/res_character_codes.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_character_codes.cmx
+tests/napkin_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 tests/res_diff.cmx
+tests/res_diff.cmx : tests/res_diff.cmi
+tests/res_diff.cmi :
+tests/res_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 tests/res_diff.cmx

syntax/.gitignore

@@ -6,13 +6,12 @@ node_modules
 *.cm*
 *.o
 lib/bs
-lib/napkinscript.exe
+lib/rescript.exe
 lib/refmt.exe
 lib/test.exe
 lib/bench.exe
-Napkinscript2.ml
-./lib/napkinscript2.exe
-./lib/Napkinscript.ml
-lib/napkinscript.ml
+Rescript2.ml
+./lib/rescript2.exe
+lib/Rescript.ml
 .vscode/settings.json
  # each person has its own preferences

syntax/Makefile

@@ -11,49 +11,49 @@ depend:
 	$(OCAMLDEP) -native -I tests -I src src/*.ml src/*.mli tests/*.ml tests/*.mli > .depend
 
 API_FILES = \
-	src/napkin_io.cmx\
-	src/napkin_minibuffer.cmx\
-	src/napkin_doc.cmx\
-	src/napkin_character_codes.cmx\
-	src/napkin_comment.cmx\
-	src/napkin_token.cmx\
-	src/napkin_grammar.cmx\
-	src/napkin_reporting.cmx\
-	src/napkin_diagnostics_printing_utils.cmx \
-	src/napkin_diagnostics.cmx\
-	src/napkin_parsetree_viewer.cmx\
-	src/napkin_parens.cmx\
-	src/napkin_comments_table.cmx\
-	src/napkin_printer.cmx\
-	src/napkin_scanner.cmx\
-	src/napkin_js_ffi.cmx\
-	src/napkin_parser.cmx\
-	src/napkin_core.cmx\
-	src/napkin_driver.cmx \
-	src/napkin_ast_conversion.cmx \
-	src/napkin_driver_ml_parser.cmx \
-	src/napkin_driver_reason_binary.cmx \
-	src/napkin_driver_binary.cmx \
-	src/napkin_ast_debugger.cmx \
-	src/napkin_outcome_printer.cmx \
-	src/napkin_multi_printer.cmx
-
-CLI_FILES = $(API_FILES) src/napkin_cli.cmx
-
-TEST_FILES = $(API_FILES) tests/napkin_diff.cmx tests/napkin_test.cmx
+	src/res_io.cmx\
+	src/res_minibuffer.cmx\
+	src/res_doc.cmx\
+	src/res_character_codes.cmx\
+	src/res_comment.cmx\
+	src/res_token.cmx\
+	src/res_grammar.cmx\
+	src/res_reporting.cmx\
+	src/res_diagnostics_printing_utils.cmx \
+	src/res_diagnostics.cmx\
+	src/res_parsetree_viewer.cmx\
+	src/res_parens.cmx\
+	src/res_comments_table.cmx\
+	src/res_printer.cmx\
+	src/res_scanner.cmx\
+	src/res_js_ffi.cmx\
+	src/res_parser.cmx\
+	src/res_core.cmx\
+	src/res_driver.cmx \
+	src/res_ast_conversion.cmx \
+	src/res_driver_ml_parser.cmx \
+	src/res_driver_reason_binary.cmx \
+	src/res_driver_binary.cmx \
+	src/res_ast_debugger.cmx \
+	src/res_outcome_printer.cmx \
+	src/res_multi_printer.cmx
+
+CLI_FILES = $(API_FILES) src/res_cli.cmx
+
+TEST_FILES = $(API_FILES) tests/res_diff.cmx tests/res_test.cmx
 
 .DEFAULT_GOAL := build-native
 
-lib/napkinscript.exe: $(CLI_FILES)
-	$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o ./lib/napkinscript.exe -I +compiler-libs ocamlcommon.cmxa  -I src $(CLI_FILES)
+lib/rescript.exe: $(CLI_FILES)
+	$(OCAMLOPT) $(OCAMLFLAGS) -O2 -o ./lib/rescript.exe -I +compiler-libs ocamlcommon.cmxa  -I src $(CLI_FILES)
 
-build-native: lib/refmt.exe lib/napkinscript.exe depend
+build-native: lib/refmt.exe lib/rescript.exe depend
 
 bootstrap: build-native
-	ocaml unix.cma ./scripts/bspack.ml -bs-main Napkin_cli -I src -o ./lib/napkinscript.ml
-	./lib/napkinscript.exe -parse ml -print ns ./lib/Napkinscript.ml > ./lib/Napkinscript2.ml
-	$(OCAMLOPT) -w a -pp "./lib/napkinscript.exe -print binary" -O2 -o ./lib/napkinscript2.exe -I +compiler-libs ocamlcommon.cmxa -I lib ./lib/Napkinscript2.ml
-	mv ./lib/napkinscript2.exe ./lib/napkinscript.exe
+	ocaml unix.cma ./scripts/bspack.ml -bs-main Res_cli -I src -o ./lib/rescript.ml
+	./lib/rescript.exe -parse ml -print ns ./lib/Rescript.ml > ./lib/Rescript2.ml
+	$(OCAMLOPT) -w a -pp "./lib/rescript.exe -print binary" -O2 -o ./lib/rescript2.exe -I +compiler-libs ocamlcommon.cmxa -I lib ./lib/Rescript2.ml
+	mv ./lib/rescript2.exe ./lib/rescript.exe
 
 lib/refmt.exe: vendor/refmt_main3.ml
 	$(OCAMLOPT) -w a -O2 -I vendor -I +compiler-libs ocamlcommon.cmxa -o lib/refmt.exe vendor/refmt_main3.ml
@@ -91,7 +91,7 @@ clean:
 	rm -rf benchmarks/*.cm*
 	rm -rf benchmarks/*.o
 	rm -rf lib/bench.exe
-	rm -rf lib/napkinscript.exe
+	rm -rf lib/rescript.exe
 	rm -rf lib/test.exe
 	git clean -dfx src
 .PHONY: clean test roundtrip-test termination dce exception reanalyze bootstrap build-native

syntax/README.md

@@ -1,10 +1,10 @@
-# BuckleScript New Syntax ![Tests](https://github.com/BuckleScript/syntax/workflows/CI/badge.svg)
+# ReScript New Syntax ![Tests](https://github.com/BuckleScript/syntax/workflows/CI/badge.svg)
 
 Blog post: https://reasonml.org/blog/bucklescript-8-1-new-syntax
 
 Documentation: https://reasonml.org/docs/reason-compiler/latest/new-bucklescript-syntax
 
-This repo is the source of truth for the new BuckleScript parser & printer. Issues go here.
+This repo is the source of truth for the new ReScript parser & printer. Issues go here.
 
 **You don't need this repo to use the new syntax**. This comes with BuckleScript 8.1. This repo is for syntax contributors.
 
@@ -38,7 +38,7 @@ npm install
 make # or: make -j9 for faster build
 ```
 
-This will produce the final binary `lib/napkinscript.exe`. "NapkinScript" is the placeholder name for the syntax. We'll change this later to avoid confusion.
+This will produce the final binary `lib/rescript.exe` used for testing
 
 First build is super slow because we're also building our vendored `refmt` (only used for the conversion tool). Subsequent builds should be <2s. If not, please file an issue (build speed is a priority).
 
@@ -67,10 +67,10 @@ Update jest snapshots:
 Debug a file:
 ```sh
 # write code in test.js
-./lib/napkinscript.exe -print ns test.js # test printer
-./lib/napkinscript.exe -print ast test.js # print ast
-./lib/napkinscript.exe -print ml test.js # show ocaml code
-./lib/napkinscript.exe -print ns -width 80 test.js # test printer and change default print width
+./lib/rescript.exe test.js # test printer
+./lib/rescript.exe -print ast test.js # print ast
+./lib/rescript.exe -print ml test.js # show ocaml code
+./lib/rescript.exe -print res -width 80 test.js # test printer and change default print width
 ```
 
 Benchmark:
@@ -87,16 +87,16 @@ make bench
 In a random project of yours:
 
 ```sh
-node_modules/.bin/bsrefmt --print=binary myFile.re | your/path/to/napkinscript.exe -parse reasonBinary -print ns > myFile.res
-node_modules/.bin/bsrefmt --print=binary --interface=true myFile.rei | your/path/to/napkinscript.exe -parse reasonBinary -print ns -interface > myFile.resi
+node_modules/.bin/bsrefmt --print=binary myFile.re | your/path/to/rescript.exe -parse reasonBinary -print ns > myFile.res
+node_modules/.bin/bsrefmt --print=binary --interface=true myFile.rei | your/path/to/rescript.exe -parse reasonBinary -print ns -interface > myFile.resi
 mv myFile.re myFile.re.backup # random backup name. Could be anything
 ```
 
 ### Example API usage
 
 ```
-module Parser = NapkinscriptCore.Parser
-module Diagnostics = NapkinscriptCore.Diagnostics
+module Parser = ResCore.Parser
+module Diagnostics = ResCore.Diagnostics
 
 let filename = "foo.res"
 let src = FS.readFile filename
@@ -107,8 +107,8 @@ let p =
   (* if you want to target the printer use: let mode = Parser.Default in*)
   Parser.make ~mode src filename
 
-let structure = NapkinscriptParser.parseImplementation p
-let signature = NapkinscriptParser.parseInterface p
+let structure = ResParser.parseImplementation p
+let signature = ResParser.parseInterface p
 
 let () = match p.Parser.diagnostics with
 | [] -> () (* no problems *)