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
77474c7a
Commit
77474c7a
authored
9 years ago
by
Mamadou Ndiaye
Browse files
Options
Downloads
Patches
Plain Diff
extention keywords Scade and inserting " assert false " for point does not work.
parent
9d093478
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/astPredef.ml
+2
-2
2 additions, 2 deletions
src/astPredef.ml
src/l2lCheckKcgKeyWord.ml
+3
-1
3 additions, 1 deletion
src/l2lCheckKcgKeyWord.ml
src/licDump.ml
+5
-3
5 additions, 3 deletions
src/licDump.ml
with
10 additions
and
6 deletions
src/astPredef.ml
+
2
−
2
View file @
77474c7a
...
...
@@ -93,7 +93,7 @@ let op2string = function
|
AND_n
->
"and"
|
OR_n
->
"or"
|
XOR_n
->
"xor"
|
IMPL_n
->
"=>"
|
IMPL_n
->
if
Lv6MainArgs
.
global_opt
.
Lv6MainArgs
.
kcg
then
assert
false
else
"=>"
|
EQ_n
->
"="
|
NEQ_n
->
"<>"
|
LT_n
|
ILT_n
|
RLT_n
->
"<"
...
...
@@ -108,7 +108,7 @@ let op2string = function
|
UMINUS_n
->
"-"
|
MINUS_n
->
"-"
|
PLUS_n
->
"+"
|
SLASH_n
->
"/"
|
SLASH_n
->
if
Lv6MainArgs
.
global_opt
.
Lv6MainArgs
.
kcg
then
"div"
else
"/"
|
TIMES_n
->
"*"
|
IUMINUS_n
->
"-"
|
IMINUS_n
->
"-"
...
...
This diff is collapsed.
Click to expand it.
src/l2lCheckKcgKeyWord.ml
+
3
−
1
View file @
77474c7a
...
...
@@ -15,7 +15,9 @@ module StringSet =
let
compare
=
compare
end
)
let
kcg_kw_list
=
[
"state"
;
"clock"
;
"initial"
]
let
kcg_kw_list
=
[
"state"
;
"clock"
;
"initial"
;
"abstract"
;
"activate"
;
"and"
;
"assume"
;
"automaton"
;
"bool"
;
"case"
;
"char"
;
"const"
;
"default"
;
"div"
;
"do"
;
"else"
;
"elsif"
;
"emit"
;
"end"
;
"enum"
;
"every"
;
"false"
;
"fby"
;
"final"
;
"flatten"
;
"fold"
;
"foldi"
;
"foldw"
;
" foldwi"
;
"function"
;
"guarantee"
;
"group"
;
"if"
;
"imported"
;
"initial"
;
"int"
;
"is"
;
"last"
;
"let"
;
"make"
;
"map"
;
"mapfold"
;
"mapi"
;
"mapw"
;
"mapwi"
;
"match"
;
"merge"
;
"mod"
;
"node"
;
"not"
;
"numeric"
;
"of"
;
"onreset"
;
"open"
;
"or"
;
"package"
;
"parameter"
;
"pre"
;
"private"
;
"probe"
;
"public"
;
"real"
;
"restart"
;
"resume"
;
"returns"
;
"reverse"
;
"sensor"
;
"sig"
;
"specialize"
;
"synchro"
;
"tel"
;
"then"
;
"times"
;
"transpose"
;
"true"
;
"unless"
;
"until"
;
"var"
;
"when"
;
"where"
;
"with"
;
"xor"
]
let
kcg_kw
=
StringSet
.
of_list
kcg_kw_list
let
(
check_var_info
:
Lic
.
var_info
->
unit
)
=
...
...
This diff is collapsed.
Click to expand it.
src/licDump.ml
+
5
−
3
View file @
77474c7a
...
...
@@ -263,7 +263,7 @@ and string_of_node_key_rec (no_prefix:bool) (nkey: node_key) =
then
Lv6Id
.
no_pack_string_of_long
ik
else
Lv6Id
.
string_of_long
ik
|
(
ik
,
salst
)
->
(*
if global_opt.kcg then ((* recursive nodes have been unfold *)
if
global_opt
.
kcg
then
((
*
recursive
nodes
have
been
unfold
*
)
(*assert (List.mem ik ["map"]);*)
(* not yet working :
- cas des noeuds itérés prédéfinis
...
...
@@ -288,7 +288,7 @@ and string_of_node_key_rec (no_prefix:bool) (nkey: node_key) =
(
FreshName
.
node_key
nkey
name
)
)
else
*)
else
let
astrings
=
List
.
map
static_arg2string_bis
salst
in
let
name
=
sprintf
"%s_%s"
(
Lv6Id
.
no_pack_string_of_long
ik
)
(
String
.
concat
"_"
astrings
)
in
(
FreshName
.
node_key
nkey
name
)
...
...
@@ -500,7 +500,9 @@ and (string_of_by_pos_op_eff: Lic.by_pos_op srcflagged -> Lic.val_exp list -> st
|
WHEN
clk
,
vel
->
(
tuple
vel
)
^
(
string_of_clock
clk
)
|
CURRENT
Some
_
,_
->
(* transform to merge in kcg mode *)
"current "
^
tuple_par
(
if
global_opt
.
ec
then
List
.
tl
vel
else
vel
)
if
global_opt
.
kcg
then
assert
false
else
"current "
^
tuple_par
(
if
global_opt
.
ec
then
List
.
tl
vel
else
vel
)
|
CURRENT
None
,_
->
"current "
^
tuple_par
vel
|
TUPLE
,_
->
(
tuple
vel
)
|
CONCAT
,
[
ve1
;
ve2
]
->
...
...
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