Rename Character token to Codepoint token.

Codepoint makes more sense with unicode

Author: Iwan

src/res_core.ml

@@ -917,7 +917,7 @@ let parseConstant p =
       s
     in
     Pconst_string(txt, None)
-  | Character {c; original} ->
+  | Codepoint {c; original} ->
     if p.mode = ParseForTypeChecker then
       Pconst_char c
     else
@@ -1113,7 +1113,7 @@ let rec parsePattern ?(alias=true) ?(or_=true) p =
     let loc = mkLoc startPos endPos in
     Ast_helper.Pat.construct ~loc
       (Location.mkloc (Longident.Lident (Token.toString token)) loc) None
-  | Int _ | String _ | Float _ | Character _ | Minus | Plus ->
+  | Int _ | String _ | Float _ | Codepoint _ | Minus | Plus ->
     let c = parseConstant p in
      begin match p.token with
       | DotDot ->
@@ -1858,7 +1858,7 @@ and parseAtomicExpr p =
       let loc = mkLoc startPos p.prevEndPos in
       Ast_helper.Exp.construct ~loc
         (Location.mkloc (Longident.Lident (Token.toString token)) loc) None
-    | Int _ | String _ | Float _ | Character _ ->
+    | Int _ | String _ | Float _ | Codepoint _ ->
       let c = parseConstant p in
       let loc = mkLoc startPos p.prevEndPos in
       Ast_helper.Exp.constant ~loc c

src/res_grammar.ml

@@ -134,7 +134,7 @@ let isSignatureItemStart = function
   | _ -> false
 
 let isAtomicPatternStart = function
-  | Token.Int _ | String _ | Character _ | Backtick
+  | Token.Int _ | String _ | Codepoint _ | Backtick
   | Lparen | Lbracket | Lbrace
   | Underscore
   | Lident _ | Uident _ | List
@@ -144,7 +144,7 @@ let isAtomicPatternStart = function
 
 let isAtomicExprStart = function
   | Token.True | False
-  | Int _ | String _ | Float _ | Character _
+  | Int _ | String _ | Float _ | Codepoint _
   | Backtick
   | Uident _ | Lident _ | Hash
   | Lparen
@@ -165,7 +165,7 @@ let isAtomicTypExprStart = function
 
 let isExprStart = function
   | Token.True | False
-  | Int _ | String _ | Float _ | Character _ | Backtick
+  | Int _ | String _ | Float _ | Codepoint _ | Backtick
   | Underscore (* _ => doThings() *)
   | Uident _ | Lident _ | Hash
   | Lparen | List | Module | Lbracket | Lbrace
@@ -194,7 +194,7 @@ let isStructureItemStart = function
   | _ -> false
 
 let isPatternStart = function
-  | Token.Int _ | Float _ | String _ | Character _ | Backtick | True | False | Minus | Plus
+  | Token.Int _ | Float _ | String _ | Codepoint _ | Backtick | True | False | Minus | Plus
   | Lparen | Lbracket | Lbrace | List
   | Underscore
   | Lident _ | Uident _ | Hash
@@ -301,7 +301,7 @@ let isJsxChildStart = isAtomicExprStart
 
 let isBlockExprStart = function
   | Token.At | Hash | Percent | Minus | MinusDot | Plus | PlusDot | Bang
-  | True | False | Float _ | Int _ | String _ | Character _ | Lident _ | Uident _
+  | True | False | Float _ | Int _ | String _ | Codepoint _ | Lident _ | Uident _
   | Lparen | List | Lbracket | Lbrace | Forwardslash | Assert
   | Lazy | If | For | While | Switch | Open | Module | Exception | Let
   | LessThan | Backtick | Try | Underscore -> true

src/res_scanner.ml

@@ -451,7 +451,7 @@ let scanEscape scanner =
   let contents = (String.sub [@doesNotRaise]) scanner.src offset (scanner.offset - offset) in
   next scanner; (* Consume \' *)
   (* TODO: do we know it's \' ? *)
-  Token.Character {c = codepoint; original = contents}
+  Token.Codepoint {c = codepoint; original = contents}
 
 let scanSingleLineComment scanner =
   let startOff = scanner.offset in
@@ -664,7 +664,7 @@ let rec scan scanner =
     | ch, '\'' ->
       let offset = scanner.offset + 1 in
       next3 scanner;
-      Token.Character {c = ch; original = (String.sub [@doesNotRaise]) scanner.src offset 1}
+      Token.Codepoint {c = ch; original = (String.sub [@doesNotRaise]) scanner.src offset 1}
     | ch, _ ->
       next scanner;
       let offset = scanner.offset in
@@ -675,7 +675,7 @@ let rec scan scanner =
       if scanner.ch = '\'' then (
         let contents = (String.sub [@doesNotRaise]) scanner.src offset length in
         next scanner;
-        Token.Character {c = Obj.magic codepoint; original = contents}
+        Token.Codepoint {c = Obj.magic codepoint; original = contents}
       ) else (
         scanner.ch <- ch;
         scanner.offset <- offset;

src/res_token.ml

@@ -3,7 +3,7 @@ module Comment = Res_comment
 type t =
   | Open
   | True | False
-  | Character of {c: char; original: string}
+  | Codepoint of {c: char; original: string}
   | Int of {i: string; suffix: char option}
   | Float of {f: string; suffix: char option}
   | String of string
@@ -88,7 +88,7 @@ let precedence = function
 let toString = function
   | Open -> "open"
   | True -> "true" | False -> "false"
-  | Character {original} -> "character '" ^ original ^ "'"
+  | Codepoint {original} -> "codepoint '" ^ original ^ "'"
   | String s -> "string \"" ^ s ^ "\""
   | Lident str -> str
   | Uident str -> str