Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions alisa/org.osate.alisa.common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,4 @@
<version>3.2.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>

Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
/CommonTypeSystem.java
/.CommonTypeSystem.java._trace
/CommonInterpreter.java
/.CommonInterpreter.java._trace

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
/CommonTypeSystemValidator.java
/CommonInterpreterValidator.java
/.CommonTypeSystemValidator.java._trace
/.CommonInterpreterValidator.java._trace
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package org.osate.alisa.common.typing.validation;

import com.google.inject.Inject;
import org.eclipse.xsemantics.runtime.validation.XsemanticsValidatorErrorGenerator;
import org.eclipse.xtext.validation.AbstractDeclarativeValidator;
import org.osate.alisa.common.typing.CommonInterpreter;

@SuppressWarnings("all")
public class CommonInterpreterValidator extends AbstractDeclarativeValidator {
@Inject
protected XsemanticsValidatorErrorGenerator errorGenerator;

@Inject
protected CommonInterpreter xsemanticsSystem;

protected CommonInterpreter getXsemanticsSystem() {
return this.xsemanticsSystem;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package org.osate.alisa.common.typing.validation;

import com.google.inject.Inject;
import org.eclipse.xsemantics.runtime.validation.XsemanticsValidatorErrorGenerator;
import org.eclipse.xtext.validation.Check;
import org.osate.aadl2.PropertyExpression;
import org.osate.alisa.common.common.ValDeclaration;
import org.osate.alisa.common.typing.CommonTypeSystem;
import org.osate.alisa.common.validation.AbstractCommonValidator;

@SuppressWarnings("all")
public class CommonTypeSystemValidator extends AbstractCommonValidator {
@Inject
protected XsemanticsValidatorErrorGenerator errorGenerator;

@Inject
protected CommonTypeSystem xsemanticsSystem;

protected CommonTypeSystem getXsemanticsSystem() {
return this.xsemanticsSystem;
}

@Check
public void checkValDecls(final ValDeclaration valDecl) {
errorGenerator.generateErrors(this,
getXsemanticsSystem().checkValDecls(valDecl),
valDecl);
}

@Check
public void checkExpressions(final PropertyExpression exp) {
errorGenerator.generateErrors(this,
getXsemanticsSystem().checkExpressions(exp),
exp);
}
}
11 changes: 0 additions & 11 deletions alisa/org.osate.verify/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,4 @@
<version>5.2.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-maven-plugin</artifactId>
<version>${xtext.version}</version>
</plugin>
</plugins>
</build>

</project>

Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
/.VerifyTypeSystem.java._trace
/VerifyTypeSystem.java
Loading