Resolve "Change used prefix for generated parts of grammar"

Closes #35 (closed)

ragconnect.base/src/main/jastadd/Intermediate.jadd

@@ -11,6 +11,8 @@ aspect SharedMustache {
 
   syn boolean RagConnect.configExperimentalJastAdd329() = getConfiguration().getExperimentalJastAdd329();
 
+  syn String RagConnect.internalRagConnectPrefix() = "_ragconnect_";
+
   syn String RagConnect.rootNodeName() = getConfiguration().getRootNode().getName();
 
   // === EndpointDefinition ===
@@ -21,7 +23,7 @@ aspect MustacheDependencyDefinition {
   // === DependencyDefinition ===
   syn String DependencyDefinition.dependencyMethodName() = "add" + capitalize(getID());
 
-  syn String DependencyDefinition.internalRelationPrefix() = "_internal_" + getID();
+  syn String DependencyDefinition.internalRelationPrefix() = ragconnect().internalRagConnectPrefix() + getID();
 
   syn String DependencyDefinition.sourceParentTypeName() = getSource().containingTypeDecl().getName();
 
@@ -45,11 +47,11 @@ aspect MustacheHandler {
   }
 
   // === Handler ===
-  syn String Handler.attributeName() = "_" + getUniqueName() + "Handler";
+  syn String Handler.attributeName() = ragconnect().internalRagConnectPrefix() + getUniqueName() + "Handler";
 
   syn String Handler.constructionSnippet() = "new " + getClassName() + "(\"Handler for " + ragconnect().rootNodeName() + ".\" + this.hashCode())";
 
-  syn String Handler.fieldName() = "_" + getUniqueName() + "Handler";
+  syn String Handler.fieldName() = ragconnect().internalRagConnectPrefix() + getUniqueName() + "Handler";
 
   syn String Handler.setupWaitUntilReadyMethodName() = "ragconnectSetup" + capitalize(getUniqueName()) + "WaitUntilReady";
 }
@@ -126,7 +128,7 @@ aspect MustacheMappingApplicationAndDefinition {
   }
 
   syn String MInnerMappingDefinition.methodName() = getMappingDefinition().methodName();
-  syn String MappingDefinition.methodName() = "_apply_" + getID();
+  syn String MappingDefinition.methodName() = ragconnect().internalRagConnectPrefix() + "_apply_" + getID();
 
   syn String MInnerMappingDefinition.outputVarName() = "result" + methodName();  // we do not need "_" in between here, because methodName begins with one
 
@@ -311,11 +313,11 @@ aspect MustacheReceiveDefinition {
 
   syn boolean EndpointDefinition.hasTypeEndpointTarget() = getEndpointTarget().isTypeEndpointTarget();
 
-  syn String EndpointDefinition.idTokenName() = "InternalRagconnectTopicInList";
+  syn String EndpointDefinition.idTokenName() = ragconnect().internalRagConnectPrefix() + "TopicInList";
 
-  syn String EndpointDefinition.internalConnectMethodName() = "_internal_" + connectMethodName();
+  syn String EndpointDefinition.internalConnectMethodName() = ragconnect().internalRagConnectPrefix() + "_internal_" + connectMethodName();
 
-  syn String EndpointDefinition.resolveInListMethodName() = "_ragconnect_resolve" + entityName() + "InList";
+  syn String EndpointDefinition.resolveInListMethodName() = ragconnect().internalRagConnectPrefix() + "_resolve" + entityName() + "InList";
 
   syn boolean EndpointDefinition.typeIsList() = getEndpointTarget().typeIsList();
 
@@ -347,8 +349,8 @@ aspect MustacheSendDefinition {
 
   // === attributes needed for computing above ones ===
   syn String EndpointTarget.senderName();
-  eq TokenEndpointTarget.senderName() = "_sender_" + getToken().getName();
-  eq TypeEndpointTarget.senderName() = "_sender_" + getType().getName();
+  eq TokenEndpointTarget.senderName() = ragconnect().internalRagConnectPrefix() + "_sender_" + getToken().getName();
+  eq TypeEndpointTarget.senderName() = ragconnect().internalRagConnectPrefix() + "_sender_" + getType().getName();
   eq ContextFreeTypeEndpointTarget.senderName() = null;
 
   syn String MEndpointDefinition.updateMethodName();
@@ -357,14 +359,14 @@ aspect MustacheSendDefinition {
   eq MTokenReceiveDefinition.updateMethodName() = null;
   eq MTokenReceiveDefinition.writeMethodName() = null;
 
-  eq MTokenSendDefinition.updateMethodName() = "_update_" + tokenName();
-  eq MTokenSendDefinition.writeMethodName() = "_writeLastValue_" + tokenName();
+  eq MTokenSendDefinition.updateMethodName() = ragconnect().internalRagConnectPrefix() + "_update_" + tokenName();
+  eq MTokenSendDefinition.writeMethodName() = ragconnect().internalRagConnectPrefix() + "_writeLastValue_" + tokenName();
 
   eq MTypeReceiveDefinition.updateMethodName() = null;
   eq MTypeReceiveDefinition.writeMethodName() = null;
 
-  eq MTypeSendDefinition.updateMethodName() = "_update_" + typeName();
-  eq MTypeSendDefinition.writeMethodName() = "_writeLastValue_" + typeName();
+  eq MTypeSendDefinition.updateMethodName() = ragconnect().internalRagConnectPrefix() + "_update_" + typeName();
+  eq MTypeSendDefinition.writeMethodName() = ragconnect().internalRagConnectPrefix() + "_writeLastValue_" + typeName();
 
   eq MContextFreeTypeReceiveDefinition.updateMethodName() = null;
   eq MContextFreeTypeReceiveDefinition.writeMethodName() = null;
@@ -381,7 +383,7 @@ aspect MustacheSendDefinition {
 
 aspect MustacheTokenComponent {
   // === TokenComponent ===
-  syn String TokenComponent.internalName() = needProxyToken() ? "_internal_" + getName() : getName();
+  syn String TokenComponent.internalName() = needProxyToken() ? ragconnect().internalRagConnectPrefix() + getName() : getName();
 
   syn String TokenComponent.javaType() = effectiveJavaTypeUse().prettyPrint();