Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2018-04-30 16:37:58 +0000
committerHenrik Rentz-Reichert2018-06-08 11:53:10 +0000
commit29873f1151bb915cf3044f21deca9c756d3f95e0 (patch)
treedfb65025ce0f630a188baf879d0fd27c5e412cc9 /plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c
parentd1dab866b5986c7e9ec36cdc1d9c9a6fde6d73c4 (diff)
downloadorg.eclipse.etrice-29873f1151bb915cf3044f21deca9c756d3f95e0.tar.gz
org.eclipse.etrice-29873f1151bb915cf3044f21deca9c756d3f95e0.tar.xz
org.eclipse.etrice-29873f1151bb915cf3044f21deca9c756d3f95e0.zip
Bug 534211 - unify Detail Code parsing
new scanner, parser and linker for detail code including tests * the scanner is tokenizing the text * the parser creates an AST * the linker associates Room objects to the AST nodes in a context dependent way * unit tests for scanner, parser and linker * a detail code translator is provided with a slightly changed interface to the translation provider Change-Id: I84075b6618dc0cedcec6e8da73520bf0a7bcaf90
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c')
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java
index 33f6e1a6e..fc6ed1edb 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CTranslationProvider.java
@@ -12,13 +12,13 @@
package org.eclipse.etrice.generator.c.gen;
-import java.util.ArrayList;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.etrice.core.room.Attribute;
-import org.eclipse.etrice.core.room.CommunicationType;
import org.eclipse.etrice.core.fsm.fSM.AbstractInterfaceItem;
import org.eclipse.etrice.core.fsm.fSM.DetailCode;
+import org.eclipse.etrice.core.room.Attribute;
+import org.eclipse.etrice.core.room.CommunicationType;
import org.eclipse.etrice.core.room.EnumLiteral;
import org.eclipse.etrice.core.room.EnumerationType;
import org.eclipse.etrice.core.room.InterfaceItem;
@@ -51,7 +51,7 @@ public class CTranslationProvider extends DefaultTranslationProvider {
}
@Override
- public String getInterfaceItemMessageText(AbstractInterfaceItem item, EObject abstractMsg, ArrayList<String> args, String index, String orig) {
+ public String getInterfaceItemMessageText(AbstractInterfaceItem item, EObject abstractMsg, List<String> args, String index, String orig) {
if (!(abstractMsg instanceof Message))
return orig;
@@ -110,11 +110,11 @@ public class CTranslationProvider extends DefaultTranslationProvider {
}
/* (non-Javadoc)
- * @see org.eclipse.etrice.generator.base.DefaultTranslationProvider#getInterfaceItemOperationText(org.eclipse.etrice.core.fsm.fSM.AbstractInterfaceItem, org.eclipse.etrice.core.room.PortOperation, java.util.ArrayList, java.lang.String)
+ * @see org.eclipse.etrice.generator.base.DefaultTranslationProvider#getInterfaceItemOperationText(org.eclipse.etrice.core.fsm.fSM.AbstractInterfaceItem, org.eclipse.etrice.core.room.PortOperation, java.util.List, java.lang.String)
*/
@Override
public String getInterfaceItemOperationText(AbstractInterfaceItem item,
- PortOperation op, ArrayList<String> args, String orig) {
+ PortOperation op, List<String> args, String orig) {
StringBuilder argtext = new StringBuilder();
for (String arg : args) {

Back to the top