8000 Multiple payload types in tokens by proux01 · Pull Request #9815 · rocq-prover/rocq · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Multiple payload types in tokens #9815

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.

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

Merged
merged 3 commits into from
Apr 1, 2019
Merged

Conversation

proux01
Copy link
Contributor
@proux01 proux01 commented Mar 22, 2019

Instead of just string (and empty strings for tokens without payload)

This is mostly useless by itself but is used in #8764 and @ppedrot expressed a preference for and independent PR (#8764 (comment)).

It also takes the opportunity to remove most of the few Obj.magic left after #9548

This will conflict with #9733 I'll rebase here or offer a patch there, whichever comes first.

proux01 added a commit to proux01/ltac2 that referenced this pull request Mar 24, 2019
@proux01 proux01 force-pushed the token-type branch 2 times, most recently from 4567139 to 3e05e50 Compare March 28, 2019 19:46
@proux01
Copy link
Contributor Author
proux01 commented Mar 29, 2019

To sum up

proux01 added a commit to proux01/ltac2 that referenced this pull request Mar 29, 2019
proux01 added a commit to proux01/ltac2 that referenced this pull request Mar 30, 2019
@proux01 proux01 requested a review from ejgallego as a code owner March 30, 2019 09:09
proux01 added a commit to proux01/ltac2 that referenced this pull request Mar 30, 2019
@ppedrot
Copy link
Member
ppedrot commented Mar 30, 2019

@proux01 It seems this PR depends on #9733. I'll merge the latter first quickly, and will ping you to rebase this one, in order to get it into 8.10.

@proux01
Copy link
Contributor Author
proux01 commented Mar 30, 2019

@proux01 It seems this PR depends on #9733. I'll merge the latter first quickly, and will ping you to rebase this one, in order to get it into 8.10.

Yep, I rebased it over #9733 so rerebasing should be easy.

@ppedrot
Copy link
Member
ppedrot commented Mar 31, 2019

@proux01 Can you rebase this PR so that I merge it?

@ppedrot ppedrot added the kind: internal API, ML documentation... label Mar 31, 2019
@ppedrot ppedrot added this to the 8.10+beta1 milestone Mar 31, 2019
@ppedrot ppedrot self-assigned this Mar 31, 2019
proux01 added 2 commits March 31, 2019 23:17
Instead of just string (and empty strings for tokens without payload)
Something like "("; [ s = SELF -> { s } ]; ")" in a GRAMMAR EXTEND in
a mlg file was causing an error message such as

OCAMLOPT  f.ml
File "f.mlg", line 179, characters 55-67:  # not in a semantic rule so line doesn't match anything in the mlg file
Error: This expression has type ('a, Extend.mayrec, 'a) Extend.symbol
       but an expression was expected of type
         ('a, Extend.norec, 'b) Extend.symbol
       Type Extend.mayrec is not compatible with type Extend.norec

It is now

COQPP   f.mlg
Error: 'SELF' or 'NEXT' illegal in anonymous entry level
@proux01
Copy link
Contributor Author
proux01 commented Mar 31, 2019

Rebased

@proux01
Copy link
Contributor Author
proux01 commented Apr 1, 2019

@ppedrot CI green

@ppedrot ppedrot merged commit d8d3b7a into rocq-prover:master Apr 1, 2019
ppedrot added a commit that referenced this pull request Apr 1, 2019
Reviewed-by: ppedrot
Ack-by: proux01
ppedrot added a commit to rocq-prover/ltac2 that referenced this pull request Apr 1, 2019
@proux01 proux01 deleted the token-type branch April 1, 2019 11:14
@proux01
Copy link
Contributor Author
proux01 commented Apr 1, 2019

Thanks!

maximedenes pushed a commit to maximedenes/coq that referenced this pull request May 6, 2019
maximedenes pushed a commit to maximedenes/coq that referenced this pull request May 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind: internal API, ML documentation...
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0