summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2013-12-10 10:13:37 (EST)
committerJuergen Haug2013-12-10 10:37:58 (EST)
commit9e7bc7e8513767a6d5ba506cd0209b09e831a840 (patch)
tree16182d3911bd5777e8b8f93ea06872cf1c8bff20
parentb63a9b72991fec7e4c73ec9ee4d09a2d81c7c365 (diff)
downloadorg.eclipse.etrice-9e7bc7e8513767a6d5ba506cd0209b09e831a840.zip
org.eclipse.etrice-9e7bc7e8513767a6d5ba506cd0209b09e831a840.tar.gz
org.eclipse.etrice-9e7bc7e8513767a6d5ba506cd0209b09e831a840.tar.bz2
[gen.c] changed error message for missing default init in external dtrefs/changes/88/19588/2
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java9
2 files changed, 6 insertions, 7 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
index 09e546e..a7fdd6b 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
@@ -238,8 +238,8 @@ class CExtensions implements ILanguageExtension {
ExternalType:{
if (dt.defaultValueLiteral != null )
return dt.getDefaultValueLiteral
- diagnostician.error("cannot initialize external type "+dt.name, dt.eContainer, dt.eContainingFeature)
- "cannot instantiate external data type "+dt.name
+ diagnostician.error("external type "+dt.name + "has no default initialization", dt.eContainer, dt.eContainingFeature)
+ ""
}
DataClass:
'''
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
index f98bd8a..72d4adc 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/CExtensions.java
@@ -516,13 +516,12 @@ public class CExtensions implements ILanguageExtension {
return _externalType.getDefaultValueLiteral();
}
String _name = _externalType.getName();
- String _plus = ("cannot initialize external type " + _name);
+ String _plus = ("external type " + _name);
+ String _plus_1 = (_plus + "has no default initialization");
EObject _eContainer = _externalType.eContainer();
EStructuralFeature _eContainingFeature = _externalType.eContainingFeature();
- this.diagnostician.error(_plus, _eContainer, _eContainingFeature);
- String _name_1 = _externalType.getName();
- String _plus_1 = ("cannot instantiate external data type " + _name_1);
- _xblockexpression = (_plus_1);
+ this.diagnostician.error(_plus_1, _eContainer, _eContainingFeature);
+ _xblockexpression = ("");
}
_switchResult = _xblockexpression;
}