Stefan pushed to branch master at Stefan / Typer

Commits: 894dd057 by Stefan Monnier at 2016-10-05T22:36:27-04:00 * src/lparse.ml (lexp_decls_1): Fix inf-loop on structural equality

- - - - -

1 changed file:

- src/lparse.ml

Changes:

===================================== src/lparse.ml ===================================== --- a/src/lparse.ml +++ b/src/lparse.ml @@ -808,15 +808,13 @@ and lexp_decls_1 | Pmcall ((l, _) as v, sargs) :: pdecls -> ((* expand macro and get the generated declarations *) let pdecls', nctx' = lexp_decls_macro v sargs nctx in - print_string "lexp_decls_macro \n"; flush stdout;

- if nctx = nctx' then( - print_string "nctx = nctx'\n"; flush stdout; + if nctx == nctx' then (* Plain macro expansion! *) lexp_decls_1 (List.append pdecls' pdecls) ectx nctx - pending_decls pending_defs) + pending_decls pending_defs

- else if ectx = nctx then + else if ectx == nctx then (assert (SMap.is_empty pending_decls); assert (pending_defs = []);

View it on GitLab: https://gitlab.com/monnier/typer/commit/894dd057c1c19ae264cd2ec8d493aacea96f...