Graduate mixed blocks from beta

[ncik-roberts]

We've decided to graduate mixed blocks from beta.

This is a one-line change plus annoying reshuffling of tests.

The test changes are hard to review, so let me describe the changes:

• Some files were "deleted" but really just renamed on top of their non-beta file with minor edits.
• Some files were "deleted" but really just merged into their non-beta file with minor edits.
• Some files I blindly accepted the updates to. (All of the parsing.ml files.)

Renamed:

• typing-layouts/mixed_records_beta.ml -> mixed_records.ml
• typing-layouts/mixed_constructor_arguments_beta.ml -> mixed_constructor_arguments.ml
• typing-layouts-float32/basics_beta.ml -> basics.ml
• typing-layouts-float64/basics_beta.ml -> basics.ml

Merged:

• typing-layouts-bits32/basics_beta.ml -> basics.ml
• typing-layouts-bits64/basics_beta.ml -> basics.ml
• typing-layouts-word/basics_beta.ml -> basics.ml

How to review:

• Review the merged files by hand. I'm fairly confident I got these right, it's just copy and pasting blocks of code.
• Review the renamed files in two steps to confirm that no tests were dropped.
  • Look at the diff from the original stable test to the final stable test.
  • Look at the diff from the original beta test to the final stable test.

For the renamed files, you could just run this script, replacing diff with your favorite diff tool.

PRE=d3606621ba7f888293784b00186c03921e0bfa91
POST=58a4fe55d70f27d562e9a77fd3b74b3847622a38
DIFF=diff
function git-show-test () { git show $1:ocaml/testsuite/tests/$2; }
function diff-tests () {
  stable=$1
  beta=$2
  read -p "Diff between original beta test and final stable test: $beta -> $stable. Enter to continue."
  $DIFF <(git-show-test $PRE $beta) <(git-show-test $POST $stable) | less -R
  read -p "Diff between original stable test and final stable test: $beta -> $stable. Enter to continue."
  $DIFF <(git-show-test $PRE $stable) <(git-show-test $POST $stable) | less -R
}
function go () {
  diff-tests typing-layouts/mixed_records.ml typing-layouts/mixed_records_beta.ml
  diff-tests typing-layouts/mixed_constructor_arguments.ml typing-layouts/mixed_constructor_arguments_beta.ml
  diff-tests typing-layouts-float32/basics.ml typing-layouts-float32/basics_beta.ml
  diff-tests typing-layouts-float64/basics.ml typing-layouts-float64/basics_beta.ml
}
go