Commit 56b08281 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '31-a-do-name-may-contain-digits-inside' into 'master'

Resolve "A DO name may contain digits inside"

Closes #31

See merge request !32
parents 452896c1 4951594d
Pipeline #5190 passed with stages
in 39 seconds
## 1.1.0a19 (2020/03/31)
- avoid NPE when lnInst is missing in ExtRef (issue riseclipse-metamodel-scl2003#64)
- put back inadvertently removed code of DOIImpl.getNamespace (issue riseclipse-metamodel-scl2003#65)
- do not considered digits at the end of a DO name as an instance number (issues #30 and #31)
## 1.1.0a18 (2020/02/19)
- solve multiple displays of OCL messages (issue #26)
- use of FeatureMap in SCL metamodel removed (issue riseclipse-metamodel-scl2003#63)
......
......@@ -631,11 +631,12 @@ public class DataObjectPresenceConditionValidator {
String[] names = new String[] { do_.getName() };
if( ! presentDO.containsKey( names[0] )) {
// if( do_.getName().matches( "[a-zA-Z]+\\d+" )) {
names = do_.getName().split( "(?=\\d)", 2 );
if( names.length == 0 ) {
console.error( "[NSD validation] Unexpected DO name " + do_.getName() + " in LNodeType (line " + do_.getParentLNodeType().getLineNumber() );
return false;
if( do_.getName().matches( "[a-zA-Z]+\\d+" )) {
names = do_.getName().split( "(?=\\d)", 2 );
if( names.length != 2 ) {
console.error( "[NSD validation] Unexpected DO name " + do_.getName() + " in LNodeType (line " + do_.getParentLNodeType().getLineNumber() );
return false;
}
}
}
if( ! presentDO.containsKey( names[0] )) {
......
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