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
824a7f5e
Commit
824a7f5e
authored
Aug 07, 2014
by
Maxime Perrotin
Browse files
Regression fixes
parent
4e4a7b13
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
AdaGenerator.py
View file @
824a7f5e
...
...
@@ -929,12 +929,13 @@ def _equality(expr):
actual_type
=
getattr
(
expr
.
left
.
exprType
,
'ReferencedTypeName'
,
None
)
or
expr
.
left
.
exprType
.
kind
basic
=
find_basic_type
(
expr
.
left
.
exprType
)
in
(
'IntegerType'
,
'Integer32Type'
,
'BooleanType'
,
'RealType'
,
'EnumeratedType'
,
'ChoiceEnumeratedType'
)
actual_type
=
actual_type
.
replace
(
'-'
,
'_'
)
basic
=
find_basic_type
(
expr
.
left
.
exprType
).
kind
in
(
'IntegerType'
,
'Integer32Type'
,
'BooleanType'
,
'RealType'
,
'EnumeratedType'
,
'ChoiceEnumeratedType'
)
if
basic
:
ada_string
=
u
'({left} {op} {right})'
.
format
(
left
=
left_str
,
op
=
expr
.
operand
,
right
=
right_str
)
...
...
icons.py
View file @
824a7f5e
...
...
@@ -2,8 +2,8 @@
# Resource object code
#
# Created:
Tue Jul 22 16:47:55
2014
# by: The Resource Compiler for PySide (Qt v4.8.
6
)
# Created:
Wed Aug 6 23:54:13
2014
# by: The Resource Compiler for PySide (Qt v4.8.
4
)
#
# WARNING! All changes made in this file will be lost!
ogParser.py
View file @
824a7f5e
...
...
@@ -1954,6 +1954,7 @@ def floating_label(root, parent, context):
errors
=
[]
warnings
=
[]
lab
=
ogAST
.
Floating_label
()
lab_x
,
lab_y
=
0
,
0
# Keep track of the number of terminator statements following the label
# useful if we want to render graphs from the SDL model
terminators
=
len
(
context
.
terminators
)
...
...
@@ -1965,6 +1966,7 @@ def floating_label(root, parent, context):
elif
child
.
type
==
lexer
.
CIF
:
# Get symbol coordinates
lab
.
pos_x
,
lab
.
pos_y
,
lab
.
width
,
lab
.
height
=
cif
(
child
)
lab_x
,
lab_y
=
lab
.
pos_x
,
lab
.
pos_y
elif
child
.
type
==
lexer
.
HYPERLINK
:
lab
.
hyperlink
=
child
.
getChild
(
0
).
text
[
1
:
-
1
]
elif
child
.
type
==
lexer
.
TRANSITION
:
...
...
@@ -1975,11 +1977,11 @@ def floating_label(root, parent, context):
lab
.
transition
=
trans
else
:
warnings
.
append
(
'Unsupported construct in floating label: '
+
str
(
child
.
type
))
[
'Unsupported construct in floating label: '
+
str
(
child
.
type
)
,
[
lab_x
,
lab_y
],
[]]
)
if
not
lab
.
transition
:
warnings
.
append
(
'Floating labels not followed by a transition: '
+
str
(
lab
.
inputString
))
warnings
.
append
(
[
'Floating labels not followed by a transition: '
+
str
(
lab
.
inputString
)
,
[
lab_x
,
lab_y
],
[]]
)
# At the end of the label parsing, get the the list of terminators that
# the transition contains by making a diff with the list at context
# level (we counted the number of terminators before parsing the item)
...
...
sdl92Lexer.py
View file @
824a7f5e
# $ANTLR 3.1.3 Mar 17, 2009 19:23:44 sdl92.g 2014-0
7-29 14:08:49
# $ANTLR 3.1.3 Mar 17, 2009 19:23:44 sdl92.g 2014-0
8-06 23:54:18
import
sys
from
antlr3
import
*
...
...
sdl92Parser.py
View file @
824a7f5e
This diff is collapsed.
Click to expand it.
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