Prechádzať zdrojové kódy

Reworked debug handling due to YAKHMI-552

jos.itemis@gmail.com 13 rokov pred
rodič
commit
c6054af2e5

+ 8 - 7
plugins/org.yakindu.sct.generator.c/library/FeatureTypeLibrary.xmi

@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="ASCII"?>
-<sgen:FeatureTypeLibrary xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sgen="http://www.yakindu.org/sct/statechart/SGen" xsi:schemaLocation="http://www.yakindu.org/sct/statechart/SGen ../../org.yakindu.sct.model.sgen/model/emf/sgen.ecore" name="C Generator">
-  <types name="CCodeFeature" optional="true">
-    <parameters name="InterfaceEventListener" parameterType="BOOLEAN"/>
-    <parameters name="Singleton" parameterType="BOOLEAN"/>
-  </types>
-</sgen:FeatureTypeLibrary>
+<?xml version="1.0" encoding="ASCII"?>
+<sgen:FeatureTypeLibrary xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sgen="http://www.yakindu.org/sct/statechart/SGen" xsi:schemaLocation="http://www.yakindu.org/sct/statechart/SGen ../../org.yakindu.sct.model.sgen/model/emf/sgen.ecore" name="C Generator">
+  <types name="CCodeFeature" optional="true">
+    <parameters name="InterfaceEventListener" parameterType="BOOLEAN"/>
+    <parameters name="Singleton" parameterType="BOOLEAN"/>
+    <parameters name="DebugType"/>
+  </types>
+</sgen:FeatureTypeLibrary>

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

@@ -8,8 +8,6 @@ String getDefaultReal() : "0.0";
 String getDefaultInteger() : "0";
 String getDefaultBoolean() : getBoolFalse();
 Boolean getSingletonDefault() : false;
-String getYacopFeature() : "YacopFeature";
 String getDebugFeature() : "debugType";
 String debugTypeCout() : "cout";
-String debugTypeCandera() : "candera";
 

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

@@ -276,15 +276,14 @@ Boolean isSingleton(Object this) : (
 
 String getDebugFeatureValue(Object this) :
 (
- (this.genEntry().getFeatureConfiguration(getYacopFeature()) != null) ? (
-  (this.genEntry().getFeatureConfiguration(getYacopFeature()).getParameterValue(getDebugFeature()) != null) ?
-       this.genEntry().getFeatureConfiguration(getYacopFeature()).getParameterValue(getDebugFeature()).getStringValue()
+ (this.genEntry().getFeatureConfiguration(getCCodeFeature()) != null) ? (
+  (this.genEntry().getFeatureConfiguration(getCCodeFeature()).getParameterValue(getDebugFeature()) != null) ?
+       this.genEntry().getFeatureConfiguration(getCCodeFeature()).getParameterValue(getDebugFeature()).getStringValue()
      : "") 
   : "" 
 ); 
 
 Boolean isDebugCout(Object this) : (getDebugFeatureValue() == debugTypeCout());
-Boolean isDebugCandera(Object this) : (getDebugFeatureValue() == debugTypeCandera());
  
 String getComment(Step this) :
 	if comment!=null then