Skip to content

Commit 77f94d2

Browse files
bobzhangbobzhang
authored
Merge pull request #5291 from rescript-lang/upgrade-syntax-repo
upgrade syntax repo
2 parents fd8394c + 6c02c6f commit 77f94d2

File tree

12 files changed

+23
-31
lines changed

12 files changed

+23
-31
lines changed

‎jscomp/ml/annot.mli renamed to ‎jscomp/ml/annot.ml

File renamed without changes.

‎jscomp/ml/outcometree.mli renamed to ‎jscomp/ml/outcometree.ml

File renamed without changes.

‎jscomp/ml/parsetree.mli renamed to ‎jscomp/ml/parsetree.ml

File renamed without changes.

‎lib/4.06.1/unstable/all_ounit_tests.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11091,10 +11091,9 @@ let parse s =
1109111091
| Some v -> v
1109211092

1109311093
end
11094-
(** Interface as module *)
1109511094
module Parsetree
1109611095
= struct
11097-
#1 "parsetree.mli"
11096+
#1 "parsetree.ml"
1109811097
(**************************************************************************)
1109911098
(* *)
1110011099
(* OCaml *)

‎lib/4.06.1/unstable/all_ounit_tests.ml.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
../lib/4.06.1/unstable/all_ounit_tests.ml: ./ml/parse.mli
153153
../lib/4.06.1/unstable/all_ounit_tests.ml: ./ml/parser.ml
154154
../lib/4.06.1/unstable/all_ounit_tests.ml: ./ml/parser.mli
155-
../lib/4.06.1/unstable/all_ounit_tests.ml: ./ml/parsetree.mli
155+
../lib/4.06.1/unstable/all_ounit_tests.ml: ./ml/parsetree.ml
156156
../lib/4.06.1/unstable/all_ounit_tests.ml: ./ml/syntaxerr.ml
157157
../lib/4.06.1/unstable/all_ounit_tests.ml: ./ml/syntaxerr.mli
158158
../lib/4.06.1/unstable/all_ounit_tests.ml: ./ounit/oUnit.ml

‎lib/4.06.1/unstable/bspack.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3044,10 +3044,9 @@ let parse s =
30443044
| Some v -> v
30453045

30463046
end
3047-
(** Interface as module *)
30483047
module Parsetree
30493048
= struct
3050-
#1 "parsetree.mli"
3049+
#1 "parsetree.ml"
30513050
(**************************************************************************)
30523051
(* *)
30533052
(* OCaml *)

‎lib/4.06.1/unstable/bspack.ml.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
../lib/4.06.1/unstable/bspack.ml: ./ml/parse.mli
8282
../lib/4.06.1/unstable/bspack.ml: ./ml/parser.ml
8383
../lib/4.06.1/unstable/bspack.ml: ./ml/parser.mli
84-
../lib/4.06.1/unstable/bspack.ml: ./ml/parsetree.mli
84+
../lib/4.06.1/unstable/bspack.ml: ./ml/parsetree.ml
8585
../lib/4.06.1/unstable/bspack.ml: ./ml/syntaxerr.ml
8686
../lib/4.06.1/unstable/bspack.ml: ./ml/syntaxerr.mli
8787
../lib/4.06.1/unstable/bspack.ml: ./stubs/bs_hash_stubs.ml

‎lib/4.06.1/unstable/js_compiler.ml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3994,10 +3994,9 @@ let parse s =
39943994
| Some v -> v
39953995

39963996
end
3997-
(** Interface as module *)
39983997
module Parsetree
39993998
= struct
4000-
#1 "parsetree.mli"
3999+
#1 "parsetree.ml"
40014000
(**************************************************************************)
40024001
(* *)
40034002
(* OCaml *)
@@ -5022,10 +5021,9 @@ let is_constructor_typath p =
50225021
| _ -> true
50235022

50245023
end
5025-
(** Interface as module *)
50265024
module Outcometree
50275025
= struct
5028-
#1 "outcometree.mli"
5026+
#1 "outcometree.ml"
50295027
(**************************************************************************)
50305028
(* *)
50315029
(* OCaml *)
@@ -47042,10 +47040,9 @@ and test_sequence arg cases actions =
4704247040
end
4704347041

4704447042
end
47045-
(** Interface as module *)
4704647043
module Annot
4704747044
= struct
47048-
#1 "annot.mli"
47045+
#1 "annot.ml"
4704947046
(**************************************************************************)
4705047047
(* *)
4705147048
(* OCaml *)
@@ -391584,7 +391581,7 @@ let jsxMapper () =
391584391581
Location.prerr_warning pattern.ppat_loc
391585391582
(Preprocessor
391586391583
(Printf.sprintf
391587-
"ReasonReact: optional argument annotations must have explicit `option`. Did you mean \
391584+
"React: optional argument annotations must have explicit `option`. Did you mean \
391588391585
`option(%s)=?`?"
391589391586
currentType)) )
391590391587
| _ -> ()
@@ -391609,7 +391606,7 @@ let jsxMapper () =
391609391606
(list, Some txt)
391610391607
| Pexp_fun (Nolabel, _, pattern, _expression) ->
391611391608
Location.raise_errorf ~loc:pattern.ppat_loc
391612-
"ReasonReact: react.component refs only support plain arguments and type annotations."
391609+
"React: react.component refs only support plain arguments and type annotations."
391613391610
| _ -> (list, None)
391614391611
[@@raises Invalid_argument]
391615391612
in
@@ -391785,7 +391782,7 @@ let jsxMapper () =
391785391782
if hasApplication.contents then ((fun a -> a), false, unerasableIgnoreExp expression)
391786391783
else
391787391784
Location.raise_errorf ~loc:pattern.ppat_loc
391788-
"ReasonReact: props need to be labelled arguments.\n\
391785+
"React: props need to be labelled arguments.\n\
391789391786
\ If you are working with refs be sure to wrap with React.forwardRef.\n\
391790391787
\ If your component doesn't have any props use () or _ instead of a name."
391791391788
(* let make = {let foo = bar in (~prop) => ...} *)

‎lib/4.06.1/unstable/js_compiler.ml.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447
../lib/4.06.1/unstable/js_compiler.ml: ./main/jsoo_common.mli
448448
../lib/4.06.1/unstable/js_compiler.ml: ./main/jsoo_main.ml
449449
../lib/4.06.1/unstable/js_compiler.ml: ./main/jsoo_main.mli
450-
../lib/4.06.1/unstable/js_compiler.ml: ./ml/annot.mli
450+
../lib/4.06.1/unstable/js_compiler.ml: ./ml/annot.ml
451451
../lib/4.06.1/unstable/js_compiler.ml: ./ml/ast_helper.ml
452452
../lib/4.06.1/unstable/js_compiler.ml: ./ml/ast_helper.mli
453453
../lib/4.06.1/unstable/js_compiler.ml: ./ml/ast_iterator.ml
@@ -497,14 +497,14 @@
497497
../lib/4.06.1/unstable/js_compiler.ml: ./ml/mtype.mli
498498
../lib/4.06.1/unstable/js_compiler.ml: ./ml/oprint.ml
499499
../lib/4.06.1/unstable/js_compiler.ml: ./ml/oprint.mli
500-
../lib/4.06.1/unstable/js_compiler.ml: ./ml/outcometree.mli
500+
../lib/4.06.1/unstable/js_compiler.ml: ./ml/outcometree.ml
501501
../lib/4.06.1/unstable/js_compiler.ml: ./ml/parmatch.ml
502502
../lib/4.06.1/unstable/js_compiler.ml: ./ml/parmatch.mli
503503
../lib/4.06.1/unstable/js_compiler.ml: ./ml/parse.ml
504504
../lib/4.06.1/unstable/js_compiler.ml: ./ml/parse.mli
505505
../lib/4.06.1/unstable/js_compiler.ml: ./ml/parser.ml
506506
../lib/4.06.1/unstable/js_compiler.ml: ./ml/parser.mli
507-
../lib/4.06.1/unstable/js_compiler.ml: ./ml/parsetree.mli
507+
../lib/4.06.1/unstable/js_compiler.ml: ./ml/parsetree.ml
508508
../lib/4.06.1/unstable/js_compiler.ml: ./ml/path.ml
509509
../lib/4.06.1/unstable/js_compiler.ml: ./ml/path.mli
510510
../lib/4.06.1/unstable/js_compiler.ml: ./ml/predef.ml

‎lib/4.06.1/whole_compiler.ml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -285462,10 +285462,9 @@ let of_array xs =
285462285462
Ext_array.fold_left xs empty (fun acc (k,v) -> add acc k v )
285463285463

285464285464
end
285465-
(** Interface as module *)
285466285465
module Parsetree
285467285466
= struct
285468-
#1 "parsetree.mli"
285467+
#1 "parsetree.ml"
285469285468
(**************************************************************************)
285470285469
(* *)
285471285470
(* OCaml *)
@@ -294253,10 +294252,9 @@ let is_constructor_typath p =
294253294252
| _ -> true
294254294253

294255294254
end
294256-
(** Interface as module *)
294257294255
module Outcometree
294258294256
= struct
294259-
#1 "outcometree.mli"
294257+
#1 "outcometree.ml"
294260294258
(**************************************************************************)
294261294259
(* *)
294262294260
(* OCaml *)
@@ -331902,10 +331900,9 @@ and test_sequence arg cases actions =
331902331900
end
331903331901

331904331902
end
331905-
(** Interface as module *)
331906331903
module Annot
331907331904
= struct
331908-
#1 "annot.mli"
331905+
#1 "annot.ml"
331909331906
(**************************************************************************)
331910331907
(* *)
331911331908
(* OCaml *)
@@ -395287,7 +395284,7 @@ let jsxMapper () =
395287395284
Location.prerr_warning pattern.ppat_loc
395288395285
(Preprocessor
395289395286
(Printf.sprintf
395290-
"ReasonReact: optional argument annotations must have explicit `option`. Did you mean \
395287+
"React: optional argument annotations must have explicit `option`. Did you mean \
395291395288
`option(%s)=?`?"
395292395289
currentType)) )
395293395290
| _ -> ()
@@ -395312,7 +395309,7 @@ let jsxMapper () =
395312395309
(list, Some txt)
395313395310
| Pexp_fun (Nolabel, _, pattern, _expression) ->
395314395311
Location.raise_errorf ~loc:pattern.ppat_loc
395315-
"ReasonReact: react.component refs only support plain arguments and type annotations."
395312+
"React: react.component refs only support plain arguments and type annotations."
395316395313
| _ -> (list, None)
395317395314
[@@raises Invalid_argument]
395318395315
in
@@ -395488,7 +395485,7 @@ let jsxMapper () =
395488395485
if hasApplication.contents then ((fun a -> a), false, unerasableIgnoreExp expression)
395489395486
else
395490395487
Location.raise_errorf ~loc:pattern.ppat_loc
395491-
"ReasonReact: props need to be labelled arguments.\n\
395488+
"React: props need to be labelled arguments.\n\
395492395489
\ If you are working with refs be sure to wrap with React.forwardRef.\n\
395493395490
\ If your component doesn't have any props use () or _ instead of a name."
395494395491
(* let make = {let foo = bar in (~prop) => ...} *)

0 commit comments

Comments
 (0)