From 7f10d39331072a240ea05951701b8ae71a6e0cb1 Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Tue, 19 Jun 2018 09:33:57 +0200
Subject: 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: Id31abfc0913353aeeb86d0070b1cec8a76d7a82e
---
 tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF     | 2 +-
 .../src/org/eclipse/etrice/dctools/tests/TestDCScanner.xtend      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
index feb8469e7..54c80d1d8 100644
--- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="1.1.2",
  org.eclipse.xtext;bundle-version="2.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.emf.ecore,
- org.eclipse.xtext.testing;bundle-version="2.13.0"
+ org.eclipse.xtext.testing;bundle-version="2.12.0"
 Bundle-Activator: org.eclipse.etrice.core.CoreTestsActivator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.etrice.core
diff --git a/tests/org.eclipse.etrice.dctools.tests/src/org/eclipse/etrice/dctools/tests/TestDCScanner.xtend b/tests/org.eclipse.etrice.dctools.tests/src/org/eclipse/etrice/dctools/tests/TestDCScanner.xtend
index 96b4913b4..8f164b578 100644
--- a/tests/org.eclipse.etrice.dctools.tests/src/org/eclipse/etrice/dctools/tests/TestDCScanner.xtend
+++ b/tests/org.eclipse.etrice.dctools.tests/src/org/eclipse/etrice/dctools/tests/TestDCScanner.xtend
@@ -16,14 +16,14 @@ import org.eclipse.etrice.dctools.fsm.ast.DCLanguage
 import org.eclipse.etrice.dctools.fsm.ast.DCScanner
 import org.junit.Before
 import org.junit.Test
-import org.eclipse.etrice.dctools.fsm.ast.internal.DCBracketToken.BracketKind
-import org.eclipse.etrice.dctools.fsm.ast.internal.DCToken.Kind
 
 import static org.eclipse.etrice.dctools.tests.TestConstants.*
 import static org.hamcrest.CoreMatchers.*
 import static org.junit.Assert.*
-import org.eclipse.etrice.dctools.fsm.ast.internal.DCBracketToken
-import org.eclipse.etrice.dctools.fsm.ast.internal.DCToken
+import org.eclipse.etrice.dctools.fsm.ast.tokens.DCToken.Kind
+import org.eclipse.etrice.dctools.fsm.ast.tokens.DCBracketToken.BracketKind
+import org.eclipse.etrice.dctools.fsm.ast.tokens.DCToken
+import org.eclipse.etrice.dctools.fsm.ast.tokens.DCBracketToken
 
 class TestDCScanner {
 	
-- 
cgit v1.2.3