Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
OpenGEODE
Commits
391e344a
Commit
391e344a
authored
Oct 08, 2015
by
Maxime Perrotin
Browse files
Support OUT parameters in procedures
In addition to IN and IN/OUT
parent
be899395
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
391e344a
...
...
@@ -148,12 +148,13 @@ The fonts are the fonts from Ubuntu, check licence in file FONT-LICENSE.TXT
Changelog
=========
1.
2.
9
(10/2015)
1.
2.
10
(10/2015)
-
Better support of renamePolicy
-
Better handling of models without CIF coordinates
-
Minor bug fixes
-
Forloop syntax error handled correctly when using range
-
support Hex and bit string literals when working with OCTET STRING
-
support OUT keyword for procedure FPAR
1.
2.4 (07/2015)
-
Use version 3.2.x of the ASN1SCC compiler with new -renamePolicy flag
...
...
opengeode/icons.py
View file @
391e344a
...
...
@@ -2,7 +2,7 @@
# Resource object code
#
# Created: Thu Oct 8 2
1
:1
8
:37 2015
# Created: Thu Oct 8 2
2
:1
6
:37 2015
# by: The Resource Compiler for PySide (Qt v4.8.6)
#
# WARNING! All changes made in this file will be lost!
opengeode/ogParser.py
View file @
391e344a
...
...
@@ -1868,7 +1868,7 @@ def fpar(root):
direction
=
'in'
assert
param
.
type
==
lexer
.
PARAM
for
child
in
param
.
getChildren
():
if
child
.
type
==
lexer
.
INOUT
:
if
child
.
type
in
(
lexer
.
INOUT
,
lexer
.
OUT
)
:
direction
=
'out'
elif
child
.
type
==
lexer
.
IN
:
pass
...
...
opengeode/opengeode.py
View file @
391e344a
...
...
@@ -116,7 +116,7 @@ except ImportError:
__all__
=
[
'opengeode'
,
'SDL_Scene'
,
'SDL_View'
,
'parse'
]
__version__
=
'1.2.
9
'
__version__
=
'1.2.
10
'
if
hasattr
(
sys
,
'frozen'
):
# Detect if we are running on Windows (py2exe-generated)
...
...
opengeode/sdl92Lexer.py
View file @
391e344a
# $ANTLR 3.1.3 Mar 17, 2009 19:23:44 sdl92.g 2015-10-08 2
1
:1
8:40
# $ANTLR 3.1.3 Mar 17, 2009 19:23:44 sdl92.g 2015-10-08 2
2
:1
6:39
import
sys
from
antlr3
import
*
...
...
@@ -29,7 +29,7 @@ RETURN=79
THIS
=
153
CHANNEL
=
13
VIAPATH
=
116
ENDCONNECTION
=
13
0
ENDCONNECTION
=
13
1
EXPORT
=
32
EQ
=
146
INFORMAL_TEXT
=
49
...
...
@@ -60,7 +60,7 @@ W=205
TYPE_INSTANCE
=
110
STOP
=
92
V
=
204
INT
=
12
8
INT
=
12
9
Q
=
214
P
=
192
S
=
195
...
...
@@ -72,7 +72,7 @@ FI=35
Z
=
215
MINUS_INFINITY
=
169
WS
=
212
OUT
=
1
36
OUT
=
1
28
NONE
=
137
INPUT_NONE
=
52
CONSTANT
=
22
...
...
@@ -86,10 +86,10 @@ T__219=219
T__217
=
217
T__218
=
218
INPUT
=
51
ENDSUBSTRUCTURE
=
13
5
ENDSUBSTRUCTURE
=
13
6
FLOAT
=
40
SUBSTRUCTURE
=
13
4
ASTERISK
=
13
3
SUBSTRUCTURE
=
13
5
ASTERISK
=
13
4
T__222
=
222
PAREN
=
68
T__221
=
221
...
...
@@ -117,11 +117,11 @@ ENDSYNTYPE=30
SORT
=
88
SET
=
85
TEXT
=
103
SEMI
=
13
1
SEMI
=
13
2
TEXTAREA
=
104
BLOCK
=
12
CIF
=
15
START
=
1
29
START
=
1
30
DECISION
=
25
DIV
=
161
PROCESS
=
74
...
...
@@ -181,7 +181,7 @@ HYPERLINK=45
NEWTYPE
=
58
Exponent
=
211
FOR
=
42
ENDSTATE
=
13
2
ENDSTATE
=
13
3
PROCEDURE_NAME
=
73
CONSTANTS
=
23
ID
=
118
...
...
opengeode/sdl92Parser.py
View file @
391e344a
This diff is collapsed.
Click to expand it.
sdl92.g
View file @
391e344a
...
...
@@ -274,9 +274,9 @@ fpar
formal_variable_param
: (INOUT | IN)?
: (INOUT | IN
| OUT
)?
variable_id (',' variable_id)* sort
-> ^(PARAM INOUT? IN? variable_id+ sort);
-> ^(PARAM INOUT? IN?
OUT?
variable_id+ sort);
// text_area: TODO add operator description in content
...
...
tests/regression/test10/system_structure.pr
View file @
391e344a
...
...
@@ -6,7 +6,7 @@ SYSTEM challenge;
FPAR
IN a T_UInt32,
IN b T_UInt32,
IN/
OUT res T_UInt32;
OUT res T_UInt32;
EXTERNAL;
SIGNAL run;
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment