dedupe snippets

Author: cometkim

jscomp/syntax/src/res_outcome_printer.ml

@@ -8,65 +8,7 @@
  * In general it represent messages to show results or errors to the user. *)
 
 module Doc = Res_doc
-module Token = Res_token
-
-let rec unsafe_for_all_range s ~start ~finish p =
-  start > finish
-  || p (String.unsafe_get s start)
-     && unsafe_for_all_range s ~start:(start + 1) ~finish p
-
-let for_all_from s start p =
-  let len = String.length s in
-  unsafe_for_all_range s ~start ~finish:(len - 1) p
-
-(* See https://github.com/rescript-lang/rescript-compiler/blob/726cfa534314b586e5b5734471bc2023ad99ebd9/jscomp/ext/ext_string.ml#L510 *)
-let isValidNumericPolyvarNumber (x : string) =
-  let len = String.length x in
-  len > 0
-  &&
-  let a = Char.code (String.unsafe_get x 0) in
-  a <= 57
-  &&
-  if len > 1 then
-    a > 48
-    && for_all_from x 1 (function
-         | '0' .. '9' -> true
-         | _ -> false)
-  else a >= 48
-
-type identifierStyle = ExoticIdent | NormalIdent
-
-let classifyIdentContent ~allowUident txt =
-  let len = String.length txt in
-  let rec go i =
-    if i == len then NormalIdent
-    else
-      let c = String.unsafe_get txt i in
-      if
-        i == 0
-        && not
-             ((allowUident && c >= 'A' && c <= 'Z')
-             || (c >= 'a' && c <= 'z')
-             || c = '_')
-      then ExoticIdent
-      else if
-        not
-          ((c >= 'a' && c <= 'z')
-          || (c >= 'A' && c <= 'Z')
-          || c = '\'' || c = '_'
-          || (c >= '0' && c <= '9'))
-      then ExoticIdent
-      else go (i + 1)
-  in
-  if Token.isKeywordTxt txt then ExoticIdent else go 0
-
-let printPolyVarIdent txt =
-  (* numeric poly-vars don't need quotes: #644 *)
-  if isValidNumericPolyvarNumber txt then Doc.text txt
-  else
-    match classifyIdentContent ~allowUident:true txt with
-    | ExoticIdent -> Doc.concat [Doc.text "\""; Doc.text txt; Doc.text "\""]
-    | NormalIdent -> Doc.text txt
+module Printer = Res_printer
 
 (* ReScript doesn't have parenthesized identifiers.
  * We don't support custom operators. *)
@@ -393,7 +335,7 @@ and printOutVariant variant =
                  (Doc.concat
                     [
                       Doc.text "#";
-                      printPolyVarIdent name;
+                      Printer.printPolyVarIdent name;
                       (match types with
                       | [] -> Doc.nil
                       | types ->

jscomp/syntax/src/res_printer.ml

@@ -376,25 +376,23 @@ let printLongident = function
   | Longident.Lident txt -> Doc.text txt
   | lid -> Doc.join ~sep:Doc.dot (printLongidentAux [] lid)
 
-type identifierStyle = ExoticIdent | NormalIdent
+type identifierStyle = ExoticLike | NormalIdent
 
-let classifyIdentContent ?(allowUident = false) ?(allowHyphen = false) txt =
-  if Token.isKeywordTxt txt then ExoticIdent
+let classifyIdentContent txt =
+  if Ext_ident.is_exotic txt then ExoticLike
+  else if Token.isKeywordTxt txt then ExoticLike
   else
     let len = String.length txt in
     let rec loop i =
       if i == len then NormalIdent
       else if i == 0 then
         match String.unsafe_get txt i with
-        | 'A' .. 'Z' when allowUident -> loop (i + 1)
-        | 'a' .. 'z' | '_' -> loop (i + 1)
-        | '-' when allowHyphen -> loop (i + 1)
-        | _ -> ExoticIdent
+        | 'A' .. 'Z' | 'a' .. 'z' | '_' -> loop (i + 1)
+        | _ -> ExoticLike
       else
         match String.unsafe_get txt i with
         | 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '\'' | '_' -> loop (i + 1)
-        | '-' when allowHyphen -> loop (i + 1)
-        | _ -> ExoticIdent
+        | _ -> ExoticLike
     in
     loop 0
 
@@ -427,8 +425,8 @@ let printPolyVarIdent txt =
   (* numeric poly-vars don't need quotes: #644 *)
   if isValidNumericPolyvarNumber txt then Doc.text txt
   else
-    match classifyIdentContent ~allowUident:true txt with
-    | ExoticIdent ->
+    match classifyIdentContent txt with
+    | ExoticLike ->
       Doc.concat
         [Doc.text "\""; Doc.text (Ext_ident.unwrap_exotic txt); Doc.text "\""]
     | NormalIdent -> (

jscomp/syntax/src/res_printer.mli

@@ -22,4 +22,6 @@ val printImplementation :
 val printInterface :
   width:int -> Parsetree.signature -> comments:Res_comment.t list -> string
 
+val printPolyVarIdent : string -> Res_doc.t
+
 val polyVarIdentToString : string -> string [@@live]