Commit 364cc82f authored by Maxime Perrotin's avatar Maxime Perrotin

Bugfix - calling entry/exit procedure

parent 5f3a7231
......@@ -249,7 +249,7 @@ package {process_name} is'''.format(process_name=process_name,
while state_tree:
current = current + state_tree.pop(0)
for comp in context.composite_states:
if current == comp.statename.lower():
if current.lower() == comp.statename.lower():
if comp.exit_procedure:
exitlist.append(current)
context = comp
......
......@@ -90,7 +90,7 @@ def flatten(process, sep=u'_'):
elif term.inputString.strip() == '-':
term.candidate_id = defaultdict(list)
for each in term.possible_states:
if each in (st.statename.lower()
if each.lower() in (st.statename.lower()
for st in context.composite_states):
term.candidate_id[each + sep + u'START'] = \
[st for st in process.mapping.viewkeys()
......
......@@ -8,7 +8,7 @@ test-ada:
flake8:
@echo Generating flake8_report file
flake8 opengeode.py sdlSymbols.py genericSymbols.py ogParser.py AdaGenerator.py Renderer.py Clipboard.py Lander.py ogAST.py undoCommands.py Connectors.py Asn1scc.py Helper.py Statechart.py >flake8_report
flake8 opengeode.py Pr.py sdlSymbols.py genericSymbols.py ogParser.py AdaGenerator.py Renderer.py Clipboard.py Lander.py ogAST.py undoCommands.py Connectors.py Asn1scc.py Helper.py Statechart.py >flake8_report
coverage:
make -C tests/regression coverage
......@@ -20,7 +20,7 @@ compile-all:
install: compile-all
mkdir -p opengeode
for f in AdaGenerator.py __init__.py genericSymbols.py icons.py ogAST.py ogParser.py opengeode.py Renderer.py samnmax.py sdl92Lexer.py sdl92Parser.py sdlSymbols.py undoCommands.py Clipboard.py Statechart.py LlvmGenerator.py Lander.py Helper.py Connectors.py Asn1scc.py; do echo Installing $$f && cp $$f opengeode; done
for f in AdaGenerator.py __init__.py Pr.py genericSymbols.py icons.py ogAST.py ogParser.py opengeode.py Renderer.py samnmax.py sdl92Lexer.py sdl92Parser.py sdlSymbols.py undoCommands.py Clipboard.py Statechart.py LlvmGenerator.py Lander.py Helper.py Connectors.py Asn1scc.py; do echo Installing $$f && cp $$f opengeode; done
python setup.py install
publish: install
......
......@@ -145,6 +145,9 @@ The fonts are the fonts from Ubuntu, check licence in file FONT-LICENSE.TXT
Changelog
=========
0.994 (07/2014)
- Maintenance release, minor fixes
0.993 (07/2014)
- Parser bugfixes
- Better support for nested states
......
......@@ -2,7 +2,7 @@
# Resource object code
#
# Created: Sun Jul 13 22:01:20 2014
# Created: Thu Jul 17 20:45:57 2014
# by: The Resource Compiler for PySide (Qt v4.8.6)
#
# WARNING! All changes made in this file will be lost!
......@@ -98,7 +98,7 @@ except ImportError:
pass
__all__ = ['opengeode']
__version__ = '0.993'
__version__ = '0.994'
if hasattr(sys, 'frozen'):
# Detect if we are running on Windows (py2exe-generated)
......
# $ANTLR 3.1.3 Mar 17, 2009 19:23:44 sdl92.g 2014-07-16 18:29:59
# $ANTLR 3.1.3 Mar 17, 2009 19:23:44 sdl92.g 2014-07-17 20:45:59
import sys
from antlr3 import *
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment