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
65476dd0
Commit
65476dd0
authored
16 years ago
by
Erwan Jahier
Browse files
Options
Downloads
Patches
Plain Diff
CompiledDataDump.const_decl was wrong for enum constants.
parent
68afaf48
No related branches found
Branches containing commit
Tags
6.9.4
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/compiledDataDump.ml
+2
-1
2 additions, 1 deletion
src/compiledDataDump.ml
src/test/test.res.exp
+18
-18
18 additions, 18 deletions
src/test/test.res.exp
with
20 additions
and
19 deletions
src/compiledDataDump.ml
+
2
−
1
View file @
65476dd0
...
...
@@ -255,8 +255,9 @@ let (const_decl: Ident.long -> const_eff -> string) =
"const "
^
(
long
tname
)
^
(
match
ceff
with
|
Extern_const_eff
_
->
":"
^
(
string_of_type_eff
(
type_of_const_eff
ceff
))
|
Enum_const_eff
_
->
""
(* enum const are defined as extern const *)
|
_
->
" = "
^
(
string_of_const_eff
ceff
)
)
^
";
\n
"
)
^
";
\n
"
let
(
node_of_node_exp_eff
:
node_exp_eff
->
string
)
=
fun
neff
->
...
...
This diff is collapsed.
Click to expand it.
src/test/test.res.exp
+
18
−
18
View file @
65476dd0
...
...
@@ -2197,12 +2197,12 @@ End of Syntax table dump.
type enum__couleur = enum {enum__bleu, enum__blanc, enum__rouge};
type enum__color = enum {enum__blue, enum__white, enum__redd};
Exported constants:
const
enum__bleu =
enum__bleu;
const
enum__blanc =
enum__blanc;
const
enum__redd =
enum__redd;
const
enum__rouge =
enum__rouge;
const
enum__blue =
enum__blue;
const
enum__white =
enum__white;
const enum__bleu;
const enum__blanc;
const enum__redd;
const enum__rouge;
const enum__blue;
const enum__white;
Exported nodes:
node enum__boo(
...
...
@@ -5898,9 +5898,9 @@ const mainPack__N = 8;
type mainPack__T = int^8;
type mainPack__couleurs = enum {mainPack__bleu, mainPack__rose, mainPack__jaune};
Exported constants:
const
mainPack__bleu =
mainPack__bleu;
const
mainPack__jaune =
mainPack__jaune;
const
mainPack__rose =
mainPack__rose;
const mainPack__bleu;
const mainPack__jaune;
const mainPack__rose;
const mainPack__X = 8;
Exported nodes:
type inter__selType = {i : int; b : bool; r : real};
...
...
@@ -6070,7 +6070,7 @@ End of Syntax table dump.
Exported constants:
Exported nodes:
*** oops: an internal error occurred in file syntaxTab.ml, line 11
2
, column 22
*** oops: an internal error occurred in file syntaxTab.ml, line 11
1
, column 22
*** when compiling lustre program should_work/Pascal/t2.lus
----------------------------------------------------------------------
...
...
@@ -6593,10 +6593,10 @@ type decl__coord_tab = {x : real; y : real}^1;
type decl__couleur = enum {decl__bleu, decl__blanc, decl__rouge};
Exported constants:
const decl__e = 8.500000;
const
decl__blanc =
decl__blanc;
const decl__f
= decl__blanc
;
const
decl__bleu =
decl__bleu;
const
decl__rouge =
decl__rouge;
const decl__blanc;
const decl__f;
const decl__bleu;
const decl__rouge;
const decl__a:int;
const decl__b:int;
const decl__c:int;
...
...
@@ -6683,10 +6683,10 @@ type declaration__coord_tab = {x : real; y : real}^1;
type declaration__couleur = enum {declaration__bleu, declaration__blanc, declaration__rouge};
Exported constants:
const declaration__e = 8.500000;
const
declaration__blanc =
declaration__blanc;
const declaration__f
= declaration__blanc
;
const
declaration__bleu =
declaration__bleu;
const
declaration__rouge =
declaration__rouge;
const declaration__blanc;
const declaration__f;
const declaration__bleu;
const declaration__rouge;
const declaration__a:int;
const declaration__b:int;
const declaration__c:int;
...
...
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