Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
tiamo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Maximilien COLANGE
tiamo
Commits
2c2b7467
Commit
2c2b7467
authored
Mar 23, 2016
by
Maximilien Colange
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'parser'
parents
b06a4b4e
b55e4e1a
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
271 additions
and
288 deletions
+271
-288
utap/src/abstractbuilder.cpp
utap/src/abstractbuilder.cpp
+2
-2
utap/src/prettyprinter.cpp
utap/src/prettyprinter.cpp
+2
-22
utap/src/utap/abstractbuilder.h
utap/src/utap/abstractbuilder.h
+162
-162
utap/src/utap/builder.h
utap/src/utap/builder.h
+5
-2
utap/src/utap/prettyprinter.h
utap/src/utap/prettyprinter.h
+100
-100
No files found.
utap/src/abstractbuilder.cpp
View file @
2c2b7467
...
...
@@ -596,7 +596,7 @@ void AbstractBuilder::exprSumEnd(const char *name)
throw
NotSupportedException
(
"exprSumEnd is not supported"
);
}
void
AbstractBuilder
::
exprSimulate
(
int
,
int
,
int
)
void
AbstractBuilder
::
exprSimulate
(
int
,
int
,
int
,
bool
,
int
)
{
throw
NotSupportedException
(
"exprSimulate is not supported"
);
}
...
...
@@ -655,7 +655,7 @@ void AbstractBuilder::exprProbaQualitative(int,Constants::kind_t,Constants::kind
throw
NotSupportedException
(
"exprProbaQualitative is not supported"
);
}
void
AbstractBuilder
::
exprProbaQuantitative
(
int
,
Constants
::
kind_t
)
void
AbstractBuilder
::
exprProbaQuantitative
(
int
,
Constants
::
kind_t
,
bool
)
{
throw
NotSupportedException
(
"exprProbaQuantitative is not supported"
);
}
...
...
utap/src/prettyprinter.cpp
View file @
2c2b7467
...
...
@@ -532,27 +532,7 @@ void PrettyPrinter::procBegin(const char *id, const bool isTA,
void
PrettyPrinter
::
procState
(
const
char
*
id
,
bool
hasInvariant
)
{
if
(
first
)
{
first
=
false
;
indent
();
*
o
.
top
()
<<
"state
\n
"
;
}
else
{
*
o
.
top
()
<<
",
\n
"
;
}
level
++
;
indent
();
level
--
;
*
o
.
top
()
<<
id
;
if
(
hasInvariant
)
{
*
o
.
top
()
<<
'{'
<<
st
.
back
()
<<
'}'
;
st
.
pop_back
();
}
this
->
procState
(
id
,
hasInvariant
,
false
);
}
void
PrettyPrinter
::
procState
(
const
char
*
id
,
bool
hasInvariant
,
bool
hasExpRate
)
...
...
@@ -1021,7 +1001,7 @@ void PrettyPrinter::exprBinary(kind_t op)
}
void
PrettyPrinter
::
exprTernary
(
kind_t
op
)
void
PrettyPrinter
::
exprTernary
(
kind_t
op
,
bool
)
{
string
exp3
=
st
.
back
();
st
.
pop_back
();
string
exp2
=
st
.
back
();
st
.
pop_back
();
...
...
utap/src/utap/abstractbuilder.h
View file @
2c2b7467
This diff is collapsed.
Click to expand it.
utap/src/utap/builder.h
View file @
2c2b7467
...
...
@@ -346,7 +346,8 @@ namespace UTAP
// Extension for SMC.
virtual
void
exprSMCControl
(
int
)
=
0
;
virtual
void
exprProbaQualitative
(
int
,
Constants
::
kind_t
,
Constants
::
kind_t
,
double
)
=
0
;
virtual
void
exprProbaQuantitative
(
int
,
Constants
::
kind_t
,
bool
=
false
)
=
0
;
virtual
void
exprProbaQuantitative
(
int
,
Constants
::
kind_t
,
bool
)
=
0
;
void
exprProbaQuantitative
(
int
i
,
Constants
::
kind_t
k
)
{
exprProbaQuantitative
(
i
,
k
,
false
);
}
virtual
void
exprProbaCompare
(
int
,
Constants
::
kind_t
,
int
,
Constants
::
kind_t
)
=
0
;
virtual
void
exprProbaExpected
(
int
,
const
char
*
)
=
0
;
virtual
void
exprBuiltinFunction1
(
Constants
::
kind_t
)
=
0
;
...
...
@@ -363,7 +364,9 @@ namespace UTAP
virtual
void
exprMitlDiamond
(
int
,
int
)
=
0
;
virtual
void
exprMitlBox
(
int
,
int
)
=
0
;
virtual
void
exprSimulate
(
int
,
int
,
int
,
bool
=
false
,
int
=
0
)
=
0
;
virtual
void
exprSimulate
(
int
,
int
,
int
,
bool
,
int
)
=
0
;
void
exprSimulate
(
int
i
,
int
j
,
int
k
,
bool
b
)
{
exprSimulate
(
i
,
j
,
k
,
b
,
0
);
}
void
exprSimulate
(
int
i
,
int
j
,
int
k
)
{
exprSimulate
(
i
,
j
,
k
,
false
);
}
/********************************************************************
* System declaration
...
...
utap/src/utap/prettyprinter.h
View file @
2c2b7467
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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