address comment

ocaml/lambda/matching.ml

@@ -2868,8 +2868,8 @@ let combine_constant value_kind loc arg cst partial ctx def
           (Pfloatcomp (Pfloat64, CFlt)) arg
           const_lambda_list
     | Const_float32 _ ->
-        (* CR mslater: (float32) pattern matching *)
-        Parmatch.raise_matched_float32 ()
+        (* Should be caught in do_compile_matching. *)
+        Misc.fatal_error "Found unexpected float32 literal pattern."
     | Const_unboxed_float _ ->
         make_test_sequence value_kind loc fail
           (Punboxed_float_comp (Pfloat64, CFneq))
@@ -3543,6 +3543,7 @@ and do_compile_matching ~scopes value_kind repr partial ctx pmh =
           compile_no_test ~scopes value_kind
             (divide_record ~scopes lbl.lbl_all ph)
             Context.combine repr partial ctx pm
+      | Constant (Const_float32 _) -> Parmatch.raise_matched_float32 ()
       | Constant cst ->
           compile_test
             (compile_match ~scopes value_kind repr partial)

ocaml/testsuite/tests/typing-small-numbers/test_disabled.ml

@@ -16,79 +16,79 @@ let _ = 1.0s;;
 Line 1, characters 8-12:
 1 | let _ = 1.0s;;
             ^^^^
-Error: Unknown modifier 's' for literal 1.0s
+Error: Found 32-bit float literal 1.0s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let _ = 1.s;;
 [%%expect{|
 Line 1, characters 8-11:
 1 | let _ = 1.s;;
             ^^^
-Error: Unknown modifier 's' for literal 1.s
+Error: Found 32-bit float literal 1.s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let _ = 1e10s;;
 [%%expect{|
 Line 1, characters 8-13:
 1 | let _ = 1e10s;;
             ^^^^^
-Error: Unknown modifier 's' for literal 1e10s
+Error: Found 32-bit float literal 1e10s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let _ = 1e+1s;;
 [%%expect{|
 Line 1, characters 8-13:
 1 | let _ = 1e+1s;;
             ^^^^^
-Error: Unknown modifier 's' for literal 1e+1s
+Error: Found 32-bit float literal 1e+1s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let _ = 1e-1s;;
 [%%expect{|
 Line 1, characters 8-13:
 1 | let _ = 1e-1s;;
             ^^^^^
-Error: Unknown modifier 's' for literal 1e-1s
+Error: Found 32-bit float literal 1e-1s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let _ = 0x111.000s;;
 [%%expect{|
 Line 1, characters 8-18:
 1 | let _ = 0x111.000s;;
             ^^^^^^^^^^
-Error: Unknown modifier 's' for literal 0x111.000s
+Error: Found 32-bit float literal 0x111.000s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let _ = 0x1.4p+0s;;
 [%%expect{|
 Line 1, characters 8-17:
 1 | let _ = 0x1.4p+0s;;
             ^^^^^^^^^
-Error: Unknown modifier 's' for literal 0x1.4p+0s
+Error: Found 32-bit float literal 0x1.4p+0s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let _ = 0xf.ffffffffffff8p+1020s;;
 [%%expect{|
 Line 1, characters 8-32:
 1 | let _ = 0xf.ffffffffffff8p+1020s;;
             ^^^^^^^^^^^^^^^^^^^^^^^^
-Error: Unknown modifier 's' for literal 0xf.ffffffffffff8p+1020s
+Error: Found 32-bit float literal 0xf.ffffffffffff8p+1020s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let _ = 0x8p-972s;;
 [%%expect{|
 Line 1, characters 8-17:
 1 | let _ = 0x8p-972s;;
             ^^^^^^^^^
-Error: Unknown modifier 's' for literal 0x8p-972s
+Error: Found 32-bit float literal 0x8p-972s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let _ = 0xc.d5e6fp+1_24s;;
 [%%expect{|
 Line 1, characters 8-24:
 1 | let _ = 0xc.d5e6fp+1_24s;;
             ^^^^^^^^^^^^^^^^
-Error: Unknown modifier 's' for literal 0xc.d5e6fp+1_24s
+Error: Found 32-bit float literal 0xc.d5e6fp+1_24s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;
 
 let () =
@@ -99,5 +99,21 @@ let () =
 Line 2, characters 8-12:
 2 |   match 0.0s with
             ^^^^
-Error: Unknown modifier 's' for literal 0.0s
+Error: Found 32-bit float literal 0.0s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
+|}];;
+
+let _ = #1.0s;;
+[%%expect{|
+Line 1, characters 8-13:
+1 | let _ = #1.0s;;
+            ^^^^^
+Error: Found 32-bit float literal #1.0s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
+|}];;
+
+let _ = -#1.0s;;
+[%%expect{|
+Line 1, characters 8-14:
+1 | let _ = -#1.0s;;
+            ^^^^^^
+Error: Found 32-bit float literal -#1.0s, but float32 is not enabled. You must enable -extension small_numbers to use this feature.
 |}];;

ocaml/testsuite/tests/typing-small-numbers/test_enabled.ml

@@ -75,7 +75,7 @@ let () =
 ;;
 [%%expect{|
 Line 1:
-Error: Matching on float32 is not supported.
+Error: float32 literal patterns are not supported.
 |}];;
 
 let () =
@@ -86,7 +86,7 @@ let () =
 ;;
 [%%expect{|
 Line 1:
-Error: Matching on float32 is not supported.
+Error: float32 literal patterns are not supported.
 |}];;
 
 let () =
@@ -95,5 +95,5 @@ let () =
 ;;
 [%%expect{|
 Line 1:
-Error: Matching on float32 is not supported.
+Error: float32 literal patterns are not supported.
 |}];;

ocaml/toplevel/byte/dune

@@ -25,7 +25,7 @@
 (rule
  (targets bytetop)
  ; This should be generated from the stdlib modules files
- (action (run %{ocaml_where}/../../bin/ocamlrun -I ../../../external/float32 %{exe:../expunge.bc} %{dep:../topstart.bc} %{targets}
+ (action (run %{ocaml_where}/../../bin/ocamlrun %{exe:../expunge.bc} %{dep:../topstart.bc} %{targets}
                     stdlib__Arg
                     stdlib__Array
                     stdlib__ArrayLabels

ocaml/typing/parmatch.ml

@@ -2467,7 +2467,7 @@ let check_ambiguous_bindings =
       ignore (List.fold_left check_case [] cases)
 
 let report_error ppf = function
-  | Float32_match -> Format.pp_print_string ppf "Matching on float32 is not supported."
+  | Float32_match -> Format.pp_print_string ppf "float32 literal patterns are not supported."
 
 let () =
   Location.register_error_of_exn (function

ocaml/typing/typecore.ml

@@ -202,6 +202,7 @@ type error =
   | Extension_not_enabled : _ Language_extension.t -> error
   | Literal_overflow of string
   | Unknown_literal of string * char
+  | Float32_literal of string
   | Illegal_letrec_pat
   | Illegal_letrec_expr
   | Illegal_class_expr
@@ -690,9 +691,9 @@ let constant : Parsetree.constant -> (Typedtree.constant, error) result =
   | Pconst_char c -> Ok (Const_char c)
   | Pconst_string (s,loc,d) -> Ok (Const_string (s,loc,d))
   | Pconst_float (f,None)-> Ok (Const_float f)
-  | Pconst_float (f,Some 's')
-    when Language_extension.is_enabled Small_numbers ->
-    Ok (Const_float32 f)
+  | Pconst_float (f,Some 's') ->
+    if Language_extension.is_enabled Small_numbers then Ok (Const_float32 f)
+    else Error (Float32_literal f)
   | Pconst_float (f,Some c) -> Error (Unknown_literal (f, c))
 
 let constant_or_raise env loc cst =
@@ -703,8 +704,11 @@ let constant_or_raise env loc cst =
 let unboxed_constant : Jane_syntax.Layouts.constant -> (Typedtree.constant, error) result
   = function
   | Float (f, None) -> Ok (Const_unboxed_float f)
-  | Float (x, Some c) ->
+  | Float (f, Some 's') ->
     (* CR mslater: (float32) unboxed *)
+    if Language_extension.is_enabled Small_numbers then assert false
+    else Error (Float32_literal (Misc.format_as_unboxed_literal f))
+  | Float (x, Some c) ->
     Error (Unknown_literal (Misc.format_as_unboxed_literal x, c))
   | Integer (i, suffix) ->
     begin match constant_integer i ~suffix with
@@ -9991,6 +9995,9 @@ let report_error ~loc env = function
         ty
   | Unknown_literal (n, m) ->
       Location.errorf ~loc "Unknown modifier '%c' for literal %s%c" m n m
+  | Float32_literal f ->
+      Location.errorf ~loc "Found 32-bit float literal %ss, but float32 is not enabled. \
+                            You must enable -extension small_numbers to use this feature." f
   | Illegal_letrec_pat ->
       Location.errorf ~loc
         "Only variables are allowed as left-hand side of `let rec'"

ocaml/typing/typecore.mli

@@ -268,6 +268,7 @@ type error =
   | Extension_not_enabled : _ Language_extension.t -> error
   | Literal_overflow of string
   | Unknown_literal of string * char
+  | Float32_literal of string
   | Illegal_letrec_pat
   | Illegal_letrec_expr
   | Illegal_class_expr
@@ -329,4 +330,4 @@ val check_recursive_bindings : Env.t -> Typedtree.value_binding list -> unit
 val check_recursive_class_bindings :
   Env.t -> Ident.t list -> Typedtree.class_expr list -> unit
 
-val src_pos : Location.t -> Typedtree.attributes -> Env.t -> Typedtree.expression 
+val src_pos : Location.t -> Typedtree.attributes -> Env.t -> Typedtree.expression

ocaml/typing/typeopt.ml

@@ -678,7 +678,8 @@ let classify_lazy_argument : Typedtree.expression ->
                              |`Other] =
   fun e -> match e.exp_desc with
     | Texp_constant
-        ( Const_int _ | Const_char _ | Const_string _ | Const_float32 _
+        ( Const_int _ | Const_char _ | Const_string _
+        | Const_float32 _ (* There is no float32 array optimization *)
         | Const_int32 _ | Const_int64 _ | Const_nativeint _ )
     | Texp_function _
     | Texp_construct (_, {cstr_arity = 0}, _, _) ->

testsuite/tools/Makefile

@@ -32,9 +32,8 @@ expect_MAIN=expect_test
 expect_PROG=$(expect_MAIN)$(EXE)
 expect_DIRS = parsing utils driver typing toplevel
 expect_OCAMLFLAGS = $(addprefix -I $(ROOTDIR)/,$(expect_DIRS))
-expect_LIBS := $(ROOTDIR)/external/compiler_float32 \
-	$(addprefix $(COMPILERLIBSDIR)/,\
-  	  ocamlcommon ocamlbytecomp ocamltoplevel)
+expect_LIBS := $(addprefix $(COMPILERLIBSDIR)/,\
+  	ocamlcommon ocamlbytecomp ocamltoplevel)
 
 codegen_PROG = codegen$(EXE)
 codegen_DIRS = parsing utils typing middle_end bytecomp lambda asmcomp