head 1.8; access; symbols pkgsrc-2022Q1:1.7.0.18 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.16 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.14 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.12 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.10 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.8 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.6 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.4 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.2 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.6.0.12 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.8 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.6 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.4 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.2 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.5.0.12 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.10 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.8 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.6 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.4 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.3.0.10 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.8 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.6 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.4 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.2 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.2.0.14 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.12 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.10 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.8 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.6 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.4 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.2 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.1.0.14 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.12 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.10 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.8 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.6 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.4 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.2 pkgsrc-2012Q4-base:1.1; locks; strict; comment @# @; 1.8 date 2022.05.10.08.20.33; author jaapb; state dead; branches; next 1.7; commitid vpiDzHNDOAj57uDD; 1.7 date 2020.01.14.22.04.26; author jaapb; state Exp; branches; next 1.6; commitid Y6oBKXTpdisjMHSB; 1.6 date 2018.11.12.17.13.38; author jaapb; state Exp; branches; next 1.5; commitid RiNLNpr1Nz9P2GZA; 1.5 date 2017.07.11.10.10.40; author jaapb; state Exp; branches; next 1.4; commitid pvegXqFP7oLrqNYz; 1.4 date 2017.07.05.20.12.42; author wiedi; state Exp; branches; next 1.3; commitid BOakxii8yodeX4Yz; 1.3 date 2016.05.06.11.51.47; author jaapb; state Exp; branches; next 1.2; commitid NT79O6Wzx2V9Qp5z; 1.2 date 2014.08.17.14.37.23; author jaapb; state Exp; branches; next 1.1; commitid BvHDCG3NTJc3WIMx; 1.1 date 2012.10.29.09.11.23; author jaapb; state Exp; branches; next ; desc @@ 1.8 log @Updated devel/menhir to version 20220210. There are many changes since the last version, including a from-the-ground-up rewrite of the parser generator code and a switch of the build system to dune. More details in the CHANGES.md file included in the distribution. @ text @$NetBSD: patch-Makefile,v 1.7 2020/01/14 22:04:26 jaapb Exp $ Install into correct locations and use BSD_INSTALL_* --- Makefile.orig 2019-09-24 09:29:51.000000000 +0000 +++ Makefile @@@@ -46,10 +46,10 @@@@ endif # These may be overridden from outside; e.g., our opam package description # provides its own values of docdir, libdir, and mandir. -bindir := $(PREFIX)/bin -docdir := $(PREFIX)/share/doc/menhir -libdir := $(PREFIX)/share/menhir -mandir := $(PREFIX)/share/man/man1 +bindir := ${DESTDIR}$(PREFIX)/bin +docdir := ${DESTDIR}$(PREFIX)/share/doc/menhir +libdir := ${DESTDIR}$(PREFIX)/share/menhir +mandir := ${DESTDIR}$(PREFIX)/man/man1 MANS := doc/menhir.1 DOCS := doc/manual.pdf doc/manual.html doc/manual*.png demos @@@@ -176,10 +176,10 @@@@ endif install: # Install the executable. - mkdir -p $(bindir) - install $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE) + ${BSD_INSTALL_PROGRAM_DIR} $(bindir) + ${BSD_INSTALL_PROGRAM} $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE) # Install Menhir's standard library. - mkdir -p $(libdir) + ${BSD_INSTALL_LIB_DIR} $(libdir) # Install MenhirLib and MenhirSdk. @@if `$(BUILDDIR)/menhir.$(TARGET) --suggest-ocamlfind | tr -d '\r'` ; then \ echo 'Installing MenhirLib and MenhirSdk via ocamlfind.' ; \ @@@@ -190,13 +190,13 @@@@ install: rm -f META ; \ else \ echo 'Installing MenhirLib and MenhirSdk manually.' ; \ - install -m 644 $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) $(libdir) ; \ - install -m 644 $(patsubst %,$(SDKDIR)/%,$(MENHIRSDK)) $(libdir) ; \ + $(BSD_INSTALL_DATA) -m 644 $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) $(libdir) ; \ + $(BSD_INSTALL_DATA) -m 644 $(patsubst %,$(SDKDIR)/%,$(MENHIRSDK)) $(libdir) ; \ fi # Install the documentation. (If building from the repository, the documentation # may be absent.) if [ -f doc/manual.pdf ] ; then \ - mkdir -p $(docdir) $(mandir) ; \ + $(BSD_INSTALL_DATA_DIR) -p $(docdir) $(mandir) ; \ cp -r $(DOCS) $(docdir) ; \ cp -r $(MANS) $(mandir) ; \ fi @ 1.7 log @Updated devel/menhir to version 20190924. It mostly contains minor changes and bugfixes. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Updated devel/menhir to version 20181026 This version contains a lot of small additions and bugfixes, see CHANGES.md in the distribution. Also, the mode of distribution has changed; the package is now distributed through INRIA's gitlab. @ text @d3 3 a5 2 Use correct install locations and BSD_INSTALL_* --- Makefile.orig 2018-10-26 13:17:23.000000000 +0000 d15 4 a18 4 +bindir := $(DESTDIR)$(PREFIX)/bin +docdir := $(DESTDIR)$(PREFIX)/share/doc/menhir +libdir := $(DESTDIR)$(PREFIX)/share/menhir +mandir := $(DESTDIR)$(PREFIX)/${PKGMANDIR} d21 2 a22 2 MLYLIB := src/standard.mly @@@@ -177,11 +177,11 @@@@ endif d28 2 a29 2 + $(BSD_INSTALL_PROGRAM_DIR) -p $(bindir) + $(BSD_INSTALL_PROGRAM) $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE) d32 1 a32 3 - install -m 644 $(MLYLIB) $(libdir) + $(BSD_INSTALL_LIB_DIR) -p $(libdir) + $(BSD_INSTALL_DATA) -m 644 $(MLYLIB) $(libdir) d36 1 a36 1 @@@@ -192,13 +192,13 @@@@ install: @ 1.5 log @Updated package to latest version, 20170607. Changes include: ## 2017/06/07 * Removed an undeclared dependency of MenhirSdk on Unix. (Reported and fixed by Frédéric Bour.) ## 2017/05/09 * Menhir now always places OCaml line number directives in the generated `.ml` file. (Until now, this was done only when `--infer` was off.) Thus, if a semantic action contains an `assert` statement, the file name and line number information carried by the `Assert_failure` exception should now be correct. (Reported by Helmut Brandl.) ## 2017/04/18 * Changed Menhir's license from QPL to GPLv2. MenhirLib remains under LGPLv2, with a linking exception. * Moved the repository to [gitlab.inria.fr](https://gitlab.inria.fr/fpottier/menhir/). * Introduced a new command line switch, `--cmly`, which causes Menhir to create a `.cmly` file, containing a description of the grammar and automaton. (Suggested by Frédéric Bour.) * Introduced a new library, MenhirSdk, which allows reading a `.cmly` file. The purpose of this library is to allow external tools to take advantage of the work performed by Menhir's front-end. (Suggested by Frédéric Bour.) * Introduced new syntax for attributes in a `.mly` file. Attributes are ignored by Menhir's back-ends, but are written to `.cmly` files, thus can be exploited by external tools via MenhirSdk. (Suggested by Frédéric Bour.) * The definition of a `%public` nonterminal symbol can now be split into several parts within a single `.mly` file. (This used to be permitted only over multiple `.mly` files.) (Suggested by Frédéric Bour.) * New functions in the incremental API: `shifts`, `acceptable`, `current_state_number`. * New functions in the incremental API and inspection API: `top`, `pop`, `pop_many`, `get`, `equal`, `force_reduction`, `feed`, `input_needed`, `state_has_default_reduction`, `production_index`, `find_production`. (Suggested by Frédéric Bour.) * New module `MenhirLib.ErrorReports`. This module is supposed to offer auxiliary functions that help produce good syntax error messages. This module does not yet contain much functionality and is expected to evolve in the future. * Incompatible change in the incremental API: the type `env` becomes `'a env`. * Incompatible change in the incremental API: the function `has_default_reduction` is renamed `env_has_default_reduction`. * The type `stack` and the function `stack` in the incremental API are deprecated. The new functions `top` and `pop` can be used instead to inspect the parser's stack. The module `MenhirLib.General` is deprecated as well. Deprecated functionality will be removed in the future. * Incompatible change in the incremental API: the type of the function `print_stack` in the result signature of the functor `MenhirLib.Printers.Make` changes to `'a env -> unit`. (Anyway, as of now, `MenhirLib.Printers` remains undocumented.) * Improved the syntax error message that is displayed when a `.mly` file is incorrect: the previous and next token are shown. * Fixed a bug where the module name `Basics` was shadowed (that is, if the user's project happened to contain a toplevel module by this name, then it could not be referred to from a `.mly` file). (Reported by François Thiré.) ## 2017/01/01 * Add `$MENHIR_STDLIB` as a way of controlling where Menhir looks for the file `standard.mly`. This environment variable overrides the installation-time default setting, and is itself overridden by the `--stdlib` command line switch. (Requested by Jonathan Protzenko.) * `Makefile` fix: filter out `'\r'` in the output of `menhir --suggest-ocamlfind`, so that the `Makefile` works when Menhir is compiled as a Windows executable. (Suggested by Jonathan Protzenko.) ## 2016/12/01 * Updated the Coq back-end for compatibility with Coq 8.6. (Jacques-Henri Jourdan.) ## 2016/11/15 * Fix in `--only-preprocess-for-ocamlyacc` mode: avoid printing newline characters inside a `%type` declaration, as this is forbidden by `ocamlyacc`. (Reported by Kenji Maillard.) * Fix in `--only-preprocess-for-ocamlyacc` mode: avoid variable capture caused by `ocamlyacc` internally translating `$i` to `_i`. (Reported by Kenji Maillard.) ## 2016/09/01 * New command line switch `--only-preprocess-for-ocamlyacc`, supposed to print the grammar in a form that `ocamlyacc` can accept. As of now, this feature is incomplete (in particular, support for Menhir's position keywords is missing), untested, and undocumented. It could be removed in the future. ## 2016/08/26 * Fixes in the output of `--only-preprocess`: * The order of productions is now preserved. (It was not. This matters if there are reduce/reduce conflicts.) * `%parameter` directives are now printed. (They were not). * `%on_error_reduce` directives are now printed. (They were not.) ## 2016/08/25 * `Makefile` fix, undoing a change made on 2016/03/03, which caused installation to fail under (some versions of?) Windows where dynamic linking is not supported. (Reported by Andrew Appel.) ## 2016/08/05 * `%on_error_reduce` declarations now have implicit priority levels, so as to tell Menhir what to do when two such declarations are applicable. Also, the well-formedness checks on `%type` and `%on_error_reduce` declarations have been reinforced. ## 2016/06/23 * A small change in the generated code (both in the code and table back-ends) so as to avoid OCaml's warning 41. The warning would arise (when compiling a generated parser with OCaml 4.03) because Menhir's exception `Error` has the same name as the data constructor `Error` in OCaml's pervasive library. (Reported by Bernhard Schommer.) ## 2016/05/18 * Anonymous rules now work also when used inside a parameterized rule. (This did not work until now.) When an anonymous rule is hoisted out of a parameterized rule, it may itself become parameterized. Menhir parameterizes it only over the parameters that it actually needs. ## 2016/05/04 * In the Coq backend, split the largest definitions into smaller ones. This circumvents a limitation of vm_compute on 32 bit machines. This also enables us to perform sharing between definitions, so that the generated files are much smaller. ## 2016/04/10 * When printing a grammar (which is done by the `--only-preprocess` options), remove the leading bar `|`, for compatibility with `yacc` and `bison`. ## 2016/03/11 * In the code back-end, generate type annotations when extracting a semantic value out of the stack. When working with a semantic value of some function type, OCaml would incorrectly warn that this function does not use its argument. This warning should now be gone. @ text @d4 3 a6 3 --- Makefile.orig 2017-06-07 09:59:06.000000000 +0100 +++ Makefile 2017-06-30 15:02:07.000000000 +0100 @@@@ -45,10 +45,10 @@@@ d17 3 a19 3 +mandir := $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 MANS := menhir.1 DOCS := manual.pdf demos d21 1 a21 1 @@@@ -178,11 +178,11 @@@@ d26 1 a26 1 - install $(BUILDDIR)/menhir.$(TARGET) $(bindir)/$(MENHIREXE) d28 1 a28 1 + $(BSD_INSTALL_PROGRAM) $(BUILDDIR)/menhir.$(TARGET) $(bindir)/$(MENHIREXE) d37 1 a37 1 @@@@ -193,12 +193,12 @@@@ d46 6 a51 5 # Install the documentation, if it has been built. if [ -f manual.pdf ] ; then \ - mkdir -p $(docdir) $(mandir) && \ + $(BSD_INSTALL_DATA_DIR) -p $(docdir) $(mandir) && \ cp -r $(DOCS) $(docdir) && \ @ 1.4 log @support PKGMANDIR @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.3 2016/05/06 11:51:47 jaapb Exp $ d4 3 a6 3 --- Makefile.orig 2016-03-03 10:30:08.000000000 +0000 +++ Makefile @@@@ -45,10 +45,10 @@@@ endif d21 1 a21 1 @@@@ -164,22 +164,22 @@@@ endif d27 1 a27 1 + $(BSD_INSTALL_PROGRAM_DIR) $(bindir) d29 1 a29 1 # Install the library. d32 1 a32 1 + $(BSD_INSTALL_LIB_DIR) $(libdir) d34 5 a38 3 @@if `$(BUILDDIR)/menhir.$(TARGET) --suggest-ocamlfind` ; then \ echo Installing MenhirLib via ocamlfind. ; \ ocamlfind install menhirLib src/META $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) ; \ d40 1 a40 1 echo Installing MenhirLib manually. ; \ d42 1 d44 1 d48 3 a50 5 - mkdir -p $(docdir) ; \ - mkdir -p $(mandir) ; \ + $(BSD_INSTALL_DATA_DIR) $(docdir) ; \ + $(BSD_INSTALL_MAN_DIR) $(mandir) ; \ cp -r $(DOCS) $(docdir) ; \ @ 1.3 log @Updated package to latest version, 20160303. Changes include: 2016/05/04: In the Coq backend, split the largest definitions into smaller ones. This circumvenents a limitation of vm_compute on 32 bit machines. This also enables us to perform sharing between definitions, so that the generated files are much smaller. 2016/04/10: When printing a grammar (which is done by the --only-preprocess options), remove the leading bar '|', for compatibility with yacc and bison. 2016/03/11: In the code back-end, generate type annotations when extracting a semantic value out of the stack. When working with a semantic value of some function type, OCaml would incorrectly warn that this function does not use its argument. This warning should now be gone. 2016/03/03: Makefile changes, so as to support ocamlbuild 4.03, which seems to have stricter hygiene rules than previous versions. 2015/12/30: Prevented an incorrect installation that would take place if USE_OCAMLFIND was given during "make all" but not during "make install". Added a command line directive --suggest-ocamlfind. 2015/11/11: Fixed a severe bug in Menhir 20151110 which (when using the code back-end) could cause a generated parser to crash. Thanks to ygrek for reporting the bug. 2015/11/11: The code produced by version XXXXXXXX of menhir --table can now be linked only against a matching version of MenhirLib. If an incorrect version of MenhirLib is installed, the OCaml compiler should complain that [MenhirLib.StaticVersion.require_XXXXXXXX] is undefined. 2015/11/10: Optimized the computation of $symbolstartpos, based on a couple of assumptions about the lexer. (See the manual.) 2015/11/04: Modified the treatment of %inline so that the positions that are computed are the same, regardless of whether %inline is used. This property did not hold until now. It now does. Of course, this means that the positions computed by the new Menhir are not the same as those computed by older versions of Menhir. 2015/11/04: Fixed a bug in the treatment of %inline that would lead to an incorrect position being computed when the caller and callee had a variable by the same name. 2015/11/04: Modified Menhir so as to compute the start and end positions in the exact same way as ocamlyacc. (There used to be a difference in the treatment of epsilon productions.) Of course, this means that the positions computed by the new Menhir are not the same as those computed by older versions of Menhir. Added the keyword $symbolstartpos so as to simulate Parsing.symbol_start_pos() in the ocamlyacc world. The keyword $startpos sometimes produces a position that is too far off to the left; $symbolstartpos produces a more accurate position. 2015/11/04: Incompatible change of the incremental API: instead of a unit argument, the entry points (which are named after the start symbols) now require an initial position, which typically should be [lexbuf.lex_curr_p]. 2015/11/03: Fix-fix-and-re-fix the Makefile in an attempt to allow installation under opam/Windows. Thanks to Daniel Weil for patient explanations and testing. 2015/10/29: MenhirLib is now installed in both binary and source forms. "menhir --suggest-menhirLib" reports where MenhirLib is installed. This can be used to retrieve a snapshot of MenhirLib in source form and include it in your project (if you wish to use --table mode, yet do not wish to have a dependency on MenhirLib). 2015/10/26: Allow --list-errors to work on 32-bit machines (with low hard limits). This should fix a problem whereby the 2015/10/23 release could not bootstrap on a 32-bit machine. 2015/10/23: New declaration "%on_error_reduce foo", where foo is a nonterminal symbol. This modifies the automaton as follows. In every state where a production of the form "foo -> ..." is ready to be reduced, every error action is replaced with a reduction of this production. (If there is a conflict between several productions that could be reduced in this manner, nothing is done.) This does not affect the language that is accepted by the automaton, but delays the detection of an error: more reductions take place before the error is detected. 2015/10/23: Fixed a bug whereby Menhir would warn about a useless %prec declaration, even though it was useful. This would happen when the declaration was duplicated (by inlining or by macro-expansion) and some but not all of the copies were useful. 2015/10/23: Added [has_default_reduction] to the incremental API. 2015/10/23: Modified the meaning of --canonical to allow default reductions to take place. This implies no loss of precision in terms of lookahead sets, and should allow gaining more contextual information when a syntax error is encountered. (It should also lead to a smaller automaton.) 2015/10/23: A brand new set of tools to work on syntax errors. New command --list-errors, which produces a list of input sentences which are representative of all possible syntax errors. (Costly.) New command --interpret-error, which confirms that one particular input sentence ends in a syntax error, and prints the number of the state in which this error occurs. New command --compile-errors, which compiles a list of erroneous sentences (together with error messages) to OCaml code. New command --compare-errors, which compares two lists of erroneous sentences to check if they cover the same error states. New command --update-errors, which updates the auto-generated comments in a list of erroneous sentences. New command --echo-errors, which removes all comments and messages from a list of erroneous sentences, and echoes just the sentences. 2015/10/16: Additions to the incremental API. A [supplier] is a function that produces tokens on demand. [lexer_lexbuf_to_supplier] turns a lexer and a lexbuf into a supplier. [loop] is a ready-made made main parsing loop. [loop_handle] is a variant that lets the user do her own error handling. [loop_handle_undo] is a variant that additionally allows undoing the last few "spurious" reductions. [number] maps a state of the LR(1) automaton to its number. 2015/10/16: Incompatible change of the incremental API: renamed the type ['a result] to ['a checkpoint]. This is a better name anyway, and should help avoid confusion with the type ['a result] introduced in OCaml 4.03. 2015/10/12: Avoid using $(shell pwd) in Makefile, for better Windows compatibility. 2015/10/05: Fixed a bug where inconsistent OCaml code was generated when --table and --external-tokens were used together. (Reported by Darin Morrison.) 2015/10/05: In --infer mode, leave the .ml file around (instead of removing it) if ocamlc fails, so we have a chance to understand what's wrong. 2015/09/21: Re-established some error messages concerning the mis-use of $i which had disappeared on 2015/06/29. 2015/09/11: Fixed the mysterious message that would appear when a nonterminal symbol begins with an uppercase letter and --infer is turned on. Clarified the documentation to indicate that a (non-start) nonterminal symbol can begin with an uppercase letter, but this is not recommended. 2015/08/27: New option --inspection (added last January, documented only now). This generates an inspection API which allows inspecting the automaton's stack, among other things. This API can in principle be used to write custom code for error reporting, error recovery, etc. It is not yet mature and may change in the future. 2015/07/20: Added the command line options --unused-token and --unused-tokens. 2015/06/29: Changed the treatment of the positional keywords $i. They are now rewritten into variables of the form '_i' where 'i' is an integer. Users are advised not to use variables of this form inside semantic actions. 2015/02/11: Added support for anonymous rules. This allows writing, e.g., list(e = expression SEMI { e }) whereas previously one should have written list(terminated(e, SEMI)). 2015/02/09: Moved all of the demos to ocamlbuild (instead of make). 2015/01/18: Incompatible change of the incremental API. The incremental API now exposes shift events too. 2015/01/16: Fixed a couple bugs in Makefile and src/Makefile which would cause compilation and installation to fail with "TARGET=byte". (Reported by Jérémie Courrèges-Anglas and Daniel Dickman.) 2015/01/01: Incompatible change of the incremental API. The entry point main_incremental is now named Incremental.main. 2014/12/29: Incompatible change of the incremental API. The API now exposes reduction events. The type 'a result is now private. The type env is no longer parameterized. [handle] is renamed to [resume]. [offer] and [resume] now expect a result, not an environment. 2014/12/22: Documented the Coq back-end (designed and implemented by Jacques-Henri Jourdan). 2014/12/15: New incremental API (in --table mode only), inspired by Frédéric Bour. 2014/12/11: Menhir now reports an error if one of the start symbols produces either the empty language or the singleton language {epsilon}. Although some people out there actually define a start symbol that recognizes {epsilon} (and use it as a way of initializing or re-initializing some global state), this is considered bad style. Furthermore, by ruling out this case, we are able to simplify the table back-end a little bit. 2014/12/12: A speed improvement in the code back-end. 2014/12/08: Menhir now requires OCaml 4.02 (instead of 3.09). 2014/12/02: Removed support for the $previouserror keyword. Removed support for --error-recovery mode. @ text @d1 1 a1 1 $NetBSD$ d17 1 a17 1 +mandir := $(DESTDIR)$(PREFIX)/man/man1 @ 1.2 log @Updated package to newest version, 20140422. Changes include: In the Coq backend, use ' instead of _ as separator in identifiers. Also, correct a serious bug that was inadvertently introduced on 2013/03/01 (r319). Lexer fix so as to support an open variant type [> ...] within a %type<...> declaration. Updated the Makefile so that install no longer depends on all. Updated the demos so that the lexer does not invoke "exit 0" when encoutering eof. (This should be more intuitive.) Fixed a newline conversion problem that would prevent Menhir from building on Windows when using ocaml 4.01. Switched to ocamlbuild. Many thanks to Daniel Weil for offering very useful guidance. "menhir --depend" was broken since someone added new whitespace in the output of ocamldep. Fixed. Fixed a compilation problem that would arise when a file produced by Menhir on a 64-bit platform was compiled by ocaml on a 32-bit platform. Performance improvements in the computation of various information about the automaton (module [Invariant]). The improvements will be noticeable only for very large automata. The option --log-grammar 3 (and above) now causes the FOLLOW sets for *terminal* symbols to be computed and displayed. Added the flag --canonical, which causes Menhir to produce a canonical LR(1) automaton in the style of Knuth. This means that no merging of states takes place during the construction of the automaton, and that no default reductions are allowed. I also modified the package to use the ocaml.mk infrastructure. @ text @d3 2 a4 2 Use correct install locations --- Makefile.orig 2014-04-22 08:04:21.000000000 +0000 d6 3 a8 3 @@@@ -48,10 +48,10 @@@@ endif # ---------------------------------------------------------------------------- # Installation paths. d10 8 a17 8 -bindir := ${PREFIX}/bin -docdir := ${PREFIX}/share/doc/menhir -libdir := ${PREFIX}/share/menhir -mandir := ${PREFIX}/share/man/man1 +bindir := ${DESTDIR}${PREFIX}/bin +docdir := ${DESTDIR}${PREFIX}/share/doc/menhir +libdir := ${DESTDIR}${PREFIX}/share/menhir +mandir := ${DESTDIR}${PKGMANDIR}/man1 d21 10 a30 5 @@@@ -95,13 +95,15 @@@@ install: mkdir -p $(libdir) mkdir -p $(docdir) mkdir -p $(mandir) - install $(BUILDDIR)/menhir.native $(bindir)/$(MENHIREXE) d32 3 a34 5 + ${BSD_INSTALL_PROGRAM} $(BUILDDIR)/menhir.native $(bindir)/$(MENHIREXE) + ${BSD_INSTALL_DATA} -m 644 $(MLYLIB) $(libdir) cp -r $(DOCS) $(docdir) cp -r $(MANS) $(mandir) @@if $(USE_OCAMLFIND) ; then \ d36 1 a36 4 - ocamlfind install menhirLib src/META $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) ; \ + ocamlfind install -destdir ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR} \ + -ldconf ignore \ + menhirLib src/META $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) ; \ d39 12 a50 1 install -m 644 $(patsubst %,$(BUILDDIR)/%,$(MENHIRLIB)) $(libdir) ; \ @ 1.1 log @Corrected contents of patch directory; minor modifications to build mechanism to keep pkglint happy. @ text @d3 2 a4 2 Change installation procedure to conform with pkgsrc (install, destdir) --- Makefile.orig 2012-01-23 10:57:40.000000000 +0000 d6 3 a8 3 @@@@ -34,10 +34,10 @@@@ ifndef PREFIX $(error Please define PREFIX) endif d21 1 a21 1 @@@@ -79,13 +79,14 @@@@ install: all d25 1 a25 1 - install src/$(MENHIREXE) $(bindir) d27 2 a28 2 + ${BSD_INSTALL_PROGRAM} src/$(MENHIREXE) $(bindir) + ${BSD_INSTALL_DATA} $(MLYLIB) $(libdir) d31 1 a31 1 @@cd src && if $(USE_OCAMLFIND) ; then \ d33 4 a36 3 - ocamlfind install menhirLib META $(MENHIRLIB) ; \ + ocamlfind install -destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib \ + -ldconf ignore menhirLib META $(MENHIRLIB) ; \ d39 1 a39 1 install -m 644 $(MENHIRLIB) $(libdir) ; \ @