Merge branch 'release/2.0.21'

eyck · eyck · commit 4ce047a2a0a2 · 2025-10-17T07:45:45.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@
 /package.json
 /build/
 /node_modules/
+/.m2/
diff --git a/com.minres.coredsl.feature/feature.xml b/com.minres.coredsl.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature id="com.minres.coredsl.feature"
 	label="CoreDsl Feature "
-	version="2.0.20">
+	version="2.0.21">
 	<plugin
 			id="com.minres.coredsl"
 			download-size="0"
diff --git a/com.minres.coredsl.feature/pom.xml b/com.minres.coredsl.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.20</version>
+		<version>2.0.21</version>
 	</parent>
 	<artifactId>com.minres.coredsl.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/com.minres.coredsl.ide/META-INF/MANIFEST.MF b/com.minres.coredsl.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.coredsl.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.coredsl.ide
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.20
+Bundle-Version: 2.0.21
 Bundle-SymbolicName: com.minres.coredsl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl,
diff --git a/com.minres.coredsl.ide/pom.xml b/com.minres.coredsl.ide/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.20</version>
+		<version>2.0.21</version>
 	</parent>
 	<artifactId>com.minres.coredsl.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/com.minres.coredsl.repository/pom.xml b/com.minres.coredsl.repository/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.minres.coredsl</groupId>
         <artifactId>com.minres.coredsl.parent</artifactId>
-        <version>2.0.20</version>
+        <version>2.0.21</version>
     </parent>
     <artifactId>com.minres.coredsl.repository</artifactId>
     <packaging>eclipse-repository</packaging>
diff --git a/com.minres.coredsl.standalone/pom.xml b/com.minres.coredsl.standalone/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.minres.coredsl</groupId>
         <artifactId>com.minres.coredsl.parent</artifactId>
-        <version>2.0.20</version>
+        <version>2.0.21</version>
     </parent>
     <artifactId>com.minres.coredsl.standalone</artifactId>
     <packaging>eclipse-repository</packaging>
diff --git a/com.minres.coredsl.target/pom.xml b/com.minres.coredsl.target/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.20</version>
+		<version>2.0.21</version>
 	</parent>
 	<artifactId>com.minres.coredsl.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff --git a/com.minres.coredsl.tests/META-INF/MANIFEST.MF b/com.minres.coredsl.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.coredsl.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.coredsl.tests
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.20
+Bundle-Version: 2.0.21
 Bundle-SymbolicName: com.minres.coredsl.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl,
diff --git a/com.minres.coredsl.tests/pom.xml b/com.minres.coredsl.tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.20</version>
+		<version>2.0.21</version>
 	</parent>
 	<artifactId>com.minres.coredsl.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/com.minres.coredsl.tests/src/com/minres/coredsl/tests/syntax/CoreDslSyntaxTest.xtend b/com.minres.coredsl.tests/src/com/minres/coredsl/tests/syntax/CoreDslSyntaxTest.xtend
@@ -620,4 +620,17 @@ class CoreDslSyntaxTest {
 		'''
 		.testStatementsForValidSyntax();
     }
+
+    @Test
+    def void parsePrePostfixValid() {
+        '''
+            int _;
+            
+            // C syntax
+            _ = ~(unsigned<32>)1;
+            _ = ~((unsigned<32>)1);
+        '''
+        .testStatementsForValidSyntax();
+    }
+
 }
diff --git a/com.minres.coredsl.ui.tests/META-INF/MANIFEST.MF b/com.minres.coredsl.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.coredsl.ui.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.coredsl.ui.tests
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.20
+Bundle-Version: 2.0.21
 Bundle-SymbolicName: com.minres.coredsl.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl.ui,
diff --git a/com.minres.coredsl.ui.tests/pom.xml b/com.minres.coredsl.ui.tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.20</version>
+		<version>2.0.21</version>
 	</parent>
 	<artifactId>com.minres.coredsl.ui.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/com.minres.coredsl.ui/META-INF/MANIFEST.MF b/com.minres.coredsl.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.coredsl.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.coredsl.ui
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.20
+Bundle-Version: 2.0.21
 Bundle-SymbolicName: com.minres.coredsl.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.coredsl,
diff --git a/com.minres.coredsl.ui/pom.xml b/com.minres.coredsl.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.20</version>
+		<version>2.0.21</version>
 	</parent>
 	<artifactId>com.minres.coredsl.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/com.minres.coredsl.web/pom.xml b/com.minres.coredsl.web/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.20</version>
+		<version>2.0.21</version>
 	</parent>
 	<artifactId>com.minres.coredsl.web</artifactId>
 	<packaging>war</packaging>
diff --git a/com.minres.coredsl/META-INF/MANIFEST.MF b/com.minres.coredsl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.coredsl
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.coredsl
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 2.0.20
+Bundle-Version: 2.0.21
 Bundle-SymbolicName: com.minres.coredsl; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext,
diff --git a/com.minres.coredsl/build.gradle b/com.minres.coredsl/build.gradle
@@ -1,6 +1,7 @@
 dependencies {
 	api "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}"
 	api "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}"
+        api "org.eclipse.emf:org.eclipse.emf.mwe.utils"
 }
 configurations {
 	mwe2 {
@@ -10,6 +11,7 @@ configurations {
 
 dependencies {
 	mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch'
+	mwe2 'org.eclipse.emf:org.eclipse.emf.mwe.utils'
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
 	mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
 	mwe2 'org.eclipse.xtext:xtext-antlr-generator'
diff --git a/com.minres.coredsl/pom.xml b/com.minres.coredsl/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.coredsl</groupId>
 		<artifactId>com.minres.coredsl.parent</artifactId>
-		<version>2.0.20</version>
+		<version>2.0.21</version>
 	</parent>
 	<artifactId>com.minres.coredsl</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/com.minres.coredsl/src/com/minres/coredsl/CoreDsl.xtext b/com.minres.coredsl/src/com/minres/coredsl/CoreDsl.xtext
@@ -192,15 +192,12 @@ EqualityExpression returns Expression: RelationalExpression ({InfixExpression.le
 RelationalExpression returns Expression: ShiftExpression ({InfixExpression.left=current} operator=('<'|'>'|'<='|'>=') right=ShiftExpression)*;
 ShiftExpression returns Expression: AdditiveExpression ({InfixExpression.left=current} operator=('<<'|'>>') right=AdditiveExpression)*;
 AdditiveExpression returns Expression: MultiplicativeExpression ({InfixExpression.left=current} operator=('+'|'-') right=MultiplicativeExpression)*;
-MultiplicativeExpression returns Expression: CastExpression ({InfixExpression.left=current} operator=('*' | '/' | '%') right=CastExpression)*;
-
-CastExpression returns Expression:
-	PrefixExpression
-	| {CastExpression} '(' targetType=TypeSpecifier ')' operand=CastExpression
-	| {CastExpression} '(' signedness=IntegerSignedness ')' operand=CastExpression;
+MultiplicativeExpression returns Expression: PrefixExpression ({InfixExpression.left=current} operator=('*' | '/' | '%') right=PrefixExpression)*;
 
 PrefixExpression returns Expression:
 	PostfixExpression
+    | {CastExpression} '(' targetType=TypeSpecifier ')' operand=PrefixExpression
+    | {CastExpression} '(' signedness=IntegerSignedness ')' operand=PrefixExpression
 	| {PrefixExpression} operator=('++' | '--') operand=PrefixExpression
 	| {PrefixExpression} operator=('+' | '-' | '~' | '!') operand=PrefixExpression
     ;
diff --git a/com.minres.coredsl/src/com/minres/coredsl/scoping/CoreDslGlobalScopeProvider.xtend b/com.minres.coredsl/src/com/minres/coredsl/scoping/CoreDslGlobalScopeProvider.xtend
@@ -12,6 +12,9 @@ import org.eclipse.xtext.EcoreUtil2
 import org.eclipse.xtext.resource.IResourceDescription
 import org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider
 import org.eclipse.xtext.util.IResourceScopeCache
+import org.eclipse.emf.common.util.WrappedException
+import com.minres.coredsl.validation.XtCoreDslValidator
+import org.eclipse.xtext.diagnostics.ExceptionDiagnostic
 
 class CoreDslGlobalScopeProvider extends ImportUriGlobalScopeProvider {
     
@@ -23,6 +26,9 @@ class CoreDslGlobalScopeProvider extends ImportUriGlobalScopeProvider {
     @Inject
     IResourceScopeCache cache;
 
+    @Inject
+    XtCoreDslValidator validator;
+    
     override protected getImportedUris(Resource resource) {
         return cache.get(CoreDslGlobalScopeProvider.getSimpleName(), resource, new Provider<LinkedHashSet<URI>>() {
             override get() {
@@ -50,7 +56,13 @@ class CoreDslGlobalScopeProvider extends ImportUriGlobalScopeProvider {
                                 includedUri = includedUri.resolve(URI::createFileURI(currentPath+"/"))
                             }
                             if(uniqueImportURIs.add(includedUri)) {
-                                collectImportUris(resource.getResourceSet().getResource(includedUri, true), uniqueImportURIs)
+                                try {
+                                    collectImportUris(resource.getResourceSet().getResource(includedUri, true), uniqueImportURIs)
+                                } catch(WrappedException e) {
+                                    /* just ignore it */
+                                    resource.errors.add(new ScopeProviderDiagnostic(e.cause.message))
+                                    //validator.acceptWarning("Could not find file", it.EObjectOrProxy, CoreDslPackage.Literals.IMPORT__IMPORT_URI, 0, "", "")
+                                }
                             }
                         ]
                     }
diff --git a/com.minres.coredsl/src/com/minres/coredsl/scoping/ScopeProviderDiagnostic.xtend b/com.minres.coredsl/src/com/minres/coredsl/scoping/ScopeProviderDiagnostic.xtend
@@ -0,0 +1,46 @@
+package com.minres.coredsl.scoping
+
+import org.eclipse.xtext.diagnostics.Diagnostic
+
+class ScopeProviderDiagnostic implements Diagnostic {
+    
+    val String message
+    
+    new(String message) {
+        this.message = message
+    }
+    
+    override getColumnEnd() {
+        -1
+    }
+    
+    override getLength() {
+        0
+    }
+    
+    override getLineEnd() {
+        -1
+    }
+    
+    override getOffset() {
+        -1
+    }
+    
+    override getColumn() {
+        -1
+    }
+    
+    override getLine() {
+        -1
+    }
+    
+    override getLocation() {
+        null
+    }
+    
+    override getMessage() {
+        message
+    }
+    
+
+}
diff --git a/com.minres.coredsl/src/com/minres/coredsl/validator/Main.xtend b/com.minres.coredsl/src/com/minres/coredsl/validator/Main.xtend
@@ -24,6 +24,7 @@ import org.eclipse.xtext.validation.Issue
 import picocli.CommandLine
 import picocli.CommandLine.Option
 import picocli.CommandLine.Parameters
+import java.io.FileNotFoundException
 
 class Main implements Callable<Integer> {
 
@@ -36,6 +37,9 @@ class Main implements Callable<Integer> {
     @Option(names=#["-v", "--verbose"], description="verbose output")
     public Boolean verbose = false;
 
+    @Option(names=#["-w", "--strict"], description="verbose output")
+    public Boolean strict = false;
+
     def static main(String[] args) {
         val ret = new CommandLine(new Main()).execute(args);
         System.exit(ret)
@@ -58,12 +62,13 @@ class ValidatorMain {
     @Inject IResourceValidator validator
 
     def run(Main params) {
-        params.repositories.forEach[repository, idx|
-            val projectMapping = new ProjectMapping
-            projectMapping.projectName = "Repository:"+idx
-            projectMapping.path = repository
-            new StandaloneSetup().addProjectMapping(projectMapping)
-        ]
+        if(params.repositories !== null && params.repositories.size()>0)
+            params.repositories.forEach[repository, idx|
+                val projectMapping = new ProjectMapping
+                projectMapping.projectName = "Repository:"+idx
+                projectMapping.path = repository
+                new StandaloneSetup().addProjectMapping(projectMapping)
+            ]
         try {
             for (file : params.files) {
                 // Load the resource
@@ -89,17 +94,23 @@ class ValidatorMain {
                     if (!errors.empty) {
                         logger.error("Error validating " + resource.URI)
                         issues.forEach[logger.error(it)]
-                        throw new ParseException("error validating " + resource.URI)
+                        throw new ParseException("Errors validating " + resource.URI)
                     } else if (!warnings.empty) {
                         logger.warn("There are warnings validating " + resource.URI)
                         issues.forEach[logger.warn(it)]
                     }
                 }
                 logger.info('Code validation for ' + file + ' finished')
             }
-        } catch (MalformedParametersException | IllegalArgumentException | ParseException e) {
-            logger.error("Command line error " + e.message, e)
+        } catch (ParseException e) {
+            logger.error(e.message)
             return -1
+        } catch (FileNotFoundException e) {
+            logger.error(e.message)
+            return -2
+        } catch (MalformedParametersException | IllegalArgumentException e) {
+            logger.error("Command line error " + e.message)
+            return -3
         }
         return 0
     }
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.coredsl</groupId>
-	<version>2.0.20</version>
+	<version>2.0.21</version>
 	<artifactId>com.minres.coredsl.parent</artifactId>
 	<packaging>pom</packaging>
 
