diff options
| author | Antonin Décimo <antonin@tarides.com> | 2023-03-31 14:24:12 +0100 |
|---|---|---|
| committer | Antonin Décimo <antonin@tarides.com> | 2023-03-31 14:24:12 +0100 |
| commit | ba6d2ebef436347b11470bdf4b85aea6bbff44a0 (patch) | |
| tree | 58cf69035ed46b54963b17f65d46b8475bae904b /testsuite | |
| parent | be27ba829f5eafb6abf9e5d91a78ea5403d52782 (diff) | |
| download | ocaml-ba6d2ebef436347b11470bdf4b85aea6bbff44a0.tar.gz | |
Revert "Use ocamlyacc's support for OCaml-style comments"
This reverts commit 514a830eae3991aec12146d3f6aeff3aa2d8406a.
> The dune build system for the OCaml compiler is morally a hack, it
> uses the tools from the ambient opam switch to build the compiler
> codebase -- which can break whenever the compiler distribution has
> more recent tools than the opam switch, and uses the more recent
> features in its own codebase.
> This is what is going on here: @DemiMarie introduced a new ocamlyacc
> feature, and also started using it in the compiler codebase in the
> non-essential commit 514a830. If we want dune to work well, a
> reasonable solution is to revert 514a830 for now, and wait until the
> next OCaml version is released (with the new ocamlyacc feature) to
> merge it again. At this point the dune build will be possible with
> the most recent OCaml release as your opam switch.
from Gabriel Scherer,
https://github.com/ocaml/ocaml/pull/11718#issuecomment-1475338016
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tools/parsecmm.mly | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/testsuite/tools/parsecmm.mly b/testsuite/tools/parsecmm.mly index 312b335154..d9807e24d5 100644 --- a/testsuite/tools/parsecmm.mly +++ b/testsuite/tools/parsecmm.mly @@ -1,19 +1,19 @@ -(**************************************************************************) -(* *) -(* OCaml *) -(* *) -(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *) -(* *) -(* Copyright 1996 Institut National de Recherche en Informatique et *) -(* en Automatique. *) -(* *) -(* All rights reserved. This file is distributed under the terms of *) -(* the GNU Lesser General Public License version 2.1, with the *) -(* special exception on linking described in the file LICENSE. *) -(* *) -(**************************************************************************) +/**************************************************************************/ +/* */ +/* OCaml */ +/* */ +/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */ +/* */ +/* Copyright 1996 Institut National de Recherche en Informatique et */ +/* en Automatique. */ +/* */ +/* All rights reserved. This file is distributed under the terms of */ +/* the GNU Lesser General Public License version 2.1, with the */ +/* special exception on linking described in the file LICENSE. */ +/* */ +/**************************************************************************/ -(* A simple parser for C-- *) +/* A simple parser for C-- */ %{ open Cmm @@ -188,7 +188,7 @@ fun_name: | IDENT { $1 } params: oneparam params { $1 :: $2 } - | (**) { [] } + | /**/ { [] } ; oneparam: IDENT COLON machtype { (bind_ident $1, $3) } @@ -293,14 +293,14 @@ expr: ; exprlist: exprlist expr { $2 :: $1 } - | (**) { [] } + | /**/ { [] } ; letdef: oneletdef { [$1] } | LPAREN letdefmult RPAREN { $2 } ; letdefmult: - (**) { [] } + /**/ { [] } | oneletdef letdefmult { $1 :: $2 } ; oneletdef: @@ -311,7 +311,7 @@ letmutdef: | LPAREN letmutdefmult RPAREN { $2 } ; letmutdefmult: - (**) { [] } + /**/ { [] } | oneletmutdef letmutdefmult { $1 :: $2 } ; oneletmutdef: @@ -389,7 +389,7 @@ sequence: ; caselist: onecase sequence caselist { ($1, $2) :: $3 } - | (**) { [] } + | /**/ { [] } ; onecase: CASE INTCONST COLON onecase { $2 :: $4 } @@ -404,7 +404,7 @@ datadecl: ; datalist: datalist dataitem { $2 :: $1 } - | (**) { [] } + | /**/ { [] } ; dataitem: STRING COLON { Cdefine_symbol $1 } @@ -432,5 +432,5 @@ catch_handler: { find_label $2, $3, $5, debuginfo () } location: - (**) { None } + /**/ { None } | LOCATION { Some $1 } |