Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lustre-v6
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
verimag
synchrone
lustre-v6
Commits
1e82ed48
Commit
1e82ed48
authored
8 years ago
by
Erwan Jahier
Browse files
Options
Downloads
Patches
Plain Diff
Add a -2c-exec option that launches the exec file
parent
1cffc6b4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
_oasis
+1
-1
1 addition, 1 deletion
_oasis
src/lv6MainArgs.ml
+8
-2
8 additions, 2 deletions
src/lv6MainArgs.ml
src/lv6MainArgs.mli
+1
-0
1 addition, 0 deletions
src/lv6MainArgs.mli
src/lv6version.ml
+2
-2
2 additions, 2 deletions
src/lv6version.ml
src/soc2c.ml
+9
-2
9 additions, 2 deletions
src/soc2c.ml
with
21 additions
and
7 deletions
_oasis
+
1
−
1
View file @
1e82ed48
OASISFormat: 0.4
OASISFormat: 0.4
Name: lustre-v6
Name: lustre-v6
Version: 1.67
3
Version: 1.67
4
Synopsis: The Lustre V6 Verimag compiler
Synopsis: The Lustre V6 Verimag compiler
Description: This package contains:
Description: This package contains:
(1) lus2lic: the (current) name of the compiler (and interpreter via -exec).
(1) lus2lic: the (current) name of the compiler (and interpreter via -exec).
...
...
This diff is collapsed.
Click to expand it.
src/lv6MainArgs.ml
+
8
−
2
View file @
1e82ed48
(* Time-stamp: <modified the
19
/1
0
/2016 (at 1
5:3
0) by
Erwan J
ahier> *)
(* Time-stamp: <modified the
22
/1
2
/2016 (at 1
6:2
0) by
j
ahier> *)
(*
(*
Le manager d'argument adapt de celui de lutin, plus joli
Le manager d'argument adapt de celui de lutin, plus joli
N.B. solution un peu batarde : les options sont stockes, comme avant, dans Global,
N.B. solution un peu batarde : les options sont stockes, comme avant, dans Global,
...
@@ -41,6 +41,7 @@ type t = {
...
@@ -41,6 +41,7 @@ type t = {
mutable
rif
:
bool
;
mutable
rif
:
bool
;
mutable
gen_ocaml
:
bool
;
mutable
gen_ocaml
:
bool
;
mutable
launch_cc
:
bool
;
mutable
launch_cc
:
bool
;
mutable
launch_exec
:
bool
;
mutable
precision
:
int
option
;
mutable
precision
:
int
option
;
}
}
...
@@ -123,7 +124,7 @@ let (make_opt : unit -> t) =
...
@@ -123,7 +124,7 @@ let (make_opt : unit -> t) =
gen_ocaml
=
false
;
gen_ocaml
=
false
;
precision
=
None
;
precision
=
None
;
launch_cc
=
false
;
launch_cc
=
false
;
launch_exec
=
false
;
}
}
...
@@ -288,6 +289,11 @@ let mkoptab (opt:t) : unit = (
...
@@ -288,6 +289,11 @@ let mkoptab (opt:t) : unit = (
(
Arg
.
Unit
(
fun
i
->
set_c_options
opt
;
opt
.
launch_cc
<-
true
))
(
Arg
.
Unit
(
fun
i
->
set_c_options
opt
;
opt
.
launch_cc
<-
true
))
[
"Try to compile the generated C files (force -2c)"
]
[
"Try to compile the generated C files (force -2c)"
]
;
;
mkopt
opt
[
"-2c-exec"
;
"--to-c-execute"
]
(
Arg
.
Unit
(
fun
i
->
set_c_options
opt
;
opt
.
launch_cc
<-
true
;
opt
.
launch_exec
<-
true
))
[
"Try to execute the generated C files (force -cc)."
]
;
mkopt
opt
mkopt
opt
[
"-rif"
]
[
"-rif"
]
(
Arg
.
Unit
(
function
s
->
opt
.
rif
<-
true
))
(
Arg
.
Unit
(
function
s
->
opt
.
rif
<-
true
))
...
...
This diff is collapsed.
Click to expand it.
src/lv6MainArgs.mli
+
1
−
0
View file @
1e82ed48
...
@@ -44,6 +44,7 @@ type t = {
...
@@ -44,6 +44,7 @@ type t = {
mutable
rif
:
bool
;
mutable
rif
:
bool
;
mutable
gen_ocaml
:
bool
;
mutable
gen_ocaml
:
bool
;
mutable
launch_cc
:
bool
;
mutable
launch_cc
:
bool
;
mutable
launch_exec
:
bool
;
mutable
precision
:
int
option
;
mutable
precision
:
int
option
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/lv6version.ml
+
2
−
2
View file @
1e82ed48
(** Automatically generated from Makefile *)
(** Automatically generated from Makefile *)
let
tool
=
"lus2lic"
let
tool
=
"lus2lic"
let
branch
=
"master"
let
branch
=
"master"
let
commit
=
"67
3
"
let
commit
=
"67
4
"
let
sha_1
=
"
3caa7c5886de6bfb05fcecd562eb21f151cad066
"
let
sha_1
=
"
1cffc6b49d46a14e9edfd05a678b56e00466682e
"
let
str
=
(
branch
^
"."
^
commit
^
" ("
^
sha_1
^
")"
)
let
str
=
(
branch
^
"."
^
commit
^
" ("
^
sha_1
^
")"
)
let
maintainer
=
"jahier@imag.fr"
let
maintainer
=
"jahier@imag.fr"
This diff is collapsed.
Click to expand it.
src/soc2c.ml
+
9
−
2
View file @
1e82ed48
(* Time-stamp: <modified the 22/1
1
/2016 (at 1
4
:1
6
) by
Erwan J
ahier> *)
(* Time-stamp: <modified the 22/1
2
/2016 (at 1
6
:1
4
) by
j
ahier> *)
(* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *)
(* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *)
...
@@ -1057,8 +1057,15 @@ fi
...
@@ -1057,8 +1057,15 @@ fi
close_out
types_h_oc
;
close_out
types_h_oc
;
close_out
ocsh
;
close_out
ocsh
;
let
call_script
=
"sh "
^
node
^
".sh"
in
let
call_script
=
"sh "
^
node
^
".sh"
in
let
call_exec
=
"./"
^
node
^
".exec"
in
if
args
.
Lv6MainArgs
.
launch_cc
then
(
if
args
.
Lv6MainArgs
.
launch_cc
then
(
if
(
Sys
.
command
call_script
)
=
0
then
()
else
if
(
Sys
.
command
call_script
)
=
0
then
(
if
args
.
Lv6MainArgs
.
launch_exec
then
(
if
(
Sys
.
command
call_exec
)
=
0
then
(
)
else
print_string
(
"sys call: '"
^
call_exec
^
"' failed
\n
"
)
)
)
else
print_string
(
"sys call: '"
^
call_script
^
"' failed
\n
"
)
print_string
(
"sys call: '"
^
call_script
^
"' failed
\n
"
)
)
else
)
else
print_string
(
"you can compile those files calling: "
^
call_script
^
"
\n
"
);
print_string
(
"you can compile those files calling: "
^
call_script
^
"
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment