Update fold syntax (#730)

CatalaLang · Oct 22, 2024 · a323940 · a323940
2 parents 05c776d + 22f8e85
commit a323940
Show file tree

Hide file tree

Showing 20 changed files with 1,341 additions and 1,294 deletions.
diff --git a/compiler/driver.ml b/compiler/driver.ml
@@ -1113,10 +1113,12 @@ module Commands = struct
         else
           Format.pp_print_list ~pp_sep:Format.pp_print_space
             (fun ppf ext ->
-               let base = File.(dirname f / ModuleName.to_string m) in
-               Format.pp_print_string ppf base;
-               if ext <> "" then Format.(pp_print_char ppf '.'; pp_print_string ppf ext)
-            )
+              let base = File.(dirname f / ModuleName.to_string m) in
+              Format.pp_print_string ppf base;
+              if ext <> "" then (
+                Format.(
+                  pp_print_char ppf '.';
+                  pp_print_string ppf ext)))
             ppf extension)
       Format.std_formatter modules_list_topo;
     Format.close_box ();

diff --git a/compiler/plugins/explain.ml b/compiler/plugins/explain.ml
diff --git a/compiler/surface/lexer.cppo.ml b/compiler/surface/lexer.cppo.ml
@@ -209,12 +209,12 @@ module R = Re.Pcre
 #ifndef MR_BUT_REPLACE
   #define MR_BUT_REPLACE MS_BUT_REPLACE
 #endif
+#ifndef MR_COMBINE
+  #define MR_COMBINE MS_COMBINE
+#endif
 #ifndef MR_INITIALLY
   #define MR_INITIALLY MS_INITIALLY
 #endif
-#ifndef MR_AND_THEN
-  #define MR_AND_THEN MS_AND_THEN
-#endif
 #ifndef MR_CARDINAL
   #define MR_CARDINAL MS_CARDINAL
 #endif
@@ -326,8 +326,8 @@ let token_list : (string * token) list =
     (MS_IS, IS);
     (MS_LIST_EMPTY, LIST_EMPTY);
     (MS_BUT_REPLACE, BUT_REPLACE);
+    (MS_COMBINE, COMBINE);
     (MS_INITIALLY, INITIALLY);
-    (MS_AND_THEN, AND_THEN);
     (MS_CARDINAL, CARDINAL);
     (MS_YEAR, YEAR);
     (MS_MONTH, MONTH);
@@ -585,12 +585,12 @@ let rec lex_code (lexbuf : lexbuf) : token =
   | MR_BUT_REPLACE ->
       L.update_acc lexbuf;
       BUT_REPLACE
+  | MR_COMBINE ->
+      L.update_acc lexbuf;
+      COMBINE
   | MR_INITIALLY ->
       L.update_acc lexbuf;
       INITIALLY
-  | MR_AND_THEN ->
-      L.update_acc lexbuf;
-      AND_THEN
   | MR_CARDINAL ->
       L.update_acc lexbuf;
       CARDINAL

diff --git a/compiler/surface/lexer_en.cppo.ml b/compiler/surface/lexer_en.cppo.ml
@@ -85,9 +85,8 @@
 #define MR_LIST_EMPTY "list", space_plus, "empty"
 #define MS_BUT_REPLACE "but replace"
 #define MR_BUT_REPLACE "but", space_plus, "replace"
+#define MS_COMBINE "combine"
 #define MS_INITIALLY "initially"
-#define MS_AND_THEN "and then"
-#define MR_AND_THEN "and", space_plus, "then"
 #define MS_CARDINAL "number"
 #define MS_YEAR "year"
 #define MS_MONTH "month"

diff --git a/compiler/surface/lexer_fr.cppo.ml b/compiler/surface/lexer_fr.cppo.ml
@@ -103,10 +103,11 @@
 #define MS_IS "est"
 #define MS_LIST_EMPTY "liste vide"
 #define MR_LIST_EMPTY "liste", space_plus, "vide"
-#define MS_BUT_REPLACE "mais en rempla\195\167ant"
+#define MS_BUT_REPLACE "mais en remplaçant"
 #define MR_BUT_REPLACE "mais", space_plus, "en", space_plus, "rempla", 0xE7, "ant"
+#define MS_COMBINE "combinaison de"
+#define MR_COMBINE "combinaison", space_plus, "de"
 #define MS_INITIALLY "initialement"
-#define MS_AND_THEN "puis"
 #define MS_CARDINAL "nombre"
 #define MS_YEAR "an"
 #define MS_MONTH "mois"

diff --git a/compiler/surface/lexer_pl.cppo.ml b/compiler/surface/lexer_pl.cppo.ml
@@ -97,10 +97,10 @@
 #define MR_LIST_EMPTY "lista", space_plus, "pusta"
 #define MS_BUT_REPLACE "ale zastąpić"
 #define MR_BUT_REPLACE "ale", space_plus, "zast", 0x0105, "pi", 0x0107
+#define MS_COMBINE "łączyć"
+#define MR_COMBINE 0x0142, 0x0105, "czy", 0x0107
 #define MS_INITIALLY "początkowo"
 #define MR_INITIALLY "pocz", 0X0105, "tkowo"
-#define MS_AND_THEN "a następnie"
-#define MR_AND_THEN "a", space_plus, "nast", 0x0119, "pnie"
 #define MS_CARDINAL "liczba"
 #define MS_YEAR "rok"
 #define MS_MONTH "miesiąc"