refactor(french_law/ocaml): refactor the api_web.ml

CatalaLang · Jul 22, 2022 · dba8938 · dba8938
1 parent 231f327
commit dba8938
Show file tree

Hide file tree

Showing 22 changed files with 11,873 additions and 3,624 deletions.
diff --git a/Makefile b/Makefile
@@ -196,13 +196,18 @@ $(FRENCH_LAW_OCAML_LIB_DIR)/law_source/allocations_familiales.ml:
 	CATALA_OPTS="$(CATALA_OPTS) -t" $(MAKE) -C $(ALLOCATIONS_FAMILIALES_DIR) allocations_familiales.ml
 	cp -f $(ALLOCATIONS_FAMILIALES_DIR)/allocations_familiales.ml $@
 
+$(FRENCH_LAW_OCAML_LIB_DIR)/law_source/allocations_familiales_api_web.ml:
+	CATALA_OPTS="$(CATALA_OPTS) -t" $(MAKE) -C $(ALLOCATIONS_FAMILIALES_DIR) allocations_familiales_api_web.ml
+	cp -f $(ALLOCATIONS_FAMILIALES_DIR)/allocations_familiales_api_web.ml $@
+
 $(FRENCH_LAW_OCAML_LIB_DIR)/law_source/unit_tests/tests_allocations_familiales.ml:
 	CATALA_OPTS="$(CATALA_OPTS) -t" $(MAKE) -C $(ALLOCATIONS_FAMILIALES_DIR) tests/tests_allocations_familiales.ml
 	cp -f $(ALLOCATIONS_FAMILIALES_DIR)/tests/tests_allocations_familiales.ml $@
 
 #> generate_french_law_library_ocaml	: Generates the French law library OCaml sources from Catala
-generate_french_law_library_ocaml:\
+generate_french_law_library_ocaml: plugins \
 	$(FRENCH_LAW_OCAML_LIB_DIR)/law_source/allocations_familiales.ml \
+	$(FRENCH_LAW_OCAML_LIB_DIR)/law_source/allocations_familiales_api_web.ml \
 	$(FRENCH_LAW_OCAML_LIB_DIR)/law_source/unit_tests/tests_allocations_familiales.ml
 	$(MAKE) format
 

diff --git a/compiler/driver.ml b/compiler/driver.ml
@@ -338,8 +338,7 @@ let driver source_file (options : Cli.options) : int =
                 Cli.debug_print "Compiling program into OCaml...";
                 Cli.debug_print "Writing to %s..."
                   (Option.value ~default:"stdout" output_file);
-                Lcalc.To_ocaml.format_program fmt prgm type_ordering;
-                File.ocamlformat_file_opt output_file
+                Lcalc.To_ocaml.format_program fmt prgm type_ordering
               | `Plugin (Plugin.Lcalc p) ->
                 let output_file, _ = get_output ~ext:p.Plugin.extension () in
                 Cli.debug_print "Compiling program through backend \"%s\"..."

diff --git a/compiler/plugins/dune b/compiler/plugins/dune
@@ -8,7 +8,7 @@
  (name jsoo)
  (modes plugin)
  (modules jsoo)
- (libraries catala.driver catala.runtime))
+ (libraries catala.driver))
 
 (documentation
  (package catala)

diff --git a/examples/Makefile.common.mk b/examples/Makefile.common.mk
@@ -9,6 +9,8 @@ CURR_DIR=examples/$(shell basename $(shell pwd))/
 CATALA=cd ../../; _build/default/compiler/catala.exe \
 	$(CATALA_OPTS) --language=$(CATALA_LANG)
 
+PLUGIN_DIR=_build/default/compiler/plugins
+
 help : ../Makefile.common.mk
 	@sed -n 's/^#> //p' $<
 
@@ -31,6 +33,14 @@ help : ../Makefile.common.mk
 		OCaml \
 		$(CURR_DIR)$<
 
+#> <target_file>_api_web.ml	 : Compiles the file to OCaml + genereates the API web
+%_api_web.ml: %.catala_$(CATALA_LANG)
+	@$(CATALA) Makefile $(CURR_DIR)$<
+	$(CATALA) \
+		jsoo \
+		--plugin-dir=$(PLUGIN_DIR) \
+		$(CURR_DIR)$<
+
 #> <target_file>.py			: Compiles the file to Python
 %.py: %.catala_$(CATALA_LANG)
 	@$(CATALA) Makefile $(CURR_DIR)$<