Skip to content

Commit 672c3ae

Browse files
bobzhangbobzhang
authored
Merge pull request #4387 from BuckleScript/tweak_lazy_encoding
vendor reason-react for testing, more friendly error message
2 parents fac8dec + 54499a5 commit 672c3ae

32 files changed

+9001
-40
lines changed

‎jscomp/test/arith_lexer.ml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
# 6 "test/arith_lexer.ml"
66
let __ocaml_lex_tables = {
7-
Lexing.lex_base =
7+
Lexing.lex_base =
88
"\000\000\246\255\247\255\248\255\249\255\250\255\251\255\252\255\
99
\058\000\133\000\255\255";
10-
Lexing.lex_backtrk =
10+
Lexing.lex_backtrk =
1111
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
1212
\002\000\001\000\255\255";
13-
Lexing.lex_default =
13+
Lexing.lex_default =
1414
"\255\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
1515
\255\255\255\255\000\000";
16-
Lexing.lex_trans =
16+
Lexing.lex_trans =
1717
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
1818
\000\000\010\000\010\000\000\000\000\000\010\000\000\000\000\000\
1919
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
@@ -63,7 +63,7 @@ let __ocaml_lex_tables = {
6363
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
6464
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
6565
\000\000\000\000\000\000\000\000\000\000\000\000";
66-
Lexing.lex_check =
66+
Lexing.lex_check =
6767
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
6868
\255\255\000\000\000\000\255\255\255\255\000\000\255\255\255\255\
6969
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
@@ -113,22 +113,22 @@ let __ocaml_lex_tables = {
113113
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
114114
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
115115
\255\255\255\255\255\255\255\255\255\255\255\255";
116-
Lexing.lex_base_code =
116+
Lexing.lex_base_code =
117117
"";
118-
Lexing.lex_backtrk_code =
118+
Lexing.lex_backtrk_code =
119119
"";
120-
Lexing.lex_default_code =
120+
Lexing.lex_default_code =
121121
"";
122-
Lexing.lex_trans_code =
122+
Lexing.lex_trans_code =
123123
"";
124-
Lexing.lex_check_code =
124+
Lexing.lex_check_code =
125125
"";
126-
Lexing.lex_code =
126+
Lexing.lex_code =
127127
"";
128128
}
129129

130130
let rec lexeme lexbuf =
131-
__ocaml_lex_lexeme_rec lexbuf 0
131+
__ocaml_lex_lexeme_rec lexbuf 0
132132
and __ocaml_lex_lexeme_rec lexbuf __ocaml_lex_state =
133133
match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
134134
| 0 ->
@@ -181,7 +181,7 @@ and __ocaml_lex_lexeme_rec lexbuf __ocaml_lex_state =
181181
( EOF )
182182
# 183 "test/arith_lexer.ml"
183183

184-
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
184+
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
185185
__ocaml_lex_lexeme_rec lexbuf __ocaml_lex_state
186186

187187
;;

‎jscomp/test/build.ninja

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,22 @@ build test/raw_output_test.cmi test/raw_output_test.cmj : cc test/raw_output_tes
507507
build test/raw_pure_test.cmi test/raw_pure_test.cmj : cc test/raw_pure_test.ml | $stdlib
508508
build test/rbset.cmi test/rbset.cmj : cc test/rbset.ml | $stdlib
509509
build test/re_first_test.cmi test/re_first_test.cmj : cc test/re_first_test.re | test/mt.cmj $stdlib
510+
build test/react.cmi test/react.cmj : cc test/react.re | $stdlib
511+
build test/reactDOMRe.cmi test/reactDOMRe.cmj : cc test/reactDOMRe.re | test/react.cmj test/reactEvent.cmj test/reasonReact.cmj $stdlib
512+
build test/reactDOMServerRe.cmi test/reactDOMServerRe.cmj : cc test/reactDOMServerRe.re | test/react.cmj $stdlib
513+
build test/reactEvent.cmj : cc_cmi test/reactEvent.re | test/reactEvent.cmi $stdlib
514+
build test/reactEvent.cmi : cc test/reactEvent.rei | $stdlib
515+
build test/reactEventRe.cmj : cc_cmi test/reactEventRe.re | test/reactEvent.cmj test/reactEventRe.cmi $stdlib
516+
build test/reactEventRe.cmi : cc test/reactEventRe.rei | test/reactEvent.cmi $stdlib
517+
build test/reactTestUtils.cmj : cc_cmi test/reactTestUtils.re | test/react.cmj test/reactTestUtils.cmi $stdlib
518+
build test/reactTestUtils.cmi : cc test/reactTestUtils.rei | test/react.cmi $stdlib
519+
build test/reasonReact.cmj : cc_cmi test/reasonReact.re | test/react.cmj test/reasonReact.cmi test/reasonReactOptimizedCreateClass.cmj test/reasonReactRouter.cmj $stdlib
520+
build test/reasonReact.cmi : cc test/reasonReact.rei | test/react.cmi test/reasonReactRouter.cmi $stdlib
521+
build test/reasonReactCompat.cmj : cc_cmi test/reasonReactCompat.re | test/react.cmj test/reasonReact.cmj test/reasonReactCompat.cmi $stdlib
522+
build test/reasonReactCompat.cmi : cc test/reasonReactCompat.rei | test/react.cmi test/reasonReact.cmi $stdlib
523+
build test/reasonReactOptimizedCreateClass.cmi test/reasonReactOptimizedCreateClass.cmj : cc test/reasonReactOptimizedCreateClass.re | $stdlib
524+
build test/reasonReactRouter.cmj : cc_cmi test/reasonReactRouter.re | test/react.cmj test/reasonReactRouter.cmi $stdlib
525+
build test/reasonReactRouter.cmi : cc test/reasonReactRouter.rei | $stdlib
510526
build test/rebind_module.cmi test/rebind_module.cmj : cc test/rebind_module.ml | $stdlib
511527
build test/rebind_module_test.cmi test/rebind_module_test.cmj : cc test/rebind_module_test.ml | test/rebind_module.cmj $stdlib
512528
build test/rec_fun_test.cmi test/rec_fun_test.cmj : cc test/rec_fun_test.ml | test/mt.cmj $stdlib

‎jscomp/test/number_lexer.ml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ let l =
1010

1111
# 12 "test/number_lexer.ml"
1212
let __ocaml_lex_tables = {
13-
Lexing.lex_base =
13+
Lexing.lex_base =
1414
"\000\000\246\255\247\255\248\255\249\255\250\255\251\255\252\255\
1515
\058\000\133\000\255\255";
16-
Lexing.lex_backtrk =
16+
Lexing.lex_backtrk =
1717
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
1818
\002\000\001\000\255\255";
19-
Lexing.lex_default =
19+
Lexing.lex_default =
2020
"\255\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
2121
\255\255\255\255\000\000";
22-
Lexing.lex_trans =
22+
Lexing.lex_trans =
2323
"\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
2424
\000\000\010\000\010\000\000\000\000\000\010\000\000\000\000\000\
2525
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
@@ -69,7 +69,7 @@ let __ocaml_lex_tables = {
6969
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
7070
\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
7171
\000\000\000\000\000\000\000\000\000\000\000\000";
72-
Lexing.lex_check =
72+
Lexing.lex_check =
7373
"\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
7474
\255\255\000\000\000\000\255\255\255\255\000\000\255\255\255\255\
7575
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
@@ -119,22 +119,22 @@ let __ocaml_lex_tables = {
119119
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
120120
\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
121121
\255\255\255\255\255\255\255\255\255\255\255\255";
122-
Lexing.lex_base_code =
122+
Lexing.lex_base_code =
123123
"";
124-
Lexing.lex_backtrk_code =
124+
Lexing.lex_backtrk_code =
125125
"";
126-
Lexing.lex_default_code =
126+
Lexing.lex_default_code =
127127
"";
128-
Lexing.lex_trans_code =
128+
Lexing.lex_trans_code =
129129
"";
130-
Lexing.lex_check_code =
130+
Lexing.lex_check_code =
131131
"";
132-
Lexing.lex_code =
132+
Lexing.lex_code =
133133
"";
134134
}
135135

136136
let rec token l lexbuf =
137-
__ocaml_lex_token_rec l lexbuf 0
137+
__ocaml_lex_token_rec l lexbuf 0
138138
and __ocaml_lex_token_rec l lexbuf __ocaml_lex_state =
139139
match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
140140
| 0 ->
@@ -187,7 +187,7 @@ and __ocaml_lex_token_rec l lexbuf __ocaml_lex_state =
187187
( l "eof" )
188188
# 189 "test/number_lexer.ml"
189189

190-
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
190+
| __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf;
191191
__ocaml_lex_token_rec l lexbuf __ocaml_lex_state
192192

193193
;;

‎jscomp/test/react.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
'use strict';
2+
3+
4+
var Ref = { };
5+
6+
var Children = { };
7+
8+
var Context = { };
9+
10+
var Fragment = { };
11+
12+
var StrictMode = { };
13+
14+
var Suspense = { };
15+
16+
var SuspenseList = { };
17+
18+
exports.Ref = Ref;
19+
exports.Children = Children;
20+
exports.Context = Context;
21+
exports.Fragment = Fragment;
22+
exports.StrictMode = StrictMode;
23+
exports.Suspense = Suspense;
24+
exports.SuspenseList = SuspenseList;
25+
/* No side effect */

0 commit comments

Comments
 (0)