Commit 60bd1348 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Fix case sensitivity issue

parent f3213aed
......@@ -142,6 +142,9 @@ The background pattern was downloaded from www.subtlepatterns.com
Changelog
=========
1.3.28 (06/2016)
- Excluded states (with *(statelist) ) were case sensitive
1.3.27 (05/2016)
- Fix bug in Ada backend when using continous signals
- Better handling of simulation script
......
......@@ -3013,7 +3013,7 @@ def state(root, parent, context):
state_def.inputString = get_input_string(child)
state_def.line = child.getLine()
state_def.charPositionInLine = child.getCharPositionInLine()
exceptions = [c.toString() for c in child.getChildren()]
exceptions = [c.toString().lower() for c in child.getChildren()]
for st in context.mapping:
if st not in exceptions + ['START']:
state_def.statelist.append(st)
......
......@@ -117,7 +117,7 @@ except ImportError:
__all__ = ['opengeode', 'SDL_Scene', 'SDL_View', 'parse']
__version__ = '1.3.27'
__version__ = '1.3.28'
if hasattr(sys, 'frozen'):
# Detect if we are running on Windows (py2exe-generated)
......
include ../shared.mk
all: test-ada test-llvm
edit:
$(OPENGEODE) test.pr
test-parse:
$(OPENGEODE) test.pr --check
test-ada:
$(OPENGEODE) test.pr --toAda
$(ASN1SCC) -Ada dataview.asn -typePrefix asn1Scc -equal
$(GNATMAKE) -O$(O) -c *.adb
$(GNATBIND) -n test.ali
simu:
$(OPENGEODE) test.pr --shared
./test_simu.sh
test-c:
$(OPENGEODE) test.pr --toC
$(ASN1SCC) -c dataview.asn -typePrefix asn1Scc -equal
$(CC) -O$(O) -c *.c
test-llvm:
$(OPENGEODE) test.pr --llvm -O$(O)
$(LLC) *.ll
$(CC) -O$(O) -c *.s
coverage:
coverage run -p $(OPENGEODE) test.pr --toAda
.PHONY: all edit test-parse test-ada test-llvm coverage simu
TASTE-Dataview DEFINITIONS ::=
BEGIN
MyChoice ::= CHOICE {
a SEQUENCE {},
b SEQUENCE (SIZE (2)) OF SEQUENCE {},
c SEQUENCE {c0 SEQUENCE {}, c1 CHOICE{c10 BOOLEAN}}
}
END
SYSTEM test;
/* CIF TEXT (164, 303), (356, 140) */
-- Text area for declarations and comments
use datamodel comment 'dataview.asn';
signal go;
signal go2;
/* CIF ENDTEXT */
CHANNEL c
FROM ENV TO test WITH go,
go2;
ENDCHANNEL;
BLOCK test;
SIGNALROUTE r
FROM ENV TO test WITH go,
go2;
CONNECT c AND r;
/* CIF PROCESS (202, 142), (150, 75) */
PROCESS test;
/* CIF TEXT (342, 419), (450, 140) */
-- Check that using star in a state with exclusion
-- works well, indepently from the casing. Same
-- for input.
dcl blah mychoice;
/* CIF ENDTEXT */
/* CIF START (106, 48), (70, 35) */
START;
/* CIF NEXTSTATE (106, 98), (70, 35) */
NEXTSTATE wait;
/* CIF STATE (613, 114), (78, 38) */
STATE Hello;
/* CIF INPUT (595, 172), (113, 35) */
INPUT go2;
/* CIF NEXTSTATE (617, 222), (70, 35) */
NEXTSTATE -;
ENDSTATE;
/* CIF STATE (106, 98), (70, 35) */
STATE wait;
/* CIF INPUT (96, 153), (103, 35) */
INPUT go;
/* CIF NEXTSTATE (112, 203), (70, 35) */
NEXTSTATE -;
ENDSTATE;
/* CIF STATE (425, 81), (146, 35) */
STATE *(wait, hEllo);
/* CIF INPUT (441, 136), (113, 35) */
INPUT go2;
/* CIF NEXTSTATE (463, 186), (70, 35) */
NEXTSTATE -;
ENDSTATE;
/* CIF STATE (254, 82), (145, 35) */
STATE *(WAIT, Hello);
/* CIF INPUT (275, 137), (103, 35) */
INPUT go;
/* CIF NEXTSTATE (291, 187), (70, 35) */
NEXTSTATE -;
ENDSTATE;
ENDPROCESS test;
ENDBLOCK;
ENDSYSTEM;
\ No newline at end of file
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