Commit 49342b61 authored by POTTIER Francois's avatar POTTIER Francois

Update the expected test output.

The number of test files that are changed in small because most of the
tests use --only-preprocess and the change is not visible at this level.
You have to go all the way and look at the OCaml code that is produced
in the end in order to see the changes.
parent 40460579
......@@ -302,11 +302,10 @@ and _menhir_reduce5 : _menhir_env -> 'ttv_tail * _menhir_state * (int) -> 'ttv_r
fun _menhir_env _menhir_stack ->
(* Reducing production main -> expr EOL *)
let (_menhir_stack, _menhir_s, (e : (int))) = _menhir_stack in
let _2 = () in
let _v : (int) =
# 15 "demos/calc-mini/parser.mly"
( e )
# 310 "demos/calc-mini/parser.ml"
# 309 "demos/calc-mini/parser.ml"
in
_menhir_goto_main _menhir_env _menhir_stack _menhir_s _v
......@@ -314,11 +313,10 @@ and _menhir_reduce4 : _menhir_env -> (('ttv_tail * _menhir_state * (int))) * _me
fun _menhir_env _menhir_stack ->
(* Reducing production expr -> expr TIMES expr *)
let ((_menhir_stack, _menhir_s, (e1 : (int))), _, (e2 : (int))) = _menhir_stack in
let _2 = () in
let _v : (int) =
# 25 "demos/calc-mini/parser.mly"
( e1 * e2 )
# 322 "demos/calc-mini/parser.ml"
# 320 "demos/calc-mini/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
......@@ -326,11 +324,10 @@ and _menhir_reduce3 : _menhir_env -> (('ttv_tail * _menhir_state * (int))) * _me
fun _menhir_env _menhir_stack ->
(* Reducing production expr -> expr PLUS expr *)
let ((_menhir_stack, _menhir_s, (e1 : (int))), _, (e2 : (int))) = _menhir_stack in
let _2 = () in
let _v : (int) =
# 23 "demos/calc-mini/parser.mly"
( e1 + e2 )
# 334 "demos/calc-mini/parser.ml"
# 331 "demos/calc-mini/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
......@@ -338,30 +335,28 @@ and _menhir_reduce2 : _menhir_env -> ('ttv_tail * _menhir_state) * _menhir_state
fun _menhir_env _menhir_stack ->
(* Reducing production expr -> LPAREN expr RPAREN *)
let ((_menhir_stack, _menhir_s), _, (e : (int))) = _menhir_stack in
let _3 = () in
let _1 = () in
let _v : (int) =
# 21 "demos/calc-mini/parser.mly"
( e )
# 347 "demos/calc-mini/parser.ml"
# 342 "demos/calc-mini/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
and _menhir_reduce1 : _menhir_env -> 'ttv_tail -> _menhir_state -> (
# 1 "demos/calc-mini/parser.mly"
(int)
# 354 "demos/calc-mini/parser.ml"
# 349 "demos/calc-mini/parser.ml"
) -> 'ttv_return =
fun _menhir_env _menhir_stack _menhir_s (i : (
# 1 "demos/calc-mini/parser.mly"
(int)
# 359 "demos/calc-mini/parser.ml"
# 354 "demos/calc-mini/parser.ml"
)) ->
(* Reducing production expr -> INT *)
let _v : (int) =
# 19 "demos/calc-mini/parser.mly"
( i )
# 365 "demos/calc-mini/parser.ml"
# 360 "demos/calc-mini/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
......@@ -418,4 +413,4 @@ and _menhir_errorcase : _menhir_env -> 'ttv_tail -> _menhir_state -> 'ttv_return
# 269 "<standard.mly>"
# 422 "demos/calc-mini/parser.ml"
# 417 "demos/calc-mini/parser.ml"
......@@ -95,13 +95,11 @@ and _menhir_goto_fold_left_additive_op_multiplicative_expr_ : _menhir_env -> 'tt
let _menhir_env = _menhir_discard _menhir_env in
let _menhir_stack = Obj.magic _menhir_stack in
let ((_menhir_stack, _menhir_s), _, (_1_inlined1 : (int))) = _menhir_stack in
let _3 = () in
let _1 = () in
let _v : (int) = let x = _1_inlined1 in
# 200 "<standard.mly>"
( x )
# 105 "demos/calc-new-syntax/parser.ml"
# 103 "demos/calc-new-syntax/parser.ml"
in
_menhir_goto_atomic_expr _menhir_env _menhir_stack _menhir_s _v
| _ ->
......@@ -211,12 +209,12 @@ and _menhir_goto_fold_left_multiplicative_op_atomic_expr_ : _menhir_env -> 'ttv_
let op =
# 58 "demos/calc-new-syntax/parser.mly"
( ( + ) )
# 215 "demos/calc-new-syntax/parser.ml"
# 213 "demos/calc-new-syntax/parser.ml"
in
# 23 "demos/calc-new-syntax/parser.mly"
( op sum elem )
# 220 "demos/calc-new-syntax/parser.ml"
# 218 "demos/calc-new-syntax/parser.ml"
in
_menhir_goto_fold_left_additive_op_multiplicative_expr_ _menhir_env _menhir_stack _menhir_s _v
| _ ->
......@@ -242,12 +240,12 @@ and _menhir_goto_fold_left_multiplicative_op_atomic_expr_ : _menhir_env -> 'ttv_
let op =
# 59 "demos/calc-new-syntax/parser.mly"
( ( - ) )
# 246 "demos/calc-new-syntax/parser.ml"
# 244 "demos/calc-new-syntax/parser.ml"
in
# 23 "demos/calc-new-syntax/parser.mly"
( op sum elem )
# 251 "demos/calc-new-syntax/parser.ml"
# 249 "demos/calc-new-syntax/parser.ml"
in
_menhir_goto_fold_left_additive_op_multiplicative_expr_ _menhir_env _menhir_stack _menhir_s _v
| _ ->
......@@ -271,12 +269,12 @@ and _menhir_goto_atomic_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int
let _v : (int) = let op =
# 70 "demos/calc-new-syntax/parser.mly"
( ( * ) )
# 275 "demos/calc-new-syntax/parser.ml"
# 273 "demos/calc-new-syntax/parser.ml"
in
# 23 "demos/calc-new-syntax/parser.mly"
( op sum elem )
# 280 "demos/calc-new-syntax/parser.ml"
# 278 "demos/calc-new-syntax/parser.ml"
in
_menhir_goto_fold_left_multiplicative_op_atomic_expr_ _menhir_env _menhir_stack _menhir_s _v
| MenhirState7 ->
......@@ -288,12 +286,12 @@ and _menhir_goto_atomic_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int
let _v : (int) = let op =
# 71 "demos/calc-new-syntax/parser.mly"
( ( / ) )
# 292 "demos/calc-new-syntax/parser.ml"
# 290 "demos/calc-new-syntax/parser.ml"
in
# 23 "demos/calc-new-syntax/parser.mly"
( op sum elem )
# 297 "demos/calc-new-syntax/parser.ml"
# 295 "demos/calc-new-syntax/parser.ml"
in
_menhir_goto_fold_left_multiplicative_op_atomic_expr_ _menhir_env _menhir_stack _menhir_s _v
| MenhirState0 | MenhirState2 | MenhirState14 | MenhirState11 ->
......@@ -311,12 +309,12 @@ and _menhir_goto_atomic_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int
let _v : (int) = let f =
# 86 "demos/calc-new-syntax/parser.mly"
( (~- ) )
# 315 "demos/calc-new-syntax/parser.ml"
# 313 "demos/calc-new-syntax/parser.ml"
in
# 31 "demos/calc-new-syntax/parser.mly"
( f x )
# 320 "demos/calc-new-syntax/parser.ml"
# 318 "demos/calc-new-syntax/parser.ml"
in
_menhir_goto_atomic_expr _menhir_env _menhir_stack _menhir_s _v
......@@ -388,7 +386,7 @@ and _menhir_run2 : _menhir_env -> 'ttv_tail -> _menhir_state -> 'ttv_return =
and _menhir_run3 : _menhir_env -> 'ttv_tail -> _menhir_state -> (
# 1 "demos/calc-new-syntax/parser.mly"
(int)
# 392 "demos/calc-new-syntax/parser.ml"
# 390 "demos/calc-new-syntax/parser.ml"
) -> 'ttv_return =
fun _menhir_env _menhir_stack _menhir_s _v ->
let _menhir_env = _menhir_discard _menhir_env in
......@@ -396,7 +394,7 @@ and _menhir_run3 : _menhir_env -> 'ttv_tail -> _menhir_state -> (
let (_1 : (
# 1 "demos/calc-new-syntax/parser.mly"
(int)
# 400 "demos/calc-new-syntax/parser.ml"
# 398 "demos/calc-new-syntax/parser.ml"
)) = _v in
let _v : (int) = _1 in
_menhir_goto_atomic_expr _menhir_env _menhir_stack _menhir_s _v
......@@ -439,4 +437,4 @@ and main : (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (int) =
# 269 "<standard.mly>"
# 443 "demos/calc-new-syntax/parser.ml"
# 441 "demos/calc-new-syntax/parser.ml"
......@@ -156,12 +156,10 @@ and _menhir_goto_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int) -> 't
(* _menhir_reduce2 *)
(* Reducing production expr -> LPAREN expr RPAREN *)
let ((_menhir_stack, _menhir_s), _, (e : (int))) = _menhir_stack in
let _3 = () in
let _1 = () in
let _v : (int) =
# 22 "demos/calc/parser.mly"
( e )
# 165 "demos/calc/parser.ml"
# 163 "demos/calc/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
| TIMES ->
......@@ -184,11 +182,10 @@ and _menhir_goto_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int) -> 't
(* _menhir_reduce5 *)
(* Reducing production expr -> expr TIMES expr *)
let ((_menhir_stack, _menhir_s, (e1 : (int))), _, (e2 : (int))) = _menhir_stack in
let _2 = () in
let _v : (int) =
# 28 "demos/calc/parser.mly"
( e1 * e2 )
# 192 "demos/calc/parser.ml"
# 189 "demos/calc/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
| MenhirState8 ->
......@@ -209,11 +206,10 @@ and _menhir_goto_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int) -> 't
(* _menhir_reduce3 *)
(* Reducing production expr -> expr PLUS expr *)
let ((_menhir_stack, _menhir_s, (e1 : (int))), _, (e2 : (int))) = _menhir_stack in
let _2 = () in
let _v : (int) =
# 24 "demos/calc/parser.mly"
( e1 + e2 )
# 217 "demos/calc/parser.ml"
# 213 "demos/calc/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
| _ ->
......@@ -233,11 +229,10 @@ and _menhir_goto_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int) -> 't
(* _menhir_reduce6 *)
(* Reducing production expr -> expr DIV expr *)
let ((_menhir_stack, _menhir_s, (e1 : (int))), _, (e2 : (int))) = _menhir_stack in
let _2 = () in
let _v : (int) =
# 30 "demos/calc/parser.mly"
( e1 / e2 )
# 241 "demos/calc/parser.ml"
# 236 "demos/calc/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
| MenhirState12 ->
......@@ -258,11 +253,10 @@ and _menhir_goto_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int) -> 't
(* _menhir_reduce4 *)
(* Reducing production expr -> expr MINUS expr *)
let ((_menhir_stack, _menhir_s, (e1 : (int))), _, (e2 : (int))) = _menhir_stack in
let _2 = () in
let _v : (int) =
# 26 "demos/calc/parser.mly"
( e1 - e2 )
# 266 "demos/calc/parser.ml"
# 260 "demos/calc/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
| _ ->
......@@ -282,11 +276,10 @@ and _menhir_goto_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int) -> 't
(* _menhir_reduce7 *)
(* Reducing production expr -> MINUS expr *)
let ((_menhir_stack, _menhir_s), _, (e : (int))) = _menhir_stack in
let _1 = () in
let _v : (int) =
# 32 "demos/calc/parser.mly"
( - e )
# 290 "demos/calc/parser.ml"
# 283 "demos/calc/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
| MenhirState0 ->
......@@ -310,11 +303,10 @@ and _menhir_goto_expr : _menhir_env -> 'ttv_tail -> _menhir_state -> (int) -> 't
(* _menhir_reduce8 *)
(* Reducing production main -> expr EOL *)
let (_menhir_stack, _menhir_s, (e : (int))) = _menhir_stack in
let _2 = () in
let _v : (int) =
# 16 "demos/calc/parser.mly"
( e )
# 318 "demos/calc/parser.ml"
# 310 "demos/calc/parser.ml"
in
(* _menhir_goto_main *)
(* State should be MenhirState0 *)
......@@ -431,7 +423,7 @@ and _menhir_run2 : _menhir_env -> 'ttv_tail -> _menhir_state -> 'ttv_return =
and _menhir_run3 : _menhir_env -> 'ttv_tail -> _menhir_state -> (
# 1 "demos/calc/parser.mly"
(int)
# 435 "demos/calc/parser.ml"
# 427 "demos/calc/parser.ml"
) -> 'ttv_return =
fun _menhir_env _menhir_stack _menhir_s _v ->
(* State 3: *)
......@@ -442,14 +434,14 @@ and _menhir_run3 : _menhir_env -> 'ttv_tail -> _menhir_state -> (
let (i : (
# 1 "demos/calc/parser.mly"
(int)
# 446 "demos/calc/parser.ml"
# 438 "demos/calc/parser.ml"
)) = _v in
(* _menhir_reduce1 *)
(* Reducing production expr -> INT *)
let _v : (int) =
# 20 "demos/calc/parser.mly"
( i )
# 453 "demos/calc/parser.ml"
# 445 "demos/calc/parser.ml"
in
_menhir_goto_expr _menhir_env _menhir_stack _menhir_s _v
......@@ -497,4 +489,4 @@ and main : (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (int) =
# 269 "<standard.mly>"
# 501 "demos/calc/parser.ml"
# 493 "demos/calc/parser.ml"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment