diff --git a/build.gradle b/build.gradle
index a6a7882eeee6db3cc34887d5b8cce3fe267905d5..c04195a9cc3a7ea4a799a717910a276f18b8d403 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'application'
sourceCompatibility = 1.8
-mainClassName = 'org.jastadd.ros2rag.compiler.Compiler'
+mainClassName = 'org.jastadd.ragconnect.compiler.Compiler'
repositories {
jcenter()
@@ -37,7 +37,7 @@ test {
jar {
manifest {
- attributes "Main-Class": 'org.jastadd.ros2rag.compiler.Compiler'
+ attributes "Main-Class": 'org.jastadd.ragconnect.compiler.Compiler'
}
from {
@@ -51,47 +51,47 @@ task relast(type: JavaExec) {
doFirst {
delete "src/gen/jastadd/*.ast"
- delete "src/gen/jastadd/Ros2Rag.jadd"
- delete "src/gen/jastadd/Ros2RagRefResolver.jadd"
- delete "src/gen/jastadd/Ros2RagResolverStubs.jrag"
+ delete "src/gen/jastadd/RagConnect.jadd"
+ delete "src/gen/jastadd/RagConnectRefResolver.jadd"
+ delete "src/gen/jastadd/RagConnectResolverStubs.jrag"
mkdir "src/gen/jastadd/"
}
args = [
"../libs/relast.jar",
"../relast.preprocessor/src/main/jastadd/RelAst.relast",
- "./src/main/jastadd/Ros2Rag.relast",
+ "./src/main/jastadd/RagConnect.relast",
"./src/main/jastadd/MustacheNodes.relast",
"--listClass=java.util.ArrayList",
"--jastAddList=JastAddList",
"--useJastAddNames",
"--file",
"--resolverHelper",
- "--grammarName=./src/gen/jastadd/Ros2Rag"
+ "--grammarName=./src/gen/jastadd/RagConnect"
]
inputs.files file("../libs/relast.jar"),
file("../relast.preprocessor/src/main/jastadd/RelAST.relast"),
- file("./src/main/jastadd/Ros2Rag.relast")
+ file("./src/main/jastadd/RagConnect.relast")
file("./src/main/jastadd/MustacheNodes.relast")
- outputs.files file("./src/gen/jastadd/Ros2Rag.ast"),
- file("./src/gen/jastadd/Ros2Rag.jadd"),
- file("./src/gen/jastadd/Ros2RagRefResolver.jadd"),
- file('./src/gen/jastadd/Ros2RagResolverStubs.jrag')
+ outputs.files file("./src/gen/jastadd/RagConnect.ast"),
+ file("./src/gen/jastadd/RagConnect.jadd"),
+ file("./src/gen/jastadd/RagConnectRefResolver.jadd"),
+ file('./src/gen/jastadd/RagConnectResolverStubs.jrag')
}
jastadd {
configureModuleBuild()
modules {
//noinspection GroovyAssignabilityCheck
- module("Ros2Rag") {
+ module("RagConnect") {
java {
basedir ".."
include "relast.preprocessor/main/**/*.java"
include "relast.preprocessor/gen/**/*.java"
- include "ros2rag.base/src/main/**/*.java"
- include "ros2rag.base/src/gen/**/*.java"
+ include "ragconnect.base/src/main/**/*.java"
+ include "ragconnect.base/src/gen/**/*.java"
}
jastadd {
@@ -99,23 +99,23 @@ jastadd {
include "relast.preprocessor/src/main/jastadd/**/*.ast"
include "relast.preprocessor/src/main/jastadd/**/*.jadd"
include "relast.preprocessor/src/main/jastadd/**/*.jrag"
- include "ros2rag.base/src/main/jastadd/**/*.ast"
- include "ros2rag.base/src/main/jastadd/**/*.jadd"
- include "ros2rag.base/src/main/jastadd/**/*.jrag"
- include "ros2rag.base/src/gen/jastadd/**/*.ast"
- include "ros2rag.base/src/gen/jastadd/**/*.jadd"
- include "ros2rag.base/src/gen/jastadd/**/*.jrag"
+ include "ragconnect.base/src/main/jastadd/**/*.ast"
+ include "ragconnect.base/src/main/jastadd/**/*.jadd"
+ include "ragconnect.base/src/main/jastadd/**/*.jrag"
+ include "ragconnect.base/src/gen/jastadd/**/*.ast"
+ include "ragconnect.base/src/gen/jastadd/**/*.jadd"
+ include "ragconnect.base/src/gen/jastadd/**/*.jrag"
}
scanner {
basedir ".."
- include "ros2rag.base/src/main/jastadd/scanner/Header.flex", [-5]
+ include "ragconnect.base/src/main/jastadd/scanner/Header.flex", [-5]
include "relast.preprocessor/src/main/jastadd/scanner/Preamble.flex", [-4]
include "relast.preprocessor/src/main/jastadd/scanner/Macros.flex", [-3]
- include "ros2rag.base/src/main/jastadd/scanner/Macros.flex", [-3]
+ include "ragconnect.base/src/main/jastadd/scanner/Macros.flex", [-3]
include "relast.preprocessor/src/main/jastadd/scanner/RulesPreamble.flex", [-2]
- include "ros2rag.base/src/main/jastadd/scanner/MappingContent.flex", [-1]
- include "ros2rag.base/src/main/jastadd/scanner/Keywords.flex"
+ include "ragconnect.base/src/main/jastadd/scanner/MappingContent.flex", [-1]
+ include "ragconnect.base/src/main/jastadd/scanner/Keywords.flex"
include "relast.preprocessor/src/main/jastadd/scanner/Keywords.flex"
include "relast.preprocessor/src/main/jastadd/scanner/Symbols.flex", [1]
include "relast.preprocessor/src/main/jastadd/scanner/RulesPostamble.flex", [2]
@@ -123,8 +123,8 @@ jastadd {
parser {
basedir ".."
- include "ros2rag.base/src/main/jastadd/parser/Preamble.parser"
- include "ros2rag.base/src/main/jastadd/parser/Ros2Rag.parser"
+ include "ragconnect.base/src/main/jastadd/parser/Preamble.parser"
+ include "ragconnect.base/src/main/jastadd/parser/RagConnect.parser"
include "relast.preprocessor/src/main/jastadd/parser/RelAst.parser"
}
}
@@ -141,18 +141,18 @@ jastadd {
}
- module = "Ros2Rag"
+ module = "RagConnect"
- astPackage = 'org.jastadd.ros2rag.ast'
+ astPackage = 'org.jastadd.ragconnect.ast'
- parser.name = 'Ros2RagParser'
+ parser.name = 'RagConnectParser'
genDir = 'src/gen/java'
buildInfoDir = 'src/gen-res'
- scanner.genDir = "src/gen/java/org/jastadd/ros2rag/scanner"
- parser.genDir = "src/gen/java/org/jastadd/ros2rag/parser"
+ scanner.genDir = "src/gen/java/org/jastadd/ragconnect/scanner"
+ parser.genDir = "src/gen/java/org/jastadd/ragconnect/parser"
jastaddOptions = ["--lineColumnNumbers", "--List=JastAddList", "--safeLazy", "--visitCheck=true", "--rewrite=cnta", "--cache=all"]
}
diff --git a/src/main/jastadd/Analysis.jrag b/src/main/jastadd/Analysis.jrag
index 228a3479df5be9d24998479bc3b48bd1626775aa..da9a88b6c0d76925c0876d84063075ed495a02a1 100644
--- a/src/main/jastadd/Analysis.jrag
+++ b/src/main/jastadd/Analysis.jrag
@@ -1,7 +1,7 @@
aspect Analysis {
// --- lookupTokenUpdateDefinition ---
inh TokenUpdateDefinition TokenUpdateDefinition.lookupTokenUpdateDefinition(TokenComponent token);
- eq Ros2Rag.getUpdateDefinition().lookupTokenUpdateDefinition(TokenComponent token) {
+ eq RagConnect.getUpdateDefinition().lookupTokenUpdateDefinition(TokenComponent token) {
for (UpdateDefinition def : getUpdateDefinitionList()) {
if (def.isTokenUpdateDefinition() && def.asTokenUpdateDefinition().getToken().equals(token)) {
return def.asTokenUpdateDefinition();
@@ -12,7 +12,7 @@ aspect Analysis {
// --- lookupDependencyDefinition ---
inh DependencyDefinition DependencyDefinition.lookupDependencyDefinition(TypeDecl source, String id);
- eq Ros2Rag.getDependencyDefinition().lookupDependencyDefinition(TypeDecl source, String id) {
+ eq RagConnect.getDependencyDefinition().lookupDependencyDefinition(TypeDecl source, String id) {
for (DependencyDefinition def : getDependencyDefinitionList()) {
if (def.getID().equals(id) && def.getSource().containingTypeDecl().equals(source)) {
return def;
diff --git a/src/main/jastadd/Errors.jrag b/src/main/jastadd/Errors.jrag
index ef223a4081e169273555140a35a9f8b47876109d..4ea4c18912a1550938a603090c941ba85397e2ba 100644
--- a/src/main/jastadd/Errors.jrag
+++ b/src/main/jastadd/Errors.jrag
@@ -3,17 +3,17 @@ import java.util.TreeSet;
import java.util.LinkedList;
aspect Errors {
- coll Set<ErrorMessage> Ros2Rag.errors()
+ coll Set<ErrorMessage> RagConnect.errors()
[new TreeSet<ErrorMessage>()]
- root Ros2Rag;
+ root RagConnect;
ReadFromMqttDefinition contributes error("Read definition already defined for " + getToken().getName())
when isAlreadyDefined()
- to Ros2Rag.errors();
+ to RagConnect.errors();
ReadFromMqttDefinition contributes error("Reading target token must not be an NTA token!")
when getToken().getNTA()
- to Ros2Rag.errors();
+ to RagConnect.errors();
// if first mapping is null, then suitableDefaultMapping() == null
ReadFromMqttDefinition contributes error("No suitable default mapping found for type " +
@@ -21,32 +21,32 @@ aspect Errors {
? getToken().getJavaTypeUse().prettyPrint()
: getMappingList().get(0).getFromType().prettyPrint()))
when effectiveMappings().get(0) == null
- to Ros2Rag.errors();
+ to RagConnect.errors();
ReadFromMqttDefinition contributes error("to-type of last mapping must be type of the Token!")
when getToken().getJavaTypeUse().prettyPrint().equals(
effectiveMappings().get(effectiveMappings().size() - 1))
- to Ros2Rag.errors();
+ to RagConnect.errors();
WriteToMqttDefinition contributes error("Writing target token must be an NTA token!")
when !getToken().getNTA()
- to Ros2Rag.errors();
+ to RagConnect.errors();
WriteToMqttDefinition contributes error("Write definition already defined for " + getToken().getName())
when isAlreadyDefined()
- to Ros2Rag.errors();
+ to RagConnect.errors();
DependencyDefinition contributes error("Dependency definition already defined for " + getSource().containingTypeDecl().getName() + " with name " + getID())
when isAlreadyDefined()
- to Ros2Rag.errors();
+ to RagConnect.errors();
DependencyDefinition contributes error("The name of a dependency definition must not be equal to a list-node on the source")
when isAlreadyDefinedAsList()
- to Ros2Rag.errors();
+ to RagConnect.errors();
DependencyDefinition contributes error("There must be a write update definition targeting " + getSource().parentTypeypeAndName() + " for dependency definition " + getID())
when targetUpdateDefinition() == null
- to Ros2Rag.errors();
+ to RagConnect.errors();
}
aspect ErrorHelpers {
diff --git a/src/main/jastadd/MustacheNodes.relast b/src/main/jastadd/MustacheNodes.relast
index 69d4280f9d9038c838e83767c6e72be9a8d6d5d8..f213a35741dd514ac86201c7e6ee32f2053a7a83 100644
--- a/src/main/jastadd/MustacheNodes.relast
+++ b/src/main/jastadd/MustacheNodes.relast
@@ -1,7 +1,7 @@
//TypeComponentMustache ;
//rel TypeComponentMustache.TypeComponent -> TypeComponent ;
-MRos2Rag ::= ReadDefinition:MReadDefinition* WriteDefinition:MWriteDefinition* MappingDefinition:MMappingDefinition* DependencyDefinition:MDependencyDefinition* RootTypeComponent:MTypeComponent* TokenComponent:MTokenComponent*;
+MRagConnect ::= ReadDefinition:MReadDefinition* WriteDefinition:MWriteDefinition* MappingDefinition:MMappingDefinition* DependencyDefinition:MDependencyDefinition* RootTypeComponent:MTypeComponent* TokenComponent:MTokenComponent*;
abstract MUpdateDefinition ::= InnerMappingDefinition:MInnerMappingDefinition*;
MReadDefinition : MUpdateDefinition;
MWriteDefinition : MUpdateDefinition;
@@ -11,7 +11,7 @@ MDependencyDefinition;
MTypeComponent;
MTokenComponent;
-rel MRos2Rag.Ros2Rag -> Ros2Rag;
+rel MRagConnect.RagConnect -> RagConnect;
rel MInnerMappingDefinition.MappingDefinition -> MappingDefinition;
rel MReadDefinition.ReadFromMqttDefinition -> ReadFromMqttDefinition;
rel MWriteDefinition.WriteToMqttDefinition -> WriteToMqttDefinition;
diff --git a/src/main/jastadd/NameResolution.jrag b/src/main/jastadd/NameResolution.jrag
index fc4485858d199f352c18fcd188914020666ef619..6d5ebe27211b6a83917126201cfa09e3d63f4064 100644
--- a/src/main/jastadd/NameResolution.jrag
+++ b/src/main/jastadd/NameResolution.jrag
@@ -2,7 +2,7 @@ aspect NameResolution {
refine RefResolverStubs eq UpdateDefinition.resolveMappingByToken(String id, int position) {
// return a MappingDefinition
- for (MappingDefinition mappingDefinition : ros2rag().getMappingDefinitionList()) {
+ for (MappingDefinition mappingDefinition : ragconnect().getMappingDefinitionList()) {
if (mappingDefinition.getID().equals(id)) {
return mappingDefinition;
}
diff --git a/src/main/jastadd/Navigation.jrag b/src/main/jastadd/Navigation.jrag
index a4f21e6e8d79c549a63d54474792382457bf74fd..b031267ab8dc8ddcbaf3d5a75e4b8fe5a068f0bb 100644
--- a/src/main/jastadd/Navigation.jrag
+++ b/src/main/jastadd/Navigation.jrag
@@ -1,17 +1,17 @@
aspect Navigation {
// --- program ---
- eq Ros2Rag.getChild().program() = getProgram();
- eq MRos2Rag.getChild().program() = getRos2Rag().program();
+ eq RagConnect.getChild().program() = getProgram();
+ eq MRagConnect.getChild().program() = getRagConnect().program();
- // --- ros2rag ---
- inh Ros2Rag ASTNode.ros2rag();
- eq Ros2Rag.getChild().ros2rag() = this;
- eq MRos2Rag.getChild().ros2rag() = getRos2Rag();
+ // --- ragconnect ---
+ inh RagConnect ASTNode.ragconnect();
+ eq RagConnect.getChild().ragconnect() = this;
+ eq MRagConnect.getChild().ragconnect() = getRagConnect();
// --- containedFile (first equation should be in preprocessor) ---
eq Program.getChild().containedFile() = null;
- eq Ros2Rag.getChild().containedFile() = null;
+ eq RagConnect.getChild().containedFile() = null;
// --- isTypeComponent (should be in preprocessor) ---
syn boolean Component.isTypeComponent() = false;
@@ -32,9 +32,9 @@ aspect Navigation {
// --- containedFileName (should replace containedFile in preprocessor) ---
inh String ASTNode.containedFileName();
eq GrammarFile.getChild().containedFileName() = getFileName();
- eq Ros2Rag.getChild().containedFileName() = getFileName();
+ eq RagConnect.getChild().containedFileName() = getFileName();
eq Program.getChild().containedFileName() = null;
- eq MRos2Rag.getChild().containedFileName() = null;
+ eq MRagConnect.getChild().containedFileName() = null;
// --- isTokenUpdateDefinition ---
syn boolean UpdateDefinition.isTokenUpdateDefinition() = false;
@@ -59,7 +59,7 @@ aspect Navigation {
// --- targetUpdateDefinition ---
syn WriteToMqttDefinition DependencyDefinition.targetUpdateDefinition() {
// resolve definition in here, as we do not need resolveMethod in any other place (yet)
- for (UpdateDefinition updateDefinition : ros2rag().getUpdateDefinitionList()) {
+ for (UpdateDefinition updateDefinition : ragconnect().getUpdateDefinitionList()) {
if (updateDefinition.isWriteToMqttDefinition() &&
updateDefinition.asWriteToMqttDefinition().getToken().equals(this.getTarget())) {
return updateDefinition.asWriteToMqttDefinition();
diff --git a/src/main/jastadd/Ros2Rag.relast b/src/main/jastadd/RagConnect.relast
similarity index 89%
rename from src/main/jastadd/Ros2Rag.relast
rename to src/main/jastadd/RagConnect.relast
index e1a84e8beac44fcbc23d09fc56ed536586bde4e8..e3ab24ad171007ea53ed78314b89b079d574d508 100644
--- a/src/main/jastadd/Ros2Rag.relast
+++ b/src/main/jastadd/RagConnect.relast
@@ -1,4 +1,4 @@
-Ros2Rag ::= UpdateDefinition* DependencyDefinition* MappingDefinition* Program <FileName> ;
+RagConnect ::= UpdateDefinition* DependencyDefinition* MappingDefinition* Program <FileName> ;
abstract UpdateDefinition ::= <AlwaysApply:boolean> ;
diff --git a/src/main/jastadd/backend/Generation.jadd b/src/main/jastadd/backend/Generation.jadd
index 9179b3d5ad520e4a3255a5b26c7ea86deaeef50b..060d4dfb6c9a87b7601391e1d5adf081c6666f78 100644
--- a/src/main/jastadd/backend/Generation.jadd
+++ b/src/main/jastadd/backend/Generation.jadd
@@ -26,15 +26,16 @@ aspect GenerationUtils {
*/
aspect AttributesForMustache {
- // --- MRos2Rag ---
- eq MRos2Rag.getChild().mqttHandlerAttribute() = mqttHandlerAttribute();
- eq MRos2Rag.getChild().mqttHandlerField() = mqttHandlerField();
+ // --- MRagConnect ---
+ eq MRagConnect.getChild().mqttHandlerAttribute() = mqttHandlerAttribute();
+ eq MRagConnect.getChild().mqttHandlerField() = mqttHandlerField();
+ eq MRagConnect.getRootTypeComponent(int i).isFirst() = i == 0;
- syn String MRos2Rag.mqttHandlerAttribute() = getRos2Rag().mqttHandlerAttribute();
- syn String MRos2Rag.mqttHandlerField() = getRos2Rag().mqttHandlerField();
- syn String MRos2Rag.mqttSetHostMethod() = getRos2Rag().mqttSetHostMethod();
- syn String MRos2Rag.mqttWaitUntilReadyMethod() = getRos2Rag().mqttWaitUntilReadyMethod();
- syn String MRos2Rag.mqttCloseMethod() = getRos2Rag().mqttCloseMethod();
+ syn String MRagConnect.mqttHandlerAttribute() = getRagConnect().mqttHandlerAttribute();
+ syn String MRagConnect.mqttHandlerField() = getRagConnect().mqttHandlerField();
+ syn String MRagConnect.mqttSetHostMethod() = getRagConnect().mqttSetHostMethod();
+ syn String MRagConnect.mqttWaitUntilReadyMethod() = getRagConnect().mqttWaitUntilReadyMethod();
+ syn String MRagConnect.mqttCloseMethod() = getRagConnect().mqttCloseMethod();
// --- MUpdateDefinition ---
syn String MUpdateDefinition.preemptiveExpectedValue();
@@ -116,6 +117,7 @@ aspect AttributesForMustache {
syn String MTypeComponent.name() = getTypeComponent().getName();
inh String MTypeComponent.mqttHandlerAttribute();
inh String MTypeComponent.mqttHandlerField();
+ inh boolean MTypeComponent.isFirst();
// --- MTokenComponent ---
syn String MTokenComponent.parentTypeName() = getTokenComponent().containingTypeDecl().getName();
@@ -124,9 +126,9 @@ aspect AttributesForMustache {
syn String MTokenComponent.internalName() = getTokenComponent().internalName();
// --- toMustache ---
- syn lazy MRos2Rag Ros2Rag.toMustache() {
- MRos2Rag result = new MRos2Rag();
- result.setRos2Rag(this);
+ syn lazy MRagConnect RagConnect.toMustache() {
+ MRagConnect result = new MRagConnect();
+ result.setRagConnect(this);
for (UpdateDefinition def : getUpdateDefinitionList()) {
if (def.isWriteToMqttDefinition()) {
result.addWriteDefinition(def.asWriteToMqttDefinition().toMustache());
@@ -216,29 +218,29 @@ aspect AspectGeneration {
syn String DependencyDefinition.internalRelationPrefix() = "_internal_" + getID();
syn String DependencyDefinition.internalTokenName() = getSource().internalName();
- syn String Ros2Rag.mqttHandlerAttribute() = "_mqttHandler";
- syn String Ros2Rag.mqttHandlerField() = "_mqttHandler";
+ syn String RagConnect.mqttHandlerAttribute() = "_mqttHandler";
+ syn String RagConnect.mqttHandlerField() = "_mqttHandler";
- syn String Ros2Rag.mqttSetHostMethod() = "MqttSetHost";
- syn String Ros2Rag.mqttWaitUntilReadyMethod() = "MqttWaitUntilReady";
- syn String Ros2Rag.mqttCloseMethod() = "MqttCloseConnections";
+ syn String RagConnect.mqttSetHostMethod() = "MqttSetHost";
+ syn String RagConnect.mqttWaitUntilReadyMethod() = "MqttWaitUntilReady";
+ syn String RagConnect.mqttCloseMethod() = "MqttCloseConnections";
// naming copy attributes
// --- mqttHandlerAttribute ---
inh String UpdateDefinition.mqttHandlerAttribute();
inh String MappingDefinition.mqttHandlerAttribute();
inh String DependencyDefinition.mqttHandlerAttribute();
- eq Ros2Rag.getChild().mqttHandlerAttribute() = mqttHandlerAttribute();
+ eq RagConnect.getChild().mqttHandlerAttribute() = mqttHandlerAttribute();
// --- rootNodeName ---
syn String ASTNode.rootNodeName() = rootNode.getName();
- public String Ros2Rag.generateAspect(String rootNodeName) {
+ public String RagConnect.generateAspect(String rootNodeName) {
rootNode = getProgram().resolveTypeDecl(rootNodeName);
return toMustache().generateAspect();
}
- public String MRos2Rag.generateAspect() {
+ public String MRagConnect.generateAspect() {
StringBuilder sb = new StringBuilder();
com.github.mustachejava.reflect.ReflectionObjectHandler roh = new com.github.mustachejava.reflect.ReflectionObjectHandler() {
@Override
@@ -257,14 +259,14 @@ aspect AspectGeneration {
};
com.github.mustachejava.DefaultMustacheFactory mf = new com.github.mustachejava.DefaultMustacheFactory();
mf.setObjectHandler(roh);
- com.github.mustachejava.Mustache m = mf.compile("ros2rag.mustache");
- m.execute(new java.io.PrintWriter(new org.jastadd.ros2rag.compiler.AppendableWriter(sb)), this);
+ com.github.mustachejava.Mustache m = mf.compile("ragconnect.mustache");
+ m.execute(new java.io.PrintWriter(new org.jastadd.ragconnect.compiler.AppendableWriter(sb)), this);
return sb.toString();
}
}
aspect RelationGeneration {
- syn java.util.List<Relation> Ros2Rag.additionalRelations() {
+ syn java.util.List<Relation> RagConnect.additionalRelations() {
java.util.List<Relation> result = new java.util.ArrayList<>();
for (DependencyDefinition dd : getDependencyDefinitionList()) {
result.add(dd.getRelationToCreate());
diff --git a/src/main/jastadd/backend/Mappings.jrag b/src/main/jastadd/backend/Mappings.jrag
index 600ce92ee064f45fe0f41860dd3ab0bc5e334bd3..8232e8ffbf4d099023f3d215666d47cfce179fa0 100644
--- a/src/main/jastadd/backend/Mappings.jrag
+++ b/src/main/jastadd/backend/Mappings.jrag
@@ -1,6 +1,6 @@
aspect DefaultMappings {
- private DefaultMappingDefinition Ros2Rag.baseDefaultMappingDefinitionFromBytes(String typeName) {
+ private DefaultMappingDefinition RagConnect.baseDefaultMappingDefinitionFromBytes(String typeName) {
DefaultMappingDefinition result = new DefaultMappingDefinition();
result.setID("_DefaultBytesTo" + Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1) + "Mapping");
result.setFromType(new JavaArrayMappingDefinitionType(new SimpleJavaTypeUse("byte")));
@@ -9,7 +9,7 @@ aspect DefaultMappings {
return result;
}
- private DefaultMappingDefinition Ros2Rag.baseDefaultMappingDefinitionToBytes(String typeName) {
+ private DefaultMappingDefinition RagConnect.baseDefaultMappingDefinitionToBytes(String typeName) {
DefaultMappingDefinition result = new DefaultMappingDefinition();
result.setID("_Default" + Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1) + "ToBytesMapping");
result.setFromType(new JavaMappingDefinitionType(new SimpleJavaTypeUse(typeName)));
@@ -18,85 +18,85 @@ aspect DefaultMappings {
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultBytesToIntMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultBytesToIntMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("int");
result.setContent("return java.nio.ByteBuffer.wrap(bytes).getInt();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultBytesToShortMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultBytesToShortMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("short");
result.setContent("return java.nio.ByteBuffer.wrap(bytes).getShort();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultBytesToLongMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultBytesToLongMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("long");
result.setContent("return java.nio.ByteBuffer.wrap(bytes).getLong();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultBytesToFloatMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultBytesToFloatMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("float");
result.setContent("return java.nio.ByteBuffer.wrap(bytes).getFloat();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultBytesToDoubleMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultBytesToDoubleMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("double");
result.setContent("return java.nio.ByteBuffer.wrap(bytes).getDouble();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultBytesToCharMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultBytesToCharMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("char");
result.setContent("return java.nio.ByteBuffer.wrap(bytes).getChar();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultBytesToStringMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultBytesToStringMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("String");
result.setContent("return new String(bytes);");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultIntToBytesMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultIntToBytesMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("int");
result.setContent("return java.nio.ByteBuffer.allocate(4).putInt(input).array();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultShortToBytesMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultShortToBytesMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("short");
result.setContent("return java.nio.ByteBuffer.allocate(2).putShort(input).array();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultLongToBytesMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultLongToBytesMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("long");
result.setContent("return java.nio.ByteBuffer.allocate(8).putLong(input).array();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultFloatToBytesMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultFloatToBytesMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("float");
result.setContent("return java.nio.ByteBuffer.allocate(4).putFloat(input).array();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultDoubleToBytesMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultDoubleToBytesMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("double");
result.setContent("return java.nio.ByteBuffer.allocate(8).putDouble(input).array();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultCharToBytesMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultCharToBytesMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("char");
result.setContent("return java.nio.ByteBuffer.allocate(2).putChar(input).array();");
return result;
}
- syn nta DefaultMappingDefinition Ros2Rag.defaultStringToBytesMapping() {
+ syn nta DefaultMappingDefinition RagConnect.defaultStringToBytesMapping() {
DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("String");
result.setContent("return input.getBytes();");
return result;
@@ -166,18 +166,18 @@ aspect Mappings {
getMappingList().get(0).getFromType().prettyPrint();
switch(typeName) {
case "int":
- case "Integer": return ros2rag().defaultBytesToIntMapping();
+ case "Integer": return ragconnect().defaultBytesToIntMapping();
case "short":
- case "Short": return ros2rag().defaultBytesToShortMapping();
+ case "Short": return ragconnect().defaultBytesToShortMapping();
case "long":
- case "Long": return ros2rag().defaultBytesToLongMapping();
+ case "Long": return ragconnect().defaultBytesToLongMapping();
case "float":
- case "Float": return ros2rag().defaultBytesToFloatMapping();
+ case "Float": return ragconnect().defaultBytesToFloatMapping();
case "double":
- case "Double": return ros2rag().defaultBytesToDoubleMapping();
+ case "Double": return ragconnect().defaultBytesToDoubleMapping();
case "char":
- case "Character": return ros2rag().defaultBytesToCharMapping();
- case "String": return ros2rag().defaultBytesToStringMapping();
+ case "Character": return ragconnect().defaultBytesToCharMapping();
+ case "String": return ragconnect().defaultBytesToStringMapping();
default: return null;
}
}
@@ -187,18 +187,18 @@ aspect Mappings {
getMappingList().get(getMappingList().size() - 1).getFromType().prettyPrint();
switch(typeName) {
case "int":
- case "Integer": return ros2rag().defaultIntToBytesMapping();
+ case "Integer": return ragconnect().defaultIntToBytesMapping();
case "short":
- case "Short": return ros2rag().defaultShortToBytesMapping();
+ case "Short": return ragconnect().defaultShortToBytesMapping();
case "long":
- case "Long": return ros2rag().defaultLongToBytesMapping();
+ case "Long": return ragconnect().defaultLongToBytesMapping();
case "float":
- case "Float": return ros2rag().defaultFloatToBytesMapping();
+ case "Float": return ragconnect().defaultFloatToBytesMapping();
case "double":
- case "Double": return ros2rag().defaultDoubleToBytesMapping();
+ case "Double": return ragconnect().defaultDoubleToBytesMapping();
case "char":
- case "Character": return ros2rag().defaultCharToBytesMapping();
- case "String": return ros2rag().defaultStringToBytesMapping();
+ case "Character": return ragconnect().defaultCharToBytesMapping();
+ case "String": return ragconnect().defaultStringToBytesMapping();
default: return null;
}
}
@@ -208,7 +208,7 @@ aspect Mappings {
eq JavaArrayMappingDefinitionType.isByteArray() = getType().getName().equals("byte");
// --- allMappingDefinitions ---
- syn java.util.List<MappingDefinition> Ros2Rag.allMappingDefinitions() {
+ syn java.util.List<MappingDefinition> RagConnect.allMappingDefinitions() {
java.util.List<MappingDefinition> result = new java.util.ArrayList<>();
getMappingDefinitionList().iterator().forEachRemaining(result::add);
result.add(defaultBytesToIntMapping());
diff --git a/src/main/jastadd/parser/Preamble.parser b/src/main/jastadd/parser/Preamble.parser
index 43fa51e769eed054371cecae2cde354b44e115a3..d701db19d6edb6d6c616bc79fc0145ea59d2713d 100644
--- a/src/main/jastadd/parser/Preamble.parser
+++ b/src/main/jastadd/parser/Preamble.parser
@@ -1,7 +1,7 @@
%header {:
-package org.jastadd.ros2rag.parser;
-import org.jastadd.ros2rag.ast.*;
+package org.jastadd.ragconnect.parser;
+import org.jastadd.ragconnect.ast.*;
:};
%goal goal;
-%goal ros2rag;
+%goal ragconnect;
diff --git a/src/main/jastadd/parser/Ros2Rag.parser b/src/main/jastadd/parser/RagConnect.parser
similarity index 86%
rename from src/main/jastadd/parser/Ros2Rag.parser
rename to src/main/jastadd/parser/RagConnect.parser
index 015b4e664950fd9f49601dbea53fc67225c41169..3fbf4b8ef3c7abdfc10b72c38938ba980079d653 100644
--- a/src/main/jastadd/parser/Ros2Rag.parser
+++ b/src/main/jastadd/parser/RagConnect.parser
@@ -1,9 +1,9 @@
-Ros2Rag ros2rag
- = update_definition.d ros2rag.r {: r.getUpdateDefinitionList().insertChild(d, 0); return r; :}
- | dependency_definition.d ros2rag.r {: r.getDependencyDefinitionList().insertChild(d, 0); return r; :}
- | mapping_definition.d ros2rag.r {: r.getMappingDefinitionList().insertChild(d, 0); return r; :}
- | comment ros2rag.r {: return r; :}
- | {: return new Ros2Rag(); :}
+RagConnect ragconnect
+ = update_definition.d ragconnect.r {: r.getUpdateDefinitionList().insertChild(d, 0); return r; :}
+ | dependency_definition.d ragconnect.r {: r.getDependencyDefinitionList().insertChild(d, 0); return r; :}
+ | mapping_definition.d ragconnect.r {: r.getMappingDefinitionList().insertChild(d, 0); return r; :}
+ | comment ragconnect.r {: return r; :}
+ | {: return new RagConnect(); :}
;
%embed {:
diff --git a/src/main/jastadd/scanner/Header.flex b/src/main/jastadd/scanner/Header.flex
index 974aa01fe70d15edbd4c80ac67169a18fe95f9e8..53f20ea9b3ea615da3c90ac3120ddea033afc4c0 100644
--- a/src/main/jastadd/scanner/Header.flex
+++ b/src/main/jastadd/scanner/Header.flex
@@ -1,17 +1,17 @@
-package org.jastadd.ros2rag.scanner;
+package org.jastadd.ragconnect.scanner;
-import org.jastadd.ros2rag.parser.Ros2RagParser.Terminals;
+import org.jastadd.ragconnect.parser.RagConnectParser.Terminals;
%%
%public
%final
-%class Ros2RagScanner
+%class RagConnectScanner
%extends beaver.Scanner
%type beaver.Symbol
%function nextToken
%yylexthrow beaver.Scanner.Exception
-%scanerror Ros2RagScanner.ScannerError
+%scanerror RagConnectScanner.ScannerError
%line
%column
diff --git a/src/main/java/org/jastadd/ros2rag/compiler/AppendableWriter.java b/src/main/java/org/jastadd/ragconnect/compiler/AppendableWriter.java
similarity index 93%
rename from src/main/java/org/jastadd/ros2rag/compiler/AppendableWriter.java
rename to src/main/java/org/jastadd/ragconnect/compiler/AppendableWriter.java
index 97680b18dc4fd1d8af3df75f35221e059355e19e..55818dcda1c89948726065c9d11640fcb6601130 100644
--- a/src/main/java/org/jastadd/ros2rag/compiler/AppendableWriter.java
+++ b/src/main/java/org/jastadd/ragconnect/compiler/AppendableWriter.java
@@ -1,4 +1,4 @@
-package org.jastadd.ros2rag.compiler;
+package org.jastadd.ragconnect.compiler;
import java.io.IOException;
import java.io.Writer;
diff --git a/src/main/java/org/jastadd/ros2rag/compiler/Compiler.java b/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java
similarity index 76%
rename from src/main/java/org/jastadd/ros2rag/compiler/Compiler.java
rename to src/main/java/org/jastadd/ragconnect/compiler/Compiler.java
index b6331130a7b338ef1bf37f6ac372d612cb1754f1..e23d4bdd168c1b5f40fb95c7cc9a2a5f02c43cdf 100644
--- a/src/main/java/org/jastadd/ros2rag/compiler/Compiler.java
+++ b/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java
@@ -1,14 +1,13 @@
-package org.jastadd.ros2rag.compiler;
+package org.jastadd.ragconnect.compiler;
import beaver.Parser;
-import org.jastadd.ros2rag.ast.*;
-import org.jastadd.ros2rag.compiler.options.CommandLine;
-import org.jastadd.ros2rag.compiler.options.CommandLine.CommandLineException;
-import org.jastadd.ros2rag.compiler.options.FlagOption;
-import org.jastadd.ros2rag.compiler.options.Option;
-import org.jastadd.ros2rag.compiler.options.StringOption;
-import org.jastadd.ros2rag.parser.Ros2RagParser;
-import org.jastadd.ros2rag.scanner.Ros2RagScanner;
+import org.jastadd.ragconnect.compiler.options.CommandLine;
+import org.jastadd.ragconnect.compiler.options.FlagOption;
+import org.jastadd.ragconnect.compiler.options.Option;
+import org.jastadd.ragconnect.compiler.options.StringOption;
+import org.jastadd.ragconnect.ast.*;
+import org.jastadd.ragconnect.parser.RagConnectParser;
+import org.jastadd.ragconnect.scanner.RagConnectScanner;
import java.io.*;
import java.nio.file.Files;
@@ -22,7 +21,7 @@ public class Compiler {
private StringOption optionOutputDir;
private StringOption optionInputGrammar;
private StringOption optionRootNode;
- private StringOption optionInputRos2Rag;
+ private StringOption optionInputRagConnect;
private FlagOption optionHelp;
private FlagOption optionVerbose;
private FlagOption optionLogReads;
@@ -36,7 +35,7 @@ public class Compiler {
addOptions();
}
- public void run(String[] args) throws CommandLineException, CompilerException {
+ public void run(String[] args) throws CommandLine.CommandLineException, CompilerException {
System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
System.setProperty("mustache.debug", "true");
options = new ArrayList<>();
@@ -75,7 +74,7 @@ public class Compiler {
throw new CompilerException("Error creating output dir " + outputDir, e);
}
- printMessage("Running Ros2Rag Preprocessor");
+ printMessage("Running RagConnect Preprocessor");
if (anyRequiredOptionIsUnset()) {
throw new CompilerException("Aborting due to missing values for required options.");
@@ -85,11 +84,11 @@ public class Compiler {
if (!otherArgs.isEmpty()) {
printMessage("Superfluous arguments will be ignored: " + otherArgs);
}
- Ros2Rag ros2Rag = parseProgram(optionInputGrammar.getValue(), optionInputRos2Rag.getValue());
+ RagConnect ragConnect = parseProgram(optionInputGrammar.getValue(), optionInputRagConnect.getValue());
- if (!ros2Rag.errors().isEmpty()) {
+ if (!ragConnect.errors().isEmpty()) {
System.err.println("Errors:");
- for (ErrorMessage e : ros2Rag.errors()) {
+ for (ErrorMessage e : ragConnect.errors()) {
System.err.println(e);
}
System.exit(1);
@@ -109,8 +108,8 @@ public class Compiler {
} catch (IOException e) {
throw new CompilerException("Could not copy " + mqttHandlerFileName, e);
}
- writeToFile(outputDir + "/Grammar.relast", ros2Rag.getProgram().generateAbstractGrammar());
- writeToFile(outputDir + "/ROS2RAG.jadd", ros2Rag.generateAspect(optionRootNode.getValue()));
+ writeToFile(outputDir + "/Grammar.relast", ragConnect.getProgram().generateAbstractGrammar());
+ writeToFile(outputDir + "/RagConnect.jadd", ragConnect.generateAspect(optionRootNode.getValue()));
}
private boolean anyRequiredOptionIsUnset() {
@@ -129,7 +128,7 @@ public class Compiler {
public static void main(String[] args) {
try {
new Compiler().run(args);
- } catch (CommandLineException | CompilerException e) {
+ } catch (CommandLine.CommandLineException | CompilerException e) {
System.err.println(e.getMessage());
System.exit(-1);
}
@@ -153,7 +152,7 @@ public class Compiler {
optionOutputDir = addOption(new StringOption("outputDir", "target directory for the generated files."));
optionInputGrammar = addOption(new StringOption("inputGrammar", "base grammar."));
optionRootNode = addOption(new StringOption("rootNode", "root node in the base grammar."));
- optionInputRos2Rag = addOption(new StringOption("inputRos2Rag", "ros2rag definition file."));
+ optionInputRagConnect = addOption(new StringOption("inputRagConnect", "connect definition file."));
optionHelp = addOption(new FlagOption("help", "Print usage and exit."));
optionVerbose = addOption(new FlagOption("verbose", "Print more messages while compiling."));
optionLogReads = addOption(new FlagOption("logReads", "Enable logging for every read."));
@@ -165,14 +164,14 @@ public class Compiler {
return option;
}
- private Ros2Rag parseProgram(String inputGrammarFileName, String inputRos2RagFileName) throws CompilerException {
+ private RagConnect parseProgram(String inputGrammarFileName, String inputRagConnectFileName) throws CompilerException {
Program program = new Program();
- Ros2Rag ros2Rag;
+ RagConnect ros2Rag;
GrammarFile inputGrammar;
try (BufferedReader reader = Files.newBufferedReader(Paths.get(inputGrammarFileName))) {
- Ros2RagScanner scanner = new Ros2RagScanner(reader);
- Ros2RagParser parser = new Ros2RagParser();
+ RagConnectScanner scanner = new RagConnectScanner(reader);
+ RagConnectParser parser = new RagConnectParser();
inputGrammar = (GrammarFile) parser.parse(scanner);
if (optionVerbose.isSet()) {
inputGrammar.dumpTree(System.out);
@@ -184,14 +183,14 @@ public class Compiler {
throw new CompilerException("Could not parse grammar file " + inputGrammarFileName, e);
}
- try (BufferedReader reader = Files.newBufferedReader(Paths.get(inputRos2RagFileName))) {
- Ros2RagScanner scanner = new Ros2RagScanner(reader);
- Ros2RagParser parser = new Ros2RagParser();
- ros2Rag = (Ros2Rag) parser.parse(scanner, Ros2RagParser.AltGoals.ros2rag);
+ try (BufferedReader reader = Files.newBufferedReader(Paths.get(inputRagConnectFileName))) {
+ RagConnectScanner scanner = new RagConnectScanner(reader);
+ RagConnectParser parser = new RagConnectParser();
+ ros2Rag = (RagConnect) parser.parse(scanner, RagConnectParser.AltGoals.ragconnect);
ros2Rag.setProgram(program);
- ros2Rag.setFileName(inputRos2RagFileName);
+ ros2Rag.setFileName(inputRagConnectFileName);
} catch (IOException | Parser.Exception e) {
- throw new CompilerException("Could not parse ros2rag file " + inputRos2RagFileName, e);
+ throw new CompilerException("Could not parse ros2rag file " + inputRagConnectFileName, e);
}
ros2Rag.treeResolveAll();
ros2Rag.additionalRelations().forEach(inputGrammar::addDeclaration);
diff --git a/src/main/java/org/jastadd/ros2rag/compiler/SimpleMain.java b/src/main/java/org/jastadd/ragconnect/compiler/SimpleMain.java
similarity index 81%
rename from src/main/java/org/jastadd/ros2rag/compiler/SimpleMain.java
rename to src/main/java/org/jastadd/ragconnect/compiler/SimpleMain.java
index 74406f87a166732efedafbc772d114185f24e227..2e7d5c9cc72b5f1915ef0c73090e30dd21fb2ae6 100644
--- a/src/main/java/org/jastadd/ros2rag/compiler/SimpleMain.java
+++ b/src/main/java/org/jastadd/ragconnect/compiler/SimpleMain.java
@@ -1,9 +1,9 @@
-package org.jastadd.ros2rag.compiler;
+package org.jastadd.ragconnect.compiler;
import beaver.Parser;
-import org.jastadd.ros2rag.ast.*;
-import org.jastadd.ros2rag.parser.Ros2RagParser;
-import org.jastadd.ros2rag.scanner.Ros2RagScanner;
+import org.jastadd.ragconnect.ast.*;
+import org.jastadd.ragconnect.parser.RagConnectParser;
+import org.jastadd.ragconnect.scanner.RagConnectScanner;
import java.io.BufferedReader;
import java.io.IOException;
@@ -102,18 +102,18 @@ public class SimpleMain {
}
public static void main(String[] args) {
- testing();
-// createManualAST();
+// testing();
+ createManualAST();
}
private static void createManualAST() {
- Ros2Rag model = new Ros2Rag();
- Program program = parseProgram(Paths.get("src", "test", "resources", "Example.relast"));
+ RagConnect model = new RagConnect();
+ Program program = parseProgram(Paths.get("ros2rag.starter","src", "main", "jastadd", "RobotModel.relast"));
model.setProgram(program);
MappingDefinition mappingDefinition = new MappingDefinition();
mappingDefinition.setID("PoseToPosition");
- mappingDefinition.setFromType(makeMappingDefinitionType("PBPose"));
+ mappingDefinition.setFromType(makeMappingDefinitionType("int"));
mappingDefinition.setFromVariableName("x");
mappingDefinition.setToType(makeMappingDefinitionType("Position"));
mappingDefinition.setContent(" pose.position.x += sqrt(.5 * size.x)\n" +
@@ -125,11 +125,14 @@ public class SimpleMain {
ReadFromMqttDefinition readFromMqttDefinition = new ReadFromMqttDefinition();
readFromMqttDefinition.setAlwaysApply(false);
- readFromMqttDefinition.setToken(TokenComponent.createRef("Joint.CurrentPosition"));
+ readFromMqttDefinition.setToken(TokenComponent.createRef("Link.CurrentPosition"));
readFromMqttDefinition.addMapping(mappingDefinition);
model.addUpdateDefinition(readFromMqttDefinition);
model.treeResolveAll();
+ for (ErrorMessage error : model.errors()) {
+ System.err.println(error);
+ }
System.out.println(model.generateAspect("Model"));
}
@@ -142,9 +145,12 @@ public class SimpleMain {
private static Program parseProgram(Path path) {
try (BufferedReader reader = Files.newBufferedReader(path)) {
- Ros2RagScanner scanner = new Ros2RagScanner(reader);
- Ros2RagParser parser = new Ros2RagParser();
- return (Program) parser.parse(scanner);
+ RagConnectScanner scanner = new RagConnectScanner(reader);
+ RagConnectParser parser = new RagConnectParser();
+ GrammarFile grammarFile = (GrammarFile) parser.parse(scanner);
+ Program program = new Program();
+ program.addGrammarFile(grammarFile);
+ return program;
} catch (IOException | Parser.Exception e) {
e.printStackTrace();
}
diff --git a/src/main/java/org/jastadd/ros2rag/compiler/Utils.java b/src/main/java/org/jastadd/ragconnect/compiler/Utils.java
similarity index 90%
rename from src/main/java/org/jastadd/ros2rag/compiler/Utils.java
rename to src/main/java/org/jastadd/ragconnect/compiler/Utils.java
index 6a229cd7e9a2551578a87f1c7b5fcccfebd31ff7..c083fe1d912fa74cb4461fce5fcb839f5b88a40f 100644
--- a/src/main/java/org/jastadd/ros2rag/compiler/Utils.java
+++ b/src/main/java/org/jastadd/ragconnect/compiler/Utils.java
@@ -1,4 +1,4 @@
-package org.jastadd.ros2rag.compiler;
+package org.jastadd.ragconnect.compiler;
import java.util.*;
import java.util.function.Predicate;
diff --git a/src/main/java/org/jastadd/ros2rag/compiler/options/CommandLine.java b/src/main/java/org/jastadd/ragconnect/compiler/options/CommandLine.java
similarity index 98%
rename from src/main/java/org/jastadd/ros2rag/compiler/options/CommandLine.java
rename to src/main/java/org/jastadd/ragconnect/compiler/options/CommandLine.java
index 89a1335c5440cc88fc8ee7c0c22552fffd86c13b..dc29ba032e1a7cdc234a9fdac60064205b5ca5ea 100644
--- a/src/main/java/org/jastadd/ros2rag/compiler/options/CommandLine.java
+++ b/src/main/java/org/jastadd/ragconnect/compiler/options/CommandLine.java
@@ -1,4 +1,4 @@
-package org.jastadd.ros2rag.compiler.options;
+package org.jastadd.ragconnect.compiler.options;
import java.util.*;
diff --git a/src/main/java/org/jastadd/ros2rag/compiler/options/EnumOption.java b/src/main/java/org/jastadd/ragconnect/compiler/options/EnumOption.java
similarity index 97%
rename from src/main/java/org/jastadd/ros2rag/compiler/options/EnumOption.java
rename to src/main/java/org/jastadd/ragconnect/compiler/options/EnumOption.java
index 67ada98e8c2483b8d29ffeb73f99e4be8e6244c8..a5278d36a39d12e21b2015cca2659321ced5117f 100644
--- a/src/main/java/org/jastadd/ros2rag/compiler/options/EnumOption.java
+++ b/src/main/java/org/jastadd/ragconnect/compiler/options/EnumOption.java
@@ -1,4 +1,4 @@
-package org.jastadd.ros2rag.compiler.options;
+package org.jastadd.ragconnect.compiler.options;
import java.util.Collection;
import java.util.TreeSet;
diff --git a/src/main/java/org/jastadd/ros2rag/compiler/options/FlagOption.java b/src/main/java/org/jastadd/ragconnect/compiler/options/FlagOption.java
similarity index 91%
rename from src/main/java/org/jastadd/ros2rag/compiler/options/FlagOption.java
rename to src/main/java/org/jastadd/ragconnect/compiler/options/FlagOption.java
index ad87ed19e91b03f05d163f0cc123af15a4a4e2e2..c16e20dc2075ad1a472bbc483e312561f9cd1d1a 100644
--- a/src/main/java/org/jastadd/ros2rag/compiler/options/FlagOption.java
+++ b/src/main/java/org/jastadd/ragconnect/compiler/options/FlagOption.java
@@ -1,4 +1,4 @@
-package org.jastadd.ros2rag.compiler.options;
+package org.jastadd.ragconnect.compiler.options;
public class FlagOption extends Option<Boolean> {
private boolean value;
diff --git a/src/main/java/org/jastadd/ros2rag/compiler/options/Option.java b/src/main/java/org/jastadd/ragconnect/compiler/options/Option.java
similarity index 96%
rename from src/main/java/org/jastadd/ros2rag/compiler/options/Option.java
rename to src/main/java/org/jastadd/ragconnect/compiler/options/Option.java
index 0f57f9899ba5f28ee80ca6d37788a6e31123ac47..cc1469cfa49e8b85ea95dda0de5509e91027b315 100644
--- a/src/main/java/org/jastadd/ros2rag/compiler/options/Option.java
+++ b/src/main/java/org/jastadd/ragconnect/compiler/options/Option.java
@@ -1,4 +1,4 @@
-package org.jastadd.ros2rag.compiler.options;
+package org.jastadd.ragconnect.compiler.options;
abstract public class Option<ValueType> implements Comparable<Option<?>> {
public final static String PREFIX = "--";
diff --git a/src/main/java/org/jastadd/ros2rag/compiler/options/StringOption.java b/src/main/java/org/jastadd/ragconnect/compiler/options/StringOption.java
similarity index 93%
rename from src/main/java/org/jastadd/ros2rag/compiler/options/StringOption.java
rename to src/main/java/org/jastadd/ragconnect/compiler/options/StringOption.java
index 19082b5ae6b9fa90145a73ff4ddc4b58b2f9b122..51ee57a5c999f32822b249d5caf48a2f4de8ce7d 100644
--- a/src/main/java/org/jastadd/ros2rag/compiler/options/StringOption.java
+++ b/src/main/java/org/jastadd/ragconnect/compiler/options/StringOption.java
@@ -1,4 +1,4 @@
-package org.jastadd.ros2rag.compiler.options;
+package org.jastadd.ragconnect.compiler.options;
public class StringOption extends Option<String> {
private String value;
diff --git a/src/main/resources/MqttHandler.jadd b/src/main/resources/MqttHandler.jadd
index c3e98dc89377e6217946fafa54a9eb7ab7594c61..493d8e4452e81c5dbfa45a522a6366345908cdcc 100644
--- a/src/main/resources/MqttHandler.jadd
+++ b/src/main/resources/MqttHandler.jadd
@@ -24,7 +24,7 @@ public class MqttHandler {
private final java.util.Map<String, java.util.List<java.util.function.Consumer<byte[]>>> callbacks;
public MqttHandler() {
- this("Ros2Rag");
+ this("RagConnect");
}
public MqttHandler(String name) {
diff --git a/src/main/resources/mqtt.mustache b/src/main/resources/mqtt.mustache
index d65ca944a9dc7e881ff75d89ea696d4bb1fe09fc..dbdb85e7954dbf50ae7e150ffc43dd4cbda0fd80 100644
--- a/src/main/resources/mqtt.mustache
+++ b/src/main/resources/mqtt.mustache
@@ -16,8 +16,8 @@ aspect MQTT {
{{mqttHandlerField}}.close();
}
- inh MqttHandler ASTNode.{{mqttHandlerAttribute}}();
{{#getRootTypeComponents}}
+ {{#first}}inh MqttHandler ASTNode.{{mqttHandlerAttribute}}();{{/first}}
eq {{rootNodeName}}.get{{name}}().{{mqttHandlerAttribute}}() = {{mqttHandlerField}};
{{/getRootTypeComponents}}
}
diff --git a/src/main/resources/ros2rag.mustache b/src/main/resources/ragconnect.mustache
similarity index 100%
rename from src/main/resources/ros2rag.mustache
rename to src/main/resources/ragconnect.mustache