Просмотр исходного кода

Adopted C Code Generator to EObject based Feature Call

Andreas Mülder 14 лет назад
Родитель
Сommit
7c658ebc0a

+ 2 - 2
plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/Expression.ext

@@ -170,9 +170,9 @@ Set[EventDefinition] getLocalEvents(InternalScope interface) :
 	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::LOCAL);
 
 // is this just relevant for events?
-String toCCode(TypedElementReferenceExpression ref) :
+String toCCode(ElementReferenceExpression ref) :
 	ref.reference.toCCode();
-String toCCode(base::NamedElement ref) :
+String toCCode(EObject ref) :
 	"/* toCode not defined for: "+ref+" */";
 String toCCode(Feature ref) :
 	"/* toCode not defined for: "+ref+" */";

+ 5 - 4
plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/Naming.ext

@@ -224,12 +224,13 @@ String getEventEnumName(EventDefinition this) : "ev_" + this.eContainer.getScope
 String getEventEnumName(FeatureCall this) : feature.getEventEnumName();
 String getEventEnumName(types::Feature this) : "/* EventEnum requested, but got Feature: "+this+" */";
 String getEventEnumName(Expression this) : "/* EventEnum requested, but got Expression: "+this+" */";
+String getEventEnumName(EObject this) : null;
 
 String getEventName(Event this) : this.eContainer.getScopeName().toFirstUpper() + this.getNameWA().toFirstUpper();
 String getEventName(EventDefinition this) : this.eContainer.getScopeName().toFirstUpper() + "_" +name.toFirstUpper();
 String getEventName(FeatureCall this) : feature.getEventName();
-String getEventName(base::NamedElement this) : "/* Event expected, but got NamedElement: "+this+" */";
-String getEventName(TypedElementReferenceExpression this) : reference.getEventName();
+String getEventName(EObject this) : "/* Event expected, but got NamedElement: "+this+" */";
+String getEventName(ElementReferenceExpression this) : reference.getEventName();
 String getEventName(types::Event this) : this.eContainer.getScopeName().toFirstUpper() + this.name.toFirstUpper();
 String getEventName(types::Feature this) : "/* Event expected, but got Feature: "+this+" */";
 String getEventName(Expression this) : "/* Event expected, but got Expression: "+this+" */";
@@ -238,9 +239,9 @@ String getInterfaceName(EventRaisingExpression this) :
 	"iface" + (( this.event.getEvent().eContainer.getScopeName() == "default")?"":this.event.getEvent().eContainer.getScopeName().toFirstUpper());
 
 EventDefinition getEvent(Expression e) : null;
-EventDefinition getEvent(NamedElement e) : null;
+EventDefinition getEvent(EObject e) : null;
 EventDefinition getEvent(FeatureCall this) : feature.getEvent();
-EventDefinition getEvent(TypedElementReferenceExpression this) : reference.getEvent();
+EventDefinition getEvent(ElementReferenceExpression this) : reference.getEvent();
 EventDefinition getEvent(EventDefinition this) : this;
 
 String getScopeName(emf::EObject eo) :