Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
POTTIER Francois
menhir
Commits
4e3869ca
Commit
4e3869ca
authored
Jul 29, 2020
by
POTTIER Francois
Browse files
Rename aux.ml to auxiliary.ml to avoid a reserved name on Windows.
parent
5ced458a
Pipeline
#160058
failed with stage
Changes
9
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
test/dynamic/positions/menhir_code/dune
View file @
4e3869ca
;; Menhir, code back-end, %inline disabled.
;; Copy the common source files.
(copy_files# ../src/{calc,aux}.ml)
(copy_files# ../src/{calc,aux
iliary
}.ml)
(copy_files# ../src/lexer.mll)
;; Copy the appropriate parser.
...
...
test/dynamic/positions/menhir_code_inline/dune
View file @
4e3869ca
;; Menhir, code back-end, %inline enabled.
;; Copy the common source files.
(copy_files# ../src/{calc,aux}.ml)
(copy_files# ../src/{calc,aux
iliary
}.ml)
(copy_files# ../src/lexer.mll)
;; Copy the appropriate parser.
...
...
test/dynamic/positions/menhir_table/dune
View file @
4e3869ca
;; Menhir, table back-end, %inline disabled.
;; Copy the common source files.
(copy_files# ../src/{calc,aux}.ml)
(copy_files# ../src/{calc,aux
iliary
}.ml)
(copy_files# ../src/lexer.mll)
;; Copy the appropriate parser.
...
...
test/dynamic/positions/menhir_table_inline/dune
View file @
4e3869ca
;; Menhir, table back-end, %inline enabled.
;; Copy the common source files.
(copy_files# ../src/{calc,aux}.ml)
(copy_files# ../src/{calc,aux
iliary
}.ml)
(copy_files# ../src/lexer.mll)
;; Copy the appropriate parser.
...
...
test/dynamic/positions/ocamlyacc/dune
View file @
4e3869ca
;; ocamlyacc.
;; Copy the common source files.
(copy_files# ../src/{calc,aux}.ml)
(copy_files# ../src/{calc,aux
iliary
}.ml)
(copy_files# ../src/lexer.mll)
;; Copy the appropriate parser.
...
...
test/dynamic/positions/src/aux.ml
→
test/dynamic/positions/src/aux
iliary
.ml
View file @
4e3869ca
File moved
test/dynamic/positions/src/calc.ml
View file @
4e3869ca
...
...
@@ -8,7 +8,7 @@ let process (line : string) =
We construct a tree and print it afterwards (instead of printing
within the semantic actions) because %inline reorders side effects,
and that would prevent us from comparing the positions. *)
Aux
.
Print
.
main
(
Parser
.
main
Lexer
.
token
linebuf
)
Aux
iliary
.
Print
.
main
(
Parser
.
main
Lexer
.
token
linebuf
)
with
|
Lexer
.
Error
msg
->
Printf
.
fprintf
stderr
"%s%!"
msg
...
...
test/dynamic/positions/src/parser-menhir.mly
View file @
4e3869ca
...
...
@@ -8,10 +8,10 @@
%
left
TIMES
DIV
/*
medium
precedence
*/
%
nonassoc
UMINUS
/*
highest
precedence
*/
%
type
<
Aux
.
annotations
>
annotations
%
start
<
Aux
.
main
>
main
%
type
<
Aux
iliary
.
annotations
>
annotations
%
start
<
Aux
iliary
.
main
>
main
%
{
open
Aux
%
}
%
{
open
Aux
iliary
%
}
%%
...
...
test/dynamic/positions/src/parser-ocamlyacc.mly
View file @
4e3869ca
...
...
@@ -8,8 +8,8 @@
%
left
TIMES
DIV
/*
medium
precedence
*/
%
nonassoc
UMINUS
/*
highest
precedence
*/
%
type
<
Aux
.
annotations
>
annotations
%
type
<
Aux
.
main
>
main
%
type
<
Aux
iliary
.
annotations
>
annotations
%
type
<
Aux
iliary
.
main
>
main
%
start
main
/*
For
now
,
we
do
not
use
[
Parsing
.
symbol_start_pos
()
]
because
it
performs
...
...
@@ -18,7 +18,7 @@
[
Parsing
.
symbol_start_pos
()
]
for
epsilon
productions
and
[
Parsing
.
rhs_start_pos
1
]
for
non
-
epsilon
productions
.
*/
%
{
open
Aux
%
}
%
{
open
Aux
iliary
%
}
%%
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment