From b3d3aa5d69c04e32198f640cf85d6f9756ef7333 Mon Sep 17 00:00:00 2001 From: moatom Date: Sat, 13 Feb 2021 19:25:34 +0900 Subject: [PATCH] Support BER MetaOCaml N111 --- vendor/token-latest/411ber/token_latest.ml | 131 +++++++++++++++++++++ vendor/token-latest/detect/detect.ml | 9 +- 2 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 vendor/token-latest/411ber/token_latest.ml diff --git a/vendor/token-latest/411ber/token_latest.ml b/vendor/token-latest/411ber/token_latest.ml new file mode 100644 index 0000000000..dcf9b540f2 --- /dev/null +++ b/vendor/token-latest/411ber/token_latest.ml @@ -0,0 +1,131 @@ +type token = Parser.token = + | WITH + | WHILE + | WHEN + | VIRTUAL + | VAL + | UNDERSCORE + | UIDENT of string + | TYPE + | TRY + | TRUE + | TO + | TILDE + | THEN + | STRUCT + | STRING of (string * Location.t * string option) + | STAR + | SIG + | SEMISEMI + | SEMI + | RPAREN + | REC + | RBRACKET + | RBRACE + | QUOTED_STRING_ITEM of + (string * Location.t * string * Location.t * string option) + | QUOTED_STRING_EXPR of + (string * Location.t * string * Location.t * string option) + | QUOTE + | QUESTION + | PRIVATE + | PREFIXOP of string + | PLUSEQ + | PLUSDOT + | PLUS + | PERCENT + | OR + | OPTLABEL of string + | OPEN + | OF + | OBJECT + | NONREC + | NEW + | MUTABLE + | MODULE + | MINUSGREATER + | MINUSDOT + | MINUS + | METHOD + | MATCH + | LPAREN + | LIDENT of string + | LETOP of string + | LET + | LESSMINUS + | LESS + | LBRACKETPERCENTPERCENT + | LBRACKETPERCENT + | LBRACKETLESS + | LBRACKETGREATER + | LBRACKETBAR + | LBRACKETATATAT + | LBRACKETATAT + | LBRACKETAT + | LBRACKET + | LBRACELESS + | LBRACE + | LAZY + | LABEL of string + | INT of (string * char option) + | INITIALIZER + | INHERIT + | INFIXOP4 of string + | INFIXOP3 of string + | INFIXOP2 of string + | INFIXOP1 of string + | INFIXOP0 of string + | INCLUDE + | IN + | IF + | HASHOP of string + | HASH + | GREATERRBRACKET + | GREATERRBRACE + | GREATERDOT + | GREATER + | FUNCTOR + | FUNCTION + | FUN + | FOR + | FLOAT of (string * char option) + | FALSE + | EXTERNAL + | EXCEPTION + | EQUAL + | EOL + | EOF + | END + | ELSE + | DOWNTO + | DOTTILDE + | DOTOP of string + | DOTLESS + | DOTDOT + | DOT + | DONE + | DOCSTRING of Docstrings.docstring + | DO + | CONSTRAINT + | COMMENT of (string * Location.t) + | COMMA + | COLONGREATER + | COLONEQUAL + | COLONCOLON + | COLON + | CLASS + | CHAR of char + | BEGIN + | BARRBRACKET + | BARBAR + | BAR + | BANG + | BACKQUOTE + | ASSERT + | AS + | ANDOP of string + | AND + | AMPERSAND + | AMPERAMPER + +let of_compiler_libs x = x diff --git a/vendor/token-latest/detect/detect.ml b/vendor/token-latest/detect/detect.ml index 6fb9235110..22f68e737f 100644 --- a/vendor/token-latest/detect/detect.ml +++ b/vendor/token-latest/detect/detect.ml @@ -1,5 +1,12 @@ let dir_name version = - if version >= (4, 11) then "411" + if version >= (4, 11) then + match Sys.os_type with + | "Unix" -> begin + match Sys.command "which metaocaml > /dev/null 2>&1" with + | 0 -> "411ber" + | _ -> "411" + end + | _ -> "411" else "408" let () =