Commit c8d41eef authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Render priority of continous signals

parent f94663fd
......@@ -142,6 +142,9 @@ The background pattern was downloaded from www.subtlepatterns.com
Changelog
=========
1.4.2 (06/2016)
- Reload / render properly priority of continuous signals
1.4.1 (06/2016)
- Continuous states can check the presence of messages in the input queue
to respect the SDL semantics
......
......@@ -2863,6 +2863,7 @@ def continuous_signal(root, parent, context):
elif child.type == lexer.INT:
# Priority
i.priority = int(child.text)
i.inputString += u';\npriority {}'.format(get_input_string(child))
elif child.type == lexer.TRANSITION:
trans, err, warn = transition(child, parent=i, context=context)
errors.extend(err)
......
......@@ -134,7 +134,7 @@ except ImportError:
__all__ = ['opengeode', 'SDL_Scene', 'SDL_View', 'parse']
__version__ = '1.4.1'
__version__ = '1.4.2'
if hasattr(sys, 'frozen'):
# Detect if we are running on Windows (py2exe-generated)
......
......@@ -48,9 +48,9 @@ SDL_BLACKBOLD = ['\\b{word}\\b'.format(word=word) for word in (
'EXPONENT', 'TRUE', 'FALSE', 'MOD', 'FI', 'WRITE', 'WRITELN',
'LENGTH', 'PRESENT', 'FPAR', 'TODO', 'FIXME', 'XXX',
'CHECKME', 'PROCEDURE', 'EXTERNAL', 'IN', 'OUT', 'TIMER',
'SET_TIMER', 'RESET_TIMER', 'VIA', 'ENTRY', 'EXIT', 'ANY',
'SET_TIMER', 'RESET_TIMER', 'VIA', 'ENTRY', 'EXIT', 'PRIORITY',
'SYNTYPE', 'ENDSYNTYPE', 'CONSTANTS', 'ENDPROCEDURE',
'COMMENT', 'SIGNAL', 'SIGNALLIST', 'USE', 'RETURNS'
'COMMENT', 'SIGNAL', 'SIGNALLIST', 'USE', 'RETURNS', 'ANY',
'NEWTYPE', 'ENDNEWTYPE', 'ARRAY', 'STRUCT', 'SYNONYM')]
SDL_REDBOLD = ['\\b{word}\\b'.format(word=word) for word in (
......
......@@ -123,7 +123,7 @@ signal telemetry(tm_type);
/* CIF STATE (443, 507), (153, 35) */
STATE exception_handler;
ENDSTATE;
/* CIF STATE (476, 0), (113, 35) */
/* CIF STATE (370, 0), (113, 35) */
STATE tc_router;
ENDSTATE;
/* CIF STATE (381, 338), (169, 35) */
......@@ -143,7 +143,7 @@ signal telemetry(tm_type);
STATE Inside_safe;
ENDSTATE;
ENDSUBSTRUCTURE;
/* CIF TEXT (0, 310), (327, 208) */
/* CIF TEXT (665, 310), (327, 208) */
-- This system tests the provided clause
-- (continuous signal)
......@@ -166,11 +166,12 @@ timer timer1, timer2;
ENDSTATE;
/* CIF STATE (485, 344), (99, 35) */
STATE wait;
/* CIF PROVIDED (495, 399), (77, 35) */
/* CIF PROVIDED (485, 399), (97, 38) */
PROVIDED failure;
/* CIF PROCEDURECALL (401, 449), (264, 35) */
priority 1;
/* CIF PROCEDURECALL (401, 455), (264, 35) */
CALL writeln('Going to SAFE mode');
/* CIF NEXTSTATE (498, 499), (70, 35) */
/* CIF NEXTSTATE (498, 505), (70, 35) */
NEXTSTATE safe;
ENDSTATE;
ENDPROCESS og;
......
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