Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lutils
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
lutils
Commits
d173d10b
Commit
d173d10b
authored
7 years ago
by
erwan
Browse files
Options
Downloads
Patches
Plain Diff
Do not raise an internal error (assert false) when a var is missing.
Indeed, it is not lutils fault when it occurs.
parent
52d447c3
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
doc/version.tex
+3
-3
3 additions, 3 deletions
doc/version.tex
src/META
+2
-2
2 additions, 2 deletions
src/META
src/lutilsVersion.ml
+2
-2
2 additions, 2 deletions
src/lutilsVersion.ml
src/rifIO.ml
+12
-10
12 additions, 10 deletions
src/rifIO.ml
with
20 additions
and
18 deletions
_oasis
+
1
−
1
View file @
d173d10b
OASISFormat: 0.4
Name: lutils
Version: 1.1
4
Version: 1.1
5
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: GPL-3
...
...
This diff is collapsed.
Click to expand it.
doc/version.tex
+
3
−
3
View file @
d173d10b
\newcommand
{
\version
}{
1.1
4
}
\newcommand
{
\sha
}{
e9db055
}
\newcommand
{
\version
}{
1.1
5
}
\newcommand
{
\sha
}{
52d447c
}
\newcommand
{
\versionname
}{
none
}
\newcommand
{
\versiondate
}{
22-06
-17
}
\newcommand
{
\versiondate
}{
04-10
-17
}
This diff is collapsed.
Click to expand it.
src/META
+
2
−
2
View file @
d173d10b
# OASIS_START
# DO NOT EDIT (digest:
bd2a3dd8b4c274b4d60cc3825abe018b
)
version = "1.1
4
"
# DO NOT EDIT (digest:
e0feb154a7aab6533276454ea556bfc0
)
version = "1.1
5
"
description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)."
requires = "unix str camlp4 num"
archive(byte) = "lutils.cma"
...
...
This diff is collapsed.
Click to expand it.
src/lutilsVersion.ml
+
2
−
2
View file @
d173d10b
let
str
=
"1.1
4
"
let
sha
=
"
e9db055
"
let
str
=
"1.1
5
"
let
sha
=
"
52d447c
"
This diff is collapsed.
Click to expand it.
src/rifIO.ml
+
12
−
10
View file @
d173d10b
(* Time-stamp: <modified the 2
3
/0
3
/2017 (at 1
6:00
) by Erwan Jahier> *)
(* Time-stamp: <modified the 2
2
/0
9
/2017 (at 1
0:12
) by Erwan Jahier> *)
(*-----------------------------------------------------------------------
** This file may only be copied under the terms of the GNU Library General
** Public License
...
...
@@ -179,16 +179,18 @@ and (parse_rif_stream :
parse_rif_stream
label
ic
oc
vntl
(
get_stream
debug
label
ic
oc
)
tbl
pragma
)
|
(
LocalGenlex
.
Kwd
(
"ERROR"
|
"Error"
|
"error"
))
::_
->
print_string
(
"#ERROR value read. bye! ("
^
str
^
")
\n
"
);
flush
stdout
;
raise
Bye
|
(
LocalGenlex
.
Kwd
(
"#"
))
::
(
LocalGenlex
.
Kwd
(
"ERROR"
|
"Error"
|
"end"
))
::_
->
print_string
(
str
^
"
\n
"
);
raise
Bye
print_string
(
"#ERROR value read. bye! ("
^
str
^
")
\n
"
);
flush
stdout
;
raise
Bye
|
(
LocalGenlex
.
Kwd
(
"#"
))
::_
->
Stream
.
junk
stream
;
(* prerr_endline (">>>" ^str); print the ignored string on stderr *)
parse_rif_stream
label
ic
oc
vntl
(
get_stream
debug
label
ic
oc
)
tbl
pragma
|
(
LocalGenlex
.
Kwd
(
"ERROR"
|
"Error"
|
"error"
))
::_
->
print_string
(
"#ERROR value read. bye! ("
^
str
^
")
\n
"
);
flush
stdout
;
raise
Bye
|
(
LocalGenlex
.
Kwd
(
"q"
))
::_
->
print_string
"# bye!
\n
"
;
raise
Bye
|
(
LocalGenlex
.
Kwd
(
"#@"
))
::_
->
(* Beginning of multi-line comment. Note that here,
...
...
@@ -360,10 +362,10 @@ let (write_outputs : out_channel -> (float -> string) -> vntl -> subst list -> u
acc
^
(
try
Data
.
val_to_string
s2f
(
List
.
assoc
vn
sl
)
with
|
Not_found
->
p
rint
_st
rin
g
(
"***
"
^
vn
^
"
not found in
"
);
print_string
(
String
.
concat
","
(
List
.
map
(
fun
(
n
,_
)
->
n
)
sl
));
flush
std
out
;
assert
false
P
rint
f
.
ep
rin
tf
(
"
\n
***
RifIO: %s
not found in
%s
\n
"
)
vn
(
String
.
concat
","
(
List
.
map
(
fun
(
n
,_
)
->
n
)
sl
));
flush
std
err
;
"nil"
)
^
" "
)
""
...
...
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