Commit 128f2390 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '23-verification-of-enumerations-against-nsd-are-not-right' into 'master'

Resolve "Verification of enumerations against NSD are not right"

Closes #23

See merge request !27
parents 32b5c302 d24798a3
Pipeline #4581 passed with stages
in 42 seconds
...@@ -445,7 +445,7 @@ public class RiseClipseValidatorSCL { ...@@ -445,7 +445,7 @@ public class RiseClipseValidatorSCL {
console.info( "Web site:" ); console.info( "Web site:" );
console.info( " http://wdi.supelec.fr/software/RiseClipse/" ); console.info( " http://wdi.supelec.fr/software/RiseClipse/" );
console.info( "" ); console.info( "" );
console.info( "RiseClipseValidatorSCL version: 1.1.0 a16 (9 February 2020)" ); console.info( "RiseClipseValidatorSCL version: 1.1.0 a17 (12 February 2020)" );
console.info( "" ); console.info( "" );
} }
......
...@@ -528,7 +528,7 @@ public abstract class BasicTypeValidator extends TypeValidator { ...@@ -528,7 +528,7 @@ public abstract class BasicTypeValidator extends TypeValidator {
@Override @Override
public boolean validateAbstractDataAttribute( AbstractDataAttribute ada, DiagnosticChain diagnostics ) { public boolean validateAbstractDataAttribute( AbstractDataAttribute ada, DiagnosticChain diagnostics ) {
AbstractRiseClipseConsole.getConsole().verbose( "[NSD validation] BasicTypeValidator.validateDA( " + ada.getName() + " ) at line " + ada.getLineNumber() ); AbstractRiseClipseConsole.getConsole().verbose( "[NSD validation] BasicTypeValidator.validateAbstractDataAttribute( " + ada.getName() + " ) at line " + ada.getLineNumber() );
boolean res = true; boolean res = true;
if( ! getName().equals( ada.getBType() )) { if( ! getName().equals( ada.getBType() )) {
diagnostics.add( new BasicDiagnostic( diagnostics.add( new BasicDiagnostic(
......
...@@ -71,7 +71,7 @@ public class ConstructedAttributeValidator extends TypeValidator { ...@@ -71,7 +71,7 @@ public class ConstructedAttributeValidator extends TypeValidator {
@Override @Override
public boolean validateAbstractDataAttribute( AbstractDataAttribute da, DiagnosticChain diagnostics ) { public boolean validateAbstractDataAttribute( AbstractDataAttribute da, DiagnosticChain diagnostics ) {
AbstractRiseClipseConsole.getConsole().verbose( "[NSD validation] ConstructedAttributeValidator.validateBDA( " + da.getName() + " ) at line " + da.getLineNumber() ); AbstractRiseClipseConsole.getConsole().verbose( "[NSD validation] ConstructedAttributeValidator.validateAbstractDataAttribute( " + da.getName() + " ) at line " + da.getLineNumber() );
boolean res = true; boolean res = true;
if( da.getRefersToDAType() != null ) { if( da.getRefersToDAType() != null ) {
......
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