Skip to content

accept unicode -> #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gares wants to merge 1 commit into
base: master
Choose a base branch
from
Open

accept unicode -> #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# UNRELEASED

- Parser:
- New accept `→` as `->` since it is found in Elpi tutorials rendered in
HTML

# v3.4.3 (November 2025)

Requires Menhir 20211230 and OCaml 4.13 or above.
Expand Down
8 changes: 5 additions & 3 deletions src/parser/gen_token_precedence.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ let pp_mehir_fixity fmt = function
| Infixr -> Format.fprintf fmt "right"

let pp_token_names fmt l =
l |> List.iter (function
| Fixed { token; _ } -> Format.fprintf fmt "%s " token
| Extensible { token; _ } -> Format.fprintf fmt "%s " token)
let toks = l |> List.map (function
| Fixed { token; _ } -> Format.asprintf "%s" token
| Extensible { token; _ } -> Format.asprintf "%s" token) in
let toks = Elpi_util.Util.uniq @@ List.sort Stdlib.compare toks in
Format.fprintf fmt "%s" (String.concat " " toks)

let () =
Format.printf "%%right BIND\n";
Expand Down
3 changes: 2 additions & 1 deletion src/parser/lexer_config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ let mixfix_symbols : mixfix list = [
{ tokens = [ mkFix "CONJ" "," CONJ;
mkFix "CONJ2" "&" CONJ2];
fixity = Infixr };
{ tokens = [ mkFix "ARROW" "->" ARROW];
{ tokens = [ mkFix "ARROW" "->" ARROW;
mkFix "ARROW" "→" ARROW];
fixity = Infixr };
{ tokens = [ mkFix "DARROW" "=>" DARROW];
fixity = Infixr };
Expand Down
40 changes: 20 additions & 20 deletions src/parser/token_precedence.mly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
%right BIND
%nonassoc VDASH QDASH
%right OR
%right DDARROW
%right DDARROWBANG
%right CONJ CONJ2
%right ARROW
%right DARROW
%nonassoc EQ EQ2 FAMILY_LT FAMILY_GT IS
%right CONS
%nonassoc FAMILY_TICK
%left FAMILY_EXP FAMILY_PLUS MINUS MINUSr MINUSi MINUSs
%left FAMILY_TIMES SLASH DIV MOD
%right FAMILY_MINUS
%nonassoc FAMILY_BTICK
%right FAMILY_EQ
%right FAMILY_OR
%right FAMILY_AND
%left FAMILY_SHARP
%nonassoc FAMILY_TILDE
%nonassoc FAMILY_QMARK
%nonassoc QDASH VDASH
%right OR
%right DDARROW
%right DDARROWBANG
%right CONJ CONJ2
%right ARROW
%right DARROW
%nonassoc EQ EQ2 FAMILY_GT FAMILY_LT IS
%right CONS
%nonassoc FAMILY_TICK
%left FAMILY_EXP FAMILY_PLUS MINUS MINUSi MINUSr MINUSs
%left DIV FAMILY_TIMES MOD SLASH
%right FAMILY_MINUS
%nonassoc FAMILY_BTICK
%right FAMILY_EQ
%right FAMILY_OR
%right FAMILY_AND
%left FAMILY_SHARP
%nonassoc FAMILY_TILDE
%nonassoc FAMILY_QMARK
%%
Loading