Skip to content

Synchronisation with OCaml#91

Closed
hhugo wants to merge 3 commits intocamlp4:trunkfrom
hhugo:lex2
Closed

Synchronisation with OCaml#91
hhugo wants to merge 3 commits intocamlp4:trunkfrom
hhugo:lex2

Conversation

@hhugo
Copy link
Copy Markdown
Contributor

@hhugo hhugo commented May 13, 2015

ocaml/ocaml#155 (literal directly followed by an identifier is not allowed anymore)
ocaml/ocaml#170 (change in the Ast)

@avsm
Copy link
Copy Markdown
Contributor

avsm commented Jul 7, 2015

Is this necessary for camlp4 to work with trunk?

@ghost
Copy link
Copy Markdown

ghost commented Jul 8, 2015

It will be when ocaml/ocaml#170 is merged

@hhugo
Copy link
Copy Markdown
Contributor Author

hhugo commented Jul 8, 2015

note that ocaml/ocaml#155 has been merged already - it only makes the lexer more restrictive / does not break camlp4

@ghost
Copy link
Copy Markdown

ghost commented Dec 4, 2015

Merged in trunk, thanks!

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants